X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=shell%2Fev-sidebar-links.c;h=58dac08ca9f835ed39c9688dc128c00bf8a3f80d;hb=848665b157185945d190a7a746d054d7f5d5e6e0;hp=93959b37ab60444963ff94fd7520b7aabb50b7a3;hpb=3159bda019e6ee334bfd11af45bd8ada0a871f33;p=evince.git diff --git a/shell/ev-sidebar-links.c b/shell/ev-sidebar-links.c index 93959b37..58dac08c 100644 --- a/shell/ev-sidebar-links.c +++ b/shell/ev-sidebar-links.c @@ -33,6 +33,7 @@ #include "ev-job-queue.h" #include "ev-document-links.h" #include "ev-window.h" +#include "ev-gui.h" struct _EvSidebarLinksPrivate { GtkWidget *tree_view; @@ -51,6 +52,7 @@ struct _EvSidebarLinksPrivate { enum { PROP_0, PROP_MODEL, + PROP_WIDGET, }; @@ -66,8 +68,9 @@ static void row_activated_callback (GtkTreeView *treeview, GtkTreePath *arg1, GtkTreeViewColumn *arg2, gpointer user_data); +static void job_finished_callback (EvJobLinks *job, + EvSidebarLinks *sidebar_links); static void ev_sidebar_links_page_iface_init (EvSidebarPageIface *iface); -static void ev_sidebar_links_clear_document (EvSidebarLinks *sidebar_links); static void ev_sidebar_links_set_document (EvSidebarPage *sidebar_page, EvDocument *document); static gboolean ev_sidebar_links_support_document (EvSidebarPage *sidebar_page, @@ -86,15 +89,6 @@ G_DEFINE_TYPE_EXTENDED (EvSidebarLinks, #define EV_SIDEBAR_LINKS_GET_PRIVATE(object) \ (G_TYPE_INSTANCE_GET_PRIVATE ((object), EV_TYPE_SIDEBAR_LINKS, EvSidebarLinksPrivate)) - -static void -ev_sidebar_links_destroy (GtkObject *object) -{ - EvSidebarLinks *ev_sidebar_links = (EvSidebarLinks *) object; - - ev_sidebar_links_clear_document (ev_sidebar_links); -} - static void ev_sidebar_links_set_property (GObject *object, guint prop_id, @@ -135,26 +129,53 @@ ev_sidebar_links_get_property (GObject *object, case PROP_MODEL: g_value_set_object (value, ev_sidebar_links->priv->model); break; + case PROP_WIDGET: + g_value_set_object (value, ev_sidebar_links->priv->tree_view); + break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; } } +static void +ev_sidebar_links_dispose (GObject *object) +{ + EvSidebarLinks *sidebar = EV_SIDEBAR_LINKS (object); + + if (sidebar->priv->job) { + g_signal_handlers_disconnect_by_func (sidebar->priv->job, + job_finished_callback, sidebar); + ev_job_queue_remove_job (sidebar->priv->job); + g_object_unref (sidebar->priv->job); + sidebar->priv->job = NULL; + } + + if (sidebar->priv->model) { + g_object_unref (sidebar->priv->model); + sidebar->priv->model = NULL; + } + + if (sidebar->priv->document) { + g_object_unref (sidebar->priv->document); + sidebar->priv->document = NULL; + sidebar->priv->page_cache = NULL; + } + + + G_OBJECT_CLASS (ev_sidebar_links_parent_class)->dispose (object); +} static void ev_sidebar_links_class_init (EvSidebarLinksClass *ev_sidebar_links_class) { GObjectClass *g_object_class; - GtkObjectClass *gtk_object_class; g_object_class = G_OBJECT_CLASS (ev_sidebar_links_class); - gtk_object_class = GTK_OBJECT_CLASS (ev_sidebar_links_class); g_object_class->set_property = ev_sidebar_links_set_property; g_object_class->get_property = ev_sidebar_links_get_property; - - gtk_object_class->destroy = ev_sidebar_links_destroy; + g_object_class->dispose = ev_sidebar_links_dispose; g_object_class_install_property (g_object_class, PROP_MODEL, @@ -163,6 +184,9 @@ ev_sidebar_links_class_init (EvSidebarLinksClass *ev_sidebar_links_class) "Current Model", GTK_TYPE_TREE_MODEL, G_PARAM_READWRITE)); + g_object_class_override_property (g_object_class, + PROP_WIDGET, + "main-widget"); g_type_class_add_private (g_object_class, sizeof (EvSidebarLinksPrivate)); } @@ -196,6 +220,8 @@ selection_changed_callback (GtkTreeSelection *selection, ev_page_cache_set_link (ev_sidebar_links->priv->page_cache, link); g_signal_handler_unblock (ev_sidebar_links->priv->page_cache, ev_sidebar_links->priv->page_changed_id); + + g_object_unref (link); } } @@ -209,12 +235,14 @@ create_loading_model (void) /* Creates a fake model to indicate that we're loading */ retval = (GtkTreeModel *)gtk_list_store_new (EV_DOCUMENT_LINKS_COLUMN_NUM_COLUMNS, G_TYPE_STRING, - G_TYPE_OBJECT); + G_TYPE_OBJECT, + G_TYPE_BOOLEAN); gtk_list_store_append (GTK_LIST_STORE (retval), &iter); markup = g_strdup_printf ("%s", _("Loading...")); gtk_list_store_set (GTK_LIST_STORE (retval), &iter, EV_DOCUMENT_LINKS_COLUMN_MARKUP, markup, + EV_DOCUMENT_LINKS_COLUMN_EXPAND, FALSE, EV_DOCUMENT_LINKS_COLUMN_LINK, NULL, -1); g_free (markup); @@ -242,11 +270,17 @@ print_section_cb (GtkWidget *menuitem, EvSidebarLinks *sidebar) -1); first_page = ev_link_get_page (link) + 1; + if (link) + g_object_unref (link); + if (gtk_tree_model_iter_next (model, &iter)) { gtk_tree_model_get (model, &iter, EV_DOCUMENT_LINKS_COLUMN_LINK, &link, -1); last_page = ev_link_get_page (link); + + if (link) + g_object_unref (link); } else { last_page = -1; } @@ -259,6 +293,35 @@ print_section_cb (GtkWidget *menuitem, EvSidebarLinks *sidebar) } } +static GtkMenu * +build_popup_menu (EvSidebarLinks *sidebar) +{ + GtkWidget *menu; + GtkWidget *item; + + menu = gtk_menu_new (); + item = gtk_image_menu_item_new_from_stock (GTK_STOCK_PRINT, NULL); + gtk_label_set_label (GTK_LABEL (GTK_BIN (item)->child), _("Print...")); + gtk_widget_show (item); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); + g_signal_connect (item, "activate", + G_CALLBACK (print_section_cb), sidebar); + + return GTK_MENU (menu); +} + +static void +popup_menu_cb (GtkWidget *treeview, EvSidebarLinks *sidebar) +{ + GtkMenu *menu = build_popup_menu (sidebar); + + gtk_menu_popup (menu, NULL, NULL, + ev_gui_menu_position_tree_selection, + sidebar->priv->tree_view, 0, + gtk_get_current_event_time ()); + gtk_menu_shell_select_first (GTK_MENU_SHELL (menu), FALSE); +} + static gboolean button_press_cb (GtkWidget *treeview, GdkEventButton *event, @@ -272,25 +335,11 @@ button_press_cb (GtkWidget *treeview, event->y, &path, NULL, NULL, NULL)) { - GtkWidget *menu; - GtkWidget *item; - gtk_tree_view_set_cursor (GTK_TREE_VIEW (treeview), path, NULL, FALSE); - - menu = gtk_menu_new (); - item = gtk_image_menu_item_new_from_stock - (GTK_STOCK_PRINT, NULL); - gtk_label_set_label (GTK_LABEL (GTK_BIN (item)->child), - _("Print...")); - gtk_widget_show (item); - gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); - g_signal_connect (item, "activate", - G_CALLBACK (print_section_cb), sidebar); - - gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, NULL, 2, + gtk_menu_popup (build_popup_menu (sidebar), NULL, + NULL, NULL, NULL, event->button, gtk_get_current_event_time ()); - gtk_tree_path_free (path); return TRUE; @@ -357,6 +406,10 @@ ev_sidebar_links_construct (EvSidebarLinks *ev_sidebar_links) "button_press_event", G_CALLBACK (button_press_cb), ev_sidebar_links); + g_signal_connect (GTK_TREE_VIEW (priv->tree_view), + "popup_menu", + G_CALLBACK (popup_menu_cb), + ev_sidebar_links); } static void @@ -400,6 +453,9 @@ links_page_num_func (GtkTreeViewColumn *tree_column, "visible", FALSE, NULL); } + + if (link) + g_object_unref (link); } /* Public Functions */ @@ -414,24 +470,6 @@ ev_sidebar_links_new (void) return ev_sidebar_links; } -static void -ev_sidebar_links_clear_document (EvSidebarLinks *sidebar_links) -{ - EvSidebarLinksPrivate *priv; - - g_return_if_fail (EV_IS_SIDEBAR_LINKS (sidebar_links)); - - priv = sidebar_links->priv; - - if (priv->document) { - g_object_unref (priv->document); - priv->document = NULL; - priv->page_cache = NULL; - } - - gtk_tree_view_set_model (GTK_TREE_VIEW (priv->tree_view), NULL); -} - static gboolean update_page_callback_foreach (GtkTreeModel *model, GtkTreePath *path, @@ -455,10 +493,14 @@ update_page_callback_foreach (GtkTreeModel *model, selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (sidebar_links->priv->tree_view)); gtk_tree_selection_select_path (selection, path); - + + g_object_unref (link); return TRUE; } } + + if (link) + g_object_unref (link); return FALSE; } @@ -503,35 +545,50 @@ row_activated_callback (GtkTreeView *treeview, return; } - + +static void +expand_open_links (GtkTreeView *tree_view, GtkTreeModel *model, GtkTreeIter *parent) +{ + GtkTreeIter iter; + gboolean expand; + + if (gtk_tree_model_iter_children (model, &iter, parent)) { + do { + gtk_tree_model_get (model, &iter, + EV_DOCUMENT_LINKS_COLUMN_EXPAND, &expand, + -1); + if (expand) { + GtkTreePath *path; + + path = gtk_tree_model_get_path (model, &iter); + gtk_tree_view_expand_row (tree_view, path, FALSE); + gtk_tree_path_free (path); + } + + expand_open_links (tree_view, model, &iter); + } while (gtk_tree_model_iter_next (model, &iter)); + } +} + static void job_finished_callback (EvJobLinks *job, EvSidebarLinks *sidebar_links) { EvSidebarLinksPrivate *priv; GtkTreeSelection *selection; - GtkTreeIter iter; - GtkTreePath *path; - gboolean result; priv = sidebar_links->priv; - - priv->model = g_object_ref (job->model); + + priv->model = job->model; g_object_notify (G_OBJECT (sidebar_links), "model"); gtk_tree_view_set_model (GTK_TREE_VIEW (priv->tree_view), job->model); + g_object_unref (job); + priv->job = NULL; + + expand_open_links (GTK_TREE_VIEW (priv->tree_view), priv->model, NULL); - /* Expand one level of the tree */ - path = gtk_tree_path_new_first (); - for (result = gtk_tree_model_get_iter_first (priv->model, &iter); - result; - result = gtk_tree_model_iter_next (priv->model, &iter)) { - gtk_tree_view_expand_row (GTK_TREE_VIEW (priv->tree_view), path, FALSE); - gtk_tree_path_next (path); - } - gtk_tree_path_free (path); - selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->tree_view)); gtk_tree_selection_set_mode (selection, GTK_SELECTION_SINGLE); priv->selection_id = g_signal_connect (selection, "changed", @@ -562,10 +619,20 @@ ev_sidebar_links_set_document (EvSidebarPage *sidebar_page, priv = sidebar_links->priv; - g_object_ref (document); + if (priv->document) { + gtk_tree_view_set_model (GTK_TREE_VIEW (priv->tree_view), NULL); + g_object_unref (priv->document); + } - priv->document = document; - priv->page_cache = ev_document_get_page_cache (document); + priv->document = g_object_ref (document); + priv->page_cache = ev_page_cache_get (document); + + if (priv->job) { + g_signal_handlers_disconnect_by_func (priv->job, + job_finished_callback, + sidebar_links); + g_object_unref (priv->job); + } priv->job = ev_job_links_new (document); g_signal_connect (priv->job, @@ -574,7 +641,6 @@ ev_sidebar_links_set_document (EvSidebarPage *sidebar_page, sidebar_links); /* The priority doesn't matter for this job */ ev_job_queue_add_job (priv->job, EV_JOB_PRIORITY_LOW); - } static gboolean @@ -591,12 +657,6 @@ ev_sidebar_links_get_label (EvSidebarPage *sidebar_page) return _("Index"); } -GtkWidget * -ev_sidebar_links_get_treeview (EvSidebarLinks *sidebar) -{ - return sidebar->priv->tree_view; -} - static void ev_sidebar_links_page_iface_init (EvSidebarPageIface *iface) {