[gcompris] Replaced hard coded or missing font faces
- From: Bruno Coudoin <bcoudoin src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gcompris] Replaced hard coded or missing font faces
- Date: Tue, 13 Aug 2013 20:28:06 +0000 (UTC)
commit 3bfda1d536043b0c055ba5250f9c7cb002618e41
Author: Bruno Coudoin <bcoudoin gcompris net>
Date: Tue Aug 13 22:25:36 2013 +0200
Replaced hard coded or missing font faces
Added a new property in skin to hold the current font.
This property can be changed in the skin.xml file.
In the future it would be nice to let the user select it.
boards/skins/babytoy/skin.xml | 2 ++
boards/skins/gartoon/skin.xml | 2 ++
src/anim-activity/AnimItem.py | 6 +++---
src/ballcatch-activity/ballcatch.py | 1 +
src/braille_alphabets-activity/BrailleChar.py | 2 +-
.../braille_alphabets.py | 12 ++++++------
src/braille_fun-activity/braille_fun.py | 4 ++--
src/braille_lotto-activity/braille_lotto.py | 12 ++++++------
src/color_mix-activity/color_mix.py | 1 +
src/electric-activity/electric.py | 2 +-
src/explore-activity/explore.py | 10 ++++++----
src/gcompris/gcompris.h | 1 +
src/gcompris/skin.c | 3 +++
src/gcompris/skin.h | 1 +
src/guessnumber-activity/guessnumber.py | 2 +-
src/hangman-activity/hangman.py | 3 +++
src/hydroelectric-activity/hydroelectric.py | 2 +-
src/intro_gravity-activity/intro_gravity.py | 1 +
src/land_safe-activity/land_safe.py | 7 +++++++
src/note_names-activity/note_names.py | 2 ++
src/piano_composition-activity/gcomprismusic.py | 7 ++++++-
.../piano_composition.py | 12 +++++++-----
.../place_your_satellite.py | 5 ++++-
src/searace-activity/searace.py | 14 +++++++-------
24 files changed, 75 insertions(+), 39 deletions(-)
---
diff --git a/boards/skins/babytoy/skin.xml b/boards/skins/babytoy/skin.xml
index 7b322c5..a7b0cdd 100644
--- a/boards/skins/babytoy/skin.xml
+++ b/boards/skins/babytoy/skin.xml
@@ -23,6 +23,7 @@
<number id="gcompris/fileselectdiry" value="80"/>
<!-- Defines the main gcompris fonts -->
+ <font id="gcompris/fontface" name="sans"/>
<font id="gcompris/title" name="sans 20"/>
<font id="gcompris/subtitle" name="sans 16"/>
<font id="gcompris/content" name="sans 12"/>
@@ -39,6 +40,7 @@
<font id="gcompris/board/title bold" name="sans bold 21"/>
<font id="gcompris/board/huge" name="sans 28"/>
<font id="gcompris/board/huge bold" name="sans bold 29"/>
+ <font id="gcompris/board/gigantic" name="sans 78"/>
<color id="menu/text" rgba="0x000000FF"/>
<color id="menu/description_bg_color" rgba="0xe8e7e2CCL"/>
diff --git a/boards/skins/gartoon/skin.xml b/boards/skins/gartoon/skin.xml
index 7593cca..93dfb98 100644
--- a/boards/skins/gartoon/skin.xml
+++ b/boards/skins/gartoon/skin.xml
@@ -23,6 +23,7 @@
<number id="gcompris/fileselectdiry" value="80"/>
<!-- Defines the main gcompris fonts -->
+ <font id="gcompris/fontface" name="sans"/>
<font id="gcompris/title" name="sans 20"/>
<font id="gcompris/subtitle" name="sans 16"/>
<font id="gcompris/content" name="sans 12"/>
@@ -39,6 +40,7 @@
<font id="gcompris/board/title bold" name="sans bold 21"/>
<font id="gcompris/board/huge" name="sans 28"/>
<font id="gcompris/board/huge bold" name="sans bold 29"/>
+ <font id="gcompris/board/gigantic" name="sans 78"/>
<color id="menu/text" rgba="0x000000FF"/>
<color id="menu/description_bg_color" rgba="0xe8e7e2CCL"/>
diff --git a/src/anim-activity/AnimItem.py b/src/anim-activity/AnimItem.py
index 5290f6d..bf791ab 100644
--- a/src/anim-activity/AnimItem.py
+++ b/src/anim-activity/AnimItem.py
@@ -1073,7 +1073,7 @@ class AnimItemText(AnimItem):
parent = self.rootitem,
x = center_x,
y = center_y,
- font = "Sans " + str(self.text_size),
+ font = gcompris.skin.get_font("gcompris/fontface") + " " + str(self.text_size),
text=("?"),
fill_color_rgba=color_stroke,
anchor = gtk.ANCHOR_CENTER,
@@ -1093,7 +1093,7 @@ class AnimItemText(AnimItem):
self.item = \
goocanvas.Text(
parent = self.rootitem,
- font = "Sans " + str(self.text_size),
+ font = gcompris.skin.get_font("gcompris/fontface") + " " + str(self.text_size),
)
AnimItem.init_item(self)
self.last_commit = None
@@ -1192,7 +1192,7 @@ class AnimItemText(AnimItem):
def set_size(self, text_size):
- self.item.set_properties(font = "Sans " + str(text_size))
+ self.item.set_properties(font = gcompris.skin.get_font("gcompris/fontface") + " " + str(text_size))
self.recenter_to_drawing_area()
def down_size(self, item, target, event, up):
diff --git a/src/ballcatch-activity/ballcatch.py b/src/ballcatch-activity/ballcatch.py
index 7c7276c..59192e9 100644
--- a/src/ballcatch-activity/ballcatch.py
+++ b/src/ballcatch-activity/ballcatch.py
@@ -75,6 +75,7 @@ class Gcompris_ballcatch:
text = _("Press the two shift keys at the same time,"
" to make the ball go in a straight line."),
fill_color = "black",
+ font = gcompris.skin.get_font("gcompris/board/medium"),
anchor = gtk.ANCHOR_CENTER,
alignment = pango.ALIGN_CENTER
)
diff --git a/src/braille_alphabets-activity/BrailleChar.py b/src/braille_alphabets-activity/BrailleChar.py
index 9a7037e..accf781 100644
--- a/src/braille_alphabets-activity/BrailleChar.py
+++ b/src/braille_alphabets-activity/BrailleChar.py
@@ -81,7 +81,7 @@ class BrailleChar:
fill_color = self.stroke_color,
alignment = pango.ALIGN_CENTER,
anchor = gtk.ANCHOR_CENTER,
- font = 'Sans BOLD')
+ font = gcompris.skin.get_font("gcompris/board/medium bold"))
if not display_letter:
self.text.props.visibility = goocanvas.ITEM_INVISIBLE
diff --git a/src/braille_alphabets-activity/braille_alphabets.py
b/src/braille_alphabets-activity/braille_alphabets.py
index 6a8b218..84743b9 100644
--- a/src/braille_alphabets-activity/braille_alphabets.py
+++ b/src/braille_alphabets-activity/braille_alphabets.py
@@ -185,7 +185,7 @@ class Gcompris_braille_alphabets:
x = 490,
y = 280,
fill_color = "black",
- font = gcompris.skin.get_font("gcompris/subtitle"),
+ font = gcompris.skin.get_font("gcompris/medium"),
width = 395,
anchor = gtk.ANCHOR_CENTER,
text = text)
@@ -206,7 +206,7 @@ class Gcompris_braille_alphabets:
x = 445,
y = 475,
fill_color ="black",
- font = "Sans 10",
+ font = gcompris.skin.get_font("gcompris/board/tiny"),
anchor= gtk.ANCHOR_CENTER,
width = 355,
text = _("When you are ready, click on "
@@ -277,7 +277,7 @@ class Gcompris_braille_alphabets:
x=690,
y=330,
fill_color="black",
- font="Sans 78",
+ font=gcompris.skin.get_font("gcompris/board/gigantic"),
anchor=gtk.ANCHOR_CENTER,
text=str(letter))
@@ -319,7 +319,7 @@ class Gcompris_braille_alphabets:
y = 200,
text = message,
fill_color = "black",
- font = 'SANS 14',
+ font = gcompris.skin.get_font("gcompris/board/medium"),
width = 780,
anchor = gtk.ANCHOR_CENTER,
alignment = pango.ALIGN_CENTER)
@@ -328,7 +328,7 @@ class Gcompris_braille_alphabets:
x=160.0, y=250.0,
text=_("Braille Cell"),
fill_color="black",
- font='Sans BOLD')
+ font=gcompris.skin.get_font("gcompris/board/medium bold"))
BrailleChar(self.rootitem, 150, 270, 120, '',
COLOR_ON ,COLOR_OFF, CIRCLE_FILL, CIRCLE_STROKE,
@@ -339,7 +339,7 @@ class Gcompris_braille_alphabets:
for j in range(3):
goocanvas.Text(parent = self.rootitem,
text = ( str(j + 1 + i * 3) ),
- font = 'Sans 20',
+ font = gcompris.skin.get_font("gcompris/board/big"),
fill_color = "black",
x = i * 120 + 140,
y = j * 45 + 290)
diff --git a/src/braille_fun-activity/braille_fun.py b/src/braille_fun-activity/braille_fun.py
index 424823c..094ae1f 100644
--- a/src/braille_fun-activity/braille_fun.py
+++ b/src/braille_fun-activity/braille_fun.py
@@ -171,7 +171,7 @@ class Gcompris_braille_fun:
fill_color="black",
anchor = gtk.ANCHOR_CENTER,
alignment = pango.ALIGN_CENTER,
- font = 'SANS 50'
+ font = gcompris.skin.get_font("gcompris/board/huge")
)
self.alphabet_vertical = goocanvas.Text(
parent = self.verticalTextRoot,
@@ -181,7 +181,7 @@ class Gcompris_braille_fun:
fill_color = "black",
anchor = gtk.ANCHOR_CENTER,
alignment = pango.ALIGN_CENTER,
- font = 'SANS 50'
+ font = gcompris.skin.get_font("gcompris/board/huge")
)
self.alphabet_array.append(self.alphabet_vertical)
diff --git a/src/braille_lotto-activity/braille_lotto.py b/src/braille_lotto-activity/braille_lotto.py
index ad34d58..cf60616 100644
--- a/src/braille_lotto-activity/braille_lotto.py
+++ b/src/braille_lotto-activity/braille_lotto.py
@@ -167,7 +167,7 @@ class Gcompris_braille_lotto:
svg_id = "#FIG1",
tooltip = _("Click me to get some hint")
)
- self.hint_left_button.translate(200, 330)
+ self.hint_left_button.translate(200, 315)
self.hint_left_button.connect("button_press_event", self.clue_left)
gcompris.utils.item_focus_init(self.hint_left_button, None)
@@ -179,7 +179,7 @@ class Gcompris_braille_lotto:
svg_id = "#FIG2",
tooltip = _("Click me to get some hint")
)
- self.hint_right_button.translate(290, 330)
+ self.hint_right_button.translate(290, 315)
self.hint_right_button.connect("button_press_event", self.clue_right)
gcompris.utils.item_focus_init(self.hint_right_button, None)
@@ -190,11 +190,11 @@ class Gcompris_braille_lotto:
#Translators : Do not translate the token {number}
clue_text = goocanvas.Text(
parent = self.root,
- text = _("I don't have this number\n\nPLAYER {number}").format(number = str(index + 1)),
+ text = _("I don't have this number\nPLAYER {number}").format(number = str(index + 1)),
font = gcompris.skin.get_font("gcompris/board/small"),
x = 290 if index == 0 else 540,
y = 380,
- width = 130,
+ width = 140,
anchor=gtk.ANCHOR_CENTER,
)
self.text_array.append(clue_text)
@@ -286,7 +286,7 @@ class Gcompris_braille_lotto:
x=315,
y=310,
width = 130,
- font = "SANS 10 BOLD",
+ font = gcompris.skin.get_font("gcompris/board/small"),
anchor=gtk.ANCHOR_CENTER,
)
@@ -310,7 +310,7 @@ class Gcompris_braille_lotto:
x=510,
y=310,
width = 130,
- font = "SANS 10 BOLD",
+ font = gcompris.skin.get_font("gcompris/board/small"),
anchor=gtk.ANCHOR_CENTER,
)
if (self.check_random[self.counter] in self.ticket_array[6:12]):
diff --git a/src/color_mix-activity/color_mix.py b/src/color_mix-activity/color_mix.py
index e8cc45f..afc3706 100644
--- a/src/color_mix-activity/color_mix.py
+++ b/src/color_mix-activity/color_mix.py
@@ -356,6 +356,7 @@ class Colors:
x = 150,
y = y,
fill_color = "black",
+ font = gcompris.skin.get_font("gcompris/board/small"),
anchor = gtk.ANCHOR_CENTER,
alignment = pango.ALIGN_CENTER,
text = msg)
diff --git a/src/electric-activity/electric.py b/src/electric-activity/electric.py
index 3ace52e..cf3baf1 100644
--- a/src/electric-activity/electric.py
+++ b/src/electric-activity/electric.py
@@ -781,7 +781,7 @@ class Component(object):
parent = self.comp_rootitem,
x = self.item_values_x,
y = self.item_values_y,
- font = "Sans 7",
+ font = gcompris.skin.get_font("gcompris/board/minuscule"),
text = "",
fill_color = "white",
anchor = gtk.ANCHOR_CENTER
diff --git a/src/explore-activity/explore.py b/src/explore-activity/explore.py
index c5d560a..80bef33 100644
--- a/src/explore-activity/explore.py
+++ b/src/explore-activity/explore.py
@@ -278,7 +278,8 @@ dialogue to\nenable the sound."), None)
parent=self.location_rootitem,
x=400,
y=495,
- text='<span font_family="century schoolbook L" size="medium" weight="bold">' + txt + '</span>',
+ text = txt,
+ font = gcompris.skin.get_font("gcompris/board/medium bold"),
anchor=gtk.ANCHOR_CENTER,
alignment=pango.ALIGN_CENTER,
use_markup=True
@@ -296,7 +297,8 @@ dialogue to\nenable the sound."), None)
parent=self.location_rootitem,
x=410,
y=50,
- text='<span font_family="century schoolbook L" size="x-large" weight="bold">' + name +
'</span>',
+ text = name,
+ font = gcompris.skin.get_font("gcompris/board/big bold"),
fill_color="black",
anchor=gtk.ANCHOR_CENTER,
alignment=pango.ALIGN_CENTER,
@@ -507,8 +509,8 @@ class ProgressBar:
parent = self.rootitem,
x = self.x,
y = self.y,
- text = '<span font_family="URW Gothic L" size="medium" \
- weight="bold" style="italic">' + txt2 + '</span>',
+ text = txt2,
+ font = gcompris.skin.get_font("gcompris/board/medium"),
use_markup = True
)
diff --git a/src/gcompris/gcompris.h b/src/gcompris/gcompris.h
index b34f0b7..caf28e4 100644
--- a/src/gcompris/gcompris.h
+++ b/src/gcompris/gcompris.h
@@ -251,6 +251,7 @@ gint gc_timing (gint timeout, gint actors_number);
#define COLOR_SUBTITLE 0xB00400FF
#define COLOR_SHADOW 0x000000FF
+#define FONT_FONTFACE "sans"
#define FONT_TITLE "sans 20"
#define FONT_TITLE_FALLBACK "sans 12"
#define FONT_SUBTITLE "sans 16"
diff --git a/src/gcompris/skin.c b/src/gcompris/skin.c
index 1f68dcd..a53135b 100644
--- a/src/gcompris/skin.c
+++ b/src/gcompris/skin.c
@@ -32,6 +32,7 @@ guint32 gc_skin_color_content;
guint32 gc_skin_color_subtitle;
guint32 gc_skin_color_shadow;
+gchar* gc_skin_font_fontface;
gchar* gc_skin_font_title;
gchar* gc_skin_font_subtitle;
gchar* gc_skin_font_content;
@@ -193,6 +194,8 @@ gc_skin_setup_vars(void)
gc_skin_color_shadow =
gc_skin_get_color_default("gcompris/shadow", COLOR_SHADOW);
+ gc_skin_font_fontface =
+ gc_skin_get_font_default("gcompris/fontface", FONT_FONTFACE);
gc_skin_font_title =
gc_skin_get_font_default("gcompris/title", FONT_TITLE);
gc_skin_font_subtitle =
diff --git a/src/gcompris/skin.h b/src/gcompris/skin.h
index 6cb2f91..6be55c9 100644
--- a/src/gcompris/skin.h
+++ b/src/gcompris/skin.h
@@ -28,6 +28,7 @@ extern guint32 gc_skin_color_content;
extern guint32 gc_skin_color_subtitle;
extern guint32 gc_skin_color_shadow;
+extern gchar* gc_skin_font_fontface;
extern gchar* gc_skin_font_title;
extern gchar* gc_skin_font_subtitle;
extern gchar* gc_skin_font_content;
diff --git a/src/guessnumber-activity/guessnumber.py b/src/guessnumber-activity/guessnumber.py
index cd01a8d..3e84819 100644
--- a/src/guessnumber-activity/guessnumber.py
+++ b/src/guessnumber-activity/guessnumber.py
@@ -257,7 +257,7 @@ class Gcompris_guessnumber:
def entry_text(self):
self.entry = gtk.Entry()
- self.entry.modify_font(pango.FontDescription("sans bold 24"))
+ self.entry.modify_font(pango.FontDescription(gcompris.skin.get_font("gcompris/board/big bold")))
text_color = gtk.gdk.color_parse("blue")
text_color_selected = gtk.gdk.color_parse("green")
diff --git a/src/hangman-activity/hangman.py b/src/hangman-activity/hangman.py
index 9f9247d..cab902f 100644
--- a/src/hangman-activity/hangman.py
+++ b/src/hangman-activity/hangman.py
@@ -331,6 +331,7 @@ class Gcompris_hangman:
y = gcompris.BOARD_HEIGHT / 2 - 30,
text = self.language,
fill_color = "white",
+ font = gcompris.skin.get_font("gcompris/board/medium"),
anchor = gtk.ANCHOR_CENTER,
alignment = pango.ALIGN_CENTER
)
@@ -451,6 +452,7 @@ class Letter:
y = y + h/2,
text = letter,
fill_color = "black",
+ font = gcompris.skin.get_font("gcompris/board/medium"),
anchor = gtk.ANCHOR_CENTER,
alignment = pango.ALIGN_CENTER
)
@@ -502,6 +504,7 @@ class Key:
y = y + h/2,
text = letter,
fill_color = "black",
+ font = gcompris.skin.get_font("gcompris/board/medium"),
anchor = gtk.ANCHOR_CENTER,
alignment = pango.ALIGN_CENTER
)
diff --git a/src/hydroelectric-activity/hydroelectric.py b/src/hydroelectric-activity/hydroelectric.py
index ba7dce1..fb06cb3 100644
--- a/src/hydroelectric-activity/hydroelectric.py
+++ b/src/hydroelectric-activity/hydroelectric.py
@@ -1092,7 +1092,7 @@ class Counter:
parent = rootitem,
x = x,
y = y,
- font = "Sans 8",
+ font = gcompris.skin.get_font("gcompris/board/minuscule"),
text = "0W",
tooltip = "\n\n\n" + tooltip
)
diff --git a/src/intro_gravity-activity/intro_gravity.py b/src/intro_gravity-activity/intro_gravity.py
index c8f7f00..eea5fe6 100644
--- a/src/intro_gravity-activity/intro_gravity.py
+++ b/src/intro_gravity-activity/intro_gravity.py
@@ -486,6 +486,7 @@ class Message:
x = x,
y = y,
width = 500,
+ font = gcompris.skin.get_font("gcompris/board/small"),
fill_color = "white",
anchor = gtk.ANCHOR_CENTER,
alignment = pango.ALIGN_CENTER,
diff --git a/src/land_safe-activity/land_safe.py b/src/land_safe-activity/land_safe.py
index ef6a67c..3b59d69 100644
--- a/src/land_safe-activity/land_safe.py
+++ b/src/land_safe-activity/land_safe.py
@@ -80,6 +80,7 @@ class Gcompris_land_safe:
x = 760,
y = 50,
fill_color = "white",
+ font = gcompris.skin.get_font("gcompris/board/small"),
anchor = gtk.ANCHOR_E,
alignment = pango.ALIGN_CENTER,
text = _(text))
@@ -177,6 +178,7 @@ class Gcompris_land_safe:
x = 384,
y = 203,
fill_color = "white",
+ font = gcompris.skin.get_font("gcompris/board/small"),
anchor = gtk.ANCHOR_CENTER,
alignment = pango.ALIGN_CENTER,
text = intro )
@@ -466,6 +468,7 @@ class Display:
parent = rootitem,
x = 20,
y = 20,
+ font = gcompris.skin.get_font("gcompris/board/small"),
fill_color = "white",
text = _("Height: "))
@@ -474,6 +477,7 @@ class Display:
parent = rootitem,
x = 100,
y = 20,
+ font = gcompris.skin.get_font("gcompris/board/small"),
fill_color = "white",
text = '')
@@ -482,6 +486,7 @@ class Display:
parent = rootitem,
x = 20,
y = 40,
+ font = gcompris.skin.get_font("gcompris/board/small"),
fill_color = "white",
text = _('Fuel'))
@@ -515,6 +520,7 @@ class Display:
parent = rootitem,
x = 20,
y = 60,
+ font = gcompris.skin.get_font("gcompris/board/small"),
fill_color = "white",
text = _('Velocity: '))
@@ -523,6 +529,7 @@ class Display:
parent = rootitem,
x = 100,
y = 60,
+ font = gcompris.skin.get_font("gcompris/board/small"),
fill_color = 'white',
text = '')
diff --git a/src/note_names-activity/note_names.py b/src/note_names-activity/note_names.py
index 240d796..56018a1 100644
--- a/src/note_names-activity/note_names.py
+++ b/src/note_names-activity/note_names.py
@@ -135,6 +135,7 @@ They also form the C Major Scale. Notice that the note positions are different t
y=65,
width=350,
text=staffText,
+ font = gcompris.skin.get_font("gcompris/board/small"),
fill_color="black",
anchor=gtk.ANCHOR_CENTER,
alignment=pango.ALIGN_CENTER
@@ -321,6 +322,7 @@ They also form the C Major Scale. Notice that the note positions are different t
y=y,
text=text,
fill_color='black',
+ font = gcompris.skin.get_font("gcompris/board/small"),
anchor=gtk.ANCHOR_CENTER,
alignment=pango.ALIGN_CENTER,
pointer_events="GOO_CANVAS_EVENTS_NONE"
diff --git a/src/piano_composition-activity/gcomprismusic.py b/src/piano_composition-activity/gcomprismusic.py
index 34aca64..ea840bc 100644
--- a/src/piano_composition-activity/gcomprismusic.py
+++ b/src/piano_composition-activity/gcomprismusic.py
@@ -287,6 +287,7 @@ class Staff():
x=self.endx - 100 + self.x,
y=self.numStaves * self.verticalDistanceBetweenStaves + self.y,
width=200,
+ font = gcompris.skin.get_font("gcompris/board/small"),
text=_("The staff is full. Please erase some notes"),
fill_color="black",
anchor=gtk.ANCHOR_CENTER,
@@ -315,7 +316,8 @@ class Staff():
parent=self.rootitem,
x=x, #x + self.x,
y=self.y - 13, #y - 75 ,
- text='<span size="' + size + '" >' + n + '</span>',
+ text = n,
+ font = gcompris.skin.get_font("gcompris/fontface") + " " + size,
fill_color="black",
anchor=gtk.ANCHOR_CENTER,
alignment=pango.ALIGN_CENTER,
@@ -389,6 +391,7 @@ class Staff():
x=note.x,
y=self.y + self.staffLineSpacing * 6 + 3,
text=text,
+ font = gcompris.skin.get_font("gcompris/board/small"),
fill_color='black',
anchor=gtk.ANCHOR_CENTER,
alignment=pango.ALIGN_CENTER
@@ -1364,6 +1367,7 @@ class TextButton:
x=x, y=y,
width=width,
text=text,
+ font = gcompris.skin.get_font("gcompris/board/small"),
fill_color="white", anchor=gtk.ANCHOR_CENTER,
alignment=pango.ALIGN_CENTER,
pointer_events="GOO_CANVAS_EVENTS_NONE"
@@ -1428,6 +1432,7 @@ def textBox(text, x, y , rootitem, width=10000,
y=y,
width=width,
text=text,
+ font = gcompris.skin.get_font("gcompris/board/small"),
fill_color=text_color,
anchor=gtk.ANCHOR_CENTER,
alignment=pango.ALIGN_CENTER,
diff --git a/src/piano_composition-activity/piano_composition.py
b/src/piano_composition-activity/piano_composition.py
index 8195c03..019b83b 100644
--- a/src/piano_composition-activity/piano_composition.py
+++ b/src/piano_composition-activity/piano_composition.py
@@ -219,6 +219,7 @@ class Gcompris_piano_composition:
parent=self.rootitem,
x=210, y=140,
width=100,
+ font = gcompris.skin.get_font("gcompris/board/small"),
text=_("Change Note Type:"),
fill_color="black", anchor=gtk.ANCHOR_CENTER,
alignment=pango.ALIGN_CENTER
@@ -383,8 +384,8 @@ dialogue to\nenable the sound."), None)
item = goocanvas.Text(parent=self.rootitem,
x=290,
y=30,
- text='<span font_family="Arial" size="15000" \
- weight="bold">' + _('Select A Melody to Load') + '</span>',
+ text= _('Select A Melody to Load'),
+ font = gcompris.skin.get_font("gcompris/fontface") + " bold 15000",
fill_color="black",
use_markup=True,
pointer_events="GOO_CANVAS_EVENTS_NONE"
@@ -401,7 +402,7 @@ dialogue to\nenable the sound."), None)
pixbuf=gcompris.utils.load_pixmap('piano_composition/previous.svg'),
x = bx,
y = by,
- tooltip = "\n\n" + "Previous Page"
+ tooltip = "\n\n" + _("Previous Page")
)
item.connect("button_press_event", self.previousMelodyPage)
gcompris.utils.item_focus_init(item, None)
@@ -411,7 +412,7 @@ dialogue to\nenable the sound."), None)
pixbuf=gcompris.utils.load_pixmap('piano_composition/next.svg'),
x = bx + 50,
y = by,
- tooltip = "\n\n" + "Next Page"
+ tooltip = "\n\n" + _("Next Page")
)
item.connect("button_press_event", self.nextMelodyPage)
gcompris.utils.item_focus_init(item, None)
@@ -565,6 +566,7 @@ dialogue to\nenable the sound."), None)
y = 15,
width = 280,
text = lyrics,
+ font = gcompris.skin.get_font("gcompris/board/small"),
fill_color = "black",
pointer_events = "GOO_CANVAS_EVENTS_NONE"
)
@@ -575,7 +577,7 @@ dialogue to\nenable the sound."), None)
x=150,
y=75,
width=280,
- text='<span weight="bold" >' + _(" " + self.data.get(section, '_origin')) + '</span>',
+ text= _(" " + self.data.get(section, '_origin')),
fill_color="black",
use_markup=True,
alignment=pango.ALIGN_CENTER,
diff --git a/src/place_your_satellite-activity/place_your_satellite.py
b/src/place_your_satellite-activity/place_your_satellite.py
index a54577a..225bffd 100644
--- a/src/place_your_satellite-activity/place_your_satellite.py
+++ b/src/place_your_satellite-activity/place_your_satellite.py
@@ -121,6 +121,7 @@ class Gcompris_place_your_satellite:
anchor = gtk.ANCHOR_CENTER,
alignment = pango.ALIGN_LEFT,
width = 500,
+ font = gcompris.skin.get_font("gcompris/board/small"),
text = message )
self.text.connect('button_press_event', self.ready_event)
bounds = self.text.get_bounds()
@@ -270,7 +271,7 @@ class Satellite:
else:
self.game.message.hide()
- self.game.distanceIndicator.show( 'Distance: {:.1f}'.format(self.distance) )
+ self.game.distanceIndicator.show( _("Distance: {:.1f}").format(self.distance) )
if abs(difference) < 0.5:
value = self.revolve(x_center, y_center, 0)
@@ -340,6 +341,7 @@ class Message:
x = x,
y = y,
fill_color = "white",
+ font = gcompris.skin.get_font("gcompris/board/small"),
anchor = gtk.ANCHOR_CENTER,
alignment = pango.ALIGN_CENTER,
text = "")
@@ -388,6 +390,7 @@ class Speed:
parent = rootitem,
x = (650 + 780)/2,
y = 470,
+ font = gcompris.skin.get_font("gcompris/board/small"),
anchor = gtk.ANCHOR_CENTER,
alignment = pango.ALIGN_CENTER,
fill_color = "white",
diff --git a/src/searace-activity/searace.py b/src/searace-activity/searace.py
index a2ea6f0..5b43ebe 100644
--- a/src/searace-activity/searace.py
+++ b/src/searace-activity/searace.py
@@ -131,13 +131,13 @@ class Gcompris_searace:
item.translate( (item.get_bounds().x1 * -1)
+ ( gcompris.BOARD_WIDTH / 2 + 25 ) / zoom,
(item.get_bounds().y1 * -1)
- + (gcompris.BOARD_HEIGHT - 125) / zoom )
+ + (gcompris.BOARD_HEIGHT - 135) / zoom )
item.scale(zoom, zoom)
item.connect("button_press_event", self.ok_event)
gcompris.utils.item_focus_init(item, None)
gcompris.bar_set_level(self.gcomprisBoard)
- gcompris.bar_location(gcompris.BOARD_WIDTH/2 - 100, -1, 0.6)
+ gcompris.bar_location(gcompris.BOARD_WIDTH/2 - 105, -1, 0.6)
def end(self):
@@ -402,7 +402,7 @@ class Gcompris_searace:
self.left_boat.sw.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_ALWAYS)
self.left_boat.sw.set_shadow_type(gtk.SHADOW_ETCHED_OUT)
- w = 250.0
+ w = 200.0
h = 160.0
y = 355.0 # The upper limit of the text boxes
x_left = gcompris.BOARD_WIDTH/4 - 30
@@ -507,7 +507,7 @@ class Gcompris_searace:
goocanvas.Text(
parent = self.rootitem,
text=_("COMMANDS ARE"),
- font=gcompris.skin.get_font("gcompris/content"),
+ font=gcompris.skin.get_font("gcompris/small"),
x=gcompris.BOARD_WIDTH/2,
y=y,
fill_color_rgba=text_color,
@@ -517,7 +517,7 @@ class Gcompris_searace:
goocanvas.Text(
parent = self.rootitem,
text=_("forward"),
- font=gcompris.skin.get_font("gcompris/content"),
+ font=gcompris.skin.get_font("gcompris/tiny"),
x=gcompris.BOARD_WIDTH/2,
y=y+hl,
fill_color_rgba= text_color,
@@ -527,7 +527,7 @@ class Gcompris_searace:
goocanvas.Text(
parent = self.rootitem,
text=_("left"),
- font=gcompris.skin.get_font("gcompris/content"),
+ font=gcompris.skin.get_font("gcompris/tiny"),
x=gcompris.BOARD_WIDTH/2,
y=y+hl*2,
fill_color_rgba= text_color,
@@ -537,7 +537,7 @@ class Gcompris_searace:
goocanvas.Text(
parent = self.rootitem,
text=_("right"),
- font=gcompris.skin.get_font("gcompris/content"),
+ font=gcompris.skin.get_font("gcompris/tiny"),
x=gcompris.BOARD_WIDTH/2,
y=y+hl*3,
fill_color_rgba=text_color,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
