Added "--nosave" option to completely disable Tux Paint's ability to save.

docs/CHANGES.txt

@@ -8,6 +8,8 @@ http://www.newbreedsoftware.com/tuxpaint/
 
 
 2004.May.30 (0.9.14) [cvs]
+  * Added "--nosave" option (suggested by Adam Moore).
+
   * Changed default UI font to "FreeSans.ttf"
 
   * Updated Breton translation.

docs/README.txt

@@ -9,7 +9,7 @@
                            bill@newbreedsoftware.com
                    http://www.newbreedsoftware.com/tuxpaint/
 
-                          June 14, 2002 - May 16, 2004
+                          June 14, 2002 - May 30, 2004
 
      ----------------------------------------------------------------------
 
@@ -356,6 +356,12 @@ Options
                    When saving an existing drawing, you will be first asked
                    whether to save over the older version or not.
 
+           nosave=yes
+                   This disables Tux Paint's ability to save files (and
+                   therefore disables the on-screen "Save" button). It can be
+                   used in situations where the program is only being used
+                   for fun, or in a test environment.
+
            lang=LANGUAGE
 
                    Run Tux Paint in one of the supported languages. Possible
@@ -495,6 +501,7 @@ Options
            --savedir DIRECTORY
            --saveover
            --saveovernew
+           --nosave
            --lang LANGUAGE
                    These enable or correspond to the configuration file
                    options described above.
@@ -518,6 +525,7 @@ Options
            --dontmirrorstamps
            --mouse
            --saveoverask
+           --save
                    These options can be used to override any settings made in
                    the configuration file. (If the option isn't set in the
                    configuration file(s), no overriding option is necessary.)

docs/html/README.html

@@ -23,7 +23,7 @@ New Breed Software</p>
 <p><a href="mailto:bill@newbreedsoftware.com">bill@newbreedsoftware.com</a><br>
 <a href="http://www.newbreedsoftware.com/tuxpaint/">http://www.newbreedsoftware.com/tuxpaint/</a></p>
 
-<p>June 14, 2002 - May 16, 2004</p>
+<p>June 14, 2002 - May 30, 2004</p>
 </center>
 
 <hr size=2 noshade>
@@ -454,6 +454,14 @@ New Breed Software</p>
 	  When saving an existing drawing, you will be first asked whether
 	  to save over the older version or not.
 	</dd>
+
+	<dt><code><b>nosave=yes</b></code></dt>
+	<dd>
+	  This disables Tux&nbsp;Paint's ability to save files
+	  (and therefore disables the on-screen "Save" button).
+	  It can be used in situations where the program is only being used for
+	  fun, or in a test environment.
+	</dd>
 	
 	<dt><code><b>lang=<i>LANGUAGE</i></b></code></dt>
 	<dd>
@@ -738,6 +746,7 @@ New Breed Software</p>
 	--savedir&nbsp;DIRECTORY<br>
         --saveover<br>
         --saveovernew<br>
+	--nosave<br>
         --lang&nbsp;LANGUAGE<br>
         </b></code></dt>
         <dd>
@@ -765,6 +774,7 @@ New Breed Software</p>
 	--dontmirrorstamps<br>
 	--mouse<br>
         --saveoverask<br>
+	--save<br>
 	</b></code></dt>
 	<dd>
           These options can be used to override any settings made in

src/manpage/tuxpaint.1

@@ -30,6 +30,7 @@ tuxpaint -- A drawing program for young children.
 [\-\-savedir \fIDIR\fP]
 [\-\-saveover]
 [\-\-saveovernew]
+[\-\-nosave]
 
 .TP 9
 .B tuxpaint
@@ -52,6 +53,7 @@ tuxpaint -- A drawing program for young children.
 [\-\-dontmirrorstamps]
 [\-\-mouse]
 [\-\-saveoverask]
+[\-\-save]
 
 .TP 9
 .B tuxpaint
@@ -214,6 +216,12 @@ can be disabled with \fI\-\-saveover\fP (which always saves over older versions
 of pictures) or \fI\-\-saveovernew\fP (which always saves a new file).
 The default is to prompt (\fI\-\-saveoverask\fP).
 
+.TP 8
+.B \-\-nosave \-\-save
+The \fInosave\fP option disables \fITux Paint's\fP ability to save files.
+This can be used in situations where the program is only being used for
+fun, or in a test environment.
+
 .SH OPTIONS - LANGUAGE
 .l
 Various parts of \fITux Paint\fP have been translated into numerous languages.

src/tuxpaint.c

@@ -21,12 +21,12 @@
   along with this program; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
   
-  June 14, 2002 - May 16, 2004
+  June 14, 2002 - May 30, 2004
 */
 
 
 #define VER_VERSION     "0.9.14"
-#define VER_DATE        "2004.05.16"
+#define VER_DATE        "2004.05.30"
 
 
 /* #define DEBUG */
@@ -428,7 +428,7 @@ int use_sound, fullscreen, disable_quit, simple_shapes, language,
   wheely, no_fancy_cursors, keymouse, mouse_x, mouse_y,
   mousekey_up, mousekey_down, mousekey_left, mousekey_right,
   dont_do_xor, use_print_config, dont_load_stamps, noshortcuts,
-  mirrorstamps, disable_stamp_controls;
+  mirrorstamps, disable_stamp_controls, disable_save;
 int recording, playing;
 char * playfile;
 FILE * demofi;
@@ -1296,7 +1296,9 @@ void mainloop(void)
 			  do_undo();
 			  
 			  been_saved = 0;
-			  tool_avail[TOOL_SAVE] = 1;
+
+			  if (!disable_save)
+			    tool_avail[TOOL_SAVE] = 1;
 			  
 			  cur_tool = old_tool;
 			  draw_toolbar();
@@ -1310,7 +1312,9 @@ void mainloop(void)
 			  do_redo();
 			  
 			  been_saved = 0;
-			  tool_avail[TOOL_SAVE] = 1;
+
+			  if (!disable_save)
+			    tool_avail[TOOL_SAVE] = 1;
 			  
 			  cur_tool = old_tool;
 			  draw_toolbar();
@@ -1926,7 +1930,10 @@ void mainloop(void)
 		  if (been_saved)
 		    {
 		      been_saved = 0;
-		      tool_avail[TOOL_SAVE] = 1;
+
+		      if (!disable_save)
+		        tool_avail[TOOL_SAVE] = 1;
+
 		      draw_toolbar();
 		      SDL_UpdateRect(screen,
 				     0, 0,
@@ -3762,6 +3769,7 @@ void show_usage(FILE * f, char * prg)
 	  "  %s [--nostampcontrols | --stampcontrols]\n"
 	  "  %s [--mirrorstamps | --dontmirrorstamps]\n"
 	  "  %s [--saveoverask | --saveover | --saveovernew]\n"
+	  "  %s [--nosave | --save]\n"
 	  "  %s [--savedir DIRECTORY]\n"
 #ifdef WIN32
 	  "  %s [--printcfg | --noprintcfg]\n"
@@ -3776,6 +3784,7 @@ void show_usage(FILE * f, char * prg)
 	  blank, blank, blank,
 	  blank, blank, blank,
 	  blank, blank, blank,
+	  blank,
 #ifdef WIN32
 	  blank,
 #endif
@@ -3960,6 +3969,7 @@ void setup(int argc, char * argv[])
   only_uppercase = 0;
   promptless_save = SAVE_OVER_PROMPT;
   disable_quit = 0;
+  disable_save = 0;
   disable_print = 0;
   dont_load_stamps = 0;
   print_delay = 0;
@@ -4190,6 +4200,14 @@ void setup(int argc, char * argv[])
 	{
 	  disable_quit = 0;
 	}
+      else if (strcmp(argv[i], "--nosave") == 0)
+	{
+	  disable_save = 1;
+	}
+      else if (strcmp(argv[i], "--save") == 0)
+	{
+	  disable_save = 0;
+	}
       else if (strcmp(argv[i], "--nostamps") == 0)
 	{
 	  dont_load_stamps = 1;
@@ -7270,6 +7288,12 @@ void reset_avail_tools(void)
     tool_avail[TOOL_QUIT] = 0;
 
 
+  /* Disable save? */
+
+  if (disable_save)
+    tool_avail[TOOL_SAVE] = 0;
+
+
 #ifdef WIN32
   if(!IsPrinterAvailable()) disallow_print = 1;
 #endif
@@ -9170,6 +9194,12 @@ int do_save(void)
 #endif
 
 
+  /* Was saving completely disabled? */
+
+  if (disable_save)
+    return 0;
+
+  
   if (promptless_save == SAVE_OVER_NO)
     {
       /* Never save over - _always_ save a new file! */
@@ -9547,7 +9577,7 @@ int do_quit(void)
 	           PROMPT_QUIT_YES,
 		   PROMPT_QUIT_NO);
 
-  if (done && !been_saved)
+  if (done && !been_saved && !disable_save)
     {
       if (do_prompt(PROMPT_QUIT_SAVE_TXT,
 		    PROMPT_QUIT_SAVE_YES,
@@ -10492,7 +10522,7 @@ int do_open(int want_new_tool)
 	    {
 	      /* Save old one first? */
 	  
-	      if (!been_saved)
+	      if (!been_saved && !disable_save)
 		{
 		  if (do_prompt(PROMPT_OPEN_SAVE_TXT,
 				PROMPT_OPEN_SAVE_YES,
@@ -12041,6 +12071,15 @@ void parse_options(FILE * fi)
 	    {
 	      disable_quit = 0;
 	    }
+	  else if (strcmp(str, "nosave=yes") == 0)
+	    {
+	      disable_save = 1;
+	    }
+	  else if (strcmp(str, "nosave=no") == 0 ||
+		   strcmp(str, "save=yes") == 0)
+	    {
+	      disable_save = 0;
+	    }
 	  else if (strcmp(str, "noprint=yes") == 0)
 	    {
 	      disable_print = 1;

src/tuxpaint.conf

@@ -5,7 +5,7 @@
 #
 # Bill Kendrick <bill@newbreedsoftware.com>
 # Default distribution version last modified:
-# September 27, 2003
+# May 30, 2004
 
 
 # The variables described below are initially commented out.
@@ -203,6 +203,13 @@
 # saveover=ask
 
 
+### Disable the 'Save' feature altogether?
+### --------------------------------------
+#
+# nosave=yes
+# save=yes
+
+
 ### Use a different language?
 ### -------------------------
 ### Note: Where the language is a known language name (e.g., "spanish")