Fixed command-line options for disable/enable Label tool.

Added config-file option for disable/enable Label tool.
Documented options to disable/enable Label tool.
This commit is contained in:
William Kendrick 2009-10-04 06:14:23 +00:00
parent a90f2548dc
commit 59fc4cacb0
4 changed files with 39 additions and 6 deletions

View file

@ -5612,6 +5612,7 @@ static void show_usage(FILE * f, char *prg)
" %s [--sysfonts | --nosysfonts]\n"
" %s [--nostampcontrols | --stampcontrols]\n"
" %s [--nomagiccontrols | --magiccontrols]\n"
" %s [--nolabel | --label]\n"
" %s [--mirrorstamps | --dontmirrorstamps]\n"
" %s [--stampsize=[0-10] | --stampsize=default]\n"
" %s [--saveoverask | --saveover | --saveovernew]\n"
@ -5636,7 +5637,7 @@ static void show_usage(FILE * f, char *prg)
blank, blank, blank, blank,
blank, blank, blank, blank,
blank, blank, blank, blank,
blank, blank, blank,
blank, blank, blank, blank,
blank, blank, blank,
blank, blank, blank, blank, blank, blank, blank, blank, blank,
#ifdef WIN32
@ -7000,7 +7001,7 @@ static void setup(int argc, char *argv[])
}
else if (strcmp(argv[i], "--label") == 0)
{
disable_label = 1;
disable_label = 0;
}
else if (strcmp(argv[i], "--noshortcuts") == 0)
{
@ -16869,6 +16870,15 @@ static void parse_options(FILE * fi)
{
disable_magic_controls = 0;
}
else if (strcmp(str, "nolabel=yes") == 0)
{
disable_label = 1;
}
else if (strcmp(str, "nolabel=no") == 0 ||
strcmp(str, "label=yes") == 0)
{
disable_label = 0;
}
else if (strcmp(str, "mirrorstamps=yes") == 0)
{
mirrorstamps = 1;