X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/5252c12db4929886dbe502013e0a1fee6500f568..f048b7fd6537e6427128e5d589233bfa8040e61b:/src/dolphinsettingsdialog.cpp

diff --git a/src/dolphinsettingsdialog.cpp b/src/dolphinsettingsdialog.cpp
index d1bb2765d..1bbbbde55 100644
--- a/src/dolphinsettingsdialog.cpp
+++ b/src/dolphinsettingsdialog.cpp
@@ -15,65 +15,77 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
  ***************************************************************************/
 
 #include "dolphinsettingsdialog.h"
-#include <klocale.h>
-#include <kiconloader.h>
+
+#include "dolphinapplication.h"
+#include "dolphinmainwindow.h"
 #include "generalsettingspage.h"
 #include "viewsettingspage.h"
-#include "bookmarkssettingspage.h"
-#include "dolphin.h"
-//Added by qt3to4:
-#include <Q3Frame>
 
-DolphinSettingsDialog::DolphinSettingsDialog() :
-    KDialogBase(IconList, i18n("Dolphin Preferences"),
-                Ok|Apply|Cancel, Ok)
+#include <klocale.h>
+#include <kmessagebox.h>
+#include <kicon.h>
+
+DolphinSettingsDialog::DolphinSettingsDialog(DolphinMainWindow* mainWindow) :
+    KPageDialog(mainWindow)
 {
-    KIconLoader iconLoader;
-    Q3Frame* generalSettingsFrame = addPage(i18n("General"), 0,
-                                                iconLoader.loadIcon("exec",
-                                                                    KIcon::NoGroup,
-                                                                    KIcon::SizeMedium));
-    m_generalSettingsPage = new GeneralSettingsPage(generalSettingsFrame);
+    const QSize minSize = minimumSize();
+    setMinimumSize(QSize(512, minSize.height()));
+
+    setFaceType(List);
+    setCaption(i18nc("@title:window", "Dolphin Preferences"));
+    setButtons(Ok | Apply | Cancel | Default);
+    setDefaultButton(Ok);
+
+    m_generalSettingsPage = new GeneralSettingsPage(mainWindow, this);
+    KPageWidgetItem* generalSettingsFrame = addPage(m_generalSettingsPage,
+                                                    i18nc("@title:group", "General"));
+    generalSettingsFrame->setIcon(KIcon("system-run"));
 
-    Q3Frame* viewSettingsFrame = addPage(i18n("View Modes"), 0,
-                                        iconLoader.loadIcon("view_choose",
-                                                            KIcon::NoGroup,
-                                                            KIcon::SizeMedium));
-    m_viewSettingsPage = new ViewSettingsPage(viewSettingsFrame);
+    m_viewSettingsPage = new ViewSettingsPage(mainWindow, this);
+    KPageWidgetItem* viewSettingsFrame = addPage(m_viewSettingsPage,
+                                                 i18nc("@title:group", "View Modes"));
+    viewSettingsFrame->setIcon(KIcon("view-choose"));
 
-    Q3Frame* bookmarksSettingsFrame = addPage(i18n("Bookmarks"), 0,
-                                             iconLoader.loadIcon("bookmark",
-                                                                 KIcon::NoGroup,
-                                                                 KIcon::SizeMedium));
-    m_bookmarksSettingsPage = new BookmarksSettingsPage(bookmarksSettingsFrame);
+    const KConfigGroup dialogConfig(KSharedConfig::openConfig("dolphinrc"), "SettingsDialog");
+    restoreDialogSize(dialogConfig);
 }
 
 DolphinSettingsDialog::~DolphinSettingsDialog()
 {
+    KConfigGroup dialogConfig(KSharedConfig::openConfig("dolphinrc"), "SettingsDialog");
+    saveDialogSize(dialogConfig);
 }
 
-void DolphinSettingsDialog::slotOk()
+void DolphinSettingsDialog::slotButtonClicked(int button)
 {
-    applySettings();
-    KDialogBase::slotOk();
-}
+    if ((button == Ok) || (button == Apply)) {
+        applySettings();
+    } else if (button == Default) {
+        const QString text(i18nc("@info", "All settings will be reset to default values. Do you want to continue?"));
+        if (KMessageBox::questionYesNo(this, text) == KMessageBox::Yes) {
+            restoreDefaults();
+        }
+    }
 
-void DolphinSettingsDialog::slotApply()
-{
-    applySettings();
-    KDialogBase::slotApply();
+    KPageDialog::slotButtonClicked(button);
 }
 
 void DolphinSettingsDialog::applySettings()
 {
     m_generalSettingsPage->applySettings();
     m_viewSettingsPage->applySettings();
-    m_bookmarksSettingsPage->applySettings();
-    Dolphin::mainWin().refreshViews();
+    DolphinApplication::app()->refreshMainWindows();
+}
+
+void DolphinSettingsDialog::restoreDefaults()
+{
+    m_generalSettingsPage->restoreDefaults();
+    m_viewSettingsPage->restoreDefaults();
+    DolphinApplication::app()->refreshMainWindows();
 }
 
 #include "dolphinsettingsdialog.moc"