X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/b4bbde40055d48202f02a9f4557cb3292dc5e85b..11289b4fc3efbc074b668d4516cd896f8ade9761:/src/viewpropertiesdialog.cpp

diff --git a/src/viewpropertiesdialog.cpp b/src/viewpropertiesdialog.cpp
index 5922f8359..9302ba138 100644
--- a/src/viewpropertiesdialog.cpp
+++ b/src/viewpropertiesdialog.cpp
@@ -41,11 +41,11 @@
 #include <kmessagebox.h>
 #include <kstandarddirs.h>
 #include <kurl.h>
+#include <kcombobox.h>
 
 #include <QAction>
 #include <QButtonGroup>
 #include <QCheckBox>
-#include <QComboBox>
 #include <QGridLayout>
 #include <QGroupBox>
 #include <QLabel>
@@ -68,6 +68,7 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) :
     m_additionalInfo(0),
     m_applyToCurrentFolder(0),
     m_applyToSubFolders(0),
+    m_applyToAllFolders(0),
     m_useAsDefault(0)
 {
     Q_ASSERT(dolphinView != 0);
@@ -92,7 +93,7 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) :
     QWidget* propsGrid = new QWidget();
 
     QLabel* viewModeLabel = new QLabel(i18nc("@label:listbox", "View mode:"), propsGrid);
-    m_viewMode = new QComboBox(propsGrid);
+    m_viewMode = new KComboBox(propsGrid);
     m_viewMode->addItem(KIcon("view-list-icons"), i18nc("@item:inlistbox", "Icons"));
     m_viewMode->addItem(KIcon("view-list-details"), i18nc("@item:inlistbox", "Details"));
     m_viewMode->addItem(KIcon("view-file-columns"), i18nc("@item:inlistbox", "Column"));
@@ -100,11 +101,11 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) :
     QLabel* sortingLabel = new QLabel(i18nc("@label:listbox", "Sorting:"), propsGrid);
     QWidget* sortingBox = new QWidget(propsGrid);
 
-    m_sortOrder = new QComboBox(sortingBox);
+    m_sortOrder = new KComboBox(sortingBox);
     m_sortOrder->addItem(i18nc("@item:inlistbox Sort", "Ascending"));
     m_sortOrder->addItem(i18nc("@item:inlistbox Sort", "Descending"));
 
-    m_sorting = new QComboBox(sortingBox);
+    m_sorting = new KComboBox(sortingBox);
     m_sorting->addItem(i18nc("@item:inlistbox Sort", "By Name"));
     m_sorting->addItem(i18nc("@item:inlistbox Sort", "By Size"));
     m_sorting->addItem(i18nc("@item:inlistbox Sort", "By Date"));
@@ -134,9 +135,9 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) :
     sortingBox->setLayout(sortingLayout);
 
     QGridLayout* propsGridLayout = new QGridLayout(propsGrid);
-    propsGridLayout->addWidget(viewModeLabel, 0, 0);
+    propsGridLayout->addWidget(viewModeLabel, 0, 0, Qt::AlignRight);
     propsGridLayout->addWidget(m_viewMode, 0, 1);
-    propsGridLayout->addWidget(sortingLabel, 1, 0);
+    propsGridLayout->addWidget(sortingLabel, 1, 0, Qt::AlignRight);
     propsGridLayout->addWidget(sortingBox, 1, 1);
 
     QVBoxLayout* propsBoxLayout = new QVBoxLayout(propsBox);
@@ -337,7 +338,7 @@ void ViewPropertiesDialog::applyViewProperties()
     // If the user selected 'Apply To All Folders' the view properties implicitely
     // are also used as default for new folders.
     const bool useAsDefault = applyToAllFolders ||
-                              (m_useAsDefault != 0) && m_useAsDefault->isChecked();
+                              ((m_useAsDefault != 0) && m_useAsDefault->isChecked());
     if (useAsDefault) {
         // For directories where no .directory file is available, the .directory
         // file stored for the global view properties is used as fallback. To update
@@ -362,10 +363,6 @@ void ViewPropertiesDialog::applyViewProperties()
         // all existing viewproperties invalid, as they have a smaller time stamp.
         GeneralSettings* settings = DolphinSettings::instance().generalSettings();
         settings->setViewPropsTimestamp(QDateTime::currentDateTime());
-
-        // This is also a good chance to make a cleanup of all mirrored view properties:
-        const KUrl mirroredDir = ViewProperties::mirroredDirectory();
-        KIO::NetAccess::del(mirroredDir, this);
     }
 
     m_dolphinView->setMode(m_viewProps->viewMode());