show column mode in viewport context menu (thanks to Thomas Georgiou for the patch)

[dolphin.git] / src / dolphinsettingsdialog.cpp

diff --git a/src/dolphinsettingsdialog.cpp b/src/dolphinsettingsdialog.cpp
index 55472caafbab3c627b7b40a450bffb3ad01f0a5c..909fd6f28a9184f71239615bf63543d3d6e7fed8 100644 (file)
--- a/src/dolphinsettingsdialog.cpp
+++ b/src/dolphinsettingsdialog.cpp
@@ -23,19 +23,21 @@
 #include <kicon.h>
 #include "generalsettingspage.h"
 #include "viewsettingspage.h"
-#include "bookmarkssettingspage.h"
 #include "dolphinapplication.h"
 #include "dolphinmainwindow.h"
 //Added by qt3to4:
 #include <QFrame>
 
 DolphinSettingsDialog::DolphinSettingsDialog(DolphinMainWindow* mainWindow) :
-    KPageDialog(),
-    m_mainWindow(mainWindow)
+        KPageDialog(),
+        m_mainWindow(mainWindow)
 {
-    setFaceType( List);
+    const QSize minSize = minimumSize();
+    setMinimumSize(QSize(512, minSize.height()));
+
+    setFaceType(List);
     setCaption(i18n("Dolphin Preferences"));
-    setButtons(Ok|Apply|Cancel);
+    setButtons(Ok | Apply | Cancel);
     setDefaultButton(Ok);
 
     m_generalSettingsPage = new GeneralSettingsPage(mainWindow, this);
@@ -45,19 +47,14 @@ DolphinSettingsDialog::DolphinSettingsDialog(DolphinMainWindow* mainWindow) :
     m_viewSettingsPage = new ViewSettingsPage(mainWindow, this);
     KPageWidgetItem* viewSettingsFrame = addPage(m_viewSettingsPage, i18n("View Modes"));
     viewSettingsFrame->setIcon(KIcon("view-choose"));
-
-    m_bookmarksSettingsPage = new BookmarksSettingsPage(mainWindow, this);
-    KPageWidgetItem* bookmarksSettingsFrame = addPage(m_bookmarksSettingsPage, i18n("Bookmarks"));
-    bookmarksSettingsFrame->setIcon(KIcon("bookmark"));
 }
 
 DolphinSettingsDialog::~DolphinSettingsDialog()
-{
-}
+{}
 
 void DolphinSettingsDialog::slotButtonClicked(int button)
 {
-    if (button==Ok || button==Apply) {
+    if (button == Ok || button == Apply) {
         applySettings();
     }
     KPageDialog::slotButtonClicked(button);
@@ -67,7 +64,6 @@ void DolphinSettingsDialog::applySettings()
 {
     m_generalSettingsPage->applySettings();
     m_viewSettingsPage->applySettings();
-    m_bookmarksSettingsPage->applySettings();
     DolphinApplication::app()->refreshMainWindows();
 }