Exclude m_terminalPanel references when built on Windows

[dolphin.git] / src / settings / dolphinsettingsdialog.cpp

diff --git a/src/settings/dolphinsettingsdialog.cpp b/src/settings/dolphinsettingsdialog.cpp
index 8c20a91489161266916763a3e5b3912b3c4e2cf0..50fd41e4c6b42bbfd5a2906e1bd1011a70f6d88f 100644 (file)
--- a/src/settings/dolphinsettingsdialog.cpp
+++ b/src/settings/dolphinsettingsdialog.cpp
@@ -20,7 +20,6 @@
 
 #include "dolphinsettingsdialog.h"
 
 
 #include "dolphinsettingsdialog.h"
 

-#include <dolphinapplication.h>

 #include <dolphinmainwindow.h>
 #include "dolphin_generalsettings.h"
 #include "general/generalsettingspage.h"
 #include <dolphinmainwindow.h>
 #include "dolphin_generalsettings.h"
 #include "general/generalsettingspage.h"


@@ -30,14 +29,15 @@
 #include "viewmodes/viewsettingspage.h"
 #include "trash/trashsettingspage.h"
 
 #include "viewmodes/viewsettingspage.h"
 #include "trash/trashsettingspage.h"
 

-#include <KLocale>
-#include <KMessageBox>
-#include <KIcon>
+#include <KAuthorized>
+#include <KWindowConfig>
+#include <KLocalizedString>
+#include <QIcon>

 
 #include <QPushButton>
 #include <QDialogButtonBox>
 
 
 #include <QPushButton>
 #include <QDialogButtonBox>
 

-DolphinSettingsDialog::DolphinSettingsDialog(const KUrl& url, QWidget* parent) :
+DolphinSettingsDialog::DolphinSettingsDialog(const QUrl& url, QWidget* parent) :

     KPageDialog(parent),
     m_pages()
 
     KPageDialog(parent),
     m_pages()
 


@@ -61,61 +61,63 @@ DolphinSettingsDialog::DolphinSettingsDialog(const KUrl& url, QWidget* parent) :
     StartupSettingsPage* startupSettingsPage = new StartupSettingsPage(url, this);
     KPageWidgetItem* startupSettingsFrame = addPage(startupSettingsPage,
                                                     i18nc("@title:group", "Startup"));
     StartupSettingsPage* startupSettingsPage = new StartupSettingsPage(url, this);
     KPageWidgetItem* startupSettingsFrame = addPage(startupSettingsPage,
                                                     i18nc("@title:group", "Startup"));

-    startupSettingsFrame->setIcon(KIcon("go-home"));
+    startupSettingsFrame->setIcon(QIcon::fromTheme(QStringLiteral("go-home")));

     connect(startupSettingsPage, &StartupSettingsPage::changed, this, &DolphinSettingsDialog::enableApply);
 
     // View Modes
     ViewSettingsPage* viewSettingsPage = new ViewSettingsPage(this);
     KPageWidgetItem* viewSettingsFrame = addPage(viewSettingsPage,
                                                  i18nc("@title:group", "View Modes"));
     connect(startupSettingsPage, &StartupSettingsPage::changed, this, &DolphinSettingsDialog::enableApply);
 
     // View Modes
     ViewSettingsPage* viewSettingsPage = new ViewSettingsPage(this);
     KPageWidgetItem* viewSettingsFrame = addPage(viewSettingsPage,
                                                  i18nc("@title:group", "View Modes"));

-    viewSettingsFrame->setIcon(KIcon("view-choose"));
+    viewSettingsFrame->setIcon(QIcon::fromTheme(QStringLiteral("view-choose")));

     connect(viewSettingsPage, &ViewSettingsPage::changed, this, &DolphinSettingsDialog::enableApply);
 
     // Navigation
     NavigationSettingsPage* navigationSettingsPage = new NavigationSettingsPage(this);
     KPageWidgetItem* navigationSettingsFrame = addPage(navigationSettingsPage,
                                                        i18nc("@title:group", "Navigation"));
     connect(viewSettingsPage, &ViewSettingsPage::changed, this, &DolphinSettingsDialog::enableApply);
 
     // Navigation
     NavigationSettingsPage* navigationSettingsPage = new NavigationSettingsPage(this);
     KPageWidgetItem* navigationSettingsFrame = addPage(navigationSettingsPage,
                                                        i18nc("@title:group", "Navigation"));

-    navigationSettingsFrame->setIcon(KIcon("input-mouse"));
+    navigationSettingsFrame->setIcon(QIcon::fromTheme(QStringLiteral("edit-select")));

     connect(navigationSettingsPage, &NavigationSettingsPage::changed, this, &DolphinSettingsDialog::enableApply);
 
     // Services
     ServicesSettingsPage* servicesSettingsPage = new ServicesSettingsPage(this);
     KPageWidgetItem* servicesSettingsFrame = addPage(servicesSettingsPage,
                                                        i18nc("@title:group", "Services"));
     connect(navigationSettingsPage, &NavigationSettingsPage::changed, this, &DolphinSettingsDialog::enableApply);
 
     // Services
     ServicesSettingsPage* servicesSettingsPage = new ServicesSettingsPage(this);
     KPageWidgetItem* servicesSettingsFrame = addPage(servicesSettingsPage,
                                                        i18nc("@title:group", "Services"));

-    servicesSettingsFrame->setIcon(KIcon("services"));
+    servicesSettingsFrame->setIcon(QIcon::fromTheme(QStringLiteral("flag")));

     connect(servicesSettingsPage, &ServicesSettingsPage::changed, this, &DolphinSettingsDialog::enableApply);
 
     // Trash
     connect(servicesSettingsPage, &ServicesSettingsPage::changed, this, &DolphinSettingsDialog::enableApply);
 
     // Trash

-    TrashSettingsPage* trashSettingsPage = new TrashSettingsPage(this);
-    KPageWidgetItem* trashSettingsFrame = addPage(trashSettingsPage,
-                                                   i18nc("@title:group", "Trash"));
-    trashSettingsFrame->setIcon(KIcon("user-trash"));
-    connect(trashSettingsPage, &TrashSettingsPage::changed, this, &DolphinSettingsDialog::enableApply);
+    auto* trashSettingsPage = createTrashSettingsPage(this);
+    if (trashSettingsPage) {
+        KPageWidgetItem* trashSettingsFrame = addPage(trashSettingsPage,
+                                                     i18nc("@title:group", "Trash"));
+        trashSettingsFrame->setIcon(QIcon::fromTheme(QStringLiteral("trash-empty")));
+        connect(trashSettingsPage, &TrashSettingsPage::changed, this, &DolphinSettingsDialog::enableApply);
+    }

 
     // General
     GeneralSettingsPage* generalSettingsPage = new GeneralSettingsPage(url, this);
     KPageWidgetItem* generalSettingsFrame = addPage(generalSettingsPage,
                                                     i18nc("@title:group General settings", "General"));
 
     // General
     GeneralSettingsPage* generalSettingsPage = new GeneralSettingsPage(url, this);
     KPageWidgetItem* generalSettingsFrame = addPage(generalSettingsPage,
                                                     i18nc("@title:group General settings", "General"));

-    generalSettingsFrame->setIcon(KIcon("system-run"));
+    generalSettingsFrame->setIcon(QIcon::fromTheme(QStringLiteral("view-preview")));

     connect(generalSettingsPage, &GeneralSettingsPage::changed, this, &DolphinSettingsDialog::enableApply);
 
     connect(generalSettingsPage, &GeneralSettingsPage::changed, this, &DolphinSettingsDialog::enableApply);
 

-    const KConfigGroup dialogConfig(KSharedConfig::openConfig("dolphinrc"), "SettingsDialog");
-#pragma message("TODO: port")
-    //restoreDialogSize(dialogConfig);
-

     m_pages.append(startupSettingsPage);
     m_pages.append(viewSettingsPage);
     m_pages.append(navigationSettingsPage);
     m_pages.append(servicesSettingsPage);
     m_pages.append(startupSettingsPage);
     m_pages.append(viewSettingsPage);
     m_pages.append(navigationSettingsPage);
     m_pages.append(servicesSettingsPage);

-    m_pages.append(trashSettingsPage);
+    if (trashSettingsPage) {
+        m_pages.append(trashSettingsPage);
+    }

     m_pages.append(generalSettingsPage);
     m_pages.append(generalSettingsPage);

+
+    const KConfigGroup dialogConfig(KSharedConfig::openConfig(QStringLiteral("dolphinrc")), "SettingsDialog");
+    KWindowConfig::restoreWindowSize(windowHandle(), dialogConfig);

 }
 
 DolphinSettingsDialog::~DolphinSettingsDialog()
 {
 }
 
 DolphinSettingsDialog::~DolphinSettingsDialog()
 {

-    KConfigGroup dialogConfig(KSharedConfig::openConfig("dolphinrc"), "SettingsDialog");
-#pragma message("TODO: port")
-    //saveDialogSize(dialogConfig);
+    KConfigGroup dialogConfig(KSharedConfig::openConfig(QStringLiteral("dolphinrc")), "SettingsDialog");
+    KWindowConfig::saveWindowSize(windowHandle(), dialogConfig);

 }
 
 void DolphinSettingsDialog::enableApply()
 }
 
 void DolphinSettingsDialog::enableApply()


@@ -136,7 +138,7 @@ void DolphinSettingsDialog::applySettings()
         // Reset the modified startup settings hint. The changed startup settings
         // have been applied already due to emitting settingsChanged().
         settings->setModifiedStartupSettings(false);
         // Reset the modified startup settings hint. The changed startup settings
         // have been applied already due to emitting settingsChanged().
         settings->setModifiedStartupSettings(false);

-        settings->writeConfig();
+        settings->save();

     }
     buttonBox()->button(QDialogButtonBox::Apply)->setEnabled(false);
 }
     }
     buttonBox()->button(QDialogButtonBox::Apply)->setEnabled(false);
 }


@@ -148,3 +150,11 @@ void DolphinSettingsDialog::restoreDefaults()
     }
 }
 
     }
 }
 

+SettingsPageBase *DolphinSettingsDialog::createTrashSettingsPage(QWidget *parent)
+{
+    if (!KAuthorized::authorizeControlModule(QStringLiteral("kcmtrash.desktop"))) {
+        return nullptr;
+    }
+
+    return new TrashSettingsPage(parent);
+}