github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-07-11 22:03:01 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

ide: Debug icons #579, #578 (thanks Zbigniew)

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@6671 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2013-12-18 18:33:40 +00:00
parent 804889b1fc
commit ee67442430
9 changed files with 2076 additions and 4400 deletions
Download patch file Download diff file Expand all files Collapse all files

50
uppsrc/ide/Debuggers/Debuggers.iml
View file

@ -1,8 +1,10 @@
PREMULTIPLIED
IMAGE_ID(IpLinePtr)
IMAGE_ID(SetIp)
IMAGE_ID(QuickWatch)
IMAGE_ID(FrameLinePtr)
IMAGE_ID(DisasPtr)
IMAGE_ID(StopDebug)
IMAGE_ID(StepInto)
IMAGE_ID(StepOver)
IMAGE_ID(StepOut)
@ -13,25 +15,29 @@ IMAGE_ID(ExplorerBack)
IMAGE_ID(ExplorerFw)
IMAGE_BEGIN_DATA
IMAGE_DATA(120,156,237,90,89,118,131,48,12,244,1,242,209,35,251,104,185,153,155,16,48,150,172,101,100,150,164,52,202,211,107,27)
IMAGE_DATA(102,70,194,182,132,11,164,91,186,165,82,210,59,173,204,14,227,159,230,112,74,235,47,51,227,20,106,169,186,194,33,152)
IMAGE_DATA(214,239,247,187,196,153,190,95,220,193,10,249,155,216,142,27,192,182,177,182,219,207,227,115,210,98,218,154,52,178,136,180)
IMAGE_DATA(152,117,81,69,7,186,181,118,65,128,26,132,195,29,208,144,240,161,248,220,247,24,67,167,48,59,126,176,80,5,126,168)
IMAGE_DATA(112,59,126,176,144,59,126,34,231,31,46,214,46,151,65,110,155,203,49,118,98,51,120,175,229,199,32,46,62,194,107,63)
IMAGE_DATA(168,78,203,157,70,121,118,84,67,226,114,13,148,187,148,1,170,33,241,35,57,88,185,143,158,67,132,187,240,183,140,63)
IMAGE_DATA(215,136,206,191,164,19,229,157,105,111,216,102,110,217,86,130,87,146,178,78,156,207,163,120,159,39,226,249,213,91,195,27)
IMAGE_DATA(56,130,7,112,21,15,226,42,30,196,197,45,176,152,186,45,75,16,143,234,163,246,197,31,131,31,222,194,146,109,10,191)
IMAGE_DATA(22,228,198,3,73,137,182,143,70,14,105,228,156,201,192,48,126,153,143,67,92,37,190,165,209,29,227,124,41,134,204,127)
IMAGE_DATA(254,228,110,243,251,99,148,235,228,175,232,226,88,231,220,188,248,222,49,36,198,38,254,14,249,111,206,239,116,59,242,127)
IMAGE_DATA(150,204,26,202,203,115,65,138,58,59,19,97,105,148,182,1,208,9,33,19,176,106,172,223,25,220,10,161,147,72,11,172)
IMAGE_DATA(80,124,223,16,136,166,88,160,70,44,171,200,123,195,242,95,52,250,216,2,23,57,54,16,95,53,224,252,143,227,239,144)
IMAGE_DATA(191,185,254,62,206,206,186,129,145,131,205,128,115,251,239,240,174,159,3,205,128,115,133,248,102,51,144,48,122,131,81,155)
IMAGE_DATA(1,200,151,227,115,140,215,160,248,110,33,177,241,46,66,65,112,140,21,159,115,129,130,80,49,91,175,216,8,127,143,43)
IMAGE_DATA(250,30,141,228,116,187,246,221,204,126,224,99,157,154,22,154,55,193,133,237,128,132,98,15,94,169,186,66,31,224,187,88)
IMAGE_DATA(116,129,126,119,10,87,223,41,92,187,25,236,107,121,240,190,71,78,214,125,23,125,49,180,60,155,207,22,184,16,79,226)
IMAGE_DATA(191,190,163,13,75,199,105,250,226,206,70,228,75,121,121,92,157,135,217,40,239,95,218,9,205,160,40,14,113,179,226,128)
IMAGE_DATA(70,197,150,36,223,24,53,52,8,151,199,118,52,68,220,242,164,17,208,16,185,226,239,32,159,243,70,248,146,6,202,31)
IMAGE_DATA(201,127,195,248,169,26,32,87,212,8,174,159,78,131,59,192,173,26,138,239,111,31,240,58,29,55,244,100,39,28,252,106)
IMAGE_DATA(221,188,156,12,60,193,25,248,233,239,250,28,210,199,155,60,52,255,245,13,30,248,13,166,202,3,241,132,23,192,175,118)
IMAGE_DATA(221,135,230,203,91,31,46,143,189,228,229,242,68,188,255,208,220,197,17,252,95,124,104,254,11,214,178,8,161,0,0,0)
IMAGE_END_DATA(672, 13)
IMAGE_DATA(120,156,237,90,75,114,219,48,12,229,174,51,157,204,180,119,200,166,206,174,23,235,25,120,129,92,162,251,220,193,171,92)
IMAGE_DATA(139,181,100,137,34,64,16,120,16,105,57,113,3,15,38,142,244,222,3,248,1,197,40,12,79,225,41,164,20,238,105,105)
IMAGE_DATA(113,24,63,153,193,73,165,95,77,141,147,168,133,236,13,14,193,148,126,62,159,37,206,124,125,117,3,43,228,175,98,43)
IMAGE_DATA(174,3,91,198,234,183,159,151,207,65,147,169,55,105,100,18,181,98,230,73,229,237,232,210,202,9,1,106,16,14,119,64)
IMAGE_DATA(67,194,187,226,115,31,209,135,70,97,86,124,103,161,10,124,87,225,86,124,103,33,87,252,64,218,239,46,214,42,151,157)
IMAGE_DATA(220,50,151,219,216,129,139,193,125,45,94,58,113,245,61,188,242,131,234,148,220,185,151,23,71,53,36,46,215,64,185,107)
IMAGE_DATA(25,160,26,18,223,147,131,150,251,222,54,120,184,43,191,167,255,185,134,119,252,37,29,47,239,72,187,195,54,179,103,91)
IMAGE_DATA(9,62,73,210,54,112,54,143,226,109,158,136,231,79,239,22,94,193,17,60,128,203,120,16,151,241,32,206,111,142,201,84)
IMAGE_DATA(109,89,156,120,84,31,181,47,252,109,240,187,183,176,243,54,69,179,31,223,194,31,78,90,174,65,188,223,223,67,122,123)
IMAGE_DATA(14,233,253,215,213,167,239,211,53,77,103,186,206,121,239,167,197,153,14,215,16,185,13,111,104,100,238,235,37,222,235,75)
IMAGE_DATA(195,79,155,198,210,47,185,205,171,254,132,107,217,116,111,197,21,57,164,191,207,126,126,145,3,105,31,196,95,218,49,138)
IMAGE_DATA(223,147,255,128,254,11,57,135,147,127,252,202,49,236,152,63,93,243,119,68,253,72,58,1,169,223,242,111,22,190,49,140)
IMAGE_DATA(133,91,65,45,27,163,17,93,26,49,70,50,208,140,159,150,251,16,183,17,95,211,168,238,113,190,20,67,230,79,63,185)
IMAGE_DATA(235,252,250,30,229,26,249,55,116,113,172,209,54,43,190,117,15,137,209,197,31,144,127,119,126,135,219,45,95,96,68,182)
IMAGE_DATA(160,92,61,38,164,168,163,49,16,154,70,42,23,0,58,32,100,0,54,141,237,154,194,205,16,58,136,180,192,18,197,215)
IMAGE_DATA(11,2,209,20,11,84,137,165,21,121,109,88,254,171,70,29,91,224,34,247,118,196,111,26,208,254,219,241,7,228,175,206)
IMAGE_DATA(191,15,103,71,189,205,140,206,197,128,115,235,107,248,170,31,29,139,1,231,10,241,213,197,64,194,180,23,152,230,98,0)
IMAGE_DATA(242,229,248,28,99,45,80,124,183,16,88,127,39,161,32,56,70,139,207,185,64,65,52,49,189,79,108,132,63,226,137,62)
IMAGE_DATA(98,33,57,220,30,251,95,27,117,199,251,86,106,90,104,214,0,39,182,3,18,138,221,249,164,170,10,125,7,223,196,162)
IMAGE_DATA(19,244,107,167,240,232,59,133,199,94,12,198,90,220,249,222,35,6,237,189,75,123,50,148,60,157,207,38,184,16,79,226)
IMAGE_DATA(95,175,209,5,171,141,107,233,139,59,27,145,47,229,101,113,219,60,204,246,242,254,75,59,96,49,72,13,135,184,177,225)
IMAGE_DATA(128,70,198,166,32,191,24,85,52,8,151,199,54,52,68,220,122,236,0,208,16,185,226,119,144,207,121,123,248,146,6,202)
IMAGE_DATA(223,147,127,71,255,53,53,64,174,168,225,156,63,149,6,119,128,155,53,26,62,222,62,192,217,90,110,104,99,103,220,100)
IMAGE_DATA(6,254,122,127,153,78,10,158,224,20,252,252,123,62,148,96,227,85,30,154,255,118,156,15,62,206,152,121,32,158,240,28)
IMAGE_DATA(248,205,30,247,4,205,122,4,204,228,81,188,205,19,241,246,9,26,19,71,240,159,241,4,205,63,189,166,156,157,0,0)
IMAGE_END_DATA(800, 14)

6
uppsrc/ide/Debuggers/Gdb.cpp
View file

@ -16,7 +16,7 @@ bool Gdb::Result(String& result, const String& s)
void Gdb::DebugBar(Bar& bar)
{
bar.Add("Stop debugging", THISBACK(Stop))
bar.Add("Stop debugging", DbgImg::StopDebug(), THISBACK(Stop))
.Key(K_SHIFT_F5);
bar.Separator();
bool b = !IdeIsDebugLock();
@ -32,9 +32,9 @@ void Gdb::DebugBar(Bar& bar)
.Key(K_CTRL_F10);
bar.Add(b, "Run", DbgImg::Run(), THISBACK(Run))
.Key(K_F5);
bar.Separator();
bar.MenuSeparator();
bar.Add(b, "Quick watch", THISBACK(QuickWatch))
.Key(K_CTRL_Q);
.Key(K_CTRL_Q);
bar.MenuSeparator();
bar.Add(b, "Copy backtrace", THISBACK(CopyStack));
bar.Add(b, "Copy dissassembly", THISBACK(CopyDisas));

4
uppsrc/ide/Debuggers/Gdb_MI2.cpp
View file

@ -41,7 +41,7 @@ void WatchEdit::HighlightLine(int line, Vector<Highlight>& h, int pos)
void Gdb_MI2::DebugBar(Bar& bar)
{
bar.Add("Stop debugging", THISBACK(Stop)).Key(K_SHIFT_F5);
bar.Add("Stop debugging", DbgImg::StopDebug(), THISBACK(Stop)).Key(K_SHIFT_F5);
bar.Separator();
// see note on Run() function -- crashes X on my machine, so removed by now
// bar.Add(!stopped, "Asynchronous break", THISBACK(AsyncBrk));
@ -51,7 +51,7 @@ void Gdb_MI2::DebugBar(Bar& bar)
bar.Add(b, "Step out", DbgImg::StepOut(), THISBACK1(Step, "exec-finish")).Key(K_SHIFT_F11);
bar.Add(b, "Run to", DbgImg::RunTo(), THISBACK(doRunTo)).Key(K_CTRL_F10);
bar.Add(b, "Run", DbgImg::Run(), THISBACK(Run)).Key(K_F5);
bar.Separator();
bar.MenuSeparator();
bar.Add(b, "Quick watch", THISBACK(QuickWatch)).Key(K_CTRL_Q);
bar.MenuSeparator();
bar.Add(b, "Copy backtrace", THISBACK(CopyStack));

2
uppsrc/ide/Debuggers/Pdb.cpp
View file

@ -16,7 +16,7 @@ using namespace PdbKeys;
void Pdb::DebugBar(Bar& bar)
{
bar.Add(AK_STOP, THISBACK(Stop));
bar.Add(AK_STOP, DbgImg::StopDebug(), THISBACK(Stop));
bool b = !IdeIsDebugLock();
bar.Separator();
bar.Add(b, AK_STEPINTO, DbgImg::StepInto(), THISBACK1(Trace, false));

BIN
uppsrc/ide/icon.ico
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 2.8 KiB

Before After
Before After

3983
uppsrc/ide/ide.iml
View file

File diff suppressed because it is too large Load diff

2356
uppsrc/ide/ide.iml.$tmp
View file

File diff suppressed because it is too large Load diff

2
uppsrc/ide/ide.key
View file

@ -66,7 +66,7 @@ KEY(COPYWORD, "Copy word", K_CTRL_K)
KEY(RUNOPTIONS, "Run options..", 0)
KEY(EXECUTE, "Execute", K_CTRL_F5)
KEY(DEBUG, "Run (in debugger)", K_F5)
KEY(DEBUG, "Debug", K_F5)
KEY(DEBUGTO, "Run to cursor (in debugger)", K_CTRL_F10)
KEY(DEBUGEXT, "Debug externally", K_ALT_F5)
KEY(DEBUGFILEEXT, "Debug file externally", K_SHIFT|K_ALT_F5)

73
uppsrc/ide/idebar.cpp
View file

@ -199,8 +199,12 @@ void Ide::Edit(Bar& menu) {
(menu.*add)("Paste", CtrlImg::paste(), THISBACK(EditPaste))
.Key(K_CTRL_V)
.Help("Insert text from clipboard at cursor location");
(menu.*add)("Select All", CtrlImg::select_all(), callback(&editor, &LineEdit::SelectAll))
.Key(K_CTRL_A);
if(!toolbar_in_row || menu.IsMenuBar())
menu.Separator();
(menu.*add)("Select all", CtrlImg::select_all(), callback(&editor, &LineEdit::SelectAll))
.Key(K_CTRL_A);
}
menu.MenuSeparator();
@ -466,40 +470,45 @@ void Ide::DebugMenu(Bar& menu)
bool b = idestate == EDITING && !IdeIsDebugLock();
if(debugger) {
debugger->DebugBar(menu);
menu.Separator();
menu.MenuSeparator();
}
else {
if(console.IsRunning())
menu.Add("Stop !", THISBACK(StopDebug))
.Help("Stop controlled process");
menu.Add(AK_RUNOPTIONS, THISBACK(RunArgs))
.Help("Current directory, command line, stdout redirection");
menu.Add(b, AK_EXECUTE, IdeImg::debug_run(), THISBACK(BuildAndExecute))
if(menu.IsMenuBar())
menu.Add(AK_RUNOPTIONS, THISBACK(RunArgs))
.Help("Current directory, command line, stdout redirection");
menu.Add(b, AK_EXECUTE, IdeImg::execute(), THISBACK(BuildAndExecute))
.Help("Build and execute the application");
menu.Add(b, AK_DEBUG, THISBACK1(BuildAndDebug, false))
menu.Add(b, AK_DEBUG, IdeImg::debug_run(), THISBACK1(BuildAndDebug, false))
.Help("Build application & run debugger");
menu.Add(b, AK_DEBUGTO, THISBACK1(BuildAndDebug, true))
.Help("Build application & run to cursor in debugger");
menu.Add(b, AK_DEBUGEXT, THISBACK(BuildAndExtDebug))
.Help("Build application & run external debugger (see Base setup, default \"msdev.exe\")");
menu.Add(b, AK_DEBUGFILEEXT, THISBACK(BuildAndExtDebugFile))
.Help("Build application & run external debugger, trying to start with current file");
#ifdef PLATFORM_POSIX
if(IsValgrind())
menu.Add(b, AK_VALGRIND, THISBACK(Valgrind))
.Help("Build application & run in valgring");
#endif
if(menu.IsMenuBar()) {
menu.Add(b, AK_DEBUGTO, THISBACK1(BuildAndDebug, true))
.Help("Build application & run to cursor in debugger");
menu.Add(b, AK_DEBUGEXT, THISBACK(BuildAndExtDebug))
.Help("Build application & run external debugger (see Base setup, default \"msdev.exe\")");
menu.Add(b, AK_DEBUGFILEEXT, THISBACK(BuildAndExtDebugFile))
.Help("Build application & run external debugger, trying to start with current file");
#ifdef PLATFORM_POSIX
if(IsValgrind())
menu.Add(b, AK_VALGRIND, THISBACK(Valgrind))
.Help("Build application & run in valgring");
#endif
menu.Separator();
menu.Separator();
}
}
if(menu.IsMenuBar()) {
menu.Add(!editfile.IsEmpty() /*&& !debuglock*/, AK_BREAKPOINT, THISBACK(DebugToggleBreak))
.Help("Set / clear breakpoint on current line");
menu.Add(!editfile.IsEmpty(), AK_CONDBREAKPOINT, THISBACK(ConditionalBreak))
.Help("Edit conditional breakpoint");
menu.Add(!editfile.IsEmpty() /*&& !debuglock*/, AK_CLEARBREAKPOINTS, THISBACK(DebugClearBreakpoints))
.Help("Clear all breakpoints");
menu.Separator();
menu.Add(target.GetCount() && FileExists(GetLogPath()), AK_OPENLOG, THISBACK(OpenLog));
}
menu.Add(!editfile.IsEmpty() /*&& !debuglock*/, AK_BREAKPOINT, THISBACK(DebugToggleBreak))
.Help("Set / clear breakpoint on current line");
menu.Add(!editfile.IsEmpty(), AK_CONDBREAKPOINT, THISBACK(ConditionalBreak))
.Help("Edit conditional breakpoint");
menu.Add(!editfile.IsEmpty() /*&& !debuglock*/, AK_CLEARBREAKPOINTS, THISBACK(DebugClearBreakpoints))
.Help("Clear all breakpoints");
menu.Separator();
menu.Add(target.GetCount() && FileExists(GetLogPath()), AK_OPENLOG, THISBACK(OpenLog));
}
void Ide::BrowseMenu(Bar& menu) {
@ -555,14 +564,20 @@ void Ide::MainMenu(Bar& menu) {
void Ide::MainTool(Bar& bar)
{
Edit(bar);
if(debugger)
if(debugger) {
if(!designer)
bar.Separator();
DebugMenu(bar);
else
}
if(!designer)
bar.Separator();
Project(bar);
BuildMenu(bar);
bar.Separator();
if(!debugger) {
DebugMenu(bar);
bar.Separator();
}
Setup(bar);
BrowseMenu(bar);
}