X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;ds=sidebyside;f=shell%2Fev-sidebar.c;h=3a99b556a5079da7596d1d25e8e19045b869fa0d;hb=d68a55580d2e63c0587b11580dfde219d5ef56fb;hp=3ba66ada46932cd8744b2b9c4a52ae6bf74deb7e;hpb=2cb9212432df8a72a106f76619db52ce9031f667;p=evince.git

diff --git a/shell/ev-sidebar.c b/shell/ev-sidebar.c
index 3ba66ada..3a99b556 100644
--- a/shell/ev-sidebar.c
+++ b/shell/ev-sidebar.c
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
 #ifdef HAVE_CONFIG_H
@@ -25,13 +25,18 @@
 #endif
 
 #include <string.h>
+
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 
 #include "ev-sidebar.h"
 #include "ev-sidebar-page.h"
-#include "ev-document-thumbnails.h"
-#include "ev-document-links.h"
+
+enum
+{
+	PROP_0,
+	PROP_CURRENT_PAGE
+};
 
 enum
 {
@@ -44,10 +49,12 @@ enum
 
 struct _EvSidebarPrivate {
 	GtkWidget *notebook;
+	GtkWidget *select_button;
 	GtkWidget *menu;
 	GtkWidget *hbox;
 	GtkWidget *label;
-	   
+
+	EvDocumentModel *model;
 	GtkTreeModel *page_model;
 };
 
@@ -57,7 +64,7 @@ G_DEFINE_TYPE (EvSidebar, ev_sidebar, GTK_TYPE_VBOX)
 		(G_TYPE_INSTANCE_GET_PRIVATE ((object), EV_TYPE_SIDEBAR, EvSidebarPrivate))
 
 static void
-ev_sidebar_destroy (GtkObject *object)
+ev_sidebar_dispose (GObject *object)
 {
 	EvSidebar *ev_sidebar = EV_SIDEBAR (object);
 
@@ -65,24 +72,124 @@ 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);
+	G_OBJECT_CLASS (ev_sidebar_parent_class)->dispose (object);
 }
 
 static void
-ev_sidebar_class_init (EvSidebarClass *ev_sidebar_class)
+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)
 {
-	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);
+	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)
+{
+        GObjectClass *g_object_class = G_OBJECT_CLASS (ev_sidebar_class);
+
 	g_type_class_add_private (g_object_class, sizeof (EvSidebarPrivate));
-	   
-	gtk_object_klass->destroy = ev_sidebar_destroy;
+
+	g_object_class->dispose = ev_sidebar_dispose;
+	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
@@ -92,17 +199,19 @@ ev_sidebar_menu_position_under (GtkMenu  *menu,
 				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;
 }
@@ -115,6 +224,17 @@ ev_sidebar_select_button_press_cb (GtkWidget      *widget,
 	EvSidebar *ev_sidebar = EV_SIDEBAR (user_data);
 
 	if (event->button == 1) {
+		GtkRequisition requisition;
+		GtkAllocation allocation;
+		gint 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,
+					     MAX (width, requisition.width), -1);
+		
 		gtk_widget_grab_focus (widget);
 			 
 		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), TRUE);
@@ -135,10 +255,10 @@ ev_sidebar_select_button_key_press_cb (GtkWidget   *widget,
 {
 	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) {
+	if (event->keyval == GDK_KEY_space ||
+	    event->keyval == GDK_KEY_KP_Space ||
+	    event->keyval == GDK_KEY_Return ||
+	    event->keyval == GDK_KEY_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,
@@ -185,30 +305,26 @@ 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
@@ -216,7 +332,6 @@ ev_sidebar_init (EvSidebar *ev_sidebar)
 {
 	GtkWidget *hbox;
 	GtkWidget *close_button;
-	GtkWidget *select_button;
 	GtkWidget *select_hbox;
 	GtkWidget *arrow;
 	GtkWidget *image;
@@ -237,12 +352,12 @@ ev_sidebar_init (EvSidebar *ev_sidebar)
 	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);
 
@@ -258,11 +373,11 @@ ev_sidebar_init (EvSidebar *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);
@@ -271,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);
    
@@ -281,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);
@@ -294,7 +409,8 @@ ev_sidebar_init (EvSidebar *ev_sidebar)
 			    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 */
@@ -322,7 +438,9 @@ ev_sidebar_add_page (EvSidebar   *ev_sidebar,
 	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),
@@ -335,7 +453,8 @@ 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_TITLE, title,
@@ -343,7 +462,10 @@ ev_sidebar_add_page (EvSidebar   *ev_sidebar,
 					   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,
@@ -356,24 +478,20 @@ 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
-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)) {
@@ -384,20 +502,36 @@ ev_sidebar_set_document (EvSidebar   *sidebar,
 				    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);
+}