From cba9550f1c8b0ecf4e8384424690fd4fc39e3d6d Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Sat, 25 Apr 2020 14:17:02 +0200 Subject: [PATCH] HackStudio: Toolbar icon overhaul --- Base/res/icons/16x16/build.png | Bin 141 -> 309 bytes Base/res/icons/16x16/debug-continue.png | Bin 0 -> 156 bytes Base/res/icons/16x16/debug-run.png | Bin 0 -> 233 bytes Base/res/icons/16x16/debug-single-step.png | Bin 0 -> 204 bytes Base/res/icons/16x16/program-pause.png | Bin 0 -> 109 bytes Base/res/icons/16x16/program-run.png | Bin 0 -> 131 bytes Base/res/icons/16x16/program-stop.png | Bin 0 -> 113 bytes Base/res/icons/16x16/single-step.png | Bin 279 -> 0 bytes Base/res/icons/breakpoint.png | Bin 305 -> 212 bytes DevTools/HackStudio/main.cpp | 17 +++++++++++------ 10 files changed, 11 insertions(+), 6 deletions(-) create mode 100644 Base/res/icons/16x16/debug-continue.png create mode 100644 Base/res/icons/16x16/debug-run.png create mode 100644 Base/res/icons/16x16/debug-single-step.png create mode 100644 Base/res/icons/16x16/program-pause.png create mode 100644 Base/res/icons/16x16/program-run.png create mode 100644 Base/res/icons/16x16/program-stop.png delete mode 100644 Base/res/icons/16x16/single-step.png diff --git a/Base/res/icons/16x16/build.png b/Base/res/icons/16x16/build.png index 2e4ec0b526badb1d35cc4f4bf1e76a4ae6b5d8e4..9690a01cc55cd12296dae00fcad2247c4bd91ee8 100644 GIT binary patch delta 282 zcmeBW+{!dTrT&kni(`nz>Ewh1%rY&J|BM9~batqu?bi5T|LdtZGxOok|Jm>TOFXi) zPjLQA182TFb>|vR3#iqwEqS-|w8q)P#~v)uI(gv0fdd-~9v=E1yxi}v{}%2Ej)jFE z>s3`%+1S|F+N!_5GyL-Ho6(`e4*mU-*$J_~zDyTP`#fDg{sVhb{e)>EQ& o9b?**7Q}EgE@6QP14E4P-oz`@OKPzxdu;An0h+kSEP@~A{lSa!i#V8k4Seeoe=S7_C|xfw?f2EWbq4h U&ps}~z`(%Z>FVdQ&MBb@0PfZ>YXATM diff --git a/Base/res/icons/16x16/debug-continue.png b/Base/res/icons/16x16/debug-continue.png new file mode 100644 index 0000000000000000000000000000000000000000..7e2166baf5e0f7a439347432642b82366aea94b6 GIT binary patch literal 156 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7l097+y@=kY$n8Ih5O1~S&)>b01emHn6#wj~-f%vaQr z=qhBCDbiq@b4ZNMqo`tUgRhX7-VPICQSKim!K#Y9%nS@$O%?w>Uo1VBfq{X+)78&q Iol`;+0I9JrTmS$7 literal 0 HcmV?d00001 diff --git a/Base/res/icons/16x16/debug-run.png b/Base/res/icons/16x16/debug-run.png new file mode 100644 index 0000000000000000000000000000000000000000..b244bb64aa0b2e28f4bb5998d3b8b2056ecc62be GIT binary patch literal 233 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7Hh8)?hFF|l8)V3LSV6#8 zaF_a1>z9*OzCU^7QeC@x<-*glRvIo&Yt>bf=bvZzBdiqU_B?g6XrY1N$q#H&4;fh= zr?Fl1Klh|$siYZ$g5;#Ga`$;E@0Nu#3u;O_2(45r+a_{8Z|{1R-F|2Cb`_RYrUVJk zu@ZDJ^;GiZ|9xP|v=y3CpOl>Amz0I*)gFA2Eay&lKMOP1M`J+ACjoMHTy|%2wU`NA4Ci@El>tW^(u%bK3BmmkNW96N^^zxz67FtIFF32> juDou=5)Ih^9)^A2#Kb48O?}S5z`)??>gTe~DWM4fj&3V2 literal 0 HcmV?d00001 diff --git a/Base/res/icons/16x16/program-stop.png b/Base/res/icons/16x16/program-stop.png new file mode 100644 index 0000000000000000000000000000000000000000..9dfe0420e2a84438d031291322fc4d55487cf77c GIT binary patch literal 113 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7EIeHtLo7}wCrGd!W-xd( z`O4$ufBpXdE-l~RqtlYZacR;Kt$puq6|;eWn%7=~EC$g<6Cbs(FvzfR3&vH{8!|93 OFnGH9xvXH=O_9rY7TvA*$&U>aaFfc6fba4!^IGvmz!CKMi z6Y;iw=7wAUUp!hh^YV<;Ls^oN5)u+KI3yRXSa`VM=!AL$HttQiH+U*O{?ct;)W*l` z9P#$Q`s!Jd3lH`1@bLT(ZG(YrIo=?rmoY1l;b25VrrYM0iH(ho?Qga;o=H~;H#XDf c=V4&*l5jg@mo;xI0|Nttr>mdKI;Vst0GSG9b^rhX diff --git a/Base/res/icons/breakpoint.png b/Base/res/icons/breakpoint.png index fcfc266f91343d9f7940d6457861f3f18efbf56e..743b9db5aaf14f70cc208c2c8838fded74380f61 100644 GIT binary patch delta 184 zcmdnUbcJz(O8sn47sn8b(|0Es3LQ4!VEJzJbGr2Rx{mvk?SBRrXsVjz+-H_S;peY6+}Re-y6f-4ap}RaN3$H0?i`eilj-T~S`cJ-_u%Sd;cU#p9f$QE rU&-m|R=9J7Q)Y7PkE)6P4$S-J9C6q3?{+o@1_lOCS3j3^P6&pIw zMNE)ENPpea9SjT%`#fD7Lo80OoovW=$biQ+K5E9M=}WD>`Hu%yEs$&WK5(y9%gkAp zBQwOYTa|y~zIvJe@;}lwcElU5W3XUSUofv5`e-r(); auto& toolbar = toolbar_container.add(); @@ -534,7 +534,7 @@ int main(int argc, char** argv) find_in_files_widget.focus_textbox_and_select_all(); })); - auto stop_action = GUI::Action::create("Stop", Gfx::Bitmap::load_from_file("/res/icons/16x16/stop.png"), [&](auto&) { + auto stop_action = GUI::Action::create("Stop", Gfx::Bitmap::load_from_file("/res/icons/16x16/program-stop.png"), [&](auto&) { terminal_wrapper.kill_running_command(); }); @@ -549,15 +549,16 @@ int main(int argc, char** argv) stop_action->set_enabled(true); }); toolbar.add_action(build_action); + toolbar.add_separator(); - auto run_action = GUI::Action::create("Run", { Mod_Ctrl, Key_R }, Gfx::Bitmap::load_from_file("/res/icons/16x16/play.png"), [&](auto&) { + auto run_action = GUI::Action::create("Run", { Mod_Ctrl, Key_R }, Gfx::Bitmap::load_from_file("/res/icons/16x16/program-run.png"), [&](auto&) { reveal_action_tab(terminal_wrapper); run(terminal_wrapper); stop_action->set_enabled(true); }); RefPtr debugger_thread; - auto debug_action = GUI::Action::create("Debug", Gfx::Bitmap::load_from_file("/res/icons/16x16/play-debug.png"), [&](auto&) { + auto debug_action = GUI::Action::create("Debug", Gfx::Bitmap::load_from_file("/res/icons/16x16/debug-run.png"), [&](auto&) { if (g_project->type() != ProjectType::Cpp) { GUI::MessageBox::show(String::format("Cannot debug current project type", get_project_executable_path().characters()), "Error", GUI::MessageBox::Type::Error, GUI::MessageBox::InputType::OK, g_window); return; @@ -575,14 +576,14 @@ int main(int argc, char** argv) debugger_thread->start(); }); - auto continue_action = GUI::Action::create("Continue", Gfx::Bitmap::load_from_file("/res/icons/16x16/go-last.png"), [&](auto&) { + auto continue_action = GUI::Action::create("Continue", Gfx::Bitmap::load_from_file("/res/icons/16x16/debug-continue.png"), [&](auto&) { pthread_mutex_lock(Debugger::the().continue_mutex()); Debugger::the().set_continue_type(Debugger::ContinueType::Continue); pthread_cond_signal(Debugger::the().continue_cond()); pthread_mutex_unlock(Debugger::the().continue_mutex()); }); - auto single_step_action = GUI::Action::create("Single Step", Gfx::Bitmap::load_from_file("/res/icons/16x16/single-step.png"), [&](auto&) { + auto single_step_action = GUI::Action::create("Single Step", Gfx::Bitmap::load_from_file("/res/icons/16x16/debug-single-step.png"), [&](auto&) { pthread_mutex_lock(Debugger::the().continue_mutex()); Debugger::the().set_continue_type(Debugger::ContinueType::SourceSingleStep); pthread_cond_signal(Debugger::the().continue_cond()); @@ -593,6 +594,8 @@ int main(int argc, char** argv) toolbar.add_action(run_action); toolbar.add_action(stop_action); + + toolbar.add_separator(); toolbar.add_action(debug_action); toolbar.add_action(continue_action); toolbar.add_action(single_step_action); @@ -624,8 +627,10 @@ int main(int argc, char** argv) auto& build_menu = menubar->add_menu("Build"); build_menu.add_action(build_action); + build_menu.add_separator(); build_menu.add_action(run_action); build_menu.add_action(stop_action); + build_menu.add_separator(); build_menu.add_action(debug_action); auto& view_menu = menubar->add_menu("View");