diff options
| author | Leandro Melo <leandro.melo@nokia.com> | 2011-11-29 13:51:00 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@nokia.com> | 2011-12-02 11:07:07 +0100 |
| commit | 67ab31c224d2c7628e5fdd19df77378af6d0b13a (patch) | |
| tree | 1dac63e4e2af58fc2c4597a35b542c6c2487ef13 /src/plugins/debugger | |
| parent | d4a881e6ee9b6b0ba6fc4bc06beb5a57c9e0e8f2 (diff) | |
| download | qt-creator-67ab31c224d2c7628e5fdd19df77378af6d0b13a.tar.gz | |
Editor: Bookmark when Shift-clicking the gutter
Task-number: QTCREATORBUG-2852
Change-Id: If539f812bce76c1c1e7b63e7133e2a7c962990ea
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Diffstat (limited to 'src/plugins/debugger')
| -rw-r--r-- | src/plugins/debugger/debuggerplugin.cpp | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp index 8d36242fa8..187ed776d7 100644 --- a/src/plugins/debugger/debuggerplugin.cpp +++ b/src/plugins/debugger/debuggerplugin.cpp @@ -707,7 +707,9 @@ public slots: void editorOpened(Core::IEditor *editor); void updateBreakMenuItem(Core::IEditor *editor); void setBusyCursor(bool busy); - void requestMark(TextEditor::ITextEditor *editor, int lineNumber); + void requestMark(TextEditor::ITextEditor *editor, + int lineNumber, + TextEditor::ITextEditor::MarkRequestKind kind); void requestContextMenu(TextEditor::ITextEditor *editor, int lineNumber, QMenu *menu); @@ -1773,8 +1775,8 @@ void DebuggerPluginPrivate::editorOpened(IEditor *editor) if (!textEditor) return; connect(textEditor, - SIGNAL(markRequested(TextEditor::ITextEditor*,int)), - SLOT(requestMark(TextEditor::ITextEditor*,int))); + SIGNAL(markRequested(TextEditor::ITextEditor*,int, TextEditor::ITextEditor::MarkRequestKind)), + SLOT(requestMark(TextEditor::ITextEditor*,int, TextEditor::ITextEditor::MarkRequestKind))); connect(textEditor, SIGNAL(markContextMenuRequested(TextEditor::ITextEditor*,int,QMenu*)), SLOT(requestContextMenu(TextEditor::ITextEditor*,int,QMenu*))); @@ -1943,8 +1945,13 @@ void DebuggerPluginPrivate::toggleBreakpointByAddress(quint64 address, } } -void DebuggerPluginPrivate::requestMark(ITextEditor *editor, int lineNumber) +void DebuggerPluginPrivate::requestMark(ITextEditor *editor, + int lineNumber, + ITextEditor::MarkRequestKind kind) { + if (kind != ITextEditor::BreakpointRequest) + return; + if (editor->property("DisassemblerView").toBool()) { QString line = editor->contents() .section('\n', lineNumber - 1, lineNumber - 1); |