notgne2/tuxpaint-pencil-sharpener
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Made Label tool truly disableable.

Browse source 
Reordered tools slightly.
This commit is contained in:
William Kendrick 2009-10-04 07:27:00 +00:00
parent dc0409900b
commit 460d691a95
2 changed files with 16 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/tools.h
View file

@ -19,11 +19,11 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
(See COPYING.txt) (See COPYING.txt)
Copyright (c) 2002-2007 by Bill Kendrick Copyright (c) 2002-2009 by Bill Kendrick
bill@newbreedsoftware.com bill@newbreedsoftware.com
http://www.tuxpaint.org/ http://www.tuxpaint.org/
June 14, 2002 - July 17, 2007 June 14, 2002 - October 4, 2009
$Id$ $Id$
*/ */
@ -40,8 +40,8 @@ enum
TOOL_LINES, TOOL_LINES,
TOOL_SHAPES, TOOL_SHAPES,
TOOL_TEXT, TOOL_TEXT,
TOOL_MAGIC,
TOOL_LABEL, TOOL_LABEL,
TOOL_MAGIC,
TOOL_UNDO, TOOL_UNDO,
TOOL_REDO, TOOL_REDO,
TOOL_ERASER, TOOL_ERASER,
@ -72,12 +72,12 @@ const char *const tool_names[NUM_TOOLS] = {
// Text tool // Text tool
gettext_noop("Text"), gettext_noop("Text"),
// "Magic" effects tools (blur, flip image, etc.)
gettext_noop("Magic"),
// Label tool // Label tool
gettext_noop("Label"), gettext_noop("Label"),
// "Magic" effects tools (blur, flip image, etc.)
gettext_noop("Magic"),
// Undo last action // Undo last action
gettext_noop("Undo"), gettext_noop("Undo"),
@ -122,12 +122,12 @@ const char *const tool_tips[NUM_TOOLS] = {
// Text tool instructions // Text tool instructions
gettext_noop("Choose a style of text. Click on your drawing and you can start typing."), gettext_noop("Choose a style of text. Click on your drawing and you can start typing."),
// Magic tool instruction
gettext_noop("Pick a magical effect to use on your drawing!"),
// Label tool instructions // Label tool instructions
gettext_noop("Choose a style of text. Click on your drawing and you can start typing. Click on the wheel to rotate the text. Click on the edit button and select a label to edit."), gettext_noop("Choose a style of text. Click on your drawing and you can start typing. Click on the wheel to rotate the text. Click on the edit button and select a label to edit."),
// Magic tool instruction
gettext_noop("Pick a magical effect to use on your drawing!"),
// Response to 'undo' action // Response to 'undo' action
gettext_noop("Undo!"), gettext_noop("Undo!"),
@ -174,8 +174,8 @@ const char *const tool_img_fnames[NUM_TOOLS] = {
DATA_PREFIX "images/tools/lines.png", DATA_PREFIX "images/tools/lines.png",
DATA_PREFIX "images/tools/shapes.png", DATA_PREFIX "images/tools/shapes.png",
DATA_PREFIX "images/tools/text.png", DATA_PREFIX "images/tools/text.png",
DATA_PREFIX "images/tools/magic.png",
DATA_PREFIX "images/tools/label.png", DATA_PREFIX "images/tools/label.png",
DATA_PREFIX "images/tools/magic.png",
DATA_PREFIX "images/tools/undo.png", DATA_PREFIX "images/tools/undo.png",
DATA_PREFIX "images/tools/redo.png", DATA_PREFIX "images/tools/redo.png",
DATA_PREFIX "images/tools/eraser.png", DATA_PREFIX "images/tools/eraser.png",

6
src/tuxpaint.c
View file

@ -10830,6 +10830,12 @@ static void reset_avail_tools(void)
tool_avail[TOOL_QUIT] = 0; tool_avail[TOOL_QUIT] = 0;
/* Disable Label? */
if (disable_label)
tool_avail[TOOL_LABEL] = 0;
/* Disable save? */ /* Disable save? */
if (disable_save) if (disable_save)