From: Pawel Polanski <pawel.3.polanski@nokia.com>
Date: Tue, 15 Mar 2011 11:08:12 +0000 (+0100)
Subject: Symbian: fixed the Debugging agents UI
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=345d9bf274f17e24bae8da50da74b70b74ac331a;p=qt-creator-jp%2Fqt-creator-jp.git

Symbian: fixed the Debugging agents UI
---

diff --git a/src/plugins/qt4projectmanager/qt-s60/s60deployconfigurationwidget.cpp b/src/plugins/qt4projectmanager/qt-s60/s60deployconfigurationwidget.cpp
index caa10fe331..a229f06df9 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60deployconfigurationwidget.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/s60deployconfigurationwidget.cpp
@@ -302,7 +302,7 @@ QWidget *S60DeployConfigurationWidget::createCommunicationChannel()
 
     communicationChannelGroupBox->setLayout(communicationChannelGridLayout);
 
-    updateCommunicationChannel();
+    updateCommunicationChannelUi();
 
     return communicationChannelGroupBox;
 }
@@ -413,6 +413,32 @@ void S60DeployConfigurationWidget::setSerialPort(int index)
     clearDeviceInfo();
 }
 
+void S60DeployConfigurationWidget::updateCommunicationChannelUi()
+{
+    S60DeployConfiguration::CommunicationChannel channel = m_deployConfiguration->communicationChannel();
+    if (channel == S60DeployConfiguration::CommunicationTrkSerialConnection) {
+        m_trkRadioButton->setChecked(true);
+        m_codaRadioButton->setChecked(false);
+        m_serialRadioButton->setChecked(true);
+        m_wlanRadioButton->setDisabled(true);
+        m_ipAddress->setDisabled(true);
+        m_serialPortsCombo->setDisabled(false);
+        updateSerialDevices();
+    } else {
+        m_trkRadioButton->setChecked(false);
+        m_codaRadioButton->setChecked(true);
+        m_wlanRadioButton->setDisabled(false);
+        if (channel == S60DeployConfiguration::CommunicationCodaTcpConnection) {
+            m_ipAddress->setDisabled(false);
+            m_serialPortsCombo->setDisabled(true);
+        } else {
+            m_ipAddress->setDisabled(true);
+            m_serialPortsCombo->setDisabled(false);
+            updateSerialDevices();
+        }
+    }
+}
+
 void S60DeployConfigurationWidget::updateCommunicationChannel()
 {
     if (!m_trkRadioButton->isChecked() && !m_codaRadioButton->isChecked())
@@ -434,7 +460,6 @@ void S60DeployConfigurationWidget::updateCommunicationChannel()
             m_ipAddress->setDisabled(false);
             m_serialPortsCombo->setDisabled(true);
             m_deployConfiguration->setCommunicationChannel(S60DeployConfiguration::CommunicationCodaTcpConnection);
-            m_deviceInfoButton->setEnabled(true);
         } else {
             m_ipAddress->setDisabled(true);
             m_serialPortsCombo->setDisabled(false);
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60deployconfigurationwidget.h b/src/plugins/qt4projectmanager/qt-s60/s60deployconfigurationwidget.h
index d80479db6e..7424eb469c 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60deployconfigurationwidget.h
+++ b/src/plugins/qt4projectmanager/qt-s60/s60deployconfigurationwidget.h
@@ -100,6 +100,7 @@ private slots:
     void slotWaitingForTrkClosed();
     void silentInstallChanged(int);
     void updateCommunicationChannel();
+    void updateCommunicationChannelUi();
     void updateWlanAddress(const QString &address);
     void cleanWlanAddress();
     void codaEvent(const Coda::CodaEvent &event);