From 0e2c7b43c2679144da07169c79ad5ba7843a29d7 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date: Tue, 30 Jun 2009 09:04:48 +0200
Subject: [PATCH] Polished the project manager, wizard titles, compiler
 warnings.

---
 .../customwidgetpluginwizardpage.ui           | 26 ++++++++++++++
 .../customwidgetwidgetswizardpage.ui          | 34 ++++++++++++++++---
 .../qt4projectconfigwidget.cpp                |  4 +++
 3 files changed, 60 insertions(+), 4 deletions(-)

diff --git a/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetpluginwizardpage.ui b/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetpluginwizardpage.ui
index ce9d886b1f8..4cbdf488a6a 100644
--- a/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetpluginwizardpage.ui
+++ b/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetpluginwizardpage.ui
@@ -13,7 +13,33 @@
   <property name="windowTitle">
    <string>WizardPage</string>
   </property>
+  <property name="title">
+   <string>Plugin and Collection Class Information</string>
+  </property>
   <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <widget class="QLabel" name="subTitleLabel">
+     <property name="text">
+      <string>Specify the properties of the plugin library and the collection class.</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <spacer name="subTitleSpacer">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeType">
+      <enum>QSizePolicy::Fixed</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>0</width>
+       <height>10</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout">
      <item>
diff --git a/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwidgetswizardpage.ui b/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwidgetswizardpage.ui
index f96c6303c7d..adf2b942f1c 100644
--- a/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwidgetswizardpage.ui
+++ b/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwidgetswizardpage.ui
@@ -7,14 +7,17 @@
     <x>0</x>
     <y>0</y>
     <width>668</width>
-    <height>430</height>
+    <height>454</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Custom Qt Widget Wizard</string>
   </property>
+  <property name="title">
+   <string>Custom Widget List</string>
+  </property>
   <layout class="QGridLayout" name="gridLayout">
-   <item row="0" column="0">
+   <item row="2" column="0">
     <widget class="QLabel" name="label">
      <property name="text">
       <string>Widget &amp;Classes:</string>
@@ -24,7 +27,7 @@
      </property>
     </widget>
    </item>
-   <item row="0" column="1" rowspan="2">
+   <item row="2" column="1" rowspan="2">
     <widget class="QWidget" name="tabStackWidget" native="true">
      <property name="minimumSize">
       <size>
@@ -34,7 +37,7 @@
      </property>
     </widget>
    </item>
-   <item row="1" column="0">
+   <item row="3" column="0">
     <widget class="Qt4ProjectManager::Internal::ClassList" name="classList">
      <property name="minimumSize">
       <size>
@@ -44,6 +47,29 @@
      </property>
     </widget>
    </item>
+   <item row="0" column="0" colspan="2">
+    <widget class="QLabel" name="subTitleLabel">
+     <property name="text">
+      <string>Specify the list of custom widgets and their properties.</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="0">
+    <spacer name="titleSpacer">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeType">
+      <enum>QSizePolicy::Fixed</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>0</width>
+       <height>10</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
   </layout>
  </widget>
  <customwidgets>
diff --git a/src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp b/src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp
index f3dd749b69c..f719d6e0144 100644
--- a/src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp
+++ b/src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp
@@ -308,6 +308,10 @@ void Qt4ProjectConfigWidget::updateToolChainCombo()
             m_ui->toolChainComboBox->addItem(tr("gcce"), qVariantFromValue(ProjectExplorer::ToolChain::GCCE));
             break;
 #endif
+        case ProjectExplorer::ToolChain::OTHER:
+        case ProjectExplorer::ToolChain::INVALID:
+        case ProjectExplorer::ToolChain::UNKNOWN:
+            break;
         }
     }
     m_ui->toolChainComboBox->setEnabled(toolchains.size() > 1);
-- 
GitLab