From 4cb1b12751e486cea156c94c826c693fcf3d2f47 Mon Sep 17 00:00:00 2001
From: trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>
Date: Tue, 12 Jul 2011 17:45:06 +0000
Subject: added configuration dialog

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@2270 90c681e8-e032-0410-971d-27865f9a5e38
---
 src/plugins/Ui/skinned/mainwindow.cpp | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'src/plugins/Ui/skinned/mainwindow.cpp')

diff --git a/src/plugins/Ui/skinned/mainwindow.cpp b/src/plugins/Ui/skinned/mainwindow.cpp
index d30c874e9..667270367 100644
--- a/src/plugins/Ui/skinned/mainwindow.cpp
+++ b/src/plugins/Ui/skinned/mainwindow.cpp
@@ -35,10 +35,12 @@
 #include <qmmpui/playlistmodel.h>
 #include <qmmpui/playlistmanager.h>
 #include <qmmpui/mediaplayer.h>
+#include <qmmpui/configdialog.h>
+#include "hotkeyeditor.h"
+#include "skinnedsettings.h"
 #include "mainwindow.h"
 #include "skin.h"
 #include "playlist.h"
-#include "configdialog.h"
 #include "dock.h"
 #include "eqwidget.h"
 #include "mainvisual.h"
@@ -312,9 +314,13 @@ void MainWindow::writeSettings()
 void MainWindow::showSettings()
 {
     ConfigDialog *confDialog = new ConfigDialog(this);
+    SkinnedSettings *skinnedSettings = new SkinnedSettings(this);
+    confDialog->addPage(tr("Appearance"), skinnedSettings, QIcon(":/interface.png"));
+    confDialog->addPage(tr("Shortcuts"), new HotkeyEditor(this), QIcon(":/shortcuts.png"));
     confDialog->exec();
-    updateSettings();
+    skinnedSettings->writeSettings();
     confDialog->deleteLater();
+    updateSettings();
     ActionManager::instance()->saveActions();
 }
 
-- 
cgit v1.2.3-13-gbd6f