From 5942b48e82543a6aff7890eddd6097f90b2c9840 Mon Sep 17 00:00:00 2001 From: Rafael Roquetto Date: Thu, 17 Jan 2013 15:27:02 -0200 Subject: [PATCH] [BlackBerry] Move NDK settings to its own category Also rename the associated files accordingly. Change-Id: Ibc0ca2c9840733968dafb6d790220d4d59f4a419 Reviewed-by: Mehdi Fekari Reviewed-by: Tobias Hunger --- ...page.cpp => blackberryndksettingspage.cpp} | 23 ++++++++++--------- ...ingspage.h => blackberryndksettingspage.h} | 14 +++++------ ...et.cpp => blackberryndksettingswidget.cpp} | 18 +++++++-------- ...widget.h => blackberryndksettingswidget.h} | 14 +++++------ ...dget.ui => blackberryndksettingswidget.ui} | 4 ++-- src/plugins/qnx/qnx.pro | 10 ++++---- src/plugins/qnx/qnx.qbs | 10 ++++---- src/plugins/qnx/qnxconstants.h | 7 ++++-- src/plugins/qnx/qnxplugin.cpp | 4 ++-- 9 files changed, 54 insertions(+), 50 deletions(-) rename src/plugins/qnx/{blackberrysettingspage.cpp => blackberryndksettingspage.cpp} (75%) rename src/plugins/qnx/{blackberrysettingspage.h => blackberryndksettingspage.h} (84%) rename src/plugins/qnx/{blackberrysettingswidget.cpp => blackberryndksettingswidget.cpp} (90%) rename src/plugins/qnx/{blackberrysettingswidget.h => blackberryndksettingswidget.h} (86%) rename src/plugins/qnx/{blackberrysettingswidget.ui => blackberryndksettingswidget.ui} (91%) diff --git a/src/plugins/qnx/blackberrysettingspage.cpp b/src/plugins/qnx/blackberryndksettingspage.cpp similarity index 75% rename from src/plugins/qnx/blackberrysettingspage.cpp rename to src/plugins/qnx/blackberryndksettingspage.cpp index ab54bb0b9f0..f5bb94b2dc0 100644 --- a/src/plugins/qnx/blackberrysettingspage.cpp +++ b/src/plugins/qnx/blackberryndksettingspage.cpp @@ -29,8 +29,8 @@ ** ****************************************************************************/ -#include "blackberrysettingspage.h" -#include "blackberrysettingswidget.h" +#include "blackberryndksettingspage.h" +#include "blackberryndksettingswidget.h" #include "qnxconstants.h" #include @@ -40,27 +40,28 @@ namespace Qnx { namespace Internal { -BlackBerrySettingsPage::BlackBerrySettingsPage(QObject *parent) : +BlackBerryNDKSettingsPage::BlackBerryNDKSettingsPage(QObject *parent) : Core::IOptionsPage(parent) { - setId(Constants::QNX_SETTINGS_ID); - setDisplayName(tr("BlackBerry")); - setCategory(ProjectExplorer::Constants::PROJECTEXPLORER_SETTINGS_CATEGORY); + setId(Core::Id(Constants::QNX_BB_NDK_SETTINGS_ID)); + setDisplayName(tr("NDK")); + setCategory(Constants::QNX_BB_CATEGORY); setDisplayCategory(QCoreApplication::translate("BlackBerry", - Constants::QNX_SETTINGS_TR_CATEGORY)); + Constants::QNX_BB_CATEGORY_TR)); + setCategoryIcon(QLatin1String(Constants::QNX_BB_CATEGORY_ICON)); } -QWidget *BlackBerrySettingsPage::createPage(QWidget *parent) +QWidget *BlackBerryNDKSettingsPage::createPage(QWidget *parent) { - m_widget = new BlackBerrySettingsWidget(parent); + m_widget = new BlackBerryNDKSettingsWidget(parent); return m_widget; } -void BlackBerrySettingsPage::apply() +void BlackBerryNDKSettingsPage::apply() { } -void BlackBerrySettingsPage::finish() +void BlackBerryNDKSettingsPage::finish() { } diff --git a/src/plugins/qnx/blackberrysettingspage.h b/src/plugins/qnx/blackberryndksettingspage.h similarity index 84% rename from src/plugins/qnx/blackberrysettingspage.h rename to src/plugins/qnx/blackberryndksettingspage.h index 866334387cb..af31f7ef044 100644 --- a/src/plugins/qnx/blackberrysettingspage.h +++ b/src/plugins/qnx/blackberryndksettingspage.h @@ -29,30 +29,30 @@ ** ****************************************************************************/ -#ifndef BLACKBERRYSETTINGSPAGE_H -#define BLACKBERRYSETTINGSPAGE_H +#ifndef BLACKBERRYNDKSETTINGSPAGE_H +#define BLACKBERRYNDKSETTINGSPAGE_H #include namespace Qnx { namespace Internal { -class BlackBerrySettingsWidget; +class BlackBerryNDKSettingsWidget; -class BlackBerrySettingsPage : public Core::IOptionsPage +class BlackBerryNDKSettingsPage : public Core::IOptionsPage { Q_OBJECT public: - explicit BlackBerrySettingsPage(QObject *parent = 0); + explicit BlackBerryNDKSettingsPage(QObject *parent = 0); QWidget *createPage(QWidget *parent); void apply(); void finish(); private: - BlackBerrySettingsWidget *m_widget; + BlackBerryNDKSettingsWidget *m_widget; }; } // namespace Internal } // namespace Qnx -#endif // BLACKBERRYSETTINGSPAGE_H +#endif // BLACKBERRYNDKSETTINGSPAGE_H diff --git a/src/plugins/qnx/blackberrysettingswidget.cpp b/src/plugins/qnx/blackberryndksettingswidget.cpp similarity index 90% rename from src/plugins/qnx/blackberrysettingswidget.cpp rename to src/plugins/qnx/blackberryndksettingswidget.cpp index 4ab0d9fcfae..56735597418 100644 --- a/src/plugins/qnx/blackberrysettingswidget.cpp +++ b/src/plugins/qnx/blackberryndksettingswidget.cpp @@ -29,8 +29,8 @@ ** ****************************************************************************/ -#include "blackberrysettingswidget.h" -#include "ui_blackberrysettingswidget.h" +#include "blackberryndksettingswidget.h" +#include "ui_blackberryndksettingswidget.h" #include "qnxutils.h" #include @@ -42,9 +42,9 @@ namespace Qnx { namespace Internal { -BlackBerrySettingsWidget::BlackBerrySettingsWidget(QWidget *parent) : +BlackBerryNDKSettingsWidget::BlackBerryNDKSettingsWidget(QWidget *parent) : QWidget(parent), - m_ui(new Ui_BlackBerrySettingsWidget) + m_ui(new Ui_BlackBerryNDKSettingsWidget) { m_bbConfig = &BlackBerryConfiguration::instance(); m_ui->setupUi(this); @@ -58,14 +58,14 @@ BlackBerrySettingsWidget::BlackBerrySettingsWidget(QWidget *parent) : connect(m_bbConfig, SIGNAL(updated()), this, SLOT(updateInfoTable())); } -void BlackBerrySettingsWidget::checkSdkPath() +void BlackBerryNDKSettingsWidget::checkSdkPath() { if (!m_ui->sdkPath->path().isEmpty() && QnxUtils::isValidNdkPath(m_ui->sdkPath->path())) m_bbConfig->setupConfiguration(m_ui->sdkPath->path()); } -void BlackBerrySettingsWidget::updateInfoTable() +void BlackBerryNDKSettingsWidget::updateInfoTable() { QMultiMap env = m_bbConfig->qnxEnv(); @@ -98,14 +98,14 @@ void BlackBerrySettingsWidget::updateInfoTable() m_ui->removeButton->setEnabled(true); } -void BlackBerrySettingsWidget::clearInfoTable() +void BlackBerryNDKSettingsWidget::clearInfoTable() { m_infoModel->clear(); m_ui->sdkPath->setPath(QString()); m_ui->removeButton->setEnabled(false); } -void BlackBerrySettingsWidget::cleanConfiguration() +void BlackBerryNDKSettingsWidget::cleanConfiguration() { QMessageBox::StandardButton button = QMessageBox::question(Core::ICore::mainWindow(), @@ -117,7 +117,7 @@ void BlackBerrySettingsWidget::cleanConfiguration() m_bbConfig->cleanConfiguration(); } -void BlackBerrySettingsWidget::initInfoTable() +void BlackBerryNDKSettingsWidget::initInfoTable() { m_infoModel = new QStandardItemModel(this); diff --git a/src/plugins/qnx/blackberrysettingswidget.h b/src/plugins/qnx/blackberryndksettingswidget.h similarity index 86% rename from src/plugins/qnx/blackberrysettingswidget.h rename to src/plugins/qnx/blackberryndksettingswidget.h index 218ccf102d3..edf76bbce99 100644 --- a/src/plugins/qnx/blackberrysettingswidget.h +++ b/src/plugins/qnx/blackberryndksettingswidget.h @@ -29,8 +29,8 @@ ** ****************************************************************************/ -#ifndef BLACKBERRYSETTINGSWIDGET_H -#define BLACKBERRYSETTINGSWIDGET_H +#ifndef BLACKBERRYNDKSETTINGSWIDGET_H +#define BLACKBERRYNDKSETTINGSWIDGET_H #include "blackberryconfiguration.h" @@ -41,14 +41,14 @@ namespace Qnx { namespace Internal { -class Ui_BlackBerrySettingsWidget; +class Ui_BlackBerryNDKSettingsWidget; -class BlackBerrySettingsWidget : public QWidget +class BlackBerryNDKSettingsWidget : public QWidget { Q_OBJECT public: - explicit BlackBerrySettingsWidget(QWidget *parent = 0); + explicit BlackBerryNDKSettingsWidget(QWidget *parent = 0); signals: void sdkPathChanged(); @@ -62,7 +62,7 @@ public slots: private: void initInfoTable(); QString m_sdkPath; - Ui_BlackBerrySettingsWidget *m_ui; + Ui_BlackBerryNDKSettingsWidget *m_ui; BlackBerryConfiguration *m_bbConfig; QStandardItemModel *m_infoModel; @@ -71,4 +71,4 @@ private: } // namespace Internal } // namespeace Qnx -#endif // BLACKBERRYSETTINGSWIDGET_H +#endif // BLACKBERRYNDKSETTINGSWIDGET_H diff --git a/src/plugins/qnx/blackberrysettingswidget.ui b/src/plugins/qnx/blackberryndksettingswidget.ui similarity index 91% rename from src/plugins/qnx/blackberrysettingswidget.ui rename to src/plugins/qnx/blackberryndksettingswidget.ui index a5e5d3b5d13..a926e5822d3 100644 --- a/src/plugins/qnx/blackberrysettingswidget.ui +++ b/src/plugins/qnx/blackberryndksettingswidget.ui @@ -1,7 +1,7 @@ - Qnx::Internal::BlackBerrySettingsWidget - + Qnx::Internal::BlackBerryNDKSettingsWidget + 0 diff --git a/src/plugins/qnx/qnx.pro b/src/plugins/qnx/qnx.pro index 37564ba8db8..382635a3f43 100644 --- a/src/plugins/qnx/qnx.pro +++ b/src/plugins/qnx/qnx.pro @@ -53,8 +53,8 @@ SOURCES += qnxplugin.cpp \ blackberrydeployinformation.cpp \ pathchooserdelegate.cpp \ blackberryabstractdeploystep.cpp \ - blackberrysettingswidget.cpp \ - blackberrysettingspage.cpp \ + blackberryndksettingswidget.cpp \ + blackberryndksettingspage.cpp \ blackberryconfiguration.cpp HEADERS += qnxplugin.h\ @@ -105,8 +105,8 @@ HEADERS += qnxplugin.h\ blackberrydeployinformation.h \ pathchooserdelegate.h \ blackberryabstractdeploystep.h \ - blackberrysettingswidget.h \ - blackberrysettingspage.h \ + blackberryndksettingswidget.h \ + blackberryndksettingspage.h \ blackberryconfiguration.h FORMS += \ @@ -117,7 +117,7 @@ FORMS += \ blackberrydeviceconfigurationwidget.ui \ qnxbaseqtconfigwidget.ui \ bardescriptorfileimagewizardpage.ui \ - blackberrysettingswidget.ui + blackberryndksettingswidget.ui RESOURCES += \ qnx.qrc diff --git a/src/plugins/qnx/qnx.qbs b/src/plugins/qnx/qnx.qbs index 756534e7372..c420728c297 100644 --- a/src/plugins/qnx/qnx.qbs +++ b/src/plugins/qnx/qnx.qbs @@ -77,11 +77,11 @@ QtcPlugin { "blackberryruncontrol.h", "blackberryruncontrolfactory.cpp", "blackberryruncontrolfactory.h", - "blackberrysettingswidget.cpp", - "blackberrysettingswidget.h", - "blackberrysettingswidget.ui", - "blackberrysettingspage.cpp", - "blackberrysettingspage.h", + "blackberryndksettingswidget.cpp", + "blackberryndksettingswidget.h", + "blackberryndksettingswidget.ui", + "blackberryndksettingspage.cpp", + "blackberryndksettingspage.h", "blackberryconfiguration.cpp", "blackberryconfiguration.h", "blackberrywizardextension.cpp", diff --git a/src/plugins/qnx/qnxconstants.h b/src/plugins/qnx/qnxconstants.h index dc6820d9590..3b428ac3197 100644 --- a/src/plugins/qnx/qnxconstants.h +++ b/src/plugins/qnx/qnxconstants.h @@ -88,8 +88,11 @@ const char QNX_BB_PLATFORM_NAME[] = "BlackBerry"; const char QNX_DEBUG_EXECUTABLE[] = "pdebug"; -const char QNX_SETTINGS_ID[] = "ZZ.Qnx Configuration"; -const char QNX_SETTINGS_TR_CATEGORY[] = QT_TRANSLATE_NOOP("BlackBerry", "BlackBerry"); +// BlackBerry settings constants +const char QNX_BB_CATEGORY[] = "BlackBerry"; +const char QNX_BB_CATEGORY_TR[] = QT_TRANSLATE_NOOP("BlackBerry", "BlackBerry"); +const char QNX_BB_CATEGORY_ICON[] = ":/qnx/images/target.png"; +const char QNX_BB_NDK_SETTINGS_ID[] = "ZZ.BlackBerry NDK Configuration"; } // namespace Constants } // namespace Qnx diff --git a/src/plugins/qnx/qnxplugin.cpp b/src/plugins/qnx/qnxplugin.cpp index cd0940e42f7..82662a1ce08 100644 --- a/src/plugins/qnx/qnxplugin.cpp +++ b/src/plugins/qnx/qnxplugin.cpp @@ -46,7 +46,7 @@ #include "qnxrunconfigurationfactory.h" #include "qnxqtversionfactory.h" #include "blackberrywizardextension.h" -#include "blackberrysettingspage.h" +#include "blackberryndksettingspage.h" #include @@ -74,7 +74,7 @@ bool QNXPlugin::initialize(const QStringList &arguments, QString *errorString) addAutoReleasedObject(new BlackBerryRunConfigurationFactory); addAutoReleasedObject(new BlackBerryRunControlFactory); addAutoReleasedObject(new BlackBerryWizardExtension); - addAutoReleasedObject(new BlackBerrySettingsPage); + addAutoReleasedObject(new BlackBerryNDKSettingsPage); // Handles QNX addAutoReleasedObject(new QnxQtVersionFactory);