Alter some options, and beautify.

2000-08-21  Piers Cornwell  <piers.cornwell@bigfoot.com>

	* app/main.c: Alter some options, and beautify.

	* gimp.1.in: Document the new options.
This commit is contained in:
Piers Cornwell 2000-08-21 21:46:45 +00:00 committed by Piers Cornwell
parent d2e2023a38
commit 18e9f72aee
4 changed files with 51 additions and 40 deletions

View File

@ -1,3 +1,9 @@
2000-08-21 Piers Cornwell <piers.cornwell@bigfoot.com>
* app/main.c: Alter some options, and beautify.
* gimp.1.in: Document the new options.
Mon Aug 21 14:09:55 PDT 2000 Manish Singh <yosh@gimp.org> Mon Aug 21 14:09:55 PDT 2000 Manish Singh <yosh@gimp.org>
* tools/pdbgen/pdb/unit.pdb: added get_number_of_built_in_units * tools/pdbgen/pdb/unit.pdb: added get_number_of_built_in_units

View File

@ -154,7 +154,7 @@ main (int argc,
for (i = 1; i < argc; i++) for (i = 1; i < argc; i++)
{ {
if ((strcmp (argv[i], "--no-interface") == 0) || if ((strcmp (argv[i], "--no-interface") == 0) ||
(strcmp (argv[i], "-n") == 0)) (strcmp (argv[i], "-i") == 0))
{ {
no_interface = TRUE; no_interface = TRUE;
argv[i] = NULL; argv[i] = NULL;
@ -205,23 +205,26 @@ main (int argc,
show_help = TRUE; show_help = TRUE;
argv[i] = NULL; argv[i] = NULL;
} }
else if (strcmp (argv[i], "--version") == 0 || else if ((strcmp (argv[i], "--version") == 0) ||
strcmp (argv[i], "-v") == 0) (strcmp (argv[i], "-v") == 0))
{ {
show_version = TRUE; show_version = TRUE;
argv[i] = NULL; argv[i] = NULL;
} }
else if (strcmp (argv[i], "--no-data") == 0) else if ((strcmp (argv[i], "--no-data") == 0) ||
(strcmp (argv[i], "-d") == 0))
{ {
no_data = TRUE; no_data = TRUE;
argv[i] = NULL; argv[i] = NULL;
} }
else if (strcmp (argv[i], "--no-splash") == 0) else if ((strcmp (argv[i], "--no-splash") == 0) ||
(strcmp (argv[i], "-s") == 0))
{ {
no_splash = TRUE; no_splash = TRUE;
argv[i] = NULL; argv[i] = NULL;
} }
else if (strcmp (argv[i], "--no-splash-image") == 0) else if ((strcmp (argv[i], "--no-splash-image") == 0) ||
(strcmp (argv[i], "-S") == 0))
{ {
no_splash_image = TRUE; no_splash_image = TRUE;
argv[i] = NULL; argv[i] = NULL;
@ -241,7 +244,8 @@ main (int argc,
use_debug_handler = TRUE; use_debug_handler = TRUE;
argv[i] = NULL; argv[i] = NULL;
} }
else if (strcmp (argv[i], "--console-messages") == 0) else if ((strcmp (argv[i], "--console-messages") == 0) ||
(strcmp (argv[i], "-c") == 0))
{ {
console_messages = TRUE; console_messages = TRUE;
argv[i] = NULL; argv[i] = NULL;
@ -278,6 +282,7 @@ main (int argc,
*/ */
else if (argv[i][0] == '-') else if (argv[i][0] == '-')
{ {
g_print (_("\nInvalid option.\n"));
show_help = TRUE; show_help = TRUE;
} }
} }
@ -297,26 +302,26 @@ main (int argc,
if (show_help) if (show_help)
{ {
g_print (_("Usage: %s [option ...] [files ...]\n"), argv[0]); g_print (_("\nUsage: %s [option ... ] [file ... ]\n\n"), argv[0]);
g_print (_("Valid options are:\n")); g_print (_("Options:\n"));
g_print (_(" -h --help Output this help.\n")); g_print (_(" -b, --batch <commands> Run in batch mode.\n"));
g_print (_(" -v --version Output version info.\n")); g_print (_(" -c, --console-messages Display warnings to console instead of a dialog box.\n"));
g_print (_(" -b --batch <commands> Run in batch mode.\n")); g_print (_(" -d, --no-data Do not load brushes, gradients, palettes, patterns.\n"));
g_print (_(" -g --gimprc <gimprc> Use an alternate gimprc file.\n")); g_print (_(" -i, --no-interface Run without a user interface.\n"));
g_print (_(" -n --no-interface Run without a user interface.\n")); g_print (_(" -g, --gimprc <gimprc> Use an alternate gimprc file.\n"));
g_print (_(" -r --restore-session Try to restore saved session.\n")); g_print (_(" -h, --help Output this help.\n"));
g_print (_(" --no-data Do not load patterns, gradients, palettes, brushes.\n")); g_print (_(" -r, --restore-session Try to restore saved session.\n"));
g_print (_(" -s, --no-splash Do not show the startup window.\n"));
g_print (_(" -S, --no-splash-image Do not add an image to the startup window.\n"));
g_print (_(" -v, --version Output version information.\n"));
g_print (_(" --verbose Show startup messages.\n")); g_print (_(" --verbose Show startup messages.\n"));
g_print (_(" --no-splash Do not show the startup window.\n")); g_print (_(" --no-shm Do not use shared memory between GIMP and plugins.\n"));
g_print (_(" --no-splash-image Do not add an image to the startup window.\n"));
g_print (_(" --no-shm Do not use shared memory between GIMP and its plugins.\n"));
g_print (_(" --no-xshm Do not use the X Shared Memory extension.\n")); g_print (_(" --no-xshm Do not use the X Shared Memory extension.\n"));
g_print (_(" --console-messages Display warnings to console instead of a dialog box.\n")); g_print (_(" --debug-handlers Enable non-fatal debugging signal handlers.\n"));
g_print (_(" --debug-handlers Enable debugging signal handlers for non-fatal signals.\n"));
g_print (" --enable-stack-trace {never|query|always}\n");
g_print (_(" Debugging mode for fatal signals.\n"));
g_print (_(" --display <display> Use the designated X display.\n")); g_print (_(" --display <display> Use the designated X display.\n"));
g_print (_(" --system-gimprc <gimprc> Use an alternate system gimprc file.\n")); g_print (_(" --system-gimprc <gimprc> Use an alternate system gimprc file.\n"));
g_print (" --enable-stack-trace <never | query | always>\n");
g_print (_(" Debugging mode for fatal signals.\n\n"));
} }
if (show_version || show_help) if (show_version || show_help)

View File

@ -47,13 +47,13 @@ can be executed by one of the Gimp scripting extensions.
Use an alternative gimprc instead of the default one. Useful in Use an alternative gimprc instead of the default one. Useful in
cases where plugins paths or machine specs may be different. cases where plugins paths or machine specs may be different.
.TP 8 .TP 8
.B \-n, \-\-no-interface .B \-i, \-\-no-interface
Run without a user interface. Run without a user interface.
.TP 8 .TP 8
.B \-r, \-\-restore\-session .B \-r, \-\-restore\-session
Try to restore saved session. Try to restore saved session.
.TP 8 .TP 8
.B \-\-no\-data .B \-d, \-\-no\-data
Do not load patterns, gradients, palettes, or brushes. Often useful Do not load patterns, gradients, palettes, or brushes. Often useful
in non-interactive situations where startup time is to be minimized. in non-interactive situations where startup time is to be minimized.
.TP 8 .TP 8
@ -74,16 +74,16 @@ This will result in slower performance than with X shared memory enabled.
.B \-\-display \fIdisplay\fP .B \-\-display \fIdisplay\fP
Use the designated X display. Use the designated X display.
.TP 8 .TP 8
.B \-\-no\-splash .B \-s, \-\-no\-splash
Do not show the splash screen. Do not show the splash screen.
.TP 8 .TP 8
.B \-\-no\-splash\-image .B \-S, \-\-no\-splash\-image
Do not show the splash screen image as part of the splash screen. Do not show the splash screen image as part of the splash screen.
.TP 8 .TP 8
.B \-\-debug\-handlers .B \-\-debug\-handlers
Enable debugging signal handlers. Enable debugging signal handlers.
.TP 8 .TP 8
.B \-\-console\-messages .B \-c, \-\-console\-messages
Do not popup dialog boxes on errors or warnings. Print the messages on Do not popup dialog boxes on errors or warnings. Print the messages on
the console instead. the console instead.
.TP 8 .TP 8

View File

@ -47,13 +47,13 @@ can be executed by one of the Gimp scripting extensions.
Use an alternative gimprc instead of the default one. Useful in Use an alternative gimprc instead of the default one. Useful in
cases where plugins paths or machine specs may be different. cases where plugins paths or machine specs may be different.
.TP 8 .TP 8
.B \-n, \-\-no-interface .B \-i, \-\-no-interface
Run without a user interface. Run without a user interface.
.TP 8 .TP 8
.B \-r, \-\-restore\-session .B \-r, \-\-restore\-session
Try to restore saved session. Try to restore saved session.
.TP 8 .TP 8
.B \-\-no\-data .B \-d, \-\-no\-data
Do not load patterns, gradients, palettes, or brushes. Often useful Do not load patterns, gradients, palettes, or brushes. Often useful
in non-interactive situations where startup time is to be minimized. in non-interactive situations where startup time is to be minimized.
.TP 8 .TP 8
@ -74,16 +74,16 @@ This will result in slower performance than with X shared memory enabled.
.B \-\-display \fIdisplay\fP .B \-\-display \fIdisplay\fP
Use the designated X display. Use the designated X display.
.TP 8 .TP 8
.B \-\-no\-splash .B \-s, \-\-no\-splash
Do not show the splash screen. Do not show the splash screen.
.TP 8 .TP 8
.B \-\-no\-splash\-image .B \-S, \-\-no\-splash\-image
Do not show the splash screen image as part of the splash screen. Do not show the splash screen image as part of the splash screen.
.TP 8 .TP 8
.B \-\-debug\-handlers .B \-\-debug\-handlers
Enable debugging signal handlers. Enable debugging signal handlers.
.TP 8 .TP 8
.B \-\-console\-messages .B \-c, \-\-console\-messages
Do not popup dialog boxes on errors or warnings. Print the messages on Do not popup dialog boxes on errors or warnings. Print the messages on
the console instead. the console instead.
.TP 8 .TP 8