Core: Separate theme settings widget from options page

Change-Id: I6537e592f87969af5c2e53606a704fabec62fedc
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>

src/plugins/coreplugin/coreplugin.pro

@@ -17,6 +17,7 @@ SOURCES += corejsextensions.cpp \
     fancytabwidget.cpp \
     generalsettings.cpp \
     themesettings.cpp \
+    themesettingswidget.cpp \
     id.cpp \
     icontext.cpp \
     jsexpander.cpp \
@@ -121,6 +122,7 @@ HEADERS += corejsextensions.h \
     fancytabwidget.h \
     generalsettings.h \
     themesettings.h \
+    themesettingswidget.h \
     id.h \
     jsexpander.h \
     messagemanager.h \

src/plugins/coreplugin/coreplugin.qbs

@@ -98,9 +98,8 @@ QtcPlugin {
             "styleanimator.cpp", "styleanimator.h",
             "tabpositionindicator.cpp", "tabpositionindicator.h",
             "textdocument.cpp", "textdocument.h",
-            "themesettings.cpp",
-            "themesettings.h",
-            "themesettings.ui",
+            "themesettings.cpp", "themesettings.h", "themesettings.ui",
+            "themesettingswidget.cpp", "themesettingswidget.h",
             "toolsettings.cpp", "toolsettings.h",
             "variablechooser.cpp", "variablechooser.h",
             "vcsmanager.cpp", "vcsmanager.h",

src/plugins/coreplugin/themesettings.h

@@ -36,7 +36,7 @@
 namespace Core {
 namespace Internal {
 
-class ThemeSettingsPrivate;
+class ThemeSettingsWidget;
 
 class ThemeSettings : public IOptionsPage
 {
@@ -50,20 +50,7 @@ public:
     void apply();
     void finish();
 
-    static QString defaultThemeFileName(const QString &fileName = QString());
-
-private slots:
-    void themeSelected(int index);
-    void copyTheme();
-    void renameTheme();
-    void copyThemeByName(const QString &);
-    void confirmDeleteTheme();
-    void deleteTheme();
-    void maybeSaveTheme();
-
-private:
-    void refreshThemeList();
-    ThemeSettingsPrivate *d;
+    ThemeSettingsWidget *m_widget;
 };
 
 } // namespace Internal

src/plugins/coreplugin/themesettingswidget.h

+/****************************************************************************
+**
+** Copyright (C) 2014 Thorben Kroeger <thorbenkroeger@gmail.com>.
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of Qt Creator.
+**
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://www.qt.io/licensing.  For further information
+** use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 or version 3 as published by the Free
+** Software Foundation and appearing in the file LICENSE.LGPLv21 and
+** LICENSE.LGPLv3 included in the packaging of this file.  Please review the
+** following information to ensure the GNU Lesser General Public License
+** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights.  These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+****************************************************************************/
+
+#ifndef THEMESETTINGSWIDGET_H
+#define THEMESETTINGSWIDGET_H
+
+#include <QWidget>
+
+namespace Core {
+namespace Internal {
+
+class ThemeSettingsPrivate;
+
+class ThemeSettingsWidget : public QWidget
+{
+    Q_OBJECT
+
+public:
+    ThemeSettingsWidget(QWidget *parent = 0);
+    ~ThemeSettingsWidget();
+
+    static QString defaultThemeFileName(const QString &fileName = QString());
+
+    void apply();
+
+private slots:
+    void themeSelected(int index);
+    void copyTheme();
+    void renameTheme();
+    void copyThemeByName(const QString &);
+    void confirmDeleteTheme();
+    void deleteTheme();
+    void maybeSaveTheme();
+
+private:
+    void refreshThemeList();
+    ThemeSettingsPrivate *d;
+};
+
+} // namespace Internal
+} // namespace Core
+
+#endif // THEMESETTINGSWIDGET_H