Case changing, audio ending detection

95 files changed, 157 insertions, 19 deletions

diff --git a/html/app.js b/html/app.js
index 2684f48..1e841dd 100644
--- a/html/app.js
+++ b/html/app.js
@@ -2,9 +2,9 @@
 
 // Collections size on the screen
 var viewConst = {
-	themes: { x: 20, y: 50, dx: 260},
-	letters: { x: 50, y: 330, dx: 80, dy: 80, line: 12},
-	collections: { x: 20, y: 50, dx: 260, dy: 100, line: 4},
+	themes: { x: 20, y: 70, dx: 260},
+	letters: { x: 50, y: 350, dx: 80, dy: 80, line: 12},
+	collections: { x: 20, y: 50, dx: 280, dy: 100, line: 4},
 	entries: { x: 70, y: 50, dx: 260, dy: 250, line: 4, screen: 8}
 };
 
@@ -17,6 +17,9 @@ enyo.kind({
 	components: [
 		{components: [
 			{name: "colorBar", classes: "colorBar"},
+			{name: "switchToUpper", kind: "Image", src: "images/case0.png", ontap: "localUpper", classes: "switchCase"},			
+			{name: "switchToScript", kind: "Image", src: "images/case1.png", showing: false, ontap: "localScript", classes: "switchCase"},			
+			{name: "switchToLower", kind: "Image", src: "images/case2.png", showing: false, ontap: "localLower", classes: "switchCase"},			
 			{name: "switchToFrench", kind: "Image", src: "images/us.png", showing: false, ontap: "localFrench", classes: "switchLang"},
 			{name: "switchToEnglish", kind: "Image", src: "images/fr.png", ontap: "localEnglish", classes: "switchLang"}
 		]},
@@ -36,6 +39,7 @@ enyo.kind({
 		Abcd.context.screen = this;
 		this.theme = this.collection = this.entry = -1;
 		this.collections = [];
+		this.playing = null;
 	},
 	
 	// Localization changed
@@ -56,6 +60,17 @@ enyo.kind({
 		});	
 	},
 	
+	// Case changed
+	setCase: function() {
+		// Redraw entry
+		enyo.forEach(this.$.box.getControls(), function(entry) {
+			if (entry.kind == 'Abcd.Letter')
+				entry.letterChanged();
+			else
+				entry.indexChanged();
+		});		
+	},
+	
 	// Display themes and letters
 	displayThemes: function() {
 		// Display themes
@@ -156,7 +171,7 @@ enyo.kind({
 		this.$.back.show();
 		length = this.collections.length;
 		for (var i = position ; i < length ; i++) {
-			this.$.box.createComponent({ kind: "Abcd.Entry", index:this.collections[i], x: x, y: y, ontap: "play"}, {owner: this}).render();
+			this.$.box.createComponent({ kind: "Abcd.Entry", index:this.collections[i], x: x, y: y, ontap: "play", onEntrySoundEnded: "soundEnd"}, {owner: this}).render();
 			x = x + viewConst.entries.dx;
 			if (++count % viewConst.entries.line == 0) {
 				y = y + viewConst.entries.dy;
@@ -220,8 +235,37 @@ enyo.kind({
 		Abcd.setLocale(Abcd.frTexts);
 	},
 	
+	// Change current case
+	localUpper: function() {
+		this.$.switchToLower.hide();
+		this.$.switchToUpper.hide();	
+		this.$.switchToScript.show();	
+		Abcd.setCase(1);
+	},
+	
+	localLower: function() {
+		this.$.switchToLower.hide();
+		this.$.switchToUpper.show();	
+		this.$.switchToScript.hide();	
+		Abcd.setCase(0);
+	},
+	
+	localScript: function() {
+		this.$.switchToLower.show();
+		this.$.switchToUpper.hide();	
+		this.$.switchToScript.hide();	
+		Abcd.setCase(2);
+	},
+	
 	// Play entry sound
 	play: function(inSender, inObject) {
+		if (this.playing != null)
+			this.playing.abort();	
+		this.playing = inSender;
 		inSender.play(Abcd.sound);
+	},
+	
+	soundEnd: function(inSender, inObject) {
+		this.playing = null;
 	}
 });
diff --git a/html/audio.js b/html/audio.js
index eb5bc17..7fcb970 100644
--- a/html/audio.js
+++ b/html/audio.js
@@ -9,6 +9,9 @@ enyo.kind({
 		src: "", crossorigin: "", preload: "auto",
 		mediagroup: "", loop: false, muted: "", controlsbar: false
 	},
+	events: {
+		onSoundEnded: ""
+	},
 	
 	// Constructor
 	create: function() {
@@ -30,7 +33,8 @@ enyo.kind({
 		if (this.hasNode() != null) {		
 			// Handle sound ended event
 			var audio = this;
-			enyo.dispatcher.listen(audio.hasNode(), "ended", function() {
+			enyo.dispatcher.listen(audio.hasNode(), "ended", function() { 
+				audio.doSoundEnded();
 			});			
 		}
 	},
@@ -107,7 +111,7 @@ enyo.kind({
 	name: "Abcd.Audio",
 	kind: enyo.Control,
 	components: [
-		{ name: "sound", kind: "HTML5.Audio", preload: "auto", autobuffer: true, controlsbar: false, onended: "broadcastEnd" }
+		{ name: "sound", kind: "HTML5.Audio", preload: "auto", autobuffer: true, controlsbar: false, onSoundEnded: "broadcastEnd" }
 	],
 	
 	// Constructor
diff --git a/html/collection.js b/html/collection.js
index bbf4bbc..4c9c2b5 100644
--- a/html/collection.js
+++ b/html/collection.js
@@ -38,9 +38,13 @@ enyo.kind({
 		var entry = Abcd.entries[collection.img];
 		var image = "images/database/"+entry.code+".png";
 		var text = __$FC(collection.text);
-		if (Abcd.context.upper)
+		if (Abcd.context.casevalue == 1)
 			text = text.toUpperCase();
 		this.$.itemImage.setAttribute("src", image);
+		this.$.itemText.removeClass("collectionText0");
+		this.$.itemText.removeClass("collectionText1");
+		this.$.itemText.removeClass("collectionText2");
+		this.$.itemText.addClass("collectionText"+Abcd.context.casevalue);		
 		this.$.itemText.setContent(text);
 		this.addClass("themeColor"+collection.theme);
 	}
diff --git a/html/css/Rochester-Regular.ttf b/html/css/Rochester-Regular.ttf
new file mode 100644
index 0000000..795faa7
--- /dev/null
+++ b/html/css/Rochester-Regular.ttf
diff --git a/html/styles.css b/html/css/styles.css
index 7e96548..b75edf2 100644
--- a/html/styles.css
+++ b/html/css/styles.css
@@ -1,4 +1,9 @@
 
+@font-face {
+	font-family: Rochester;
+	src: url('css/Rochester-Regular.ttf');
+}
+
 .board {
 }
 
@@ -11,6 +16,14 @@
 	top: -10px;
 }
 
+.switchCase {
+	position: absolute;
+	width: 50px;
+	height: 50px;
+	right: 100px;
+	top: 10px;
+}
+
 .switchLang {
 	position: absolute;
 	width: 50px;
@@ -81,6 +94,19 @@
 	padding: 5px;
 }
 
+.entryText0 {
+	font-size: 30px;
+}
+
+.entryText1 {
+	font-size: 28px;
+}
+
+.entryText2 {
+	font-size: 36px;
+	font-family: Rochester;
+}
+
 .entrySoundIcon {
 }
 
@@ -93,7 +119,7 @@
 	border-style: inset;
 	border-color: darkgray;
 	box-shadow: 2px -2px 2px 1px black;
-	width: 230px;
+	width: 250px;
 	position: absolute;
 	z-index: 0;
 	-webkit-user-select: none;
@@ -108,13 +134,25 @@
 }
 
 .collectionText {
-	font-size: 22px;
 	margin-left: 10px;
 	text-align: center;
 	padding: 3px;
 	display: inline-block;	
 }
 
+.collectionText0 {
+	font-size: 22px;
+}
+
+.collectionText1 {
+	font-size: 18px;
+}
+
+.collectionText2 {
+	font-size: 28px;
+	font-family: Rochester;
+}
+
 .theme {
 	border-width: 5px;
 	border-style: inset;
@@ -135,11 +173,23 @@
 }
 
 .themeText {
-	font-size:30px;
 	text-align: center;
 	padding: 5px;
 }
 
+.themeText0 {
+	font-size: 30px;
+}
+
+.themeText1 {
+	font-size: 28px;
+}
+
+.themeText2 {
+	font-size: 36px;
+	font-family: Rochester;
+}
+
 .themeColor-1 {
 	background-color: #ffffff;
 }
diff --git a/html/entry.js b/html/entry.js
index ee57655..4062775 100644
--- a/html/entry.js
+++ b/html/entry.js
@@ -10,8 +10,12 @@ enyo.kind({
 			{ name: "itemImage", classes: "entryImage", kind: "Image", onload: "imageLoaded" },
 			{ name: "soundIcon", kind: "Image", src: "images/sound_icon.png", classes: "entrySoundIcon" },
 			{ name: "itemText", classes: "entryText" }
-		]}
+		]},
+		{kind: "Signals", onEndOfSound: "endOfSound"}		
 	],
+	events: {
+		onEntrySoundEnded: ""
+	},
 	
 	// Constructor
 	create: function() {
@@ -36,25 +40,48 @@ enyo.kind({
 	
 	// Card setup
 	indexChanged: function() {
+		// Get content
 		var entry = Abcd.entries[this.index];
 		var image = "images/database/"+entry.code+".png";
 		var text = __$FC(entry.text);
-		if (Abcd.context.upper)
+		if (Abcd.context.casevalue == 1)
 			text = text.toUpperCase();
+			
+		// Get sound
 		if (entry[Abcd.context.lang]) {
 			this.sound = "audio/"+Abcd.context.lang+"/database/"+entry.code;
-			this.$.soundIcon.setSrc("images/sound_icon.png");
+			this.$.soundIcon.setSrc("images/sound_off.png");
 		} else {
 			this.sound = null;
-			this.$.soundIcon.setSrc("images/nosound_icon.png");
+			this.$.soundIcon.setSrc("images/sound_none.png");
 		}
+		
+		// Display all
 		this.$.itemImage.setAttribute("src", image);
+		this.$.itemText.removeClass("entryText0");
+		this.$.itemText.removeClass("entryText1");
+		this.$.itemText.removeClass("entryText2");
+		this.$.itemText.addClass("entryText"+Abcd.context.casevalue);
 		this.$.itemText.setContent(text);
 	},
 	
 	// Play sound using the media
 	play: function(media) {
-		if (this.sound != null)
+		if (this.sound != null) {
+			this.$.soundIcon.setSrc("images/sound_on.png");	
 			media.play(this.sound);
+		}
+	},
+	
+	endOfSound: function(e, s) {
+		if (s == this.sound) {
+			this.doEntrySoundEnded();
+			this.$.soundIcon.setSrc("images/sound_off.png");
+		}
+	},
+
+	abort: function() {
+		 if (this.$.soundIcon !== undefined)
+			this.$.soundIcon.setSrc("images/sound_off.png");	
 	}
 });
\ No newline at end of file
diff --git a/html/images/case0.png b/html/images/case0.png
new file mode 100644
index 0000000..a4c66cf
--- /dev/null
+++ b/html/images/case0.png
diff --git a/html/images/case1.png b/html/images/case1.png
new file mode 100644
index 0000000..fb242aa
--- /dev/null
+++ b/html/images/case1.png
diff --git a/html/images/case2.png b/html/images/case2.png
new file mode 100644
index 0000000..7a5eb34
--- /dev/null
+++ b/html/images/case2.png
diff --git a/html/images/letters/a0.png b/html/images/letters/a0.png
new file mode 100644
index 0000000..65340b6
--- /dev/null
+++ b/html/images/letters/a0.png
diff --git a/html/images/letters/a.png b/html/images/letters/a1.png
index 3b77695..3b77695 100644
--- a/html/images/letters/a.png
+++ b/html/images/letters/a1.png
diff --git a/html/images/letters/a2.png b/html/images/letters/a2.png
new file mode 100644
index 0000000..e716533
--- /dev/null
+++ b/html/images/letters/a2.png
diff --git a/html/images/letters/b0.png b/html/images/letters/b0.png
new file mode 100644
index 0000000..9dc4f27
--- /dev/null
+++ b/html/images/letters/b0.png
diff --git a/html/images/letters/b.png b/html/images/letters/b1.png
index 405cd24..405cd24 100644
--- a/html/images/letters/b.png
+++ b/html/images/letters/b1.png
diff --git a/html/images/letters/b2.png b/html/images/letters/b2.png
new file mode 100644
index 0000000..ae43dd4
--- /dev/null
+++ b/html/images/letters/b2.png
diff --git a/html/images/letters/c0.png b/html/images/letters/c0.png
new file mode 100644
index 0000000..c0e370f
--- /dev/null
+++ b/html/images/letters/c0.png
diff --git a/html/images/letters/c.png b/html/images/letters/c1.png
index b3eb5e8..b3eb5e8 100644
--- a/html/images/letters/c.png
+++ b/html/images/letters/c1.png
diff --git a/html/images/letters/c2.png b/html/images/letters/c2.png
new file mode 100644
index 0000000..721fa9d
--- /dev/null
+++ b/html/images/letters/c2.png
diff --git a/html/images/letters/d0.png b/html/images/letters/d0.png
new file mode 100644
index 0000000..87925f1
--- /dev/null
+++ b/html/images/letters/d0.png
diff --git a/html/images/letters/d.png b/html/images/letters/d1.png
index 285c19d..285c19d 100644
--- a/html/images/letters/d.png
+++ b/html/images/letters/d1.png
diff --git a/html/images/letters/d2.png b/html/images/letters/d2.png
new file mode 100644
index 0000000..5ff609e
--- /dev/null
+++ b/html/images/letters/d2.png
diff --git a/html/images/letters/e0.png b/html/images/letters/e0.png
new file mode 100644
index 0000000..c5b6123
--- /dev/null
+++ b/html/images/letters/e0.png
diff --git a/html/images/letters/e.png b/html/images/letters/e1.png
index 878ff7c..878ff7c 100644
--- a/html/images/letters/e.png
+++ b/html/images/letters/e1.png
diff --git a/html/images/letters/e2.png b/html/images/letters/e2.png
new file mode 100644
index 0000000..aadee6f
--- /dev/null
+++ b/html/images/letters/e2.png
diff --git a/html/images/letters/f0.png b/html/images/letters/f0.png
new file mode 100644
index 0000000..7290fc1
--- /dev/null
+++ b/html/images/letters/f0.png
diff --git a/html/images/letters/f.png b/html/images/letters/f1.png
index ddd667a..ddd667a 100644
--- a/html/images/letters/f.png
+++ b/html/images/letters/f1.png
diff --git a/html/images/letters/f2.png b/html/images/letters/f2.png
new file mode 100644
index 0000000..c60f792
--- /dev/null
+++ b/html/images/letters/f2.png
diff --git a/html/images/letters/g0.png b/html/images/letters/g0.png
new file mode 100644
index 0000000..9a78516
--- /dev/null
+++ b/html/images/letters/g0.png
diff --git a/html/images/letters/g.png b/html/images/letters/g1.png
index 5236188..5236188 100644
--- a/html/images/letters/g.png
+++ b/html/images/letters/g1.png
diff --git a/html/images/letters/g2.png b/html/images/letters/g2.png
new file mode 100644
index 0000000..43a7e94
--- /dev/null
+++ b/html/images/letters/g2.png
diff --git a/html/images/letters/h0.png b/html/images/letters/h0.png
new file mode 100644
index 0000000..18a39f4
--- /dev/null
+++ b/html/images/letters/h0.png
diff --git a/html/images/letters/h.png b/html/images/letters/h1.png
index 5b2cb47..5b2cb47 100644
--- a/html/images/letters/h.png
+++ b/html/images/letters/h1.png
diff --git a/html/images/letters/h2.png b/html/images/letters/h2.png
new file mode 100644
index 0000000..b45b568
--- /dev/null
+++ b/html/images/letters/h2.png
diff --git a/html/images/letters/i0.png b/html/images/letters/i0.png
new file mode 100644
index 0000000..5b778bb
--- /dev/null
+++ b/html/images/letters/i0.png
diff --git a/html/images/letters/i.png b/html/images/letters/i1.png
index 7564dc0..7564dc0 100644
--- a/html/images/letters/i.png
+++ b/html/images/letters/i1.png
diff --git a/html/images/letters/i2.png b/html/images/letters/i2.png
new file mode 100644
index 0000000..0db881e
--- /dev/null
+++ b/html/images/letters/i2.png
diff --git a/html/images/letters/j0.png b/html/images/letters/j0.png
new file mode 100644
index 0000000..7acdf74
--- /dev/null
+++ b/html/images/letters/j0.png
diff --git a/html/images/letters/j.png b/html/images/letters/j1.png
index 7858c44..7858c44 100644
--- a/html/images/letters/j.png
+++ b/html/images/letters/j1.png
diff --git a/html/images/letters/j2.png b/html/images/letters/j2.png
new file mode 100644
index 0000000..1880f5f
--- /dev/null
+++ b/html/images/letters/j2.png
diff --git a/html/images/letters/k0.png b/html/images/letters/k0.png
new file mode 100644
index 0000000..244d441
--- /dev/null
+++ b/html/images/letters/k0.png
diff --git a/html/images/letters/k.png b/html/images/letters/k1.png
index 9f58069..9f58069 100644
--- a/html/images/letters/k.png
+++ b/html/images/letters/k1.png
diff --git a/html/images/letters/k2.png b/html/images/letters/k2.png
new file mode 100644
index 0000000..929e2f5
--- /dev/null
+++ b/html/images/letters/k2.png
diff --git a/html/images/letters/l0.png b/html/images/letters/l0.png
new file mode 100644
index 0000000..ac0c13d
--- /dev/null
+++ b/html/images/letters/l0.png
diff --git a/html/images/letters/l.png b/html/images/letters/l1.png
index a9265b2..a9265b2 100644
--- a/html/images/letters/l.png
+++ b/html/images/letters/l1.png
diff --git a/html/images/letters/l2.png b/html/images/letters/l2.png
new file mode 100644
index 0000000..48fceeb
--- /dev/null
+++ b/html/images/letters/l2.png
diff --git a/html/images/letters/m0.png b/html/images/letters/m0.png
new file mode 100644
index 0000000..d6e846d
--- /dev/null
+++ b/html/images/letters/m0.png
diff --git a/html/images/letters/m.png b/html/images/letters/m1.png
index 70bee30..70bee30 100644
--- a/html/images/letters/m.png
+++ b/html/images/letters/m1.png
diff --git a/html/images/letters/m2.png b/html/images/letters/m2.png
new file mode 100644
index 0000000..c0ef4e1
--- /dev/null
+++ b/html/images/letters/m2.png
diff --git a/html/images/letters/n0.png b/html/images/letters/n0.png
new file mode 100644
index 0000000..9a596af
--- /dev/null
+++ b/html/images/letters/n0.png
diff --git a/html/images/letters/n.png b/html/images/letters/n1.png
index e29345e..e29345e 100644
--- a/html/images/letters/n.png
+++ b/html/images/letters/n1.png
diff --git a/html/images/letters/n2.png b/html/images/letters/n2.png
new file mode 100644
index 0000000..6862401
--- /dev/null
+++ b/html/images/letters/n2.png
diff --git a/html/images/letters/o0.png b/html/images/letters/o0.png
new file mode 100644
index 0000000..372f1a2
--- /dev/null
+++ b/html/images/letters/o0.png
diff --git a/html/images/letters/o.png b/html/images/letters/o1.png
index 66a305e..66a305e 100644
--- a/html/images/letters/o.png
+++ b/html/images/letters/o1.png
diff --git a/html/images/letters/o2.png b/html/images/letters/o2.png
new file mode 100644
index 0000000..aae90b8
--- /dev/null
+++ b/html/images/letters/o2.png
diff --git a/html/images/letters/p0.png b/html/images/letters/p0.png
new file mode 100644
index 0000000..84f26ee
--- /dev/null
+++ b/html/images/letters/p0.png
diff --git a/html/images/letters/p.png b/html/images/letters/p1.png
index ae90920..ae90920 100644
--- a/html/images/letters/p.png
+++ b/html/images/letters/p1.png
diff --git a/html/images/letters/p2.png b/html/images/letters/p2.png
new file mode 100644
index 0000000..ad89dd1
--- /dev/null
+++ b/html/images/letters/p2.png
diff --git a/html/images/letters/q0.png b/html/images/letters/q0.png
new file mode 100644
index 0000000..88428b4
--- /dev/null
+++ b/html/images/letters/q0.png
diff --git a/html/images/letters/q.png b/html/images/letters/q1.png
index 6279479..6279479 100644
--- a/html/images/letters/q.png
+++ b/html/images/letters/q1.png
diff --git a/html/images/letters/q2.png b/html/images/letters/q2.png
new file mode 100644
index 0000000..12c818b
--- /dev/null
+++ b/html/images/letters/q2.png
diff --git a/html/images/letters/r0.png b/html/images/letters/r0.png
new file mode 100644
index 0000000..63a5fbf
--- /dev/null
+++ b/html/images/letters/r0.png
diff --git a/html/images/letters/r.png b/html/images/letters/r1.png
index eb28da3..eb28da3 100644
--- a/html/images/letters/r.png
+++ b/html/images/letters/r1.png
diff --git a/html/images/letters/r2.png b/html/images/letters/r2.png
new file mode 100644
index 0000000..c0215c3
--- /dev/null
+++ b/html/images/letters/r2.png
diff --git a/html/images/letters/s0.png b/html/images/letters/s0.png
new file mode 100644
index 0000000..668264f
--- /dev/null
+++ b/html/images/letters/s0.png
diff --git a/html/images/letters/s.png b/html/images/letters/s1.png
index c32cedd..c32cedd 100644
--- a/html/images/letters/s.png
+++ b/html/images/letters/s1.png
diff --git a/html/images/letters/s2.png b/html/images/letters/s2.png
new file mode 100644
index 0000000..2c159c0
--- /dev/null
+++ b/html/images/letters/s2.png
diff --git a/html/images/letters/t0.png b/html/images/letters/t0.png
new file mode 100644
index 0000000..94568e2
--- /dev/null
+++ b/html/images/letters/t0.png
diff --git a/html/images/letters/t.png b/html/images/letters/t1.png
index 4a5ec42..4a5ec42 100644
--- a/html/images/letters/t.png
+++ b/html/images/letters/t1.png
diff --git a/html/images/letters/t2.png b/html/images/letters/t2.png
new file mode 100644
index 0000000..b2ab949
--- /dev/null
+++ b/html/images/letters/t2.png
diff --git a/html/images/letters/u0.png b/html/images/letters/u0.png
new file mode 100644
index 0000000..62c1a34
--- /dev/null
+++ b/html/images/letters/u0.png
diff --git a/html/images/letters/u.png b/html/images/letters/u1.png
index 3b217e4..3b217e4 100644
--- a/html/images/letters/u.png
+++ b/html/images/letters/u1.png
diff --git a/html/images/letters/u2.png b/html/images/letters/u2.png
new file mode 100644
index 0000000..c278791
--- /dev/null
+++ b/html/images/letters/u2.png
diff --git a/html/images/letters/v0.png b/html/images/letters/v0.png
new file mode 100644
index 0000000..869d794
--- /dev/null
+++ b/html/images/letters/v0.png
diff --git a/html/images/letters/v.png b/html/images/letters/v1.png
index c1c7e8f..c1c7e8f 100644
--- a/html/images/letters/v.png
+++ b/html/images/letters/v1.png
diff --git a/html/images/letters/v2.png b/html/images/letters/v2.png
new file mode 100644
index 0000000..82de143
--- /dev/null
+++ b/html/images/letters/v2.png
diff --git a/html/images/letters/w0.png b/html/images/letters/w0.png
new file mode 100644
index 0000000..6430914
--- /dev/null
+++ b/html/images/letters/w0.png
diff --git a/html/images/letters/w.png b/html/images/letters/w1.png
index 354ddb1..354ddb1 100644
--- a/html/images/letters/w.png
+++ b/html/images/letters/w1.png
diff --git a/html/images/letters/w2.png b/html/images/letters/w2.png
new file mode 100644
index 0000000..49997f6
--- /dev/null
+++ b/html/images/letters/w2.png
diff --git a/html/images/letters/x0.png b/html/images/letters/x0.png
new file mode 100644
index 0000000..ce87a4e
--- /dev/null
+++ b/html/images/letters/x0.png
diff --git a/html/images/letters/x.png b/html/images/letters/x1.png
index a1bf759..a1bf759 100644
--- a/html/images/letters/x.png
+++ b/html/images/letters/x1.png
diff --git a/html/images/letters/x2.png b/html/images/letters/x2.png
new file mode 100644
index 0000000..2689537
--- /dev/null
+++ b/html/images/letters/x2.png
diff --git a/html/images/letters/y0.png b/html/images/letters/y0.png
new file mode 100644
index 0000000..66973d1
--- /dev/null
+++ b/html/images/letters/y0.png
diff --git a/html/images/letters/y.png b/html/images/letters/y1.png
index 578beae..578beae 100644
--- a/html/images/letters/y.png
+++ b/html/images/letters/y1.png
diff --git a/html/images/letters/y2.png b/html/images/letters/y2.png
new file mode 100644
index 0000000..31a3a56
--- /dev/null
+++ b/html/images/letters/y2.png
diff --git a/html/images/letters/z0.png b/html/images/letters/z0.png
new file mode 100644
index 0000000..042dce2
--- /dev/null
+++ b/html/images/letters/z0.png
diff --git a/html/images/letters/z.png b/html/images/letters/z1.png
index 3872215..3872215 100644
--- a/html/images/letters/z.png
+++ b/html/images/letters/z1.png
diff --git a/html/images/letters/z2.png b/html/images/letters/z2.png
new file mode 100644
index 0000000..15eaa32
--- /dev/null
+++ b/html/images/letters/z2.png
diff --git a/html/images/nosound_icon.png b/html/images/nosound_icon.png
deleted file mode 100644
index ab05613..0000000
--- a/html/images/nosound_icon.png
+++ /dev/null
diff --git a/html/images/sound_none.png b/html/images/sound_none.png
new file mode 100644
index 0000000..be17621
--- /dev/null
+++ b/html/images/sound_none.png
diff --git a/html/images/sound_off.png b/html/images/sound_off.png
new file mode 100644
index 0000000..9139991
--- /dev/null
+++ b/html/images/sound_off.png
diff --git a/html/images/sound_icon.png b/html/images/sound_on.png
index b05a431..b05a431 100644
--- a/html/images/sound_icon.png
+++ b/html/images/sound_on.png
diff --git a/html/index.html b/html/index.html
index 267a7e5..dcff691 100644
--- a/html/index.html
+++ b/html/index.html
@@ -4,7 +4,7 @@
 	<title>Abecedarium</title>
 	<link href="enyo/enyo.css" rel="stylesheet" type="text/css" />	
 	<script src="enyo/enyo.js" type="text/javascript"></script>
-	<link href="styles.css" rel="stylesheet" type="text/css" />	
+	<link href="css/styles.css" rel="stylesheet" type="text/css" />	
 </head>
 <body class="board">
 <div id="header" class="config"></div>
diff --git a/html/letter.js b/html/letter.js
index df5b02e..5d6b34f 100644
--- a/html/letter.js
+++ b/html/letter.js
@@ -28,6 +28,6 @@ enyo.kind({
 	// Card setup
 	letterChanged: function() {
 		this.letter = this.letter.toLowerCase()	
-		this.$.itemImage.setAttribute("src", "images/letters/"+this.letter+".png");
+		this.$.itemImage.setAttribute("src", "images/letters/"+this.letter+Abcd.context.casevalue+".png");
 	}
 });	
\ No newline at end of file
diff --git a/html/theme.js b/html/theme.js
index 066d60b..cad51e3 100644
--- a/html/theme.js
+++ b/html/theme.js
@@ -38,9 +38,13 @@ enyo.kind({
 		var entry = Abcd.entries[theme.img];
 		var image = "images/database/"+entry.code+".png";
 		var text = __$FC(theme.text);
-		if (Abcd.context.upper)
+		if (Abcd.context.casevalue == 1)
 			text = text.toUpperCase();
 		this.$.itemImage.setAttribute("src", image);
+		this.$.itemText.removeClass("themeText0");
+		this.$.itemText.removeClass("themeText1");
+		this.$.itemText.removeClass("themeText2");
+		this.$.itemText.addClass("themeText"+Abcd.context.casevalue);		
 		this.$.itemText.setContent(text);
 		this.addClass("themeColor"+this.index);
 	}
diff --git a/html/util.js b/html/util.js
index d8dd2ee..32f4c01 100644
--- a/html/util.js
+++ b/html/util.js
@@ -11,7 +11,7 @@ Abcd = {};
 Abcd.context = {
 	screen: null,
 	lang: "fr",
-	upper: false,
+	casevalue: 0,
 };
 Abcd.saveContext = function() {
 	Abcd.sugar.sendMessage(
@@ -28,6 +28,11 @@ Abcd.setLocale = function(texts) {
 	if (Abcd.context.screen != null)
 		Abcd.context.screen.setLocale();
 }
+Abcd.setCase = function(casevalue) {
+	Abcd.context.casevalue = casevalue;
+	if (Abcd.context.screen != null)
+		Abcd.context.screen.setCase();
+}
 Abcd.sugar = new Sugar();
 Abcd.sugar.connect("localization", Abcd.setLocale);
 Abcd.sugar.connect("save-context", Abcd.saveContext);