[gnome-sudoku] Load CSS from gresource.
- From: Arnaud Bonatti <arnaudb src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-sudoku] Load CSS from gresource.
- Date: Fri, 24 Oct 2014 16:45:16 +0000 (UTC)
commit 49e554f2f0d15cb7f0cc77d3a965bec47ba6b684
Author: Arnaud Bonatti <arnaud bonatti gmail com>
Date: Fri Oct 24 18:16:25 2014 +0200
Load CSS from gresource.
data/Makefile.am | 3 ++-
data/gnome-sudoku.css | 2 ++
src/gnome-sudoku.gresource.xml.in | 7 ++++---
src/gnome-sudoku.vala | 12 +-----------
4 files changed, 9 insertions(+), 15 deletions(-)
---
diff --git a/data/Makefile.am b/data/Makefile.am
index 19ab780..c98b65a 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -19,7 +19,8 @@ pixmap_DATA = footprints.png
dist_noinst_DATA = \
gnome-sudoku.ui \
gnome-sudoku-menu.ui \
- print-dialog.ui
+ print-dialog.ui \
+ gnome-sudoku.css
man_MANS = gnome-sudoku.6
diff --git a/data/gnome-sudoku.css b/data/gnome-sudoku.css
new file mode 100644
index 0000000..024c57d
--- /dev/null
+++ b/data/gnome-sudoku.css
@@ -0,0 +1,2 @@
+/* Pixel-perfect compatibility with games that have a Button without ButtonBox. */
+GtkButtonBox { -GtkButtonBox-child-internal-pad-x:0; }
diff --git a/src/gnome-sudoku.gresource.xml.in b/src/gnome-sudoku.gresource.xml.in
index e88d36d..fa8962c 100644
--- a/src/gnome-sudoku.gresource.xml.in
+++ b/src/gnome-sudoku.gresource.xml.in
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<gresources>
<gresource prefix="/org/gnome/sudoku/ui">
- <file alias="gnome-sudoku.ui" preprocess="xml-stripblanks">@top_srcdir@/data/gnome-sudoku.ui</file>
- <file preprocess="xml-stripblanks">@top_srcdir@/data/print-dialog.ui</file>
+ <file alias="gnome-sudoku.css">@top_srcdir@/data/gnome-sudoku.css</file>
+ <file preprocess="xml-stripblanks" alias="gnome-sudoku.ui">@top_srcdir@/data/gnome-sudoku.ui</file>
+ <file preprocess="xml-stripblanks">@top_srcdir@/data/print-dialog.ui</file><!-- see print-dialog.vala,
no support for aliases for now -->
</gresource>
<gresource prefix="/org/gnome/sudoku/gtk">
- <file alias="menus.ui" preprocess="xml-stripblanks">@top_srcdir@/data/gnome-sudoku-menu.ui</file>
+ <file preprocess="xml-stripblanks" alias="menus.ui">@top_srcdir@/data/gnome-sudoku-menu.ui</file>
</gresource>
</gresources>
diff --git a/src/gnome-sudoku.vala b/src/gnome-sudoku.vala
index 139ed06..8353af8 100644
--- a/src/gnome-sudoku.vala
+++ b/src/gnome-sudoku.vala
@@ -135,17 +135,7 @@ public class Sudoku : Gtk.Application
Window.set_default_icon_name ("gnome-sudoku");
var css_provider = new CssProvider ();
- try
- {
- /* Pixel-perfect compatibility with games that have a Button without ButtonBox. */
- var data = """GtkButtonBox { -GtkButtonBox-child-internal-pad-x:0; }
- GtkBox#start_box { margin:0 80px 0 80px; }""";
- css_provider.load_from_data (data, data.length);
- }
- catch (GLib.Error e)
- {
- warning ("Error loading css styles: %s", e.message);
- }
+ css_provider.load_from_resource ("/org/gnome/sudoku/ui/gnome-sudoku.css");
StyleContext.add_provider_for_screen (Gdk.Screen.get_default (), css_provider,
STYLE_PROVIDER_PRIORITY_APPLICATION);
var builder = new Builder.from_resource ("/org/gnome/sudoku/ui/gnome-sudoku.ui");
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]