[gcompris/gcomprixogoo] Removed skin dependancies for activities.
- From: Bruno Coudoin <bcoudoin src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [gcompris/gcomprixogoo] Removed skin dependancies for activities.
- Date: Wed, 30 Dec 2009 22:28:50 +0000 (UTC)
commit fc4f404df4ac2a9befdd82291bae853c70eba314
Author: Bruno Coudoin <bruno coudoin free fr>
Date: Wed Dec 30 23:27:11 2009 +0100
Removed skin dependancies for activities.
It is too hard to have skinable activities. We no more do that.
boards/skins/gartoon/skin.xml | 25 -------------------------
src/maze-activity/maze.c | 9 +++++----
src/missing_letter-activity/missingletter.c | 2 +-
src/pythontest-activity/pythontest.py | 6 +++---
4 files changed, 9 insertions(+), 33 deletions(-)
---
diff --git a/boards/skins/gartoon/skin.xml b/boards/skins/gartoon/skin.xml
index efcf9b1..7593cca 100644
--- a/boards/skins/gartoon/skin.xml
+++ b/boards/skins/gartoon/skin.xml
@@ -43,31 +43,6 @@
<color id="menu/text" rgba="0x000000FF"/>
<color id="menu/description_bg_color" rgba="0xe8e7e2CCL"/>
- <!-- Here you may define some other properties that will -->
- <!-- affect a particular game. -->
- <!-- For example, in futur, the colors of the canal lock game will be -->
- <!-- customisable with some lines like: -->
- <!-- <color id="canal_lock/canal color" rgba="0x0010FFFF"/>-->
- <!-- <color id="canal_lock/lock color" rgba="0x8cc679FF"/>-->
- <!-- <color id="canal_lock/lock color h" rgba="0x71A65FFF"/>-->
- <!-- <color id="canal_lock/canal lock color" rgba="0xd1cd0cFF"/>-->
- <!-- <color id="canal_lock/canal lock color h" rgba="0xf1ed1cFF"/>-->
- <!-- <color id="canal_lock/ground color" rgba="0x9b5f5aFF"/>-->
- <color id="pythontest/circle in" rgba="0x8080FFFF"/>
- <color id="pythontest/circle out" rgba="0xFFFFFFFF"/>
- <color id="pythontest/line" rgba="0xFFFF40FF"/>
-
- <color id="erase/rectangle in" rgba="0xfb1f1fCC"/>
- <color id="erase/rectangle out" rgba="0X1ECECEFF"/>
- <color id="erase/rectangle in2" rgba="0xf8565699"/>
- <color id="erase/rectangle out2" rgba="0X0E0E0EFF"/>
- <color id="erase/rectangle in3" rgba="0xf49a9a66"/>
- <color id="erase/rectangle out3" rgba="0XFFFFFFFF"/>
-
- <color id="missingletter/question" rgba="0XFFFFFFFF"/>
-
- <color id="maze/wall color" rgba="0x1a1109ff"/>
-
</Skin>
</GCompris>
diff --git a/src/maze-activity/maze.c b/src/maze-activity/maze.c
index 5607249..cc3a260 100644
--- a/src/maze-activity/maze.c
+++ b/src/maze-activity/maze.c
@@ -36,6 +36,7 @@
#define BASE_Y2 470
#define LINE_COLOR "white"
+#define WALL_COLOR 0x1a1109ffL
/* array of the board */
static int Maze[MAX_BREEDTE][MAX_HOOGTE];
@@ -819,22 +820,22 @@ draw_background(GooCanvasItem *rootItem)
if (x1==0)
draw_a_line(rootItem,
x, y, x, y+cellsize,
- gc_skin_get_color("maze/wall color"));
+ WALL_COLOR);
if (y1==0)
draw_a_line(rootItem,
x, y, x+cellsize, y,
- gc_skin_get_color("maze/wall color"));
+ WALL_COLOR);
if (wall&EAST)
draw_a_line(rootItem,
x+cellsize, y, x+cellsize, y+cellsize,
- gc_skin_get_color("maze/wall color"));
+ WALL_COLOR);
if (wall&SOUTH)
draw_a_line(rootItem,x,
y+cellsize, x+cellsize, y+cellsize,
- gc_skin_get_color("maze/wall color"));
+ WALL_COLOR);
}
}
diff --git a/src/missing_letter-activity/missingletter.c b/src/missing_letter-activity/missingletter.c
index 8dcc6ac..d693be1 100644
--- a/src/missing_letter-activity/missingletter.c
+++ b/src/missing_letter-activity/missingletter.c
@@ -315,7 +315,7 @@ missing_letter_create_item(GooCanvasItem *parent)
-1,
GTK_ANCHOR_CENTER,
"font", gc_skin_font_board_huge_bold,
- "fill_color_rgba", gc_skin_get_color("missingletter/question"),
+ "fill_color_rgba", 0xFFFFFFFFL,
NULL);
goo_canvas_image_new (boardRootItem,
diff --git a/src/pythontest-activity/pythontest.py b/src/pythontest-activity/pythontest.py
index 70e03a0..935d4f3 100644
--- a/src/pythontest-activity/pythontest.py
+++ b/src/pythontest-activity/pythontest.py
@@ -42,9 +42,9 @@ class Gcompris_pythontest:
self.canvasitems = {}
self.colors = {}
- self.colors['circle_in'] = gcompris.skin.get_color("pythontest/circle in")
- self.colors['circle_out'] = gcompris.skin.get_color("pythontest/circle out")
- self.colors['line'] = gcompris.skin.get_color("pythontest/line")
+ self.colors['circle_in'] = 0x8080FFFF
+ self.colors['circle_out'] = 0xFFFFFFFF
+ self.colors['line'] = 0xFFFF40FF
# Just for config demo
self.config_colors = { 'red' : 0xFF0000FFL,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]