GNOME.org
 

[gcompris/gcomprismusic] edited Makefile.am at src/ , edited configure.ac to add rhymes, added a new menu icon for rhymes, ed

commit 1c4782c85e38a6635311541b5b2e066588e3e05d
Author: Karthik Subramanian <itskarthik s gmail com>
Date:   Wed Jun 8 12:18:33 2011 +0530

    edited Makefile.am at src/ , edited configure.ac to add rhymes, added a new menu icon for rhymes, edited the heading for rhymes

 configure.ac                   |    5 ++-
 src/Makefile.am                |    3 +-
 src/rhymes-activity/rhymes.py  |   22 +++-------
 src/rhymes-activity/rhymes.svg |   92 ++++++++++++++++++++++++++++++++++++++++
 4 files changed, 104 insertions(+), 18 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index c60753a..9f95026 100644
--- a/configure.ac
+++ b/configure.ac
@@ -548,7 +548,7 @@ AC_SUBST(CFLAGS)
 AC_SUBST(LIBS)
 
 dnl Autoconf output
-AC_OUTPUT([
+AC_OUTPUT([ src/piano-activity/Makefile
 Makefile.mingw
 Makefile
 autopackage/Makefile
@@ -830,6 +830,9 @@ src/redraw_symmetrical-activity/resources/redraw_symmetrical/Makefile
 src/reversecount-activity/Makefile
 src/reversecount-activity/resources/Makefile
 src/reversecount-activity/resources/reversecount/Makefile
+src/rhymes-activity/Makefile
+src/rhymes-activity/resources/Makefile
+src/rhymes-activity/resources/rhymes/Makefile
 src/scalesboard-activity/Makefile
 src/scalesboard-activity/resources/Makefile
 src/scalesboard-activity/resources/scale/Makefile
diff --git a/src/Makefile.am b/src/Makefile.am
index 9097c8c..f01acc8 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-SUBDIRS = \
+SUBDIRS = piano-activity \
 	administration-activity \
 	advanced_colors-activity \
 	algebra_by-activity \
@@ -107,6 +107,7 @@ SUBDIRS = \
 	redraw-activity \
 	redraw_symmetrical-activity \
 	reversecount-activity \
+        rhymes-activity \
 	scalesboard-activity \
 	scalesboard_weight-activity \
 	searace-activity \
diff --git a/src/rhymes-activity/rhymes.py b/src/rhymes-activity/rhymes.py
index 3395fc8..be3fa32 100644
--- a/src/rhymes-activity/rhymes.py
+++ b/src/rhymes-activity/rhymes.py
@@ -97,30 +97,20 @@ class Gcompris_rhymes:
     gcompris.sound.policy_set(gcompris.sound.PLAY_AND_INTERRUPT)
     self.read_data()
     print self.dataset.sections()
-    print self.dataset.get("1","title")
-
-    self.title=goocanvas.Text(
-      parent = self.rootitem,
-      x = 400.0,
-      y = 50.0,
-      text = _("Rhymes activity"),
-      fill_color = "black",
-      anchor = gtk.ANCHOR_CENTER,
-      alignment = pango.ALIGN_CENTER
-      )
 
     self.showrhyme(1)
 
-#prints each rhyme according to the calling parameter.
+  #prints each rhyme according to the calling parameter.
   def showrhyme(self,calledrhyme):
 
- #fills the rhyme title
+    #fills the rhyme title
     
     self.rhymetitle=goocanvas.Text(
         parent = self.rootitem,
         x = 400,
-        y = 100,
+        y = 50,
         text = str(self.dataset.get(str(calledrhyme),"title")),
+        font = 'sans bold 25',
         fill_color = 'black',
         anchor = gtk.ANCHOR_CENTER,
         alignment = pango.ALIGN_CENTER
@@ -136,10 +126,10 @@ class Gcompris_rhymes:
     self.rhymetext.sw.set_shadow_type(gtk.SHADOW_ETCHED_OUT)
     
     w = 300.0
-    h = 450.0
+    h = 475.0
     x_left = int(self.dataset.get(str(calledrhyme),"x"))
     x_right = int(self.dataset.get(str(calledrhyme),"x"))+200
-    y = int(self.dataset.get(str(calledrhyme),"y"))-100
+    y = int(self.dataset.get(str(calledrhyme),"y"))-125
     
     self.rhymetext.tb = gtk.TextBuffer()
     self.rhymetext.tv = gtk.TextView(self.rhymetext.tb)
diff --git a/src/rhymes-activity/rhymes.svg b/src/rhymes-activity/rhymes.svg
new file mode 100644
index 0000000..5070a98
--- /dev/null
+++ b/src/rhymes-activity/rhymes.svg
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/";
+   xmlns:cc="http://creativecommons.org/ns#";
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+   xmlns:svg="http://www.w3.org/2000/svg";
+   xmlns="http://www.w3.org/2000/svg";
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+   width="230.31496"
+   height="194.88188"
+   id="svg3068"
+   version="1.1"
+   inkscape:version="0.48.0 r9654"
+   sodipodi:docname="double-semiquaver-orange.svg">
+  <defs
+     id="defs3" />
+  <sodipodi:namedview
+     inkscape:document-units="mm"
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="2.8"
+     inkscape:cx="164.46367"
+     inkscape:cy="125.76909"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     units="mm"
+     inkscape:window-width="1600"
+     inkscape:window-height="1150"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata4">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-857.4803)">
+    <g
+       id="g4238"
+       transform="matrix(1.1613948,0,0,1.1613948,-142.61859,495.09406)">
+      <path
+         transform="matrix(0.13707166,0,0,0.1066915,221.54884,398.70765)"
+         sodipodi:open="true"
+         sodipodi:end="6.2768464"
+         sodipodi:start="0"
+         d="m 389.71877,444.50916 c 0,116.28708 -77.79036,210.55639 -173.74962,210.55639 -95.95927,0 -173.749622,-94.26931 -173.749622,-210.55639 0,-116.28709 77.790352,-210.5564 173.749622,-210.5564 95.52943,0 173.14058,93.45784 173.74612,209.22171"
+         sodipodi:ry="210.5564"
+         sodipodi:rx="173.74962"
+         sodipodi:cy="444.50916"
+         sodipodi:cx="215.96915"
+         id="path4028-2"
+         style="fill:#ffb00d;fill-opacity:1;stroke:none"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(0.16199378,0,0,0.12608995,125.23205,364.1036)"
+         sodipodi:open="true"
+         sodipodi:end="6.2768464"
+         sodipodi:start="0"
+         d="m 389.71877,444.50916 c 0,116.28708 -77.79036,210.55639 -173.74962,210.55639 -95.95927,0 -173.749622,-94.26931 -173.749622,-210.55639 0,-116.28709 77.790352,-210.5564 173.749622,-210.5564 95.52943,0 173.14058,93.45784 173.74612,209.22171"
+         sodipodi:ry="210.5564"
+         sodipodi:rx="173.74962"
+         sodipodi:cy="444.50916"
+         sodipodi:cx="215.96915"
+         id="path4028-2-2"
+         style="fill:#ffb00d;fill-opacity:1;stroke:none"
+         sodipodi:type="arc" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3137"
+         d="m 246.41956,475.6179 c -15.43897,-2.51525 -29.91558,-18.30451 -25.09658,-34.5038 3.21391,-14.41946 18.27279,-25.95877 33.19529,-22.50253 7.89498,-0.71059 16.91624,7.03871 22.08071,7.17139 5.25354,-13.25392 10.4982,-26.5527 14.27471,-40.31907 -9.22477,-5.74741 -19.97108,-8.40372 -29.63775,-13.32271 -12.97946,-5.67597 -25.87106,-11.55666 -38.60957,-17.7558 -8.2565,5.5056 -7.17384,17.2403 -11.84987,25.25115 -6.15676,15.42885 -12.10053,31.00855 -16.12504,47.12993 -3.99047,10.85175 -11.18324,22.79874 -23.83537,24.14546 -15.32785,3.12245 -33.23254,-3.65032 -40.9668,-17.55145 -7.13577,-16.36541 -0.37143,-37.45795 15.33301,-46.06898 10.42886,-4.06853 23.39432,-2.92537 32.5251,3.75152 4.63573,3.1224 13.15264,15.908 14.0872,3.28739 4.27235,-20.38693 13.90564,-39.17596 21.74758,-58.37553 3.54999,-6.79837 4.20327,-15.40154 9.98683,-20.79314 6.89231,-2.57561 14.13249,2.66933 20.82656,4.51924 14.43932,6.41995 29.92942,10.10666 44.0506,17.31608 8.10449,4.62451 17.88364,6.35903 
 24.90288,12.69922 5.8833,7.42174 -2.39137,15.63467 -3.90314,23.23068 -7.51744,21.3901 -13.40105,43.3679 -22.40795,64.21601 -4.48266,12.5089 -7.3883,27.25274 -18.76,35.52767 -6.56158,3.63334 -14.52875,4.66402 -21.8184,2.94727 z m 16.28058,-9.71798 c 8.48802,-7.04311 13.42311,-19.45468 6.80865,-29.41643 -5.7353,-8.39468 -17.95775,-9.3221 -26.8795,-6.27801 -7.62802,3.44454 -13.04164,11.78589 -12.39888,20.22745 5.0164,11.91898 19.82133,20.83882 32.46973,15.46699 z m -7.54541,-3.05303 c -1.1011,-9.69882 -13.05317,-6.48849 -18.59106,-9.71825 3.96267,-9.29875 21.57,-3.50058 22.97038,5.96684 0.34891,1.5524 -3.01042,5.85207 -4.37932,3.75141 z m 3.70807,-12.04829 c -6.76653,-8.06858 11.43178,-9.83602 6.56729,-0.33055 -1.34721,2.25069 -4.85913,1.96361 -6.56729,0.33055 z m -11.98108,-8.55758 c -6.53538,-9.63788 12.72566,-2.82918 3.25994,1.18027 -1.23398,0.89195 -2.4215,-0.441 -3.25994,-1.18027 z m -75.55152,-4.21966 c 9.20291,-5.95794 14.75527,-19.2245 8.51287,-29.17587 -6.00263,-13.684
 93 -26.71459,-18.24577 -36.89971,-6.60315 -7.93387,7.12895 -8.54036,20.24834 -1.14425,27.97448 6.61712,8.75571 19.45779,11.98739 29.53109,7.80454 z m -18.46636,-8.66019 c -6.16629,-1.21644 -14.73019,-15.11958 -5.37617,-14.68993 3.6142,6.53684 11.11992,10.97635 17.35762,10.26704 1.55023,5.95032 -8.56176,6.73313 -11.98145,4.42289 z m 11.82298,-11.34719 c -6.04534,-8.18467 13.3489,-8.18325 4.37732,-0.42223 -1.28451,0.80804 -2.96261,1.02188 -4.37732,0.42223 z m -13.74207,-8.59322 c -4.439,-7.92583 14.0423,-6.07186 4.47639,0.0996 -1.32224,0.78984 -3.2507,1.09111 -4.47639,-0.0996 z m 150.55004,-45.5221 c 5.35345,-10.54997 -11.28787,-11.63406 -17.42486,-15.70629 -14.73309,-5.36397 -29.78227,-10.18897 -43.26117,-18.37679 -9.52128,-7.80038 -18.63625,11.5913 -6.24137,12.98337 20.45757,9.8811 41.82196,17.67919 62.72716,26.52378 2.91963,0.30622 2.97492,-3.68524 4.20024,-5.42407 z"
+         style="fill:#000000" />
+    </g>
+  </g>
+</svg>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]