Updated Brazilian Portuguese translation.

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

diff --git a/shell/ev-sidebar.c b/shell/ev-sidebar.c
index c5a6574ceab72df8951892790ec6ddc88a6f9b7d..f23a45f39cc00d7d33c48161f7d63403503e5f33 100644 (file)
--- a/shell/ev-sidebar.c
+++ b/shell/ev-sidebar.c
@@ -29,21 +29,10 @@
 #include <gdk/gdkkeysyms.h>
 
 #include "ev-sidebar.h"
 #include <gdk/gdkkeysyms.h>
 
 #include "ev-sidebar.h"

-#include "ev-document-thumbnails.h"
-#include "ev-document-links.h"
-#include "ev-sidebar-links.h"
-#include "ev-sidebar-thumbnails.h"
-
-typedef struct
-{
-       char *id;
-       char *title;
-       GtkWidget *main_widget;
-} EvSidebarPage;
+#include "ev-sidebar-page.h"

 
 enum
 {
 
 enum
 {

-       PAGE_COLUMN_ID,

        PAGE_COLUMN_TITLE,
        PAGE_COLUMN_MENU_ITEM,
        PAGE_COLUMN_MAIN_WIDGET,
        PAGE_COLUMN_TITLE,
        PAGE_COLUMN_MENU_ITEM,
        PAGE_COLUMN_MAIN_WIDGET,


@@ -54,7 +43,6 @@ enum
 struct _EvSidebarPrivate {
        GtkWidget *notebook;
        GtkWidget *menu;
 struct _EvSidebarPrivate {
        GtkWidget *notebook;
        GtkWidget *menu;

-       GtkWidget *frame;

        GtkWidget *hbox;
        GtkWidget *label;
           
        GtkWidget *hbox;
        GtkWidget *label;
           


@@ -75,6 +63,12 @@ ev_sidebar_destroy (GtkObject *object)
                gtk_menu_detach (GTK_MENU (ev_sidebar->priv->menu));
                ev_sidebar->priv->menu = NULL;
        }
                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);
 }
           
        (* GTK_OBJECT_CLASS (ev_sidebar_parent_class)->destroy) (object);
 }


@@ -125,6 +119,15 @@ ev_sidebar_select_button_press_cb (GtkWidget      *widget,
        EvSidebar *ev_sidebar = EV_SIDEBAR (user_data);
 
        if (event->button == 1) {
        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_widget_grab_focus (widget);
                         
                gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), TRUE);


@@ -218,13 +221,14 @@ ev_sidebar_menu_item_activate_cb (GtkWidget *widget,
                } else {
                        valid = gtk_tree_model_iter_next (ev_sidebar->priv->page_model, &iter);
                }
                } 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)
 {
        }
 }
 
 static void
 ev_sidebar_init (EvSidebar *ev_sidebar)
 {

-       GtkWidget *frame;

        GtkWidget *hbox;
        GtkWidget *close_button;
        GtkWidget *select_button;
        GtkWidget *hbox;
        GtkWidget *close_button;
        GtkWidget *select_button;


@@ -233,26 +237,19 @@ ev_sidebar_init (EvSidebar *ev_sidebar)
        GtkWidget *image;
 
        ev_sidebar->priv = EV_SIDEBAR_GET_PRIVATE (ev_sidebar);
        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,
 
        /* 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 */
                                            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;
        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_widget_show (hbox);
 
        select_button = gtk_toggle_button_new ();


@@ -269,7 +266,7 @@ 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,
        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_widget_show (ev_sidebar->priv->label);
 
        arrow = gtk_arrow_new (GTK_ARROW_DOWN, GTK_SHADOW_NONE);


@@ -279,7 +276,7 @@ ev_sidebar_init (EvSidebar *ev_sidebar)
        gtk_container_add (GTK_CONTAINER (select_button), select_hbox);
        gtk_widget_show (select_hbox);
 
        gtk_container_add (GTK_CONTAINER (select_button), select_hbox);
        gtk_widget_show (select_hbox);
 

-       gtk_box_pack_start (GTK_BOX (hbox), select_button, FALSE, FALSE, 0);
+       gtk_box_pack_start (GTK_BOX (hbox), select_button, TRUE, TRUE, 0);

        gtk_widget_show (select_button);
 
        close_button = gtk_button_new ();
        gtk_widget_show (select_button);
 
        close_button = gtk_button_new ();


@@ -311,6 +308,8 @@ 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_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), FALSE);

 }
 
 /* Public functions */
 }
 
 /* Public functions */


@@ -327,19 +326,19 @@ ev_sidebar_new (void)
 
 void
 ev_sidebar_add_page (EvSidebar   *ev_sidebar,
 
 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;
                     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));
        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));
        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);
           
        index = gtk_notebook_append_page (GTK_NOTEBOOK (ev_sidebar->priv->notebook),
                                          main_widget, NULL);


@@ -354,7 +353,6 @@ ev_sidebar_add_page (EvSidebar   *ev_sidebar,
           
        gtk_list_store_insert_with_values (GTK_LIST_STORE (ev_sidebar->priv->page_model),
                                           &iter, 0,
           
        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_TITLE, title,
                                           PAGE_COLUMN_MENU_ITEM, menu_item,
                                           PAGE_COLUMN_MAIN_WIDGET, main_widget,


@@ -373,6 +371,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);
        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
 }
 
 void


@@ -381,34 +380,42 @@ ev_sidebar_set_document (EvSidebar   *sidebar,
 {
        EvSidebarPrivate *priv;
        GtkTreeIter iter;
 {
        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;
        
           
        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 *widget;

+               GtkWidget *menu_widget;

 
                gtk_tree_model_get (priv->page_model, &iter,
                                    PAGE_COLUMN_MAIN_WIDGET, &widget,
 
                gtk_tree_model_get (priv->page_model, &iter,
                                    PAGE_COLUMN_MAIN_WIDGET, &widget,

+                                   PAGE_COLUMN_MENU_ITEM, &menu_widget,

                                    -1);
                         
                                    -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), TRUE);

        }
 }
        }
 }

+