X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;ds=sidebyside;f=shell%2Fev-page-action.c;h=4b559c5d4bba96fa327437b6ce7bdbe8b629cd9f;hb=324e007ce9e3dfd5e1c28fdc90483ca81236b180;hp=9e327077e3a8fefe0789990c4493a18bd2c2f148;hpb=0a2a397faf5fe1fb1ac869b4db10b11ef07d1f3b;p=evince.git diff --git a/shell/ev-page-action.c b/shell/ev-page-action.c index 9e327077..4b559c5d 100644 --- a/shell/ev-page-action.c +++ b/shell/ev-page-action.c @@ -23,202 +23,462 @@ #include "ev-page-action.h" #include "ev-window.h" +#include "ev-document-links.h" #include -#include +#include #include #include #include +#include -struct _EvPageActionPrivate +typedef struct _EvPageActionWidget EvPageActionWidget; +typedef struct _EvPageActionWidgetClass EvPageActionWidgetClass; +struct _EvPageActionWidget { - int current_page; - int total_pages; + GtkToolItem parent; + + GtkWidget *entry; + EvPageCache *page_cache; + guint signal_id; + GtkTreeModel *filter_model; + GtkTreeModel *model; }; -enum +struct _EvPageActionWidgetClass { - PROP_0, - PROP_CURRENT_PAGE, - PROP_TOTAL_PAGES + GtkToolItemClass parent_class; }; -static void ev_page_action_init (EvPageAction *action); -static void ev_page_action_class_init (EvPageActionClass *class); - -enum +struct _EvPageActionPrivate { - GOTO_PAGE_SIGNAL, - LAST_SIGNAL + EvPageCache *page_cache; + GtkTreeModel *model; }; -static guint signals[LAST_SIGNAL] = { 0 }; + +/* 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); + +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_class_init (EvPageActionWidgetClass *action_widget) +{ +} + + + +static void ev_page_action_init (EvPageAction *action); +static void ev_page_action_class_init (EvPageActionClass *class); G_DEFINE_TYPE (EvPageAction, ev_page_action, GTK_TYPE_ACTION) #define EV_PAGE_ACTION_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), EV_TYPE_PAGE_ACTION, EvPageActionPrivate)) +enum { + PROP_0, + PROP_PAGE_CACHE, + PROP_MODEL, +}; + +/* user data to set on the widget. */ +#define EPA_FILTER_MODEL_DATA "epa-filter-model" + +static void +page_changed_cb (EvPageCache *page_cache, + gint page, + EvPageActionWidget *proxy) +{ + g_assert (proxy); + + if (page_cache != NULL) { + gchar *page_label = ev_page_cache_get_page_label (page_cache, page); + gtk_entry_set_text (GTK_ENTRY (proxy->entry), page_label); + gtk_editable_set_position (GTK_EDITABLE (proxy->entry), -1); + g_free (page_label); + } else { + gtk_entry_set_text (GTK_ENTRY (proxy->entry), ""); + } +} + static void -update_label (GtkAction *action, gpointer dummy, GtkWidget *proxy) +activate_cb (GtkWidget *entry, GtkAction *action) { EvPageAction *page = EV_PAGE_ACTION (action); - char *text; - GtkWidget *label; + EvPageCache *page_cache; + const char *text; + + text = gtk_entry_get_text (GTK_ENTRY (entry)); + page_cache = page->priv->page_cache; + + if (! ev_page_cache_set_page_label (page_cache, text)) { + /* rest the entry to the current page if we were unable to + * change it */ + gchar *page_label = + ev_page_cache_get_page_label (page_cache, + ev_page_cache_get_current_page (page_cache)); + gtk_entry_set_text (GTK_ENTRY (entry), page_label); + gtk_editable_set_position (GTK_EDITABLE (entry), -1); + g_free (page_label); + } +} + +static GtkWidget * +create_tool_item (GtkAction *action) +{ + EvPageActionWidget *proxy; + + proxy = g_object_new (ev_page_action_widget_get_type (), NULL); + gtk_container_set_border_width (GTK_CONTAINER (proxy), 6); + gtk_widget_show (GTK_WIDGET (proxy)); + + proxy->entry = gtk_entry_new (); + gtk_entry_set_width_chars (GTK_ENTRY (proxy->entry), 5); + gtk_widget_show (proxy->entry); - label = GTK_WIDGET (g_object_get_data (G_OBJECT (proxy), "label")); + g_signal_connect (proxy->entry, "activate", + G_CALLBACK (activate_cb), + action); + + gtk_container_add (GTK_CONTAINER (proxy), proxy->entry); - text = g_strdup_printf (_("of %d"), page->priv->total_pages); - gtk_label_set_text (GTK_LABEL (label), text); + return GTK_WIDGET (proxy); } static void -update_spin (GtkAction *action, gpointer dummy, GtkWidget *proxy) +update_page_cache (EvPageAction *page, GParamSpec *pspec, EvPageActionWidget *proxy) { - EvPageAction *page = EV_PAGE_ACTION (action); - GtkWidget *spin; - int value; + EvPageCache *page_cache; + guint signal_id; + + page_cache = page->priv->page_cache; + + /* clear the old signal */ + if (proxy->signal_id > 0 && proxy->page_cache) + g_signal_handler_disconnect (proxy->page_cache, proxy->signal_id); + + if (page_cache != NULL) { + signal_id = g_signal_connect (page_cache, + "page-changed", + G_CALLBACK (page_changed_cb), + proxy); + /* Set the initial value */ + page_changed_cb (page_cache, + ev_page_cache_get_current_page (page_cache), + proxy); + } else { + /* Or clear the entry */ + signal_id = 0; + page_changed_cb (NULL, 0, proxy); + } + proxy->page_cache = page_cache; + proxy->signal_id = signal_id; +} - spin = GTK_WIDGET (g_object_get_data (G_OBJECT (proxy), "spin")); +static gboolean +build_new_tree_cb (GtkTreeModel *model, + GtkTreePath *path, + GtkTreeIter *iter, + gpointer data) +{ + GtkTreeModel *filter_model = GTK_TREE_MODEL (data); + EvLink *link; - value = gtk_spin_button_get_value (GTK_SPIN_BUTTON (spin)); + gtk_tree_model_get (model, iter, + EV_DOCUMENT_LINKS_COLUMN_LINK, &link, + -1); - if (value != page->priv->current_page ) - { - gtk_spin_button_set_value (GTK_SPIN_BUTTON (spin), - page->priv->current_page); + if (link && ev_link_get_link_type (link) == EV_LINK_TYPE_PAGE) { + 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); } + + return FALSE; } -static void -value_changed_cb (GtkWidget *spin, GtkAction *action) +static GtkTreeModel * +get_filter_model_from_model (GtkTreeModel *model) { - int value; + 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); - value = gtk_spin_button_get_value (GTK_SPIN_BUTTON (spin)); + 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); + } - g_signal_emit (action, signals[GOTO_PAGE_SIGNAL], 0, value); + return filter_model; } -static void -total_pages_changed_cb (EvPageAction *action, GParamSpec *pspec, - GtkSpinButton *spin) +static gboolean +match_selected_cb (GtkEntryCompletion *completion, + GtkTreeModel *filter_model, + GtkTreeIter *filter_iter, + EvPageActionWidget *proxy) { - gtk_spin_button_set_range (GTK_SPIN_BUTTON (spin), 1, - action->priv->total_pages); + 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); + ev_page_cache_set_link (proxy->page_cache, link); + + return TRUE; } + -static GtkWidget * -create_tool_item (GtkAction *action) +static void +display_completion_text (GtkCellLayout *cell_layout, + GtkCellRenderer *renderer, + GtkTreeModel *filter_model, + GtkTreeIter *filter_iter, + EvPageActionWidget *proxy) { - GtkWidget *hbox, *spin, *item, *label; + EvLink *link; + GtkTreeIter *iter; - hbox = gtk_hbox_new (FALSE, 6); - gtk_container_set_border_width (GTK_CONTAINER (hbox), 6); - gtk_widget_show (hbox); + 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); - item = GTK_WIDGET (gtk_tool_item_new ()); - gtk_widget_show (item); - - spin = gtk_spin_button_new_with_range (1, 9999, 1); - gtk_spin_button_set_digits (GTK_SPIN_BUTTON (spin), 0); - g_object_set_data (G_OBJECT (item), "spin", spin); - gtk_widget_show (spin); + g_object_set (renderer, "text", ev_link_get_title (link), NULL); +} - g_signal_connect (action, "notify::total-pages", - G_CALLBACK (total_pages_changed_cb), - spin); - g_signal_connect (spin, "value_changed", - G_CALLBACK (value_changed_cb), - action); +static gboolean +match_completion (GtkEntryCompletion *completion, + const gchar *key, + GtkTreeIter *filter_iter, + EvPageActionWidget *proxy) +{ + 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); + + 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; + } - label = gtk_label_new (""); - g_object_set_data (G_OBJECT (item), "label", label); - update_label (action, NULL, item); - gtk_widget_show (label); + return FALSE; +} - gtk_box_pack_start (GTK_BOX (hbox), spin, FALSE, FALSE, 0); - gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); - gtk_container_add (GTK_CONTAINER (item), hbox); - return item; +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); + } } static void connect_proxy (GtkAction *action, GtkWidget *proxy) { - if (GTK_IS_TOOL_ITEM (proxy)) - { - g_signal_connect_object (action, "notify::total-pages", - G_CALLBACK (update_label), - proxy, 0); - g_signal_connect_object (action, "notify::current-page", - G_CALLBACK (update_spin), + if (GTK_IS_TOOL_ITEM (proxy)) { + g_signal_connect_object (action, "notify::page-cache", + G_CALLBACK (update_page_cache), proxy, 0); + /* 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); + } } GTK_ACTION_CLASS (ev_page_action_parent_class)->connect_proxy (action, proxy); } static void -ev_page_action_init (EvPageAction *action) +ev_page_action_dispose (GObject *object) { - action->priv = EV_PAGE_ACTION_GET_PRIVATE (action); -} + EvPageAction *page = EV_PAGE_ACTION (object); -static void -ev_page_action_finalize (GObject *object) -{ - G_OBJECT_CLASS (ev_page_action_parent_class)->finalize (object); + if (page->priv->page_cache) { + g_object_unref (page->priv->page_cache); + page->priv->page_cache = NULL; + } + + G_OBJECT_CLASS (ev_page_action_parent_class)->dispose (object); } static void -ev_page_action_set_property (GObject *object, - guint prop_id, +ev_page_action_set_property (GObject *object, + guint prop_id, const GValue *value, - GParamSpec *pspec) + GParamSpec *pspec) { - EvPageAction *page = EV_PAGE_ACTION (object); + EvPageAction *page; + EvPageCache *page_cache; + GtkTreeModel *model; + + page = EV_PAGE_ACTION (object); switch (prop_id) { - case PROP_CURRENT_PAGE: - page->priv->current_page = g_value_get_int (value); - break; - case PROP_TOTAL_PAGES: - page->priv->total_pages = g_value_get_int (value); - break; + case PROP_PAGE_CACHE: + page_cache = page->priv->page_cache; + page->priv->page_cache = EV_PAGE_CACHE (g_value_dup_object (value)); + if (page_cache) + g_object_unref (page_cache); + break; + case PROP_MODEL: + model = page->priv->model; + page->priv->model = GTK_TREE_MODEL (g_value_dup_object (value)); + if (model) + g_object_unref (model); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; } } static void -ev_page_action_get_property (GObject *object, - guint prop_id, - GValue *value, +ev_page_action_get_property (GObject *object, + guint prop_id, + GValue *value, GParamSpec *pspec) { - EvPageAction *page = EV_PAGE_ACTION (object); + EvPageAction *page; + + page = EV_PAGE_ACTION (object); switch (prop_id) { - case PROP_CURRENT_PAGE: - g_value_set_int (value, page->priv->current_page); - break; - case PROP_TOTAL_PAGES: - g_value_set_int (value, page->priv->total_pages); - break; + case PROP_PAGE_CACHE: + g_value_set_object (value, page->priv->page_cache); + break; + case PROP_MODEL: + g_value_set_object (value, page->priv->model); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; } } void -ev_page_action_set_current_page (EvPageAction *page, int current_page) +ev_page_action_set_document (EvPageAction *page, EvDocument *document) { - g_object_set (page, "current-page", current_page, NULL); + EvPageCache *page_cache = NULL; + + if (document) + page_cache = ev_document_get_page_cache (document); + + g_object_set (page, + "page-cache", page_cache, + "model", NULL, + NULL); } void -ev_page_action_set_total_pages (EvPageAction *page, int total_pages) +ev_page_action_set_model (EvPageAction *page_action, + GtkTreeModel *model) { - g_object_set (page, "total-pages", total_pages, NULL); + g_object_set (page_action, + "model", model, + NULL); +} + +static void +ev_page_action_init (EvPageAction *page) +{ + page->priv = EV_PAGE_ACTION_GET_PRIVATE (page); } static void @@ -227,7 +487,7 @@ ev_page_action_class_init (EvPageActionClass *class) GObjectClass *object_class = G_OBJECT_CLASS (class); GtkActionClass *action_class = GTK_ACTION_CLASS (class); - object_class->finalize = ev_page_action_finalize; + object_class->dispose = ev_page_action_dispose; object_class->set_property = ev_page_action_set_property; object_class->get_property = ev_page_action_get_property; @@ -235,36 +495,21 @@ ev_page_action_class_init (EvPageActionClass *class) action_class->create_tool_item = create_tool_item; action_class->connect_proxy = connect_proxy; - signals[GOTO_PAGE_SIGNAL] = - g_signal_new ("goto_page", - G_OBJECT_CLASS_TYPE (object_class), - G_SIGNAL_RUN_FIRST, - G_STRUCT_OFFSET (EvPageActionClass, goto_page), - NULL, NULL, - g_cclosure_marshal_VOID__INT, - G_TYPE_NONE, - 1, - G_TYPE_INT); - g_object_class_install_property (object_class, - PROP_CURRENT_PAGE, - g_param_spec_int ("current-page", - "Current Page", - "The number of current page", - 0, - G_MAXINT, - 0, - G_PARAM_READWRITE)); + PROP_PAGE_CACHE, + g_param_spec_object ("page-cache", + "Page Cache", + "Current page cache", + EV_TYPE_PAGE_CACHE, + G_PARAM_READWRITE)); g_object_class_install_property (object_class, - PROP_TOTAL_PAGES, - g_param_spec_int ("total-pages", - "Total Pages", - "The total number of pages", - 0, - G_MAXINT, - 0, - G_PARAM_READWRITE)); + PROP_MODEL, + g_param_spec_object ("model", + "Model", + "Current Model", + GTK_TYPE_TREE_MODEL, + G_PARAM_READWRITE)); g_type_class_add_private (object_class, sizeof (EvPageActionPrivate)); }