From 796ca5d51d6299b399e4dd9bd6e8347b5bfa7af4 Mon Sep 17 00:00:00 2001
From: Christian Kandeler <christian.kandeler@nokia.com>
Date: Tue, 8 Feb 2011 12:14:48 +0100
Subject: [PATCH] Maemo: Add another link pointing to the device configurations
 page.

The widget where the developer actually chooses the configuration
should definitely have that link as well.
---
 .../qt-maemo/maemodeploystepwidget.cpp               | 12 ++++++++++++
 .../qt-maemo/maemodeploystepwidget.h                 |  1 +
 .../qt-maemo/maemodeploystepwidget.ui                |  7 +++++++
 3 files changed, 20 insertions(+)

diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemodeploystepwidget.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemodeploystepwidget.cpp
index c5a7fd44be2..459cd1a6dae 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemodeploystepwidget.cpp
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemodeploystepwidget.cpp
@@ -5,11 +5,14 @@
 #include "maemodeployablelistmodel.h"
 #include "maemodeployables.h"
 #include "maemodeviceconfigurations.h"
+#include "maemosettingspages.h"
 #include "maemoglobal.h"
+#include "maemomanager.h"
 #include "maemopertargetdeviceconfigurationlistmodel.h"
 #include "maemorunconfiguration.h"
 #include "qt4maemotarget.h"
 
+#include <coreplugin/icore.h>
 #include <projectexplorer/buildconfiguration.h>
 #include <projectexplorer/target.h>
 #include <utils/qtcassert.h>
@@ -60,6 +63,8 @@ void MaemoDeployStepWidget::init()
     ui->deployToSysrootCheckBox->setChecked(m_step->isDeployToSysrootEnabled());
     connect(ui->deployToSysrootCheckBox, SIGNAL(toggled(bool)), this,
         SLOT(setDeployToSysroot(bool)));
+    connect(ui->manageDevConfsLabel, SIGNAL(linkActivated(QString)),
+        SLOT(showDeviceConfigurations()));
 }
 
 void MaemoDeployStepWidget::handleDeviceUpdate()
@@ -190,5 +195,12 @@ void MaemoDeployStepWidget::addIcon()
     ui->tableView->resizeRowsToContents();
 }
 
+void MaemoDeployStepWidget::showDeviceConfigurations()
+{
+    MaemoDeviceConfigurationsSettingsPage *page
+        = MaemoManager::instance().deviceConfigurationsSettingsPage();
+    Core::ICore::instance()->showOptionsDialog(page->category(), page->id());
+}
+
 } // namespace Internal
 } // namespace Qt4ProjectManager
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemodeploystepwidget.h b/src/plugins/qt4projectmanager/qt-maemo/maemodeploystepwidget.h
index 6f3f8b18a30..50e2b71d60a 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemodeploystepwidget.h
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemodeploystepwidget.h
@@ -30,6 +30,7 @@ private:
     Q_SLOT void handleModelListReset();
     Q_SLOT void addDesktopFile();
     Q_SLOT void addIcon();
+    Q_SLOT void showDeviceConfigurations();
 
     virtual void init();
     virtual QString summaryText() const;
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemodeploystepwidget.ui b/src/plugins/qt4projectmanager/qt-maemo/maemodeploystepwidget.ui
index ef21cb61d06..bc085fd0d47 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemodeploystepwidget.ui
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemodeploystepwidget.ui
@@ -30,6 +30,13 @@
        </property>
       </widget>
      </item>
+     <item>
+      <widget class="QLabel" name="manageDevConfsLabel">
+       <property name="text">
+        <string>&lt;a href=irrelevant&gt;Manage device configurations&lt;/a&gt;</string>
+       </property>
+      </widget>
+     </item>
      <item>
       <spacer name="horizontalSpacer">
        <property name="orientation">