From f86ccf296db3d358d26620454546435f67094458 Mon Sep 17 00:00:00 2001
From: Pawel Polanski <pawel.3.polanski@nokia.com>
Date: Mon, 9 May 2011 17:07:06 +0200
Subject: [PATCH] Symbian: Application display name can be changed

When publishing to Ovi Store the application's
name can be changed in the Publishing Wizard

Task-number: QTCREATORBUG-4816
---
 .../qt-s60/s60publisherovi.cpp                |  36 +-
 .../qt-s60/s60publisherovi.h                  |   5 +
 .../s60publishingsissettingspageovi.cpp       |  28 +
 .../qt-s60/s60publishingsissettingspageovi.h  |   2 +
 .../qt-s60/s60publishingsissettingspageovi.ui | 655 ++++++++++--------
 5 files changed, 424 insertions(+), 302 deletions(-)

diff --git a/src/plugins/qt4projectmanager/qt-s60/s60publisherovi.cpp b/src/plugins/qt4projectmanager/qt-s60/s60publisherovi.cpp
index 0b0d7dba281..ec77ff32f01 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60publisherovi.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/s60publisherovi.cpp
@@ -103,6 +103,12 @@ void S60PublisherOvi::setBuildConfiguration(Qt4BuildConfiguration *qt4bc)
     m_qt4bc = qt4bc;
 }
 
+
+void S60PublisherOvi::setDisplayName(const QString &displayName)
+{
+    m_displayName = displayName;
+}
+
 void S60PublisherOvi::setVendorName(const QString &vendorName)
 {
     m_vendorName = vendorName;
@@ -159,7 +165,6 @@ void S60PublisherOvi::completeCreation()
     m_createSisProc->setWorkingDirectory(m_qt4bc->buildDirectory());
 
     // set up access to vendor names
-
     QStringList deploymentLevelVars = m_reader->values("DEPLOYMENT");
     QStringList vendorInfoVars;
     QStringList valueLevelVars;
@@ -178,6 +183,24 @@ void S60PublisherOvi::completeCreation()
     }
 }
 
+QString S60PublisherOvi::nameFromTarget() const
+{
+    QString target = m_reader->value(QLatin1String("TARGET"));
+    if (target.isEmpty())
+        target = QFileInfo(m_qt4project->rootProjectNode()->path()).baseName();
+    return target;
+}
+
+QString S60PublisherOvi::displayName() const
+{
+    const QStringList displayNameList = m_reader->values(QLatin1String("DEPLOYMENT.display_name"));
+
+    if (displayNameList.isEmpty())
+        return nameFromTarget();
+
+    return displayNameList.join(QLatin1String(" "));
+}
+
 QString S60PublisherOvi::globalVendorName() const
 {
     QStringList vendorinfos = m_reader->values(m_vendorInfoVariable);
@@ -297,11 +320,14 @@ void S60PublisherOvi::updateProFile(const QString &var, const QString &values)
 void S60PublisherOvi::updateProFile()
 {
     if (m_vendorInfoVariable.isEmpty()) {
-        m_vendorInfoVariable = "vendorinfo";
-        updateProFile("my_deployment.pkg_prerules", m_vendorInfoVariable);
-        updateProFile("DEPLOYMENT", "my_deployment");
+        m_vendorInfoVariable = QLatin1String("vendorinfo");
+        updateProFile(QLatin1String("my_deployment.pkg_prerules"), m_vendorInfoVariable);
+        updateProFile(QLatin1String("DEPLOYMENT"), QLatin1String("my_deployment"));
     }
 
+    if (!m_displayName.isEmpty() && m_displayName != nameFromTarget())
+        updateProFile(QLatin1String("DEPLOYMENT.display_name"), m_displayName);
+
     updateProFile(m_vendorInfoVariable, "\"%{" + m_localVendorNames + "}\" \":\\\"" + m_vendorName + "\\\"\"" );
     updateProFile("TARGET.UID3", m_appUid);
 }
@@ -366,8 +392,6 @@ void S60PublisherOvi::endBuild(int result)
 
     QString resultFile = m_qt4bc->buildDirectory() + "/" + m_qt4project->displayName() + fileNamePostFix;
 
-
-
     QFileInfo fi(resultFile);
     if (result == QProcess::NormalExit && fi.exists()) {
         emit progressReport(tr("Created %1\n").arg(QDir::toNativeSeparators(resultFile)), m_normalColor);
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60publisherovi.h b/src/plugins/qt4projectmanager/qt-s60/s60publisherovi.h
index 3f470fa70b2..9647f879562 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60publisherovi.h
+++ b/src/plugins/qt4projectmanager/qt-s60/s60publisherovi.h
@@ -105,10 +105,12 @@ public:
     void cleanUp();
     void completeCreation();
 
+    QString displayName() const;
     QString globalVendorName() const;
     QString localisedVendorNames() const;
     bool isVendorNameValid(const QString &vendorName) const;
 
+    QString nameFromTarget() const;
     QString qtVersion() const;
 
     QString uid3() const;
@@ -128,10 +130,12 @@ public:
 
     bool hasSucceeded();
 
+    void setDisplayName(const QString &displayName);
     void setVendorName(const QString &vendorName);
     void setLocalVendorNames(const QString &localVendorNames);
     void setAppUid(const QString &appuid);
 
+
 signals:
     void progressReport(const QString& status, QColor c);
     void succeeded();
@@ -165,6 +169,7 @@ private:
     QString m_vendorName;
     QString m_localVendorNames;
     QString m_appUid;
+    QString m_displayName;
 
     bool m_finishedAndSuccessful;
 };
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60publishingsissettingspageovi.cpp b/src/plugins/qt4projectmanager/qt-s60/s60publishingsissettingspageovi.cpp
index b0305ae88c0..18aedc0b7bb 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60publishingsissettingspageovi.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/s60publishingsissettingspageovi.cpp
@@ -76,6 +76,11 @@ void S60PublishingSisSettingsPageOvi::initializePage()
 
     showWarningsForUnenforcableChecks();
 
+    //Check Display Name
+    ui->displayNameLineEdit->setText(m_publisher->displayName());
+    displayNameChanged();
+    connect(ui->displayNameLineEdit,SIGNAL(textChanged(QString)),SLOT(displayNameChanged()));
+
     //Check Global Vendor Name
     ui->globalVendorNameLineEdit->setText(m_publisher->globalVendorName());
     globalVendorNameChanged();
@@ -131,6 +136,29 @@ void S60PublishingSisSettingsPageOvi::reflectSettingState(bool settingState, QLa
     wizard()->setTitleFormat(wizard()->titleFormat());
 }
 
+void S60PublishingSisSettingsPageOvi::displayNameChanged()
+{
+    reflectSettingState(!ui->displayNameLineEdit->text().isEmpty(),
+                        ui->displayNameOkLabel,
+                        ui->displayNameErrorLabel,
+                        ui->displayNameErrorReasonLabel,
+                        tr("This should be application's display name. <br>"
+                           "It can't' be empty.<br>"));
+
+    const int visibleCharacters = 12;
+    if (ui->displayNameLineEdit->text().length() > visibleCharacters) {
+        ui->displayNameWarningLabel->show();
+        ui->displayNameWarningReasonLabel->setText(tr("The display name is quite long.<br>"
+                                                   "It might not be fully visible in the phone's menu.<br>"));
+        ui->displayNameWarningReasonLabel->show();
+    } else {
+        ui->displayNameWarningLabel->hide();
+        ui->displayNameWarningReasonLabel->hide();
+    }
+
+    m_publisher->setDisplayName(ui->displayNameLineEdit->text());
+}
+
 void S60PublishingSisSettingsPageOvi::globalVendorNameChanged()
 {
     reflectSettingState(m_publisher->isVendorNameValid(ui->globalVendorNameLineEdit->text()),
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60publishingsissettingspageovi.h b/src/plugins/qt4projectmanager/qt-s60/s60publishingsissettingspageovi.h
index a18c9f58b94..f469b575841 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60publishingsissettingspageovi.h
+++ b/src/plugins/qt4projectmanager/qt-s60/s60publishingsissettingspageovi.h
@@ -59,12 +59,14 @@ public:
     virtual void initializePage();
     virtual void cleanupPage();
 
+
 private slots:
     void globalVendorNameChanged();
     void localisedVendorNamesChanged();
     void qtVersionChanged();
     void uid3Changed();
     void capabilitiesChanged();
+    void displayNameChanged();
 
 private:
     void reflectSettingState(bool settingState, QLabel *okLabel, QLabel *errorLabel, QLabel *errorReasonLabel, const QString &errorReason);
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60publishingsissettingspageovi.ui b/src/plugins/qt4projectmanager/qt-s60/s60publishingsissettingspageovi.ui
index 3a3d00fb240..8db4b0ab0cc 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60publishingsissettingspageovi.ui
+++ b/src/plugins/qt4projectmanager/qt-s60/s60publishingsissettingspageovi.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>301</width>
-    <height>346</height>
+    <width>453</width>
+    <height>630</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -23,31 +23,324 @@
    <property name="sizeConstraint">
     <enum>QLayout::SetMinAndMaxSize</enum>
    </property>
-   <item row="0" column="0">
-    <widget class="QLabel" name="globalVendorNameLabel">
+   <item row="10" column="1" colspan="2">
+    <widget class="QLabel" name="localisedVendorNamesErrorReasonLabel">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
      <property name="text">
-      <string>Global vendor name:</string>
+      <string/>
      </property>
     </widget>
    </item>
-   <item row="0" column="2">
-    <widget class="QLabel" name="globalVendorNameOkLabel">
+   <item row="10" column="0">
+    <widget class="QLabel" name="localisedVendorNamesErrorLabel">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
      <property name="text">
       <string/>
      </property>
      <property name="pixmap">
-      <pixmap>:/projectexplorer/images/ConnectionOn.png</pixmap>
+      <pixmap resource="../../projectexplorer/projectexplorer.qrc">:/projectexplorer/images/compile_error.png</pixmap>
      </property>
     </widget>
    </item>
-   <item row="8" column="0">
-    <widget class="QLabel" name="qtVersionLabel">
+   <item row="9" column="2">
+    <widget class="QLabel" name="localisedVendorNamesOkLabel">
      <property name="text">
-      <string>Qt version used in builds:</string>
+      <string/>
+     </property>
+     <property name="pixmap">
+      <pixmap resource="../../projectexplorer/projectexplorer.qrc">:/projectexplorer/images/ConnectionOn.png</pixmap>
      </property>
     </widget>
    </item>
-   <item row="8" column="1">
+   <item row="9" column="1">
+    <widget class="QLineEdit" name="localisedVendorNamesLineEdit">
+     <property name="text">
+      <string>Localised Vendor Names</string>
+     </property>
+    </widget>
+   </item>
+   <item row="5" column="1">
+    <widget class="QLineEdit" name="globalVendorNameLineEdit">
+     <property name="text">
+      <string>Current Global Vendor Name</string>
+     </property>
+    </widget>
+   </item>
+   <item row="24" column="1" colspan="3">
+    <widget class="QLabel" name="capabilitiesErrorReasonLabel">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="text">
+      <string/>
+     </property>
+    </widget>
+   </item>
+   <item row="4" column="0" colspan="4">
+    <widget class="Line" name="line_5">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="0">
+    <widget class="QLabel" name="displayNameErrorLabel">
+     <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="0">
+    <widget class="QLabel" name="displayNameLabel">
+     <property name="text">
+      <string>Display name:</string>
+     </property>
+    </widget>
+   </item>
+   <item row="19" column="1">
+    <widget class="QLabel" name="uid3WarningReasonLabel">
+     <property name="text">
+      <string/>
+     </property>
+    </widget>
+   </item>
+   <item row="19" column="0">
+    <widget class="QLabel" name="uid3WarningLabel">
+     <property name="text">
+      <string/>
+     </property>
+     <property name="pixmap">
+      <pixmap resource="../../projectexplorer/projectexplorer.qrc">:/projectexplorer/images/compile_warning.png</pixmap>
+     </property>
+    </widget>
+   </item>
+   <item row="20" column="0" colspan="4">
+    <widget class="Line" name="line">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+    </widget>
+   </item>
+   <item row="7" column="1" colspan="2">
+    <widget class="QLabel" name="globalVendorNameWarningReasonLabel">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="text">
+      <string/>
+     </property>
+    </widget>
+   </item>
+   <item row="7" column="0">
+    <widget class="QLabel" name="globalVendorNameWarningLabel">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="text">
+      <string/>
+     </property>
+     <property name="pixmap">
+      <pixmap resource="../../projectexplorer/projectexplorer.qrc">:/projectexplorer/images/compile_warning.png</pixmap>
+     </property>
+    </widget>
+   </item>
+   <item row="15" column="1" colspan="2">
+    <widget class="QLabel" name="qtVersionWarningReasonLabel">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="text">
+      <string/>
+     </property>
+    </widget>
+   </item>
+   <item row="15" column="0">
+    <widget class="QLabel" name="qtVersionWarningLabel">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="text">
+      <string/>
+     </property>
+     <property name="pixmap">
+      <pixmap resource="../../projectexplorer/projectexplorer.qrc">:/projectexplorer/images/compile_warning.png</pixmap>
+     </property>
+    </widget>
+   </item>
+   <item row="11" column="0">
+    <widget class="QLabel" name="localisedVendorNamesWarningLabel">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="text">
+      <string/>
+     </property>
+     <property name="pixmap">
+      <pixmap resource="../../projectexplorer/projectexplorer.qrc">:/projectexplorer/images/compile_warning.png</pixmap>
+     </property>
+    </widget>
+   </item>
+   <item row="11" column="1" colspan="2">
+    <widget class="QLabel" name="localisedVendorNamesWarningReasonLabel">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="text">
+      <string/>
+     </property>
+    </widget>
+   </item>
+   <item row="12" column="0" colspan="4">
+    <widget class="Line" name="line_2">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+    </widget>
+   </item>
+   <item row="24" column="0">
+    <widget class="QLabel" name="capabilitiesErrorLabel">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="text">
+      <string/>
+     </property>
+     <property name="pixmap">
+      <pixmap resource="../../projectexplorer/projectexplorer.qrc">:/projectexplorer/images/compile_error.png</pixmap>
+     </property>
+    </widget>
+   </item>
+   <item row="18" column="0">
+    <widget class="QLabel" name="uid3ErrorLabel">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="text">
+      <string/>
+     </property>
+     <property name="pixmap">
+      <pixmap resource="../../projectexplorer/projectexplorer.qrc">:/projectexplorer/images/compile_error.png</pixmap>
+     </property>
+    </widget>
+   </item>
+   <item row="14" column="0">
+    <widget class="QLabel" name="qtVersionErrorLabel">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="text">
+      <string/>
+     </property>
+     <property name="pixmap">
+      <pixmap resource="../../projectexplorer/projectexplorer.qrc">:/projectexplorer/images/compile_error.png</pixmap>
+     </property>
+    </widget>
+   </item>
+   <item row="9" column="0">
+    <widget class="QLabel" name="localisedVendorNamesLabel">
+     <property name="text">
+      <string>Localised vendor names:</string>
+     </property>
+    </widget>
+   </item>
+   <item row="23" column="0">
+    <widget class="QLabel" name="capabilitiesLabel">
+     <property name="text">
+      <string>Capabilities:</string>
+     </property>
+    </widget>
+   </item>
+   <item row="6" column="1" colspan="3">
+    <widget class="QLabel" name="globalVendorNameErrorReasonLabel">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="text">
+      <string/>
+     </property>
+    </widget>
+   </item>
+   <item row="17" column="2">
+    <widget class="QLabel" name="uid3OkLabel">
+     <property name="text">
+      <string/>
+     </property>
+     <property name="pixmap">
+      <pixmap resource="../../projectexplorer/projectexplorer.qrc">:/projectexplorer/images/ConnectionOn.png</pixmap>
+     </property>
+    </widget>
+   </item>
+   <item row="17" column="1">
+    <widget class="QLineEdit" name="uid3LineEdit">
+     <property name="text">
+      <string>Current UID3</string>
+     </property>
+    </widget>
+   </item>
+   <item row="17" column="0">
+    <widget class="QLabel" name="uid3Label">
+     <property name="text">
+      <string>Application UID:</string>
+     </property>
+    </widget>
+   </item>
+   <item row="13" column="2">
+    <widget class="QLabel" name="qtVersionOkLabel">
+     <property name="text">
+      <string/>
+     </property>
+     <property name="pixmap">
+      <pixmap resource="../../projectexplorer/projectexplorer.qrc">:/projectexplorer/images/ConnectionOn.png</pixmap>
+     </property>
+    </widget>
+   </item>
+   <item row="13" column="1">
     <widget class="QLabel" name="qtVersionDisplayLabel">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
@@ -63,48 +356,14 @@
      </property>
     </widget>
    </item>
-   <item row="8" column="2">
-    <widget class="QLabel" name="qtVersionOkLabel">
+   <item row="13" column="0">
+    <widget class="QLabel" name="qtVersionLabel">
      <property name="text">
-      <string/>
-     </property>
-     <property name="pixmap">
-      <pixmap>:/projectexplorer/images/ConnectionOn.png</pixmap>
+      <string>Qt version used in builds:</string>
      </property>
     </widget>
    </item>
-   <item row="12" column="0">
-    <widget class="QLabel" name="uid3Label">
-     <property name="text">
-      <string>Application UID:</string>
-     </property>
-    </widget>
-   </item>
-   <item row="12" column="2">
-    <widget class="QLabel" name="uid3OkLabel">
-     <property name="text">
-      <string/>
-     </property>
-     <property name="pixmap">
-      <pixmap>:/projectexplorer/images/ConnectionOn.png</pixmap>
-     </property>
-    </widget>
-   </item>
-   <item row="12" column="1">
-    <widget class="QLineEdit" name="uid3LineEdit">
-     <property name="text">
-      <string>Current UID3</string>
-     </property>
-    </widget>
-   </item>
-   <item row="18" column="0">
-    <widget class="QLabel" name="capabilitiesLabel">
-     <property name="text">
-      <string>Capabilities:</string>
-     </property>
-    </widget>
-   </item>
-   <item row="18" column="1">
+   <item row="23" column="1">
     <widget class="QLabel" name="capabilitiesDisplayLabel">
      <property name="frameShape">
       <enum>QFrame::NoFrame</enum>
@@ -114,18 +373,39 @@
      </property>
     </widget>
    </item>
-   <item row="18" column="2">
-    <widget class="QLabel" name="capabilitiesOkLabel">
+   <item row="5" column="0">
+    <widget class="QLabel" name="globalVendorNameLabel">
+     <property name="text">
+      <string>Global vendor name:</string>
+     </property>
+    </widget>
+   </item>
+   <item row="5" column="2">
+    <widget class="QLabel" name="globalVendorNameOkLabel">
      <property name="text">
       <string/>
      </property>
      <property name="pixmap">
-      <pixmap>:/projectexplorer/images/ConnectionOn.png</pixmap>
+      <pixmap resource="../../projectexplorer/projectexplorer.qrc">:/projectexplorer/images/ConnectionOn.png</pixmap>
      </property>
     </widget>
    </item>
-   <item row="1" column="1" colspan="3">
-    <widget class="QLabel" name="globalVendorNameErrorReasonLabel">
+   <item row="16" column="0" colspan="4">
+    <widget class="Line" name="line_3">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+    </widget>
+   </item>
+   <item row="8" column="0" colspan="4">
+    <widget class="Line" name="line_4">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+    </widget>
+   </item>
+   <item row="6" column="0">
+    <widget class="QLabel" name="globalVendorNameErrorLabel">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
        <horstretch>0</horstretch>
@@ -135,22 +415,12 @@
      <property name="text">
       <string/>
      </property>
-    </widget>
-   </item>
-   <item row="9" column="1" colspan="3">
-    <widget class="QLabel" name="qtVersionErrorReasonLabel">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text">
-      <string/>
+     <property name="pixmap">
+      <pixmap resource="../../projectexplorer/projectexplorer.qrc">:/projectexplorer/images/compile_error.png</pixmap>
      </property>
     </widget>
    </item>
-   <item row="13" column="1" colspan="3">
+   <item row="18" column="1" colspan="3">
     <widget class="QLabel" name="uid3ErrorReasonLabel">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
@@ -163,8 +433,8 @@
      </property>
     </widget>
    </item>
-   <item row="19" column="1" colspan="3">
-    <widget class="QLabel" name="capabilitiesErrorReasonLabel">
+   <item row="14" column="1" colspan="3">
+    <widget class="QLabel" name="qtVersionErrorReasonLabel">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
        <horstretch>0</horstretch>
@@ -176,257 +446,48 @@
      </property>
     </widget>
    </item>
-   <item row="11" column="0" colspan="4">
-    <widget class="Line" name="line_3">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-    </widget>
-   </item>
-   <item row="3" column="0" colspan="4">
-    <widget class="Line" name="line_4">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="0">
-    <widget class="QLabel" name="globalVendorNameErrorLabel">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
+   <item row="23" column="2">
+    <widget class="QLabel" name="capabilitiesOkLabel">
      <property name="text">
       <string/>
      </property>
      <property name="pixmap">
-      <pixmap>:/projectexplorer/images/compile_error.png</pixmap>
+      <pixmap resource="../../projectexplorer/projectexplorer.qrc">:/projectexplorer/images/ConnectionOn.png</pixmap>
      </property>
     </widget>
    </item>
-   <item row="9" column="0">
-    <widget class="QLabel" name="qtVersionErrorLabel">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
+   <item row="3" column="0">
+    <widget class="QLabel" name="displayNameWarningLabel">
      <property name="text">
       <string/>
      </property>
      <property name="pixmap">
-      <pixmap>:/projectexplorer/images/compile_error.png</pixmap>
+      <pixmap resource="../../projectexplorer/projectexplorer.qrc">:/projectexplorer/images/compile_warning.png</pixmap>
      </property>
     </widget>
    </item>
-   <item row="13" column="0">
-    <widget class="QLabel" name="uid3ErrorLabel">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
+   <item row="1" column="1">
+    <widget class="QLineEdit" name="displayNameLineEdit"/>
+   </item>
+   <item row="1" column="2">
+    <widget class="QLabel" name="displayNameOkLabel">
      <property name="text">
       <string/>
      </property>
      <property name="pixmap">
-      <pixmap>:/projectexplorer/images/compile_error.png</pixmap>
+      <pixmap resource="../../projectexplorer/projectexplorer.qrc">:/projectexplorer/images/ConnectionOn.png</pixmap>
      </property>
     </widget>
    </item>
-   <item row="19" column="0">
-    <widget class="QLabel" name="capabilitiesErrorLabel">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text">
-      <string/>
-     </property>
-     <property name="pixmap">
-      <pixmap>:/projectexplorer/images/compile_error.png</pixmap>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="1">
-    <widget class="QLineEdit" name="globalVendorNameLineEdit">
-     <property name="text">
-      <string>Current Global Vendor Name</string>
-     </property>
-    </widget>
-   </item>
-   <item row="4" column="0">
-    <widget class="QLabel" name="localisedVendorNamesLabel">
-     <property name="text">
-      <string>Localised vendor names:</string>
-     </property>
-    </widget>
-   </item>
-   <item row="4" column="1">
-    <widget class="QLineEdit" name="localisedVendorNamesLineEdit">
-     <property name="text">
-      <string>Localised Vendor Names</string>
-     </property>
-    </widget>
-   </item>
-   <item row="4" column="2">
-    <widget class="QLabel" name="localisedVendorNamesOkLabel">
-     <property name="text">
-      <string/>
-     </property>
-     <property name="pixmap">
-      <pixmap>:/projectexplorer/images/ConnectionOn.png</pixmap>
-     </property>
-    </widget>
-   </item>
-   <item row="5" column="0">
-    <widget class="QLabel" name="localisedVendorNamesErrorLabel">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text">
-      <string/>
-     </property>
-     <property name="pixmap">
-      <pixmap>:/projectexplorer/images/compile_error.png</pixmap>
-     </property>
-    </widget>
-   </item>
-   <item row="5" column="1" colspan="2">
-    <widget class="QLabel" name="localisedVendorNamesErrorReasonLabel">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
+   <item row="3" column="1">
+    <widget class="QLabel" name="displayNameWarningReasonLabel">
      <property name="text">
       <string/>
      </property>
     </widget>
    </item>
-   <item row="7" column="0" colspan="3">
-    <widget class="Line" name="line_2">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-    </widget>
-   </item>
-   <item row="6" column="0">
-    <widget class="QLabel" name="localisedVendorNamesWarningLabel">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text">
-      <string/>
-     </property>
-     <property name="pixmap">
-      <pixmap>:/projectexplorer/images/compile_warning.png</pixmap>
-     </property>
-    </widget>
-   </item>
-   <item row="6" column="1" colspan="2">
-    <widget class="QLabel" name="localisedVendorNamesWarningReasonLabel">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text">
-      <string/>
-     </property>
-    </widget>
-   </item>
-   <item row="10" column="0">
-    <widget class="QLabel" name="qtVersionWarningLabel">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text">
-      <string/>
-     </property>
-     <property name="pixmap">
-      <pixmap>:/projectexplorer/images/compile_warning.png</pixmap>
-     </property>
-    </widget>
-   </item>
-   <item row="10" column="1" colspan="2">
-    <widget class="QLabel" name="qtVersionWarningReasonLabel">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text">
-      <string/>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="0">
-    <widget class="QLabel" name="globalVendorNameWarningLabel">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text">
-      <string/>
-     </property>
-     <property name="pixmap">
-      <pixmap>:/projectexplorer/images/compile_warning.png</pixmap>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="1" colspan="2">
-    <widget class="QLabel" name="globalVendorNameWarningReasonLabel">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text">
-      <string/>
-     </property>
-    </widget>
-   </item>
-   <item row="15" column="0" colspan="3">
-    <widget class="Line" name="line">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-    </widget>
-   </item>
-   <item row="14" column="0">
-    <widget class="QLabel" name="uid3WarningLabel">
-     <property name="text">
-      <string/>
-     </property>
-     <property name="pixmap">
-      <pixmap>:/projectexplorer/images/compile_warning.png</pixmap>
-     </property>
-    </widget>
-   </item>
-   <item row="14" column="1">
-    <widget class="QLabel" name="uid3WarningReasonLabel">
+   <item row="2" column="1">
+    <widget class="QLabel" name="displayNameErrorReasonLabel">
      <property name="text">
       <string/>
      </property>
@@ -434,6 +495,8 @@
    </item>
   </layout>
  </widget>
- <resources/>
+ <resources>
+  <include location="../../projectexplorer/projectexplorer.qrc"/>
+ </resources>
  <connections/>
 </ui>