Merge branch 'frameworks'

1 files changed, 76 insertions, 70 deletions

diff --git a/src/settings/viewpropertiesdialog.cpp b/src/settings/viewpropertiesdialog.cpp
index 574f8e18e..be7fe0d86 100644
--- a/src/settings/viewpropertiesdialog.cpp
+++ b/src/settings/viewpropertiesdialog.cpp
@@ -29,30 +29,27 @@
 
 #include <config-baloo.h>
 
-#include <KComponentData>
-#include <KLocale>
-#include <KIconLoader>
-#include <KIO/NetAccess>
+#include <KLocalizedString>
 #include <KMessageBox>
-#include <KStandardDirs>
-#include <KUrl>
+#include <QUrl>
 #include <KComboBox>
+#include <KConfigGroup>
+#include <KWindowConfig>
 
-#include <QAction>
 #include <QButtonGroup>
 #include <QCheckBox>
 #include <QGridLayout>
 #include <QGroupBox>
 #include <QLabel>
-#include <QMenu>
 #include <QPushButton>
 #include <QRadioButton>
-#include <QBoxLayout>
+#include <QDialogButtonBox>
+#include <QVBoxLayout>
 
 #include <views/viewproperties.h>
 
 ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) :
-    KDialog(dolphinView),
+    QDialog(dolphinView),
     m_isDirty(false),
     m_dolphinView(dolphinView),
     m_viewProps(0),
@@ -72,29 +69,31 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) :
     Q_ASSERT(dolphinView);
     const bool useGlobalViewProps = GeneralSettings::globalViewProps();
 
-    setCaption(i18nc("@title:window", "View Properties"));
-    setButtons(KDialog::Ok | KDialog::Cancel | KDialog::Apply);
+    setWindowTitle(i18nc("@title:window", "View Properties"));
+    setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Minimum);
 
-    const KUrl& url = dolphinView->url();
+    const QUrl& url = dolphinView->url();
     m_viewProps = new ViewProperties(url);
     m_viewProps->setAutoSaveEnabled(false);
 
-    QWidget* main = new QWidget();
-    QVBoxLayout* topLayout = new QVBoxLayout();
+    auto layout = new QVBoxLayout(this);
+    setLayout(layout);
+
+    auto propsGrid = new QWidget(this);
+    layout->addWidget(propsGrid);
 
     // create 'Properties' group containing view mode, sorting, sort order and show hidden files
-    QWidget* propsBox = main;
+    QWidget* propsBox = this;
     if (!useGlobalViewProps) {
-        propsBox = new QGroupBox(i18nc("@title:group", "Properties"), main);
+        propsBox = new QGroupBox(i18nc("@title:group", "Properties"), this);
+        layout->addWidget(propsBox);
     }
 
-    QWidget* propsGrid = new QWidget();
-
     QLabel* viewModeLabel = new QLabel(i18nc("@label:listbox", "View mode:"), propsGrid);
     m_viewMode = new KComboBox(propsGrid);
-    m_viewMode->addItem(KIcon("view-list-icons"), i18nc("@item:inlistbox", "Icons"), DolphinView::IconsView);
-    m_viewMode->addItem(KIcon("view-list-details"), i18nc("@item:inlistbox", "Compact"), DolphinView::CompactView);
-    m_viewMode->addItem(KIcon("view-list-tree"), i18nc("@item:inlistbox", "Details"), DolphinView::DetailsView);
+    m_viewMode->addItem(QIcon::fromTheme("view-list-icons"), i18nc("@item:inlistbox", "Icons"), DolphinView::IconsView);
+    m_viewMode->addItem(QIcon::fromTheme("view-list-details"), i18nc("@item:inlistbox", "Compact"), DolphinView::CompactView);
+    m_viewMode->addItem(QIcon::fromTheme("view-list-tree"), i18nc("@item:inlistbox", "Details"), DolphinView::DetailsView);
 
     QLabel* sortingLabel = new QLabel(i18nc("@label:listbox", "Sorting:"), propsGrid);
     QWidget* sortingBox = new QWidget(propsGrid);
@@ -136,33 +135,29 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) :
     propsBoxLayout->addWidget(m_showHiddenFiles);
     propsBoxLayout->addWidget(m_additionalInfo);
 
-    topLayout->addWidget(propsBox);
-
-    connect(m_viewMode, SIGNAL(currentIndexChanged(int)),
-            this, SLOT(slotViewModeChanged(int)));
-    connect(m_sorting, SIGNAL(currentIndexChanged(int)),
-            this, SLOT(slotSortingChanged(int)));
-    connect(m_sortOrder, SIGNAL(currentIndexChanged(int)),
-            this, SLOT(slotSortOrderChanged(int)));
-    connect(m_additionalInfo, SIGNAL(clicked()),
-            this, SLOT(configureAdditionalInfo()));
-    connect(m_sortFoldersFirst, SIGNAL(clicked()),
-            this, SLOT(slotSortFoldersFirstChanged()));
-    connect(m_previewsShown, SIGNAL(clicked()),
-            this, SLOT(slotShowPreviewChanged()));
-    connect(m_showInGroups, SIGNAL(clicked()),
-            this, SLOT(slotGroupedSortingChanged()));
-    connect(m_showHiddenFiles, SIGNAL(clicked()),
-            this, SLOT(slotShowHiddenFilesChanged()));
-
-    connect(this, SIGNAL(okClicked()), this, SLOT(slotOk()));
-    connect(this, SIGNAL(applyClicked()), this, SLOT(slotApply()));
+    connect(m_viewMode, static_cast<void(KComboBox::*)(int)>(&KComboBox::currentIndexChanged),
+            this, &ViewPropertiesDialog::slotViewModeChanged);
+    connect(m_sorting, static_cast<void(KComboBox::*)(int)>(&KComboBox::currentIndexChanged),
+            this, &ViewPropertiesDialog::slotSortingChanged);
+    connect(m_sortOrder, static_cast<void(KComboBox::*)(int)>(&KComboBox::currentIndexChanged),
+            this, &ViewPropertiesDialog::slotSortOrderChanged);
+    connect(m_additionalInfo, &QPushButton::clicked,
+            this, &ViewPropertiesDialog::configureAdditionalInfo);
+    connect(m_sortFoldersFirst, &QCheckBox::clicked,
+            this, &ViewPropertiesDialog::slotSortFoldersFirstChanged);
+    connect(m_previewsShown, &QCheckBox::clicked,
+            this, &ViewPropertiesDialog::slotShowPreviewChanged);
+    connect(m_showInGroups, &QCheckBox::clicked,
+            this, &ViewPropertiesDialog::slotGroupedSortingChanged);
+    connect(m_showHiddenFiles, &QCheckBox::clicked,
+            this, &ViewPropertiesDialog::slotShowHiddenFilesChanged);
 
     // Only show the following settings if the view properties are remembered
     // for each directory:
     if (!useGlobalViewProps) {
         // create 'Apply View Properties To' group
-        QGroupBox* applyBox = new QGroupBox(i18nc("@title:group", "Apply View Properties To"), main);
+        QGroupBox* applyBox = new QGroupBox(i18nc("@title:group", "Apply View Properties To"), this);
+        layout->addWidget(applyBox);
 
         m_applyToCurrentFolder = new QRadioButton(i18nc("@option:radio Apply View Properties To",
                                                         "Current folder"), applyBox);
@@ -182,27 +177,38 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) :
         applyBoxLayout->addWidget(m_applyToSubFolders);
         applyBoxLayout->addWidget(m_applyToAllFolders);
 
-        m_useAsDefault = new QCheckBox(i18nc("@option:check", "Use these view properties as default"), main);
-
-        topLayout->addWidget(applyBox);
-        topLayout->addWidget(m_useAsDefault);
+        m_useAsDefault = new QCheckBox(i18nc("@option:check", "Use these view properties as default"), this);
+        layout->addWidget(m_useAsDefault);
 
-        connect(m_applyToCurrentFolder, SIGNAL(clicked(bool)),
-                this, SLOT(markAsDirty(bool)));
-        connect(m_applyToSubFolders, SIGNAL(clicked(bool)),
-                this, SLOT(markAsDirty(bool)));
-        connect(m_applyToAllFolders, SIGNAL(clicked(bool)),
-                this, SLOT(markAsDirty(bool)));
-        connect(m_useAsDefault, SIGNAL(clicked(bool)),
-                this, SLOT(markAsDirty(bool)));
+        connect(m_applyToCurrentFolder, &QRadioButton::clicked,
+                this, &ViewPropertiesDialog::markAsDirty);
+        connect(m_applyToSubFolders, &QRadioButton::clicked,
+                this, &ViewPropertiesDialog::markAsDirty);
+        connect(m_applyToAllFolders, &QRadioButton::clicked,
+                this, &ViewPropertiesDialog::markAsDirty);
+        connect(m_useAsDefault, &QCheckBox::clicked,
+                this, &ViewPropertiesDialog::markAsDirty);
     }
 
-    main->setLayout(topLayout);
-    setMainWidget(main);
+    layout->addStretch();
 
-    const KConfigGroup dialogConfig(KSharedConfig::openConfig("dolphinrc"),
-                                    "ViewPropertiesDialog");
-    restoreDialogSize(dialogConfig);
+    auto buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel | QDialogButtonBox::Apply, this);
+    connect(buttonBox, &QDialogButtonBox::accepted, this, &ViewPropertiesDialog::accept);
+    connect(buttonBox, &QDialogButtonBox::rejected, this, &ViewPropertiesDialog::reject);
+    layout->addWidget(buttonBox);
+
+    auto okButton = buttonBox->button(QDialogButtonBox::Ok);
+    okButton->setShortcut(Qt::CTRL | Qt::Key_Return);
+    okButton->setDefault(true);
+
+    auto applyButton = buttonBox->button(QDialogButtonBox::Apply);
+    connect(applyButton, &QPushButton::clicked, this, &ViewPropertiesDialog::slotApply);
+    connect(this, &ViewPropertiesDialog::isDirtyChanged, applyButton, [applyButton](bool isDirty) {
+        applyButton->setEnabled(isDirty);
+    });
+
+    const KConfigGroup dialogConfig(KSharedConfig::openConfig("dolphinrc"), "ViewPropertiesDialog");
+    KWindowConfig::restoreWindowSize(windowHandle(), dialogConfig);
 
     loadSettings();
 }
@@ -213,15 +219,14 @@ ViewPropertiesDialog::~ViewPropertiesDialog()
     delete m_viewProps;
     m_viewProps = 0;
 
-    KConfigGroup dialogConfig(KSharedConfig::openConfig("dolphinrc"),
-                              "ViewPropertiesDialog");
-    saveDialogSize(dialogConfig, KConfigBase::Persistent);
+    KConfigGroup dialogConfig(KSharedConfig::openConfig("dolphinrc"), "ViewPropertiesDialog");
+    KWindowConfig::saveWindowSize(windowHandle(), dialogConfig);
 }
 
-void ViewPropertiesDialog::slotOk()
+void ViewPropertiesDialog::accept()
 {
     applyViewProperties();
-    accept();
+    QDialog::accept();
 }
 
 void ViewPropertiesDialog::slotApply()
@@ -281,8 +286,10 @@ void ViewPropertiesDialog::slotShowHiddenFilesChanged()
 
 void ViewPropertiesDialog::markAsDirty(bool isDirty)
 {
-    m_isDirty = isDirty;
-    enableButtonApply(isDirty);
+    if (m_isDirty != isDirty) {
+        m_isDirty = isDirty;
+        emit isDirtyChanged(isDirty);
+    }
 }
 
 void ViewPropertiesDialog::configureAdditionalInfo()
@@ -358,7 +365,7 @@ void ViewPropertiesDialog::applyViewProperties()
         // all existing viewproperties invalid, as they have a smaller time stamp.
         GeneralSettings* settings = GeneralSettings::self();
         settings->setViewPropsTimestamp(QDateTime::currentDateTime());
-        settings->writeConfig();
+        settings->save();
     }
 
     m_dolphinView->setMode(m_viewProps->viewMode());
@@ -408,4 +415,3 @@ void ViewPropertiesDialog::loadSettings()
     markAsDirty(false);
 }
 
-#include "viewpropertiesdialog.moc"