aboutsummaryrefslogtreecommitdiffstats
path: root/widgets/misc/e-task-widget.c
diff options
context:
space:
mode:
authorSrinivasa Ragavan <sragavan@novell.com>2007-12-17 04:19:53 +0800
committerSrinivasa Ragavan <sragavan@src.gnome.org>2007-12-17 04:19:53 +0800
commit5b89cbe4f598387a56d22627558b5308da6044bc (patch)
tree620d37062cec0df7cbfa107d8317b62fb28ce9ee /widgets/misc/e-task-widget.c
parent9bf01a179e346a25967a0898c900c863ed7b95db (diff)
downloadgsoc2013-evolution-5b89cbe4f598387a56d22627558b5308da6044bc.tar
gsoc2013-evolution-5b89cbe4f598387a56d22627558b5308da6044bc.tar.gz
gsoc2013-evolution-5b89cbe4f598387a56d22627558b5308da6044bc.tar.bz2
gsoc2013-evolution-5b89cbe4f598387a56d22627558b5308da6044bc.tar.lz
gsoc2013-evolution-5b89cbe4f598387a56d22627558b5308da6044bc.tar.xz
gsoc2013-evolution-5b89cbe4f598387a56d22627558b5308da6044bc.tar.zst
gsoc2013-evolution-5b89cbe4f598387a56d22627558b5308da6044bc.zip
** Non-intrusive errror reporting and basic logging support.
2007-12-17 Srinivasa Ragavan <sragavan@novell.com> ** Non-intrusive errror reporting and basic logging support. * em-folder-browser.c: (emfb_help_debug): Invoke the debug menu. * evolution-mail.schemas.in: Schema for error timeout and level. * mail-component.c: (mail_component_init), (render_pixbuf), (render_level), (render_date), (append_logs), (spin_value_changed), (mail_component_show_logger): Handle the lifecycle of the logger. * mail-component.h: Api to show the logger. * mail-config.c: (gconf_error_time_changed), (gconf_error_level_changed), (mail_config_init), (mail_config_get_error_timeout), (mail_config_get_error_level): Load and get the error time and level. * mail-config.h: * mail-mt.c: (mail_msg_set_cancelable), (mail_msg_new), (end_event_callback), (mail_msg_free), (mail_msg_check_error), (operation_cancel), (do_op_status): Revamp the error handling. * mail-mt.h: * mail-ops.c: (send_queue_send), (mail_send_queue): Handle the send/receive case of error reporting separately. * mail-send-recv.c: (free_send_info), (mail_send): 2007-12-17 Srinivasa Ragavan <sragavan@novell.com> ** Revamped Activity handler and task bar/widget for non-intrusive error reporting * e-activity-handler.c: (activity_info_new), (activity_info_free), (task_widget_new_from_activity_info), (setup_task_bar), (e_activity_handler_init), (e_activity_handler_set_error_flush_time), (e_activity_handler_set_logger), (cancel_wrapper), (e_activity_handler_cancelable_operation_started), (e_activity_handler_operation_started), (handle_error), (error_cleanup), (e_activity_handler_make_error), (e_activity_handler_operation_set_error), (e_activity_handler_operation_progressing), (e_activity_handler_operation_finished): * e-activity-handler.h: * e-task-bar.c: (e_task_bar_prepend_task), (e_task_bar_remove_task_from_id), (e_task_bar_remove_task), (e_task_bar_get_task_widget_from_id): * e-task-bar.h: * e-task-widget.c: (e_task_widget_init), (button_press_event_cb), (prepare_popup), (e_task_widget_construct), (e_task_widget_new_with_cancel), (e_task_widget_new), (e_task_widget_update_image): * e-task-widget.h: 2007-12-17 Srinivasa Ragavan <sragavan@novell.com> * Makefile.am: Add e-logger.[ch] to compilation * e-error.c: (e_error_newv): Add primary/secondary text to the error dialog to the gobject as data. * e-logger.[ch]: A new logger provision Evolution. 2007-12-17 Srinivasa Ragavan <sragavan@novell.com> * evolution-mail-global.xml: Add Debug Log menu item for mailer. * evolution.xml: Add place holder for Debug menu item. svn path=/trunk/; revision=34712
Diffstat (limited to 'widgets/misc/e-task-widget.c')
-rw-r--r--widgets/misc/e-task-widget.c101
1 files changed, 92 insertions, 9 deletions
diff --git a/widgets/misc/e-task-widget.c b/widgets/misc/e-task-widget.c
index 50d459d3f0..bb9a6026d9 100644
--- a/widgets/misc/e-task-widget.c
+++ b/widgets/misc/e-task-widget.c
@@ -26,12 +26,15 @@
#include "e-task-widget.h"
#include "e-spinner.h"
+#include <e-util/e-icon-factory.h>
#include <gtk/gtkframe.h>
#include <gtk/gtkhbox.h>
#include <gtk/gtklabel.h>
#include <gtk/gtkimage.h>
#include <gtk/gtktooltips.h>
+#include <gtk/gtktoolbutton.h>
+#include <gtk/gtkbox.h>
#include <glib/gi18n.h>
@@ -45,7 +48,11 @@ struct _ETaskWidgetPrivate {
GdkPixbuf *icon_pixbuf;
GtkWidget *label;
+ GtkWidget *box;
GtkWidget *image;
+
+ void (*cancel_func) (gpointer data);
+ gpointer data;
};
G_DEFINE_TYPE (ETaskWidget, e_task_widget, GTK_TYPE_EVENT_BOX)
@@ -112,8 +119,35 @@ e_task_widget_init (ETaskWidget *task_widget)
priv->icon_pixbuf = NULL;
priv->label = NULL;
priv->image = NULL;
+ priv->box = NULL;
task_widget->priv = priv;
+ task_widget->id = 0;
+}
+
+static gboolean
+button_press_event_cb (GtkWidget *w, gpointer data)
+{
+ ETaskWidget *tw = (ETaskWidget *) data;
+ ETaskWidgetPrivate *priv = tw->priv;
+
+ priv->cancel_func (priv->data);
+
+ return TRUE;
+}
+
+static gboolean
+prepare_popup (ETaskWidget *widget, GdkEventButton *event)
+{
+ if (event->type != GDK_BUTTON_PRESS)
+ return FALSE;
+
+ if (event->button != 3)
+ return FALSE;
+
+ /* FIXME: Implement Cancel */
+
+ return TRUE;
}
@@ -121,17 +155,20 @@ void
e_task_widget_construct (ETaskWidget *task_widget,
GdkPixbuf *icon_pixbuf,
const char *component_id,
- const char *information)
+ const char *information,
+ void (*cancel_func) (gpointer data),
+ gpointer data)
{
ETaskWidgetPrivate *priv;
/*GdkPixmap *pixmap;
GdkBitmap *mask;*/
GtkWidget *box;
GtkWidget *frame;
+ GtkWidget *image = e_icon_factory_get_image ("gtk-stop", E_ICON_SIZE_MENU);
+ GtkWidget *tool;
g_return_if_fail (task_widget != NULL);
g_return_if_fail (E_IS_TASK_WIDGET (task_widget));
- g_return_if_fail (icon_pixbuf != NULL);
g_return_if_fail (component_id != NULL);
g_return_if_fail (information != NULL);
@@ -154,22 +191,34 @@ e_task_widget_construct (ETaskWidget *task_widget,
/* priv->icon_pixbuf = g_object_ref (icon_pixbuf); */
/* gdk_pixbuf_render_pixmap_and_mask (icon_pixbuf, &pixmap, &mask, 128); */
-
+ priv->box = gtk_hbox_new (FALSE, 0);
priv->image = e_spinner_new ();
e_spinner_set_size (E_SPINNER (priv->image), GTK_ICON_SIZE_SMALL_TOOLBAR);
e_spinner_start (E_SPINNER (priv->image));
/* gtk_image_new_from_pixmap (pixmap, mask); */
gtk_widget_show (priv->image);
- gtk_box_pack_start (GTK_BOX (box), priv->image, FALSE, TRUE, 0);
-
+ gtk_widget_show (priv->box);
+ gtk_box_pack_start (GTK_BOX (priv->box), priv->image, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (box), priv->box, FALSE, TRUE, 0);
priv->label = gtk_label_new ("");
gtk_misc_set_alignment (GTK_MISC (priv->label), 0.0, 0.5);
gtk_widget_show (priv->label);
gtk_box_pack_start (GTK_BOX (box), priv->label, TRUE, TRUE, 0);
+ if (cancel_func) {
+ tool = (GtkWidget *) gtk_tool_button_new (image, NULL);
+ gtk_box_pack_end (GTK_BOX (box), tool, FALSE, TRUE, 0);
+ gtk_widget_show_all (tool);
+
+ gtk_widget_set_sensitive (tool, cancel_func != NULL);
+ priv->cancel_func = cancel_func;
+ priv->data = data;
+ g_signal_connect (tool, "clicked", G_CALLBACK (button_press_event_cb), task_widget);
+ /* g_object_unref (pixmap);
+ if (mask)
+ g_object_unref (mask); */
+ g_signal_connect (task_widget, "button-press-event", G_CALLBACK (prepare_popup), task_widget);
- /* g_object_unref (pixmap);
- if (mask)
- g_object_unref (mask); */
+ }
priv->tooltips = gtk_tooltips_new ();
g_object_ref_sink (priv->tooltips);
@@ -178,6 +227,23 @@ e_task_widget_construct (ETaskWidget *task_widget,
}
GtkWidget *
+e_task_widget_new_with_cancel (GdkPixbuf *icon_pixbuf,
+ const char *component_id,
+ const char *information,
+ void (*cancel_func) (gpointer data),
+ gpointer data)
+{
+ ETaskWidget *task_widget;
+
+ g_return_val_if_fail (information != NULL, NULL);
+
+ task_widget = g_object_new (e_task_widget_get_type (), NULL);
+ e_task_widget_construct (task_widget, icon_pixbuf, component_id, information, cancel_func, data);
+
+ return GTK_WIDGET (task_widget);
+}
+
+GtkWidget *
e_task_widget_new (GdkPixbuf *icon_pixbuf,
const char *component_id,
const char *information)
@@ -188,11 +254,28 @@ e_task_widget_new (GdkPixbuf *icon_pixbuf,
g_return_val_if_fail (information != NULL, NULL);
task_widget = g_object_new (e_task_widget_get_type (), NULL);
- e_task_widget_construct (task_widget, icon_pixbuf, component_id, information);
+ e_task_widget_construct (task_widget, icon_pixbuf, component_id, information, NULL, NULL);
return GTK_WIDGET (task_widget);
}
+GtkWidget *
+e_task_widget_update_image (ETaskWidget *task_widget,
+ char *stock, char *text)
+{
+ GtkWidget *img, *tool;
+
+ img = e_icon_factory_get_image ("stock_dialog-warning", E_ICON_SIZE_MENU);
+ tool = (GtkWidget *) gtk_tool_button_new (img, NULL);
+ gtk_box_pack_start (GTK_BOX(task_widget->priv->box), tool, FALSE, TRUE, 0);
+ gtk_widget_destroy (task_widget->priv->image);
+ gtk_widget_show_all (task_widget->priv->box);
+ task_widget->priv->image = img;
+ gtk_label_set_text (GTK_LABEL (task_widget->priv->label), text);
+
+ return tool;
+}
+
void
e_task_widget_update (ETaskWidget *task_widget,