Maemo: Configuration dialog fixes.

- Disable "Remote Processes" button when no entry is selected.
- Fix some keyboard shortcuts.

3 files changed, 17 insertions, 9 deletions

diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurationssettingswidget.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurationssettingswidget.cpp
index 23142e3434..399c49fc45 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurationssettingswidget.cpp
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurationssettingswidget.cpp
@@ -470,6 +470,7 @@ void MaemoDeviceConfigurationsSettingsWidget::currentConfigChanged(int index)
         m_ui->testConfigButton->setEnabled(false);
         m_ui->generateKeyButton->setEnabled(false);
         m_ui->deployKeyButton->setEnabled(false);
+        m_ui->remoteProcessesButton->setEnabled(false);
         clearDetails();
         m_ui->detailsWidget->setEnabled(false);
     } else {
@@ -477,6 +478,7 @@ void MaemoDeviceConfigurationsSettingsWidget::currentConfigChanged(int index)
         m_ui->testConfigButton->setEnabled(true);
         m_ui->generateKeyButton->setEnabled(true);
         m_ui->deployKeyButton->setEnabled(true);
+        m_ui->remoteProcessesButton->setEnabled(true);
         m_ui->configurationComboBox->setCurrentIndex(index);
         display(currentConfig());
     }
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurationssettingswidget.ui b/src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurationssettingswidget.ui
index 0dca479178..ad92b41db2 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurationssettingswidget.ui
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurationssettingswidget.ui
@@ -325,7 +325,7 @@
            <item row="9" column="0">
             <widget class="QLabel" name="keyLabel">
              <property name="text">
-              <string>Private key &amp;file:</string>
+              <string>Private key file:</string>
              </property>
             </widget>
            </item>
@@ -402,6 +402,9 @@
      </item>
      <item>
       <widget class="QPushButton" name="remoteProcessesButton">
+       <property name="enabled">
+        <bool>false</bool>
+       </property>
        <property name="text">
         <string>Remote Processes ...</string>
        </property>
@@ -557,8 +560,8 @@
    <slot>authenticationTypeChanged()</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>231</x>
-     <y>122</y>
+     <x>228</x>
+     <y>135</y>
     </hint>
     <hint type="destinationlabel">
      <x>513</x>
@@ -573,8 +576,8 @@
    <slot>keyFileEditingFinished()</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>430</x>
-     <y>323</y>
+     <x>149</x>
+     <y>334</y>
     </hint>
     <hint type="destinationlabel">
      <x>257</x>
@@ -589,8 +592,8 @@
    <slot>keyFileEditingFinished()</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>430</x>
-     <y>323</y>
+     <x>149</x>
+     <y>334</y>
     </hint>
     <hint type="destinationlabel">
      <x>257</x>
@@ -637,8 +640,8 @@
    <slot>authenticationTypeChanged()</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>335</x>
-     <y>122</y>
+     <x>280</x>
+     <y>135</y>
     </hint>
     <hint type="destinationlabel">
      <x>525</x>
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemoremoteprocessesdialog.ui b/src/plugins/qt4projectmanager/qt-maemo/maemoremoteprocessesdialog.ui
index 90fad49638..7e74791729 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemoremoteprocessesdialog.ui
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemoremoteprocessesdialog.ui
@@ -21,6 +21,9 @@
        <property name="text">
         <string>&amp;Filter by process name:</string>
        </property>
+       <property name="buddy">
+        <cstring>processFilterLineEdit</cstring>
+       </property>
       </widget>
      </item>
      <item>