# HG changeset patch # User Jacob Dawid # Date 1344104546 -7200 # Node ID 59175df7dcf64fd0cab12aef0b426ce8ced36692 # Parent f4ea22ef2bebca882dcd766c46b0227112b335ff Created and added debug action icons. * bp_next.png: Added icon. * bp_prev.png: Added icon. * bp_rm_all.png: Added icon. * bp_toggle.png: Added icon. * db_cont.png: Added icon. * db_step.png: Added icon. * db_step_in.png: Added icon. * db_step_out.png: Added icon. * db_stop.png: Added icon. * file-editor-interface.h: Added method for accessing the editor's toolbar. * file-editor: Implemented new interface methods. Assigned icons. * main-window.cc: Now adding debug actions to toolbar. * resource.qrc: Added new icons to resource file. diff --git a/gui/src/icons/bp_next.png b/gui/src/icons/bp_next.png new file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..122ea66f099371b3272cae63812cdac415557c46 GIT binary patch literal 1173 zc$@*11Zw+Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FZT01FZU(%pXi00007bV*G`2iyn* z5gr0Dkv-M`00b3DL_t(o!_AgmXj^3%$A53m$#=4zHC5bS8!EUs#h-uRp$=+|lvAQvC-hM`iP-lOiQZlQ|-IEe9 zbvoO;%49SZ0^Tm`B@{wXP6E9Zm{o7ZQ&2`I>t?0h)2wU`NxAURi$7oa{CMh@_q#u> z6~MY#ZI^|qaqRZs-R*q(*%P059(`v2$Kxlv2WkPZQm$F$3^QqB8b~@VulMnIM@MM< zWOrz*MWu4pdtjf_8ikmahfumo9PgM+1fXEwBn^y_?GWcKWftJTG_cWpHZN|N?9U(jO zs|pLSK%WIkfWw2OHxfPjC9&(*PrNV`9N~nH=H|Lz3)an#Ox&2N>Rx3{e)bN+3L6{PkF=cBamLs~!q{?UAcG%I1E|&yfjafNY`c zb_?u<`bvNsaOBgB!ThyfG17Wu^Mzz5p_>8;fsDY3Acvsn>SiJ93h4pMgxLxB`|8Sh zN#@hYG;np=qC7Cz6PKT3K1H|H703wBZfdV{) zKv+2*_A9*A{1iUykWIquC5ZjSm=L^K6t8#;%Z>35yMuN0j6ZjTrmP8(Nm!a=Op-Z% z_;fh2^RuA*s6!xYw;}R7EX^?_$-Hu>c=a#gb_a}&Wi5sN=S5geFeKUe;P7DBy!W-d nwh=cBCX7|~17q8X|1aV{8S+Raw4Al<00000NkvXXu0mjf5!)@f diff --git a/gui/src/icons/bp_prev.png b/gui/src/icons/bp_prev.png new file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..a183a08ec073d4390d4f4d4a3416c184daf1326f GIT binary patch literal 1159 zc$@);1bF+2P)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FZT01FZU(%pXi00007bV*G`2iyn* z5gs-WCCOs|00aj~L_t(o!_Ai4PaJg=$3MRr_69DyxD@OflqOta8){*F&?p6oCWf>P zwJ%hO0b@#^jMit<^bcq?u`k=0cxj_gCVle7WFhTC6LpcQH3Ds2l#77i(q(Tm^PBNu z2G|gxEG)*8octz}ncw-&IcGlSCn%9wmbIhz$|#`;ApnRzoJ<{_82*K8ghEEAfG5gF{;n;rmY^5-D~tTv_P`06#wG_^Dm-zx!r zVL*1vV&T{4_AUbe=*GsFh0Ow)%-#vmB)HWA5rrkd0?Q(`u!jQ17NMo)-!ieTWc>cj z&ILrF9yky5072(=@`@1GfeRzEB*K0O`8JBMgD)C>;=^~=;Zq1l0YkvC@G4g@JXbhqCe8)1+RNO zu(x2X3=qFtMLc@#(=(Peu$_I2Az_aVncOq{4h3OjDQOxv-E`h1UEt^u`i5qhl`+!-{b#N&>{)8)7Tjl!*gbC=F zj0(&AO_T254bwFNTrCoCQ~;N z>If+JF!=)*6V;KAi$d`rj7BA`x28CMYl@!0Q;!9o?s$df{%{age4!{DtA7SW zxgFTjVP*=n?Aq9MDK>dkLr0N1yBFYyNZok1>-DKSd?|Bu*SA5L3#fp(c~(+MJ`)Pl zSXlNyO49MgqR#_c+0AoZk4l59HBZvr7=bbsZV&V4@)8{#AH>E>Hw!kg_DiuPwTzSV zlU$zo4)QC2o$^4b#_@JUXsU~M7G}8o>-UgPqbUjt|Cs=Q_KPtIe7&;Fgs$`LYOVjb Z_78p7$%OXBiSPgb002ovPDHLkV1kq945a`7 diff --git a/gui/src/icons/bp_rm_all.png b/gui/src/icons/bp_rm_all.png new file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..7f1731df9a0b78e661e21c0597ff862071222b9b GIT binary patch literal 803 zc$@(v1Kj+HP)Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FZT01FZU(%pXi00007bV*G`2iyn* z5h4tw+G#ET00N^)L_t(o!|j$&NRwe4$3Ks3t(cS1B!oIx*f2s6cI>YmDu_Vx60vjB zbC+)7v4h>Un}h@z1d{?G>*^ux(m?|?NQc>MZTkM%eD`$Ndi(D_;N~p9yaMc3z1SHgs|a>RFZgCE0NL~=sJbd`nCdwS5mEpk{7>QQV^gm57LKFYspI zJ#ZE1l<-J^+_wX0nzQ=aD0zaP1SS+5;306U;Rp)rnmzBj5h!@ka$WfpaHnediGU9c z6Il4N>Ns@v2&yWd&mIU51Mh%qyGslRc<$~oynm5c>6d~R9q_CUlM7&4v;%`cFA!C? zb3sTa;X)9u)WAo)8Bs@=c(XyI$+Fu%pM}{Bm=@i@$3!X_b(mEqk9;{p%kQn7eak?< zfETWv(1jJZ19N?2!%>G>6?8~1!ir{>or9;R;hF1qfg5ih6=E=vN=9w7GV0*~-_M+2 z>SwXjwGjy+a1%hU!>smzb16jZY#DVvyg8u@MQyX%)FHjJ3l|kQE!K`%MLoTaT}#sx zd>K}@obZU{$*d03fm|W836o0=;mWLXz9$fXba{LRerOFVS7!Cr*AYkvmEc@(V{;dN zIRs&=&a7rL01%6=V5+)=_6}p7G9EBtVB)qPIYZ7jARFZI0LRrBL3HLZ^N$8i5mvEhb hB?;#_*0KI~{RQ@;iH5@x4O0LB002ovPDHLkV1f(iTiyTw diff --git a/gui/src/icons/bp_toggle.png b/gui/src/icons/bp_toggle.png new file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..7d7e2e3ad2b797f3077b65989dcd8ccfb4dcbed8 GIT binary patch literal 2608 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 Y8{FuC0-DK(B>(^b07*qoM6N<$g1dnoYXATM diff --git a/gui/src/icons/db_step.png b/gui/src/icons/db_step.png new file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..671e3299121eb8de50d6e0564084e05904e48a87 GIT binary patch literal 1251 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 diff --git a/gui/src/m-editor/file-editor-interface.h b/gui/src/m-editor/file-editor-interface.h --- a/gui/src/m-editor/file-editor-interface.h +++ b/gui/src/m-editor/file-editor-interface.h @@ -20,6 +20,7 @@ #include #include +#include class QTerminal; class main_window; @@ -43,6 +44,7 @@ virtual ~file_editor_interface () { } virtual QMenu *debug_menu () = 0; + virtual QToolBar *toolbar () = 0; virtual void handle_entered_debug_mode () = 0; virtual void handle_quit_debug_mode () = 0; diff --git a/gui/src/m-editor/file-editor.cc b/gui/src/m-editor/file-editor.cc --- a/gui/src/m-editor/file-editor.cc +++ b/gui/src/m-editor/file-editor.cc @@ -57,6 +57,12 @@ return _debug_menu; } +QToolBar * +file_editor::toolbar () +{ + return _tool_bar; +} + void file_editor::handle_entered_debug_mode () { @@ -337,7 +343,6 @@ _tab_widget = new QTabWidget (widget); _tab_widget->setTabsClosable (true); - // Theme icons with QStyle icons as fallback QAction *new_action = new QAction (QIcon(":/actions/icons/filenew.png"), tr("&New File"), _tool_bar); @@ -371,10 +376,18 @@ QAction *toggle_bookmark_action = new QAction (tr ("Toggle &Bookmark"),_tool_bar); QAction *remove_bookmark_action = new QAction (tr ("&Remove All Bookmarks"),_tool_bar); - QAction *next_breakpoint_action = new QAction (tr ("&Next breakpoint"),_tool_bar); - QAction *previous_breakpoint_action = new QAction (tr ("Pre&vious breakpoint"),_tool_bar); - QAction *toggle_breakpoint_action = new QAction (tr ("Toggle &breakpoint"),_tool_bar); - QAction *remove_breakpoint_action = new QAction (tr ("&Remove All breakpoints"),_tool_bar); + QAction *next_breakpoint_action + = new QAction (QIcon (":/actions/icons/bp_next.png"), + tr ("&Next breakpoint"), _tool_bar); + QAction *previous_breakpoint_action + = new QAction (QIcon (":/actions/icons/bp_prev.png"), + tr ("Pre&vious breakpoint"), _tool_bar); + QAction *toggle_breakpoint_action + = new QAction (QIcon (":/actions/icons/bp_toggle.png"), + tr ("Toggle &breakpoint"), _tool_bar); + QAction *remove_all_breakpoints_action + = new QAction (QIcon (":/actions/icons/bp_rm_all.png"), + tr ("&Remove All breakpoints"), _tool_bar); QAction *comment_selection_action = new QAction (tr ("&Comment Selected Text"),_tool_bar); QAction *uncomment_selection_action = new QAction (tr ("&Uncomment Selected Text"),_tool_bar); @@ -413,10 +426,15 @@ _tool_bar->addAction (redo_action); _tool_bar->addAction (_copy_action); _tool_bar->addAction (_cut_action); + _tool_bar->addAction (paste_action); _tool_bar->addSeparator (); - _tool_bar->addAction (paste_action); _tool_bar->addAction (find_action); _tool_bar->addAction (_run_action); + _tool_bar->addSeparator (); + _tool_bar->addAction (toggle_breakpoint_action); + _tool_bar->addAction (next_breakpoint_action); + _tool_bar->addAction (previous_breakpoint_action); + _tool_bar->addAction (remove_all_breakpoints_action); // menu bar QMenu *fileMenu = new QMenu (tr ("&File"), _menu_bar); @@ -450,7 +468,7 @@ _debug_menu->addAction (toggle_breakpoint_action); _debug_menu->addAction (next_breakpoint_action); _debug_menu->addAction (previous_breakpoint_action); - _debug_menu->addAction (remove_breakpoint_action); + _debug_menu->addAction (remove_all_breakpoints_action); _debug_menu->addSeparator (); // The other debug actions will be added by the main window. _menu_bar->addMenu (_debug_menu); @@ -501,7 +519,7 @@ SIGNAL (triggered ()), this, SLOT (request_next_breakpoint ())); connect (previous_breakpoint_action, SIGNAL (triggered ()), this, SLOT (request_previous_breakpoint ())); - connect (remove_breakpoint_action, + connect (remove_all_breakpoints_action, SIGNAL (triggered ()), this, SLOT (request_remove_breakpoint ())); connect (comment_selection_action, SIGNAL (triggered ()), this, SLOT (request_comment_selected_text ())); diff --git a/gui/src/m-editor/file-editor.h b/gui/src/m-editor/file-editor.h --- a/gui/src/m-editor/file-editor.h +++ b/gui/src/m-editor/file-editor.h @@ -50,7 +50,8 @@ QTerminal * terminal (); main_window * get_main_window (); - QMenu * debug_menu(); + QMenu * debug_menu (); + QToolBar * toolbar (); void handle_entered_debug_mode (); void handle_quit_debug_mode (); diff --git a/gui/src/main-window.cc b/gui/src/main-window.cc --- a/gui/src/main-window.cc +++ b/gui/src/main-window.cc @@ -592,32 +592,37 @@ _debug_menu = menuBar ()->addMenu (tr ("De&bug")); - _debug_step_over = _debug_menu->addAction (tr ("Step")); + _debug_step_over = _debug_menu->addAction (QIcon (":/actions/icons/db_step.png"), tr ("Step")); _debug_step_over->setEnabled (false); _file_editor->debug_menu ()->addAction (_debug_step_over); + _file_editor->toolbar ()->addAction (_debug_step_over); _debug_step_over->setShortcut (Qt::Key_F10); - _debug_step_into = _debug_menu->addAction (tr ("Step in")); + _debug_step_into = _debug_menu->addAction (QIcon (":/actions/icons/db_step_in.png"), tr ("Step in")); _debug_step_into->setEnabled (false); _file_editor->debug_menu ()->addAction (_debug_step_into); + _file_editor->toolbar ()->addAction (_debug_step_into); _debug_step_into->setShortcut (Qt::Key_F11); - _debug_step_out = _debug_menu->addAction (tr ("Step out")); + _debug_step_out = _debug_menu->addAction (QIcon (":/actions/icons/db_step_out.png"), tr ("Step out")); _debug_step_out->setEnabled (false); _file_editor->debug_menu ()->addAction (_debug_step_out); + _file_editor->toolbar ()->addAction (_debug_step_out); _debug_step_out->setShortcut (Qt::ShiftModifier + Qt::Key_F11); - _debug_continue = _debug_menu->addAction (tr ("Continue")); + _debug_continue = _debug_menu->addAction (QIcon (":/actions/icons/db_cont.png"), tr ("Continue")); _debug_continue->setEnabled (false); _file_editor->debug_menu ()->addAction (_debug_continue); + _file_editor->toolbar ()->addAction (_debug_continue); _debug_continue->setShortcut (Qt::Key_F5); _debug_menu->addSeparator (); _file_editor->debug_menu ()->addSeparator (); - _debug_quit = _debug_menu->addAction (tr ("Exit Debug Mode")); + _debug_quit = _debug_menu->addAction (QIcon (":/actions/icons/db_stop.png"), tr ("Exit Debug Mode")); _debug_quit->setEnabled (false); _file_editor->debug_menu ()->addAction (_debug_quit); + _file_editor->toolbar ()->addAction (_debug_quit); _debug_quit->setShortcut (Qt::ShiftModifier + Qt::Key_F5); //QMenu *parallelMenu = menuBar ()->addMenu (tr ("&Parallel")); diff --git a/gui/src/resource.qrc b/gui/src/resource.qrc --- a/gui/src/resource.qrc +++ b/gui/src/resource.qrc @@ -27,5 +27,14 @@ icons/jabber_protocol.png icons/logo.png icons/terminal.png + icons/bp_toggle.png + icons/bp_rm_all.png + icons/bp_prev.png + icons/bp_next.png + icons/db_cont.png + icons/db_step.png + icons/db_step_in.png + icons/db_step_out.png + icons/db_stop.png