feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

debugger: Remove All Watch Items -> Remove All Evaluated Expressions

Browse Source 
Task-number: QTCREATORBUG-5919
Change-Id: I49288a500e5771a3f6489ce993bd7b00b3176e50
Reviewed-on: http://codereview.qt.nokia.com/3582
Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
hjk
2011-08-25 11:43:07 +02:00
committed by hjk
parent 716ab646de
commit e3849b5ebd
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/debugger/watchwindow.cpp
View File

@@ -760,7 +760,8 @@ void WatchWindow::contextMenuEvent(QContextMenuEvent *ev)
breakpointMenu.addAction(actSetWatchpointAtExpression); breakpointMenu.addAction(actSetWatchpointAtExpression);
QMenu menu; QMenu menu;
QAction *actInsertNewWatchItem = menu.addAction(tr("Insert New Evaluated Expression")); QAction *actInsertNewWatchItem =
menu.addAction(tr("Insert New Evaluated Expression"));
actInsertNewWatchItem->setEnabled(canHandleWatches && canInsertWatches); actInsertNewWatchItem->setEnabled(canHandleWatches && canInsertWatches);
QAction *actSelectWidgetToWatch = menu.addAction(tr("Select Widget to Watch")); QAction *actSelectWidgetToWatch = menu.addAction(tr("Select Widget to Watch"));
actSelectWidgetToWatch->setEnabled(canHandleWatches actSelectWidgetToWatch->setEnabled(canHandleWatches
@@ -774,7 +775,8 @@ void WatchWindow::contextMenuEvent(QContextMenuEvent *ev)
QAction *actRemoveWatchExpression = new QAction(removeWatchActionText(exp), &menu); QAction *actRemoveWatchExpression = new QAction(removeWatchActionText(exp), &menu);
actRemoveWatchExpression->setEnabled( actRemoveWatchExpression->setEnabled(
(canHandleWatches || state == DebuggerNotReady) && !exp.isEmpty()); (canHandleWatches || state == DebuggerNotReady) && !exp.isEmpty());
QAction *actRemoveWatches = new QAction(tr("Remove All Watch Items"), &menu); QAction *actRemoveWatches =
new QAction(tr("Remove All Evaluated Expressions"), &menu);
actRemoveWatches->setEnabled(!WatchHandler::watcherNames().isEmpty()); actRemoveWatches->setEnabled(!WatchHandler::watcherNames().isEmpty());
if (m_type == LocalsType) if (m_type == LocalsType)
@@ -824,7 +826,8 @@ void WatchWindow::contextMenuEvent(QContextMenuEvent *ev)
tr("Open Memory View at Referenced Address")); tr("Open Memory View at Referenced Address"));
actOpenMemoryViewAtPointerValue->setEnabled(false); actOpenMemoryViewAtPointerValue->setEnabled(false);
} }
actOpenMemoryEditorStackLayout->setText(tr("Open Memory Editor Showing Stack Layout")); actOpenMemoryEditorStackLayout->setText(
tr("Open Memory Editor Showing Stack Layout"));
actOpenMemoryEditorStackLayout->setEnabled(m_type == LocalsType); actOpenMemoryEditorStackLayout->setEnabled(m_type == LocalsType);
memoryMenu.addAction(actOpenMemoryViewAtVariableAddress); memoryMenu.addAction(actOpenMemoryViewAtVariableAddress);
memoryMenu.addAction(actOpenMemoryViewAtPointerValue); memoryMenu.addAction(actOpenMemoryViewAtPointerValue);
@@ -873,7 +876,8 @@ void WatchWindow::contextMenuEvent(QContextMenuEvent *ev)
menu.addAction(actShowInEditor); menu.addAction(actShowInEditor);
menu.addAction(debuggerCore()->action(SettingsDialog)); menu.addAction(debuggerCore()->action(SettingsDialog));
QAction *actCloseEditorToolTips = new QAction(tr("Close Editor Tooltips"), &menu); QAction *actCloseEditorToolTips =
new QAction(tr("Close Editor Tooltips"), &menu);
actCloseEditorToolTips->setEnabled(DebuggerToolTipManager::instance()->hasToolTips()); actCloseEditorToolTips->setEnabled(DebuggerToolTipManager::instance()->hasToolTips());
menu.addAction(actCloseEditorToolTips); menu.addAction(actCloseEditorToolTips);