summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikolai Kosjar <nikolai.kosjar@nokia.com>2012-05-08 09:36:52 +0200
committerNikolai Kosjar <nikolai.kosjar@nokia.com>2012-05-08 10:55:11 +0200
commit4a0bfbff5f4f4f816752b345afeb24bfa0fae91d (patch)
tree21943175d0c5dbabcab853419a920942cbfdd696
parent7388034eef7d9a04318618b8597f4f52d31ebd3e (diff)
downloadqt-creator-4a0bfbff5f4f4f816752b345afeb24bfa0fae91d.tar.gz
Device settings widget improvements.
- Use a form layout in the "General" group box - now the labels are aligned according to the platform. - Set a minimum height for the "Type Specific" group box. If there are no devices the "Type Specific" label will be not cut off by the underlying spacer. Change-Id: Ia4527628db204ad33852d8d21751ec60cfe225cd Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
-rw-r--r--src/plugins/projectexplorer/devicesupport/devicesettingswidget.ui94
1 files changed, 52 insertions, 42 deletions
diff --git a/src/plugins/projectexplorer/devicesupport/devicesettingswidget.ui b/src/plugins/projectexplorer/devicesupport/devicesettingswidget.ui
index 66db396b26..2296e418db 100644
--- a/src/plugins/projectexplorer/devicesupport/devicesettingswidget.ui
+++ b/src/plugins/projectexplorer/devicesupport/devicesettingswidget.ui
@@ -51,22 +51,53 @@
<property name="title">
<string>General</string>
</property>
- <layout class="QGridLayout" name="gridLayout">
- <item row="1" column="0">
- <widget class="QLabel" name="oSTypeLabel">
- <property name="text">
- <string>Type:</string>
- </property>
- </widget>
- </item>
- <item row="1" column="1">
- <widget class="QLabel" name="osTypeValueLabel">
- <property name="text">
- <string/>
- </property>
- </widget>
+ <layout class="QHBoxLayout" name="horizontalLayout_2">
+ <item>
+ <layout class="QFormLayout" name="formLayout_2">
+ <item row="0" column="0">
+ <widget class="QLabel" name="deviceNameLabel">
+ <property name="text">
+ <string>&amp;Name:</string>
+ </property>
+ <property name="buddy">
+ <cstring>nameLineEdit</cstring>
+ </property>
+ </widget>
+ </item>
+ <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>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="autoDetectionKeyLabel">
+ <property name="text">
+ <string>Auto-detected:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="1">
+ <widget class="QLabel" name="autoDetectionValueLabel">
+ <property name="text">
+ <string/>
+ </property>
+ </widget>
+ </item>
+ </layout>
</item>
- <item row="0" column="2">
+ <item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
@@ -79,38 +110,17 @@
</property>
</spacer>
</item>
- <item row="0" column="1">
- <widget class="QLineEdit" name="nameLineEdit"/>
- </item>
- <item row="0" column="0">
- <widget class="QLabel" name="deviceNameLabel">
- <property name="text">
- <string>&amp;Name:</string>
- </property>
- <property name="buddy">
- <cstring>nameLineEdit</cstring>
- </property>
- </widget>
- </item>
- <item row="2" column="0">
- <widget class="QLabel" name="autoDetectionKeyLabel">
- <property name="text">
- <string>Auto-detected:</string>
- </property>
- </widget>
- </item>
- <item row="2" column="1">
- <widget class="QLabel" name="autoDetectionValueLabel">
- <property name="text">
- <string/>
- </property>
- </widget>
- </item>
</layout>
</widget>
</item>
<item>
<widget class="QGroupBox" name="osSpecificGroupBox">
+ <property name="minimumSize">
+ <size>
+ <width>0</width>
+ <height>25</height>
+ </size>
+ </property>
<property name="title">
<string>Type Specific</string>
</property>