diff options
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/Makefile.am | 16 | ||||
| -rw-r--r-- | shell/ev-message-area.c | 324 | ||||
| -rw-r--r-- | shell/ev-message-area.h | 69 | ||||
| -rw-r--r-- | shell/ev-window.c | 105 |
4 files changed, 474 insertions, 40 deletions
diff --git a/shell/Makefile.am b/shell/Makefile.am index 34dc0ff..973882b 100644 --- a/shell/Makefile.am +++ b/shell/Makefile.am @@ -4,6 +4,7 @@ INCLUDES= \ -I$(top_srcdir)/cut-n-paste/zoom-control/ \ -I$(top_srcdir)/cut-n-paste/toolbar-editor/ \ -I$(top_srcdir)/cut-n-paste/totem-screensaver/ \ + -I$(top_srcdir)/cut-n-paste/gedit-message-area/ \ -I$(top_srcdir)/libdocument \ -I$(top_srcdir)/properties \ -DGNOMELOCALEDIR=\"$(datadir)/locale\" \ @@ -29,6 +30,8 @@ evince_SOURCES= \ ev-history.h \ ev-marshal.c \ ev-marshal.h \ + ev-message-area.c \ + ev-message-area.h \ ev-metadata-manager.c \ ev-metadata-manager.h \ ev-navigation-action.c \ @@ -89,13 +92,14 @@ evince_SOURCES+= \ endif -evince_LDADD= \ - $(top_builddir)/cut-n-paste/zoom-control/libephyzoom.la \ - $(top_builddir)/cut-n-paste/toolbar-editor/libtoolbareditor.la \ +evince_LDADD= \ + $(top_builddir)/cut-n-paste/zoom-control/libephyzoom.la \ + $(top_builddir)/cut-n-paste/toolbar-editor/libtoolbareditor.la \ $(top_builddir)/cut-n-paste/totem-screensaver/libtotemscrsaver.la \ - $(top_builddir)/properties/libevproperties.la \ - $(top_builddir)/libdocument/libevbackend.la \ - $(SHELL_LIBS) \ + $(top_builddir)/cut-n-paste/gedit-message-area/libgeditmsgarea.la \ + $(top_builddir)/properties/libevproperties.la \ + $(top_builddir)/libdocument/libevbackend.la \ + $(SHELL_LIBS) \ $(GNOME_PRINT_LIBS) if ENABLE_DJVU diff --git a/shell/ev-message-area.c b/shell/ev-message-area.c new file mode 100644 index 0000000..93e227d --- /dev/null +++ b/shell/ev-message-area.c @@ -0,0 +1,324 @@ +/* ev-message-area.c + * this file is part of evince, a gnome document viewer + * + * Copyright (C) 2007 Carlos Garcia Campos + * + * Author: + * Carlos Garcia Campos <carlosgc@gnome.org> + * + * Evince is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * Evince 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 + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. + */ + +#include <gtk/gtkaccessible.h> +#include <gtk/gtklabel.h> +#include <gtk/gtkhbox.h> +#include <gtk/gtkvbox.h> +#include <gtk/gtkimage.h> +#include <gtk/gtkstock.h> + +#include "ev-message-area.h" + +#define EV_MESSAGE_AREA_GET_PRIVATE(obj) \ + (G_TYPE_INSTANCE_GET_PRIVATE ((obj), EV_TYPE_MESSAGE_AREA, EvMessageAreaPrivate)) + +struct _EvMessageAreaPrivate { + GtkWidget *image; + GtkWidget *label; + GtkWidget *secondary_label; + + guint message_type : 3; +}; + +enum { + PROP_0, + PROP_MESSAGE_TYPE, + PROP_TEXT, + PROP_SECONDARY_TEXT, + PROP_IMAGE +}; + +static void ev_message_area_set_property (GObject *object, + guint prop_id, + const GValue *value, + GParamSpec *pspec); +static void ev_message_area_get_property (GObject *object, + guint prop_id, + GValue *value, + GParamSpec *pspec); + +G_DEFINE_TYPE (EvMessageArea, ev_message_area, GEDIT_TYPE_MESSAGE_AREA) + +static void +ev_message_area_class_init (EvMessageAreaClass *class) +{ + GObjectClass *gobject_class = G_OBJECT_CLASS (class); + + gobject_class->set_property = ev_message_area_set_property; + gobject_class->get_property = ev_message_area_get_property; + + g_object_class_install_property (gobject_class, + PROP_MESSAGE_TYPE, + g_param_spec_enum ("message-type", + "Message Type", + "The type of message", + GTK_TYPE_MESSAGE_TYPE, + GTK_MESSAGE_INFO, + G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); + g_object_class_install_property (gobject_class, + PROP_TEXT, + g_param_spec_string ("text", + "Text", + "The primary text of the message dialog", + NULL, + G_PARAM_READWRITE)); + g_object_class_install_property (gobject_class, + PROP_SECONDARY_TEXT, + g_param_spec_string ("secondary-text", + "Secondary Text", + "The secondary text of the message dialog", + NULL, + G_PARAM_READWRITE)); + g_object_class_install_property (gobject_class, + PROP_IMAGE, + g_param_spec_object ("image", + "Image", + "The image", + GTK_TYPE_WIDGET, + G_PARAM_READWRITE)); + + g_type_class_add_private (gobject_class, sizeof (EvMessageAreaPrivate)); +} + +static void +ev_message_area_init (EvMessageArea *area) +{ + GtkWidget *hbox, *vbox; + + area->priv = EV_MESSAGE_AREA_GET_PRIVATE (area); + + hbox = gtk_hbox_new (FALSE, 12); + vbox = gtk_vbox_new (FALSE, 12); + + area->priv->label = gtk_label_new (NULL); + gtk_label_set_use_markup (GTK_LABEL (area->priv->label), TRUE); + gtk_label_set_line_wrap (GTK_LABEL (area->priv->label), TRUE); + gtk_label_set_selectable (GTK_LABEL (area->priv->label), TRUE); + gtk_misc_set_alignment (GTK_MISC (area->priv->label), 0.0, 0.5); + GTK_WIDGET_SET_FLAGS (area->priv->label, GTK_CAN_FOCUS); + gtk_box_pack_start (GTK_BOX (vbox), area->priv->label, TRUE, TRUE, 0); + gtk_widget_show (area->priv->label); + + area->priv->secondary_label = gtk_label_new (NULL); + gtk_label_set_use_markup (GTK_LABEL (area->priv->secondary_label), TRUE); + gtk_label_set_line_wrap (GTK_LABEL (area->priv->secondary_label), TRUE); + gtk_label_set_selectable (GTK_LABEL (area->priv->secondary_label), TRUE); + gtk_misc_set_alignment (GTK_MISC (area->priv->secondary_label), 0.0, 0.5); + GTK_WIDGET_SET_FLAGS (area->priv->secondary_label, GTK_CAN_FOCUS); + gtk_box_pack_start (GTK_BOX (vbox), area->priv->secondary_label, TRUE, TRUE, 0); + + area->priv->image = gtk_image_new_from_stock (NULL, GTK_ICON_SIZE_DIALOG); + gtk_misc_set_alignment (GTK_MISC (area->priv->image), 0.5, 0.0); + gtk_box_pack_start (GTK_BOX (hbox), area->priv->image, FALSE, FALSE, 0); + gtk_widget_show (area->priv->image); + + gtk_box_pack_start (GTK_BOX (hbox), vbox, TRUE, TRUE, 0); + gtk_widget_show (vbox); + + gedit_message_area_set_contents (GEDIT_MESSAGE_AREA (area), hbox); + gtk_widget_show (hbox); +} + +static void +ev_message_area_set_image_for_type (EvMessageArea *area, + GtkMessageType type) +{ + const gchar *stock_id = NULL; + AtkObject *atk_obj; + + switch (type) { + case GTK_MESSAGE_INFO: + stock_id = GTK_STOCK_DIALOG_INFO; + break; + case GTK_MESSAGE_QUESTION: + stock_id = GTK_STOCK_DIALOG_QUESTION; + break; + case GTK_MESSAGE_WARNING: + stock_id = GTK_STOCK_DIALOG_WARNING; + break; + case GTK_MESSAGE_ERROR: + stock_id = GTK_STOCK_DIALOG_ERROR; + break; + case GTK_MESSAGE_OTHER: + break; + default: + g_warning ("Unknown GtkMessageType %u", type); + break; + } + + if (stock_id) + gtk_image_set_from_stock (GTK_IMAGE (area->priv->image), stock_id, + GTK_ICON_SIZE_DIALOG); + + atk_obj = gtk_widget_get_accessible (GTK_WIDGET (area)); + if (GTK_IS_ACCESSIBLE (atk_obj)) { + atk_object_set_role (atk_obj, ATK_ROLE_ALERT); + if (stock_id) { + GtkStockItem item; + + gtk_stock_lookup (stock_id, &item); + atk_object_set_name (atk_obj, item.label); + } + } +} + +static void +ev_message_area_set_property (GObject *object, + guint prop_id, + const GValue *value, + GParamSpec *pspec) +{ + EvMessageArea *area = EV_MESSAGE_AREA (object); + + switch (prop_id) { + case PROP_MESSAGE_TYPE: + area->priv->message_type = g_value_get_enum (value); + ev_message_area_set_image_for_type (area, area->priv->message_type); + break; + case PROP_TEXT: + ev_message_area_set_text (area, g_value_get_string (value)); + break; + case PROP_SECONDARY_TEXT: + ev_message_area_set_secondary_text (area, g_value_get_string (value)); + break; + case PROP_IMAGE: + ev_message_area_set_image (area, (GtkWidget *)g_value_get_object (value)); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } +} + +static void +ev_message_area_get_property (GObject *object, + guint prop_id, + GValue *value, + GParamSpec *pspec) +{ + EvMessageArea *area = EV_MESSAGE_AREA (object); + + switch (prop_id) { + case PROP_MESSAGE_TYPE: + g_value_set_enum (value, (GtkMessageType) area->priv->message_type); + break; + case PROP_TEXT: + g_value_set_string (value, gtk_label_get_label (GTK_LABEL (area->priv->label))); + break; + case PROP_SECONDARY_TEXT: + g_value_set_string (value, gtk_label_get_label (GTK_LABEL (area->priv->secondary_label))); + break; + case PROP_IMAGE: + g_value_set_object (value, area->priv->image); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } +} + +GtkWidget * +ev_message_area_new (GtkMessageType type, + const gchar *text, + const gchar *first_button_text, + ...) +{ + GtkWidget *widget; + + widget = g_object_new (EV_TYPE_MESSAGE_AREA, + "message-type", type, + "text", text, + NULL); + if (first_button_text) { + va_list args; + + va_start (args, first_button_text); + gedit_message_area_add_buttons_valist (GEDIT_MESSAGE_AREA (widget), + first_button_text, + args); + va_end (args); + } + + return widget; +} + +void +ev_message_area_set_image (EvMessageArea *area, + GtkWidget *image) +{ + GtkWidget *parent; + + g_return_if_fail (EV_IS_MESSAGE_AREA (area)); + + area->priv->message_type = GTK_MESSAGE_OTHER; + + parent = area->priv->image->parent; + gtk_container_add (GTK_CONTAINER (parent), image); + gtk_container_remove (GTK_CONTAINER (parent), area->priv->image); + gtk_box_reorder_child (GTK_BOX (parent), image, 0); + + area->priv->image = image; + + g_object_notify (G_OBJECT (area), "image"); +} + +void +ev_message_area_set_text (EvMessageArea *area, + const gchar *str) +{ + g_return_if_fail (EV_IS_MESSAGE_AREA (area)); + + if (str) { + gchar *msg; + + msg = g_strdup_printf ("<b>%s</b>", str); + gtk_label_set_markup (GTK_LABEL (area->priv->label), msg); + g_free (msg); + } else { + gtk_label_set_markup (GTK_LABEL (area->priv->label), NULL); + } + + g_object_notify (G_OBJECT (area), "text"); +} + +void +ev_message_area_set_secondary_text (EvMessageArea *area, + const gchar *str) +{ + g_return_if_fail (EV_IS_MESSAGE_AREA (area)); + + if (str) { + gchar *msg; + + msg = g_strdup_printf ("<small>%s</small>", str); + gtk_label_set_markup (GTK_LABEL (area->priv->secondary_label), msg); + g_free (msg); + gtk_widget_show (area->priv->secondary_label); + } else { + gtk_label_set_markup (GTK_LABEL (area->priv->secondary_label), NULL); + gtk_widget_hide (area->priv->secondary_label); + } + + g_object_notify (G_OBJECT (area), "secondary-text"); +} diff --git a/shell/ev-message-area.h b/shell/ev-message-area.h new file mode 100644 index 0000000..bb29545 --- /dev/null +++ b/shell/ev-message-area.h @@ -0,0 +1,69 @@ +/* ev-message-area.h + * this file is part of evince, a gnome document viewer + * + * Copyright (C) 2007 Carlos Garcia Campos + * + * Author: + * Carlos Garcia Campos <carlosgc@gnome.org> + * + * Evince is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * Evince 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 + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. + */ + +#ifndef EV_MESSAGE_AREA_H +#define EV_MESSAGE_AREA_H + +#include <gtk/gtkmessagedialog.h> + +#include "gedit-message-area.h" + +G_BEGIN_DECLS + +#define EV_TYPE_MESSAGE_AREA (ev_message_area_get_type ()) +#define EV_MESSAGE_AREA(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EV_TYPE_MESSAGE_AREA, EvMessageArea)) +#define EV_MESSAGE_AREA_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EV_TYPE_MESSAGE_AREA, EvMessageAreaClass)) +#define EV_IS_MESSAGE_AREA(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EV_TYPE_MESSAGE_AREA)) +#define EV_IS_MESSAGE_AREA_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EV_TYPE_MESSAGE_AREA)) +#define EV_MESSAGE_AREA_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), EV_TYPE_MESSAGE_AREA, EvMessageAreaClass)) + +typedef struct _EvMessageArea EvMessageArea; +typedef struct _EvMessageAreaClass EvMessageAreaClass; +typedef struct _EvMessageAreaPrivate EvMessageAreaPrivate; + +struct _EvMessageArea { + GeditMessageArea parent_instance; + + /*< private >*/ + EvMessageAreaPrivate *priv; +}; + +struct _EvMessageAreaClass { + GeditMessageAreaClass parent_class; +}; + +GType ev_message_area_get_type (void) G_GNUC_CONST; +GtkWidget *ev_message_area_new (GtkMessageType type, + const gchar *text, + const gchar *first_button_text, + ...); +void ev_message_area_set_image (EvMessageArea *area, + GtkWidget *image); +void ev_message_area_set_text (EvMessageArea *area, + const gchar *str); +void ev_message_area_set_secondary_text (EvMessageArea *area, + const gchar *str); + +G_END_DECLS + +#endif /* EV_MESSAGE_AREA_H */ diff --git a/shell/ev-window.c b/shell/ev-window.c index ed568f9..ca2a14e 100644 --- a/shell/ev-window.c +++ b/shell/ev-window.c @@ -91,6 +91,8 @@ #include <string.h> #include <unistd.h> +#include "ev-message-area.h" + #if !GLIB_CHECK_VERSION (2, 13, 3) char *xdg_user_dir_lookup (char *type); #endif @@ -119,10 +121,12 @@ struct _EvWindowPrivate { GtkWidget *menubar; GtkWidget *toolbar; GtkWidget *hpaned; + GtkWidget *view_box; GtkWidget *sidebar; GtkWidget *find_bar; GtkWidget *scrolled_window; GtkWidget *view; + GtkWidget *message_area; GtkWidget *password_view; GtkWidget *sidebar_thumbs; GtkWidget *sidebar_links; @@ -624,29 +628,55 @@ ev_window_is_empty (const EvWindow *ev_window) } static void -ev_window_error_dialog_response_cb (GtkWidget *dialog, - gint response_id, - EvWindow *ev_window) +ev_window_set_message_area (EvWindow *window, + GtkWidget *area) { - gtk_widget_destroy (dialog); + if (window->priv->message_area == area) + return; + + if (window->priv->message_area) + gtk_widget_destroy (window->priv->message_area); + window->priv->message_area = area; + + if (!area) + return; + + gtk_box_pack_start (GTK_BOX (window->priv->view_box), + window->priv->message_area, + FALSE, FALSE, 0); + gtk_box_reorder_child (GTK_BOX (window->priv->view_box), + window->priv->message_area, 0); + g_object_add_weak_pointer (G_OBJECT (window->priv->message_area), + (gpointer) &(window->priv->message_area)); } static void -ev_window_error_dialog (GtkWindow *window, const gchar *msg, GError *error) +ev_window_error_message_response_cb (EvMessageArea *area, + gint response_id, + EvWindow *window) { - GtkWidget *dialog; + ev_window_set_message_area (window, NULL); +} - dialog = gtk_message_dialog_new (GTK_WINDOW (window), - GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_MESSAGE_ERROR, - GTK_BUTTONS_CLOSE, - msg); - gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), - "%s", error->message); - g_signal_connect (dialog, "response", - G_CALLBACK (ev_window_error_dialog_response_cb), - window); - gtk_widget_show (dialog); +static void +ev_window_error_message (GtkWindow *window, const gchar *msg, GError *error) +{ + GtkWidget *area; + + if (EV_WINDOW (window)->priv->message_area) + return; + + area = ev_message_area_new (GTK_MESSAGE_ERROR, + msg, + GTK_STOCK_CLOSE, + GTK_RESPONSE_CANCEL, + NULL); + ev_message_area_set_secondary_text (EV_MESSAGE_AREA (area), error->message); + g_signal_connect (area, "response", + G_CALLBACK (ev_window_error_message_response_cb), + window); + gtk_widget_show (area); + ev_window_set_message_area (EV_WINDOW (window), area); } static void @@ -1149,6 +1179,8 @@ ev_window_set_document (EvWindow *ev_window, EvDocument *document) if (ev_window->priv->document) g_object_unref (ev_window->priv->document); ev_window->priv->document = g_object_ref (document); + + ev_window_set_message_area (ev_window, NULL); ev_window->priv->page_cache = ev_page_cache_get (ev_window->priv->document); g_signal_connect (ev_window->priv->page_cache, "page-changed", @@ -1384,9 +1416,9 @@ ev_window_load_job_cb (EvJobLoad *job, ev_window_popup_password_dialog (ev_window); } else { - ev_window_error_dialog (GTK_WINDOW (ev_window), - _("Unable to open document"), - job->error); + ev_window_error_message (GTK_WINDOW (ev_window), + _("Unable to open document"), + job->error); ev_window_clear_load_job (ev_window); ev_window->priv->in_reload = FALSE; } @@ -1679,9 +1711,9 @@ ev_window_cmd_file_open_copy_at_dest (EvWindow *window, EvLinkDest *dest) new_filename = ev_window_create_tmp_symlink (old_filename, &error); if (error) { - ev_window_error_dialog (GTK_WINDOW (window), - _("Cannot open a copy."), - error); + ev_window_error_message (GTK_WINDOW (window), + _("Cannot open a copy."), + error); g_error_free (error); g_free (old_filename); @@ -1998,7 +2030,7 @@ ev_window_save_job_cb (EvJobSave *job, gchar *msg; msg = g_strdup_printf (_("The file could not be saved as “%s”."), job->uri); - ev_window_error_dialog (GTK_WINDOW (window), msg, job->error); + ev_window_error_message (GTK_WINDOW (window), msg, job->error); g_free (msg); } @@ -4960,9 +4992,9 @@ image_save_dialog_response_cb (GtkWidget *fc, filename, "png", &error, NULL); if (error) { - ev_window_error_dialog (GTK_WINDOW (ev_window), - _("The image could not be saved."), - error); + ev_window_error_message (GTK_WINDOW (ev_window), + _("The image could not be saved."), + error); g_error_free (error); g_free (filename); gnome_vfs_uri_unref (target_uri); @@ -5051,9 +5083,9 @@ ev_attachment_popup_cmd_open_attachment (GtkAction *action, EvWindow *window) ev_attachment_open (attachment, &error); if (error) { - ev_window_error_dialog (GTK_WINDOW (window), - _("Unable to open attachment"), - error); + ev_window_error_message (GTK_WINDOW (window), + _("Unable to open attachment"), + error); g_error_free (error); } } @@ -5104,9 +5136,9 @@ attachment_save_dialog_response_cb (GtkWidget *fc, ev_attachment_save (attachment, filename, &error); if (error) { - ev_window_error_dialog (GTK_WINDOW (ev_window), - _("The attachment could not be saved."), - error); + ev_window_error_message (GTK_WINDOW (ev_window), + _("The attachment could not be saved."), + error); g_error_free (error); g_free (filename); @@ -5338,14 +5370,19 @@ ev_window_init (EvWindow *ev_window) ev_sidebar_add_page (EV_SIDEBAR (ev_window->priv->sidebar), sidebar_widget); + ev_window->priv->view_box = gtk_vbox_new (FALSE, 0); ev_window->priv->scrolled_window = GTK_WIDGET (g_object_new (GTK_TYPE_SCROLLED_WINDOW, "shadow-type", GTK_SHADOW_IN, NULL)); + gtk_box_pack_start (GTK_BOX (ev_window->priv->view_box), + ev_window->priv->scrolled_window, + TRUE, TRUE, 0); gtk_widget_show (ev_window->priv->scrolled_window); gtk_paned_add2 (GTK_PANED (ev_window->priv->hpaned), - ev_window->priv->scrolled_window); + ev_window->priv->view_box); + gtk_widget_show (ev_window->priv->view_box); ev_window->priv->view = ev_view_new (); ev_view_set_screen_dpi (EV_VIEW (ev_window->priv->view), |