[iagno] Adwaita is blue, classic reversi green.
- From: Arnaud Bonatti <arnaudb src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [iagno] Adwaita is blue, classic reversi green.
- Date: Sat, 14 Feb 2015 02:38:09 +0000 (UTC)
commit 636fd3327463b94f42fd1e4c5b0292469b490723
Author: Arnaud Bonatti <arnaud bonatti gmail com>
Date: Sat Feb 14 03:37:54 2015 +0100
Adwaita is blue, classic reversi green.
data/themes/Makefile.am | 1 +
data/themes/adwaita.theme.in | 16 ++++++++--------
data/themes/classic.theme.in | 32 ++++++++++++++++++++++++++++++++
data/themes/sun_and_star.theme.in | 8 ++++----
po/POTFILES.in | 1 +
src/game-view.vala | 6 +++---
src/themes.vala | 2 +-
7 files changed, 50 insertions(+), 16 deletions(-)
---
diff --git a/data/themes/Makefile.am b/data/themes/Makefile.am
index 50125c2..051cf8a 100644
--- a/data/themes/Makefile.am
+++ b/data/themes/Makefile.am
@@ -1,6 +1,7 @@
themes_keydir = $(datadir)/iagno/themes/key
themes_key_files = \
adwaita.theme.in \
+ classic.theme.in \
high_contrast.theme.in \
sun_and_star.theme.in
themes_key_DATA = $(themes_key_files:.theme.in=.theme)
diff --git a/data/themes/adwaita.theme.in b/data/themes/adwaita.theme.in
index 078d637..d6e463a 100644
--- a/data/themes/adwaita.theme.in
+++ b/data/themes/adwaita.theme.in
@@ -8,20 +8,20 @@ File=black_and_white.svg
[Background]
#Image=
-Red=0.3
-Green=0.6
-Blue=0.4
+Red=0.2
+Green=0.4
+Blue=0.6
[Border]
-Red=0.0
-Green=0.0
-Blue=0.0
+Red=0.1
+Green=0.1
+Blue=0.1
Width=3
[Spacing]
Red=0.1
-Green=0.3
-Blue=0.2
+Green=0.2
+Blue=0.3
Width=2
[Margin]
diff --git a/data/themes/classic.theme.in b/data/themes/classic.theme.in
new file mode 100644
index 0000000..b1bb63a
--- /dev/null
+++ b/data/themes/classic.theme.in
@@ -0,0 +1,32 @@
+[Theme]
+Id=classic
+_Name=Classic
+
+[Pieces]
+#Animated=True
+File=black_and_white.svg
+
+[Background]
+#Image=
+Red=0.2
+Green=0.6
+Blue=0.4
+
+[Border]
+Red=0.1
+Green=0.1
+Blue=0.1
+Width=3
+
+[Spacing]
+Red=0.1
+Green=0.3
+Blue=0.2
+Width=2
+
+[Margin]
+#Width=0
+
+[Sound]
+Flip=flip-piece.ogg
+GameOver=gameover.ogg
diff --git a/data/themes/sun_and_star.theme.in b/data/themes/sun_and_star.theme.in
index 44dbf64..17f02d6 100644
--- a/data/themes/sun_and_star.theme.in
+++ b/data/themes/sun_and_star.theme.in
@@ -8,14 +8,14 @@ File=sun_and_star.svg
[Background]
#Image=
-Red=0.3
+Red=0.2
Green=0.6
Blue=0.4
[Border]
-Red=0.0
-Green=0.0
-Blue=0.0
+Red=0.1
+Green=0.1
+Blue=0.1
Width=3
[Spacing]
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 3995379..9b513db 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -7,6 +7,7 @@ data/iagno.desktop.in
[type: gettext/glade]data/iagno-themes.ui
[type: gettext/glade]data/iagno.ui
[type: gettext/ini]data/themes/adwaita.theme.in
+[type: gettext/ini]data/themes/classic.theme.in
[type: gettext/ini]data/themes/high_contrast.theme.in
[type: gettext/ini]data/themes/sun_and_star.theme.in
data/org.gnome.iagno.gschema.xml
diff --git a/src/game-view.vala b/src/game-view.vala
index 2d5740c..3d9d8e9 100644
--- a/src/game-view.vala
+++ b/src/game-view.vala
@@ -120,10 +120,10 @@ public class GameView : Gtk.DrawingArea
string filename;
if (defaults.gtk_theme_name == "HighContrast")
filename = "high_contrast.theme";
- /* else if (defaults.gtk_application_prefer_dark_theme == true) // TODO
- filename = "adwaita_dark.theme"; */
- else
+ else if (defaults.gtk_application_prefer_dark_theme == true)
filename = "adwaita.theme";
+ else
+ filename = "classic.theme";
key.load_from_file (Path.build_filename (DATA_DIRECTORY, "themes", "key", filename),
GLib.KeyFileFlags.NONE);
load_theme (key);
}
diff --git a/src/themes.vala b/src/themes.vala
index eb064ad..7222cb2 100644
--- a/src/themes.vala
+++ b/src/themes.vala
@@ -38,7 +38,6 @@ public class ThemesDialog : Dialog
/* load themes key files */
Dir dir;
- string theme = settings.get_string ("theme");
try
{
dir = Dir.open (Path.build_filename (DATA_DIRECTORY, "themes", "key"));
@@ -88,6 +87,7 @@ public class ThemesDialog : Dialog
view.theme = ((Label) (((Box) row.get_child ()).get_children ().nth_data (2))).label;
// TODO BETTER view.theme may have fall back to "default"
settings.set_string ("theme", view.theme);
+ queue_draw (); // try to redraw because there’re sometimes bugs
});
}
catch (FileError e)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]