shell: Port EvWindow to GtkStyleContext

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

diff --git a/shell/ev-window.c b/shell/ev-window.c
index 4fe718333f0890a131cef978b55c8269f922865b..0e6fd92a4fe1ddf26e0b5188d1ff218f3d5e68aa 100644 (file)
--- a/shell/ev-window.c
+++ b/shell/ev-window.c
@@ -75,6 +75,7 @@
 #include "ev-properties-dialog.h"
 #include "ev-sidebar-annotations.h"
 #include "ev-sidebar-attachments.h"
+#include "ev-sidebar-bookmarks.h"
 #include "ev-sidebar.h"
 #include "ev-sidebar-links.h"
 #include "ev-sidebar-page.h"
@@ -140,6 +141,7 @@ struct _EvWindowPrivate {
        GtkWidget *sidebar_attachments;
        GtkWidget *sidebar_layers;
        GtkWidget *sidebar_annots;
+       GtkWidget *sidebar_bookmarks;
 
        /* Settings */
        GSettings *settings;
@@ -251,6 +253,7 @@ struct _EvWindowPrivate {
 #define ATTACHMENTS_SIDEBAR_ID "attachments"
 #define LAYERS_SIDEBAR_ID "layers"
 #define ANNOTS_SIDEBAR_ID "annotations"
+#define BOOKMARKS_SIDEBAR_ID "bookmarks"
 
 #define EV_PRINT_SETTINGS_FILE  "print-settings"
 #define EV_PRINT_SETTINGS_GROUP "Print Settings"
@@ -964,6 +967,8 @@ ev_window_sidebar_get_current_page_id (EvWindow *ev_window)
                id = LAYERS_SIDEBAR_ID;
        } else if (current_page == ev_window->priv->sidebar_annots) {
                id = ANNOTS_SIDEBAR_ID;
+       } else if (current_page == ev_window->priv->sidebar_bookmarks) {
+               id = BOOKMARKS_SIDEBAR_ID;
        } else {
                g_assert_not_reached();
        }
@@ -984,6 +989,7 @@ ev_window_sidebar_set_current_page (EvWindow    *window,
        GtkWidget  *attachments = window->priv->sidebar_attachments;
        GtkWidget  *annots = window->priv->sidebar_annots;
        GtkWidget  *layers = window->priv->sidebar_layers;
+       GtkWidget  *bookmarks = window->priv->sidebar_bookmarks;
 
        if (strcmp (page_id, LINKS_SIDEBAR_ID) == 0 &&
            ev_sidebar_page_support_document (EV_SIDEBAR_PAGE (links), document)) {
@@ -1000,6 +1006,9 @@ ev_window_sidebar_set_current_page (EvWindow    *window,
        } else if (strcmp (page_id, ANNOTS_SIDEBAR_ID) == 0 &&
                   ev_sidebar_page_support_document (EV_SIDEBAR_PAGE (annots), document)) {
                ev_sidebar_set_page (sidebar, annots);
+       } else if (strcmp (page_id, BOOKMARKS_SIDEBAR_ID) == 0 &&
+                  ev_sidebar_page_support_document (EV_SIDEBAR_PAGE (bookmarks), document)) {
+               ev_sidebar_set_page (sidebar, bookmarks);
        }
 }
 
@@ -2044,6 +2053,8 @@ ev_window_open_uri (EvWindow       *ev_window,
 
        if (ev_window->priv->metadata) {
                ev_window->priv->bookmarks = ev_bookmarks_new (ev_window->priv->metadata);
+               ev_sidebar_bookmarks_set_bookmarks (EV_SIDEBAR_BOOKMARKS (ev_window->priv->sidebar_bookmarks),
+                                                   ev_window->priv->bookmarks);
                g_signal_connect_swapped (ev_window->priv->bookmarks, "changed",
                                          G_CALLBACK (ev_window_setup_bookmarks),
                                          ev_window);
@@ -3833,22 +3844,19 @@ fullscreen_toolbar_setup_item_properties (GtkUIManager *ui_manager)
 static void
 fullscreen_toolbar_remove_shadow (GtkWidget *toolbar)
 {
-       static gboolean done = FALSE;
+       GtkCssProvider *provider;
 
-       if (!done) {
-               gtk_rc_parse_string (
-                       "\n"
-                       "   style \"fullscreen-toolbar-style\"\n"
-                       "   {\n"
-                       "      GtkToolbar::shadow-type=GTK_SHADOW_NONE\n"
-                       "   }\n"
-                       "\n"
-                       "    widget \"*.fullscreen-toolbar\" style \"fullscreen-toolbar-style\"\n"
-                       "\n");
-               done = TRUE;
-       }
-       
-       gtk_widget_set_name (toolbar, "fullscreen-toolbar");
+       gtk_widget_set_name (toolbar, "ev-fullscreen-toolbar");
+
+       provider = gtk_css_provider_new ();
+       gtk_css_provider_load_from_data (provider,
+                                        "#ev-fullscreen-toolbar {\n"
+                                        " -GtkToolbar-shadow-type: none; }",
+                                        -1, NULL);
+       gtk_style_context_add_provider (gtk_widget_get_style_context (toolbar),
+                                       GTK_STYLE_PROVIDER (provider),
+                                       GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
+       g_object_unref (provider);
 }
 
 static void
@@ -5843,6 +5851,13 @@ sidebar_annots_annot_add_cancelled (EvSidebarAnnotations *sidebar_annots,
        ev_view_cancel_add_annotation (EV_VIEW (window->priv->view));
 }
 
+static void
+sidebar_bookmarks_add_bookmark (EvSidebarBookmarks *sidebar_bookmarks,
+                               EvWindow           *window)
+{
+       ev_window_cmd_bookmarks_add (NULL, window);
+}
+
 static void
 register_custom_actions (EvWindow *window, GtkActionGroup *group)
 {
@@ -7137,6 +7152,16 @@ ev_window_init (EvWindow *ev_window)
        ev_sidebar_add_page (EV_SIDEBAR (ev_window->priv->sidebar),
                             sidebar_widget);
 
+       sidebar_widget = ev_sidebar_bookmarks_new ();
+       ev_window->priv->sidebar_bookmarks = sidebar_widget;
+       g_signal_connect (sidebar_widget,
+                         "add-bookmark",
+                         G_CALLBACK (sidebar_bookmarks_add_bookmark),
+                         ev_window);
+       gtk_widget_show (sidebar_widget);
+       ev_sidebar_add_page (EV_SIDEBAR (ev_window->priv->sidebar),
+                            sidebar_widget);
+
        ev_window->priv->view_box = gtk_vbox_new (FALSE, 0);
        ev_window->priv->scrolled_window =
                GTK_WIDGET (g_object_new (GTK_TYPE_SCROLLED_WINDOW,