Make linux devices configuration less huge.

Change-Id: I2dbf049eb97842ed6b72e05f8d7b1e91d08996d1
Reviewed-on: http://codereview.qt-project.org/5021
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>

diff --git a/src/plugins/remotelinux/linuxdeviceconfigurationssettingswidget.cpp b/src/plugins/remotelinux/linuxdeviceconfigurationssettingswidget.cpp
index 95d93f5..8b81faa 100644 (file)
--- a/src/plugins/remotelinux/linuxdeviceconfigurationssettingswidget.cpp
+++ b/src/plugins/remotelinux/linuxdeviceconfigurationssettingswidget.cpp
@@ -136,7 +136,6 @@ QString LinuxDeviceConfigurationsSettingsWidget::searchKeywords() const
         << ' ' << m_ui->nameLineEdit->text()
         << ' ' << m_ui->passwordLabel->text()
         << ' ' << m_ui->freePortsLabel->text()
-        << ' ' << m_ui->portsWarningLabel->text()
         << ' ' << m_ui->pwdLineEdit->text()
         << ' ' << m_ui->timeoutSpinBox->value()
         << ' ' << m_ui->userLineEdit->text()
@@ -148,9 +147,13 @@ QString LinuxDeviceConfigurationsSettingsWidget::searchKeywords() const
 void LinuxDeviceConfigurationsSettingsWidget::initGui()
 {
     m_ui->setupUi(this);
+    m_ui->portsWarningLabel->setPixmap(QPixmap(":/projectexplorer/images/compile_error.png"));
+    m_ui->portsWarningLabel->setToolTip(QLatin1String("<font color=\"red\">")
+        + tr("You will need at least one port.") + QLatin1String("</font>"));
     m_ui->configurationComboBox->setModel(m_devConfigs.data());
     m_ui->nameLineEdit->setValidator(m_nameValidator);
     m_ui->keyFileLineEdit->setExpectedKind(Utils::PathChooser::File);
+    m_ui->keyFileLineEdit->lineEdit()->setMinimumWidth(0);
     QRegExpValidator * const portsValidator
         = new QRegExpValidator(QRegExp(PortList::regularExpression()), this);
     m_ui->portsLineEdit->setValidator(portsValidator);
@@ -398,12 +401,7 @@ void LinuxDeviceConfigurationsSettingsWidget::clearDetails()
 
 void LinuxDeviceConfigurationsSettingsWidget::updatePortsWarningLabel()
 {
-    if (currentConfig()->freePorts().hasMore()) {
-        m_ui->portsWarningLabel->clear();
-    } else {
-        m_ui->portsWarningLabel->setText(QLatin1String("<font color=\"red\">")
-            + tr("You will need at least one port.") + QLatin1String("</font>"));
-    }
+    m_ui->portsWarningLabel->setVisible(!currentConfig()->freePorts().hasMore());
 }
 
 const ILinuxDeviceConfigurationFactory *LinuxDeviceConfigurationsSettingsWidget::factoryForCurrentConfig() const

diff --git a/src/plugins/remotelinux/linuxdeviceconfigurationssettingswidget.ui b/src/plugins/remotelinux/linuxdeviceconfigurationssettingswidget.ui
index fdaf567..a3d6c9d 100644 (file)
--- a/src/plugins/remotelinux/linuxdeviceconfigurationssettingswidget.ui
+++ b/src/plugins/remotelinux/linuxdeviceconfigurationssettingswidget.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>726</width>
-    <height>421</height>
+    <height>473</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -67,6 +67,12 @@
            </sizepolicy>
           </property>
           <layout class="QFormLayout" name="formLayout_2">
+           <property name="fieldGrowthPolicy">
+            <enum>QFormLayout::FieldsStayAtSizeHint</enum>
+           </property>
+           <property name="margin">
+            <number>0</number>
+           </property>
            <item row="0" column="0">
             <widget class="QLabel" name="deviceNameLabel">
              <property name="text">
@@ -80,6 +86,20 @@
            <item row="0" column="1">
             <widget class="QLineEdit" name="nameLineEdit"/>
            </item>
+           <item row="1" column="0">
+            <widget class="QLabel" name="oSTypeLabel">
+             <property name="text">
+              <string>OS type:</string>
+             </property>
+            </widget>
+           </item>
+           <item row="1" column="1">
+            <widget class="QLabel" name="osTypeValueLabel">
+             <property name="text">
+              <string/>
+             </property>
+            </widget>
+           </item>
            <item row="2" column="0">
             <widget class="QLabel" name="deviceTypeLabel">
              <property name="text">
@@ -87,6 +107,13 @@
              </property>
             </widget>
            </item>
+           <item row="2" column="1">
+            <widget class="QLabel" name="deviceTypeValueLabel">
+             <property name="text">
+              <string/>
+             </property>
+            </widget>
+           </item>
            <item row="3" column="0">
             <widget class="QLabel" name="authTypeLabel">
              <property name="text">
@@ -141,25 +168,25 @@
             </widget>
            </item>
            <item row="4" column="1">
-            <widget class="QLineEdit" name="hostLineEdit">
-             <property name="placeholderText">
-              <string>IP or host name of the device</string>
-             </property>
-            </widget>
-           </item>
-           <item row="5" column="0">
-            <widget class="QLabel" name="sshPortLabel">
-             <property name="text">
-              <string>&amp;SSH port:</string>
-             </property>
-             <property name="buddy">
-              <cstring>sshPortSpinBox</cstring>
-             </property>
-            </widget>
-           </item>
-           <item row="5" column="1">
             <layout class="QHBoxLayout" name="horizontalLayout_4">
              <item>
+              <widget class="QLineEdit" name="hostLineEdit">
+               <property name="placeholderText">
+                <string>IP or host name of the device</string>
+               </property>
+              </widget>
+             </item>
+             <item>
+              <widget class="QLabel" name="sshPortLabel">
+               <property name="text">
+                <string>&amp;SSH port:</string>
+               </property>
+               <property name="buddy">
+                <cstring>sshPortSpinBox</cstring>
+               </property>
+              </widget>
+             </item>
+             <item>
               <widget class="QSpinBox" name="sshPortSpinBox">
                <property name="minimum">
                 <number>0</number>
@@ -172,19 +199,6 @@
                </property>
               </widget>
              </item>
-             <item>
-              <spacer name="horizontalSpacer_3">
-               <property name="orientation">
-                <enum>Qt::Horizontal</enum>
-               </property>
-               <property name="sizeHint" stdset="0">
-                <size>
-                 <width>40</width>
-                 <height>20</height>
-                </size>
-               </property>
-              </spacer>
-             </item>
             </layout>
            </item>
            <item row="6" column="0">
@@ -209,37 +223,20 @@
              <item>
               <widget class="QLabel" name="portsWarningLabel">
                <property name="text">
-                <string>TextLabel</string>
+                <string/>
                </property>
               </widget>
              </item>
              <item>
-              <spacer name="horizontalSpacer_2">
-               <property name="orientation">
-                <enum>Qt::Horizontal</enum>
+              <widget class="QLabel" name="connectionTimeoutLabel">
+               <property name="text">
+                <string>Timeout:</string>
                </property>
-               <property name="sizeHint" stdset="0">
-                <size>
-                 <width>40</width>
-                 <height>20</height>
-                </size>
+               <property name="buddy">
+                <cstring>timeoutSpinBox</cstring>
                </property>
-              </spacer>
+              </widget>
              </item>
-            </layout>
-           </item>
-           <item row="7" column="0">
-            <widget class="QLabel" name="connectionTimeoutLabel">
-             <property name="text">
-              <string>Connection time&amp;out:</string>
-             </property>
-             <property name="buddy">
-              <cstring>timeoutSpinBox</cstring>
-             </property>
-            </widget>
-           </item>
-           <item row="7" column="1">
-            <layout class="QHBoxLayout" name="horizontalLayout_5">
              <item>
               <widget class="QSpinBox" name="timeoutSpinBox">
                <property name="suffix">
@@ -256,22 +253,9 @@
                </property>
               </widget>
              </item>
-             <item>
-              <spacer name="horizontalSpacer">
-               <property name="orientation">
-                <enum>Qt::Horizontal</enum>
-               </property>
-               <property name="sizeHint" stdset="0">
-                <size>
-                 <width>40</width>
-                 <height>20</height>
-                </size>
-               </property>
-              </spacer>
-             </item>
             </layout>
            </item>
-           <item row="8" column="0">
+           <item row="7" column="0">
             <widget class="QLabel" name="userNameLabel">
              <property name="text">
               <string>&amp;Username:</string>
@@ -281,10 +265,10 @@
              </property>
             </widget>
            </item>
-           <item row="8" column="1">
+           <item row="7" column="1">
             <widget class="QLineEdit" name="userLineEdit"/>
            </item>
-           <item row="9" column="0">
+           <item row="8" column="0">
             <widget class="QLabel" name="passwordLabel">
              <property name="text">
               <string>&amp;Password:</string>
@@ -294,7 +278,7 @@
              </property>
             </widget>
            </item>
-           <item row="9" column="1">
+           <item row="8" column="1">
             <layout class="QHBoxLayout" name="horizontalLayout_6">
              <item>
               <widget class="QLineEdit" name="pwdLineEdit">
@@ -312,17 +296,17 @@
              </item>
             </layout>
            </item>
-           <item row="10" column="0">
+           <item row="9" column="0">
             <widget class="QLabel" name="keyLabel">
              <property name="text">
               <string>Private key file:</string>
              </property>
             </widget>
            </item>
-           <item row="10" column="1">
+           <item row="9" column="1">
             <layout class="QHBoxLayout" name="horizontalLayout_8">
              <item>
-              <widget class="Utils::PathChooser" name="keyFileLineEdit"/>
+              <widget class="Utils::PathChooser" name="keyFileLineEdit" native="true"/>
              </item>
              <item>
               <widget class="QPushButton" name="makeKeyFileDefaultButton">
@@ -333,27 +317,6 @@
              </item>
             </layout>
            </item>
-           <item row="2" column="1">
-            <widget class="QLabel" name="deviceTypeValueLabel">
-             <property name="text">
-              <string/>
-             </property>
-            </widget>
-           </item>
-           <item row="1" column="0">
-            <widget class="QLabel" name="oSTypeLabel">
-             <property name="text">
-              <string>OS type:</string>
-             </property>
-            </widget>
-           </item>
-           <item row="1" column="1">
-            <widget class="QLabel" name="osTypeValueLabel">
-             <property name="text">
-              <string/>
-             </property>
-            </widget>
-           </item>
           </layout>
          </widget>
         </item>