From a0f7753933d782120f7046ac1151e63abe29ac3b Mon Sep 17 00:00:00 2001 From: twanvl Date: Sat, 7 Jul 2007 20:00:51 +0000 Subject: [PATCH] Added icons to window menu and to the tab bar git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@523 0fc631ac-6414-0410-93d0-97cfa31319b6 --- src/gui/set/window.cpp | 19 ++++++++++--------- src/gui/set/window.hpp | 2 +- src/gui/value/symbol.cpp | 13 ++++++++++--- src/gui/value/symbol.hpp | 1 + src/resource/common/edit_symbol.png | Bin 0 -> 341 bytes src/resource/msw/mse.rc | 8 ++++++++ src/resource/msw/tool/print_preview.png | Bin 336 -> 339 bytes src/resource/msw/tool/window_cards.png | Bin 0 -> 362 bytes src/resource/msw/tool/window_keywords.png | Bin 0 -> 657 bytes src/resource/msw/tool/window_set_info.png | Bin 0 -> 354 bytes src/resource/msw/tool/window_statistics.png | Bin 0 -> 469 bytes src/resource/msw/tool/window_style.png | Bin 0 -> 568 bytes 12 files changed, 30 insertions(+), 13 deletions(-) create mode 100644 src/resource/common/edit_symbol.png create mode 100644 src/resource/msw/tool/window_cards.png create mode 100644 src/resource/msw/tool/window_keywords.png create mode 100644 src/resource/msw/tool/window_set_info.png create mode 100644 src/resource/msw/tool/window_statistics.png create mode 100644 src/resource/msw/tool/window_style.png diff --git a/src/gui/set/window.cpp b/src/gui/set/window.cpp index f92e0957..4d8e4bc1 100644 --- a/src/gui/set/window.cpp +++ b/src/gui/set/window.cpp @@ -129,17 +129,17 @@ SetWindow::SetWindow(Window* parent, const SetP& set) tb->Realize(); // tab bar, sizer - wxToolBar* tabBar = new wxToolBar(this, ID_TAB_BAR, wxDefaultPosition, wxDefaultSize, wxTB_FLAT | wxNO_BORDER | wxTB_HORIZONTAL | wxTB_HORZ_TEXT | wxTB_NOICONS); + wxToolBar* tabBar = new wxToolBar(this, ID_TAB_BAR, wxDefaultPosition, wxDefaultSize, wxTB_FLAT | wxNO_BORDER | wxTB_HORIZONTAL | wxTB_HORZ_TEXT); wxSizer* s = new wxBoxSizer(wxVERTICAL); s->Add(tabBar, 0, wxEXPAND | wxBOTTOM, 3); SetSizer(s); // panels - addPanel(menuWindow, tabBar, new CardsPanel (this, wxID_ANY), 0, _("cards tab")); - addPanel(menuWindow, tabBar, new SetInfoPanel (this, wxID_ANY), 1, _("set info tab")); - addPanel(menuWindow, tabBar, new StylePanel (this, wxID_ANY), 2, _("style tab")); - addPanel(menuWindow, tabBar, new KeywordsPanel(this, wxID_ANY), 3, _("keywords tab")); - addPanel(menuWindow, tabBar, new StatsPanel (this, wxID_ANY), 4, _("stats tab")); + addPanel(menuWindow, tabBar, new CardsPanel (this, wxID_ANY), 0, _("window_cards"), _("cards tab")); + addPanel(menuWindow, tabBar, new SetInfoPanel (this, wxID_ANY), 1, _("window_set_info"), _("set info tab")); + addPanel(menuWindow, tabBar, new StylePanel (this, wxID_ANY), 2, _("window_style"), _("style tab")); + addPanel(menuWindow, tabBar, new KeywordsPanel(this, wxID_ANY), 3, _("window_keywords"), _("keywords tab")); + addPanel(menuWindow, tabBar, new StatsPanel (this, wxID_ANY), 4, _("window_statistics"), _("stats tab")); // addPanel(*s, *menuWindow, *tabBar, new DraftPanel (&this, wxID_ANY), 5, _("F10")) selectPanel(ID_WINDOW_CARDS); // select cards panel @@ -178,7 +178,7 @@ SetWindow::~SetWindow() { // ----------------------------------------------------------------------------- : Panel managment -void SetWindow::addPanel(wxMenu* windowMenu, wxToolBar* tabBar, SetWindowPanel* panel, UInt pos, const String& name) { +void SetWindow::addPanel(IconMenu* windowMenu, wxToolBar* tabBar, SetWindowPanel* panel, UInt pos, const String& image_name, const String& name) { // insert in list if (panels.size() <= pos) panels.resize(pos + 1); panels[pos] = panel; @@ -189,9 +189,10 @@ void SetWindow::addPanel(wxMenu* windowMenu, wxToolBar* tabBar, SetWindowPanel* String tab_help = tr(LOCALE_CAT_TOOLTIP, name); // add to tab bar int id = ID_WINDOW_MIN + pos; - tabBar->AddTool(id, tab_name, wxNullBitmap, wxNullBitmap, wxITEM_CHECK, tab_help, description); + tabBar->AddTool(id, tab_name + _(" "), load_resource_tool_image(image_name), wxNullBitmap, wxITEM_CHECK, tab_help, description); + tabBar->AddSeparator(); // add to menu bar - windowMenu->AppendCheckItem(id, menu_name, description); + windowMenu->Append(id, image_name, menu_name, description, wxITEM_CHECK); // add to sizer GetSizer()->Add(panel, 1, wxEXPAND); } diff --git a/src/gui/set/window.hpp b/src/gui/set/window.hpp index fc479187..b5fab075 100644 --- a/src/gui/set/window.hpp +++ b/src/gui/set/window.hpp @@ -53,7 +53,7 @@ class SetWindow : public wxFrame, public SetView { /// Add a panel to the window, as well as to the menu and tab bar /** The position only determines the order in which events will be send. */ - void addPanel(wxMenu* windowMenu, wxToolBar* tabBar, SetWindowPanel* panel, UInt pos, const String& name); + void addPanel(IconMenu* windowMenu, wxToolBar* tabBar, SetWindowPanel* panel, UInt pos, const String& image_name, const String& name); /// Select a panel, based on a tab id void selectPanel(int id); diff --git a/src/gui/value/symbol.cpp b/src/gui/value/symbol.cpp index 29e58d32..411c2fbb 100644 --- a/src/gui/value/symbol.cpp +++ b/src/gui/value/symbol.cpp @@ -8,12 +8,15 @@ #include #include +#include // ----------------------------------------------------------------------------- : SymbolValueEditor IMPLEMENT_VALUE_EDITOR(Symbol) , button_down(-2) -{} +{ + button_images[0] = Bitmap(load_resource_image(_("edit_symbol"))); +} void SymbolValueEditor::draw(RotatedDC& dc) { SymbolValueViewer::draw(dc); @@ -27,8 +30,8 @@ void SymbolValueEditor::draw(RotatedDC& dc) { if (nativeLook()) { // draw editor buttons dc.SetFont(*wxNORMAL_FONT); - drawButton(dc, 0, _("Edit")); - drawButton(dc, 1, _("Gallery")); + drawButton(dc, 0, _BUTTON_("edit symbol")); + //drawButton(dc, 1, _BUTTON_("symbol gallery")); } } void SymbolValueEditor::drawButton(RotatedDC& dc, int button, const String& text) { @@ -49,6 +52,10 @@ void SymbolValueEditor::drawButton(RotatedDC& dc, int button, const String& text // draw text RealSize text_size = dc.GetTextExtent(text); dc.DrawText(text, align_in_rect((Alignment)(ALIGN_BOTTOM | ALIGN_CENTER), text_size, RealRect(x, y, size,size*0.9))); + // draw image + const Bitmap& bmp = button_images[button]; + RealSize image_size(bmp.GetWidth(), bmp.GetHeight()); + dc.DrawBitmap(bmp, align_in_rect(ALIGN_MIDDLE_CENTER, image_size, RealRect(x,y,size,size * 0.8))); } int SymbolValueEditor::findButton(const RealPoint& pos) { diff --git a/src/gui/value/symbol.hpp b/src/gui/value/symbol.hpp index fa3183ee..936e4f32 100644 --- a/src/gui/value/symbol.hpp +++ b/src/gui/value/symbol.hpp @@ -34,6 +34,7 @@ class SymbolValueEditor : public SymbolValueViewer, public ValueEditor { // button, or -1 for mouse down, but not on button, or -2 for mouse not down int button_down; + Bitmap button_images[1]; }; // ----------------------------------------------------------------------------- : EOF diff --git a/src/resource/common/edit_symbol.png b/src/resource/common/edit_symbol.png new file mode 100644 index 0000000000000000000000000000000000000000..c81a03bf5f33b042c02e2f6a6393cdb47de170fc GIT binary patch literal 341 zcmeAS@N?(olHy`uVBq!ia0vp^k|4~%#K6F4)1$Nq$YCo9@(X784`luCJfJ@TNOKl= zL>4nJ@ErzW#^d=bQb2+wt`Q~9`MJ5Nc_j=Com#zYK*0x|E{-7;bCyoI$#__S$9bzV zcWEEr4AU4Uk(#F2LUl<;jK$bFOsao3d<^z-%uaSW@ufvf`OutwCAJ}%YF;|h*R5uz zocb>DB7n#2X6Keg+Dld!U6Yye`;gDx%caX!rRs*iJSNpEb=hd$=B)Pg#Cdwb$0I{z zSMGb`^4)P)OYtJ3kN&eBRvargHR-9GD(E?P`neZ1g8OvEWM#gK?9V^Fe^JW!bCI?J z;=lUDFK=42@%`IlJEwbgibmN8Bq{7G5ER$z*!<~;j<&N)%JS2 iQvv7J*gQQ@b-}*Qe_?!ENPjuduMD29elF{r5}E+9Lx*|* literal 0 HcmV?d00001 diff --git a/src/resource/msw/mse.rc b/src/resource/msw/mse.rc index 0560e290..74b04c0f 100644 --- a/src/resource/msw/mse.rc +++ b/src/resource/msw/mse.rc @@ -54,6 +54,12 @@ tool/card_rotate_270 IMAGE "tool/card_rotate_270.png" tool/keyword_add IMAGE "tool/keyword_add.png" tool/keyword_del IMAGE "tool/keyword_del.png" +tool/window_cards IMAGE "tool/window_cards.png" +tool/window_set_info IMAGE "tool/window_set_info.png" +tool/window_style IMAGE "tool/window_style.png" +tool/window_keywords IMAGE "tool/window_keywords.png" +tool/window_statistics IMAGE "tool/window_statistics.png" + tool/help IMAGE "tool/help.png" // -------------------------------------------------------- : Symbol editor @@ -141,6 +147,8 @@ welcome_new IMAGE "../common/welcome_new.png" welcome_open IMAGE "../common/welcome_open.png" welcome_last IMAGE "../common/welcome_last.png" +edit_symbol IMAGE "../common/edit_symbol.png" + // -------------------------------------------------------- : WX wxBITMAP_STD_COLOURS BITMAP "wx/msw/colours.bmp" diff --git a/src/resource/msw/tool/print_preview.png b/src/resource/msw/tool/print_preview.png index a6bb5bc4882691467638f38e7959af861044046e..fb4e1af30a69c139bdcf27bf9b392f142ce46b72 100644 GIT binary patch delta 251 zcmVOE#DynuuQ>J}xdE}n@hq^n|FU2!{eYeV7$ECH&jL7@D% z7~LN-kTAK-ql0M7s?D{l_x=48gagq6GIqcbSOYN{@eTpK55NW3yAjYcPBNjo1+hCg y0u~mNB;{p(6twFm$cF!FTHgvkZ@<2;5X~Fw#H{QZ% zG{(dj6O9Ki0zs%kx?>3m39vQc;(wUk$<8-_HZzPs*hYMDq}^1`WP!>>&X#fB&d~Lw zo2&qZjxXW{EDxv_HDkgTQ6`~rqRQ3v&ALOOFmm6~YXPl3qgR98Ea*FAh1$shpaO!K z{KTy}V$%mM?;K3_$n_vNXSU)Ga{xGifas0P1H;)tARxF7VJt|v+W454){5u3zaa8Kv1Z<`gH zj|Eo)jkEKzVfEAw#rV>6vpPun+a07*qo IM6N<$g2RoUSO5S3 literal 0 HcmV?d00001 diff --git a/src/resource/msw/tool/window_keywords.png b/src/resource/msw/tool/window_keywords.png new file mode 100644 index 0000000000000000000000000000000000000000..3dd13596c955e1ecdb2e5d1e7c89c74c460d16d7 GIT binary patch literal 657 zcmV;C0&e|@P)?82+ADv+YWD5Q%N zakai~x{+!ZZqkZ~Oem~0oHe((weOGf@%En8z_O_iJm}TVG+TBqucbx${D_9m3#i?F0Qqmn&~)M|>co5pTMfW)^H!MPm6_@vbrmtpoleg@2nK!RPDfS$!&;*7xK`#7&lncSM z?cjV%mpXs1KZ`hL+Nbn12km?vtP-O!r?zSP(Z8Wkc5e5Iq*&8^u(!Zht z%nWA)I03x1287##_aok9g45scJ{LHHRfL%u?)VOowTbyG6cNZ1rI>~Gwxh@2gEa`7 rEh-!MVhU18y(|Q>V1UCtjI(ct6C*W$?8*ucxzzRcFX%Hz&d)xFBgwZO@< zzR9w?&$~{vqLZ_qq_Lf-uAHE=p+d8vKd+uWsG3@?h@PgFJ)e+8o{mbNkUg4?IF^QB zkAHKPczlqAOpAR{jD1drdRvQpMuBuXd~Z{9X<~I~Uvg(UXInu=T1is?0004WQchC< zK<3zH0001eNklV^vn3X1#xf1N{E(r};Jlcs5vY66Cm zf#VnkWZz^kfK4wgkgcp4_BxmneM&p;=?>oY_IV+K?qPn<)ALLK`6qXISP7U^fxG_- zSQpvuwGfb8H@An_0oD}$B4}|u_!wjK;HV$+2hckOo0Zgu^#A|>07*qoM6N<$f;7;m Al>h($ literal 0 HcmV?d00001 diff --git a/src/resource/msw/tool/window_statistics.png b/src/resource/msw/tool/window_statistics.png new file mode 100644 index 0000000000000000000000000000000000000000..8e38f53830e0fe87d48170dfda2c8b6e8d22fe4d GIT binary patch literal 469 zcmV;`0V@89P)g$U6vDUhh4#^FQB8{(y?&o@LKDFu(b}*_kdg%R^Rw?f>x8xkrc< zcbvf%AKq@<1+c`6@negKEav(7>*O8<(h!gH3scXPrTHnvJ;00%PO1jdb3b=Ub{)v0 z{q}|hHSA&YfF-NqGZsfaseYTn%N+onJND%d6q>}YUY15VxoHWhIN zXOL#8KI)A02Eft)u0;*|f|E6f14S<{M9gCE^o@#%s8(gxJ}S=vs9aQw$aEG}k_30v zDhY~L8?Vi=OhZ3@dDjPBK&+ z<_al*-SN&zpk=sx+>84A<=sTDB+@Odr03fB6!kg^$Ao!w4;}B{KW(5u>H*I}00000 LNkvXXu0mjfR`=E5 literal 0 HcmV?d00001 diff --git a/src/resource/msw/tool/window_style.png b/src/resource/msw/tool/window_style.png new file mode 100644 index 0000000000000000000000000000000000000000..9ad4d2c36899dce6b018c4dcd071cc5b55e51c7c GIT binary patch literal 568 zcmV-80>}M{P)#Q7u90$HSl&eJ^s3wsOeAWS1!}%1uI3^3 z^X*QCKff4xnMlwqFRqb%K|;+#dt zmEi!x-P6Yy?wq}K{M%=iG?*HUSlGO70W-t@zpR4q>XpUSB92OF`tY;--_P*q@>zx} z2hKkNYBq?T`0zbOIsj^9WMKHm1Js-jq?7;tW0nz;lIHCb$ina&Ihf7zIRK4f5hHjh!o*p%VP&BqLnufG9l-itLQ{$uzje)~J; zRKCAVUUnub47v(z4BtMhG929X>HfvNYb1a+=VQ|h0?d3Ws%$_1{Ezwb^?xy+q8`KL zTQ3=w9(>1e?)E2!J8xKz3w*ff7CZ6o0i1c^(-+3&j4WJ1Y$D-H6~<4v@f2@ndi(Bs;J5Fe7{32_!tmqAUxr`5{xGnz^KBPk{XS<-NB%8B zi3}Wwo0n9uF#P{*#_<1-8^gcfGl29rU_k!&O`Q9gkO2UmNDermHR3b?0000