#endif
#include <string.h>
+
#include <gtk/gtk.h>
#include <gdk/gdkkeysyms.h>
struct _EvSidebarPrivate {
GtkWidget *notebook;
+ GtkWidget *select_button;
GtkWidget *menu;
GtkWidget *hbox;
GtkWidget *label;
-
+
+ EvDocumentModel *model;
GtkTreeModel *page_model;
};
gboolean *push_in,
gpointer user_data)
{
- GtkWidget *widget;
+ GtkWidget *widget;
+ GtkAllocation allocation;
g_return_if_fail (GTK_IS_BUTTON (user_data));
- g_return_if_fail (GTK_WIDGET_NO_WINDOW (user_data));
+ g_return_if_fail (!gtk_widget_get_has_window (GTK_WIDGET (user_data)));
widget = GTK_WIDGET (user_data);
- gdk_window_get_origin (widget->window, x, y);
+ gdk_window_get_origin (gtk_widget_get_window (widget), x, y);
+ gtk_widget_get_allocation (widget, &allocation);
- *x += widget->allocation.x;
- *y += widget->allocation.y + widget->allocation.height;
+ *x += allocation.x;
+ *y += allocation.y + allocation.height;
*push_in = FALSE;
}
if (event->button == 1) {
GtkRequisition requisition;
+ GtkAllocation allocation;
gint width;
-
- width = widget->allocation.width;
+
+ gtk_widget_get_allocation (widget, &allocation);
+ width = 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,
{
GtkWidget *hbox;
GtkWidget *close_button;
- GtkWidget *select_button;
GtkWidget *select_hbox;
GtkWidget *arrow;
GtkWidget *image;
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);
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, TRUE, TRUE, 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);
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);
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);
TRUE, TRUE, 0);
gtk_widget_show (ev_sidebar->priv->notebook);
- gtk_widget_set_sensitive (GTK_WIDGET (ev_sidebar), FALSE);
+ 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 */
g_return_if_fail (EV_IS_SIDEBAR (ev_sidebar));
g_return_if_fail (EV_IS_SIDEBAR_PAGE (main_widget));
g_return_if_fail (GTK_IS_WIDGET (main_widget));
-
+
+ ev_sidebar_page_set_model (EV_SIDEBAR_PAGE (main_widget),
+ ev_sidebar->priv->model);
title = ev_sidebar_page_get_label (EV_SIDEBAR_PAGE (main_widget));
index = gtk_notebook_append_page (GTK_NOTEBOOK (ev_sidebar->priv->notebook),
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_TITLE, title,
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,
g_free (label_title);
}
-void
-ev_sidebar_set_document (EvSidebar *sidebar,
- EvDocument *document)
+static void
+ev_sidebar_document_changed_cb (EvDocumentModel *model,
+ GParamSpec *pspec,
+ EvSidebar *sidebar)
{
- EvSidebarPrivate *priv;
+ EvSidebarPrivate *priv = sidebar->priv;
+ EvDocument *document = ev_document_model_get_document (model);
GtkTreeIter iter;
gboolean valid;
- gboolean has_pages;
-
- g_return_if_fail (EV_IS_SIDEBAR (sidebar));
- g_return_if_fail (EV_IS_DOCUMENT (document));
-
- priv = sidebar->priv;
-
- has_pages = FALSE;
-
+ gboolean 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)) {
PAGE_COLUMN_MAIN_WIDGET, &widget,
PAGE_COLUMN_MENU_ITEM, &menu_widget,
-1);
-
if (ev_sidebar_page_support_document (EV_SIDEBAR_PAGE (widget), document)) {
- ev_sidebar_page_set_document (EV_SIDEBAR_PAGE (widget), document);
- has_pages = TRUE;
+ has_pages = TRUE;
} else {
- gtk_widget_set_sensitive (menu_widget, FALSE);
+ 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), TRUE);
+ gtk_widget_set_sensitive (GTK_WIDGET (sidebar->priv->notebook), TRUE);
+ gtk_widget_set_sensitive (GTK_WIDGET (sidebar->priv->select_button), TRUE);
}
}
+void
+ev_sidebar_set_model (EvSidebar *sidebar,
+ EvDocumentModel *model)
+{
+ g_return_if_fail (EV_IS_SIDEBAR (sidebar));
+ g_return_if_fail (EV_IS_DOCUMENT_MODEL (model));
+
+ if (model == sidebar->priv->model)
+ return;
+
+ sidebar->priv->model = model;
+ g_signal_connect (model, "notify::document",
+ G_CALLBACK (ev_sidebar_document_changed_cb),
+ sidebar);
+}