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

* Thumbnails now stored in ".thumbs" subdirectory under "saved".

Browse source 
* Moved "tuxpaint-import.1" source into "src/manpage"
This commit is contained in:
William Kendrick 2003-06-17 09:10:57 +00:00
parent be7efbb0d5
commit face1b6038
6 changed files with 90 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/tuxpaint-import.1 → src/manpage/tuxpaint-import.1
View file

@ -1,5 +1,5 @@
.\" tuxpaint-import.1 - 2002.10.19
.TH TUXPAINT-IMPORT 1 "19 Oct 2002" "2002.10.19" "Tux Paint Import"
.\" tuxpaint-import.1 - 2003.06.17
.TH TUXPAINT-IMPORT 1 "17 Jun 2003" "2003.06.17" "Tux Paint Import"
.SH NAME
tuxpaint-import -- Import image files into Tux Paint(1)
@ -32,6 +32,10 @@ to determine where the files should go so that they can be access within
where new image files are stored, after being resized and converted into PNG
format.
.TP 8
.B $HOME/.tuxpaint/saved/.thumbs
where thumbnail images are stored.
.SH AUTHOR
Bill Kendrick. <bill@newbreedsoftware.com>

10
src/tuxpaint-import.sh
View file

@ -9,7 +9,7 @@
# bill@newbreedsoftware.com
# http://www.newbreedsoftware.com/tuxpaint/
# September 21, 2002 - January 16, 2003
# September 21, 2002 - June 17, 2003
TMPDIR=/tmp
@ -45,6 +45,12 @@ if [ ! -d $SAVEDIR ]; then
mkdir -p $SAVEDIR
fi
# Make sure savedir thumbs directory exists!
if [ ! -d $SAVEDIR/.thumbs ]; then
echo "Creating $SAVEDIR/.thumbs"
mkdir -p $SAVEDIR/.thumbs
fi
# For each picture list...
for i in $*
@ -68,7 +74,7 @@ do
# Create thumbnail for 'Open' dialog:
pngtopnm $SAVEDIR/$NEWFILENAME.png | pnmscale -xysize 92 56 \
| pnmtopng > $SAVEDIR/$NEWFILENAME-t.png
| pnmtopng > $SAVEDIR/.thumbs/$NEWFILENAME-t.png
else
# File wasn't there!

70
src/tuxpaint.c
View file

@ -8050,7 +8050,34 @@ int do_save(void)
"%s\n\n", fname, strerror(errno));
fprintf(stderr,
"Cannot save the any pictures! SORRY!\n\n");
"Cannot save any pictures! SORRY!\n\n");
draw_tux_text(TUX_OOPS, SDL_GetError(), 0, 0, 0);
free(fname);
return 0;
}
free(fname);
show_progress_bar();
/* Make sure we have a ~/.tuxpaint/saved/.thumbs/ directory: */
fname = get_fname("saved/.thumbs");
res = mkdir(fname, 0755);
if (res != 0 && errno != EEXIST)
{
fprintf(stderr,
"\nError: Can't create user data thumbnail directory:\n"
"%s\n"
"The error that occurred was:\n"
"%s\n\n", fname, strerror(errno));
fprintf(stderr,
"Cannot save any pictures! SORRY!\n\n");
draw_tux_text(TUX_OOPS, SDL_GetError(), 0, 0, 0);
@ -8116,11 +8143,27 @@ int do_save(void)
show_progress_bar();
/* Save thumbnail, too: */
/* (Was thumbnail in old directory, rather than under .thumbs?) */
snprintf(tmp, sizeof(tmp), "saved/%s-t%s", file_id, FNAME_EXTENSION);
fname = get_fname(tmp);
fi = fopen(fname, "r");
if (fi != NULL)
{
fclose(fi);
}
else
{
/* No old thumbnail! Save this image's thumbnail in the new place,
under ".thumbs" */
snprintf(tmp, sizeof(tmp), "saved/.thumbs/%s-t%s", file_id, FNAME_EXTENSION);
fname = get_fname(tmp);
}
debug(fname);
thm = thumbnail(canvas, THUMB_W - 20, THUMB_H - 20, 0);
@ -8524,10 +8567,22 @@ int do_open(int want_new_tool)
/* Try to load thumbnail first: */
snprintf(fname, sizeof(fname), "%s/%s-t.png", dirname,
d_names[num_files]);
snprintf(fname, sizeof(fname), "%s/.thumbs/%s-t.png",
dirname, d_names[num_files]);
debug(fname);
img = IMG_Load(fname);
if (img == NULL)
{
/* No thumbnail in the new location ("saved/.thumbs"),
try the old locatin ("saved/"): */
snprintf(fname, sizeof(fname), "%s/%s-t.png", dirname,
d_names[num_files]);
debug(fname);
img = IMG_Load(fname);
}
if (img != NULL)
{
@ -8546,7 +8601,8 @@ int do_open(int want_new_tool)
num_files++;
}
else
if (img == NULL)
{
/* No thumbnail - load original: */
@ -8605,8 +8661,8 @@ int do_open(int want_new_tool)
debug("Saving thumbnail for this one!");
snprintf(fname, sizeof(fname), "%s/%s-t.png", dirname,
d_names[num_files]);
snprintf(fname, sizeof(fname), "%s/.thumbs/%s-t.png",
dirname, d_names[num_files]);
fi = fopen(fname, "wb");
if (fi == NULL)