[gcompris] color_mix, minor look and feel improvement
- From: Bruno Coudoin <bcoudoin src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gcompris] color_mix, minor look and feel improvement
- Date: Thu, 4 Oct 2012 21:25:43 +0000 (UTC)
commit 3dea2463f8de265fc47c10b45e3f75a4b4a1f56c
Author: Bruno Coudoin <bruno coudoin free fr>
Date: Thu Oct 4 23:12:35 2012 +0200
color_mix, minor look and feel improvement
It was not looking nice to have several text box with a different
width. Now I have a single box with the 3 possible messages.
src/color_mix-activity/color_mix.py | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
---
diff --git a/src/color_mix-activity/color_mix.py b/src/color_mix-activity/color_mix.py
index b21e69e..313965e 100644
--- a/src/color_mix-activity/color_mix.py
+++ b/src/color_mix-activity/color_mix.py
@@ -331,20 +331,24 @@ class Colors:
self.game.game_over(2)
def show_message(self, color1_diff, color2_diff, color3_diff):
+ text = []
if color1_diff > 27:
- self.message( _("Too much {color}").format( color = self.color_1), 300)
+ text.append( _("Too much {color}").format( color = self.color_1) )
elif color1_diff < -27:
- self.message( _("Not enough {color}").format( color = self.color_1), 300)
+ text.append(_("Not enough {color}").format( color = self.color_1) )
if color2_diff > 27:
- self.message( _("Too much {color}").format( color = self.color_2), 375)
+ text.append(_("Too much {color}").format( color = self.color_2) )
elif color2_diff < -27:
- self.message( _("Not enough {color}").format( color = self.color_2), 375)
+ text.append(_("Not enough {color}").format( color = self.color_2) )
if color3_diff > 27:
- self.message( _("Too much {color}").format( color = self.color_3), 450)
+ text.append(_("Too much {color}").format( color = self.color_3) )
elif color3_diff < -27:
- self.message( _("Not enough {color}").format( color = self.color_3), 450)
+ text.append(_("Not enough {color}").format( color = self.color_3) )
+
+ if text:
+ self.message( "\n".join(text), 375)
def message(self, msg, y):
text = goocanvas.Text(
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]