mirror of https://github.com/GNOME/gimp.git
Changed MAIN(); to MAIN()
Mon Mar 16 17:50:56 EST 1998 Adrian Likins <adrian@gimp.org>
* plugins/illusion/illusion.c:
* plugins/papertile/papertile.c:
* plugins/fractaltrace/fractaltrace.c:
* plugins/flame/flame.c: Changed MAIN(); to MAIN()
*gimprc_user: added a commented out (install-colormap)
option
*app/install.c: comsetic update to show info about .gimp/scripts
*plugins/sparkle/sparckle.c:
*plugins/despeckle/despeckle.c: made a local MIN/MAX instead
of redefing the normal one (causes problems on some compilers)
-adrian
This commit is contained in:
EST 1998 Adrian Likins
Adrian Likins
parent
d5cfeb6643
commit
d728bead19
16
ChangeLog
16
ChangeLog
|
|
@ -1,3 +1,19 @@
|
|||
Mon Mar 16 17:50:56 EST 1998 Adrian Likins <adrian@gimp.org>
|
||||
|
||||
* plugins/illusion/illusion.c:
|
||||
* plugins/papertile/papertile.c:
|
||||
* plugins/fractaltrace/fractaltrace.c:
|
||||
* plugins/flame/flame.c: Changed MAIN(); to MAIN()
|
||||
|
||||
*gimprc_user: added a commented out (install-colormap)
|
||||
option
|
||||
|
||||
*app/install.c: comsetic update to show info about .gimp/scripts
|
||||
|
||||
*plugins/sparkle/sparckle.c:
|
||||
*plugins/despeckle/despeckle.c: made a local MIN/MAX instead
|
||||
of redefing the normal one (causes problems on some compilers)
|
||||
|
||||
Mon Mar 16 05:12:00 CST 1998 Larry Ewing <lewing@gimp.org>
|
||||
|
||||
* app/move.c:
|
||||
|
|
|
|||
|
|
@ -273,6 +273,16 @@ install_help (InstallCallback callback)
|
|||
"\t\twide GIMP plug-in directories when searching for\n", -1);
|
||||
gtk_text_insert (GTK_TEXT (text), font, NULL, NULL,
|
||||
"\t\tplug-ins.\n", -1);
|
||||
gtk_text_insert (GTK_TEXT (text), font_emphasis, NULL, NULL,
|
||||
"scripts\n", -1);
|
||||
gtk_text_insert (GTK_TEXT (text), font, NULL, NULL,
|
||||
"\t\tThis subdirectory is used by the GIMP to store \n", -1);
|
||||
gtk_text_insert (GTK_TEXT (text), font, NULL, NULL,
|
||||
"\t\tuser created and isntalled scripts. The default gimprc\n", -1);
|
||||
gtk_text_insert (GTK_TEXT (text), font, NULL, NULL,
|
||||
"\t\tfile checks this subdirectory in addition to the system\n", -1);
|
||||
gtk_text_insert (GTK_TEXT (text), font, NULL, NULL,
|
||||
"\t\t-wide gimp scripts subdirectory when searching for scripts\n", -1);
|
||||
gtk_text_insert (GTK_TEXT (text), font_emphasis, NULL, NULL,
|
||||
"tmp\n", -1);
|
||||
gtk_text_insert (GTK_TEXT (text), font, NULL, NULL,
|
||||
|
|
|
|||
|
|
@ -273,6 +273,16 @@ install_help (InstallCallback callback)
|
|||
"\t\twide GIMP plug-in directories when searching for\n", -1);
|
||||
gtk_text_insert (GTK_TEXT (text), font, NULL, NULL,
|
||||
"\t\tplug-ins.\n", -1);
|
||||
gtk_text_insert (GTK_TEXT (text), font_emphasis, NULL, NULL,
|
||||
"scripts\n", -1);
|
||||
gtk_text_insert (GTK_TEXT (text), font, NULL, NULL,
|
||||
"\t\tThis subdirectory is used by the GIMP to store \n", -1);
|
||||
gtk_text_insert (GTK_TEXT (text), font, NULL, NULL,
|
||||
"\t\tuser created and isntalled scripts. The default gimprc\n", -1);
|
||||
gtk_text_insert (GTK_TEXT (text), font, NULL, NULL,
|
||||
"\t\tfile checks this subdirectory in addition to the system\n", -1);
|
||||
gtk_text_insert (GTK_TEXT (text), font, NULL, NULL,
|
||||
"\t\t-wide gimp scripts subdirectory when searching for scripts\n", -1);
|
||||
gtk_text_insert (GTK_TEXT (text), font_emphasis, NULL, NULL,
|
||||
"tmp\n", -1);
|
||||
gtk_text_insert (GTK_TEXT (text), font, NULL, NULL,
|
||||
|
|
|
|||
|
|
@ -273,6 +273,16 @@ install_help (InstallCallback callback)
|
|||
"\t\twide GIMP plug-in directories when searching for\n", -1);
|
||||
gtk_text_insert (GTK_TEXT (text), font, NULL, NULL,
|
||||
"\t\tplug-ins.\n", -1);
|
||||
gtk_text_insert (GTK_TEXT (text), font_emphasis, NULL, NULL,
|
||||
"scripts\n", -1);
|
||||
gtk_text_insert (GTK_TEXT (text), font, NULL, NULL,
|
||||
"\t\tThis subdirectory is used by the GIMP to store \n", -1);
|
||||
gtk_text_insert (GTK_TEXT (text), font, NULL, NULL,
|
||||
"\t\tuser created and isntalled scripts. The default gimprc\n", -1);
|
||||
gtk_text_insert (GTK_TEXT (text), font, NULL, NULL,
|
||||
"\t\tfile checks this subdirectory in addition to the system\n", -1);
|
||||
gtk_text_insert (GTK_TEXT (text), font, NULL, NULL,
|
||||
"\t\t-wide gimp scripts subdirectory when searching for scripts\n", -1);
|
||||
gtk_text_insert (GTK_TEXT (text), font_emphasis, NULL, NULL,
|
||||
"tmp\n", -1);
|
||||
gtk_text_insert (GTK_TEXT (text), font, NULL, NULL,
|
||||
|
|
|
|||
|
|
@ -273,6 +273,16 @@ install_help (InstallCallback callback)
|
|||
"\t\twide GIMP plug-in directories when searching for\n", -1);
|
||||
gtk_text_insert (GTK_TEXT (text), font, NULL, NULL,
|
||||
"\t\tplug-ins.\n", -1);
|
||||
gtk_text_insert (GTK_TEXT (text), font_emphasis, NULL, NULL,
|
||||
"scripts\n", -1);
|
||||
gtk_text_insert (GTK_TEXT (text), font, NULL, NULL,
|
||||
"\t\tThis subdirectory is used by the GIMP to store \n", -1);
|
||||
gtk_text_insert (GTK_TEXT (text), font, NULL, NULL,
|
||||
"\t\tuser created and isntalled scripts. The default gimprc\n", -1);
|
||||
gtk_text_insert (GTK_TEXT (text), font, NULL, NULL,
|
||||
"\t\tfile checks this subdirectory in addition to the system\n", -1);
|
||||
gtk_text_insert (GTK_TEXT (text), font, NULL, NULL,
|
||||
"\t\t-wide gimp scripts subdirectory when searching for scripts\n", -1);
|
||||
gtk_text_insert (GTK_TEXT (text), font_emphasis, NULL, NULL,
|
||||
"tmp\n", -1);
|
||||
gtk_text_insert (GTK_TEXT (text), font, NULL, NULL,
|
||||
|
|
|
|||
|
|
@ -12,3 +12,7 @@
|
|||
# have edited this file.
|
||||
|
||||
(show-tips yes)
|
||||
|
||||
# Install a GIMP colormap by default -- only for 8-bit displays
|
||||
# (install-colormap)
|
||||
|
||||
|
|
|
|||
|
|
@ -12,3 +12,7 @@
|
|||
# have edited this file.
|
||||
|
||||
(show-tips yes)
|
||||
|
||||
# Install a GIMP colormap by default -- only for 8-bit displays
|
||||
# (install-colormap)
|
||||
|
||||
|
|
|
|||
|
|
@ -39,8 +39,8 @@
|
|||
|
||||
/***** Macros *****/
|
||||
|
||||
#define MIN(a, b) (((a) < (b)) ? (a) : (b))
|
||||
#define MAX(a, b) (((a) > (b)) ? (a) : (b))
|
||||
#define ALIEN_MIN(a, b) (((a) < (b)) ? (a) : (b))
|
||||
#define ALIEN_MAX(a, b) (((a) > (b)) ? (a) : (b))
|
||||
|
||||
|
||||
/***** Magic numbers *****/
|
||||
|
|
@ -313,15 +313,15 @@ run (char *name,
|
|||
|
||||
/* Calculate preview size */
|
||||
if (sel_width > sel_height) {
|
||||
pwidth = MIN(sel_width, PREVIEW_SIZE);
|
||||
pwidth = ALIEN_MIN(sel_width, PREVIEW_SIZE);
|
||||
pheight = sel_height * pwidth / sel_width;
|
||||
} else {
|
||||
pheight = MIN(sel_height, PREVIEW_SIZE);
|
||||
pheight = ALIEN_MIN(sel_height, PREVIEW_SIZE);
|
||||
pwidth = sel_width * pheight / sel_height;
|
||||
} /* else */
|
||||
|
||||
preview_width = MAX(pwidth, 2); /* Min size is 2 */
|
||||
preview_height = MAX(pheight, 2);
|
||||
preview_width = ALIEN_MAX(pwidth, 2); /* Min size is 2 */
|
||||
preview_height = ALIEN_MAX(pheight, 2);
|
||||
|
||||
/* See how we will run */
|
||||
switch (run_mode) {
|
||||
|
|
|
|||
|
|
@ -42,7 +42,34 @@
|
|||
*
|
||||
* Revision History:
|
||||
*
|
||||
*
|
||||
* Revison ? 1998/03/16 adrian
|
||||
* changed MIN, MAX to DESPECKLE_MIN, DESPECKLE_MAX
|
||||
* since some compilers dont like max/min
|
||||
* being defined twice.
|
||||
*
|
||||
* -Adrian
|
||||
*
|
||||
* $Log$
|
||||
* Revision 1.7 1998/03/16 23:02:25 adrian
|
||||
* Mon Mar 16 17:50:56 EST 1998 Adrian Likins <adrian@gimp.org>
|
||||
*
|
||||
* * plugins/illusion/illusion.c:
|
||||
* * plugins/papertile/papertile.c:
|
||||
* * plugins/fractaltrace/fractaltrace.c:
|
||||
* * plugins/flame/flame.c: Changed MAIN(); to MAIN()
|
||||
*
|
||||
* *gimprc_user: added a commented out (install-colormap)
|
||||
* option
|
||||
*
|
||||
* *app/install.c: comsetic update to show info about .gimp/scripts
|
||||
*
|
||||
* *plugins/sparkle/sparckle.c:
|
||||
* *plugins/despeckle/despeckle.c: made a local MIN/MAX instead
|
||||
* of redefing the normal one (causes problems on some compilers)
|
||||
*
|
||||
* -adrian
|
||||
*
|
||||
* Revision 1.6 1998/03/16 06:33:44 yosh
|
||||
* configure saves CFLAGS properly
|
||||
* all plugins should parse gtkrc now
|
||||
|
|
@ -129,8 +156,8 @@
|
|||
* Macros...
|
||||
*/
|
||||
|
||||
#define MIN(a,b) (((a) < (b)) ? (a) : (b))
|
||||
#define MAX(a,b) (((a) > (b)) ? (a) : (b))
|
||||
#define DESPECKLE_MIN(a,b) (((a) < (b)) ? (a) : (b))
|
||||
#define DESPECKLE_MAX(a,b) (((a) > (b)) ? (a) : (b))
|
||||
|
||||
|
||||
/*
|
||||
|
|
@ -730,8 +757,8 @@ despeckle_dialog(void)
|
|||
gtk_table_attach(GTK_TABLE(ptable), frame, 0, 1, 0, 1, 0, 0, 0, 0);
|
||||
gtk_widget_show(frame);
|
||||
|
||||
preview_width = MIN(sel_width, PREVIEW_SIZE);
|
||||
preview_height = MIN(sel_height, PREVIEW_SIZE);
|
||||
preview_width = DESPECKLE_MIN(sel_width, PREVIEW_SIZE);
|
||||
preview_height = DESPECKLE_MIN(sel_height, PREVIEW_SIZE);
|
||||
|
||||
preview = gtk_preview_new(GTK_PREVIEW_COLOR);
|
||||
gtk_preview_size(GTK_PREVIEW(preview), preview_width, preview_height);
|
||||
|
|
@ -739,8 +766,8 @@ despeckle_dialog(void)
|
|||
gtk_widget_show(preview);
|
||||
|
||||
hscroll_data = gtk_adjustment_new(0, 0, sel_width - 1, 1.0,
|
||||
MIN(preview_width, sel_width),
|
||||
MIN(preview_width, sel_width));
|
||||
DESPECKLE_MIN(preview_width, sel_width),
|
||||
DESPECKLE_MIN(preview_width, sel_width));
|
||||
|
||||
gtk_signal_connect(hscroll_data, "value_changed",
|
||||
(GtkSignalFunc)preview_scroll_callback, NULL);
|
||||
|
|
@ -751,8 +778,8 @@ despeckle_dialog(void)
|
|||
gtk_widget_show(scrollbar);
|
||||
|
||||
vscroll_data = gtk_adjustment_new(0, 0, sel_height - 1, 1.0,
|
||||
MIN(preview_height, sel_height),
|
||||
MIN(preview_height, sel_height));
|
||||
DESPECKLE_MIN(preview_height, sel_height),
|
||||
DESPECKLE_MIN(preview_height, sel_height));
|
||||
|
||||
gtk_signal_connect(vscroll_data, "value_changed",
|
||||
(GtkSignalFunc)preview_scroll_callback, NULL);
|
||||
|
|
@ -766,8 +793,8 @@ despeckle_dialog(void)
|
|||
|
||||
preview_x1 = sel_x1;
|
||||
preview_y1 = sel_y1;
|
||||
preview_x2 = preview_x1 + MIN(preview_width, sel_width);
|
||||
preview_y2 = preview_y1 + MIN(preview_height, sel_height);
|
||||
preview_x2 = preview_x1 + DESPECKLE_MIN(preview_width, sel_width);
|
||||
preview_y2 = preview_y1 + DESPECKLE_MIN(preview_height, sel_height);
|
||||
|
||||
/*
|
||||
* Filter type controls...
|
||||
|
|
@ -904,8 +931,8 @@ preview_scroll_callback(void)
|
|||
{
|
||||
preview_x1 = sel_x1 + GTK_ADJUSTMENT(hscroll_data)->value;
|
||||
preview_y1 = sel_y1 + GTK_ADJUSTMENT(vscroll_data)->value;
|
||||
preview_x2 = preview_x1 + MIN(preview_width, sel_width);
|
||||
preview_y2 = preview_y1 + MIN(preview_height, sel_height);
|
||||
preview_x2 = preview_x1 + DESPECKLE_MIN(preview_width, sel_width);
|
||||
preview_y2 = preview_y1 + DESPECKLE_MIN(preview_height, sel_height);
|
||||
|
||||
preview_update();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -58,7 +58,7 @@ GPlugInInfo PLUG_IN_INFO = {
|
|||
run /* run_proc */
|
||||
};
|
||||
|
||||
MAIN();
|
||||
MAIN()
|
||||
|
||||
/******************************************************************************/
|
||||
|
||||
|
|
|
|||
|
|
@ -79,7 +79,7 @@ static gdouble center_y;
|
|||
|
||||
/******************************************************************************/
|
||||
|
||||
MAIN();
|
||||
MAIN()
|
||||
|
||||
/******************************************************************************/
|
||||
|
||||
|
|
|
|||
|
|
@ -78,7 +78,7 @@ static gint select_height;
|
|||
|
||||
/******************************************************************************/
|
||||
|
||||
MAIN();
|
||||
MAIN()
|
||||
|
||||
/******************************************************************************/
|
||||
|
||||
|
|
|
|||
|
|
@ -42,7 +42,34 @@
|
|||
*
|
||||
* Revision History:
|
||||
*
|
||||
*
|
||||
* Revison ? 1998/03/16 adrian
|
||||
* changed MIN, MAX to DESPECKLE_MIN, DESPECKLE_MAX
|
||||
* since some compilers dont like max/min
|
||||
* being defined twice.
|
||||
*
|
||||
* -Adrian
|
||||
*
|
||||
* $Log$
|
||||
* Revision 1.7 1998/03/16 23:02:25 adrian
|
||||
* Mon Mar 16 17:50:56 EST 1998 Adrian Likins <adrian@gimp.org>
|
||||
*
|
||||
* * plugins/illusion/illusion.c:
|
||||
* * plugins/papertile/papertile.c:
|
||||
* * plugins/fractaltrace/fractaltrace.c:
|
||||
* * plugins/flame/flame.c: Changed MAIN(); to MAIN()
|
||||
*
|
||||
* *gimprc_user: added a commented out (install-colormap)
|
||||
* option
|
||||
*
|
||||
* *app/install.c: comsetic update to show info about .gimp/scripts
|
||||
*
|
||||
* *plugins/sparkle/sparckle.c:
|
||||
* *plugins/despeckle/despeckle.c: made a local MIN/MAX instead
|
||||
* of redefing the normal one (causes problems on some compilers)
|
||||
*
|
||||
* -adrian
|
||||
*
|
||||
* Revision 1.6 1998/03/16 06:33:44 yosh
|
||||
* configure saves CFLAGS properly
|
||||
* all plugins should parse gtkrc now
|
||||
|
|
@ -129,8 +156,8 @@
|
|||
* Macros...
|
||||
*/
|
||||
|
||||
#define MIN(a,b) (((a) < (b)) ? (a) : (b))
|
||||
#define MAX(a,b) (((a) > (b)) ? (a) : (b))
|
||||
#define DESPECKLE_MIN(a,b) (((a) < (b)) ? (a) : (b))
|
||||
#define DESPECKLE_MAX(a,b) (((a) > (b)) ? (a) : (b))
|
||||
|
||||
|
||||
/*
|
||||
|
|
@ -730,8 +757,8 @@ despeckle_dialog(void)
|
|||
gtk_table_attach(GTK_TABLE(ptable), frame, 0, 1, 0, 1, 0, 0, 0, 0);
|
||||
gtk_widget_show(frame);
|
||||
|
||||
preview_width = MIN(sel_width, PREVIEW_SIZE);
|
||||
preview_height = MIN(sel_height, PREVIEW_SIZE);
|
||||
preview_width = DESPECKLE_MIN(sel_width, PREVIEW_SIZE);
|
||||
preview_height = DESPECKLE_MIN(sel_height, PREVIEW_SIZE);
|
||||
|
||||
preview = gtk_preview_new(GTK_PREVIEW_COLOR);
|
||||
gtk_preview_size(GTK_PREVIEW(preview), preview_width, preview_height);
|
||||
|
|
@ -739,8 +766,8 @@ despeckle_dialog(void)
|
|||
gtk_widget_show(preview);
|
||||
|
||||
hscroll_data = gtk_adjustment_new(0, 0, sel_width - 1, 1.0,
|
||||
MIN(preview_width, sel_width),
|
||||
MIN(preview_width, sel_width));
|
||||
DESPECKLE_MIN(preview_width, sel_width),
|
||||
DESPECKLE_MIN(preview_width, sel_width));
|
||||
|
||||
gtk_signal_connect(hscroll_data, "value_changed",
|
||||
(GtkSignalFunc)preview_scroll_callback, NULL);
|
||||
|
|
@ -751,8 +778,8 @@ despeckle_dialog(void)
|
|||
gtk_widget_show(scrollbar);
|
||||
|
||||
vscroll_data = gtk_adjustment_new(0, 0, sel_height - 1, 1.0,
|
||||
MIN(preview_height, sel_height),
|
||||
MIN(preview_height, sel_height));
|
||||
DESPECKLE_MIN(preview_height, sel_height),
|
||||
DESPECKLE_MIN(preview_height, sel_height));
|
||||
|
||||
gtk_signal_connect(vscroll_data, "value_changed",
|
||||
(GtkSignalFunc)preview_scroll_callback, NULL);
|
||||
|
|
@ -766,8 +793,8 @@ despeckle_dialog(void)
|
|||
|
||||
preview_x1 = sel_x1;
|
||||
preview_y1 = sel_y1;
|
||||
preview_x2 = preview_x1 + MIN(preview_width, sel_width);
|
||||
preview_y2 = preview_y1 + MIN(preview_height, sel_height);
|
||||
preview_x2 = preview_x1 + DESPECKLE_MIN(preview_width, sel_width);
|
||||
preview_y2 = preview_y1 + DESPECKLE_MIN(preview_height, sel_height);
|
||||
|
||||
/*
|
||||
* Filter type controls...
|
||||
|
|
@ -904,8 +931,8 @@ preview_scroll_callback(void)
|
|||
{
|
||||
preview_x1 = sel_x1 + GTK_ADJUSTMENT(hscroll_data)->value;
|
||||
preview_y1 = sel_y1 + GTK_ADJUSTMENT(vscroll_data)->value;
|
||||
preview_x2 = preview_x1 + MIN(preview_width, sel_width);
|
||||
preview_y2 = preview_y1 + MIN(preview_height, sel_height);
|
||||
preview_x2 = preview_x1 + DESPECKLE_MIN(preview_width, sel_width);
|
||||
preview_y2 = preview_y1 + DESPECKLE_MIN(preview_height, sel_height);
|
||||
|
||||
preview_update();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -105,7 +105,7 @@ struct {
|
|||
frame_spec f = {0.0, &config.cp, 1, 0.0};
|
||||
|
||||
|
||||
MAIN();
|
||||
MAIN()
|
||||
|
||||
|
||||
static void query()
|
||||
|
|
|
|||
|
|
@ -58,7 +58,7 @@ GPlugInInfo PLUG_IN_INFO = {
|
|||
run /* run_proc */
|
||||
};
|
||||
|
||||
MAIN();
|
||||
MAIN()
|
||||
|
||||
/******************************************************************************/
|
||||
|
||||
|
|
|
|||
|
|
@ -79,7 +79,7 @@ static gdouble center_y;
|
|||
|
||||
/******************************************************************************/
|
||||
|
||||
MAIN();
|
||||
MAIN()
|
||||
|
||||
/******************************************************************************/
|
||||
|
||||
|
|
|
|||
|
|
@ -78,7 +78,7 @@ static gint select_height;
|
|||
|
||||
/******************************************************************************/
|
||||
|
||||
MAIN();
|
||||
MAIN()
|
||||
|
||||
/******************************************************************************/
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue