Ported Dolphin from KDialog to QDialog and save/restoreDialogSize to KWindowConfig::save/restoreWindowSize with the help of the porting scripts.

REVIEW: 122305

6 files changed, 22 insertions, 25 deletions

diff --git a/src/settings/general/configurepreviewplugindialog.cpp b/src/settings/general/configurepreviewplugindialog.cpp
index eb9ad010c..15cd92667 100644
--- a/src/settings/general/configurepreviewplugindialog.cpp
+++ b/src/settings/general/configurepreviewplugindialog.cpp
@@ -30,11 +30,13 @@
 #include <QLibrary>
 #include <QVBoxLayout>
 #include <QStandardPaths>
+#include <QDialogButtonBox>
+#include <QPushButton>
 
 ConfigurePreviewPluginDialog::ConfigurePreviewPluginDialog(const QString& pluginName,
                                                            const QString& desktopEntryName,
                                                            QWidget* parent) :
-    KDialog(parent)
+    QDialog(parent)
 {
     QSharedPointer<ThumbCreator> previewPlugin;
     const QString pluginPath = KPluginLoader::findPlugin(desktopEntryName);
@@ -45,24 +47,21 @@ ConfigurePreviewPluginDialog::ConfigurePreviewPluginDialog(const QString& plugin
         }
     }
 
-    setCaption(i18nc("@title:window", "Configure Preview for %1", pluginName));
+    setWindowTitle(i18nc("@title:window", "Configure Preview for %1", pluginName));
+    setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Minimum);
     setMinimumWidth(400);
-    setButtons(Ok | Cancel);
-    setDefaultButton(Ok);
 
-    if (previewPlugin) {
-        auto mainWidget = new QWidget(this);
-        mainWidget->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Minimum);
-        setMainWidget(mainWidget);
+    auto layout = new QVBoxLayout(this);
+    setLayout(layout);
 
+    if (previewPlugin) {
         auto configurationWidget = previewPlugin->createConfigurationWidget();
-        configurationWidget->setParent(mainWidget);
-
-        auto layout = new QVBoxLayout(mainWidget);
+        configurationWidget->setParent(this);
         layout->addWidget(configurationWidget);
+
         layout->addStretch();
 
-        connect(this, &ConfigurePreviewPluginDialog::okClicked, this, [=] {
+        connect(this, &ConfigurePreviewPluginDialog::accepted, this, [=] {
             // TODO: It would be great having a mechanism to tell PreviewJob that only previews
             // for a specific MIME-type should be regenerated. As this is not available yet we
             // delete the whole thumbnails directory.
@@ -73,4 +72,13 @@ ConfigurePreviewPluginDialog::ConfigurePreviewPluginDialog(const QString& plugin
             KIO::del(QUrl::fromLocalFile(thumbnailsPath), KIO::HideProgressInfo);
         });
     }
+
+    auto buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, this);
+    connect(buttonBox, &QDialogButtonBox::accepted, this, &ConfigurePreviewPluginDialog::accept);
+    connect(buttonBox, &QDialogButtonBox::rejected, this, &ConfigurePreviewPluginDialog::reject);
+    layout->addWidget(buttonBox);
+
+    auto okButton = buttonBox->button(QDialogButtonBox::Ok);
+    okButton->setShortcut(Qt::CTRL | Qt::Key_Return);
+    okButton->setDefault(true);
 }
\ No newline at end of file
diff --git a/src/settings/general/configurepreviewplugindialog.h b/src/settings/general/configurepreviewplugindialog.h
index 02a0cde34..620caeb51 100644
--- a/src/settings/general/configurepreviewplugindialog.h
+++ b/src/settings/general/configurepreviewplugindialog.h
@@ -20,12 +20,12 @@
 #ifndef CONFIGUREPREVIEWPLUGINDIALOG_H
 #define CONFIGUREPREVIEWPLUGINDIALOG_H
 
-#include <KDialog>
+#include <QDialog>
 
 /**
  * @brief Dialog for configuring preview-plugins.
  */
-class ConfigurePreviewPluginDialog : public KDialog
+class ConfigurePreviewPluginDialog : public QDialog
 {
     Q_OBJECT
 
diff --git a/src/settings/general/confirmationssettingspage.cpp b/src/settings/general/confirmationssettingspage.cpp
index 617d31c7d..264024abd 100644
--- a/src/settings/general/confirmationssettingspage.cpp
+++ b/src/settings/general/confirmationssettingspage.cpp
@@ -21,7 +21,6 @@
 
 #include <dolphin_generalsettings.h>
 
-#include <KDialog>
 #include <KLocalizedString>
 
 #include <QCheckBox>
@@ -58,15 +57,11 @@ ConfirmationsSettingsPage::ConfirmationsSettingsPage(QWidget* parent) :
     m_confirmClosingMultipleTabs = new QCheckBox(i18nc("@option:check Ask for confirmation when",
                                                        "Closing Dolphin windows with multiple tabs"), this);
 
-    topLayout->addSpacing(KDialog::spacingHint());
     topLayout->addWidget(confirmLabelKde);
-    topLayout->addSpacing(KDialog::spacingHint());
     topLayout->addWidget(m_confirmMoveToTrash);
     topLayout->addWidget(m_confirmDelete);
     topLayout->addWidget(m_confirmScriptExecution);
-    topLayout->addSpacing(KDialog::spacingHint());
     topLayout->addWidget(confirmLabelDolphin);
-    topLayout->addSpacing(KDialog::spacingHint());
     topLayout->addWidget(m_confirmClosingMultipleTabs);
     topLayout->addStretch();
 
diff --git a/src/settings/general/generalsettingspage.cpp b/src/settings/general/generalsettingspage.cpp
index f32cb9c92..d8f61ef90 100644
--- a/src/settings/general/generalsettingspage.cpp
+++ b/src/settings/general/generalsettingspage.cpp
@@ -26,7 +26,6 @@
 #include <settings/settingspagebase.h>
 #include "statusbarsettingspage.h"
 
-#include <KDialog>
 #include <KLocalizedString>
 
 #include <QTabWidget>
@@ -38,7 +37,6 @@ GeneralSettingsPage::GeneralSettingsPage(const QUrl& url, QWidget* parent) :
 {
     QVBoxLayout* topLayout = new QVBoxLayout(this);
     topLayout->setMargin(0);
-    topLayout->setSpacing(KDialog::spacingHint());
 
     QTabWidget* tabWidget = new QTabWidget(this);
 
diff --git a/src/settings/general/previewssettingspage.cpp b/src/settings/general/previewssettingspage.cpp
index 835af9dbe..9e5f18cc7 100644
--- a/src/settings/general/previewssettingspage.cpp
+++ b/src/settings/general/previewssettingspage.cpp
@@ -23,7 +23,6 @@
 #include "configurepreviewplugindialog.h"
 
 #include <KConfigGroup>
-#include <KDialog>
 #include <KGlobal>
 #include <KLocalizedString>
 #include <KNumInput>
@@ -88,7 +87,6 @@ PreviewsSettingsPage::PreviewsSettingsPage(QWidget* parent) :
     fileSizeBoxLayout->addWidget(remoteFileSizeLabel, 0, Qt::AlignRight);
     fileSizeBoxLayout->addWidget(m_remoteFileSizeBox);
 
-    topLayout->addSpacing(KDialog::spacingHint());
     topLayout->addWidget(showPreviewsLabel);
     topLayout->addWidget(m_listView);
     topLayout->addLayout(fileSizeBoxLayout);
diff --git a/src/settings/general/statusbarsettingspage.cpp b/src/settings/general/statusbarsettingspage.cpp
index d12a0c1fc..03846253b 100644
--- a/src/settings/general/statusbarsettingspage.cpp
+++ b/src/settings/general/statusbarsettingspage.cpp
@@ -21,7 +21,6 @@
 
 #include <dolphin_generalsettings.h>
 
-#include <KDialog>
 #include <KLocalizedString>
 
 #include <QCheckBox>
@@ -36,7 +35,6 @@ StatusBarSettingsPage::StatusBarSettingsPage(QWidget* parent) :
     m_showSpaceInfo = new QCheckBox(i18nc("@option:check", "Show space information"), this);
 
     QVBoxLayout* topLayout = new QVBoxLayout(this);
-    topLayout->addSpacing(KDialog::spacingHint());
     topLayout->addWidget(m_showZoomSlider);
     topLayout->addWidget(m_showSpaceInfo);
     topLayout->addStretch();