X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/333e2ae031fec6139a712f15283f0fffb23f2dc6..9760f9607d:/src/settings/dolphinsettingsdialog.cpp

diff --git a/src/settings/dolphinsettingsdialog.cpp b/src/settings/dolphinsettingsdialog.cpp
index 5314c24ed..6bddb861f 100644
--- a/src/settings/dolphinsettingsdialog.cpp
+++ b/src/settings/dolphinsettingsdialog.cpp
@@ -20,22 +20,20 @@
 
 #include "dolphinsettingsdialog.h"
 
-#include <dolphinmainwindow.h>
 #include "dolphin_generalsettings.h"
+#include "dolphinmainwindow.h"
 #include "general/generalsettingspage.h"
 #include "navigation/navigationsettingspage.h"
 #include "services/servicessettingspage.h"
 #include "startup/startupsettingspage.h"
-#include "viewmodes/viewsettingspage.h"
 #include "trash/trashsettingspage.h"
+#include "viewmodes/viewsettingspage.h"
 
 #include <KAuthorized>
-#include <KWindowConfig>
 #include <KLocalizedString>
-#include <QIcon>
+#include <KWindowConfig>
 
 #include <QPushButton>
-#include <QDialogButtonBox>
 
 DolphinSettingsDialog::DolphinSettingsDialog(const QUrl& url, QWidget* parent) :
     KPageDialog(parent),
@@ -43,7 +41,7 @@ DolphinSettingsDialog::DolphinSettingsDialog(const QUrl& url, QWidget* parent) :
 
 {
     const QSize minSize = minimumSize();
-    setMinimumSize(QSize(512, minSize.height()));
+    setMinimumSize(QSize(540, minSize.height()));
 
     setFaceType(List);
     setWindowTitle(i18nc("@title:window", "Dolphin Preferences"));
@@ -57,6 +55,13 @@ DolphinSettingsDialog::DolphinSettingsDialog(const QUrl& url, QWidget* parent) :
     connect(box->button(QDialogButtonBox::Apply), &QAbstractButton::clicked, this, &DolphinSettingsDialog::applySettings);
     connect(box->button(QDialogButtonBox::RestoreDefaults), &QAbstractButton::clicked, this, &DolphinSettingsDialog::restoreDefaults);
 
+    // General
+    GeneralSettingsPage* generalSettingsPage = new GeneralSettingsPage(url, this);
+    KPageWidgetItem* generalSettingsFrame = addPage(generalSettingsPage,
+                                                    i18nc("@title:group General settings", "General"));
+    generalSettingsFrame->setIcon(QIcon::fromTheme(QStringLiteral("view-preview")));
+    connect(generalSettingsPage, &GeneralSettingsPage::changed, this, &DolphinSettingsDialog::enableApply);
+
     // Startup
     StartupSettingsPage* startupSettingsPage = new StartupSettingsPage(url, this);
     KPageWidgetItem* startupSettingsFrame = addPage(startupSettingsPage,
@@ -94,19 +99,14 @@ DolphinSettingsDialog::DolphinSettingsDialog(const QUrl& url, QWidget* parent) :
         connect(trashSettingsPage, &TrashSettingsPage::changed, this, &DolphinSettingsDialog::enableApply);
     }
 
-    // General
-    GeneralSettingsPage* generalSettingsPage = new GeneralSettingsPage(url, this);
-    KPageWidgetItem* generalSettingsFrame = addPage(generalSettingsPage,
-                                                    i18nc("@title:group General settings", "General"));
-    generalSettingsFrame->setIcon(QIcon::fromTheme(QStringLiteral("view-preview")));
-    connect(generalSettingsPage, &GeneralSettingsPage::changed, this, &DolphinSettingsDialog::enableApply);
-
+    m_pages.append(generalSettingsPage);
     m_pages.append(startupSettingsPage);
     m_pages.append(viewSettingsPage);
     m_pages.append(navigationSettingsPage);
     m_pages.append(servicesSettingsPage);
-    m_pages.append(trashSettingsPage);
-    m_pages.append(generalSettingsPage);
+    if (trashSettingsPage) {
+        m_pages.append(trashSettingsPage);
+    }
 
     const KConfigGroup dialogConfig(KSharedConfig::openConfig(QStringLiteral("dolphinrc")), "SettingsDialog");
     KWindowConfig::restoreWindowSize(windowHandle(), dialogConfig);