Patch from Dagmar d'Surreal <dagmar@speakeasy.net> to correct help docs

2003-05-24  Glynn Foster  <glynn.foster@sun.com>

	* help/C/zenity.xml: Patch from Dagmar d'Surreal
	<dagmar@speakeasy.net> to correct help docs and
	script examples for the change from --dialog-title to
	--title.

	* THANKS, src/about.c: Add Dagmar.

	* src/progress.c: For now, just send a SIGHUP to the
	parent process - not entirely sure if this is the best thing
	to do right now.
This commit is contained in:
Glynn Foster 2003-05-24 01:36:24 +00:00 committed by Glynn Foster
parent 1930a4a763
commit 1acd9cfed8
5 changed files with 28 additions and 10 deletions

View File

@ -1,3 +1,16 @@
2003-05-24 Glynn Foster <glynn.foster@sun.com>
* help/C/zenity.xml: Patch from Dagmar d'Surreal
<dagmar@speakeasy.net> to correct help docs and
script examples for the change from --dialog-title to
--title.
* THANKS, src/about.c: Add Dagmar.
* src/progress.c: For now, just send a SIGHUP to the
parent process - not entirely sure if this is the best thing
to do right now.
2003-05-23 Mike Newman <mikegtn@gnome.org> 2003-05-23 Mike Newman <mikegtn@gnome.org>
* src/gdialog: fixed --textbox to actually load filename * src/gdialog: fixed --textbox to actually load filename

1
THANKS
View File

@ -9,4 +9,5 @@ Mike Newman <mike@gtnorthern.demon.co.uk>
Havoc Pennington <hp@redhat.com> Havoc Pennington <hp@redhat.com>
Kristian Rietveld <kris@gtk.org> Kristian Rietveld <kris@gtk.org>
Jakub Steiner <jimmac@ximian.com> Jakub Steiner <jimmac@ximian.com>
Danel d'Surreal <dagmar@speakeasy.net>
Tom Tromey <tromey@redhat.com> Tom Tromey <tromey@redhat.com>

View File

@ -171,7 +171,7 @@
<para> <para>
When using &app;, make sure that any arguments to the command line options are surrounded by When using &app;, make sure that any arguments to the command line options are surrounded by
a set of quotes ' ' or " " as in <command>&app; --calendar --dialog-title="Holiday Planner" a set of quotes ' ' or " " as in <command>&app; --calendar --title="Holiday Planner"
</command>, for example. If you do not use quotes, then it is likely that you will get </command>, for example. If you do not use quotes, then it is likely that you will get
unexpected results. unexpected results.
</para> </para>
@ -343,7 +343,7 @@
<programlisting> <programlisting>
#!/bin/sh #!/bin/sh
if zenity --calendar --dialog-title="Calendar selection" --text="Select a date from below" --day=18 --month=1 --year=2003 if zenity --calendar --title="Calendar selection" --text="Select a date from below" --day=18 --month=1 --year=2003
then echo $? then echo $?
else echo "No date selected" else echo "No date selected"
fi fi
@ -410,7 +410,7 @@
<programlisting> <programlisting>
#!/bin/sh #!/bin/sh
if zenity --entry --dialog-title="Add a new entry" --text="Enter your _Password" --hide-text if zenity --entry --title="Add a new entry" --text="Enter your _Password" --hide-text
then echo $? then echo $?
else echo "No password entered" else echo "No password entered"
fi fi
@ -561,7 +561,7 @@
<programlisting> <programlisting>
#!/bin/sh #!/bin/sh
FILE=`zenity --file-selection --dialog-title="Select a file"' FILE=`zenity --file-selection --title="Select a file"'
case $? in case $? in
0) 0)
@ -667,7 +667,7 @@
<para> <para>
The following commandline shows an example of how to use the List dialog: The following commandline shows an example of how to use the List dialog:
<programlisting> <programlisting>
zenity --list --dialog-title="Choose bugs you wish to view" \ zenity --list --title="Choose bugs you wish to view" \
--text="Select items from the list below." \ --text="Select items from the list below." \
--column="Bug Number" --column="Severity" --column="Description" \ --column="Bug Number" --column="Severity" --column="Description" \
992383 Normal "GtkTreeView crashes on multiple selections" \ 992383 Normal "GtkTreeView crashes on multiple selections" \
@ -748,7 +748,7 @@
echo "# Rebooting system" ; sleep 1 echo "# Rebooting system" ; sleep 1
echo "100" ; sleep 1 echo "100" ; sleep 1
) | ) |
zenity --progress --dialog-title="Update System Logs" --text="Scanning mail logs..." --percentage=0 zenity --progress --title="Update System Logs" --text="Scanning mail logs..." --percentage=0
if [ "$?" = -1 ] ; then if [ "$?" = -1 ] ; then
zenity --error --text="Update cancelled." zenity --error --text="Update cancelled."
@ -808,11 +808,11 @@
<programlisting> <programlisting>
#!/bin/sh #!/bin/sh
FILE=`zenity --file-selection --dialog-title="Select a file"' FILE=`zenity --file-selection --title="Select a file"'
case $? in case $? in
0) 0)
zenity --text-info --dialog-title=$FILE --editable 2>/tmp/tmp.txt zenity --text-info --title=$FILE --editable 2>/tmp/tmp.txt
1) 1)
echo "No file selected.";; echo "No file selected.";;

View File

@ -59,6 +59,7 @@ static const gchar *author_credits[] = {
"Havoc Pennington <hp@redhat.com>", "Havoc Pennington <hp@redhat.com>",
"Kristian Rietveld <kris@gtk.org>", "Kristian Rietveld <kris@gtk.org>",
"Jakub Steiner <jimmac@ximian.com>", "Jakub Steiner <jimmac@ximian.com>",
"Daniel d'Surreal <dagmar@speakeasy.net>",
"Tom Tromey <tromey@redhat.com>", "Tom Tromey <tromey@redhat.com>",
NULL NULL
}; };

View File

@ -212,8 +212,11 @@ zenity_progress_dialog_response (GtkWidget *widget, int response, gpointer data)
break; break;
case GTK_RESPONSE_CANCEL: case GTK_RESPONSE_CANCEL:
/* FIXME: This should kill off the parent process - not entirely sure how to achieve this */ /* FIXME: This should kill off the parent process nicely and return an error code
kill (0); * I'm pretty sure there is a nice way to do this, but I'm clueless about this
* stuff. Should be using SIGHUP instead of 1 though.
*/
kill (getpid (), 1);
zen_data->exit_code = 1; zen_data->exit_code = 1;
gtk_main_quit (); gtk_main_quit ();
break; break;