X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;ds=sidebyside;f=shell%2Fev-sidebar-links.c;h=69856084a653328dd0262ae68850a9b39fe50ce1;hb=d4139205b010ed06310d14284e63114e88ec6de2;hp=46394019f47a248874b097cf9f70c3d4eb181851;hpb=19eb9bd4a84d54e7af3eaf8c8f58037bf5437a97;p=evince.git diff --git a/shell/ev-sidebar-links.c b/shell/ev-sidebar-links.c index 46394019..69856084 100644 --- a/shell/ev-sidebar-links.c +++ b/shell/ev-sidebar-links.c @@ -17,7 +17,7 @@ * * 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. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #ifdef HAVE_CONFIG_H @@ -25,15 +25,15 @@ #endif #include + #include #include -#include "ev-sidebar-page.h" -#include "ev-sidebar-links.h" -#include "ev-job-queue.h" #include "ev-document-links.h" +#include "ev-job-scheduler.h" +#include "ev-sidebar-links.h" +#include "ev-sidebar-page.h" #include "ev-window.h" -#include "ev-gui.h" struct _EvSidebarLinksPrivate { GtkWidget *tree_view; @@ -46,7 +46,7 @@ struct _EvSidebarLinksPrivate { EvJob *job; GtkTreeModel *model; EvDocument *document; - EvPageCache *page_cache; + EvDocumentModel *doc_model; }; enum { @@ -60,23 +60,20 @@ enum { N_SIGNALS }; -static void links_page_num_func (GtkTreeViewColumn *tree_column, - GtkCellRenderer *cell, - GtkTreeModel *tree_model, - GtkTreeIter *iter, - EvSidebarLinks *sidebar_links); -static void update_page_callback (EvPageCache *page_cache, - gint current_page, - EvSidebarLinks *sidebar_links); +static void update_page_callback (EvSidebarLinks *sidebar_links, + gint old_page, + gint current_page); static void row_activated_callback (GtkTreeView *treeview, GtkTreePath *arg1, GtkTreeViewColumn *arg2, gpointer user_data); +static void ev_sidebar_links_set_links_model (EvSidebarLinks *links, + GtkTreeModel *model); 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_set_document (EvSidebarPage *sidebar_page, - EvDocument *document); +static void ev_sidebar_links_set_current_page (EvSidebarLinks *sidebar_links, + gint current_page); +static void ev_sidebar_links_page_iface_init (EvSidebarPageInterface *iface); static gboolean ev_sidebar_links_support_document (EvSidebarPage *sidebar_page, EvDocument *document); static const gchar* ev_sidebar_links_get_label (EvSidebarPage *sidebar_page); @@ -100,18 +97,12 @@ ev_sidebar_links_set_property (GObject *object, const GValue *value, GParamSpec *pspec) { - EvSidebarLinks *ev_sidebar_links; - GtkTreeModel *model; - - ev_sidebar_links = EV_SIDEBAR_LINKS (object); + EvSidebarLinks *ev_sidebar_links = EV_SIDEBAR_LINKS (object); switch (prop_id) { case PROP_MODEL: - model = ev_sidebar_links->priv->model; - ev_sidebar_links->priv->model = GTK_TREE_MODEL (g_value_dup_object (value)); - if (model) - g_object_unref (model); + ev_sidebar_links_set_links_model (ev_sidebar_links, g_value_get_object (value)); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); @@ -151,7 +142,7 @@ ev_sidebar_links_dispose (GObject *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); + ev_job_cancel (sidebar->priv->job); g_object_unref (sidebar->priv->job); sidebar->priv->job = NULL; } @@ -164,24 +155,42 @@ ev_sidebar_links_dispose (GObject *object) if (sidebar->priv->document) { g_object_unref (sidebar->priv->document); sidebar->priv->document = NULL; - sidebar->priv->page_cache = NULL; + sidebar->priv->doc_model = NULL; } - G_OBJECT_CLASS (ev_sidebar_links_parent_class)->dispose (object); } +static void +ev_sidebar_links_map (GtkWidget *widget) +{ + EvSidebarLinks *links; + + links = EV_SIDEBAR_LINKS (widget); + + GTK_WIDGET_CLASS (ev_sidebar_links_parent_class)->map (widget); + + if (links->priv->model) { + ev_sidebar_links_set_current_page (links, + ev_document_model_get_page (links->priv->doc_model)); + } +} + static void ev_sidebar_links_class_init (EvSidebarLinksClass *ev_sidebar_links_class) { - GObjectClass *g_object_class; + GObjectClass *g_object_class; + GtkWidgetClass *widget_class; g_object_class = G_OBJECT_CLASS (ev_sidebar_links_class); + widget_class = GTK_WIDGET_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; g_object_class->dispose = ev_sidebar_links_dispose; + widget_class->map = ev_sidebar_links_map; + signals[LINK_ACTIVATED] = g_signal_new ("link-activated", G_TYPE_FROM_CLASS (g_object_class), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, @@ -212,8 +221,6 @@ selection_changed_callback (GtkTreeSelection *selection, GtkTreeModel *model; GtkTreeIter iter; - g_return_if_fail (EV_IS_SIDEBAR_LINKS (ev_sidebar_links)); - document = EV_DOCUMENT (ev_sidebar_links->priv->document); g_return_if_fail (ev_sidebar_links->priv->document != NULL); @@ -227,10 +234,10 @@ selection_changed_callback (GtkTreeSelection *selection, if (link == NULL) return; - g_signal_handler_block (ev_sidebar_links->priv->page_cache, + g_signal_handler_block (ev_sidebar_links->priv->doc_model, ev_sidebar_links->priv->page_changed_id); g_signal_emit (ev_sidebar_links, signals[LINK_ACTIVATED], 0, link); - g_signal_handler_unblock (ev_sidebar_links->priv->page_cache, + g_signal_handler_unblock (ev_sidebar_links->priv->doc_model, ev_sidebar_links->priv->page_changed_id); g_object_unref (link); @@ -248,10 +255,11 @@ create_loading_model (void) retval = (GtkTreeModel *)gtk_list_store_new (EV_DOCUMENT_LINKS_COLUMN_NUM_COLUMNS, G_TYPE_STRING, G_TYPE_OBJECT, - G_TYPE_BOOLEAN); + G_TYPE_BOOLEAN, + G_TYPE_STRING); gtk_list_store_append (GTK_LIST_STORE (retval), &iter); - markup = g_strdup_printf ("%s", _("Loading...")); + 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, @@ -262,27 +270,6 @@ create_loading_model (void) return retval; } -static gint -get_page_from_link (EvLink *link) -{ - EvLinkAction *action; - EvLinkDest *dest; - - action = ev_link_get_action (link); - if (!action) - return -1; - - if (ev_link_action_get_action_type (action) != - EV_LINK_ACTION_TYPE_GOTO_DEST) - return -1; - - dest = ev_link_action_get_dest (action); - if (dest) - return ev_link_dest_get_page (dest); - - return -1; -} - static void print_section_cb (GtkWidget *menuitem, EvSidebarLinks *sidebar) { @@ -297,6 +284,7 @@ print_section_cb (GtkWidget *menuitem, EvSidebarLinks *sidebar) if (gtk_tree_selection_get_selected (selection, &model, &iter)) { EvLink *link; int first_page, last_page = -1; + EvDocumentLinks *document_links; gtk_tree_model_get (model, &iter, EV_DOCUMENT_LINKS_COLUMN_LINK, &link, @@ -305,7 +293,9 @@ print_section_cb (GtkWidget *menuitem, EvSidebarLinks *sidebar) if (!link) return; - first_page = get_page_from_link (link); + document_links = EV_DOCUMENT_LINKS (sidebar->priv->document); + + first_page = ev_document_links_get_link_page (document_links, link); if (first_page == -1) { g_object_unref (link); return; @@ -320,22 +310,19 @@ print_section_cb (GtkWidget *menuitem, EvSidebarLinks *sidebar) -1); if (link) { - last_page = get_page_from_link (link); + last_page = ev_document_links_get_link_page (document_links, link);; g_object_unref (link); } } else { - last_page = ev_page_cache_get_n_pages (sidebar->priv->page_cache); + last_page = ev_document_get_n_pages (sidebar->priv->document); } if (last_page == -1) - last_page = ev_page_cache_get_n_pages (sidebar->priv->page_cache); + last_page = ev_document_get_n_pages (sidebar->priv->document); window = gtk_widget_get_toplevel (GTK_WIDGET (sidebar)); if (EV_IS_WINDOW (window)) { -#ifdef WITH_PRINT - ev_window_print_range (EV_WINDOW (window), - first_page, last_page); -#endif + ev_window_print_range (EV_WINDOW (window), first_page, last_page); } } } @@ -348,7 +335,7 @@ build_popup_menu (EvSidebarLinks *sidebar) 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_label_set_label (GTK_LABEL (gtk_bin_get_child (GTK_BIN (item))), _("Print…")); gtk_widget_show (item); gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); g_signal_connect (item, "activate", @@ -420,7 +407,7 @@ ev_sidebar_links_construct (EvSidebarLinks *ev_sidebar_links) loading_model = create_loading_model (); priv->tree_view = gtk_tree_view_new_with_model (loading_model); g_object_unref (loading_model); - + selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->tree_view)); gtk_tree_selection_set_mode (selection, GTK_SELECTION_NONE); gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (priv->tree_view), FALSE); @@ -445,15 +432,16 @@ ev_sidebar_links_construct (EvSidebarLinks *ev_sidebar_links) renderer = gtk_cell_renderer_text_new (); gtk_tree_view_column_pack_end (GTK_TREE_VIEW_COLUMN (column), renderer, FALSE); - gtk_tree_view_column_set_cell_data_func (GTK_TREE_VIEW_COLUMN (column), renderer, - (GtkTreeCellDataFunc) links_page_num_func, - ev_sidebar_links, NULL); + gtk_tree_view_column_set_attributes (GTK_TREE_VIEW_COLUMN (column), renderer, + "text", EV_DOCUMENT_LINKS_COLUMN_PAGE_LABEL, + NULL); + g_object_set (G_OBJECT (renderer), "style", PANGO_STYLE_ITALIC, NULL); - g_signal_connect (GTK_TREE_VIEW (priv->tree_view), + g_signal_connect (priv->tree_view, "button_press_event", G_CALLBACK (button_press_cb), ev_sidebar_links); - g_signal_connect (GTK_TREE_VIEW (priv->tree_view), + g_signal_connect (priv->tree_view, "popup_menu", G_CALLBACK (popup_menu_cb), ev_sidebar_links); @@ -467,53 +455,6 @@ ev_sidebar_links_init (EvSidebarLinks *ev_sidebar_links) ev_sidebar_links_construct (ev_sidebar_links); } -static void -links_page_num_func (GtkTreeViewColumn *tree_column, - GtkCellRenderer *cell, - GtkTreeModel *tree_model, - GtkTreeIter *iter, - EvSidebarLinks *sidebar_links) -{ - EvLink *link; - gint page; - - gtk_tree_model_get (tree_model, iter, - EV_DOCUMENT_LINKS_COLUMN_LINK, &link, - -1); - - if (!link) { - g_object_set (cell, - "visible", FALSE, - NULL); - return; - } - - page = get_page_from_link (link); - - if (page >= 0) { - gchar *page_label; - gchar *page_string; - - page_label = ev_page_cache_get_page_label (sidebar_links->priv->page_cache, - page); - page_string = g_markup_printf_escaped ("%s", page_label); - - g_object_set (cell, - "markup", page_string, - "visible", TRUE, - NULL); - - g_free (page_label); - g_free (page_string); - } else { - g_object_set (cell, - "visible", FALSE, - NULL); - } - - g_object_unref (link); -} - /* Public Functions */ GtkWidget * @@ -542,19 +483,18 @@ update_page_callback_foreach (GtkTreeModel *model, if (link) { int current_page; int dest_page; + EvDocumentLinks *document_links = EV_DOCUMENT_LINKS (sidebar_links->priv->document); - dest_page = get_page_from_link (link); + dest_page = ev_document_links_get_link_page (document_links, link); g_object_unref (link); - current_page = ev_page_cache_get_current_page (sidebar_links->priv->page_cache); + current_page = ev_document_model_get_page (sidebar_links->priv->doc_model); if (dest_page == current_page) { - GtkTreeSelection *selection; - - selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (sidebar_links->priv->tree_view)); gtk_tree_view_expand_to_path (GTK_TREE_VIEW (sidebar_links->priv->tree_view), path); - gtk_tree_selection_select_path (selection, path); + gtk_tree_view_set_cursor (GTK_TREE_VIEW (sidebar_links->priv->tree_view), + path, NULL, FALSE); return TRUE; } @@ -564,14 +504,17 @@ update_page_callback_foreach (GtkTreeModel *model, } static void -update_page_callback (EvPageCache *page_cache, - gint current_page, - EvSidebarLinks *sidebar_links) +ev_sidebar_links_set_current_page (EvSidebarLinks *sidebar_links, + gint current_page) { GtkTreeSelection *selection; GtkTreeModel *model; GtkTreeIter iter; + /* Widget is not currently visible */ + if (!gtk_widget_get_mapped (GTK_WIDGET (sidebar_links))) + return; + selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (sidebar_links->priv->tree_view)); if (gtk_tree_selection_get_selected (selection, &model, &iter)) { @@ -581,13 +524,12 @@ update_page_callback (EvPageCache *page_cache, EV_DOCUMENT_LINKS_COLUMN_LINK, &link, -1); if (link) { - gint current_page; gint dest_page; + EvDocumentLinks *document_links = EV_DOCUMENT_LINKS (sidebar_links->priv->document); - dest_page = get_page_from_link (link); + dest_page = ev_document_links_get_link_page (document_links, link); g_object_unref (link); - current_page = ev_page_cache_get_current_page (sidebar_links->priv->page_cache); if (dest_page == current_page) return; } @@ -605,24 +547,29 @@ update_page_callback (EvPageCache *page_cache, update_page_callback_foreach, sidebar_links); - g_signal_handler_unblock (selection, sidebar_links->priv->selection_id); g_signal_handler_unblock (sidebar_links->priv->tree_view, sidebar_links->priv->row_activated_id); } +static void +update_page_callback (EvSidebarLinks *sidebar_links, + gint old_page, + gint new_page) +{ + ev_sidebar_links_set_current_page (sidebar_links, new_page); +} + static void -row_activated_callback (GtkTreeView *treeview, - GtkTreePath *arg1, - GtkTreeViewColumn *arg2, - gpointer user_data) -{ +row_activated_callback (GtkTreeView *treeview, + GtkTreePath *arg1, + GtkTreeViewColumn *arg2, + gpointer user_data) +{ if (gtk_tree_view_row_expanded (GTK_TREE_VIEW (treeview), arg1)) { - gtk_tree_view_collapse_row (GTK_TREE_VIEW (treeview), arg1); + gtk_tree_view_collapse_row (GTK_TREE_VIEW (treeview), arg1); } else { - gtk_tree_view_expand_row (GTK_TREE_VIEW (treeview), arg1, FALSE); + gtk_tree_view_expand_row (GTK_TREE_VIEW (treeview), arg1, FALSE); } - - return; } static void @@ -638,7 +585,7 @@ expand_open_links (GtkTreeView *tree_view, GtkTreeModel *model, GtkTreeIter *par -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); @@ -648,18 +595,31 @@ expand_open_links (GtkTreeView *tree_view, GtkTreeModel *model, GtkTreeIter *par } while (gtk_tree_model_iter_next (model, &iter)); } } - + +static void +ev_sidebar_links_set_links_model (EvSidebarLinks *sidebar_links, + GtkTreeModel *model) +{ + EvSidebarLinksPrivate *priv = sidebar_links->priv; + + if (priv->model == model) + return; + + if (priv->model) + g_object_unref (priv->model); + priv->model = g_object_ref (model); + + g_object_notify (G_OBJECT (sidebar_links), "model"); +} + static void job_finished_callback (EvJobLinks *job, EvSidebarLinks *sidebar_links) { - EvSidebarLinksPrivate *priv; + EvSidebarLinksPrivate *priv = sidebar_links->priv; GtkTreeSelection *selection; - priv = sidebar_links->priv; - - priv->model = job->model; - g_object_notify (G_OBJECT (sidebar_links), "model"); + ev_sidebar_links_set_links_model (sidebar_links, job->model); gtk_tree_view_set_model (GTK_TREE_VIEW (priv->tree_view), job->model); @@ -670,33 +630,41 @@ job_finished_callback (EvJobLinks *job, 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", - G_CALLBACK (selection_changed_callback), - sidebar_links); - priv->page_changed_id = g_signal_connect (priv->page_cache, "page-changed", - G_CALLBACK (update_page_callback), - sidebar_links); - priv->row_activated_id = g_signal_connect (G_OBJECT (priv->tree_view), "row-activated", - G_CALLBACK (row_activated_callback), sidebar_links); - update_page_callback (priv->page_cache, - ev_page_cache_get_current_page (priv->page_cache), - sidebar_links); + + if (priv->selection_id <= 0) { + priv->selection_id = + g_signal_connect (selection, "changed", + G_CALLBACK (selection_changed_callback), + sidebar_links); + } + priv->page_changed_id = + g_signal_connect_swapped (priv->doc_model, "page-changed", + G_CALLBACK (update_page_callback), + sidebar_links); + if (priv->row_activated_id <= 0) { + priv->row_activated_id = + g_signal_connect (priv->tree_view, "row-activated", + G_CALLBACK (row_activated_callback), + sidebar_links); + } + ev_sidebar_links_set_current_page (sidebar_links, + ev_document_model_get_page (priv->doc_model)); } static void -ev_sidebar_links_set_document (EvSidebarPage *sidebar_page, - EvDocument *document) +ev_sidebar_links_document_changed_cb (EvDocumentModel *model, + GParamSpec *pspec, + EvSidebarLinks *sidebar_links) { - EvSidebarLinks *sidebar_links; - EvSidebarLinksPrivate *priv; + EvDocument *document = ev_document_model_get_document (model); + EvSidebarLinksPrivate *priv = sidebar_links->priv; - g_return_if_fail (EV_IS_SIDEBAR_PAGE (sidebar_page)); - g_return_if_fail (EV_IS_DOCUMENT (document)); - - sidebar_links = EV_SIDEBAR_LINKS (sidebar_page); + if (!EV_IS_DOCUMENT_LINKS (document)) + return; - priv = sidebar_links->priv; + if (!ev_document_links_has_document_links (EV_DOCUMENT_LINKS (document))) + return; if (priv->document) { gtk_tree_view_set_model (GTK_TREE_VIEW (priv->tree_view), NULL); @@ -704,7 +672,6 @@ ev_sidebar_links_set_document (EvSidebarPage *sidebar_page, } 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, @@ -719,7 +686,23 @@ ev_sidebar_links_set_document (EvSidebarPage *sidebar_page, G_CALLBACK (job_finished_callback), sidebar_links); /* The priority doesn't matter for this job */ - ev_job_queue_add_job (priv->job, EV_JOB_PRIORITY_LOW); + ev_job_scheduler_push_job (priv->job, EV_JOB_PRIORITY_NONE); +} + +static void +ev_sidebar_links_set_model (EvSidebarPage *sidebar_page, + EvDocumentModel *model) +{ + EvSidebarLinks *sidebar_links = EV_SIDEBAR_LINKS (sidebar_page); + EvSidebarLinksPrivate *priv = sidebar_links->priv; + + if (priv->doc_model == model) + return; + + priv->doc_model = model; + g_signal_connect (model, "notify::document", + G_CALLBACK (ev_sidebar_links_document_changed_cb), + sidebar_page); } static gboolean @@ -737,10 +720,10 @@ ev_sidebar_links_get_label (EvSidebarPage *sidebar_page) } static void -ev_sidebar_links_page_iface_init (EvSidebarPageIface *iface) +ev_sidebar_links_page_iface_init (EvSidebarPageInterface *iface) { iface->support_document = ev_sidebar_links_support_document; - iface->set_document = ev_sidebar_links_set_document; + iface->set_model = ev_sidebar_links_set_model; iface->get_label = ev_sidebar_links_get_label; }