From 3db6772bd564fc2c592b61853b870dd8c9dc5e1b Mon Sep 17 00:00:00 2001 From: raveit65 Date: Mon, 23 Apr 2018 16:46:40 +0200 Subject: css: Convert to GResource --- configure.ac | 1 + data/Makefile.am | 8 +- data/mate-panel.css | 10 --- data/panel-grid-symbolic.svg | 173 ------------------------------------- data/theme/Makefile.am | 8 ++ data/theme/mate-panel.css | 10 +++ data/theme/panel-grid-symbolic.svg | 173 +++++++++++++++++++++++++++++++++++++ mate-panel/Makefile.am | 1 - mate-panel/main.c | 35 ++++---- mate-panel/panel.gresource.xml | 4 + 10 files changed, 216 insertions(+), 207 deletions(-) delete mode 100644 data/mate-panel.css delete mode 100644 data/panel-grid-symbolic.svg create mode 100644 data/theme/Makefile.am create mode 100644 data/theme/mate-panel.css create mode 100644 data/theme/panel-grid-symbolic.svg diff --git a/configure.ac b/configure.ac index aa94cfb7..65a1a4b9 100644 --- a/configure.ac +++ b/configure.ac @@ -254,6 +254,7 @@ AC_SUBST(REBUILD) AC_OUTPUT([ Makefile data/Makefile +data/theme/Makefile data/org.mate.panel.gschema.xml data/org.mate.panel.menubar.gschema.xml data/org.mate.panel.object.gschema.xml diff --git a/data/Makefile.am b/data/Makefile.am index ad405ccd..74c58edd 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -1,3 +1,6 @@ +SUBDIRS = \ + theme + layoutdir = $(datadir)/mate-panel/layouts layout_DATA = \ default.layout \ @@ -7,11 +10,6 @@ layout_DATA = \ opensuse.layout \ ubuntu.layout -matepaneldir = $(datadir)/mate-panel -matepanel_DATA = \ - mate-panel.css \ - panel-grid-symbolic.svg - @INTLTOOL_XML_NOMERGE_RULE@ gsettings_ENUM_NAMESPACE = org.mate.panel diff --git a/data/mate-panel.css b/data/mate-panel.css deleted file mode 100644 index bfa890d1..00000000 --- a/data/mate-panel.css +++ /dev/null @@ -1,10 +0,0 @@ - -MatePanelAppletFrameDBus > MatePanelAppletFrameDBus { - border-style: none; - background-repeat: no-repeat; - background-position: left; - color: @theme_fg_color; - background-image: -gtk-recolor(url("panel-grid-symbolic.svg")); - background-size: 12px 22px; -} - diff --git a/data/panel-grid-symbolic.svg b/data/panel-grid-symbolic.svg deleted file mode 100644 index c057ca53..00000000 --- a/data/panel-grid-symbolic.svg +++ /dev/null @@ -1,173 +0,0 @@ - - - - - - - - image/svg+xml - - Gnome Symbolic Icon Theme - - - - - - - - Gnome Symbolic Icon Theme - - - - - - - - - - - - - - - diff --git a/data/theme/Makefile.am b/data/theme/Makefile.am new file mode 100644 index 00000000..be159948 --- /dev/null +++ b/data/theme/Makefile.am @@ -0,0 +1,8 @@ +NULL = + +EXTRA_DIST = \ + mate-panel.css \ + panel-grid-symbolic.svg \ + $(NULL) + +-include $(top_srcdir)/git.mk diff --git a/data/theme/mate-panel.css b/data/theme/mate-panel.css new file mode 100644 index 00000000..bfa890d1 --- /dev/null +++ b/data/theme/mate-panel.css @@ -0,0 +1,10 @@ + +MatePanelAppletFrameDBus > MatePanelAppletFrameDBus { + border-style: none; + background-repeat: no-repeat; + background-position: left; + color: @theme_fg_color; + background-image: -gtk-recolor(url("panel-grid-symbolic.svg")); + background-size: 12px 22px; +} + diff --git a/data/theme/panel-grid-symbolic.svg b/data/theme/panel-grid-symbolic.svg new file mode 100644 index 00000000..c057ca53 --- /dev/null +++ b/data/theme/panel-grid-symbolic.svg @@ -0,0 +1,173 @@ + + + + + + + + image/svg+xml + + Gnome Symbolic Icon Theme + + + + + + + + Gnome Symbolic Icon Theme + + + + + + + + + + + + + + + diff --git a/mate-panel/Makefile.am b/mate-panel/Makefile.am index 6de930be..836b49e4 100644 --- a/mate-panel/Makefile.am +++ b/mate-panel/Makefile.am @@ -14,7 +14,6 @@ AM_CPPFLAGS = \ -I$(top_builddir)/mate-panel/libpanel-util \ -DMATELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ -DPANELDATADIR=\""$(datadir)/mate-panel"\" \ - -DDATADIR=\""$(datadir)"\" \ $(DISABLE_DEPRECATED_CFLAGS) AM_CFLAGS = $(WARN_CFLAGS) diff --git a/mate-panel/main.c b/mate-panel/main.c index dc136cda..825ec348 100644 --- a/mate-panel/main.c +++ b/mate-panel/main.c @@ -60,8 +60,12 @@ main (int argc, char **argv) { char *desktopfile; GOptionContext *context; - GError *error, *error2; - GtkCssProvider *provider; + GError *error; + GdkScreen *screen; + GtkCssProvider *css; + GtkStyleProvider *provider; + const gchar *resource; + guint priority; bindtextdomain (GETTEXT_PACKAGE, MATELOCALEDIR); bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); @@ -167,22 +171,17 @@ main (int argc, char **argv) * connecting to the session manager */ panel_session_init (); - /*Load a css file from a path so the drag handle image can be loaded*/ - error2 = NULL; - provider = gtk_css_provider_new (); - gtk_css_provider_load_from_path (provider, - DATADIR "/mate-panel/" "mate-panel.css", &error2); - - if (error2 != NULL) { - g_warning ("Can't parse mate-panel CSS custom description: %s\n", error2->message); - g_error_free (error2); - } - else { - gtk_style_context_add_provider_for_screen (gdk_screen_get_default(), - GTK_STYLE_PROVIDER (provider), - GTK_STYLE_PROVIDER_PRIORITY_FALLBACK); - } - g_object_unref (provider); + /*Load a css file from a GResource so the drag handle image can be loaded*/ + screen = gdk_screen_get_default (); + css = gtk_css_provider_new (); + provider = GTK_STYLE_PROVIDER (css); + resource = "/org/mate/panel/theme/mate-panel.css"; + priority = GTK_STYLE_PROVIDER_PRIORITY_FALLBACK; + + gtk_css_provider_load_from_resource (css, resource); + gtk_style_context_add_provider_for_screen (screen, provider, priority); + + g_object_unref (provider); gtk_main (); diff --git a/mate-panel/panel.gresource.xml b/mate-panel/panel.gresource.xml index c49541d0..df6396c5 100644 --- a/mate-panel/panel.gresource.xml +++ b/mate-panel/panel.gresource.xml @@ -5,4 +5,8 @@ panel-run-dialog.ui ../applets/fish/wanda.png + + ../data/theme/mate-panel.css + ../data/theme/panel-grid-symbolic.svg + -- cgit v1.2.1