Core: Hide the theme editor

It isn't ready for production yet, will hopefully be reworked for 3.4.

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

src/plugins/coreplugin/generalsettings.ui

@@ -73,6 +73,16 @@
         </item>
        </layout>
       </item>
+      <item row="1" column="0">
+       <widget class="QLabel" name="themeLabel">
+        <property name="text">
+         <string>Theme:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1">
+       <widget class="Core::Internal::ThemeSettingsWidget" name="themeWidget" native="true"/>
+      </item>
       <item row="2" column="0">
        <widget class="QLabel" name="languageLabel">
         <property name="text">
@@ -334,6 +344,12 @@
     <signal>browsingFinished()</signal>
    </slots>
   </customwidget>
+  <customwidget>
+   <class>Core::Internal::ThemeSettingsWidget</class>
+   <extends>QWidget</extends>
+   <header>themesettingswidget.h</header>
+   <container>1</container>
+  </customwidget>
  </customwidgets>
  <resources>
   <include location="core.qrc"/>

src/plugins/coreplugin/mainwindow.cpp

@@ -132,7 +132,6 @@ MainWindow::MainWindow() :
     m_rightPaneWidget(0),
     m_versionDialog(0),
     m_generalSettings(new GeneralSettings),
-    m_themeSettings(new ThemeSettings),
     m_shortcutSettings(new ShortcutSettings),
     m_toolSettings(new ToolSettings),
     m_mimeTypeSettings(new MimeTypeSettings),
@@ -256,7 +255,6 @@ MainWindow::~MainWindow()
 
     ExtensionSystem::PluginManager::removeObject(m_shortcutSettings);
     ExtensionSystem::PluginManager::removeObject(m_generalSettings);
-    ExtensionSystem::PluginManager::removeObject(m_themeSettings);
     ExtensionSystem::PluginManager::removeObject(m_toolSettings);
     ExtensionSystem::PluginManager::removeObject(m_mimeTypeSettings);
     ExtensionSystem::PluginManager::removeObject(m_systemEditor);
@@ -268,8 +266,6 @@ MainWindow::~MainWindow()
     m_shortcutSettings = 0;
     delete m_generalSettings;
     m_generalSettings = 0;
-    delete m_themeSettings;
-    m_themeSettings = 0;
     delete m_toolSettings;
     m_toolSettings = 0;
     delete m_mimeTypeSettings;
@@ -327,7 +323,6 @@ bool MainWindow::init(QString *errorMessage)
     m_progressManager->init(); // needs the status bar manager
 
     ExtensionSystem::PluginManager::addObject(m_generalSettings);
-    ExtensionSystem::PluginManager::addObject(m_themeSettings);
     ExtensionSystem::PluginManager::addObject(m_shortcutSettings);
     ExtensionSystem::PluginManager::addObject(m_toolSettings);
     ExtensionSystem::PluginManager::addObject(m_mimeTypeSettings);

src/plugins/coreplugin/mainwindow.h

@@ -72,7 +72,6 @@ namespace Internal {
 class ActionManagerPrivate;
 class FancyTabWidget;
 class GeneralSettings;
-class ThemeSettings;
 class ProgressManagerPrivate;
 class ShortcutSettings;
 class ToolSettings;
@@ -192,7 +191,6 @@ private:
     QMap<QWidget *, IContext *> m_contextWidgets;
 
     GeneralSettings *m_generalSettings;
-    ThemeSettings *m_themeSettings;
     ShortcutSettings *m_shortcutSettings;
     ToolSettings *m_toolSettings;
     MimeTypeSettings *m_mimeTypeSettings;

src/plugins/coreplugin/themesettings.ui

@@ -2,15 +2,19 @@
 <ui version="4.0">
  <class>Core::Internal::ThemeSettings</class>
  <widget class="QWidget" name="Core::Internal::ThemeSettings">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>527</width>
-    <height>359</height>
-   </rect>
-  </property>
   <layout class="QVBoxLayout" name="verticalLayout">
+   <property name="leftMargin">
+    <number>0</number>
+   </property>
+   <property name="topMargin">
+    <number>0</number>
+   </property>
+   <property name="rightMargin">
+    <number>0</number>
+   </property>
+   <property name="bottomMargin">
+    <number>0</number>
+   </property>
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout">
      <item>
@@ -66,8 +70,6 @@
    <container>1</container>
   </customwidget>
  </customwidgets>
- <resources>
-  <include location="core.qrc"/>
- </resources>
+ <resources/>
  <connections/>
 </ui>

src/plugins/coreplugin/themesettingswidget.cpp

@@ -169,6 +169,7 @@ ThemeSettingsPrivate::ThemeSettingsPrivate(QWidget *widget)
 {
     m_currentTheme = ThemeEntry(creatorTheme()->fileName(), true);
     m_ui->setupUi(widget);
+    m_ui->editor->hide(); // TODO: Restore after improving the editor
     m_ui->themeComboBox->setModel(m_themeListModel);
 }