diff options
| author | Carlos Garcia Campos <[email protected]> | 2012-09-29 12:22:17 +0200 |
|---|---|---|
| committer | raveit65 <[email protected]> | 2018-03-22 21:24:30 +0100 |
| commit | 1b1f2c58617b72efb9aad7ebc98fe390138d733f (patch) | |
| tree | 59d41dbf6f529175d9dd678db1050a209e837577 | |
| parent | 11fc5dc635d544b7d19b5774ab11dcd5e5c2638c (diff) | |
| download | atril-1b1f2c58617b72efb9aad7ebc98fe390138d733f.tar.bz2 atril-1b1f2c58617b72efb9aad7ebc98fe390138d733f.tar.xz | |
Move custom css to a file compiled as a gresource
origin commit:
https://git.gnome.org/browse/evince/commit/shell?h=gnome-3-6&id=65fa4ff
| -rw-r--r-- | shell/Makefile.am | 1 | ||||
| -rw-r--r-- | shell/atril.css | 3 | ||||
| -rw-r--r-- | shell/atril.gresource.xml | 1 | ||||
| -rw-r--r-- | shell/ev-window.c | 34 |
4 files changed, 38 insertions, 1 deletions
diff --git a/shell/Makefile.am b/shell/Makefile.am index ea8d91d8..1d8b8259 100644 --- a/shell/Makefile.am +++ b/shell/Makefile.am @@ -153,6 +153,7 @@ atrild_LDADD= \ endif EXTRA_DIST = \ + atril.css \ atril-ui.xml \ atril-toolbar.xml \ atril.gresource.xml \ diff --git a/shell/atril.css b/shell/atril.css new file mode 100644 index 00000000..e834616e --- /dev/null +++ b/shell/atril.css @@ -0,0 +1,3 @@ +#ev-fullscreen-toolbar { + +} diff --git a/shell/atril.gresource.xml b/shell/atril.gresource.xml index f66c2a10..952c7de1 100644 --- a/shell/atril.gresource.xml +++ b/shell/atril.gresource.xml @@ -19,6 +19,7 @@ <gresource prefix="/org/mate/atril/shell"> <file alias="ui/atril.xml" compressed="true" preprocess="xml-stripblanks">atril-ui.xml</file> <file alias="ui/toolbar.xml" compressed="true" preprocess="xml-stripblanks">atril-toolbar.xml</file> + <file alias="ui/atril.css" compressed="true">atril.css</file> </gresource> </gresources> diff --git a/shell/ev-window.c b/shell/ev-window.c index 065ada89..6bb7eefb 100644 --- a/shell/ev-window.c +++ b/shell/ev-window.c @@ -4231,7 +4231,7 @@ ev_window_run_fullscreen (EvWindow *window) "/FullscreenToolbar"); gtk_widget_set_name (window->priv->fullscreen_toolbar, - "atril-fullscreen-toolbar"); + "ev-fullscreen-toolbar"); gtk_toolbar_set_style (GTK_TOOLBAR (window->priv->fullscreen_toolbar), GTK_TOOLBAR_BOTH_HORIZ); fullscreen_toolbar_setup_item_properties (window->priv->ui_manager); @@ -7647,11 +7647,33 @@ handle_sync_view_cb (EvAtrilWindow *object, } #endif /* ENABLE_DBUS */ +static gboolean +_gtk_css_provider_load_from_resource (GtkCssProvider *provider, + const char *resource_path, + GError **error) +{ + GBytes *data; + gboolean retval; + + data = g_resources_lookup_data (resource_path, 0, error); + if (!data) + return FALSE; + + retval = gtk_css_provider_load_from_data (provider, + g_bytes_get_data (data, NULL), + g_bytes_get_size (data), + error); + g_bytes_unref (data); + + return retval; +} + static void ev_window_init (EvWindow *ev_window) { GtkActionGroup *action_group; GtkAccelGroup *accel_group; + GtkCssProvider *css_provider; GError *error = NULL; GtkWidget *sidebar_widget; GtkWidget *menuitem; @@ -7758,6 +7780,16 @@ ev_window_init (EvWindow *ev_window) &error); g_assert_no_error (error); + css_provider = gtk_css_provider_new (); + _gtk_css_provider_load_from_resource (css_provider, + "/org/mate/atril/shell/ui/atril.css", + &error); + g_assert_no_error (error); + gtk_style_context_add_provider_for_screen (gtk_widget_get_screen (GTK_WIDGET (ev_window)), + GTK_STYLE_PROVIDER (css_provider), + GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); + g_object_unref (css_provider); + ev_window->priv->recent_manager = gtk_recent_manager_get_default (); ev_window->priv->recent_action_group = NULL; ev_window->priv->recent_ui_id = 0; |