From 56205ba9c84857768f130adab36bee89051c44bf Mon Sep 17 00:00:00 2001 From: William Kendrick Date: Sat, 10 Oct 2009 06:54:37 +0000 Subject: [PATCH] Inserting a dead tool button to get ones after Text and Label to line up nice. Improved Label tool icon. Improved Label tool "Select mode" button icon. --- data/images/tools/label.png | Bin 1045 -> 718 bytes data/images/tools/label_select.png | Bin 986 -> 1134 bytes src/tools.h | 9 +++++++++ src/tuxpaint.c | 5 +++++ 4 files changed, 14 insertions(+) diff --git a/data/images/tools/label.png b/data/images/tools/label.png index cd8319c83ed65de353fe1dafdf04fd8a65c8ba84..defd7890b2bcdaf374a517b66d8ae752ae7e7b47 100644 GIT binary patch delta 705 zcmV;y0zUnf2+jqN8Gi%-008vVlvV%$00DDSM?wIu&K&6g0007FOGiWi|A&vvzW@LL z32;bRa{vGf6951U69E94oEQKA00(qQO+^RU3JL}>8Q)QmT%Jot>TCO$y!S?O|uWGxMGAoA=%f$jsj~uee0YB-!i+-)S?K zgab3rOgTh9ARR&geN)0An=Jf7Cr!Nz8d&HmhmYty**(-WgAG1GD5XK@XHu! z^NxdhtSg~S5gLXY81mKK2qRLFTx6f8m%50 z8$bn@`)UTj4;I+R7=r-hlBMV20S*#LHKsd2JXOUWXMZWFZ;Ex6IowTQ6~T<|iCCNi z$7_`F0l`f+)z}x_Fv9Kh)sWmafS_^rxnfucL7poXz3G-{sLH2 zNRxGrhm(i&zK$l0QYctljK$c@!u^Z_9bPiYbsn1vXLX)Mi$zz3fz1OpO*#N9@P{e$ z3@eGK#((1+#Mn-a1+9yexXLr$n`c-7YAKh5cHLBHt8xtOHIl!)V3_lv!lb@roTZL` zI8rs*5#X@R?%|4?6hCwd~Jm((>G6WjF6~+Rm^PxSZ=7 ntc~Ep$)vJ0R-}_Nj0DnMQ-L|*4$>iiDSy@?G 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 diff --git a/src/tools.h b/src/tools.h index 4a76ccdce..8155d5868 100644 --- a/src/tools.h +++ b/src/tools.h @@ -41,6 +41,7 @@ enum TOOL_SHAPES, TOOL_TEXT, TOOL_LABEL, + TOOL_NA, TOOL_MAGIC, TOOL_UNDO, TOOL_REDO, @@ -75,6 +76,9 @@ const char *const tool_names[NUM_TOOLS] = { // Label tool gettext_noop("Label"), + // Reserved... + gettext_noop(""), + // "Magic" effects tools (blur, flip image, etc.) gettext_noop("Magic"), @@ -125,6 +129,9 @@ const char *const tool_tips[NUM_TOOLS] = { // Label tool instructions gettext_noop("Choose a style of text. Click on your drawing and you can start typing. Press [Enter] or [Tab] to complete the text. By using the selector button and clicking an exist label, you can move it, edit it and change its text style."), + // Reserved... + gettext_noop(""), + // Magic tool instruction gettext_noop("Pick a magical effect to use on your drawing!"), @@ -175,6 +182,7 @@ const char *const tool_img_fnames[NUM_TOOLS] = { DATA_PREFIX "images/tools/shapes.png", DATA_PREFIX "images/tools/text.png", DATA_PREFIX "images/tools/label.png", + DATA_PREFIX "images/ui/dead40x40.png", DATA_PREFIX "images/tools/magic.png", DATA_PREFIX "images/tools/undo.png", DATA_PREFIX "images/tools/redo.png", @@ -197,6 +205,7 @@ const int tool_tux[NUM_TOOLS] = { TUX_DEFAULT, TUX_DEFAULT, TUX_DEFAULT, + TUX_DEFAULT, TUX_OOPS, TUX_WAIT, TUX_DEFAULT, diff --git a/src/tuxpaint.c b/src/tuxpaint.c index ba71531ea..490a1ad3d 100644 --- a/src/tuxpaint.c +++ b/src/tuxpaint.c @@ -10889,6 +10889,11 @@ static void reset_avail_tools(void) tool_avail[TOOL_LABEL] = 0; + /* TBD... */ + + tool_avail[TOOL_NA] = 0; + + /* Disable save? */ if (disable_save)