summaryrefslogtreecommitdiff
path: root/src/progress.c
diff options
context:
space:
mode:
authorGlynn Foster <glynn.foster@sun.com>2003-03-10 17:11:18 +0000
committerGlynn Foster <gman@src.gnome.org>2003-03-10 17:11:18 +0000
commit49f89795349a47ae4e061666d84a715bf24f5373 (patch)
treefe33734a99bda00908c87cb8065c0dcd6644f51e /src/progress.c
parentaaf773626ebd98d6f71ccc536fd1358eb636bae5 (diff)
Mass indentation cleanup. Make sure the glade dialogs aren't initially
2003-03-10 Glynn Foster <glynn.foster@sun.com> * src/about.c, src/calendar.c, src/entry.c, src/fileselection.c, src/main.c, src/msg.c, src/progress.c, src/text.c, src/tree.c, src/util.c, src/util.h, src/zenity.glade, src/zenity.h: Mass indentation cleanup. Make sure the glade dialogs aren't initially visible because this avoids a visibility jump. Apparently == TRUE is bad mojo. Fix up.
Diffstat (limited to 'src/progress.c')
-rw-r--r--src/progress.c194
1 files changed, 97 insertions, 97 deletions
diff --git a/src/progress.c b/src/progress.c
index bf730bc..41153bc 100644
--- a/src/progress.c
+++ b/src/progress.c
@@ -37,142 +37,142 @@ static void zenity_progress_dialog_response (GtkWidget *widget, int response, gp
void
zenity_progress (ZenityData *data, ZenityProgressData *progress_data)
{
- GtkWidget *dialog;
- GtkWidget *text;
- GtkWidget *progress_bar;
- guint input;
+ GtkWidget *dialog;
+ GtkWidget *text;
+ GtkWidget *progress_bar;
+ guint input;
- glade_dialog = zenity_util_load_glade_file ("zenity_progress_dialog");
+ glade_dialog = zenity_util_load_glade_file ("zenity_progress_dialog");
- if (glade_dialog == NULL) {
- data->exit_code = -1;
- return;
- }
+ if (glade_dialog == NULL) {
+ data->exit_code = -1;
+ return;
+ }
- glade_xml_signal_autoconnect (glade_dialog);
-
- dialog = glade_xml_get_widget (glade_dialog, "zenity_progress_dialog");
+ glade_xml_signal_autoconnect (glade_dialog);
+
+ dialog = glade_xml_get_widget (glade_dialog, "zenity_progress_dialog");
- g_signal_connect (G_OBJECT (dialog), "response",
- G_CALLBACK (zenity_progress_dialog_response), data);
+ g_signal_connect (G_OBJECT (dialog), "response",
+ G_CALLBACK (zenity_progress_dialog_response), data);
- if (data->dialog_title)
- gtk_window_set_title (GTK_WINDOW (dialog), data->dialog_title);
+ if (data->dialog_title)
+ gtk_window_set_title (GTK_WINDOW (dialog), data->dialog_title);
- if (data->window_icon)
- zenity_util_set_window_icon (dialog, data->window_icon);
- else {
- zenity_util_set_window_icon (dialog, ZENITY_IMAGE_FULLPATH ("zenity-progress.png"));
- }
+ if (data->window_icon)
+ zenity_util_set_window_icon (dialog, data->window_icon);
+ else {
+ zenity_util_set_window_icon (dialog, ZENITY_IMAGE_FULLPATH ("zenity-progress.png"));
+ }
- text = glade_xml_get_widget (glade_dialog, "zenity_progress_text");
- gtk_label_set_text (GTK_LABEL (text), progress_data->dialog_text);
+ text = glade_xml_get_widget (glade_dialog, "zenity_progress_text");
+ gtk_label_set_text (GTK_LABEL (text), progress_data->dialog_text);
- progress_bar = glade_xml_get_widget (glade_dialog, "zenity_progress_bar");
+ progress_bar = glade_xml_get_widget (glade_dialog, "zenity_progress_bar");
- if (progress_data->percentage > -1)
- gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (progress_bar),
- progress_data->percentage/100.0);
+ if (progress_data->percentage > -1)
+ gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (progress_bar),
+ progress_data->percentage/100.0);
- gtk_widget_show (dialog);
- if (progress_data->pulsate != TRUE)
- timer = gtk_timeout_add (100, zenity_progress_timeout, progress_bar);
- else
- timer = gtk_timeout_add (100, zenity_progress_pulsate_timeout, progress_bar);
+ gtk_widget_show (dialog);
+ if (!progress_data->pulsate)
+ timer = gtk_timeout_add (100, zenity_progress_timeout, progress_bar);
+ else
+ timer = gtk_timeout_add (100, zenity_progress_pulsate_timeout, progress_bar);
- gtk_main ();
+ gtk_main ();
}
gint
zenity_progress_timeout (gpointer data)
{
- gchar buffer[256];
- float percentage;
-
- while(gtk_events_pending()) {
- gtk_main_iteration();
+ gchar buffer[256];
+ float percentage;
- if (timer == 0)
- return FALSE;
- }
+ while(gtk_events_pending()) {
+ gtk_main_iteration();
- if (scanf ("%255s", buffer) == EOF) {
- GtkWidget *button;
+ if (timer == 0)
+ return FALSE;
+ }
- button = glade_xml_get_widget (glade_dialog, "zenity_progress_ok_button");
- gtk_widget_set_sensitive (button, TRUE);
- gtk_widget_grab_focus (button);
+ if (scanf ("%255s", buffer) == EOF) {
+ GtkWidget *button;
- button = glade_xml_get_widget (glade_dialog, "zenity_progress_cancel_button");
- gtk_widget_set_sensitive (button, FALSE);
+ button = glade_xml_get_widget (glade_dialog, "zenity_progress_ok_button");
+ gtk_widget_set_sensitive (button, TRUE);
+ gtk_widget_grab_focus (button);
- if (glade_dialog)
- g_object_unref (glade_dialog);
+ button = glade_xml_get_widget (glade_dialog, "zenity_progress_cancel_button");
+ gtk_widget_set_sensitive (button, FALSE);
+
+ if (glade_dialog)
+ g_object_unref (glade_dialog);
- return FALSE;
- } else {
- percentage = atoi (buffer);
+ return FALSE;
+ } else {
+ percentage = atoi (buffer);
- if (percentage > 100)
- gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (data), 1.0);
- else
- gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (data), percentage / 100.0);
+ if (percentage > 100)
+ gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (data), 1.0);
+ else
+ gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (data), percentage / 100.0);
- return TRUE;
- }
+ return TRUE;
+ }
}
gint
zenity_progress_pulsate_timeout (gpointer data)
{
- while(gtk_events_pending()) {
- gtk_main_iteration();
-
- if (timer == 0)
- return FALSE;
- }
-
- if (feof (stdin)) {
- gtk_progress_bar_pulse (GTK_PROGRESS_BAR (data));
+ while(gtk_events_pending()) {
+ gtk_main_iteration();
- return FALSE;
- } else {
- GtkWidget *button;
+ if (timer == 0)
+ return FALSE;
+ }
- /* We stop the pulsating and switch the focus on the dialog buttons */
+ if (feof (stdin)) {
+ gtk_progress_bar_pulse (GTK_PROGRESS_BAR (data));
+ return FALSE;
+ } else {
+ GtkWidget *button;
- gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (data), 1.0);
+ /* We stop the pulsating and switch the focus on the dialog buttons */
+
+ gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (data), 1.0);
- button = glade_xml_get_widget (glade_dialog, "zenity_progress_ok_button");
- gtk_widget_set_sensitive (button, TRUE);
- gtk_widget_grab_focus (button);
+ button = glade_xml_get_widget (glade_dialog, "zenity_progress_ok_button");
+ gtk_widget_set_sensitive (button, TRUE);
+ gtk_widget_grab_focus (button);
- button = glade_xml_get_widget (glade_dialog, "zenity_progress_cancel_button");
- gtk_widget_set_sensitive (button, FALSE);
+ button = glade_xml_get_widget (glade_dialog, "zenity_progress_cancel_button");
+ gtk_widget_set_sensitive (button, FALSE);
- return TRUE;
- }
+ return TRUE;
+ }
}
static void
zenity_progress_dialog_response (GtkWidget *widget, int response, gpointer data)
{
- ZenityData *zen_data = data;
-
- switch (response) {
- case GTK_RESPONSE_OK:
- zen_data->exit_code = 0;
- gtk_main_quit ();
- break;
-
- case GTK_RESPONSE_CANCEL:
- zen_data->exit_code = 1;
- gtk_main_quit ();
- break;
-
- default:
- zen_data->exit_code = 1;
- break;
- }
+ ZenityData *zen_data = data;
+
+ switch (response) {
+ case GTK_RESPONSE_OK:
+ zen_data->exit_code = 0;
+ gtk_main_quit ();
+ break;
+
+ case GTK_RESPONSE_CANCEL:
+ zen_data->exit_code = 1;
+ gtk_main_quit ();
+ break;
+
+ default:
+ /* Esc dialog */
+ zen_data->exit_code = 1;
+ break;
+ }
}