From 8228ff475e7dced57dbaa9550255534d0c275767 Mon Sep 17 00:00:00 2001 From: Nickolay V. Shmyrev Date: Sun, 19 Nov 2006 00:51:27 +0000 Subject: Preliminary history implementation 2006-11-19 Nickolay V. Shmyrev * data/evince-toolbar.xml: * po/POTFILES.in: * shell/Makefile.am: * shell/ev-navigation-action-widget.c: (ev_navigation_action_widget_init), (ev_navigation_action_widget_class_init), (menu_deactivate_cb), (menu_detacher), (ev_navigation_action_widget_set_menu), (menu_position_func), (popup_menu_under_arrow), (ev_navigation_action_widget_toggled), (ev_navigation_action_widget_button_press_event): * shell/ev-navigation-action-widget.h: * shell/ev-navigation-action.c: (ev_navigation_action_set_history), (ev_navigation_action_set_window), (activate_menu_item_cb), (new_history_menu_item), (new_empty_history_menu_item), (build_menu), (menu_activated_cb), (connect_proxy), (create_tool_item), (ev_navigation_action_init), (ev_navigation_action_finalize), (ev_navigation_action_class_init): * shell/ev-navigation-action.h: * shell/ev-page-action-widget.c: (ev_page_action_widget_init), (ev_page_action_widget_set_page_cache), (ev_page_action_widget_finalize), (ev_page_action_widget_class_init), (match_selected_cb), (display_completion_text), (match_completion), (build_new_tree_cb), (get_filter_model_from_model), (ev_page_action_widget_update_model): * shell/ev-page-action-widget.h: * shell/ev-page-action.c: (activate_link_cb), (update_model), (connect_proxy): * shell/ev-page-action.h: * shell/ev-stock-icons.c: * shell/ev-stock-icons.h: * shell/ev-window.c: (ev_window_setup_action_sensitivity), (page_changed_cb), (ev_window_setup_document), (ev_window_dispose), (register_custom_actions): * shell/main.c: Preliminary history implementation --- (limited to 'shell/ev-page-action.c') diff --git a/shell/ev-page-action.c b/shell/ev-page-action.c index 97abd1a..52c74f5 100644 --- a/shell/ev-page-action.c +++ b/shell/ev-page-action.c @@ -16,7 +16,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id$ */ #include "config.h" @@ -25,6 +24,7 @@ #include "ev-page-cache.h" #include "ev-window.h" #include "ev-document-links.h" +#include "ev-page-action-widget.h" #include "ev-marshal.h" #include @@ -34,28 +34,6 @@ #include #include -typedef struct _EvPageActionWidget EvPageActionWidget; -typedef struct _EvPageActionWidgetClass EvPageActionWidgetClass; -struct _EvPageActionWidget -{ - GtkToolItem parent; - - GtkWidget *entry; - GtkWidget *label; - EvPageCache *page_cache; - guint signal_id; - GtkTreeModel *filter_model; - GtkTreeModel *model; -}; - -struct _EvPageActionWidgetClass -{ - GtkToolItemClass parent_class; - - void (* activate_link) (EvPageActionWidget *page_action, - EvLink *link); -}; - struct _EvPageActionPrivate { EvPageCache *page_cache; @@ -63,73 +41,6 @@ struct _EvPageActionPrivate }; -/* Widget we pass back */ -static GType ev_page_action_widget_get_type (void); -static void ev_page_action_widget_init (EvPageActionWidget *action_widget); -static void ev_page_action_widget_class_init (EvPageActionWidgetClass *action_widget); - -#define EV_TYPE_PAGE_ACTION_WIDGET (ev_page_action_widget_get_type ()) -#define EV_PAGE_ACTION_WIDGET(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EV_TYPE_PAGE_ACTION_WIDGET, EvPageActionWidget)) - -enum -{ - WIDGET_ACTIVATE_LINK, - WIDGET_N_SIGNALS -}; - -static guint widget_signals[WIDGET_N_SIGNALS] = {0, }; - -G_DEFINE_TYPE (EvPageActionWidget, ev_page_action_widget, GTK_TYPE_TOOL_ITEM) - -static void -ev_page_action_widget_init (EvPageActionWidget *action_widget) -{ - -} - -static void -ev_page_action_widget_set_page_cache (EvPageActionWidget *action_widget, - EvPageCache *page_cache) -{ - if (action_widget->page_cache != NULL) { - g_object_remove_weak_pointer (G_OBJECT (action_widget->page_cache), - (gpointer *)&action_widget->page_cache); - action_widget->page_cache = NULL; - } - - if (page_cache != NULL) { - action_widget->page_cache = page_cache; - g_object_add_weak_pointer (G_OBJECT (page_cache), - (gpointer *)&action_widget->page_cache); - } -} - -static void -ev_page_action_widget_finalize (GObject *object) -{ - EvPageActionWidget *action_widget = EV_PAGE_ACTION_WIDGET (object); - - ev_page_action_widget_set_page_cache (action_widget, NULL); -} - -static void -ev_page_action_widget_class_init (EvPageActionWidgetClass *class) -{ - GObjectClass *object_class = G_OBJECT_CLASS (class); - - object_class->finalize = ev_page_action_widget_finalize; - - widget_signals[WIDGET_ACTIVATE_LINK] = g_signal_new ("activate_link", - G_OBJECT_CLASS_TYPE (object_class), - G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, - G_STRUCT_OFFSET (EvPageActionClass, activate_link), - NULL, NULL, - g_cclosure_marshal_VOID__OBJECT, - G_TYPE_NONE, 1, - G_TYPE_OBJECT); - -} - static void ev_page_action_init (EvPageAction *action); static void ev_page_action_class_init (EvPageActionClass *class); @@ -152,9 +63,6 @@ enum { PROP_MODEL, }; -/* user data to set on the widget. */ -#define EPA_FILTER_MODEL_DATA "epa-filter-model" - static void update_pages_label (EvPageActionWidget *proxy, gint page, @@ -285,222 +193,22 @@ update_page_cache (EvPageAction *page, GParamSpec *pspec, EvPageActionWidget *pr proxy->signal_id = signal_id; } -static gboolean -build_new_tree_cb (GtkTreeModel *model, - GtkTreePath *path, - GtkTreeIter *iter, - gpointer data) -{ - GtkTreeModel *filter_model = GTK_TREE_MODEL (data); - EvLink *link; - EvLinkAction *action; - EvLinkActionType type; - - gtk_tree_model_get (model, iter, - EV_DOCUMENT_LINKS_COLUMN_LINK, &link, - -1); - - if (!link) - return FALSE; - - action = ev_link_get_action (link); - if (!action) { - g_object_unref (link); - return FALSE; - } - - type = ev_link_action_get_action_type (action); - - if (type == EV_LINK_ACTION_TYPE_GOTO_DEST) { - GtkTreeIter filter_iter; - - gtk_list_store_append (GTK_LIST_STORE (filter_model), &filter_iter); - gtk_list_store_set (GTK_LIST_STORE (filter_model), &filter_iter, - 0, iter, - -1); - } - - g_object_unref (link); - - return FALSE; -} - -static GtkTreeModel * -get_filter_model_from_model (GtkTreeModel *model) -{ - GtkTreeModel *filter_model; - - filter_model = - (GtkTreeModel *) g_object_get_data (G_OBJECT (model), EPA_FILTER_MODEL_DATA); - if (filter_model == NULL) { - filter_model = (GtkTreeModel *) gtk_list_store_new (1, GTK_TYPE_TREE_ITER); - - gtk_tree_model_foreach (model, - build_new_tree_cb, - filter_model); - g_object_set_data_full (G_OBJECT (model), EPA_FILTER_MODEL_DATA, filter_model, g_object_unref); - } - - return filter_model; -} - -static gboolean -match_selected_cb (GtkEntryCompletion *completion, - GtkTreeModel *filter_model, - GtkTreeIter *filter_iter, - EvPageActionWidget *proxy) -{ - EvLink *link; - GtkTreeIter *iter; - - gtk_tree_model_get (filter_model, filter_iter, - 0, &iter, - -1); - gtk_tree_model_get (proxy->model, iter, - EV_DOCUMENT_LINKS_COLUMN_LINK, &link, - -1); - - g_signal_emit (proxy, widget_signals[WIDGET_ACTIVATE_LINK], 0, link); - - if (link) - g_object_unref (link); - - gtk_tree_iter_free (iter); - - return TRUE; -} - - static void -display_completion_text (GtkCellLayout *cell_layout, - GtkCellRenderer *renderer, - GtkTreeModel *filter_model, - GtkTreeIter *filter_iter, - EvPageActionWidget *proxy) -{ - EvLink *link; - GtkTreeIter *iter; - - gtk_tree_model_get (filter_model, filter_iter, - 0, &iter, - -1); - gtk_tree_model_get (proxy->model, iter, - EV_DOCUMENT_LINKS_COLUMN_LINK, &link, - -1); - - g_object_set (renderer, "text", ev_link_get_title (link), NULL); - - if (link) - g_object_unref (link); - - gtk_tree_iter_free (iter); -} - -static gboolean -match_completion (GtkEntryCompletion *completion, - const gchar *key, - GtkTreeIter *filter_iter, - EvPageActionWidget *proxy) +activate_link_cb (EvPageActionWidget *proxy, EvLink *link, EvPageAction *action) { - EvLink *link; - GtkTreeIter *iter; - const gchar *text = NULL; - - gtk_tree_model_get (gtk_entry_completion_get_model (completion), - filter_iter, - 0, &iter, - -1); - gtk_tree_model_get (proxy->model, iter, - EV_DOCUMENT_LINKS_COLUMN_LINK, &link, - -1); - - - if (link) { - text = ev_link_get_title (link); - g_object_unref (link); - } - - gtk_tree_iter_free (iter); - - if (text && key) { - gchar *normalized_text; - gchar *normalized_key; - gchar *case_normalized_text; - gchar *case_normalized_key; - gboolean retval = FALSE; - - normalized_text = g_utf8_normalize (text, -1, G_NORMALIZE_ALL); - normalized_key = g_utf8_normalize (key, -1, G_NORMALIZE_ALL); - case_normalized_text = g_utf8_casefold (normalized_text, -1); - case_normalized_key = g_utf8_casefold (normalized_key, -1); - - if (strstr (case_normalized_text, case_normalized_key)) - retval = TRUE; - - g_free (normalized_text); - g_free (normalized_key); - g_free (case_normalized_text); - g_free (case_normalized_key); - - return retval; - } - - return FALSE; + g_signal_emit (action, signals[ACTIVATE_LINK], 0, link); } - static void update_model (EvPageAction *page, GParamSpec *pspec, EvPageActionWidget *proxy) -{ +{ GtkTreeModel *model; - GtkTreeModel *filter_model; g_object_get (G_OBJECT (page), "model", &model, NULL); - if (model != NULL) { - /* Magik */ - GtkEntryCompletion *completion; - GtkCellRenderer *renderer; - - proxy->model = model; - filter_model = get_filter_model_from_model (model); - - completion = gtk_entry_completion_new (); - - /* popup-set-width is 2.7.0 only */ - g_object_set (G_OBJECT (completion), - "popup-set-width", FALSE, - "model", filter_model, - NULL); - - g_signal_connect (completion, "match-selected", G_CALLBACK (match_selected_cb), proxy); - gtk_entry_completion_set_match_func (completion, - (GtkEntryCompletionMatchFunc) match_completion, - proxy, NULL); - - /* Set up the layout */ - renderer = (GtkCellRenderer *) - g_object_new (GTK_TYPE_CELL_RENDERER_TEXT, - "ellipsize", PANGO_ELLIPSIZE_END, - "width_chars", 30, - NULL); - gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (completion), renderer, TRUE); - gtk_cell_layout_set_cell_data_func (GTK_CELL_LAYOUT (completion), - renderer, - (GtkCellLayoutDataFunc) display_completion_text, - proxy, NULL); - gtk_entry_set_completion (GTK_ENTRY (proxy->entry), completion); - - g_object_unref (completion); - g_object_unref (model); - } -} -static void -activate_link_cb (EvPageActionWidget *proxy, EvLink *link, EvPageAction *action) -{ - g_signal_emit (action, signals[ACTIVATE_LINK], 0, link); + ev_page_action_widget_update_model (proxy, model); } static void @@ -515,14 +223,9 @@ connect_proxy (GtkAction *action, GtkWidget *proxy) action); update_page_cache (EV_PAGE_ACTION (action), NULL, EV_PAGE_ACTION_WIDGET (proxy)); - /* We only go through this whole rigmarole if we can set - * GtkEntryCompletion::popup-set-width, which appeared in - * GTK+-2.7.0 */ - if (gtk_check_version (2, 7, 0) == NULL) { - g_signal_connect_object (action, "notify::model", - G_CALLBACK (update_model), - proxy, 0); - } + g_signal_connect_object (action, "notify::model", + G_CALLBACK (update_model), + proxy, 0); } GTK_ACTION_CLASS (ev_page_action_parent_class)->connect_proxy (action, proxy); -- cgit v0.9.1