From 4415224f993db41f3d0be75c52df3ee9dfcbddf4 Mon Sep 17 00:00:00 2001
From: Christian Kandeler <christian.kandeler@nokia.com>
Date: Fri, 9 Mar 2012 10:18:41 +0100
Subject: [PATCH] Devices: Display auto-detection info status in settings
widget.
Change-Id: I7e9c00ae3f4e094f24e71c6bde3060027188ebeb
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@nokia.com>
---
.../devicesupport/devicesettingswidget.cpp | 1 +
.../devicesupport/devicesettingswidget.ui | 32 +++++++++++++------
2 files changed, 24 insertions(+), 9 deletions(-)
diff --git a/src/plugins/projectexplorer/devicesupport/devicesettingswidget.cpp b/src/plugins/projectexplorer/devicesupport/devicesettingswidget.cpp
index 73490ec8a6f..37d709ebe1c 100644
--- a/src/plugins/projectexplorer/devicesupport/devicesettingswidget.cpp
+++ b/src/plugins/projectexplorer/devicesupport/devicesettingswidget.cpp
@@ -183,6 +183,7 @@ void DeviceSettingsWidget::displayCurrent()
m_ui->defaultDeviceButton->setEnabled(
m_deviceManager->defaultDevice(current->type()) != current);
m_ui->osTypeValueLabel->setText(DeviceManager::displayNameForDeviceType(current->type()));
+ m_ui->autoDetectionValueLabel->setText(current->isAutoDetected() ? tr("Yes") : tr("No"));
m_nameValidator->setDisplayName(current->displayName());
m_ui->removeConfigButton->setEnabled(!current->isAutoDetected());
diff --git a/src/plugins/projectexplorer/devicesupport/devicesettingswidget.ui b/src/plugins/projectexplorer/devicesupport/devicesettingswidget.ui
index 35da02baf83..66db396b26d 100644
--- a/src/plugins/projectexplorer/devicesupport/devicesettingswidget.ui
+++ b/src/plugins/projectexplorer/devicesupport/devicesettingswidget.ui
@@ -52,20 +52,17 @@
<string>General</string>
</property>
<layout class="QGridLayout" name="gridLayout">
- <item row="1" column="1">
- <widget class="QLabel" name="osTypeValueLabel">
+ <item row="1" column="0">
+ <widget class="QLabel" name="oSTypeLabel">
<property name="text">
- <string/>
+ <string>Type:</string>
</property>
</widget>
</item>
- <item row="0" column="1">
- <widget class="QLineEdit" name="nameLineEdit"/>
- </item>
- <item row="1" column="0">
- <widget class="QLabel" name="oSTypeLabel">
+ <item row="1" column="1">
+ <widget class="QLabel" name="osTypeValueLabel">
<property name="text">
- <string>Type:</string>
+ <string/>
</property>
</widget>
</item>
@@ -82,6 +79,9 @@
</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">
@@ -92,6 +92,20 @@
</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>
--
GitLab