X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=shell%2Fev-sidebar.c;h=f23a45f39cc00d7d33c48161f7d63403503e5f33;hb=96820f5584e3a27ceebb1b0995c476f7c0953d0b;hp=780f9f6a73811371777b39450d5b483c4e116411;hpb=37ca059dda89fecb22f6297d337ea393b2069605;p=evince.git

diff --git a/shell/ev-sidebar.c b/shell/ev-sidebar.c
index 780f9f6a..f23a45f3 100644
--- a/shell/ev-sidebar.c
+++ b/shell/ev-sidebar.c
@@ -26,114 +26,290 @@
 
 #include <string.h>
 #include <gtk/gtk.h>
+#include <gdk/gdkkeysyms.h>
 
 #include "ev-sidebar.h"
-#include "ev-sidebar-bookmarks.h"
-
-typedef struct
-{
-	char *id;
-	char *title;
-	GtkWidget *main_widget;
-} EvSidebarPage;
+#include "ev-sidebar-page.h"
 
 enum
 {
-	PAGE_COLUMN_ID,
 	PAGE_COLUMN_TITLE,
+	PAGE_COLUMN_MENU_ITEM,
 	PAGE_COLUMN_MAIN_WIDGET,
 	PAGE_COLUMN_NOTEBOOK_INDEX,
 	PAGE_COLUMN_NUM_COLS
 };
 
 struct _EvSidebarPrivate {
-	GtkWidget *option_menu;
 	GtkWidget *notebook;
-
+	GtkWidget *menu;
+	GtkWidget *hbox;
+	GtkWidget *label;
+	   
 	GtkTreeModel *page_model;
 };
 
-static void ev_sidebar_omenu_changed_cb (GtkComboBox *combo_box,
-					 gpointer     user_data);
-
 G_DEFINE_TYPE (EvSidebar, ev_sidebar, GTK_TYPE_VBOX)
 
 #define EV_SIDEBAR_GET_PRIVATE(object) \
-	(G_TYPE_INSTANCE_GET_PRIVATE ((object), EV_TYPE_SIDEBAR, EvSidebarPrivate))
+		(G_TYPE_INSTANCE_GET_PRIVATE ((object), EV_TYPE_SIDEBAR, EvSidebarPrivate))
+
+static void
+ev_sidebar_destroy (GtkObject *object)
+{
+	EvSidebar *ev_sidebar = EV_SIDEBAR (object);
+
+	if (ev_sidebar->priv->menu) {
+		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_class_init (EvSidebarClass *ev_sidebar_class)
 {
 	GObjectClass *g_object_class;
-
+	GtkWidgetClass *widget_class;
+	GtkObjectClass *gtk_object_klass;
+ 
 	g_object_class = G_OBJECT_CLASS (ev_sidebar_class);
-
+	widget_class = GTK_WIDGET_CLASS (ev_sidebar_class);
+	gtk_object_klass = GTK_OBJECT_CLASS (ev_sidebar_class);
+	   
 	g_type_class_add_private (g_object_class, sizeof (EvSidebarPrivate));
+	   
+	gtk_object_klass->destroy = ev_sidebar_destroy;
+}
+
+static void
+ev_sidebar_menu_position_under (GtkMenu  *menu,
+				int      *x,
+				int      *y,
+				gboolean *push_in,
+				gpointer  user_data)
+{
+	GtkWidget *widget;
+
+	g_return_if_fail (GTK_IS_BUTTON (user_data));
+	g_return_if_fail (GTK_WIDGET_NO_WINDOW (user_data));
+
+	widget = GTK_WIDGET (user_data);
+	   
+	gdk_window_get_origin (widget->window, x, y);
+	   
+	*x += widget->allocation.x;
+	*y += widget->allocation.y + widget->allocation.height;
+	   
+	*push_in = FALSE;
+}
+
+static gboolean
+ev_sidebar_select_button_press_cb (GtkWidget      *widget,
+				   GdkEventButton *event,
+				   gpointer        user_data)
+{
+	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);
+		gtk_menu_popup (GTK_MENU (ev_sidebar->priv->menu),
+				NULL, NULL, ev_sidebar_menu_position_under, widget,
+				event->button, event->time);
+
+		return TRUE;
+	}
+
+	return FALSE;
+}
+
+static gboolean
+ev_sidebar_select_button_key_press_cb (GtkWidget   *widget,
+				       GdkEventKey *event,
+				       gpointer     user_data)
+{
+	EvSidebar *ev_sidebar = EV_SIDEBAR (user_data);
+	   
+	if (event->keyval == GDK_space ||
+	    event->keyval == GDK_KP_Space ||
+	    event->keyval == GDK_Return ||
+	    event->keyval == GDK_KP_Enter) {
+		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), TRUE);
+		gtk_menu_popup (GTK_MENU (ev_sidebar->priv->menu),
+			        NULL, NULL, ev_sidebar_menu_position_under, widget,
+				1, event->time);
+		return TRUE;
+	}
+
+	return FALSE;
+}
+
+static void
+ev_sidebar_close_clicked_cb (GtkWidget *widget,
+			     gpointer   user_data)
+{
+	EvSidebar *ev_sidebar = EV_SIDEBAR (user_data);
+
+	gtk_widget_hide (GTK_WIDGET (ev_sidebar));
+}
+
+static void
+ev_sidebar_menu_deactivate_cb (GtkWidget *widget,
+			       gpointer   user_data)
+{
+	GtkWidget *menu_button;
 
+	menu_button = GTK_WIDGET (user_data);
+	   
+	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (menu_button), FALSE);
+}
+
+static void
+ev_sidebar_menu_detach_cb (GtkWidget *widget,
+			   GtkMenu   *menu)
+{
+	EvSidebar *ev_sidebar = EV_SIDEBAR (widget);
+	   
+	ev_sidebar->priv->menu = NULL;
+}
+
+static void
+ev_sidebar_menu_item_activate_cb (GtkWidget *widget,
+				  gpointer   user_data)
+{
+	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, 
+				    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);
+			valid = FALSE;
+		} else {
+			valid = gtk_tree_model_iter_next (ev_sidebar->priv->page_model, &iter);
+		}
+		g_object_unref (item);
+		g_free (title);
+	}
 }
 
 static void
 ev_sidebar_init (EvSidebar *ev_sidebar)
 {
 	GtkWidget *hbox;
-	GtkCellRenderer *renderer;
+	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,
-				    G_TYPE_INT);
+			gtk_list_store_new (PAGE_COLUMN_NUM_COLS,
+					    G_TYPE_STRING,
+					    GTK_TYPE_WIDGET,
+					    GTK_TYPE_WIDGET,
+					    G_TYPE_INT);
 
 	/* top option menu */
-	hbox = gtk_hbox_new (FALSE, 6);
-	gtk_box_pack_start (GTK_BOX (ev_sidebar), hbox,
-			    FALSE, FALSE, 0);
-	ev_sidebar->priv->option_menu =
-		gtk_combo_box_new_with_model (ev_sidebar->priv->page_model);
-	g_signal_connect (ev_sidebar->priv->option_menu, "changed",
-			  G_CALLBACK (ev_sidebar_omenu_changed_cb), ev_sidebar);
-	gtk_box_pack_start (GTK_BOX (hbox),
-			    ev_sidebar->priv->option_menu,
+	hbox = gtk_hbox_new (FALSE, 0);
+	ev_sidebar->priv->hbox = 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",
+			  G_CALLBACK (ev_sidebar_select_button_press_cb),
+			  ev_sidebar);
+	g_signal_connect (select_button, "key_press_event",
+			  G_CALLBACK (ev_sidebar_select_button_key_press_cb),
+			  ev_sidebar);
+
+	select_hbox = gtk_hbox_new (FALSE, 0);
+
+	ev_sidebar->priv->label = gtk_label_new ("");
+	gtk_box_pack_start (GTK_BOX (select_hbox),
+			    ev_sidebar->priv->label,
 			    FALSE, FALSE, 0);
-	renderer = gtk_cell_renderer_text_new ();
-	gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (ev_sidebar->priv->option_menu),
-				    renderer, TRUE);
-	gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (ev_sidebar->priv->option_menu),
-					renderer,
-					"text", PAGE_COLUMN_TITLE,
-					NULL);
+	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_widget_show (select_hbox);
+
+	gtk_box_pack_start (GTK_BOX (hbox), select_button, TRUE, TRUE, 0);
+	gtk_widget_show (select_button);
+
+	close_button = gtk_button_new ();
+	gtk_button_set_relief (GTK_BUTTON (close_button), GTK_RELIEF_NONE);
+	g_signal_connect (close_button, "clicked",
+			  G_CALLBACK (ev_sidebar_close_clicked_cb),
+			  ev_sidebar);
+	   
+	image = gtk_image_new_from_stock (GTK_STOCK_CLOSE,
+					  GTK_ICON_SIZE_SMALL_TOOLBAR);
+	gtk_container_add (GTK_CONTAINER (close_button), image);
+	gtk_widget_show (image);
+   
+	gtk_box_pack_end (GTK_BOX (hbox), close_button, FALSE, FALSE, 0);
+	gtk_widget_show (close_button);
+   
+	ev_sidebar->priv->menu = gtk_menu_new ();
+	g_signal_connect (ev_sidebar->priv->menu, "deactivate",
+			  G_CALLBACK (ev_sidebar_menu_deactivate_cb),
+			  select_button);
+	gtk_menu_attach_to_widget (GTK_MENU (ev_sidebar->priv->menu),
+				   GTK_WIDGET (ev_sidebar),
+				   ev_sidebar_menu_detach_cb);
+	gtk_widget_show (ev_sidebar->priv->menu);
 
 	ev_sidebar->priv->notebook = gtk_notebook_new ();
 	gtk_notebook_set_show_border (GTK_NOTEBOOK (ev_sidebar->priv->notebook), FALSE);
 	gtk_notebook_set_show_tabs (GTK_NOTEBOOK (ev_sidebar->priv->notebook), FALSE);
 	gtk_box_pack_start (GTK_BOX (ev_sidebar), ev_sidebar->priv->notebook,
 			    TRUE, TRUE, 0);
-	gtk_widget_show_all (GTK_WIDGET (ev_sidebar));
-}
-
-static void
-ev_sidebar_omenu_changed_cb (GtkComboBox *combo_box,
-			     gpointer     user_data)
-{
-	GtkTreeIter iter;
-	EvSidebar *ev_sidebar = EV_SIDEBAR (user_data);
-
-	if (gtk_combo_box_get_active_iter (combo_box, &iter)) {
-		gint index;
+	gtk_widget_show (ev_sidebar->priv->notebook);
 
-		gtk_tree_model_get (ev_sidebar->priv->page_model,
-				    &iter,
-				    PAGE_COLUMN_NOTEBOOK_INDEX, &index,
-				    -1);
-		gtk_notebook_set_current_page (GTK_NOTEBOOK (ev_sidebar->priv->notebook),
-					       index);
-					       
-	}
+	gtk_widget_set_sensitive (GTK_WIDGET (ev_sidebar), FALSE);
 }
 
 /* Public functions */
@@ -150,28 +326,52 @@ 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);
-					  
+	   
+	menu_item = gtk_image_menu_item_new_with_label (title);
+	g_signal_connect (menu_item, "activate",
+			  G_CALLBACK (ev_sidebar_menu_item_activate_cb),
+			  ev_sidebar);
+	gtk_widget_show (menu_item);
+	gtk_menu_shell_append (GTK_MENU_SHELL (ev_sidebar->priv->menu),
+			       menu_item);
+	   
 	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);
+	   
+	/* 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,
+			    &iter,
+			    PAGE_COLUMN_TITLE, &label_title,
+			    PAGE_COLUMN_NOTEBOOK_INDEX, &index,
+			    -1);
+
+	gtk_menu_set_active (GTK_MENU (ev_sidebar->priv->menu), index);
+	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
@@ -180,40 +380,42 @@ 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_BOOKMARKS (widget))
-			/* && EV_IS_BOOKMARKS (document)
-			   && ev_bookmarks_has_bookmarks (document)... */
-			ev_sidebar_bookmarks_set_document (EV_SIDEBAR_BOOKMARKS (widget),
-							   document);
-		/* else if EV_IS_SIDEBAR_THUMBNAILS... */
+			 
+
+		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), TRUE);
+	}
 }
 
-void
-ev_sidebar_clear (EvSidebar *ev_sidebar)
-{
-	g_return_if_fail (EV_IS_SIDEBAR (ev_sidebar));
-
-	gtk_list_store_clear (GTK_LIST_STORE (ev_sidebar->priv->page_model));
-}