Maemo: Remove ability to change device type.

It's a fundamental attribute of the device. It makes no sense to
change it.

diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurationssettingswidget.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurationssettingswidget.cpp
index 388c66d..4c32863 100644 (file)
--- a/src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurationssettingswidget.cpp
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurationssettingswidget.cpp
@@ -132,9 +132,8 @@ QString MaemoDeviceConfigurationsSettingsWidget::searchKeywords() const
         << ' ' << m_ui->passwordButton->text()
         << ' ' << m_ui->authTypeLabel->text()
         << ' ' << m_ui->connectionTimeoutLabel->text()
-        << ' ' << m_ui->deviceButton->text()
-        << ' ' << m_ui->simulatorButton->text()
         << ' ' << m_ui->deviceTypeLabel->text()
+        << ' ' << m_ui->deviceTypeValueLabel->text()
         << ' ' << m_ui->deviceNameLabel->text()
         << ' ' << m_ui->hostNameLabel->text()
         << ' ' << m_ui->keyLabel->text()
@@ -198,9 +197,9 @@ void MaemoDeviceConfigurationsSettingsWidget::displayCurrent()
     m_ui->defaultDeviceButton->setEnabled(!current->isDefault());
     const SshConnectionParameters &sshParams = current->sshParameters();
     if (current->type() == MaemoDeviceConfig::Physical)
-        m_ui->deviceButton->setChecked(true);
+        m_ui->deviceTypeValueLabel->setText(tr("Physical Device"));
     else
-        m_ui->simulatorButton->setChecked(true);
+        m_ui->deviceTypeValueLabel->setText(tr("Emulator (Qemu)"));
     if (sshParams.authType == Core::SshConnectionParameters::AuthByPwd)
         m_ui->passwordButton->setChecked(true);
     else
@@ -257,15 +256,6 @@ void MaemoDeviceConfigurationsSettingsWidget::configNameEditingFinished()
     m_nameValidator->setDisplayName(newName);
 }
 
-void MaemoDeviceConfigurationsSettingsWidget::deviceTypeChanged()
-{
-    const MaemoDeviceConfig::DeviceType devType
-        = m_ui->deviceButton->isChecked()
-            ? MaemoDeviceConfig::Physical : MaemoDeviceConfig::Simulator;
-    //m_devConfigs->setDeviceType(currentIndex(), devType);
-    fillInValues();
-}
-
 void MaemoDeviceConfigurationsSettingsWidget::authenticationTypeChanged()
 {
     SshConnectionParameters sshParams = currentConfig()->sshParameters();

diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurationssettingswidget.h b/src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurationssettingswidget.h
index cc13caa..ff0be87 100644 (file)
--- a/src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurationssettingswidget.h
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurationssettingswidget.h
@@ -73,7 +73,6 @@ private slots:
     void addConfig();
     void deleteConfig();
     void configNameEditingFinished();
-    void deviceTypeChanged();
     void authenticationTypeChanged();
     void hostNameEditingFinished();
     void sshPortEditingFinished();

diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurationssettingswidget.ui b/src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurationssettingswidget.ui
index 4b3ea69..98fd5a4 100644 (file)
--- a/src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurationssettingswidget.ui
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurationssettingswidget.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>602</width>
+    <width>703</width>
     <height>421</height>
    </rect>
   </property>
@@ -87,29 +87,6 @@
              </property>
             </widget>
            </item>
-           <item row="1" column="1">
-            <widget class="QWidget" name="deviceTypeButtonsWidget" native="true">
-             <layout class="QHBoxLayout" name="horizontalLayout_2">
-              <property name="margin">
-               <number>0</number>
-              </property>
-              <item>
-               <widget class="QRadioButton" name="deviceButton">
-                <property name="text">
-                 <string>Remote device</string>
-                </property>
-               </widget>
-              </item>
-              <item>
-               <widget class="QRadioButton" name="simulatorButton">
-                <property name="text">
-                 <string>Maemo &amp;emulator</string>
-                </property>
-               </widget>
-              </item>
-             </layout>
-            </widget>
-           </item>
            <item row="2" column="0">
             <widget class="QLabel" name="authTypeLabel">
              <property name="text">
@@ -332,7 +309,7 @@
            <item row="9" column="1">
             <layout class="QHBoxLayout" name="horizontalLayout_8">
              <item>
-              <widget class="Utils::PathChooser" name="keyFileLineEdit" native="true"/>
+              <widget class="Utils::PathChooser" name="keyFileLineEdit"/>
              </item>
              <item>
               <widget class="QPushButton" name="makeKeyFileDefaultButton">
@@ -343,6 +320,13 @@
              </item>
             </layout>
            </item>
+           <item row="1" column="1">
+            <widget class="QLabel" name="deviceTypeValueLabel">
+             <property name="text">
+              <string>TextLabel</string>
+             </property>
+            </widget>
+           </item>
           </layout>
          </widget>
         </item>
@@ -485,22 +469,6 @@
  <resources/>
  <connections>
   <connection>
-   <sender>deviceButton</sender>
-   <signal>clicked(bool)</signal>
-   <receiver>MaemoDeviceConfigurationsSettingsWidget</receiver>
-   <slot>deviceTypeChanged()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>231</x>
-     <y>99</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>511</x>
-     <y>279</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
    <sender>hostLineEdit</sender>
    <signal>editingFinished()</signal>
    <receiver>MaemoDeviceConfigurationsSettingsWidget</receiver>
@@ -549,22 +517,6 @@
    </hints>
   </connection>
   <connection>
-   <sender>simulatorButton</sender>
-   <signal>clicked(bool)</signal>
-   <receiver>MaemoDeviceConfigurationsSettingsWidget</receiver>
-   <slot>deviceTypeChanged()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>335</x>
-     <y>99</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>426</x>
-     <y>87</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
    <sender>addConfigButton</sender>
    <signal>clicked()</signal>
    <receiver>MaemoDeviceConfigurationsSettingsWidget</receiver>