Do a custom error handling in for the 'Create New...' submenu. Thanks to David for...

[dolphin.git] / src / dolphinsettingsdialog.cpp

diff --git a/src/dolphinsettingsdialog.cpp b/src/dolphinsettingsdialog.cpp
index d1bb2765d399950be53bb5901c1c7f00d4c69b5d..cf66af3b267e800781bad13c6a85e756ee90ea6a 100644 (file)
--- a/src/dolphinsettingsdialog.cpp
+++ b/src/dolphinsettingsdialog.cpp
@@ -15,57 +15,52 @@
  *   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 <kicon.h>
 #include "generalsettingspage.h"
 #include "viewsettingspage.h"
 #include "bookmarkssettingspage.h"
-#include "dolphin.h"
+#include "dolphinapplication.h"
+#include "dolphinmainwindow.h"
 //Added by qt3to4:
-#include <Q3Frame>
+#include <QFrame>
 
-DolphinSettingsDialog::DolphinSettingsDialog() :
-    KDialogBase(IconList, i18n("Dolphin Preferences"),
-                Ok|Apply|Cancel, Ok)
+DolphinSettingsDialog::DolphinSettingsDialog(DolphinMainWindow* mainWindow) :
+    KPageDialog(),
+    m_mainWindow(mainWindow)
 {
-    KIconLoader iconLoader;
-    Q3Frame* generalSettingsFrame = addPage(i18n("General"), 0,
-                                                iconLoader.loadIcon("exec",
-                                                                    KIcon::NoGroup,
-                                                                    KIcon::SizeMedium));
-    m_generalSettingsPage = new GeneralSettingsPage(generalSettingsFrame);
+    setFaceType( List);
+    setCaption(i18n("Dolphin Preferences"));
+    setButtons(Ok|Apply|Cancel);
+    setDefaultButton(Ok);
 
-    Q3Frame* viewSettingsFrame = addPage(i18n("View Modes"), 0,
-                                        iconLoader.loadIcon("view_choose",
-                                                            KIcon::NoGroup,
-                                                            KIcon::SizeMedium));
-    m_viewSettingsPage = new ViewSettingsPage(viewSettingsFrame);
+    m_generalSettingsPage = new GeneralSettingsPage(mainWindow, this);
+    KPageWidgetItem* generalSettingsFrame = addPage(m_generalSettingsPage, i18n("General"));
+    generalSettingsFrame->setIcon(KIcon("exec"));
 
-    Q3Frame* bookmarksSettingsFrame = addPage(i18n("Bookmarks"), 0,
-                                             iconLoader.loadIcon("bookmark",
-                                                                 KIcon::NoGroup,
-                                                                 KIcon::SizeMedium));
-    m_bookmarksSettingsPage = new BookmarksSettingsPage(bookmarksSettingsFrame);
-}
+    m_viewSettingsPage = new ViewSettingsPage(mainWindow, this);
+    KPageWidgetItem* viewSettingsFrame = addPage(m_viewSettingsPage, i18n("View Modes"));
+    viewSettingsFrame->setIcon(KIcon("view_choose"));
 
-DolphinSettingsDialog::~DolphinSettingsDialog()
-{
+    m_bookmarksSettingsPage = new BookmarksSettingsPage(mainWindow, this);
+    KPageWidgetItem* bookmarksSettingsFrame = addPage(m_bookmarksSettingsPage, i18n("Bookmarks"));
+    bookmarksSettingsFrame->setIcon(KIcon("bookmark"));
 }
 
-void DolphinSettingsDialog::slotOk()
+DolphinSettingsDialog::~DolphinSettingsDialog()
 {
-    applySettings();
-    KDialogBase::slotOk();
 }
 
-void DolphinSettingsDialog::slotApply()
+void DolphinSettingsDialog::slotButtonClicked(int button)
 {
-    applySettings();
-    KDialogBase::slotApply();
+    if (button==Ok || button==Apply) {
+        applySettings();
+    }
+    KPageDialog::slotButtonClicked(button);
 }
 
 void DolphinSettingsDialog::applySettings()
@@ -73,7 +68,7 @@ void DolphinSettingsDialog::applySettings()
     m_generalSettingsPage->applySettings();
     m_viewSettingsPage->applySettings();
     m_bookmarksSettingsPage->applySettings();
-    Dolphin::mainWin().refreshViews();
+    DolphinApplication::app()->refreshMainWindows();
 }
 
 #include "dolphinsettingsdialog.moc"