From 2a1c503bc343c7339b66667c73ffd22f0ad606ff Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date: Fri, 17 Apr 2009 11:31:52 +0200
Subject: [PATCH] Fix debugger settings action.
---
src/plugins/debugger/debuggerconstants.h | 1 +
src/plugins/debugger/debuggerplugin.cpp | 7 ++++---
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/plugins/debugger/debuggerconstants.h b/src/plugins/debugger/debuggerconstants.h
index f4e2ae6e04c..119b6afe2a0 100644
--- a/src/plugins/debugger/debuggerconstants.h
+++ b/src/plugins/debugger/debuggerconstants.h
@@ -53,6 +53,7 @@ const char * const M_DEBUG_VIEWS = "Debugger.Menu.View.Debug";
const char * const C_GDBDEBUGGER = "Gdb Debugger";
const char * const GDBRUNNING = "Gdb.Running";
+const char * const DEBUGGER_COMMON_SETTINGS_PAGE = QT_TRANSLATE_NOOP("Debugger", "Common");
const char * const DEBUGGER_SETTINGS_CATEGORY = QT_TRANSLATE_NOOP("Debugger", "Debugger");
namespace Internal {
diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp
index de6c264b2f2..40c258e3c51 100644
--- a/src/plugins/debugger/debuggerplugin.cpp
+++ b/src/plugins/debugger/debuggerplugin.cpp
@@ -246,8 +246,8 @@ public:
CommonOptionsPage() {}
// IOptionsPage
- QString id() const { return QLatin1String("Common"); }
- QString trName() const { return tr("Common"); }
+ QString id() const { return QLatin1String(Debugger::Constants::DEBUGGER_COMMON_SETTINGS_PAGE); }
+ QString trName() const { return QCoreApplication::translate("Debugger", Debugger::Constants::DEBUGGER_COMMON_SETTINGS_PAGE); }
QString category() const { return QLatin1String(Debugger::Constants::DEBUGGER_SETTINGS_CATEGORY); }
QString trCategory() const { return QCoreApplication::translate("Debugger", Debugger::Constants::DEBUGGER_SETTINGS_CATEGORY); }
@@ -988,7 +988,8 @@ void DebuggerPlugin::focusCurrentEditor(IMode *mode)
void DebuggerPlugin::showSettingsDialog()
{
- Core::ICore::instance()->showOptionsDialog("Debugger", "General");
+ Core::ICore::instance()->showOptionsDialog(QLatin1String(Debugger::Constants::DEBUGGER_SETTINGS_CATEGORY),
+ QLatin1String(Debugger::Constants::DEBUGGER_COMMON_SETTINGS_PAGE));
}
#include "debuggerplugin.moc"
--
GitLab