[gcompris] play piano, uses the same icons as composition.



commit daa62102884a7a2ff76ab1a43495ad27c3bf030b
Author: Bruno Coudoin <bruno coudoin free fr>
Date:   Mon Oct 1 23:31:34 2012 +0200

    play piano, uses the same icons as composition.
    
    Removed specific icons to reuse the one from piano composition
    and improved the screen layout.

 .../piano_composition/playActivities/Makefile.am   |    7 +----
 .../piano_composition/playActivities/erase.png     |  Bin 4876 -> 0 bytes
 .../playActivities/playbutton.png                  |  Bin 10252 -> 0 bytes
 src/play_piano-activity/play_piano.py              |   29 ++++++++++++++-----
 4 files changed, 22 insertions(+), 14 deletions(-)
---
diff --git a/src/piano_composition-activity/resources/piano_composition/playActivities/Makefile.am b/src/piano_composition-activity/resources/piano_composition/playActivities/Makefile.am
index 2f955e9..fde27f9 100644
--- a/src/piano_composition-activity/resources/piano_composition/playActivities/Makefile.am
+++ b/src/piano_composition-activity/resources/piano_composition/playActivities/Makefile.am
@@ -1,8 +1,3 @@
-imgdir = $(pkgdatadir)/@PACKAGE_DATA_DIR@/piano_composition/playActivities
-img_DATA = \
-	erase.png \
-	playbutton.png
-
 img2dir = $(pkgdatadir)/@PACKAGE_DATA_DIR@/piano_composition/playActivities/background
 img2_DATA = \
 	background/1.jpg \
@@ -12,4 +7,4 @@ img2_DATA = \
 	background/5.jpg \
 	background/6.jpg
 
-EXTRA_DIST = $(img_DATA) $(img2_DATA)
+EXTRA_DIST = $(img2_DATA)
diff --git a/src/play_piano-activity/play_piano.py b/src/play_piano-activity/play_piano.py
index d3d429d..c3077c5 100644
--- a/src/play_piano-activity/play_piano.py
+++ b/src/play_piano-activity/play_piano.py
@@ -134,13 +134,26 @@ dialogue to\nenable the sound."), None)
         textBox(_("Click the piano keys that match the written notes."),
                 388, 60, self.rootitem, fill_color_rgba = 0x999999AAL, width=200)
 
+        bx = 600
+        by = 340
+
+        goocanvas.Rect(parent = self.rootitem,
+                       x = bx - 10,
+                       y = by - 8,
+                       width = 120,
+                       height = 63,
+                       stroke_color = "black",
+                       fill_color_rgba = 0x33333399L,
+                       line_width = 2.0,
+                       radius_x = 3, radius_y = 3)
+
         # PLAY BUTTON
         self.playButton = goocanvas.Image(
                 parent=self.rootitem,
-                pixbuf=gcompris.utils.load_pixmap('piano_composition/playActivities/playbutton.png'),
-                x=170,
-                y=50,
-                tooltip = "\n\n\n" + _('Play')
+                pixbuf = gcompris.utils.load_pixmap('piano_composition/play.svg'),
+                x = bx,
+                y = by,
+                tooltip = "\n\n" + _('Play')
                 )
         self.playButton.connect("button_press_event", self.staff.playComposition)
 
@@ -149,10 +162,10 @@ dialogue to\nenable the sound."), None)
         # ERASE BUTTON
         self.eraseButton = goocanvas.Image(
                 parent=self.rootitem,
-                pixbuf=gcompris.utils.load_pixmap('piano_composition/playActivities/erase.png'),
-                x=650,
-                y=170,
-                tooltip = "\n\n\n" + _("Erase Attempt")
+                pixbuf = gcompris.utils.load_pixmap('piano_composition/edit-clear.svg'),
+                x = bx + 50,
+                y = by,
+                tooltip = "\n\n" + _("Erase Attempt")
                 )
         self.eraseButton.connect("button_press_event", self.erase_entry)
         gcompris.utils.item_focus_init(self.eraseButton, None)



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]