feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Devices: Display auto-detection info status in settings widget.

Browse Source 
Change-Id: I7e9c00ae3f4e094f24e71c6bde3060027188ebeb
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@nokia.com>
This commit is contained in:
Christian Kandeler
2012-03-09 10:18:41 +01:00
parent aa6571ba01
commit 4415224f99
2 changed files with 25 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/projectexplorer/devicesupport/devicesettingswidget.cpp
View File

@@ -183,6 +183,7 @@ void DeviceSettingsWidget::displayCurrent()
m_ui->defaultDeviceButton->setEnabled( m_ui->defaultDeviceButton->setEnabled(
m_deviceManager->defaultDevice(current->type()) != current); m_deviceManager->defaultDevice(current->type()) != current);
m_ui->osTypeValueLabel->setText(DeviceManager::displayNameForDeviceType(current->type())); m_ui->osTypeValueLabel->setText(DeviceManager::displayNameForDeviceType(current->type()));
m_ui->autoDetectionValueLabel->setText(current->isAutoDetected() ? tr("Yes") : tr("No"));
m_nameValidator->setDisplayName(current->displayName()); m_nameValidator->setDisplayName(current->displayName());
m_ui->removeConfigButton->setEnabled(!current->isAutoDetected()); m_ui->removeConfigButton->setEnabled(!current->isAutoDetected());

34
src/plugins/projectexplorer/devicesupport/devicesettingswidget.ui
View File

@@ -52,16 +52,6 @@
<string>General</string> <string>General</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
<item row="1" column="1">
<widget class="QLabel" name="osTypeValueLabel">
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLineEdit" name="nameLineEdit"/>
</item>
<item row="1" column="0"> <item row="1" column="0">
<widget class="QLabel" name="oSTypeLabel"> <widget class="QLabel" name="oSTypeLabel">
<property name="text"> <property name="text">
@@ -69,6 +59,13 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="1">
<widget class="QLabel" name="osTypeValueLabel">
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="0" column="2"> <item row="0" column="2">
<spacer name="horizontalSpacer"> <spacer name="horizontalSpacer">
<property name="orientation"> <property name="orientation">
@@ -82,6 +79,9 @@
</property> </property>
</spacer> </spacer>
</item> </item>
<item row="0" column="1">
<widget class="QLineEdit" name="nameLineEdit"/>
</item>
<item row="0" column="0"> <item row="0" column="0">
<widget class="QLabel" name="deviceNameLabel"> <widget class="QLabel" name="deviceNameLabel">
<property name="text"> <property name="text">
@@ -92,6 +92,20 @@
</property> </property>
</widget> </widget>
</item> </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> </layout>
</widget> </widget>
</item> </item>