[gcompris: 88/90] Merge branch 'gcomprisbraille'
- From: Bruno Coudoin <bcoudoin src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gcompris: 88/90] Merge branch 'gcomprisbraille'
- Date: Sat, 3 Sep 2011 01:51:29 +0000 (UTC)
commit 2dea596d39b8a8806215a96de91dd598a4636147
Merge: cd8c1f0 3a6d5e9
Author: Bruno Coudoin <bruno coudoin free fr>
Date: Sat Sep 3 02:12:34 2011 +0200
Merge branch 'gcomprisbraille'
Conflicts:
src/braille_alphabets-activity/BrailleChar.py
src/braille_alphabets-activity/BrailleMap.py
src/braille_alphabets-activity/Makefile.in
src/braille_alphabets-activity/braille_alphabets.py
src/braille_alphabets-activity/resources/braille_alphabets/Makefile.am
src/braille_fun-activity/braille_fun.py
src/braille_fun-activity/braille_fun.xml.in
src/braille_fun-activity/resources/braille_fun/Makefile.am
src/braille_lotto-activity/braille_lotto.py
src/braille_lotto-activity/braille_lotto.xml.in
src/braille_lotto-activity/resources/braille_lotto/Makefile.am
src/louis_braille-activity/init_path.sh
src/louis_braille-activity/louis_braille.py
src/louis_braille-activity/louis_braille.xml.in
src/louis_braille-activity/resources/Makefile.am
src/louis_braille-activity/resources/louis_braille/Makefile.am
src/louis_braille-activity/resources/louis_braille/activity.desktop
src/louis_braille-activity/resources/louis_braille/activity.desktop.in
src/braille_alphabets-activity/BrailleChar.py | 100 +-
src/braille_alphabets-activity/BrailleMap.py | 30 +-
src/braille_alphabets-activity/Makefile.in | 760 ----
.../braille_alphabets.py | 103 +-
.../resources/braille_alphabets/Makefile.am | 9 +
.../resources/braille_alphabets/back.png | Bin 1573 -> 0 bytes
.../resources/braille_alphabets/back.svg | 166 +
.../resources/braille_alphabets/braille_tux.svgz | Bin 14786 -> 14953 bytes
.../resources/braille_alphabets/mosaic.svgz | Bin 4491 -> 4525 bytes
.../resources/braille_alphabets/target.svg | 104 +-
src/braille_fun-activity/braille_fun.py | 120 +-
src/braille_fun-activity/braille_fun.svg | 3668 ++++++++------------
src/braille_fun-activity/braille_fun.xml.in | 12 +-
.../resources/braille_fun/Makefile.am | 7 +
src/braille_lotto-activity/braille_lotto.py | 200 +-
src/braille_lotto-activity/braille_lotto.xml.in | 10 +
.../resources/braille_alphabets | 1 +
.../resources/braille_lotto/Makefile.am | 6 +
src/dicey_dicey-activity/Makefile.am | 2 +-
src/dicey_dicey-activity/dicey_dicey.py | 4 +-
src/dicey_dicey-activity/dicey_dicey.xml.in | 7 +-
src/dicey_dicey-activity/resources/Makefile.am | 1 +
.../resources/dicey_dicey/Makefile.am | 14 +
src/louis_braille-activity/Makefile.am | 1 +
src/louis_braille-activity/louis_braille.py | 259 ++-
src/louis_braille-activity/louis_braille.xml.in | 13 +
src/louis_braille-activity/resources/Makefile.am | 1 +
.../resources/louis_braille/Makefile.am | 14 +
.../resources/louis_braille/activity.desktop | 17 +-
.../resources/louis_braille/activity.desktop.in | 48 +-
.../resources/louis_braille/back.png | Bin 77278 -> 0 bytes
.../resources/louis_braille/background.svgz | Bin 0 -> 850 bytes
.../resources/louis_braille/braile.jpg | Bin 43376 -> 43376 bytes
.../resources/louis_braille/braille_ball.jpg | Bin 13440 -> 13440 bytes
.../resources/louis_braille/chart.png | Bin 29639 -> 29639 bytes
.../resources/louis_braille/fireplace.jpg | Bin 20493 -> 20493 bytes
.../resources/louis_braille/louis.jpg | Bin 39078 -> 0 bytes
.../resources/louis_braille/louis.png | Bin 0 -> 107446 bytes
.../resources/louis_braille/night_printing.jpg | Bin 8368 -> 8368 bytes
.../resources/louis_braille/piano.jpg | Bin 13351 -> 0 bytes
.../resources/louis_braille/piano.svg | 1530 ++++++++
.../resources/louis_braille/rnib.jpg | Bin 52337 -> 52337 bytes
.../resources/louis_braille/statue.jpg | Bin 48687 -> 48687 bytes
.../resources/louis_braille/teach.jpg | Bin 55242 -> 55242 bytes
.../resources/louis_braille/workshop.jpg | Bin 25726 -> 25726 bytes
src/rhymes_riddles-activity/Makefile.am | 2 +-
src/rhymes_riddles-activity/resources/Makefile.am | 1 +
.../resources/rhymes_riddles/Makefile.am | 5 +
.../resources/rhymes_riddles/pencil.png | Bin 37810 -> 0 bytes
src/rhymes_riddles-activity/rhymes_riddles.py | 4 +-
src/rhymes_riddles-activity/rhymes_riddles.xml.in | 2 +-
51 files changed, 3948 insertions(+), 3273 deletions(-)
---
diff --cc src/braille_alphabets-activity/Makefile.am
index ad4e44d,62e2307..ad4e44d
mode 100755,100644..100644
--- a/src/braille_alphabets-activity/Makefile.am
+++ b/src/braille_alphabets-activity/Makefile.am
diff --cc src/braille_alphabets-activity/braille_alphabets.py
index aa8fa3f,29fb01c..ba823e3
--- a/src/braille_alphabets-activity/braille_alphabets.py
+++ b/src/braille_alphabets-activity/braille_alphabets.py
@@@ -1,6 -1,6 +1,10 @@@
# gcompris - braille_alphabets.py
#
++<<<<<<< HEAD
+# Copyright (C) 2011 Bruno Coudoin and Srishti Sethi
++=======
+ # Copyright (C) 2011 Bruno Coudoin | Srishti Sethi
++>>>>>>> gcomprisbraille
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@@ -39,10 -39,6 +43,13 @@@ CIRCLE_STROKE = "black
MAP_STROKE = "black"
MAP_FILL = "light blue"
++<<<<<<< HEAD
+braille_intro = _("The Braille system is a method that is used by blind people to read and write.")
+braille_desc = _("Each Braille character, or cell, is made up of six dot positions, arranged in "
+ "a rectangle containing two columns of three dots each. As seen on the left, each dot "
+ "is referenced by a number from 1 to 6.")
++=======
++>>>>>>> gcomprisbraille
#Array Declaration
letter_arr_one = ['A','B','C','D','E','F','G']
diff --cc src/braille_alphabets-activity/resources/braille_alphabets/Makefile.am
index 3a7e7cb,758c59a..089b899
--- a/src/braille_alphabets-activity/resources/braille_alphabets/Makefile.am
+++ b/src/braille_alphabets-activity/resources/braille_alphabets/Makefile.am
@@@ -1,13 -1,8 +1,22 @@@
imgdir = $(pkgdatadir)/@PACKAGE_DATA_DIR@/braille_alphabets
img_DATA = \
++<<<<<<< HEAD
+ back.png \
+ braille_tux.svgz \
+ mosaic.svgz \
+ target.svg
+
+
+EXTRA_DIST = $(img_DATA)
+
+CLEANFILES =
+
+
++=======
+ back.svg \
+ braille_tux.svgz \
+ mosaic.svgz \
+ target.svg
+
+ EXTRA_DIST = $(img_DATA)
++>>>>>>> gcomprisbraille
diff --cc src/braille_fun-activity/braille_fun.py
index 6997a18,af1e5fc..95513b9
--- a/src/braille_fun-activity/braille_fun.py
+++ b/src/braille_fun-activity/braille_fun.py
@@@ -1,6 -1,6 +1,10 @@@
# gcompris - braille_fun.py
#
++<<<<<<< HEAD
+# Copyright (C) 2011 Srishti Sethi
++=======
+ # Copyright (C) 2003, 2008 Bruno Coudoin | Srishti Sethi
++>>>>>>> gcomprisbraille
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --cc src/braille_fun-activity/resources/braille_fun/Makefile.am
index 00e0bab,4515788..cfb248b
--- a/src/braille_fun-activity/resources/braille_fun/Makefile.am
+++ b/src/braille_fun-activity/resources/braille_fun/Makefile.am
@@@ -1,11 -1,6 +1,18 @@@
imgdir = $(pkgdatadir)/@PACKAGE_DATA_DIR@/braille_fun
img_DATA = \
++<<<<<<< HEAD
+ hillside.svg \
+ plane.svg
+
+
+EXTRA_DIST = $(img_DATA)
+
+CLEANFILES =
+
+
++=======
+ hillside.svg
+ plane.svg
+
+ EXTRA_DIST = $(img_DATA)
++>>>>>>> gcomprisbraille
diff --cc src/braille_lotto-activity/braille_lotto.py
index 98c83a4,9bbbff8..17992ed
--- a/src/braille_lotto-activity/braille_lotto.py
+++ b/src/braille_lotto-activity/braille_lotto.py
@@@ -1,6 -1,6 +1,10 @@@
# gcompris - braille_lotto.py
#
++<<<<<<< HEAD
+# Copyright (C) 2011 Bruno Coudoin and Srishti Sethi
++=======
+ # Copyright (C) 2011 Bruno Coudoin | Srishti Sethi
++>>>>>>> gcomprisbraille
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@@ -529,4 -501,4 +505,8 @@@ class Gcompris_braille_lotto
self.start()
def set_level(self, level):
++<<<<<<< HEAD
+ print("braille_lotto set level. %i" % level)
++=======
+ pass
++>>>>>>> gcomprisbraille
diff --cc src/braille_lotto-activity/braille_lotto.xml.in
index 44f7208,b820739..ec0e259
--- a/src/braille_lotto-activity/braille_lotto.xml.in
+++ b/src/braille_lotto-activity/braille_lotto.xml.in
@@@ -3,17 -3,17 +3,27 @@@
<Board
name="braille_lotto"
type="python:braille_lotto"
- section="/experimental"
+ section="/discovery/braille"
icon="braille_lotto.svg"
++<<<<<<< HEAD
+ difficulty="5"
++=======
+ difficulty="1"
++>>>>>>> gcomprisbraille
author="Srishti Sethi (srishakatux gmail com)"
boarddir=""
demo="1">
<_title>Braille Lotto</_title>
<_description>Fun with Braille</_description>
++<<<<<<< HEAD
+ <_prerequisite></_prerequisite>
+ <_goal>Discover the Braille system for numbers.</_goal>
+ <_manual>Check the Braille system for the number on the button in the ticket.If you find the code in the ticket, click on it in order to cross it.As soon you click the code it will be crossed.The player who is able to cross all the braille codes correctly first, wins the game.Check the braille chart by clicking on the toggle button for help.</_manual>
++=======
+ <_prerequisite>Braille number codes</_prerequisite>
+ <_goal>To match the braille code for all ticket numbers with that on the button correctly.</_goal>
+ <_manual>Check the braille code for the number on the button in the ticket.If you find the code in the ticket, click on it in order to mark its presence.If you mark the number correctly a check mark will be displayed on the ticket number otherwise a cross mark will be indicated.In case you mark it wrong, again click on the ticket number to hide the cross mark.The player who is able to identify all the braille codes correctly first, wins the game.Check the braille chart by clicking on the toggle button for help.</_manual>
++>>>>>>> gcomprisbraille
<_credit></_credit>
</Board>
<Data directory=""/>
diff --cc src/braille_lotto-activity/resources/braille_lotto/Makefile.am
index de7ee82,bc2ac94..f4af164
--- a/src/braille_lotto-activity/resources/braille_lotto/Makefile.am
+++ b/src/braille_lotto-activity/resources/braille_lotto/Makefile.am
@@@ -6,10 -6,6 +6,16 @@@ img_DATA =
callout2.svg \
cross_button.png \
game.svg \
++<<<<<<< HEAD
+ tux.svg
+
+EXTRA_DIST = $(img_DATA)
+
+CLEANFILES =
+
+
++=======
+ tux.svg
+
+ EXTRA_DIST = $(img_DATA)
++>>>>>>> gcomprisbraille
diff --cc src/louis_braille-activity/louis_braille.py
index 4001b8a,cdbdc76..807fb7c
--- a/src/louis_braille-activity/louis_braille.py
+++ b/src/louis_braille-activity/louis_braille.py
@@@ -134,85 -120,6 +120,88 @@@ class Gcompris_louis_braille
ok.connect("button_press_event", self.ok_event)
gcompris.utils.item_focus_init(ok, None)
++<<<<<<< HEAD
+ for index in range(11,22):
+ #Rectangle for STORY
+ goocanvas.Rect(parent=self.rootitem,
+ x=50,
+ y=(index - 9) * 35,
+ width=600,
+ height=45,
+ stroke_color="orange",
+ fill_color="white",
+ line_width=2.0)
+
+ #Rectangle for SEQUENCE
+ goocanvas.Rect(parent=self.rootitem,
+ x=20,
+ y=(index - 9) * 35,
+ width=30,
+ height=45,
+ stroke_color="orange",
+ fill_color="white",
+ line_width=2.0)
+
+ #Displaying the STORY
+ goocanvas.Text(parent = self.rootitem,
+ x=350.0,
+ y=(index - 9) * 37.8,
+ text=str(self.dataset.get(str(NUMBER_SEQUENCE[index - 11][0]),"story")),
+ fill_color="black",
+ anchor = gtk.ANCHOR_CENTER,
+ alignment = pango.ALIGN_CENTER,
+ font = 'SANS 8'
+ )
+ #Displaying the SEQUENCE
+ goocanvas.Text(parent = self.rootitem,
+ x=28.0,
+ y=(index - 9) * 37,
+ text= str(SEQUENCE[index - 11]),
+ fill_color="black",
+ anchor = gtk.ANCHOR_CENTER,
+ alignment = pango.ALIGN_CENTER,
+ font = 'SANS 8'
+ )
+ #Answer area to the right
+ #Rectangle for numbering
+ goocanvas.Rect(parent=self.rootitem,
+ x=690,
+ y=(index - 9) * 35,
+ width=30,
+ height=45,
+ stroke_color="orange",
+ fill_color="white",
+ line_width=2.0)
+ #Displaying the numbering
+ goocanvas.Text(parent = self.rootitem,
+ x=710.0,
+ y=(index - 9) * 37,
+ text= str(index - 10),
+ fill_color="black",
+ anchor = gtk.ANCHOR_CENTER,
+ alignment = pango.ALIGN_CENTER,
+ font = 'SANS 8'
+ )
+ self.widget_array = []
+
+ for index in range(11):
+ # the answer area
+ self.entry = gtk.Entry()
+
+ goocanvas.Widget(
+ parent = self.rootitem,
+ widget=self.entry,
+ x = 740,
+ y = (index + 2) * 36,
+ width = 50,
+ height= 25,
+ anchor=gtk.ANCHOR_NW)
+
+ self.widget_array.append(self.entry)
+ self.widget_array[index].connect("activate", self.enter_callback,
+ self.widget_array[index], index)
++=======
++>>>>>>> gcomprisbraille
else :
gcompris.bar_location(gcompris.BOARD_WIDTH - 140, 350, 0.8)
@@@ -246,23 -165,13 +247,33 @@@
20, 50, LOUIS_BRAILLE_NAME[index] ,COLOR_ON, COLOR_OFF,
CIRCLE_FILL, CIRCLE_FILL,True,False ,False, None)
++<<<<<<< HEAD
+ story = self.dataset.get(str(level),"story")
+
+ #Rectangle for YEAR
+ goocanvas.Rect(parent=self.rootitem,
+ x=330,
+ y=382,
+ width=180,
+ height=25,
+ stroke_color="orange",
+ fill_color="white",
+ line_width=2.0)
+
+ #Displaying the YEAR
+ goocanvas.Text(parent = self.rootitem,
+ x=420.0,
+ y=395.0,
+ text=str(self.dataset.get(str(level),"year")),
++=======
+ story = self.dataset.get(str(level), _("story"))
+
+ # Displaying the YEAR
+ item = goocanvas.Text(parent = self.rootitem,
+ x = 420.0,
+ y = 400.0,
+ text=str(self.dataset.get(str(level) , "year")),
++>>>>>>> gcomprisbraille
fill_color="black",
anchor = gtk.ANCHOR_CENTER,
alignment = pango.ALIGN_CENTER,
@@@ -356,3 -276,129 +378,132 @@@
def set_level(self, level):
print("louis_braille set level. %i" % level)
++<<<<<<< HEAD
++=======
+
+ class Reordering:
+ """This class manages the reordering activity"""
+
+ def __init__(self, louisbraille, max_item):
+ self.louisbraille = louisbraille
+ self.rootitem = louisbraille.rootitem
+ self.index = 0
+ self.randoms = range(max_item)
+ random.shuffle(self.randoms)
+ self.orders = range(max_item)
+
+ def dump(self):
+ for index, item in enumerate(self.orders):
+ print index, item.get_data("index")
+
+ # Return True if all the items are properly placed
+ def is_done(self):
+ for index, item in enumerate(self.orders):
+ group_index = item.get_data("index")
+ if ( group_index != index ):
+ return False
+ return True
+
+ # To indicate correct and wrong lines
+ def is_not_done(self):
+ for index , item in enumerate (self.orders):
+ group_index = item.get_data("index")
+ rectbox = item.get_data("rectbox")
+ if ( group_index != index ):
+ rectbox.set_property("fill_color_rgba", 0xed6d6deeL)
+ else :
+ rectbox.set_property("fill_color_rgba", 0x80e072eeL)
+
+ def add_line(self, text):
+ position = self.randoms[ self.index ]
+ y = (position + 0.5) * 43
+ group_item = goocanvas.Group(parent = self.rootitem,
+ y = y)
+ # Save in the item itself where is its correct position
+ group_item.set_data("index", self.index)
+ # Create Rounded Rectangles for each story
+ rect_box = goocanvas.Rect(parent = group_item,
+ x = 100,
+ y = 0,
+ width = 550,
+ height = 40,
+ radius_x = 5,
+ radius_y = 5,
+ stroke_color = "black",
+ fill_color_rgba = 0xEEEEEEEEL,
+ line_width = 2.0)
+ group_item.set_data("rectbox", rect_box)
+ self.orders[ position ] = group_item
+
+ # Displaying the STORY
+ goocanvas.Text(parent = group_item,
+ x = 370.0,
+ y = 20,
+ text = text,
+ fill_color = "black",
+ anchor = gtk.ANCHOR_CENTER,
+ alignment = pango.ALIGN_CENTER,
+ font = 'SANS 9',
+ width = 500,
+ )
+
+ group_item.connect("button_press_event", self.component_drag)
+ group_item.connect("motion_notify_event", self.component_drag)
+ group_item.connect("button_release_event", self.component_drag)
+
+ self.index += 1
+
+ # Return the index in self.orders of the given group
+ def get_group_index(self, group):
+ return self.orders.index(group)
+
+ def move_group(self, from_index, to_index):
+ from_item = self.orders[from_index]
+ (from_x, from_y) = from_item.get_properties('x', 'y')
+ print "from", from_x, from_y
+ to_item = self.orders[to_index]
+ to_x = to_item.get_data('xref')
+ to_y = to_item.get_data('yref')
+ print "to", to_x, to_y
+ from_item.set_properties(x = to_x, y = to_y)
+ to_item.set_data("xref", from_x)
+ to_item.set_data("yref", from_y)
+ self.orders[from_index], self.orders[to_index] = self.orders[to_index], self.orders[from_index]
+
+ def swap_with_group_near(self, group, y):
+ for index, item in enumerate(self.orders):
+ bounds = item.get_bounds()
+ if ( group != item and
+ y < bounds.y2 and y > bounds.y1 ):
+ print self.get_group_index(group)
+ self.move_group( index, self.get_group_index(group) )
+ return
+
+ def component_drag(self, widget, target, event):
+ groupitem = target.get_parent()
+ groupitem.raise_(None)
+
+ if event.type == gtk.gdk.BUTTON_PRESS:
+ bounds = groupitem.get_bounds()
+ self.offset_y = event.y
+ # We save the x and y coord in xref and yref for future use
+ (x, y) = groupitem.get_properties('x', 'y')
+ groupitem.set_data("xref", x)
+ groupitem.set_data("yref", y)
+
+ elif ( event.type == gtk.gdk.MOTION_NOTIFY
+ and event.state & gtk.gdk.BUTTON1_MASK ):
+ groupitem.translate(0, event.y - self.offset_y)
+
+ (x, y) = self.louisbraille.gcomprisBoard.canvas.\
+ convert_from_item_space(groupitem, event.x, event.y)
+ self.swap_with_group_near(groupitem, y)
+
+ elif event.type == gtk.gdk.BUTTON_RELEASE:
+ groupitem.set_transform(None)
+ to_x = groupitem.get_data('xref')
+ to_y = groupitem.get_data('yref')
+ groupitem.set_properties(x = to_x, y = to_y)
+
+ return True
++>>>>>>> gcomprisbraille
diff --cc src/louis_braille-activity/louis_braille.xml.in
index 581f5b8,e21eb34..f2e8b72
--- a/src/louis_braille-activity/louis_braille.xml.in
+++ b/src/louis_braille-activity/louis_braille.xml.in
@@@ -3,18 -3,18 +3,31 @@@
<Board
name="louis_braille"
type="python:louis_braille"
- section="/experimental"
+ section="/discovery/braille"
icon="louis_braille.svg"
++<<<<<<< HEAD
+ difficulty="5"
+ author="Srishti Sethi (srishakatux gmail com)"
+ boarddir=""
+ demo="1">
+ <title>The History of Louis Braille</title>
+ <description>Review the major dates in the inventor of the Braille system.</description>
+ <prerequisite></prerequisite>
+ <goal></goal>
+ <manual>Read the history of Louis Braille, his biography and discovery of the Braille system. Click on the previous and next buttons to move to the respective story page. At the end, arrange the sequence in the chronological order.</manual>
+ <credit>Louis Braille Video: < http://www.youtube.com/watch?v=9bdfC2j_4x4 > </credit>
++=======
+ difficulty="4"
+ author="Srishti Sethi (srishakatux gmail com)"
+ boarddir=""
+ demo="1">
+ <_title>Louis Braille</_title>
+ <_description>The Story Of Louis Braille</_description>
+ <_prerequisite>Reading</_prerequisite>
+ <_goal></_goal>
+ <_manual>Read the story of Louis Braille, his biography and discovery of braille code. Click on the previous and next buttons to move to the respective story page. At the end of story, arrange the sequence of story by draging the events. Click on OK button to confirm the sequence. Each correctly arranged line will me marked in green and in red otherwise.</_manual>
+ <_credit>Louis Braille Video < http://www.youtube.com/watch?v=9bdfC2j_4x4> </_credit>
++>>>>>>> gcomprisbraille
</Board>
<Data directory=""/>
-</GCompris>
+</GCompris>
diff --cc src/louis_braille-activity/resources/Makefile.am
index bfcfca5,0c57d18..5b09752
--- a/src/louis_braille-activity/resources/Makefile.am
+++ b/src/louis_braille-activity/resources/Makefile.am
@@@ -1,1 -1,1 +1,2 @@@
-SUBDIRS = louis_braille
+SUBDIRS = louis_braille
++
diff --cc src/louis_braille-activity/resources/louis_braille/Makefile.am
index e7cc8a6,774467b..93493fb
--- a/src/louis_braille-activity/resources/louis_braille/Makefile.am
+++ b/src/louis_braille-activity/resources/louis_braille/Makefile.am
@@@ -1,14 -1,14 +1,24 @@@
imgdir = $(pkgdatadir)/@PACKAGE_DATA_DIR@/louis_braille
img_DATA = \
activity.desktop \
++<<<<<<< HEAD
+ back.png \
++=======
+ background.svgz \
++>>>>>>> gcomprisbraille
braile.jpg \
braille_ball.jpg \
chart.png \
fireplace.jpg \
++<<<<<<< HEAD
+ louis.jpg \
+ night_printing.jpg \
+ piano.jpg \
++=======
+ louis.png \
+ night_printing.jpg \
+ piano.svg \
++>>>>>>> gcomprisbraille
rnib.jpg \
statue.jpg \
teach.jpg \
@@@ -21,7 -21,4 +31,11 @@@ activity.desktop: activity.desktop.i
sed -e "s/^_//g" $< > $@
EXTRA_DIST = $(img_DATA) activity.desktop.in
++<<<<<<< HEAD
+
+CLEANFILES = activity.desktop
+
+
++=======
+ CLEANFILES = activity.desktop
++>>>>>>> gcomprisbraille
diff --cc src/louis_braille-activity/resources/louis_braille/activity.desktop
index e82535a,0a6c596..6aebfc3
mode 100644,100755..100755
--- a/src/louis_braille-activity/resources/louis_braille/activity.desktop
+++ b/src/louis_braille-activity/resources/louis_braille/activity.desktop
@@@ -1,7 -1,7 +1,11 @@@
[1]
year = 1809
story = Born January 4th at Coupvary near Paris in France.
++<<<<<<< HEAD
+image = louis_braille/louis.jpg
++=======
+ image = louis_braille/louis.png
++>>>>>>> gcomprisbraille
[2]
year = 1812
@@@ -21,11 -21,11 +25,19 @@@ image = louis_braille/rnib.jp
[5]
year = 1820
story = He began to impress his classmates and began to play piano and the organ.
++<<<<<<< HEAD
+image = louis_braille/piano.jpg
+
+[6]
+year = 1821
+story = Charles Barbier, a french soldier visited school and shared invention of night writing ,a code of 12 raised dots that let soldiers share secret information on battlefield.
++=======
+ image = louis_braille/piano.svg
+
+ [6]
+ year = 1821
+ story = Charles Barbier, a french soldier visited school and shared invention of night writing ,a code of 12 raised dots to share information on battlefield.
++>>>>>>> gcomprisbraille
image = louis_braille/night_printing.jpg
[7]
@@@ -52,36 -52,3 +64,39 @@@ image = louis_braille/statue.jp
year = After his Death
story = Braille got accepted as a world wide standard.Louis proved if you have motivation you can do incredible things.
image = louis_braille/braille_ball.jpg
++<<<<<<< HEAD
+
+[12]
+story = Born January 4th at Coupvary near Paris in France.
+
+[13]
+story = Louis Braille injured his left eye with a stitching awl from his fathers workshop.
+
+[14]
+story = At the age of three Louis became blind due to sympathetic ophthalmia.
+
+[15]
+story = At the age of 10 he was sent to Paris to study at the Royal Institute for Blind Youth.
+
+[16]
+story = He began to impress his classmates and began to play piano and the organ.
+
+[17]
+story = Charles Barbier, a french soldier visited school and shared invention of night writing.
+
+[18]
+story = Louis trimmed Barbier's 12 dots into 6 and invented Braille.
+
+[19]
+story = He became a professor after graduating and secretly taught his method.
+
+[20]
+story = He revised and extended braille to include mathematics,symbols, punctuations and music notations.
+
+[21]
+story = He died of tuberculosis.He is burried in the Pantheon in Paris.A monument is erected to honor him.
+
+[22]
- story = Braille got accepted as a world wide standard.Louis proved if you have motivation you can do incredible things.
++story = Braille got accepted as a world wide standard.Louis proved if you have motivation you can do incredible things.
++=======
++>>>>>>> gcomprisbraille
diff --cc src/louis_braille-activity/resources/louis_braille/activity.desktop.in
index 82b91a1,965caeb..6c4e74a
--- a/src/louis_braille-activity/resources/louis_braille/activity.desktop.in
+++ b/src/louis_braille-activity/resources/louis_braille/activity.desktop.in
@@@ -1,50 -1,50 +1,93 @@@
[1]
++<<<<<<< HEAD
+_year = 1809
+_story = Born January 4th at Coupvary near Paris in France.
+image = louis_braille/louis.jpg
+
+[2]
+_year = 1812
++=======
+ year = 1809
+ _story = Born January 4th at Coupvary near Paris in France.
+ image = louis_braille/louis.png
+
+ [2]
+ year = 1812
++>>>>>>> gcomprisbraille
_story = Louis Braille injured his left eye with a stitching awl from his fathers workshop.
image = louis_braille/workshop.jpg
[3]
++<<<<<<< HEAD
+_year = 1812
++=======
+ year = 1812
++>>>>>>> gcomprisbraille
_story = At the age of three Louis became blind due to sympathetic ophthalmia.
image = louis_braille/fireplace.jpg
[4]
++<<<<<<< HEAD
+_year = 1819
++=======
+ year = 1819
++>>>>>>> gcomprisbraille
_story = At the age of 10 he was sent to Paris to study at the Royal Institute for Blind Youth.
image = louis_braille/rnib.jpg
[5]
++<<<<<<< HEAD
+_year = 1820
+_story = He began to impress his classmates and began to play piano and the organ.
+image = louis_braille/piano.jpg
+
+[6]
+_year = 1821
+_story = Charles Barbier, a french soldier visited school and shared invention of night writing ,a code of 12 raised dots that let soldiers share secret information on battlefield.
+image = louis_braille/night_printing.jpg
+
+[7]
+_year = 1824
++=======
+ year = 1820
+ _story = He began to impress his classmates and began to play piano and the organ.
+ image = louis_braille/piano.svg
+
+ [6]
+ year = 1821
+ _story = Charles Barbier, a french soldier visited school and shared invention of night writing ,a code of 12 raised dots to share information on battlefield.
+ image = louis_braille/night_printing.jpg
+
+ [7]
+ year = 1824
++>>>>>>> gcomprisbraille
_story = Louis trimmed Barbier's 12 dots into 6 and invented Braille.
image = louis_braille/braile.jpg
[8]
++<<<<<<< HEAD
+_year = 1828
++=======
+ year = 1828
++>>>>>>> gcomprisbraille
_story = He became a professor after graduating and secretly taught his method.
image = louis_braille/teach.jpg
[9]
++<<<<<<< HEAD
+_year = 1837
++=======
+ year = 1837
++>>>>>>> gcomprisbraille
_story = He revised and extended braille to include mathematics, symbols, punctuations and music notations.
image = louis_braille/chart.png
[10]
++<<<<<<< HEAD
+_year = 1852
++=======
+ year = 1852
++>>>>>>> gcomprisbraille
_story = He died of tuberculosis.He is burried in the Pantheon in Paris.A monument is erected to honor him.
image = louis_braille/statue.jpg
@@@ -52,36 -52,3 +95,39 @@@
_year = After his Death
_story = Braille got accepted as a world wide standard.Louis proved if you have motivation you can do incredible things.
image = louis_braille/braille_ball.jpg
++<<<<<<< HEAD
+
+[12]
+_story = Born January 4th at Coupvary near Paris in France.
+
+[13]
+_story = Louis Braille injured his left eye with a stitching awl from his fathers workshop.
+
+[14]
+_story = At the age of three Louis became blind due to sympathetic ophthalmia.
+
+[15]
+_story = At the age of 10 he was sent to Paris to study at the Royal Institute for Blind Youth.
+
+[16]
+_story = He began to impress his classmates and began to play piano and the organ.
+
+[17]
+_story = Charles Barbier, a french soldier visited school and shared invention of night writing.
+
+[18]
+_story = Louis trimmed Barbier's 12 dots into 6 and invented Braille.
+
+[19]
+_story = He became a professor after graduating and secretly taught his method.
+
+[20]
+_story = He revised and extended braille to include mathematics,symbols, punctuations and music notations.
+
+[21]
+_story = He died of tuberculosis.He is burried in the Pantheon in Paris.A monument is erected to honor him.
+
+[22]
- _story = Braille got accepted as a world wide standard.Louis proved if you have motivation you can do incredible things.
++_story = Braille got accepted as a world wide standard.Louis proved if you have motivation you can do incredible things.
++=======
++>>>>>>> gcomprisbraille
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
