Heya,
I've just commit back some changes of strings, to make things more
consistent between the command line interface and the documentation in
terms of the descriptions used. I don't expect anymore changes to be
needed before 2.10. Patch is attached.
thanks,
Glynn
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/zenity/ChangeLog,v
retrieving revision 1.248
diff -u -r1.248 ChangeLog
--- ChangeLog 31 Jan 2005 22:17:38 -0000 1.248
+++ ChangeLog 6 Feb 2005 23:10:07 -0000
@@ -1,3 +1,10 @@
+2005-02-07 Glynn Foster <[EMAIL PROTECTED]>
+
+ * help/C/zenity.xml: Update docs to add the new goption
+ help stuff.
+ * src/option.c: Update to be in line with the documentation
+ descriptions.
+
2005-02-01 Glynn Foster <[EMAIL PROTECTED]>
* src/notification.c, src/option.c: Patch from Chris
Index: help/C/zenity.xml
===================================================================
RCS file: /cvs/gnome/zenity/help/C/zenity.xml,v
retrieving revision 1.27
diff -u -r1.27 zenity.xml
--- help/C/zenity.xml 25 Oct 2004 23:40:59 -0000 1.27
+++ help/C/zenity.xml 6 Feb 2005 23:10:07 -0000
@@ -115,7 +115,7 @@
<listitem><para>Calendar</para></listitem>
<listitem><para>File selection</para></listitem>
<listitem><para>List</para></listitem>
- <listitem><para>Notification</para></listitem>
+ <listitem><para>Notification icon</para></listitem>
<listitem><para>Message</para>
<itemizedlist>
<listitem><para>Error</para></listitem>
@@ -288,17 +288,115 @@
<varlistentry>
<term><option>--help</option></term>
<listitem>
- <para>Displays help text. You can also use -? to specify this option.</para>
+ <para>Displays shortened help text.</para>
</listitem>
</varlistentry>
<varlistentry>
- <term><option>--usage</option></term>
+ <term><option>--help-all</option></term>
<listitem>
- <para>Displays brief usage text.</para>
+ <para>Displays full help text for all dialogs.</para>
</listitem>
</varlistentry>
-
+
+ <varlistentry>
+ <term><option>--help-general</option></term>
+ <listitem>
+ <para>Displays help text for general dialog options.</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><option>--help-calendar</option></term>
+ <listitem>
+ <para>Displays help text for calendar dialog options.</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><option>--help-entry</option></term>
+ <listitem>
+ <para>Displays help text for text entry dialog options.</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><option>--help-error</option></term>
+ <listitem>
+ <para>Displays help text for error dialog options.</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><option>--help-info</option></term>
+ <listitem>
+ <para>Displays help text for information dialog options.</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><option>--help-file-selection</option></term>
+ <listitem>
+ <para>Displays help text for file selection dialog options.</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><option>--help-list</option></term>
+ <listitem>
+ <para>Displays help text for list dialog options.</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><option>--help-notification</option></term>
+ <listitem>
+ <para>Displays help text for notification icon options.</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><option>--help-progress</option></term>
+ <listitem>
+ <para>Displays help text for progress dialog options.</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><option>--help-question</option></term>
+ <listitem>
+ <para>Displays help text for question dialog options.</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><option>--help-warning</option></term>
+ <listitem>
+ <para>Displays help text for warning dialog options.</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><option>--help-text-info</option></term>
+ <listitem>
+ <para>Displays help for text information dialog options.</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><option>--help-misc</option></term>
+ <listitem>
+ <para>Displays help for miscellaneous options.</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><option>--help-gtk</option></term>
+ <listitem>
+ <para>Displays help for GTK+ options.</para>
+ </listitem>
+ </varlistentry>
+
</variablelist>
</sect2>
Index: src/option.c
===================================================================
RCS file: /cvs/gnome/zenity/src/option.c,v
retrieving revision 1.6
diff -u -r1.6 option.c
--- src/option.c 31 Jan 2005 22:17:38 -0000 1.6
+++ src/option.c 6 Feb 2005 23:10:08 -0000
@@ -1257,8 +1257,8 @@
/* Adds notification option entries */
a_group = g_option_group_new("notification",
- N_("Notification options"),
- N_("Show notification options"), NULL, 0);
+ N_("Notification icon options"),
+ N_("Show notification icon options"), NULL, 0);
g_option_group_add_entries(a_group, notification_options);
g_option_group_set_parse_hooks (a_group,
zenity_notification_pre_callback, zenity_notification_post_callback);
@@ -1296,9 +1296,9 @@
g_option_context_add_group(tmp_ctx, a_group);
/* Adds text option entries */
- a_group = g_option_group_new("text",
- N_("Text options"),
- N_("Show text options"), NULL, 0);
+ a_group = g_option_group_new("text-info",
+ N_("Text information options"),
+ N_("Show text information options"), NULL, 0);
g_option_group_add_entries(a_group, text_options);
g_option_group_set_parse_hooks (a_group,
zenity_text_pre_callback, zenity_text_post_callback);
_______________________________________________
gnome-i18n mailing list
gnome-i18n@gnome.org
http://mail.gnome.org/mailman/listinfo/gnome-i18n
