Increase timeout to hide full screen popup. Bug 316123.

[evince.git] / shell / ev-sidebar.c

diff --git a/shell/ev-sidebar.c b/shell/ev-sidebar.c
index 3f296075a84c7e9fb9e382da0cbb4da6c1346de8..509a90b35ee3aa509ae635497c9639b44c7f3c67 100644 (file)
--- a/shell/ev-sidebar.c
+++ b/shell/ev-sidebar.c
@@ -30,8 +30,12 @@
 
 #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
 {
@@ -45,7 +49,6 @@ enum
 struct _EvSidebarPrivate {
        GtkWidget *notebook;
        GtkWidget *menu;
-       GtkWidget *frame;
        GtkWidget *hbox;
        GtkWidget *label;
           
@@ -66,10 +69,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)
 {
@@ -84,6 +183,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
@@ -116,6 +225,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);
@@ -186,36 +304,31 @@ 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;
@@ -234,14 +347,9 @@ ev_sidebar_init (EvSidebar *ev_sidebar)
                                            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 ();
@@ -363,6 +471,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
@@ -399,6 +508,8 @@ ev_sidebar_set_document (EvSidebar   *sidebar,
                } else {
                                gtk_widget_set_sensitive (menu_widget, FALSE);
                }
+               g_object_unref (widget);
+               g_object_unref (menu_widget);
        }
        
        if (!has_pages) {