Publish to Ovi displays problems with build setup

Such as: no valid toolchain or no valid build
configuration

Reviewed-by: dt

diff --git a/src/plugins/qt4projectmanager/qt-s60/s60publishingbuildsettingspageovi.cpp b/src/plugins/qt4projectmanager/qt-s60/s60publishingbuildsettingspageovi.cpp
index e45daf1..05a0db7 100644 (file)
--- a/src/plugins/qt4projectmanager/qt-s60/s60publishingbuildsettingspageovi.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/s60publishingbuildsettingspageovi.cpp
@@ -83,8 +83,14 @@ S60PublishingBuildSettingsPageOvi::S60PublishingBuildSettingsPageOvi(S60Publishe
     m_ui->chooseBuildConfigDropDown->setSizeAdjustPolicy(QComboBox::AdjustToContentsOnFirstShow);
     int focusedIndex = m_ui->chooseBuildConfigDropDown->findData(QVariant::fromValue(m_bc));
     m_ui->chooseBuildConfigDropDown->setCurrentIndex(focusedIndex);
+    m_ui->chooseBuildConfigDropDown->setEnabled(!list.isEmpty());
     m_publisher->setBuildConfiguration(static_cast<Qt4BuildConfiguration *>(m_bc));
+    m_ui->buildConfigInfoLabel->setVisible(list.isEmpty());
 
+    m_ui->buildConfigInfoLabel->setToolTip(tr("No valid build configuration has been detected.<br>"
+                                         "Please define a correct  build configuration in \"Options->Qt4\""));
+    m_ui->toolchainInfoIconLabel->setToolTip(tr("No valid tool chain has been detected.<br>"
+                                         "Please define a correct tool chain in \"Options->Tool Chains\""));
     populateToolchainList(m_bc);
 
     //change the build configuration if the user changes it
@@ -118,8 +124,12 @@ void S60PublishingBuildSettingsPageOvi::populateToolchainList(ProjectExplorer::B
         }
         ++index;
     }
+
     connect(m_ui->chooseToolchainDropDown, SIGNAL(currentIndexChanged(int)), this, SLOT(toolchainChosen()));
+
+    m_ui->toolchainInfoIconLabel->setVisible(!toolchains.size());
     m_ui->chooseToolchainDropDown->setEnabled(toolchains.size() > 1);
+
     if (toolchainChanged)
         toolchainChosen();
     else

diff --git a/src/plugins/qt4projectmanager/qt-s60/s60publishingbuildsettingspageovi.ui b/src/plugins/qt4projectmanager/qt-s60/s60publishingbuildsettingspageovi.ui
index 57adf12..b227a8a 100644 (file)
--- a/src/plugins/qt4projectmanager/qt-s60/s60publishingbuildsettingspageovi.ui
+++ b/src/plugins/qt4projectmanager/qt-s60/s60publishingbuildsettingspageovi.ui
@@ -14,6 +14,36 @@
    <string>Form</string>
   </property>
   <layout class="QGridLayout" name="gridLayout">
+   <item row="2" column="1">
+    <spacer name="verticalSpacer_2">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>40</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="0" column="2">
+    <widget class="QLabel" name="buildConfigInfoLabel">
+     <property name="text">
+      <string/>
+     </property>
+     <property name="pixmap">
+      <pixmap resource="../../projectexplorer/projectexplorer.qrc">:/projectexplorer/images/compile_error.png</pixmap>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="1">
+    <widget class="QComboBox" name="chooseToolchainDropDown">
+     <property name="enabled">
+      <bool>false</bool>
+     </property>
+    </widget>
+   </item>
    <item row="0" column="0">
     <widget class="QLabel" name="chooseBuildConfigLabel">
      <property name="text">
@@ -21,10 +51,7 @@
      </property>
     </widget>
    </item>
-   <item row="0" column="1">
-    <widget class="QComboBox" name="chooseBuildConfigDropDown"/>
-   </item>
-   <item row="0" column="2">
+   <item row="0" column="3">
     <spacer name="horizontalSpacer">
      <property name="orientation">
       <enum>Qt::Horizontal</enum>
@@ -37,27 +64,13 @@
      </property>
     </spacer>
    </item>
-   <item row="3" column="0" colspan="3">
-    <widget class="QLabel" name="label">
-     <property name="text">
-      <string>Only Qt versions above 4.6.3 are made available in this wizard.
-Previous Qt versions have limitations in building suitable SIS files.</string>
+   <item row="0" column="1">
+    <widget class="QComboBox" name="chooseBuildConfigDropDown">
+     <property name="enabled">
+      <bool>false</bool>
      </property>
     </widget>
    </item>
-   <item row="2" column="1">
-    <spacer name="verticalSpacer_2">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>40</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
    <item row="1" column="0">
     <widget class="QLabel" name="chooseToolchainLabel">
      <property name="text">
@@ -65,10 +78,25 @@ Previous Qt versions have limitations in building suitable SIS files.</string>
      </property>
     </widget>
    </item>
-   <item row="1" column="1">
-    <widget class="QComboBox" name="chooseToolchainDropDown"/>
-   </item>
    <item row="1" column="2">
+    <widget class="QLabel" name="toolchainInfoIconLabel">
+     <property name="text">
+      <string/>
+     </property>
+     <property name="pixmap">
+      <pixmap resource="../../projectexplorer/projectexplorer.qrc">:/projectexplorer/images/compile_error.png</pixmap>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="0" colspan="4">
+    <widget class="QLabel" name="label">
+     <property name="text">
+      <string>Only Qt versions above 4.6.3 are made available in this wizard.
+Previous Qt versions have limitations in building suitable SIS files.</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="3">
     <spacer name="horizontalSpacer_2">
      <property name="orientation">
       <enum>Qt::Horizontal</enum>
@@ -83,6 +111,8 @@ Previous Qt versions have limitations in building suitable SIS files.</string>
    </item>
   </layout>
  </widget>
- <resources/>
+ <resources>
+  <include location="../../projectexplorer/projectexplorer.qrc"/>
+ </resources>
  <connections/>
 </ui>