From c0eb2243860146aa4d1a3e48a3b6a33ec8e1c110 Mon Sep 17 00:00:00 2001 From: twanvl Date: Fri, 23 Mar 2007 22:02:57 +0000 Subject: [PATCH] Icons for file->export git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@233 0fc631ac-6414-0410-93d0-97cfa31319b6 --- src/gui/control/graph.cpp | 6 +++++- src/gui/set/window.cpp | 10 +++++----- src/resource/msw/mse.rc | 5 +++++ src/resource/msw/tool/export_apprentice.png | Bin 0 -> 767 bytes src/resource/msw/tool/export_html.png | Bin 0 -> 999 bytes src/resource/msw/tool/export_image.png | Bin 0 -> 273 bytes src/resource/msw/tool/export_images.png | Bin 0 -> 348 bytes src/resource/msw/tool/export_mws.png | Bin 0 -> 452 bytes 8 files changed, 15 insertions(+), 6 deletions(-) create mode 100644 src/resource/msw/tool/export_apprentice.png create mode 100644 src/resource/msw/tool/export_html.png create mode 100644 src/resource/msw/tool/export_image.png create mode 100644 src/resource/msw/tool/export_images.png create mode 100644 src/resource/msw/tool/export_mws.png diff --git a/src/gui/control/graph.cpp b/src/gui/control/graph.cpp index 8ef0bea1..8dc4aedd 100644 --- a/src/gui/control/graph.cpp +++ b/src/gui/control/graph.cpp @@ -160,7 +160,7 @@ void BarGraph::draw(RotatedDC& dc, int current) const { } // How many labels and lines to draw? dc.SetFont(*wxNORMAL_FONT); - UInt label_step = UInt(max(1.0, dc.GetCharHeight() / step_height)); + UInt label_step = UInt(max(1.0, (dc.GetCharHeight() + 1) / step_height)); // Draw backlines (horizontal) and value labels dc.SetPen(lerp(bg, fg, 0.5)); for (UInt i = 0 ; i <= axis.max ; ++i) { @@ -218,6 +218,10 @@ int BarGraph::findItem(const RealPoint& pos, const RealRect& rect1) const { // ----------------------------------------------------------------------------- : Pie Graph +// ----------------------------------------------------------------------------- : Scatter Graph + + + // ----------------------------------------------------------------------------- : Graph Legend // ----------------------------------------------------------------------------- : GraphControl diff --git a/src/gui/set/window.cpp b/src/gui/set/window.cpp index 2bbf8d27..5ba5128a 100644 --- a/src/gui/set/window.cpp +++ b/src/gui/set/window.cpp @@ -54,11 +54,11 @@ SetWindow::SetWindow(Window* parent, const SetP& set) menuFile->Append(ID_FILE_SAVE, _("save"), _MENU_("save set"), _HELP_("save set")); menuFile->Append(ID_FILE_SAVE_AS, _MENU_("save set as"), _HELP_("save set as")); IconMenu* menuExport = new IconMenu(); - menuExport->Append(ID_FILE_EXPORT_HTML, _MENU_("export html"), _HELP_("export html")); - menuExport->Append(ID_FILE_EXPORT_IMAGE, _MENU_("export image"), _HELP_("export image")); - menuExport->Append(ID_FILE_EXPORT_IMAGES, _MENU_("export images"), _HELP_("export images")); - menuExport->Append(ID_FILE_EXPORT_APPR, _MENU_("export apprentice"),_HELP_("export apprentice")); - menuExport->Append(ID_FILE_EXPORT_MWS, _MENU_("export mws"), _HELP_("export mws")); + menuExport->Append(ID_FILE_EXPORT_HTML, _("export_html"), _MENU_("export html"), _HELP_("export html")); + menuExport->Append(ID_FILE_EXPORT_IMAGE, _("export_image"), _MENU_("export image"), _HELP_("export image")); + menuExport->Append(ID_FILE_EXPORT_IMAGES, _("export_images"), _MENU_("export images"), _HELP_("export images")); + menuExport->Append(ID_FILE_EXPORT_APPR, _("export_apprentice"), _MENU_("export apprentice"),_HELP_("export apprentice")); + menuExport->Append(ID_FILE_EXPORT_MWS, _("export_mws"), _MENU_("export mws"), _HELP_("export mws")); menuFile->Append(ID_FILE_EXPORT, _MENU_("export"), _("Export the set..."), menuExport); menuFile->AppendSeparator(); // menuFile->Append(ID_FILE_INSPECT, _("Inspect Internal Data..."), _("Shows a the data in the set using a tree structure")); diff --git a/src/resource/msw/mse.rc b/src/resource/msw/mse.rc index 4470fffd..0db79006 100644 --- a/src/resource/msw/mse.rc +++ b/src/resource/msw/mse.rc @@ -22,6 +22,11 @@ cursor/rot_text CURSOR "cursor/rot_text.cur" tool/new IMAGE "tool/new.png" tool/open IMAGE "tool/open.png" tool/save IMAGE "tool/save.png" +tool/export_html IMAGE "tool/export_html.png" +tool/export_image IMAGE "tool/export_image.png" +tool/export_images IMAGE "tool/export_images.png" +tool/export_mws IMAGE "tool/export_mws.png" +tool/export_apprentice IMAGE "tool/export_apprentice.png" tool/undo IMAGE "tool/undo.png" tool/redo IMAGE "tool/redo.png" diff --git a/src/resource/msw/tool/export_apprentice.png b/src/resource/msw/tool/export_apprentice.png new file mode 100644 index 0000000000000000000000000000000000000000..2a31978a48562fef88b7458196410c36586f39cd GIT binary patch literal 767 zcmVHwi#24SV1UVlv;?(EV}VgDuu?XRIn*XAl(%AQVOp7 z2XtFnY=zR5+ji;Z>$!;~2@-jw7 zMlSh8qtOOeDwUw?Is`$0D2iR?^ZBr}w1j4}37+S>d?ZPN$KwI#Ogk{*283WYfI0a6 zepIVf92^{6TxR>sLZJ}6UN5+^Q-(QfLLb$k2ntkDg(hnV3tGSO3+6Ku(MS{tBY~5X6V&VVRz~LlW-UO;DPhPMLNc2~ zrjmhGwP1g+k^Y*7^}@o=)(+TLtJT^7F$g6bfTqgu`&bVgr`2sCAVA_J2tJ9*xrx!k zED9edas1;ae*Zd#eQOjUVF1Rk4SA}Gh_esLnC<{rg9J(|MH6|YYWQR-$lV^scyS)d z$KMbuyo5fv3iti*P^aohq>B*b!44ouU5>@$_)Mb%$Kmw43$>Yhn18y08#8}!Z5D9N zohJFd xM|C#bZZ~>*df;-o{%d_So!;Kwu02{e{sCt&osd}Y29N*%002ovPDHLkV1kX0Q3C(~ literal 0 HcmV?d00001 diff --git a/src/resource/msw/tool/export_html.png b/src/resource/msw/tool/export_html.png new file mode 100644 index 0000000000000000000000000000000000000000..ff0f1f066bbbb5f5cbaac23a26c6eede5fd42496 GIT binary patch literal 999 zcmVpF33NqRbVF}#ZDnqB004<9jRpV!1B6LLK~#90Ws`eM6IK+)PbZ=h zjZ4t@h;v|~1n~jlqcc$goll}Dm;!m`rrO<+(nn_^EMsanE2% zP50HZyH7j!*9;?BRs(5q_1lPi-LO*AeEKUfuW;lIx2z5!Iyny97s9{cC**Vh^JLAK zd#nZNc_ne}j|Ob6xAi8)7wP``SNOpMnx1VK-r1CZs5TuGujfJxcc zK)*c4l^~FdMY+w_k?#nu$YNCXIN6|2hcHBP}CAo z_;`#L%!l}}HZg$AAe8W}&<=KfA_RvY z`fT7+K7z2D?5TmQ>Yi56-Y#Y`8}u6!#JPaN8bJa!GQJWMcX+}{$j1`C1mU8@5z_U) z_TPBfjA=m{kY^c7V)xD)AmJ&Hm@L4^zY6440rF5{=9UC(2t9%CH|8KEJ?}1UR}JV^ zU1noiqXaF>2D!;WYm1m53s#|4p!F>FP=L6(;4D3hIU6p3=XVJ!ehh;4);%wBQsEsp zS~a>NI{)>AH5XySJ%=$YahzK+Ch+3%4U4UpOJVC)02iMsEb`T0hI6nvElVC{;b(gu zrj>hAbMi~8-G$QHj#&b&c_F_ROZh4|ZN386Z5pg*kk(Y!PB{_P32YE1^VB6Isf0@zX7N) VcS9YSD>DE9002ovPDHLkV1o9#$bSF; literal 0 HcmV?d00001 diff --git a/src/resource/msw/tool/export_image.png b/src/resource/msw/tool/export_image.png new file mode 100644 index 0000000000000000000000000000000000000000..299b9f108e733345f82cfabfb3f344adc0dadedb GIT binary patch literal 273 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGLLkg|>2BR0kYI^x zM2T~LZf||fA*ixeEZ*h`P={bXAA!S-(vOV z|K)3w{`;$)`SJhH3&}rh4LQe_{=E2R?*IAo_cY#Tn6SAp({A_IKmUJEe2BR0kYI^x zM2T~LZfuvGYP=N-Kfc}i9nY>y?}X-g&YS;!Zh6Dic}QGG?jG z;a_l=L3@kC_0orX8Z4RFcs5Mr)t;lw*Hy@8ku5DJJSS3q($hz>9AzROBpgoZhA`T% zJ8*clQ_i&q_W~Z?TXT4As?(;AmI+>sAAA@;Jzex^t8Lp6+d_xwjC!mmZn!>uTfiPD zu$MV=R#3tbhCR;~74c91KK*vN!f7L}0%^BvKF9hZZo00J5vZ(VO8p2n?RCelF{r5}E)pF33NqRbVF}#ZDnqB004<9jRpV!0bxl*K~#90mD5X00#O(S;M2Bk zf5IOk)UFmSS|&t`7PSd#kwruVLAdB*=qTM?WC;}nW#EV+g%TQ>AeK~ul2;rmvv_kp zm{Z~?GXpPY;C$}`XPCnPFeP0^kD-zAMxZ5fN42Qsk>?m=Bdn!Z@