minecraft-pi-reborn/zenity
Archived
1
0
Fork 0
Code Pull Requests Activity

Fix typo in gdialog wrapper. Sensitize OK button in progress when 100% reached.

Browse Source
This commit is contained in:
Mike Newman 2003-05-24 09:15:50 +00:00
parent 1acd9cfed8
commit 25d20adbd1
3 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2003-05-24 Mike Newman <mikegtn@gnome.org>
* src/progress.c: Make "OK" sensitive if progress bar has
reached 100%, and give it focus.
2003-05-24 Glynn Foster <glynn.foster@sun.com> 2003-05-24 Glynn Foster <glynn.foster@sun.com>
* help/C/zenity.xml: Patch from Dagmar d'Surreal * help/C/zenity.xml: Patch from Dagmar d'Surreal

12
src/gdialog
View File

@ -33,8 +33,8 @@ ARG: while ($argn < $args) {
get_arg; get_arg;
# Section 1 : Args which gdialog expects BEFORE box options # Section 1 : Args which gdialog expects BEFORE box options
# --clear, --backtitle have no obvious effect - ignored # --clear, --backtitle have no obvious effect - ignored
if ($element eq "--title") { if ($element eq "--title") {
@ -60,7 +60,7 @@ ARG: while ($argn < $args) {
next ARG; next ARG;
} }
# Section 2 : Box Options and subsequent args # Section 2 : Box Options and subsequent args
if ($element eq "--msgbox" || $element eq "--infobox") { if ($element eq "--msgbox" || $element eq "--infobox") {
@ -144,8 +144,8 @@ ARG: while ($argn < $args) {
# Loop over the remainder of the commandline # Loop over the remainder of the commandline
# discarding the 'status' and 'tag' args of each item # discarding the 'status' and 'tag' args of each item
# and using the 'item' for display in our second column # and using the 'item' for display in our second column
# also pass a NULL argument since zenity can't set the status # also pass a fake NULL argument since zenity can't set
# of a row like gdialog can # the status of a row like gdialog can
while ($argn < $args) { while ($argn < $args) {
get_arg; get_arg;
@ -162,7 +162,7 @@ ARG: while ($argn < $args) {
# a gdialog --menu is just a one column zenity --list # a gdialog --menu is just a one column zenity --list
# Use the 'text' arg as a second column header # Use the 'text' arg as a second column header
# FIXME: or should it be the dialog text? # FIXME: or should it be the dialog text, or both?
$command .= "--list --column $element "; $command .= "--list --column $element ";

8
src/progress.c
View File

@ -105,9 +105,13 @@ zenity_progress_handle_stdin (GIOChannel *channel,
/* Now try to convert the thing to a number */ /* Now try to convert the thing to a number */
percentage = atoi (string->str); percentage = atoi (string->str);
if (percentage > 100) if (percentage >= 100) {
GtkWidget *button;
button = glade_xml_get_widget( glade_dialog,"zenity_progress_ok_button");
gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (progress_bar), 1.0); gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (progress_bar), 1.0);
else gtk_widget_set_sensitive(GTK_WIDGET (button), TRUE);
gtk_widget_grab_focus(GTK_WIDGET (button));
} else
gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (progress_bar), percentage / 100.0); gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (progress_bar), percentage / 100.0);
} }