1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
|
diff -cr a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp
*** a/src/plugins/debugger/debuggerplugin.cpp 2022-10-25 00:00:23.378435033 +0300
--- b/src/plugins/debugger/debuggerplugin.cpp 2022-10-24 23:56:32.034431011 +0300
***************
*** 635,640 ****
--- 635,642 ----
int lineNumber, QMenu *menu);
void setOrRemoveBreakpoint();
+ void setMessageTracepoint();
+ void editBreakpoint();
void enableOrDisableBreakpoint();
void updateDebugWithoutDeployMenu();
***************
*** 688,693 ****
--- 689,696 ----
QAction m_setOrRemoveBreakpointAction{Tr::tr("Set or Remove Breakpoint")};
QAction m_enableOrDisableBreakpointAction{Tr::tr("Enable or Disable Breakpoint")};
QAction m_reloadDebuggingHelpersAction{Tr::tr("Reload Debugging Helpers")};
+ QAction m_setMessageTracepointAction{tr("Set Message Tracepoint...")};
+ QAction m_editBreakpoint{tr("Edit Breakpoint...")};
BreakpointManager m_breakpointManager;
QString m_lastPermanentStatusMessage;
***************
*** 1092,1103 ****
--- 1095,1118 ----
connect(&m_setOrRemoveBreakpointAction, &QAction::triggered,
this, &DebuggerPluginPrivate::setOrRemoveBreakpoint);
+ cmd = ActionManager::registerAction(&m_setMessageTracepointAction, "Debugger.SetMessageTracepoint");
+ debugMenu->addAction(cmd);
+ cmd->setDefaultKeySequence(QKeySequence(tr("F8")));
+ connect(&m_setMessageTracepointAction, &QAction::triggered,
+ this, &DebuggerPluginPrivate::setMessageTracepoint);
+
cmd = ActionManager::registerAction(&m_enableOrDisableBreakpointAction,
"Debugger.EnableOrDisableBreakpoint");
cmd->setDefaultKeySequence(QKeySequence(useMacShortcuts ? Tr::tr("Ctrl+F8") : Tr::tr("Ctrl+F9")));
debugMenu->addAction(cmd);
connect(&m_enableOrDisableBreakpointAction, &QAction::triggered,
this, &DebuggerPluginPrivate::enableOrDisableBreakpoint);
+
+ cmd = ActionManager::registerAction(&m_editBreakpoint, "EditBreakpoint");
+ cmd->setDefaultKeySequence(QKeySequence(tr("Ctrl+Shift+F9")));
+ debugMenu->addAction(cmd);
+ connect(&m_editBreakpoint, &QAction::triggered,
+ this, &DebuggerPluginPrivate::editBreakpoint);
debugMenu->addSeparator();
***************
*** 1494,1500 ****
--- 1509,1517 ----
m_watchAction.setEnabled(state != DebuggerFinished && state != DebuggerNotReady);
m_setOrRemoveBreakpointAction.setEnabled(true);
+ m_setMessageTracepointAction.setEnabled(true);
m_enableOrDisableBreakpointAction.setEnabled(true);
+ m_editBreakpoint.setEnabled(true);
}
void DebuggerPluginPrivate::onStartupProjectChanged(Project *project)
***************
*** 1827,1833 ****
--- 1844,1852 ----
{
BaseTextEditor *textEditor = qobject_cast<BaseTextEditor *>(editor);
m_setOrRemoveBreakpointAction.setEnabled(textEditor != nullptr);
+ m_setMessageTracepointAction.setEnabled(textEditor != nullptr);
m_enableOrDisableBreakpointAction.setEnabled(textEditor != nullptr);
+ m_editBreakpoint.setEnabled(textEditor != nullptr);
}
void DebuggerPluginPrivate::requestContextMenu(TextEditorWidget *widget,
***************
*** 1923,1928 ****
--- 1942,1963 ----
}
}
+ void DebuggerPluginPrivate::editBreakpoint()
+ {
+ const BaseTextEditor *textEditor = BaseTextEditor::currentTextEditor();
+ QTC_ASSERT(textEditor, return);
+ const int lineNumber = textEditor->currentLine();
+ ContextData location = getLocationContext(textEditor->textDocument(), lineNumber);
+ if (location.isValid()) {
+ GlobalBreakpoint gbp = BreakpointManager::findBreakpointFromContext(location);
+ if (!gbp) {
+ BreakpointManager::setOrRemoveBreakpoint(location);
+ gbp = BreakpointManager::findBreakpointFromContext(location);
+ }
+ BreakpointManager::editBreakpoint(gbp, ICore::dialogParent());
+ }
+ }
+
void DebuggerPluginPrivate::setOrRemoveBreakpoint()
{
const BaseTextEditor *textEditor = BaseTextEditor::currentTextEditor();
***************
*** 1933,1938 ****
--- 1968,2008 ----
BreakpointManager::setOrRemoveBreakpoint(location);
}
+ void DebuggerPluginPrivate::setMessageTracepoint()
+ {
+ const BaseTextEditor *textEditor = BaseTextEditor::currentTextEditor();
+ QTC_ASSERT(textEditor, return);
+ const int lineNumber = textEditor->currentLine();
+ ContextData location = getLocationContext(textEditor->textDocument(), lineNumber);
+ if (location.isValid()) {
+ GlobalBreakpoint gbp = BreakpointManager::findBreakpointFromContext(location);
+ if (gbp)
+ return;
+
+ QString message;
+ if (location.type == LocationByAddress) {
+ //: Message tracepoint: Address hit.
+ message = tr("0x%1 hit").arg(location.address, 0, 16);
+ } else {
+ //: Message tracepoint: %1 file, %2 line %3 function hit.
+ message = tr("%1:%2 %3() hit").arg(location.fileName.fileName()).
+ arg(location.textPosition.line).
+ arg(cppFunctionAt(location.fileName, location.textPosition.line));
+ }
+ QInputDialog dialog; // Create wide input dialog.
+ dialog.setWindowFlags(dialog.windowFlags()
+ & ~(Qt::MSWindowsFixedSizeDialogHint));
+ dialog.resize(600, dialog.height());
+ dialog.setWindowTitle(tr("Add Message Tracepoint"));
+ dialog.setLabelText (tr("Message:"));
+ dialog.setTextValue(message);
+ if (dialog.exec() != QDialog::Accepted || dialog.textValue().isEmpty())
+ return;
+ message = dialog.textValue();
+ BreakpointManager::setOrRemoveBreakpoint(location, message);
+ }
+ }
+
void DebuggerPluginPrivate::enableOrDisableBreakpoint()
{
const BaseTextEditor *textEditor = BaseTextEditor::currentTextEditor();
***************
*** 1964,1969 ****
--- 2034,2040 ----
m_watchAction.setEnabled(false);
m_setOrRemoveBreakpointAction.setEnabled(false);
+ m_setMessageTracepointAction.setEnabled(false);
m_enableOrDisableBreakpointAction.setEnabled(false);
//m_snapshotAction.setEnabled(false);
|