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

Added "--nostamps" to disable Stamp tool. (Speeds up loading; reduces RAM)

Browse source
This commit is contained in:
William Kendrick 2003-06-15 02:05:13 +00:00
parent 82e231c7d2
commit 1100b76284
5 changed files with 112 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

5
docs/CHANGES.txt
View file

@ -64,6 +64,11 @@ http://www.newbreedsoftware.com/tuxpaint/
* Added a set of square brushes (similar to the various round ones).
* Added "--nostamps" option to disable stamp tool.
(When it's not needed, they just take time to load, and RAM to store.)
* Added missing "--nosysconfig" to "--help" usage output.
2003.February.22 (0.9.10)
* UTF-8 stamp descriptions word-wrap around spaces.

30
docs/FAQ.txt
View file

@ -6,7 +6,7 @@ Copyright 2003 by Bill Kendrick
bill@newbreedsoftware.com
http://www.newbreedsoftware.com/tuxpaint/
September 14, 2002 - January 5, 2003
September 14, 2002 - June 14, 2003
Frequently Asked Questions:
@ -35,7 +35,8 @@ Frequently Asked Questions:
#define LOW_QUALITY_FLOOD_FILL
in the "tuxpaint.c" file in the "src" directory.
Stamp outlines are always rectangles
------------------------------------
Tux Paint was built with low-quality (but faster) stamp outlines.
@ -48,6 +49,31 @@ Frequently Asked Questions:
in the "tuxpaint.c" file in the "src" directory.
The Rubber Stamp tool is greyed out!
------------------------------------
This means that Tux Paint either couldn't find any stamp images,
or was asked not to load them.
If you installed Tux Paint, but did not install the separate,
optional "Stamps" collection, quit Tux Paint and install it now.
It should be available from the same place you got the main
Tux Paint program.
If you don't want to install the default collection of stamps,
you can just create your own. See the README documentation for
more on creating PNG image files, TXT text description files,
WAV sound files, and DAT text data files that make up stamps.
Finally, if you install the stamps, and think they should be loading,
check to see that the "nostamps" option isn't being set.
(Either via a "--nostamps" option to Tux Paint's command line, or
"nostamps=yes" in the configuration file.)
If so, either change/remove the "nostamps" option, or you can
override it with "--stamps" on the command line or
"nostamps=no" or "stamps=yes" in a configuration file.
Interface Problems
------------------
Stamp thumbnails in the Stamp Selector look bad

9
docs/README.txt
View file

@ -274,6 +274,15 @@ Options
This can help when Tux Paint is run on very slow
computers, or displayed on a remote X-Window display.
nostamps=yes
This option tells Tux Paint to not load any rubber stamp
images, which in turn ends up disabling the Stamps tool.
This can speed up Tux Paint when it first loads up, and
reduce memory usage while it's running. Of course, no
stamps will be available at all.
savedir DIRECTORY
Use this option to change where Tux Paint saves pictures.

10
docs/html/README.html
View file

@ -368,6 +368,16 @@ New Breed Software</p>
or displayed on a remote X-Window display.</p>
</dd>
<dt><code><b>nostamps=yes</b></code></dt>
<dd>
<p>This option tells Tux&nbsp;Paint to not load any rubber stamp
images, which in turn ends up disabling the <b>Stamps</b> tool.</p>
<p>This can speed up Tux&nbsp;Paint when it first loads up,
and reduce memory usage while it's running. Of course, no stamps
will be available at all.</p>
</dd>
<dt><code><b>savedir&nbsp;<i>DIRECTORY</i></b></code></dt>
<dd>
<p>Use this option to change where Tux&nbsp;Paint saves pictures.

97
src/tuxpaint.c
View file

@ -327,7 +327,7 @@ int use_sound, fullscreen, disable_quit, simple_shapes, language,
disable_print, print_delay, only_uppercase, promptless_save, grab_input,
wheely, no_fancy_cursors, keymouse, mouse_x, mouse_y,
mousekey_up, mousekey_down, mousekey_left, mousekey_right,
dont_do_xor, use_print_config;
dont_do_xor, use_print_config, dont_load_stamps;
int WINDOW_WIDTH, WINDOW_HEIGHT;
char * printcommand;
int prog_bar_ctr;
@ -3275,15 +3275,17 @@ void show_usage(FILE * f, char * prg)
"Usage: %s {--usage | --help | --version | --copying}\n"
" %s [--fullscreen] [--800x600] [--nosound] [--noquit] [--noprint]\n"
" [--simpleshapes] [--uppercase] [--grab] [--nowheelmouse]\n"
" [--nofancycursors] [--keyboard] [--nooutlines]\n"
" [--nofancycursors] [--keyboard] [--nooutlines] [--nostamps]\n"
" [--savedir DIRECTORY] [--saveover] [--saveovernew]\n"
" %s [--windowed] [--640x480] [--sound] [--quit] [--print]\n"
" [--complexshapes] [--mixedcase] [--dontgrab] [--wheelmouse]\n"
" [--fancycursors] [--mouse] [--outlines]\n"
" [--fancycursors] [--mouse] [--outlines] [--stamps]\n"
" [--saveoverask]\n"
" %s [--printcfg | --noprintcfg] (Windows only)\n"
" %s [--printdelay=SECONDS]\n"
" [--lang LANGUAGE | --locale LOCALE]\n\n"
" [--lang LANGUAGE | --locale LOCALE]\n"
" %s [--nosysconfig]\n"
"\n"
"LANGUAGE may be one of:\n"
" english american-english\n"
" brazilian brazilian-portuguese portugues-brazilian\n"
@ -3313,7 +3315,7 @@ void show_usage(FILE * f, char * prg)
" spanish espanol\n"
" swedish svenska\n"
" turkish\n\n",
prg, prg, prg, prg, prg);
prg, prg, prg, prg, prg, prg);
}
@ -3377,6 +3379,7 @@ void setup(int argc, char * argv[])
promptless_save = SAVE_OVER_PROMPT;
disable_quit = 0;
disable_print = 0;
dont_load_stamps = 0;
print_delay = 0;
printcommand = "pngtopnm | pnmtops | lpr";
langstr = NULL;
@ -3564,6 +3567,14 @@ void setup(int argc, char * argv[])
{
disable_quit = 0;
}
else if (strcmp(argv[i], "--nostamps") == 0)
{
dont_load_stamps = 1;
}
else if (strcmp(argv[i], "--stamps") == 0)
{
dont_load_stamps = 0;
}
else if (strcmp(argv[i], "--noprint") == 0 || strcmp(argv[i], "-p") == 0)
{
disable_print = 1;
@ -4402,51 +4413,54 @@ void setup(int argc, char * argv[])
/* Load stamps: */
if (dont_load_stamps == 0)
{
#ifndef NOSOUND
loadarbitrary(img_stamps, txt_stamps, inf_stamps, snd_stamps, &num_stamps, 0,
MAX_STAMPS, DATA_PREFIX "stamps", 0, -1, -1);
loadarbitrary(img_stamps, txt_stamps, inf_stamps, snd_stamps, &num_stamps,
0, MAX_STAMPS, DATA_PREFIX "stamps", 0, -1, -1);
#else
loadarbitrary(img_stamps, txt_stamps, inf_stamps, &num_stamps, 0,
MAX_STAMPS, DATA_PREFIX "stamps", 0, -1, -1);
loadarbitrary(img_stamps, txt_stamps, inf_stamps, &num_stamps,
0, MAX_STAMPS, DATA_PREFIX "stamps", 0, -1, -1);
#endif
homedirdir = get_fname("stamps");
homedirdir = get_fname("stamps");
#ifndef NOSOUND
loadarbitrary(img_stamps, txt_stamps, inf_stamps, snd_stamps,
&num_stamps, num_stamps,
MAX_STAMPS, homedirdir, 0, -1, -1);
loadarbitrary(img_stamps, txt_stamps, inf_stamps, snd_stamps,
&num_stamps, num_stamps,
MAX_STAMPS, homedirdir, 0, -1, -1);
#else
loadarbitrary(img_stamps, txt_stamps, inf_stamps, &num_stamps, num_stamps,
MAX_STAMPS, homedirdir, 0, -1, -1);
loadarbitrary(img_stamps, txt_stamps, inf_stamps, &num_stamps, num_stamps,
MAX_STAMPS, homedirdir, 0, -1, -1);
#endif
if (num_stamps == 0)
{
fprintf(stderr,
"\nWarning: No stamps found in " DATA_PREFIX "stamps/\n"
"or %s\n\n", homedirdir);
}
free(homedirdir);
/* Create stamp thumbnails: */
for (i = 0; i < num_stamps; i++)
{
if (img_stamps[i]->w > 40 ||
img_stamps[i]->h > 40)
if (num_stamps == 0)
{
img_stamp_thumbs[i] = thumbnail(img_stamps[i], 40, 40, 1);
}
else
{
img_stamp_thumbs[i] = NULL;
fprintf(stderr,
"\nWarning: No stamps found in " DATA_PREFIX "stamps/\n"
"or %s\n\n", homedirdir);
}
show_progress_bar();
free(homedirdir);
/* Create stamp thumbnails: */
for (i = 0; i < num_stamps; i++)
{
if (img_stamps[i]->w > 40 ||
img_stamps[i]->h > 40)
{
img_stamp_thumbs[i] = thumbnail(img_stamps[i], 40, 40, 1);
}
else
{
img_stamp_thumbs[i] = NULL;
}
show_progress_bar();
}
}
@ -10557,6 +10571,15 @@ void parse_options(FILE * fi)
{
disable_print = 0;
}
else if (strcmp(str, "nostamps=yes") == 0)
{
dont_load_stamps = 1;
}
else if (strcmp(str, "nostamps=no") == 0 ||
strcmp(str, "stamps=yes") == 0)
{
dont_load_stamps = 0;
}
else if (strcmp(str, "nosound=yes") == 0)
{
use_sound = 0;