From 59e752836002102fe13f930965502a36bffa7c77 Mon Sep 17 00:00:00 2001 From: Francois Ferrand Date: Tue, 6 Sep 2016 14:21:09 +0200 Subject: [PATCH] Settings: Regroup all Devices-related configuration pages Each kind of Device used to add its own top-level preference page, with only a single tab in each, which makes the list of categories almost irrelevant. Regrouping all these under the 'Devices' category makes the settings page much more consistent and reduces the clutter. Change-Id: I72c04b57004c2e1b1f57208bdaabe8b944390558 Reviewed-by: Eike Ziller --- src/plugins/android/androidconstants.h | 4 +--- src/plugins/android/androidsettingspage.cpp | 10 ++++----- src/plugins/baremetal/baremetal.pro | 2 -- src/plugins/baremetal/baremetal.qrc | 5 ----- src/plugins/baremetal/baremetalconstants.h | 6 +----- .../gdbserverproviderssettingspage.cpp | 19 ++++++++++++------ src/plugins/baremetal/images/QtBareMetal.png | Bin 5204 -> 0 bytes src/plugins/ios/iosconstants.h | 4 +--- src/plugins/ios/iossettingspage.cpp | 11 +++++----- .../devicesupport/devicesettingspage.cpp | 3 ++- .../projectexplorerconstants.h | 1 + src/plugins/qnx/qnxconstants.h | 4 +--- src/plugins/qnx/qnxsettingspage.cpp | 8 ++++---- 13 files changed, 35 insertions(+), 42 deletions(-) delete mode 100644 src/plugins/baremetal/baremetal.qrc delete mode 100644 src/plugins/baremetal/images/QtBareMetal.png diff --git a/src/plugins/android/androidconstants.h b/src/plugins/android/androidconstants.h index d51c40b13f8..1966164d4bb 100644 --- a/src/plugins/android/androidconstants.h +++ b/src/plugins/android/androidconstants.h @@ -47,9 +47,7 @@ enum AndroidQemuStatus { } // namespace Internal namespace Constants { -const char ANDROID_SETTINGS_ID[] = "ZZ.Android Configurations"; -const char ANDROID_SETTINGS_CATEGORY[] = "XA.Android"; -const char ANDROID_SETTINGS_TR_CATEGORY[] = QT_TRANSLATE_NOOP("Android", "Android"); +const char ANDROID_SETTINGS_ID[] = "BB.Android Configurations"; const char ANDROID_SETTINGS_CATEGORY_ICON[] = ":/android/images/QtAndroid.png"; const char ANDROID_TOOLCHAIN_ID[] = "Qt4ProjectManager.ToolChain.Android"; const char ANDROIDQT[] = "Qt4ProjectManager.QtVersion.Android"; diff --git a/src/plugins/android/androidsettingspage.cpp b/src/plugins/android/androidsettingspage.cpp index c737248e9de..8d70dcffe13 100644 --- a/src/plugins/android/androidsettingspage.cpp +++ b/src/plugins/android/androidsettingspage.cpp @@ -28,6 +28,7 @@ #include "androidsettingswidget.h" #include "androidconstants.h" #include "androidtoolchain.h" +#include #include #include @@ -41,11 +42,10 @@ AndroidSettingsPage::AndroidSettingsPage(QObject *parent) : Core::IOptionsPage(parent) { setId(Constants::ANDROID_SETTINGS_ID); - setDisplayName(tr("Android Configurations")); - setCategory(Constants::ANDROID_SETTINGS_CATEGORY); - setDisplayCategory(QCoreApplication::translate("Android", - Constants::ANDROID_SETTINGS_TR_CATEGORY)); - setCategoryIcon(Utils::Icon(Constants::ANDROID_SETTINGS_CATEGORY_ICON)); + setDisplayName(tr("Android")); + setCategory(ProjectExplorer::Constants::DEVICE_SETTINGS_CATEGORY); + setDisplayCategory(QCoreApplication::translate("ProjectExplorer", + ProjectExplorer::Constants::DEVICE_SETTINGS_TR_CATEGORY)); } QWidget *AndroidSettingsPage::widget() diff --git a/src/plugins/baremetal/baremetal.pro b/src/plugins/baremetal/baremetal.pro index 6f534d90aa7..b79db4aac5c 100644 --- a/src/plugins/baremetal/baremetal.pro +++ b/src/plugins/baremetal/baremetal.pro @@ -47,5 +47,3 @@ HEADERS += baremetalplugin.h \ openocdgdbserverprovider.h \ defaultgdbserverprovider.h \ stlinkutilgdbserverprovider.h - -RESOURCES = baremetal.qrc diff --git a/src/plugins/baremetal/baremetal.qrc b/src/plugins/baremetal/baremetal.qrc deleted file mode 100644 index 1226d8f5878..00000000000 --- a/src/plugins/baremetal/baremetal.qrc +++ /dev/null @@ -1,5 +0,0 @@ - - - images/QtBareMetal.png - - diff --git a/src/plugins/baremetal/baremetalconstants.h b/src/plugins/baremetal/baremetalconstants.h index 7b1358cc33b..def72715773 100644 --- a/src/plugins/baremetal/baremetalconstants.h +++ b/src/plugins/baremetal/baremetalconstants.h @@ -34,11 +34,7 @@ const char BareMetalOsType[] = "BareMetalOsType"; const char ACTION_ID[] = "BareMetal.Action"; const char MENU_ID[] = "BareMetal.Menu"; -const char BAREMETAL_SETTINGS_CATEGORY[] = "ZZ.BareMetal"; -const char BAREMETAL_SETTINGS_TR_CATEGORY[] = QT_TRANSLATE_NOOP("BareMetal", "Bare Metal"); -const char BAREMETAL_SETTINGS_CATEGORY_ICON[] = ":/baremetal/images/QtBareMetal.png"; - -const char GDB_PROVIDERS_SETTINGS_ID[] = "AA.BareMetal.GdbServerProvidersOptions"; +const char GDB_PROVIDERS_SETTINGS_ID[] = "EE.BareMetal.GdbServerProvidersOptions"; // Debugger Server Provider Ids const char OPENOCD_PROVIDER_ID[] = "BareMetal.GdbServerProvider.OpenOcd"; diff --git a/src/plugins/baremetal/gdbserverproviderssettingspage.cpp b/src/plugins/baremetal/gdbserverproviderssettingspage.cpp index d01bcddac15..6cf97c60f08 100644 --- a/src/plugins/baremetal/gdbserverproviderssettingspage.cpp +++ b/src/plugins/baremetal/gdbserverproviderssettingspage.cpp @@ -30,6 +30,7 @@ #include #include +#include #include #include @@ -47,6 +48,7 @@ #include #include #include +#include using namespace Utils; @@ -293,10 +295,16 @@ GdbServerProvidersSettingsWidget::GdbServerProvidersSettingsWidget verticalLayout->addWidget(m_providerView); verticalLayout->addLayout(buttonLayout); - auto horizontalLayout = new QHBoxLayout(this); + auto horizontalLayout = new QHBoxLayout(); horizontalLayout->addLayout(verticalLayout); horizontalLayout->addWidget(m_container); + auto groupBox = new QGroupBox(tr("GDB Server Providers"), this); + groupBox->setLayout(horizontalLayout); + + auto topLayout = new QVBoxLayout(this); + topLayout->addWidget(groupBox); + connect(&m_model, &GdbServerProviderModel::providerStateChanged, this, &GdbServerProvidersSettingsWidget::updateState); @@ -411,12 +419,11 @@ QModelIndex GdbServerProvidersSettingsWidget::currentIndex() const GdbServerProvidersSettingsPage::GdbServerProvidersSettingsPage(QObject *parent) : Core::IOptionsPage(parent) { - setCategory(Constants::BAREMETAL_SETTINGS_CATEGORY); - setDisplayCategory(QCoreApplication::translate( - "BareMetal", Constants::BAREMETAL_SETTINGS_TR_CATEGORY)); - setCategoryIcon(Utils::Icon(Constants::BAREMETAL_SETTINGS_CATEGORY_ICON)); setId(Constants::GDB_PROVIDERS_SETTINGS_ID); - setDisplayName(tr("GDB Server Providers")); + setDisplayName(tr("Bare Metal")); + setCategory(ProjectExplorer::Constants::DEVICE_SETTINGS_CATEGORY); + setDisplayCategory(QCoreApplication::translate("ProjectExplorer", + ProjectExplorer::Constants::DEVICE_SETTINGS_TR_CATEGORY)); } QWidget *GdbServerProvidersSettingsPage::widget() diff --git a/src/plugins/baremetal/images/QtBareMetal.png b/src/plugins/baremetal/images/QtBareMetal.png deleted file mode 100644 index 969916316a84fab1e01430e1a6706e159a1d20df..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5204 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 K&t;ucLK6Um3et1{ diff --git a/src/plugins/ios/iosconstants.h b/src/plugins/ios/iosconstants.h index 4bb8e9b832c..6dffc21e381 100644 --- a/src/plugins/ios/iosconstants.h +++ b/src/plugins/ios/iosconstants.h @@ -34,9 +34,7 @@ Q_DECLARE_LOGGING_CATEGORY(iosLog) } // namespace Internal namespace Constants { -const char IOS_SETTINGS_ID[] = "ZZ.Ios Configurations"; -const char IOS_SETTINGS_CATEGORY[] = "XA.Ios"; -const char IOS_SETTINGS_TR_CATEGORY[] = QT_TRANSLATE_NOOP("Ios", "iOS"); +const char IOS_SETTINGS_ID[] = "CC.Ios Configurations"; const char IOS_SETTINGS_CATEGORY_ICON[] = ":/ios/images/iossettings.png"; const char IOSQT[] = "Qt4ProjectManager.QtVersion.Ios"; // this literal is replicated to avoid dependencies diff --git a/src/plugins/ios/iossettingspage.cpp b/src/plugins/ios/iossettingspage.cpp index 84e103deb07..e3d5bc19e3f 100644 --- a/src/plugins/ios/iossettingspage.cpp +++ b/src/plugins/ios/iossettingspage.cpp @@ -28,6 +28,8 @@ #include "iossettingswidget.h" #include "iosconstants.h" +#include + #include namespace Ios { @@ -37,11 +39,10 @@ IosSettingsPage::IosSettingsPage(QObject *parent) : Core::IOptionsPage(parent) { setId(Constants::IOS_SETTINGS_ID); - setDisplayName(tr("iOS Configurations")); - setCategory(Constants::IOS_SETTINGS_CATEGORY); - setDisplayCategory(QCoreApplication::translate("iOS", - Constants::IOS_SETTINGS_TR_CATEGORY)); - setCategoryIcon(Utils::Icon(QLatin1String(Constants::IOS_SETTINGS_CATEGORY_ICON))); + setDisplayName(tr("iOS")); + setCategory(ProjectExplorer::Constants::DEVICE_SETTINGS_CATEGORY); + setDisplayCategory(QCoreApplication::translate("ProjectExplorer", + ProjectExplorer::Constants::DEVICE_SETTINGS_TR_CATEGORY)); } QWidget *IosSettingsPage::widget() diff --git a/src/plugins/projectexplorer/devicesupport/devicesettingspage.cpp b/src/plugins/projectexplorer/devicesupport/devicesettingspage.cpp index 3958b9d3857..078d5fdff24 100644 --- a/src/plugins/projectexplorer/devicesupport/devicesettingspage.cpp +++ b/src/plugins/projectexplorer/devicesupport/devicesettingspage.cpp @@ -41,7 +41,8 @@ DeviceSettingsPage::DeviceSettingsPage(QObject *parent) setId(Constants::DEVICE_SETTINGS_PAGE_ID); setDisplayName(tr("Devices")); setCategory(Constants::DEVICE_SETTINGS_CATEGORY); - setDisplayCategory(QCoreApplication::translate("ProjectExplorer", "Devices")); + setDisplayCategory(QCoreApplication::translate("ProjectExplorer", + ProjectExplorer::Constants::DEVICE_SETTINGS_TR_CATEGORY)); setCategoryIcon(Utils::Icon(":/projectexplorer/images/MaemoDevice.png")); } diff --git a/src/plugins/projectexplorer/projectexplorerconstants.h b/src/plugins/projectexplorer/projectexplorerconstants.h index 8d2ef91ff75..b5f0cb31908 100644 --- a/src/plugins/projectexplorer/projectexplorerconstants.h +++ b/src/plugins/projectexplorer/projectexplorerconstants.h @@ -172,6 +172,7 @@ const char KITS_SETTINGS_PAGE_ID[] = "D.ProjectExplorer.KitsOptions"; // Device settings page const char DEVICE_SETTINGS_CATEGORY[] = "XW.Devices"; +const char DEVICE_SETTINGS_TR_CATEGORY[] = QT_TRANSLATE_NOOP("ProjectExplorer", "Devices"); const char DEVICE_SETTINGS_PAGE_ID[] = "AA.Device Settings"; // Task categories diff --git a/src/plugins/qnx/qnxconstants.h b/src/plugins/qnx/qnxconstants.h index c77dbc21e56..5dcb5c44c97 100644 --- a/src/plugins/qnx/qnxconstants.h +++ b/src/plugins/qnx/qnxconstants.h @@ -55,10 +55,8 @@ const char QNX_DEBUG_EXECUTABLE[] = "pdebug"; const char QNX_TOOLCHAIN_ID[] = "Qnx.QccToolChain"; // QNX settings constants -const char QNX_CATEGORY[] = "XF.Qnx"; -const char QNX_CATEGORY_TR[] = QT_TRANSLATE_NOOP("QNX", "QNX"); const char QNX_CATEGORY_ICON[] = ":/qnx/images/qnx-target.png"; -const char QNX_SETTINGS_ID[] = "ZZ.Qnx Configuration"; +const char QNX_SETTINGS_ID[] = "DD.Qnx Configuration"; const char QNX_CONFIGS_FILENAME[] = "qnxconfigurations.xml"; diff --git a/src/plugins/qnx/qnxsettingspage.cpp b/src/plugins/qnx/qnxsettingspage.cpp index 5644fb64c05..8bc719a2c71 100644 --- a/src/plugins/qnx/qnxsettingspage.cpp +++ b/src/plugins/qnx/qnxsettingspage.cpp @@ -30,6 +30,7 @@ #include "qnxsettingswidget.h" #include +#include #include @@ -43,10 +44,9 @@ QnxSettingsPage::QnxSettingsPage(QObject* parent) : { setId(Core::Id(Constants::QNX_SETTINGS_ID)); setDisplayName(tr("QNX")); - setCategory(Constants::QNX_CATEGORY); - setDisplayCategory(QCoreApplication::translate("QNX", - Constants::QNX_CATEGORY_TR)); - setCategoryIcon(Utils::Icon(Constants::QNX_CATEGORY_ICON)); + setCategory(ProjectExplorer::Constants::DEVICE_SETTINGS_CATEGORY); + setDisplayCategory(QCoreApplication::translate("ProjectExplorer", + ProjectExplorer::Constants::DEVICE_SETTINGS_TR_CATEGORY)); } QWidget* QnxSettingsPage::widget()