X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=shell%2Fev-sidebar.c;h=06a29c78eb9830e7015777f31f2cd3835b5ac9c3;hb=88f0701b10f70b8aede0f7e23014875ab72c2e26;hp=c5a6574ceab72df8951892790ec6ddc88a6f9b7d;hpb=86c8055b11de2c6bf38a3e747448b83ae0ffcaf9;p=evince.git diff --git a/shell/ev-sidebar.c b/shell/ev-sidebar.c index c5a6574c..06a29c78 100644 --- a/shell/ev-sidebar.c +++ b/shell/ev-sidebar.c @@ -29,21 +29,16 @@ #include #include "ev-sidebar.h" -#include "ev-document-thumbnails.h" -#include "ev-document-links.h" -#include "ev-sidebar-links.h" -#include "ev-sidebar-thumbnails.h" +#include "ev-sidebar-page.h" -typedef struct +enum { - char *id; - char *title; - GtkWidget *main_widget; -} EvSidebarPage; + PROP_0, + PROP_CURRENT_PAGE +}; enum { - PAGE_COLUMN_ID, PAGE_COLUMN_TITLE, PAGE_COLUMN_MENU_ITEM, PAGE_COLUMN_MAIN_WIDGET, @@ -53,8 +48,8 @@ enum struct _EvSidebarPrivate { GtkWidget *notebook; + GtkWidget *select_button; GtkWidget *menu; - GtkWidget *frame; GtkWidget *hbox; GtkWidget *label; @@ -75,10 +70,106 @@ ev_sidebar_destroy (GtkObject *object) gtk_menu_detach (GTK_MENU (ev_sidebar->priv->menu)); ev_sidebar->priv->menu = NULL; } + + if (ev_sidebar->priv->page_model) { + g_object_unref (ev_sidebar->priv->page_model); + ev_sidebar->priv->page_model = NULL; + } + (* GTK_OBJECT_CLASS (ev_sidebar_parent_class)->destroy) (object); } +static void +ev_sidebar_select_page (EvSidebar *ev_sidebar, GtkTreeIter *iter) +{ + char *title; + int index; + + gtk_tree_model_get (ev_sidebar->priv->page_model, iter, + PAGE_COLUMN_TITLE, &title, + PAGE_COLUMN_NOTEBOOK_INDEX, &index, + -1); + + gtk_notebook_set_current_page (GTK_NOTEBOOK (ev_sidebar->priv->notebook), index); + gtk_label_set_text (GTK_LABEL (ev_sidebar->priv->label), title); + + g_free (title); +} + +void +ev_sidebar_set_page (EvSidebar *ev_sidebar, + GtkWidget *main_widget) +{ + GtkTreeIter iter; + gboolean valid; + + valid = gtk_tree_model_get_iter_first (ev_sidebar->priv->page_model, &iter); + + while (valid) { + GtkWidget *widget; + + gtk_tree_model_get (ev_sidebar->priv->page_model, &iter, + PAGE_COLUMN_MAIN_WIDGET, &widget, + -1); + + if (widget == main_widget) { + ev_sidebar_select_page (ev_sidebar, &iter); + valid = FALSE; + } else { + valid = gtk_tree_model_iter_next (ev_sidebar->priv->page_model, &iter); + } + g_object_unref (widget); + } + + g_object_notify (G_OBJECT (ev_sidebar), "current-page"); +} + +static void +ev_sidebar_set_property (GObject *object, + guint prop_id, + const GValue *value, + GParamSpec *pspec) +{ + EvSidebar *sidebar = EV_SIDEBAR (object); + + switch (prop_id) + { + case PROP_CURRENT_PAGE: + ev_sidebar_set_page (sidebar, g_value_get_object (value)); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + } +} + +static GtkWidget * +ev_sidebar_get_current_page (EvSidebar *sidebar) +{ + GtkNotebook *notebook = GTK_NOTEBOOK (sidebar->priv->notebook); + + return gtk_notebook_get_nth_page + (notebook, gtk_notebook_get_current_page (notebook)); +} + +static void +ev_sidebar_get_property (GObject *object, + guint prop_id, + GValue *value, + GParamSpec *pspec) +{ + EvSidebar *sidebar = EV_SIDEBAR (object); + + switch (prop_id) + { + case PROP_CURRENT_PAGE: + g_value_set_object (value, ev_sidebar_get_current_page (sidebar)); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + } +} + static void ev_sidebar_class_init (EvSidebarClass *ev_sidebar_class) { @@ -93,6 +184,16 @@ ev_sidebar_class_init (EvSidebarClass *ev_sidebar_class) g_type_class_add_private (g_object_class, sizeof (EvSidebarPrivate)); gtk_object_klass->destroy = ev_sidebar_destroy; + g_object_class->get_property = ev_sidebar_get_property; + g_object_class->set_property = ev_sidebar_set_property; + + g_object_class_install_property (g_object_class, + PROP_CURRENT_PAGE, + g_param_spec_object ("current-page", + "Current page", + "The currently visible page", + GTK_TYPE_WIDGET, + G_PARAM_READWRITE)); } static void @@ -125,6 +226,15 @@ ev_sidebar_select_button_press_cb (GtkWidget *widget, EvSidebar *ev_sidebar = EV_SIDEBAR (user_data); if (event->button == 1) { + GtkRequisition requisition; + gint width; + + width = widget->allocation.width; + gtk_widget_set_size_request (ev_sidebar->priv->menu, -1, -1); + gtk_widget_size_request (ev_sidebar->priv->menu, &requisition); + gtk_widget_set_size_request (ev_sidebar->priv->menu, + MAX (width, requisition.width), -1); + gtk_widget_grab_focus (widget); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), TRUE); @@ -195,72 +305,59 @@ ev_sidebar_menu_item_activate_cb (GtkWidget *widget, EvSidebar *ev_sidebar = EV_SIDEBAR (user_data); GtkTreeIter iter; GtkWidget *menu_item, *item; - gchar *title; gboolean valid; - gint index; menu_item = gtk_menu_get_active (GTK_MENU (ev_sidebar->priv->menu)); valid = gtk_tree_model_get_iter_first (ev_sidebar->priv->page_model, &iter); while (valid) { - gtk_tree_model_get (ev_sidebar->priv->page_model, - &iter, - PAGE_COLUMN_TITLE, &title, + gtk_tree_model_get (ev_sidebar->priv->page_model, &iter, PAGE_COLUMN_MENU_ITEM, &item, - PAGE_COLUMN_NOTEBOOK_INDEX, &index, -1); if (item == menu_item) { - gtk_notebook_set_current_page - (GTK_NOTEBOOK (ev_sidebar->priv->notebook), index); - gtk_label_set_text (GTK_LABEL (ev_sidebar->priv->label), title); + ev_sidebar_select_page (ev_sidebar, &iter); valid = FALSE; } else { valid = gtk_tree_model_iter_next (ev_sidebar->priv->page_model, &iter); } + g_object_unref (item); } + + g_object_notify (G_OBJECT (ev_sidebar), "current-page"); } static void ev_sidebar_init (EvSidebar *ev_sidebar) { - GtkWidget *frame; GtkWidget *hbox; GtkWidget *close_button; - GtkWidget *select_button; GtkWidget *select_hbox; GtkWidget *arrow; GtkWidget *image; ev_sidebar->priv = EV_SIDEBAR_GET_PRIVATE (ev_sidebar); - gtk_box_set_spacing (GTK_BOX (ev_sidebar), 6); /* data model */ ev_sidebar->priv->page_model = (GtkTreeModel *) gtk_list_store_new (PAGE_COLUMN_NUM_COLS, - G_TYPE_STRING, G_TYPE_STRING, GTK_TYPE_WIDGET, GTK_TYPE_WIDGET, G_TYPE_INT); /* top option menu */ - frame = gtk_frame_new (NULL); - ev_sidebar->priv->frame = frame; - gtk_box_pack_start (GTK_BOX (ev_sidebar), frame, FALSE, FALSE, 0); - gtk_widget_show (frame); - hbox = gtk_hbox_new (FALSE, 0); ev_sidebar->priv->hbox = hbox; - gtk_container_add (GTK_CONTAINER (frame), hbox); + gtk_box_pack_start (GTK_BOX (ev_sidebar), hbox, FALSE, FALSE, 0); gtk_widget_show (hbox); - select_button = gtk_toggle_button_new (); - gtk_button_set_relief (GTK_BUTTON (select_button), GTK_RELIEF_NONE); - g_signal_connect (select_button, "button_press_event", + ev_sidebar->priv->select_button = gtk_toggle_button_new (); + gtk_button_set_relief (GTK_BUTTON (ev_sidebar->priv->select_button), GTK_RELIEF_NONE); + g_signal_connect (ev_sidebar->priv->select_button, "button_press_event", G_CALLBACK (ev_sidebar_select_button_press_cb), ev_sidebar); - g_signal_connect (select_button, "key_press_event", + g_signal_connect (ev_sidebar->priv->select_button, "key_press_event", G_CALLBACK (ev_sidebar_select_button_key_press_cb), ev_sidebar); @@ -269,18 +366,18 @@ ev_sidebar_init (EvSidebar *ev_sidebar) ev_sidebar->priv->label = gtk_label_new (""); gtk_box_pack_start (GTK_BOX (select_hbox), ev_sidebar->priv->label, - TRUE, FALSE, 0); + FALSE, FALSE, 0); gtk_widget_show (ev_sidebar->priv->label); arrow = gtk_arrow_new (GTK_ARROW_DOWN, GTK_SHADOW_NONE); gtk_box_pack_end (GTK_BOX (select_hbox), arrow, FALSE, FALSE, 0); gtk_widget_show (arrow); - gtk_container_add (GTK_CONTAINER (select_button), select_hbox); + gtk_container_add (GTK_CONTAINER (ev_sidebar->priv->select_button), select_hbox); gtk_widget_show (select_hbox); - gtk_box_pack_start (GTK_BOX (hbox), select_button, FALSE, FALSE, 0); - gtk_widget_show (select_button); + gtk_box_pack_start (GTK_BOX (hbox), ev_sidebar->priv->select_button, TRUE, TRUE, 0); + gtk_widget_show (ev_sidebar->priv->select_button); close_button = gtk_button_new (); gtk_button_set_relief (GTK_BUTTON (close_button), GTK_RELIEF_NONE); @@ -289,7 +386,7 @@ ev_sidebar_init (EvSidebar *ev_sidebar) ev_sidebar); image = gtk_image_new_from_stock (GTK_STOCK_CLOSE, - GTK_ICON_SIZE_SMALL_TOOLBAR); + GTK_ICON_SIZE_MENU); gtk_container_add (GTK_CONTAINER (close_button), image); gtk_widget_show (image); @@ -299,7 +396,7 @@ ev_sidebar_init (EvSidebar *ev_sidebar) ev_sidebar->priv->menu = gtk_menu_new (); g_signal_connect (ev_sidebar->priv->menu, "deactivate", G_CALLBACK (ev_sidebar_menu_deactivate_cb), - select_button); + ev_sidebar->priv->select_button); gtk_menu_attach_to_widget (GTK_MENU (ev_sidebar->priv->menu), GTK_WIDGET (ev_sidebar), ev_sidebar_menu_detach_cb); @@ -311,6 +408,9 @@ ev_sidebar_init (EvSidebar *ev_sidebar) gtk_box_pack_start (GTK_BOX (ev_sidebar), ev_sidebar->priv->notebook, TRUE, TRUE, 0); gtk_widget_show (ev_sidebar->priv->notebook); + + gtk_widget_set_sensitive (GTK_WIDGET (ev_sidebar->priv->notebook), FALSE); + gtk_widget_set_sensitive (GTK_WIDGET (ev_sidebar->priv->select_button), FALSE); } /* Public functions */ @@ -327,19 +427,19 @@ ev_sidebar_new (void) void ev_sidebar_add_page (EvSidebar *ev_sidebar, - const gchar *page_id, - const gchar *title, GtkWidget *main_widget) { GtkTreeIter iter; GtkWidget *menu_item; gchar *label_title; + const gchar *title; int index; g_return_if_fail (EV_IS_SIDEBAR (ev_sidebar)); - g_return_if_fail (page_id != NULL); - g_return_if_fail (title != NULL); + g_return_if_fail (EV_IS_SIDEBAR_PAGE (main_widget)); g_return_if_fail (GTK_IS_WIDGET (main_widget)); + + title = ev_sidebar_page_get_label (EV_SIDEBAR_PAGE (main_widget)); index = gtk_notebook_append_page (GTK_NOTEBOOK (ev_sidebar->priv->notebook), main_widget, NULL); @@ -351,16 +451,19 @@ ev_sidebar_add_page (EvSidebar *ev_sidebar, gtk_widget_show (menu_item); gtk_menu_shell_append (GTK_MENU_SHELL (ev_sidebar->priv->menu), menu_item); - + + /* Insert and move to end */ gtk_list_store_insert_with_values (GTK_LIST_STORE (ev_sidebar->priv->page_model), &iter, 0, - PAGE_COLUMN_ID, page_id, PAGE_COLUMN_TITLE, title, PAGE_COLUMN_MENU_ITEM, menu_item, PAGE_COLUMN_MAIN_WIDGET, main_widget, PAGE_COLUMN_NOTEBOOK_INDEX, index, -1); - + gtk_list_store_move_before(GTK_LIST_STORE(ev_sidebar->priv->page_model), + &iter, NULL); + + /* Set the first item added as active */ gtk_tree_model_get_iter_first (ev_sidebar->priv->page_model, &iter); gtk_tree_model_get (ev_sidebar->priv->page_model, @@ -373,6 +476,7 @@ ev_sidebar_add_page (EvSidebar *ev_sidebar, gtk_label_set_text (GTK_LABEL (ev_sidebar->priv->label), label_title); gtk_notebook_set_current_page (GTK_NOTEBOOK (ev_sidebar->priv->notebook), index); + g_free (label_title); } void @@ -381,34 +485,43 @@ ev_sidebar_set_document (EvSidebar *sidebar, { EvSidebarPrivate *priv; GtkTreeIter iter; - gboolean result; + gboolean valid; + gboolean has_pages; g_return_if_fail (EV_IS_SIDEBAR (sidebar)); g_return_if_fail (EV_IS_DOCUMENT (document)); priv = sidebar->priv; - /* FIXME: We should prolly make sidebars have an interface. For now, we - * do this bad hack (TM) - */ - for (result = gtk_tree_model_get_iter_first (priv->page_model, &iter); - result; - result = gtk_tree_model_iter_next (priv->page_model, &iter)) { + has_pages = FALSE; + + for (valid = gtk_tree_model_get_iter_first (priv->page_model, &iter); + valid; + valid = gtk_tree_model_iter_next (priv->page_model, &iter)) { GtkWidget *widget; + GtkWidget *menu_widget; gtk_tree_model_get (priv->page_model, &iter, PAGE_COLUMN_MAIN_WIDGET, &widget, + PAGE_COLUMN_MENU_ITEM, &menu_widget, -1); - if (EV_IS_SIDEBAR_LINKS (widget) - && EV_IS_DOCUMENT_LINKS (document) - && ev_document_links_has_document_links (EV_DOCUMENT_LINKS (document))) { - ev_sidebar_links_set_document - (EV_SIDEBAR_LINKS (widget), document); - } else if (EV_IS_SIDEBAR_THUMBNAILS (widget) && - EV_IS_DOCUMENT_THUMBNAILS (document)) { - ev_sidebar_thumbnails_set_document - (EV_SIDEBAR_THUMBNAILS (widget), document); + + if (ev_sidebar_page_support_document (EV_SIDEBAR_PAGE (widget), document)) { + ev_sidebar_page_set_document (EV_SIDEBAR_PAGE (widget), document); + has_pages = TRUE; + } else { + gtk_widget_set_sensitive (menu_widget, FALSE); } + g_object_unref (widget); + g_object_unref (menu_widget); + } + + if (!has_pages) { + gtk_widget_hide (GTK_WIDGET (sidebar)); + } else { + gtk_widget_set_sensitive (GTK_WIDGET (sidebar->priv->notebook), TRUE); + gtk_widget_set_sensitive (GTK_WIDGET (sidebar->priv->select_button), TRUE); } } +