feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Maemo: Add another link pointing to the device configurations page.

Browse Source 
The widget where the developer actually chooses the configuration
should definitely have that link as well.
This commit is contained in:
Christian Kandeler
2011-02-08 12:14:48 +01:00
parent d2cfe6cb05
commit 796ca5d51d
3 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/qt4projectmanager/qt-maemo/maemodeploystepwidget.cpp
View File

@@ -5,11 +5,14 @@
#include "maemodeployablelistmodel.h" #include "maemodeployablelistmodel.h"
#include "maemodeployables.h" #include "maemodeployables.h"
#include "maemodeviceconfigurations.h" #include "maemodeviceconfigurations.h"
#include "maemosettingspages.h"
#include "maemoglobal.h" #include "maemoglobal.h"
#include "maemomanager.h"
#include "maemopertargetdeviceconfigurationlistmodel.h" #include "maemopertargetdeviceconfigurationlistmodel.h"
#include "maemorunconfiguration.h" #include "maemorunconfiguration.h"
#include "qt4maemotarget.h" #include "qt4maemotarget.h"
#include <coreplugin/icore.h>
#include <projectexplorer/buildconfiguration.h> #include <projectexplorer/buildconfiguration.h>
#include <projectexplorer/target.h> #include <projectexplorer/target.h>
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
@@ -60,6 +63,8 @@ void MaemoDeployStepWidget::init()
ui->deployToSysrootCheckBox->setChecked(m_step->isDeployToSysrootEnabled()); ui->deployToSysrootCheckBox->setChecked(m_step->isDeployToSysrootEnabled());
connect(ui->deployToSysrootCheckBox, SIGNAL(toggled(bool)), this, connect(ui->deployToSysrootCheckBox, SIGNAL(toggled(bool)), this,
SLOT(setDeployToSysroot(bool))); SLOT(setDeployToSysroot(bool)));
connect(ui->manageDevConfsLabel, SIGNAL(linkActivated(QString)),
SLOT(showDeviceConfigurations()));
} }
void MaemoDeployStepWidget::handleDeviceUpdate() void MaemoDeployStepWidget::handleDeviceUpdate()
@@ -190,5 +195,12 @@ void MaemoDeployStepWidget::addIcon()
ui->tableView->resizeRowsToContents(); ui->tableView->resizeRowsToContents();
} }
void MaemoDeployStepWidget::showDeviceConfigurations()
{
MaemoDeviceConfigurationsSettingsPage *page
= MaemoManager::instance().deviceConfigurationsSettingsPage();
Core::ICore::instance()->showOptionsDialog(page->category(), page->id());
}
} // namespace Internal } // namespace Internal
} // namespace Qt4ProjectManager } // namespace Qt4ProjectManager

1
src/plugins/qt4projectmanager/qt-maemo/maemodeploystepwidget.h
View File

@@ -30,6 +30,7 @@ private:
Q_SLOT void handleModelListReset(); Q_SLOT void handleModelListReset();
Q_SLOT void addDesktopFile(); Q_SLOT void addDesktopFile();
Q_SLOT void addIcon(); Q_SLOT void addIcon();
Q_SLOT void showDeviceConfigurations();
virtual void init(); virtual void init();
virtual QString summaryText() const; virtual QString summaryText() const;

7
src/plugins/qt4projectmanager/qt-maemo/maemodeploystepwidget.ui
View File

@@ -30,6 +30,13 @@
</property> </property>
</widget> </widget>
</item> </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> <item>
<spacer name="horizontalSpacer"> <spacer name="horizontalSpacer">
<property name="orientation"> <property name="orientation">