2003-01-03 13:26:04 +00:00
|
|
|
/*
|
|
|
|
* progress.c
|
|
|
|
*
|
|
|
|
* Copyright (C) 2002 Sun Microsystems, Inc.
|
|
|
|
*
|
|
|
|
* This library is free software; you can redistribute it and/or
|
|
|
|
* modify it under the terms of the GNU Library General Public
|
|
|
|
* License as published by the Free Software Foundation; either
|
|
|
|
* version 2 of the License, or (at your option) any later version.
|
|
|
|
*
|
|
|
|
* This library is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
|
* Library General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU Library General Public
|
|
|
|
* License along with this library; if not, write to the
|
COPYING, src/about.c, src/calendar.c, src/eggtrayicon.c, src/entry.c,
2005-04-25 Glynn Foster <glynn.foster@sun.com>
* COPYING, src/about.c, src/calendar.c, src/eggtrayicon.c,
* src/entry.c, src/fileselection.c, src/main.c, src/msg.c,
* src/notification.c, src/option.c, src/progress.c,
* src/text.c, src/tree.c, src/util.c: Update the FSF address
to point to 51 Franklin Street, Fifth Floor as per forwarded
mail from Alvaro Lopez Ortega.
2005-04-25 03:20:45 +00:00
|
|
|
* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
|
|
|
|
* Boston, MA 02110-1301, USA.
|
2003-01-03 13:26:04 +00:00
|
|
|
*
|
|
|
|
* Authors: Glynn Foster <glynn.foster@sun.com>
|
|
|
|
*/
|
|
|
|
|
2005-07-06 20:13:11 +00:00
|
|
|
#include "config.h"
|
|
|
|
|
2003-01-03 13:26:04 +00:00
|
|
|
#include <stdio.h>
|
2003-06-04 12:53:46 +00:00
|
|
|
#include <string.h>
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <sys/types.h>
|
2004-09-17 08:57:21 +00:00
|
|
|
#include <unistd.h>
|
2003-06-04 12:53:46 +00:00
|
|
|
#include <signal.h>
|
2003-01-03 13:26:04 +00:00
|
|
|
#include "zenity.h"
|
|
|
|
#include "util.h"
|
|
|
|
|
2009-07-20 08:23:32 +00:00
|
|
|
static GtkBuilder *builder;
|
2003-06-03 21:52:16 +00:00
|
|
|
static ZenityData *zen_data;
|
2003-05-19 18:24:41 +00:00
|
|
|
static GIOChannel *channel;
|
|
|
|
|
2009-08-08 18:16:49 +00:00
|
|
|
static gint pulsate_timeout = -1;
|
2006-12-02 10:54:45 +00:00
|
|
|
static gboolean autokill;
|
2010-02-23 18:07:08 +00:00
|
|
|
static gboolean no_cancel;
|
|
|
|
static gboolean auto_close;
|
2006-12-02 10:54:45 +00:00
|
|
|
|
2003-01-09 18:07:04 +00:00
|
|
|
gint zenity_progress_timeout (gpointer data);
|
|
|
|
gint zenity_progress_pulsate_timeout (gpointer data);
|
2003-01-03 13:26:04 +00:00
|
|
|
|
Fix up the response signal handlers. Use returns of 0 for 'Ok' and
2003-01-07 Glynn Foster <glynn.foster@sun.com>
* 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/zenity.glade, src/zenity.h: Fix up
the response signal handlers. Use returns of 0 for
'Ok' and 'Close', 1 for 'Cancel' and 'Escape' and
-1 for 'Uh Oh'. Get stuff printing to stderr. Fix up
the error handling that I thought was improved,
although still have issues with popt callback getting
called numerous times because of more than one instance
of the same kind is being used in poptOption.
* TODO: Update accordingly.
2003-01-07 13:22:57 +00:00
|
|
|
static void zenity_progress_dialog_response (GtkWidget *widget, int response, gpointer data);
|
2003-01-03 13:26:04 +00:00
|
|
|
|
2003-05-19 18:24:41 +00:00
|
|
|
static gboolean
|
|
|
|
zenity_progress_pulsate_progress_bar (gpointer user_data)
|
|
|
|
{
|
|
|
|
gtk_progress_bar_pulse (GTK_PROGRESS_BAR (user_data));
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
2009-08-08 18:16:49 +00:00
|
|
|
static void
|
2012-08-12 16:20:07 +00:00
|
|
|
zenity_progress_pulsate_stop (void)
|
2009-08-08 18:16:49 +00:00
|
|
|
{
|
|
|
|
if (pulsate_timeout > 0) {
|
|
|
|
g_source_remove (pulsate_timeout);
|
|
|
|
pulsate_timeout = -1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
zenity_progress_pulsate_start (GObject *progress_bar)
|
|
|
|
{
|
|
|
|
if (pulsate_timeout == -1) {
|
|
|
|
pulsate_timeout = g_timeout_add (100,
|
|
|
|
zenity_progress_pulsate_progress_bar,
|
|
|
|
progress_bar);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2003-05-19 18:24:41 +00:00
|
|
|
static gboolean
|
|
|
|
zenity_progress_handle_stdin (GIOChannel *channel,
|
|
|
|
GIOCondition condition,
|
|
|
|
gpointer data)
|
|
|
|
{
|
|
|
|
static ZenityProgressData *progress_data;
|
2009-07-20 08:23:32 +00:00
|
|
|
static GObject *progress_bar;
|
|
|
|
static GObject *progress_label;
|
2003-05-19 18:24:41 +00:00
|
|
|
float percentage = 0.0;
|
|
|
|
|
|
|
|
progress_data = (ZenityProgressData *) data;
|
2009-07-20 08:23:32 +00:00
|
|
|
progress_bar = gtk_builder_get_object (builder, "zenity_progress_bar");
|
|
|
|
progress_label = gtk_builder_get_object (builder, "zenity_progress_text");
|
2003-05-19 18:24:41 +00:00
|
|
|
|
|
|
|
if ((condition == G_IO_IN) || (condition == G_IO_IN + G_IO_HUP)) {
|
|
|
|
GString *string;
|
|
|
|
GError *error = NULL;
|
|
|
|
|
|
|
|
string = g_string_new (NULL);
|
|
|
|
|
|
|
|
while (channel->is_readable != TRUE)
|
|
|
|
;
|
|
|
|
do {
|
|
|
|
gint status;
|
|
|
|
|
|
|
|
do {
|
|
|
|
status = g_io_channel_read_line_string (channel, string, NULL, &error);
|
|
|
|
|
|
|
|
while (gtk_events_pending ())
|
|
|
|
gtk_main_iteration ();
|
|
|
|
|
|
|
|
} while (status == G_IO_STATUS_AGAIN);
|
|
|
|
|
|
|
|
if (status != G_IO_STATUS_NORMAL) {
|
|
|
|
if (error) {
|
|
|
|
g_warning ("zenity_progress_handle_stdin () : %s", error->message);
|
|
|
|
g_error_free (error);
|
|
|
|
error = NULL;
|
|
|
|
}
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!g_ascii_strncasecmp (string->str, "#", 1)) {
|
|
|
|
gchar *match;
|
|
|
|
|
|
|
|
/* We have a comment, so let's try to change the label */
|
|
|
|
match = g_strstr_len (string->str, strlen (string->str), "#");
|
|
|
|
match++;
|
2003-06-13 22:01:48 +00:00
|
|
|
gtk_label_set_text (GTK_LABEL (progress_label), g_strcompress(g_strchomp (g_strchug (match))));
|
2009-08-08 17:15:42 +00:00
|
|
|
|
|
|
|
} else if (g_str_has_prefix (string->str, "pulsate")) {
|
|
|
|
gchar *colon, *command, *value;
|
|
|
|
|
|
|
|
zenity_util_strip_newline (string->str);
|
|
|
|
|
|
|
|
colon = strchr(string->str, ':');
|
|
|
|
if (colon == NULL) {
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* split off the command and value */
|
|
|
|
command = g_strstrip (g_strndup (string->str, colon - string->str));
|
|
|
|
|
|
|
|
value = colon + 1;
|
|
|
|
while (*value && g_ascii_isspace (*value)) value++;
|
|
|
|
|
|
|
|
if (!g_ascii_strcasecmp (value, "false")) {
|
|
|
|
zenity_progress_pulsate_stop ();
|
|
|
|
|
|
|
|
gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (progress_bar),
|
|
|
|
progress_data->percentage / 100.0);
|
|
|
|
} else {
|
|
|
|
zenity_progress_pulsate_start (progress_bar);
|
|
|
|
}
|
|
|
|
|
|
|
|
g_free (command);
|
2003-05-19 18:24:41 +00:00
|
|
|
} else {
|
|
|
|
|
|
|
|
if (!g_ascii_isdigit (*(string->str)))
|
|
|
|
continue;
|
|
|
|
|
|
|
|
/* Now try to convert the thing to a number */
|
2009-08-10 02:22:05 +00:00
|
|
|
percentage = CLAMP(atoi (string->str), 0, 100);
|
|
|
|
|
|
|
|
gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (progress_bar),
|
|
|
|
percentage / 100.0);
|
|
|
|
|
|
|
|
progress_data->percentage = percentage;
|
|
|
|
|
|
|
|
if (percentage == 100) {
|
2009-08-08 17:19:33 +00:00
|
|
|
GObject *button;
|
2009-08-10 02:22:05 +00:00
|
|
|
|
2009-08-08 17:19:33 +00:00
|
|
|
button = gtk_builder_get_object(builder, "zenity_progress_ok_button");
|
|
|
|
gtk_widget_set_sensitive(GTK_WIDGET (button), TRUE);
|
|
|
|
gtk_widget_grab_focus(GTK_WIDGET (button));
|
2009-08-10 02:22:05 +00:00
|
|
|
|
2009-08-08 17:19:33 +00:00
|
|
|
if (progress_data->autoclose) {
|
|
|
|
zen_data->exit_code = zenity_util_return_exit_code (ZENITY_OK);
|
|
|
|
gtk_main_quit();
|
|
|
|
}
|
2009-08-08 17:15:42 +00:00
|
|
|
}
|
2003-05-19 18:24:41 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
} while (g_io_channel_get_buffer_condition (channel) == G_IO_IN);
|
|
|
|
g_string_free (string, TRUE);
|
|
|
|
}
|
|
|
|
|
2011-01-03 00:57:42 +00:00
|
|
|
if ((condition != G_IO_IN) && (condition != G_IO_IN + G_IO_HUP)) {
|
2003-05-19 18:24:41 +00:00
|
|
|
/* We assume that we are done, so stop the pulsating and de-sensitize the buttons */
|
|
|
|
GtkWidget *button;
|
|
|
|
|
2009-07-20 08:23:32 +00:00
|
|
|
button = GTK_WIDGET (gtk_builder_get_object (builder,
|
2009-08-08 17:19:33 +00:00
|
|
|
"zenity_progress_ok_button"));
|
2003-05-19 18:24:41 +00:00
|
|
|
gtk_widget_set_sensitive (button, TRUE);
|
|
|
|
gtk_widget_grab_focus (button);
|
|
|
|
|
2009-07-20 08:23:32 +00:00
|
|
|
button = GTK_WIDGET (gtk_builder_get_object (builder,
|
2009-08-08 17:19:33 +00:00
|
|
|
"zenity_progress_cancel_button"));
|
|
|
|
|
2003-05-19 18:24:41 +00:00
|
|
|
gtk_widget_set_sensitive (button, FALSE);
|
2009-08-08 17:19:33 +00:00
|
|
|
|
2003-05-19 18:24:41 +00:00
|
|
|
gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (progress_bar), 1.0);
|
|
|
|
|
2009-08-08 18:16:49 +00:00
|
|
|
zenity_progress_pulsate_stop ();
|
2003-05-19 18:24:41 +00:00
|
|
|
|
2009-07-20 08:23:32 +00:00
|
|
|
g_object_unref (builder);
|
2003-05-19 18:24:41 +00:00
|
|
|
|
2005-02-07 01:56:02 +00:00
|
|
|
if (progress_data->autoclose) {
|
|
|
|
zen_data->exit_code = zenity_util_return_exit_code (ZENITY_OK);
|
|
|
|
gtk_main_quit();
|
|
|
|
}
|
2009-08-08 17:19:33 +00:00
|
|
|
|
2003-05-19 18:24:41 +00:00
|
|
|
g_io_channel_shutdown (channel, TRUE, NULL);
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
zenity_progress_read_info (ZenityProgressData *progress_data)
|
|
|
|
{
|
|
|
|
channel = g_io_channel_unix_new (0);
|
|
|
|
g_io_channel_set_encoding (channel, NULL, NULL);
|
|
|
|
g_io_channel_set_flags (channel, G_IO_FLAG_NONBLOCK, NULL);
|
|
|
|
g_io_add_watch (channel, G_IO_IN | G_IO_HUP, zenity_progress_handle_stdin, progress_data);
|
2012-04-19 19:10:21 +00:00
|
|
|
/* We need to check the pulsate state here, because, the g_io_add_watch
|
|
|
|
doesn't call the zenity_progress_handle_stdin function if there's no
|
|
|
|
input. This fix the Bug 567663 */
|
|
|
|
if (progress_data->pulsate) {
|
|
|
|
GObject *progress_bar = gtk_builder_get_object (builder, "zenity_progress_bar");
|
|
|
|
zenity_progress_pulsate_start (progress_bar);
|
|
|
|
}
|
2003-05-19 18:24:41 +00:00
|
|
|
}
|
|
|
|
|
Fix up the response signal handlers. Use returns of 0 for 'Ok' and
2003-01-07 Glynn Foster <glynn.foster@sun.com>
* 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/zenity.glade, src/zenity.h: Fix up
the response signal handlers. Use returns of 0 for
'Ok' and 'Close', 1 for 'Cancel' and 'Escape' and
-1 for 'Uh Oh'. Get stuff printing to stderr. Fix up
the error handling that I thought was improved,
although still have issues with popt callback getting
called numerous times because of more than one instance
of the same kind is being used in poptOption.
* TODO: Update accordingly.
2003-01-07 13:22:57 +00:00
|
|
|
void
|
|
|
|
zenity_progress (ZenityData *data, ZenityProgressData *progress_data)
|
2003-01-03 13:26:04 +00:00
|
|
|
{
|
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.
2003-03-10 17:11:18 +00:00
|
|
|
GtkWidget *dialog;
|
2011-07-26 17:00:28 +00:00
|
|
|
GtkWidget *button;
|
2009-07-20 08:23:32 +00:00
|
|
|
GObject *text;
|
|
|
|
GObject *progress_bar;
|
2010-02-23 18:07:08 +00:00
|
|
|
GObject *cancel_button,*ok_button;
|
2003-01-03 13:26:04 +00:00
|
|
|
|
2003-06-03 21:52:16 +00:00
|
|
|
zen_data = data;
|
2009-07-20 08:23:32 +00:00
|
|
|
builder = zenity_util_load_ui_file ("zenity_progress_dialog", NULL);
|
2003-01-03 13:26:04 +00:00
|
|
|
|
2009-07-20 08:23:32 +00:00
|
|
|
if (builder == NULL) {
|
2003-06-07 14:41:56 +00:00
|
|
|
data->exit_code = zenity_util_return_exit_code (ZENITY_ERROR);
|
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.
2003-03-10 17:11:18 +00:00
|
|
|
return;
|
|
|
|
}
|
2009-08-08 17:19:33 +00:00
|
|
|
|
2009-07-20 08:23:32 +00:00
|
|
|
gtk_builder_connect_signals (builder, NULL);
|
2009-08-08 17:19:33 +00:00
|
|
|
|
2009-07-20 08:23:32 +00:00
|
|
|
dialog = GTK_WIDGET (gtk_builder_get_object (builder,
|
2009-08-08 17:19:33 +00:00
|
|
|
"zenity_progress_dialog"));
|
Fix up the response signal handlers. Use returns of 0 for 'Ok' and
2003-01-07 Glynn Foster <glynn.foster@sun.com>
* 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/zenity.glade, src/zenity.h: Fix up
the response signal handlers. Use returns of 0 for
'Ok' and 'Close', 1 for 'Cancel' and 'Escape' and
-1 for 'Uh Oh'. Get stuff printing to stderr. Fix up
the error handling that I thought was improved,
although still have issues with popt callback getting
called numerous times because of more than one instance
of the same kind is being used in poptOption.
* TODO: Update accordingly.
2003-01-07 13:22:57 +00:00
|
|
|
|
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.
2003-03-10 17:11:18 +00:00
|
|
|
g_signal_connect (G_OBJECT (dialog), "response",
|
|
|
|
G_CALLBACK (zenity_progress_dialog_response), data);
|
2009-08-08 17:19:33 +00:00
|
|
|
|
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.
2003-03-10 17:11:18 +00:00
|
|
|
if (data->dialog_title)
|
|
|
|
gtk_window_set_title (GTK_WINDOW (dialog), data->dialog_title);
|
2003-01-03 13:26:04 +00:00
|
|
|
|
Add new notification icon. Update for new files. Restructure code a little
2004-09-13 Glynn Foster <glynn.foster@sun.com>
* data/Makefile.am, data/zenity-notification.png: Add new
notification icon.
* src/Makefile.am: Update for new files.
* src/about.c, src/calendar.c, src/entry.c, src/fileselection.c,
src/progress.c, src/text.c, src/tree.c, src/msg.c: Restructure code a
little bit for new utility functions for setting window icons.
* src/eggtrayicon.c, src/eggtrayicon.h: New files for notification area
support.
* src/main.c, src/notification.c, src/util.c, src/util.h, src/zenity.h:
Add support for notification area.
* data/zenity.1, help/*: Update docs for notification and new file
selection changes.
2004-09-13 07:51:51 +00:00
|
|
|
zenity_util_set_window_icon (dialog, data->window_icon, ZENITY_IMAGE_FULLPATH ("zenity-progress.png"));
|
2003-04-13 15:42:41 +00:00
|
|
|
|
2004-03-19 02:28:30 +00:00
|
|
|
if (data->width > -1 || data->height > -1)
|
|
|
|
gtk_window_set_default_size (GTK_WINDOW (dialog), data->width, data->height);
|
2003-01-03 13:26:04 +00:00
|
|
|
|
2012-09-18 16:33:07 +00:00
|
|
|
if (data->modal)
|
|
|
|
gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);
|
|
|
|
|
2011-07-26 17:00:28 +00:00
|
|
|
if (data->ok_label) {
|
|
|
|
button = GTK_WIDGET (gtk_builder_get_object (builder, "zenity_progress_ok_button"));
|
|
|
|
gtk_button_set_label (GTK_BUTTON (button), data->ok_label);
|
|
|
|
gtk_button_set_image (GTK_BUTTON (button),
|
|
|
|
gtk_image_new_from_stock (GTK_STOCK_OK, GTK_ICON_SIZE_BUTTON));
|
|
|
|
}
|
|
|
|
|
|
|
|
if (data->cancel_label) {
|
|
|
|
button = GTK_WIDGET (gtk_builder_get_object (builder, "zenity_progress_cancel_button"));
|
|
|
|
gtk_button_set_label (GTK_BUTTON (button), data->cancel_label);
|
|
|
|
gtk_button_set_image (GTK_BUTTON (button),
|
|
|
|
gtk_image_new_from_stock (GTK_STOCK_CANCEL, GTK_ICON_SIZE_BUTTON));
|
|
|
|
}
|
|
|
|
|
2009-07-20 08:23:32 +00:00
|
|
|
text = gtk_builder_get_object (builder, "zenity_progress_text");
|
2005-11-15 04:14:35 +00:00
|
|
|
|
|
|
|
if (progress_data->dialog_text)
|
|
|
|
gtk_label_set_markup (GTK_LABEL (text), g_strcompress (progress_data->dialog_text));
|
2003-01-03 13:26:04 +00:00
|
|
|
|
2009-07-20 08:23:32 +00:00
|
|
|
progress_bar = gtk_builder_get_object (builder, "zenity_progress_bar");
|
2003-01-03 13:26:04 +00:00
|
|
|
|
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.
2003-03-10 17:11:18 +00:00
|
|
|
if (progress_data->percentage > -1)
|
|
|
|
gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (progress_bar),
|
|
|
|
progress_data->percentage/100.0);
|
Add from the 2 Sebastian's, and make email addresses more spam proof.
2004-04-26 Glynn Foster <glynn.foster@sun.com>
* THANKS, src/about.c: Add from the 2 Sebastian's, and make
email addresses more spam proof.
* src/calendar.c, src/entry.c, src/fileselection.c, src/msg.c,
* src/progress.c, src/text.c, src/tree.c, src/util.c,
* src/util.h: Patch from Sebastian Kapfer to make all zenity
dialogs transients of the parent xterm. Fixes #136226.
* src/zenity.glade: Patch from Sebastian Heinlein to
improve things HIG wise. Fixes #140745.
2004-04-26 04:41:25 +00:00
|
|
|
|
2006-12-02 10:54:45 +00:00
|
|
|
autokill = progress_data->autokill;
|
|
|
|
|
2010-02-23 18:07:08 +00:00
|
|
|
auto_close = progress_data->autoclose;
|
|
|
|
ok_button = gtk_builder_get_object (builder, "zenity_progress_ok_button");
|
|
|
|
|
|
|
|
no_cancel = progress_data->no_cancel;
|
|
|
|
cancel_button = gtk_builder_get_object (builder, "zenity_progress_cancel_button");
|
|
|
|
|
|
|
|
if (no_cancel) {
|
|
|
|
gtk_widget_hide (GTK_WIDGET(cancel_button));
|
|
|
|
gtk_window_set_deletable (GTK_WINDOW (dialog), FALSE);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (no_cancel && auto_close)
|
|
|
|
gtk_widget_hide(GTK_WIDGET(ok_button));
|
|
|
|
|
Add from the 2 Sebastian's, and make email addresses more spam proof.
2004-04-26 Glynn Foster <glynn.foster@sun.com>
* THANKS, src/about.c: Add from the 2 Sebastian's, and make
email addresses more spam proof.
* src/calendar.c, src/entry.c, src/fileselection.c, src/msg.c,
* src/progress.c, src/text.c, src/tree.c, src/util.c,
* src/util.h: Patch from Sebastian Kapfer to make all zenity
dialogs transients of the parent xterm. Fixes #136226.
* src/zenity.glade: Patch from Sebastian Heinlein to
improve things HIG wise. Fixes #140745.
2004-04-26 04:41:25 +00:00
|
|
|
zenity_util_show_dialog (dialog);
|
2003-05-19 18:24:41 +00:00
|
|
|
zenity_progress_read_info (progress_data);
|
2003-01-09 18:07:04 +00:00
|
|
|
|
2007-08-13 20:36:29 +00:00
|
|
|
if(data->timeout_delay > 0) {
|
2011-06-16 14:07:58 +00:00
|
|
|
g_timeout_add_seconds (data->timeout_delay, (GSourceFunc) zenity_util_timeout_handle, dialog);
|
2007-08-13 20:36:29 +00:00
|
|
|
}
|
|
|
|
|
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.
2003-03-10 17:11:18 +00:00
|
|
|
gtk_main ();
|
2003-01-03 13:26:04 +00:00
|
|
|
}
|
|
|
|
|
Fix up the response signal handlers. Use returns of 0 for 'Ok' and
2003-01-07 Glynn Foster <glynn.foster@sun.com>
* 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/zenity.glade, src/zenity.h: Fix up
the response signal handlers. Use returns of 0 for
'Ok' and 'Close', 1 for 'Cancel' and 'Escape' and
-1 for 'Uh Oh'. Get stuff printing to stderr. Fix up
the error handling that I thought was improved,
although still have issues with popt callback getting
called numerous times because of more than one instance
of the same kind is being used in poptOption.
* TODO: Update accordingly.
2003-01-07 13:22:57 +00:00
|
|
|
static void
|
|
|
|
zenity_progress_dialog_response (GtkWidget *widget, int response, gpointer data)
|
2003-01-03 13:26:04 +00:00
|
|
|
{
|
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.
2003-03-10 17:11:18 +00:00
|
|
|
switch (response) {
|
|
|
|
case GTK_RESPONSE_OK:
|
2011-06-17 13:47:07 +00:00
|
|
|
zenity_util_exit_code_with_data(ZENITY_OK, zen_data);
|
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.
2003-03-10 17:11:18 +00:00
|
|
|
break;
|
2009-08-08 17:19:33 +00:00
|
|
|
|
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.
2003-03-10 17:11:18 +00:00
|
|
|
case GTK_RESPONSE_CANCEL:
|
2006-12-02 10:54:45 +00:00
|
|
|
/* We do not want to kill the parent process, in order to give the user
|
|
|
|
the ability to choose the action to be taken. See bug #310824.
|
2009-08-08 17:19:33 +00:00
|
|
|
But we want to give people the option to choose this behavior.
|
|
|
|
-- Monday 27, March 2006
|
2006-12-02 10:54:45 +00:00
|
|
|
*/
|
|
|
|
if (autokill) {
|
|
|
|
kill (getppid (), 1);
|
|
|
|
}
|
2003-06-07 14:41:56 +00:00
|
|
|
zen_data->exit_code = zenity_util_return_exit_code (ZENITY_CANCEL);
|
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.
2003-03-10 17:11:18 +00:00
|
|
|
break;
|
2006-12-02 10:54:45 +00:00
|
|
|
|
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.
2003-03-10 17:11:18 +00:00
|
|
|
default:
|
|
|
|
/* Esc dialog */
|
2003-06-07 14:41:56 +00:00
|
|
|
zen_data->exit_code = zenity_util_return_exit_code (ZENITY_ESC);
|
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.
2003-03-10 17:11:18 +00:00
|
|
|
break;
|
|
|
|
}
|
2004-07-19 01:13:40 +00:00
|
|
|
gtk_main_quit ();
|
2003-01-03 13:26:04 +00:00
|
|
|
}
|