From 92322229b78ff14d26d8fb4d6f24c5e106edcf44 Mon Sep 17 00:00:00 2001
From: Robert Loehning <robert.loehning@nokia.com>
Date: Fri, 15 Oct 2010 15:21:02 +0200
Subject: [PATCH] Fixed strings in context menu when breakpoints don't have a
number
Task-number: QTCREATORBUG-2742
Reviewed-by: hjk
---
src/plugins/debugger/debuggerengine.cpp | 22 ++++++++++++++++++----
1 file changed, 18 insertions(+), 4 deletions(-)
diff --git a/src/plugins/debugger/debuggerengine.cpp b/src/plugins/debugger/debuggerengine.cpp
index ff1c1c6981e..980b59e4e22 100644
--- a/src/plugins/debugger/debuggerengine.cpp
+++ b/src/plugins/debugger/debuggerengine.cpp
@@ -391,7 +391,11 @@ void DebuggerEnginePrivate::handleContextMenuRequest(const QVariant ¶meters)
if (data) {
// existing breakpoint
const QString number = QString::fromAscii(data->bpNumber);
- QAction *act = new QAction(tr("Remove Breakpoint %1").arg(number), menu);
+ QAction *act;
+ if (number.isEmpty())
+ act = new QAction(tr("Remove Breakpoint"), menu);
+ else
+ act = new QAction(tr("Remove Breakpoint %1").arg(number), menu);
act->setData(args);
connect(act, SIGNAL(triggered()),
this, SLOT(breakpointSetRemoveMarginActionTriggered()));
@@ -399,14 +403,24 @@ void DebuggerEnginePrivate::handleContextMenuRequest(const QVariant ¶meters)
QAction *act2;
if (data->enabled)
- act2 = new QAction(tr("Disable Breakpoint %1").arg(number), menu);
+ if (number.isEmpty())
+ act2 = new QAction(tr("Disable Breakpoint"), menu);
+ else
+ act2 = new QAction(tr("Disable Breakpoint %1").arg(number), menu);
else
- act2 = new QAction(tr("Enable Breakpoint %1").arg(number), menu);
+ if (number.isEmpty())
+ act2 = new QAction(tr("Enable Breakpoint"), menu);
+ else
+ act2 = new QAction(tr("Enable Breakpoint %1").arg(number), menu);
act2->setData(args);
connect(act2, SIGNAL(triggered()),
this, SLOT(breakpointEnableDisableMarginActionTriggered()));
menu->addAction(act2);
- QAction *editAction = new QAction(tr("Edit Breakpoint %1...").arg(number), menu);
+ QAction *editAction;
+ if (number.isEmpty())
+ editAction = new QAction(tr("Edit Breakpoint..."), menu);
+ else
+ editAction = new QAction(tr("Edit Breakpoint %1...").arg(number), menu);
connect(editAction, SIGNAL(triggered()), this, SLOT(slotEditBreakpoint()));
editAction->setData(qVariantFromValue(data));
menu->addAction(editAction);
--
GitLab