diff options
20 files changed, 43 insertions, 18 deletions
diff --git a/src/plugins/android/androidpotentialkit.cpp b/src/plugins/android/androidpotentialkit.cpp index 1ec2d10a7f..bc09d061b7 100644 --- a/src/plugins/android/androidpotentialkit.cpp +++ b/src/plugins/android/androidpotentialkit.cpp @@ -105,7 +105,7 @@ AndroidPotentialKitWidget::AndroidPotentialKitWidget(QWidget *parent) layout->addWidget(label, 0, 0, 1, 2); QPushButton *openOptions = new QPushButton; - openOptions->setText(tr("Open Settings")); + openOptions->setText(Core::ICore::msgShowOptionsDialog()); openOptions->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); layout->addWidget(openOptions, 1, 1); diff --git a/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp b/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp index 2d9e417d58..ac7ae8a1b7 100644 --- a/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp @@ -390,7 +390,7 @@ NoKitPage::NoKitPage(CMakeOpenProjectWizard *cmakeWizard) layout->addWidget(m_descriptionLabel); m_optionsButton = new QPushButton; - m_optionsButton->setText(tr("Show Options")); + m_optionsButton->setText(Core::ICore::msgShowOptionsDialog()); connect(m_optionsButton, SIGNAL(clicked()), this, SLOT(showOptions())); diff --git a/src/plugins/coreplugin/externaltool.cpp b/src/plugins/coreplugin/externaltool.cpp index 898b8e87b4..b7db6da8fa 100644 --- a/src/plugins/coreplugin/externaltool.cpp +++ b/src/plugins/coreplugin/externaltool.cpp @@ -700,7 +700,7 @@ ExternalToolManager::ExternalToolManager() d->m_configureSeparator = new QAction(this); d->m_configureSeparator->setSeparator(true); - d->m_configureAction = new QAction(tr("Configure..."), this); + d->m_configureAction = new QAction(Core::ICore::msgShowOptionsDialog(), this); connect(d->m_configureAction, SIGNAL(triggered()), this, SLOT(openPreferences())); // add the external tools menu diff --git a/src/plugins/coreplugin/fileutils.cpp b/src/plugins/coreplugin/fileutils.cpp index 214ad3a66d..43140dc34f 100644 --- a/src/plugins/coreplugin/fileutils.cpp +++ b/src/plugins/coreplugin/fileutils.cpp @@ -66,7 +66,7 @@ static void showGraphicalShellError(QWidget *parent, const QString &app, const Q if (!error.isEmpty()) mbox.setDetailedText(QApplication::translate("Core::Internal", "'%1' returned the following error:\n\n%2").arg(app, error)); - QAbstractButton *settingsButton = mbox.addButton(QApplication::translate("Core::Internal", "Settings..."), + QAbstractButton *settingsButton = mbox.addButton(Core::ICore::msgShowOptionsDialog(), QMessageBox::ActionRole); mbox.exec(); if (mbox.clickedButton() == settingsButton) diff --git a/src/plugins/coreplugin/icore.cpp b/src/plugins/coreplugin/icore.cpp index a244ff44da..f2ee9303e2 100644 --- a/src/plugins/coreplugin/icore.cpp +++ b/src/plugins/coreplugin/icore.cpp @@ -338,6 +338,11 @@ bool ICore::showOptionsDialog(const Id group, const Id page, QWidget *parent) return m_mainwindow->showOptionsDialog(group, page, parent); } +QString ICore::msgShowOptionsDialog() +{ + return QCoreApplication::translate("Core", "Configure...", "msgShowOptionsDialog"); +} + bool ICore::showWarningWithOptions(const QString &title, const QString &text, const QString &details, Id settingsCategory, diff --git a/src/plugins/coreplugin/icore.h b/src/plugins/coreplugin/icore.h index 0251f0cb74..45332a6717 100644 --- a/src/plugins/coreplugin/icore.h +++ b/src/plugins/coreplugin/icore.h @@ -73,6 +73,7 @@ public: const QVariantMap &extraVariables = QVariantMap()); static bool showOptionsDialog(Id group, Id page, QWidget *parent = 0); + static QString msgShowOptionsDialog(); static bool showWarningWithOptions(const QString &title, const QString &text, const QString &details = QString(), diff --git a/src/plugins/coreplugin/locator/locatorwidget.cpp b/src/plugins/coreplugin/locator/locatorwidget.cpp index 66ee96094a..0cd6a94237 100644 --- a/src/plugins/coreplugin/locator/locatorwidget.cpp +++ b/src/plugins/coreplugin/locator/locatorwidget.cpp @@ -223,7 +223,7 @@ LocatorWidget::LocatorWidget(Locator *qop) : m_completionList(new CompletionList(this)), m_filterMenu(new QMenu(this)), m_refreshAction(new QAction(tr("Refresh"), this)), - m_configureAction(new QAction(tr("Configure..."), this)), + m_configureAction(new QAction(Core::ICore::msgShowOptionsDialog(), this)), m_fileLineEdit(new Utils::FancyLineEdit), m_updateRequested(false), m_acceptRequested(false), diff --git a/src/plugins/coreplugin/vcsmanager.cpp b/src/plugins/coreplugin/vcsmanager.cpp index ced5902b58..9a8e164831 100644 --- a/src/plugins/coreplugin/vcsmanager.cpp +++ b/src/plugins/coreplugin/vcsmanager.cpp @@ -325,7 +325,8 @@ IVersionControl* VcsManager::findVersionControlForDirectory(const QString &input .arg(versionControl->displayName()), InfoBarEntry::GlobalSuppressionEnabled); d->m_unconfiguredVcs = versionControl; - info.setCustomButtonInfo(tr("Configure"), m_instance, SLOT(configureVcs())); + info.setCustomButtonInfo(Core::ICore::msgShowOptionsDialog(), m_instance, + SLOT(configureVcs())); infoBar->addInfo(info); } return 0; diff --git a/src/plugins/cpaster/protocol.cpp b/src/plugins/cpaster/protocol.cpp index cc500f77ce..2306ed252a 100644 --- a/src/plugins/cpaster/protocol.cpp +++ b/src/plugins/cpaster/protocol.cpp @@ -166,7 +166,7 @@ bool Protocol::showConfigurationError(const Protocol *p, QMessageBox mb(QMessageBox::Warning, title, message, QMessageBox::Cancel, parent); QPushButton *settingsButton = 0; if (showConfig) - settingsButton = mb.addButton(tr("Settings..."), QMessageBox::AcceptRole); + settingsButton = mb.addButton(Core::ICore::msgShowOptionsDialog(), QMessageBox::AcceptRole); mb.exec(); bool rc = false; if (mb.clickedButton() == settingsButton) diff --git a/src/plugins/debugger/debuggeractions.cpp b/src/plugins/debugger/debuggeractions.cpp index 073cd95777..c13f117a43 100644 --- a/src/plugins/debugger/debuggeractions.cpp +++ b/src/plugins/debugger/debuggeractions.cpp @@ -100,7 +100,7 @@ DebuggerSettings::DebuggerSettings() item = new SavedAction(this); insertItem(SettingsDialog, item); - item->setText(tr("Debugger Properties...")); + item->setText(tr("Configure Debugger...")); // // View diff --git a/src/plugins/debugger/debuggerkitconfigwidget.cpp b/src/plugins/debugger/debuggerkitconfigwidget.cpp index 720a690c4c..6626b6608f 100644 --- a/src/plugins/debugger/debuggerkitconfigwidget.cpp +++ b/src/plugins/debugger/debuggerkitconfigwidget.cpp @@ -83,7 +83,7 @@ DebuggerKitConfigWidget::DebuggerKitConfigWidget(Kit *workingCopy, const KitInfo refresh(); connect(m_comboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(currentDebuggerChanged(int))); - m_manageButton = new QPushButton(tr("Manage...")); + m_manageButton = new QPushButton(KitConfigWidget::msgManage()); m_manageButton->setContentsMargins(0, 0, 0, 0); connect(m_manageButton, SIGNAL(clicked()), this, SLOT(manageDebuggers())); diff --git a/src/plugins/projectexplorer/kitchooser.cpp b/src/plugins/projectexplorer/kitchooser.cpp index 592270c186..25f082b608 100644 --- a/src/plugins/projectexplorer/kitchooser.cpp +++ b/src/plugins/projectexplorer/kitchooser.cpp @@ -29,6 +29,7 @@ #include "kitchooser.h" +#include "kitconfigwidget.h" #include "kitinformation.h" #include "kitmanager.h" #include "projectexplorerconstants.h" @@ -49,7 +50,7 @@ KitChooser::KitChooser(QWidget *parent) : { m_chooser = new QComboBox(this); m_chooser->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed); - m_manageButton = new QPushButton(tr("Manage..."), this); + m_manageButton = new QPushButton(KitConfigWidget::msgManage(), this); QHBoxLayout *layout = new QHBoxLayout(this); layout->setContentsMargins(0, 0, 0, 0); diff --git a/src/plugins/projectexplorer/kitconfigwidget.cpp b/src/plugins/projectexplorer/kitconfigwidget.cpp index fa1834b4f2..eeea98dd9a 100644 --- a/src/plugins/projectexplorer/kitconfigwidget.cpp +++ b/src/plugins/projectexplorer/kitconfigwidget.cpp @@ -53,4 +53,9 @@ void KitConfigWidget::setMutable(bool b) m_kit->setMutable(m_kitInformation->id(), b); } +QString KitConfigWidget::msgManage() +{ + return tr("Manage..."); +} + } // namespace ProjectExplorer diff --git a/src/plugins/projectexplorer/kitconfigwidget.h b/src/plugins/projectexplorer/kitconfigwidget.h index 2db6d11ad0..8570147e2f 100644 --- a/src/plugins/projectexplorer/kitconfigwidget.h +++ b/src/plugins/projectexplorer/kitconfigwidget.h @@ -67,6 +67,8 @@ public: bool isMutable() const; void setMutable(bool b); + static QString msgManage(); + signals: void dirty(); diff --git a/src/plugins/projectexplorer/kitinformationconfigwidget.cpp b/src/plugins/projectexplorer/kitinformationconfigwidget.cpp index e93b8cb4f1..a5d119dd1a 100644 --- a/src/plugins/projectexplorer/kitinformationconfigwidget.cpp +++ b/src/plugins/projectexplorer/kitinformationconfigwidget.cpp @@ -129,7 +129,7 @@ ToolChainInformationConfigWidget::ToolChainInformationConfigWidget(Kit *k, const refresh(); connect(m_comboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(currentToolChainChanged(int))); - m_manageButton = new QPushButton(tr("Manage...")); + m_manageButton = new QPushButton(KitConfigWidget::msgManage()); m_manageButton->setContentsMargins(0, 0, 0, 0); connect(m_manageButton, SIGNAL(clicked()), this, SLOT(manageToolChains())); @@ -316,7 +316,7 @@ DeviceInformationConfigWidget::DeviceInformationConfigWidget(Kit *workingCopy, c { m_comboBox->setModel(m_model); - m_manageButton = new QPushButton(tr("Manage")); + m_manageButton = new QPushButton(KitConfigWidget::msgManage()); refresh(); m_comboBox->setToolTip(toolTip()); diff --git a/src/plugins/projectexplorer/projectwizardpage.cpp b/src/plugins/projectexplorer/projectwizardpage.cpp index 2b0b66774c..92eb6b90ba 100644 --- a/src/plugins/projectexplorer/projectwizardpage.cpp +++ b/src/plugins/projectexplorer/projectwizardpage.cpp @@ -54,6 +54,7 @@ ProjectWizardPage::ProjectWizardPage(QWidget *parent) : m_ui(new Ui::WizardPage) { m_ui->setupUi(this); + m_ui->vcsManageButton->setText(Core::ICore::msgShowOptionsDialog()); connect(m_ui->projectComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(slotProjectChanged(int))); connect(m_ui->vcsManageButton, SIGNAL(clicked()), this, SLOT(slotManageVcs())); diff --git a/src/plugins/projectexplorer/projectwizardpage.ui b/src/plugins/projectexplorer/projectwizardpage.ui index 1be771449d..f512edf44f 100644 --- a/src/plugins/projectexplorer/projectwizardpage.ui +++ b/src/plugins/projectexplorer/projectwizardpage.ui @@ -2,6 +2,14 @@ <ui version="4.0"> <class>ProjectExplorer::Internal::WizardPage</class> <widget class="QWizardPage" name="ProjectExplorer::Internal::WizardPage"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>397</width> + <height>248</height> + </rect> + </property> <property name="title"> <string>Project Management</string> </property> @@ -67,7 +75,7 @@ <item row="2" column="2"> <widget class="QPushButton" name="vcsManageButton"> <property name="text"> - <string>Manage...</string> + <string/> </property> </widget> </item> @@ -108,8 +116,8 @@ <rect> <x>0</x> <y>0</y> - <width>316</width> - <height>103</height> + <width>373</width> + <height>104</height> </rect> </property> <layout class="QVBoxLayout" name="verticalLayout_2"> diff --git a/src/plugins/projectexplorer/targetsetupwidget.cpp b/src/plugins/projectexplorer/targetsetupwidget.cpp index d8e1cfef99..a1d718be99 100644 --- a/src/plugins/projectexplorer/targetsetupwidget.cpp +++ b/src/plugins/projectexplorer/targetsetupwidget.cpp @@ -33,6 +33,7 @@ #include "buildinfo.h" #include "projectexplorerconstants.h" #include "kit.h" +#include "kitconfigwidget.h" #include "kitmanager.h" #include "kitoptionspage.h" @@ -79,7 +80,7 @@ TargetSetupWidget::TargetSetupWidget(Kit *k, Utils::FadingWidget *panel = new Utils::FadingWidget(m_detailsWidget); QHBoxLayout *panelLayout = new QHBoxLayout(panel); - m_manageButton = new QPushButton(tr("Manage...")); + m_manageButton = new QPushButton(KitConfigWidget::msgManage()); panelLayout->addWidget(m_manageButton); m_detailsWidget->setToolWidget(panel); diff --git a/src/plugins/qtsupport/qtkitconfigwidget.cpp b/src/plugins/qtsupport/qtkitconfigwidget.cpp index 70cf3605a5..1efee3ef9a 100644 --- a/src/plugins/qtsupport/qtkitconfigwidget.cpp +++ b/src/plugins/qtsupport/qtkitconfigwidget.cpp @@ -55,7 +55,7 @@ QtKitConfigWidget::QtKitConfigWidget(ProjectExplorer::Kit *k, const ProjectExplo versionIds.append(v->uniqueId()); versionsChanged(versionIds, QList<int>(), QList<int>()); - m_manageButton = new QPushButton(tr("Manage...")); + m_manageButton = new QPushButton(KitConfigWidget::msgManage()); refresh(); m_combo->setToolTip(toolTip()); diff --git a/src/plugins/vcsbase/vcsconfigurationpage.cpp b/src/plugins/vcsbase/vcsconfigurationpage.cpp index 2ecce32ea4..41e7d7532b 100644 --- a/src/plugins/vcsbase/vcsconfigurationpage.cpp +++ b/src/plugins/vcsbase/vcsconfigurationpage.cpp @@ -61,7 +61,7 @@ VcsConfigurationPage::VcsConfigurationPage(const Core::IVersionControl *vc, QWid setSubTitle(tr("Please configure <b>%1</b> now.").arg(vc->displayName())); d->m_versionControl = vc; - d->m_configureButton = new QPushButton(tr("Configure..."), this); + d->m_configureButton = new QPushButton(Core::ICore::msgShowOptionsDialog(), this); QVBoxLayout *verticalLayout = new QVBoxLayout(this); verticalLayout->addWidget(d->m_configureButton); |