diff --git a/data/images/tools/label.png b/data/images/tools/label.png index cd8319c83..defd7890b 100644 Binary files a/data/images/tools/label.png and b/data/images/tools/label.png differ diff --git a/data/images/tools/label_select.png b/data/images/tools/label_select.png index 272b92952..d354c4919 100644 Binary files a/data/images/tools/label_select.png and b/data/images/tools/label_select.png differ 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)