[gcompris] explore, removed happy and sad face.
- From: Bruno Coudoin <bcoudoin src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gcompris] explore, removed happy and sad face.
- Date: Sun, 9 Sep 2012 21:33:11 +0000 (UTC)
commit 2149da3d300b918b0b77627064b35a211c172a80
Author: Bruno Coudoin <bruno coudoin free fr>
Date: Sun Sep 9 11:47:24 2012 +0200
explore, removed happy and sad face.
cleanup, removed unused winner.png file.
src/explore-activity/explore.py | 12 +-----------
src/explore-activity/resources/explore/Makefile.am | 5 +----
.../resources/explore/happyFace.png | Bin 72879 -> 0 bytes
src/explore-activity/resources/explore/sadFace.png | Bin 130563 -> 0 bytes
src/explore-activity/resources/explore/winner.png | Bin 14645 -> 0 bytes
.../explore_world_animals/content.desktop.in | 1 -
.../explore_world_music/content.desktop.in | 1 -
7 files changed, 2 insertions(+), 17 deletions(-)
---
diff --git a/src/explore-activity/explore.py b/src/explore-activity/explore.py
index 26ca6c4..f96cf14 100644
--- a/src/explore-activity/explore.py
+++ b/src/explore-activity/explore.py
@@ -251,15 +251,9 @@ class Gcompris_explore:
# check to see if student has won game
if s == (len(self.data.sections()) - 1) and s != 0:
+ # Force stopping the playing sound if any
gcompris.sound.play_ogg('/boards/sounds/silence1s.ogg')
- # show congratulations image!
- goocanvas.Image(
- parent=self.rootitem,
- x=200, y=30,
- pixbuf=gcompris.utils.load_pixmap(self.gameWonPic)
- )
-
# reset the game
if self.gcomprisBoard.level == 2:
@@ -568,8 +562,6 @@ class Gcompris_explore:
except: self.author = ''
try: self.locationPic = self.activityDataFilePath + self.data.get('common', 'locationpic')
except: self.locationPic = ExploreActivityResourcesFilepath + 'defaultLocationPic.png'
- try: self.gameWonPic = self.activityDataFilePath + self.data.get('common', 'gamewonpic')
- except: self.gameWonPic = ExploreActivityResourcesFilepath + 'happyFace.png'
try: self.generalText = self.data.get('common', 'GeneralText')
except:pass
try: self.SoundMatchingGameText = self.data.get('common', 'SoundMatchingGameText')
@@ -606,8 +598,6 @@ class Gcompris_explore:
except: pass
try: self.data.set('common', 'locationpic', _('enter the filename of the picture you would like to use to identify items to click on your background image'))
except: pass
- try: self.data.set('common', 'gamewonpic', _('enter the filename of the picture to be shown when the player wins the entire game'))
- except: pass
try: self.data.set('common', 'generalText', _('enter the text to appear on your image for textMatchingGame'))
except: pass
try: self.data.set('common', 'SoundMatchingGameText', _('enter the text to appear on your image for SoundMatchingGame'))
diff --git a/src/explore-activity/resources/explore/Makefile.am b/src/explore-activity/resources/explore/Makefile.am
index 680067c..1303ca9 100644
--- a/src/explore-activity/resources/explore/Makefile.am
+++ b/src/explore-activity/resources/explore/Makefile.am
@@ -4,11 +4,8 @@ img_DATA = \
defaultCompletedLocationPic.png \
defaultLocationPic.png \
default.png \
- happyFace.png \
playbutton.png \
ribbon.png \
- sadFace.png \
- star.png \
- winner.png
+ star.png
EXTRA_DIST = $(img_DATA)
diff --git a/src/explore_world_animals-activity/resources/explore_world_animals/content.desktop.in b/src/explore_world_animals-activity/resources/explore_world_animals/content.desktop.in
index 5f8a8c7..386e499 100644
--- a/src/explore_world_animals-activity/resources/explore_world_animals/content.desktop.in
+++ b/src/explore_world_animals-activity/resources/explore_world_animals/content.desktop.in
@@ -1,6 +1,5 @@
[common]
background = world.jpg
-credits = enter a list of credits and links to resources you used here
credits = http://aliciac.hubpages.com, http://www.public-domain-image.com, http://www.publicdomainpictures.net
creator = Christina Hadley (with help from Beth Hadley)
locationpic = tux.png
diff --git a/src/explore_world_music-activity/resources/explore_world_music/content.desktop.in b/src/explore_world_music-activity/resources/explore_world_music/content.desktop.in
index 0018edd..0a9ce35 100644
--- a/src/explore_world_music-activity/resources/explore_world_music/content.desktop.in
+++ b/src/explore_world_music-activity/resources/explore_world_music/content.desktop.in
@@ -3,7 +3,6 @@ background = worldmap.jpg
credits = http://commons.wikimedia.org/wiki, http://archive.org
creator = Beth Hadley
locationpic = suitcase.png
-gamewonpic = dancingWorld.png
generalText = Explore world music! Click on the suitcases.
SoundMatchingGameText = Click on the location that matches the music you hear.
TextMatchingGameText = Click on the location that matches the text.
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]