Commit 155981ac authored by Manish Singh's avatar Manish Singh

create tips dialog after loading files on the command line, instead of in

* app/app_procs.c: create tips dialog after loading files on the command line,
instead of in an idle function. Lamer hack, but it works better.

* app/gdisplay_ops.c: fix for new view on zoomed image

* Makefile.am
* gimptool.1: added man page for gimptool by Ben Gertzfield

-Yosh
parent c970beaf
Tue May 12 02:49:12 PDT 1998 Manish Singh <yosh@gimp.org>
* app/app_procs.c: create tips dialog after loading files on the
command line, instead of in an idle function. Lamer hack, but it
works better.
* app/gdisplay_ops.c: fix for new view on zoomed image
* Makefile.am
* gimptool.1: added man page for gimptool by Ben Gertzfield
Mon May 11 16:59:18 PDT 1998 Manish Singh <yosh@gimp.org>
* gimptool.in: added --install-bin options for installing already
......
......@@ -4,13 +4,13 @@ SUBDIRS = libgimp plug-ins app data
bin_SCRIPTS = gimptool
EXTRA_DIST = TODO NOTES gtkrc gimp_logo.ppm gimp_splash.ppm rmshm user_install gimp_tips.txt ps-menurc
EXTRA_DIST = TODO NOTES gtkrc gimp_logo.ppm gimp_splash.ppm rmshm user_install gimp_tips.txt ps-menurc gimp.1 gimptool.1
gimpdata_DATA = gimprc gimprc_user gtkrc gimp_logo.ppm gimp_splash.ppm gimp_tips.txt ps-menurc
gimpdata_SCRIPTS = user_install
man_MANS=gimp.1
man_MANS=gimp.1 gimptool.1
scriptdata =
......
......@@ -105,18 +105,6 @@ static ProcRecord quit_proc =
};
/* Warning: This is a hack. This makes the files load _after_ the gtk_main
loop starts. This means that if a file is on the command line, the
file handling plug-in's gtk_main won't cause any dialogs that have
set a gtk_quit_add_destroy (...) to die when the plug-in ends.
Thanks to Owen for this.
*/
gint file_open_wrapper (char *name) {
file_open (name, name);
return FALSE;
}
void
gimp_init (int gimp_argc,
char **gimp_argv)
......@@ -129,11 +117,15 @@ gimp_init (int gimp_argc,
while (gimp_argc--)
{
if (*gimp_argv)
gtk_idle_add ((GtkFunction) file_open_wrapper, *gimp_argv);
file_open (*gimp_argv, *gimp_argv);
gimp_argv++;
}
batch_init ();
/* Handle showing dialogs with gdk_quit_adds here */
if (!no_interface && show_tips)
tips_dialog_create ();
}
......@@ -255,7 +247,7 @@ splash_text_draw (GtkWidget *widget)
font = gdk_font_load ("-Adobe-Helvetica-Bold-R-Normal--*-140-*-*-*-*-*-*");
gdk_draw_string (widget->window,
font,
widget->style->black_gc,
widget->style->fg_gc[GTK_STATE_NORMAL],
((logo_area_width - gdk_string_width (font, NAME)) / 2),
(0.25 * logo_area_height),
NAME);
......@@ -263,19 +255,19 @@ splash_text_draw (GtkWidget *widget)
font = gdk_font_load ("-Adobe-Helvetica-Bold-R-Normal--*-120-*-*-*-*-*-*");
gdk_draw_string (widget->window,
font,
widget->style->black_gc,
widget->style->fg_gc[GTK_STATE_NORMAL],
((logo_area_width - gdk_string_width (font, GIMP_VERSION)) / 2),
(0.45 * logo_area_height),
GIMP_VERSION);
gdk_draw_string (widget->window,
font,
widget->style->black_gc,
widget->style->fg_gc[GTK_STATE_NORMAL],
((logo_area_width - gdk_string_width (font, BROUGHT)) / 2),
(0.65 * logo_area_height),
BROUGHT);
gdk_draw_string (widget->window,
font,
widget->style->black_gc,
widget->style->fg_gc[GTK_STATE_NORMAL],
((logo_area_width - gdk_string_width (font, AUTHORS)) / 2),
(0.80 * logo_area_height),
AUTHORS);
......@@ -444,7 +436,7 @@ app_init_update_status(char *label1val,
#define RESET_BAR()
void
app_init ()
app_init (void)
{
char filename[MAXPATHLEN];
char *gimp_dir;
......@@ -527,8 +519,6 @@ app_init ()
render_setup (transparency_type, transparency_size);
tools_options_dialog_new ();
tools_select (RECT_SELECT);
if (show_tips)
tips_dialog_create ();
}
color_transfer_init ();
......@@ -545,7 +535,7 @@ app_exit_finish_done (void)
}
void
app_exit_finish ()
app_exit_finish (void)
{
if (app_exit_finish_done ())
return;
......
......@@ -77,6 +77,7 @@ gdisplay_new_view (GDisplay *gdisp)
if (gdisp->gimage)
{
new_gdisp = gdisplay_new (gdisp->gimage, gdisp->scale);
new_gdisp->scale = gdisp->scale;
new_gdisp->offset_x = gdisp->offset_x;
new_gdisp->offset_y = gdisp->offset_y;
}
......
......@@ -77,6 +77,7 @@ gdisplay_new_view (GDisplay *gdisp)
if (gdisp->gimage)
{
new_gdisp = gdisplay_new (gdisp->gimage, gdisp->scale);
new_gdisp->scale = gdisp->scale;
new_gdisp->offset_x = gdisp->offset_x;
new_gdisp->offset_y = gdisp->offset_y;
}
......
.TH GIMP "11 May 1998" Version 1.0
.SH NAME
gimp-tool - script to perform various Gimpy functions
.SH SYNOPSIS
.B gimp-tool
[\-\-prefix\fI[=DIR]\fP] [\-\-exec\-prefix\fI[=DIR]\fP] [\-\-version] [\-\-libs] [\-\-cflags]
[\-\-build \fIplug-in.c\fP] [\-\-install \fIplug-in.c\fP] [\-\-install-admin plug-in.c]
.SH DESCRIPTION
.PP
\fIgimp-tool\fP is a tool that can, among other things, build plug-ins
and install them if they are distributed in one .c file.
.PP
\fIgimp-tool\fP is also used by programs that need to know what libraries
and include-paths \fIGimp\fP was compiled with. .m4 macros for use
with GNU autoconf are also included, to make detection of these libraries
et cetera easy for the upstream maintainer.
.SH OPTIONS
.l
\fIgimp-tool\fP accepts the following options:
.TP 8
.B \-\-build \fIplug-in.c\fP
Compile and link \fIplug-in.c\fP into a Gimp plug-in.
.TP 8
.B \-\-install \fIplug-in.c\fP
Compile, link, and install \fIplug-in.c\fP into the user's personal Gimp
configuration directory (for example, /home/che/.gimp/plug-ins/)
.TP 8
.B \-\-install\-admin \fIplug-in.c\fP
Compile, link, and install \fIplug-in.c\fP into the system-wide Gimp
plug-ins directory (for example, /usr/lib/gimp/0.99/plug-ins/)
.TP 8
.B \-\-version
Display the currently installed version of Gimp.
.TP 8
.B \-\-libs
Display the libraries Gimp was compiled with.
.TP 8
.B \-\-cflags
Display the flags that were passed to the compiler when Gimp was compiled.
.SH ENVIRONMENT
.PP
.TP 8
.B GTK_CONFIG
to get the location of the gtk-config program.
.TP 8
.B CC
to get the name of the desired C compiler.
.TP 8
.B CFLAGS
to get the preferred flags to pass to the C compiler.
.SH SEE ALSO
.BR gimp (1),
.BR gtk-config (1)
.SH COPYRIGHT
Copyright \(co 1995 Spencer Kimball and Peter Mattis
Permission to use, copy, modify, and distribute this software and its
documentation for any purpose and without fee is hereby granted,
provided that the above copyright notice appear in all copies and that
both that copyright notice and this permission notice appear in
supporting documentation.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment