no more need to hit Enter. now display the text all the time, even if

	* src/boards/algebra_guesscount.c: (start_board),
	(update_line_calcul), (item_event_num): no more need to hit Enter.
	* src/boards/colors.c: (repeat): now display the text all the time, even if
	  sound is there.
	* boards/geography/Makefile.am:
	* boards/geography/board10_0.xml.in:
	* boards/geography/norway_counties: Added norway country in geography by
	  Karl Ove Hufthammer

svn path=/trunk/; revision=2511

41 files changed, 28 insertions, 1 deletions

diff --git a/boards/geography/Makefile.am b/boards/geography/Makefile.am
index afa06f0..d27738b 100644
--- a/boards/geography/Makefile.am
+++ b/boards/geography/Makefile.am
@@ -16,7 +16,8 @@ xml_in_files = \
 	board8_0.xml.in \
 	board9_0.xml.in \
 	board9_1.xml.in \
-	board9_2.xml.in
+	board9_2.xml.in \
+	board10_0.xml.in
 
 xml_DATA = $(xml_in_files:.xml.in=.xml)
 
diff --git a/boards/geography/board10_0.xml.in b/boards/geography/board10_0.xml.in
new file mode 100644
index 0000000..a9676f9
--- /dev/null
+++ b/boards/geography/board10_0.xml.in
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ShapeGame>
+  <Title x="600" y="495" justification="GTK_JUSTIFY_CENTER">
+    <_name>Counties of Norway</_name>
+  </Title>
+  <Shape name="A1" pixmapfile="geography/norway_counties/akershus.png" targetfile="geography/norway_counties/target_akershus.png" x="232,5" y="408,5" zoomx="1" zoomy="1" position="0"><tooltip>Akershus</tooltip></Shape>
+  <Shape name="A2" pixmapfile="geography/norway_counties/hedmark.png" targetfile="geography/norway_counties/target_hedmark.png" x="236,5" y="368,5" zoomx="1" zoomy="1" position="0"><tooltip>Hedmark</tooltip></Shape>
+  <Shape name="A3" pixmapfile="geography/norway_counties/nord-trondelag.png" targetfile="geography/norway_counties/target_nord-trondelag.png" x="254" y="274,5" zoomx="1" zoomy="1" position="0"><tooltip>Nord-Trøndelag</tooltip></Shape>
+  <Shape name="A4" pixmapfile="geography/norway_counties/rogaland.png" targetfile="geography/norway_counties/target_rogaland.png" x="147" y="433.5" zoomx="1" zoomy="1" position="0"><tooltip>Rogaland</tooltip></Shape>
+  <Shape name="A5" pixmapfile="geography/norway_counties/troms.png" targetfile="geography/norway_counties/target_troms.png" x="346,5" y="100,5" zoomx="1" zoomy="1" position="0"><tooltip>Troms</tooltip></Shape>
+  <Shape name="A6" pixmapfile="geography/norway_counties/aust-agder.png" targetfile="geography/norway_counties/target_aust-agder.png" x="177" y="440,5" zoomx="1" zoomy="1" position="0"><tooltip>Aust-Agder</tooltip></Shape>
+  <Shape name="A7" pixmapfile="geography/norway_counties/hordaland.png" targetfile="geography/norway_counties/target_hordaland.png" x="154" y="392.5" zoomx="1" zoomy="1" position="0"><tooltip>Hordaland</tooltip></Shape>
+  <Shape name="A8" pixmapfile="geography/norway_counties/oppland.png" targetfile="geography/norway_counties/target_oppland.png" x="204,5" y="366.5" zoomx="1" zoomy="1" position="0"><tooltip>Oppland</tooltip></Shape>
+  <Shape name="A9" pixmapfile="geography/norway_counties/sogn-og-fjordane.png" targetfile="geography/norway_counties/target_sogn-og-fjordane.png" x="162" y="355.5" zoomx="1" zoomy="1" position="0"><tooltip>Sogn og Fjordane</tooltip></Shape>
+  <Shape name="A10" pixmapfile="geography/norway_counties/vest-agder.png" targetfile="geography/norway_counties/target_vest-agder.png" x="162" y="450,5" zoomx="1" zoomy="1" position="0"><tooltip>Vest-Agder</tooltip></Shape>
+  <Shape name="A11" pixmapfile="geography/norway_counties/buskerud.png" targetfile="geography/norway_counties/target_buskerud.png" x="197" y="399,5" zoomx="1" zoomy="1" position="0"><tooltip>Buskerud</tooltip></Shape>
+  <Shape name="A12" pixmapfile="geography/norway_counties/more-og-romsdal.png" targetfile="geography/norway_counties/target_more-og-romsdal.png" x="181" y="315.5" zoomx="1" zoomy="1" position="0"><tooltip>Møre og Romsdal</tooltip></Shape>
+  <Shape name="A13" pixmapfile="geography/norway_counties/oslo.png" targetfile="geography/norway_counties/target_oslo.png" x="226" y="418.5" zoomx="1" zoomy="1" position="0"><tooltip>Oslo</tooltip></Shape>
+  <Shape name="A14" pixmapfile="geography/norway_counties/sor-trondelag.png" targetfile="geography/norway_counties/target_sor-trondelag.png" x="224,5" y="300,5" zoomx="1" zoomy="1" position="0"><tooltip>Sør-Trøndelag</tooltip></Shape>
+  <Shape name="A15" pixmapfile="geography/norway_counties/vestfold.png" targetfile="geography/norway_counties/target_vestfold.png" x="214" y="430.5" zoomx="1" zoomy="1" position="0"><tooltip>Vestfold</tooltip></Shape>
+  <Shape name="A16" pixmapfile="geography/norway_counties/finnmark.png" targetfile="geography/norway_counties/target_finnmark.png" x="426,5" y="75.5" zoomx="1" zoomy="1" position="0"><tooltip>Finnmark</tooltip></Shape>
+  <Shape name="A17" pixmapfile="geography/norway_counties/nordland.png" targetfile="geography/norway_counties/target_nordland.png" x="294" y="175.5" zoomx="1" zoomy="1" position="0"><tooltip>Nordland</tooltip></Shape>
+  <Shape name="A18" pixmapfile="geography/norway_counties/ostfold.png" targetfile="geography/norway_counties/target_ostfold.png" x="232,5" y="435,5" zoomx="1" zoomy="1" position="0"><tooltip>Østfold</tooltip></Shape>
+  <Shape name="A19" pixmapfile="geography/norway_counties/telemark.png" targetfile="geography/norway_counties/target_telemark.png" x="186" y="424,5" zoomx="1" zoomy="1" position="0"><tooltip>Telemark</tooltip></Shape>
+  <Shape name="1" pixmapfile="geography/norway_counties/norway.png" type="SHAPE_BACKGROUND" x="307" y="249.5" zoomx="1" zoomy="1" position="0"/>
+</ShapeGame>
diff --git a/boards/geography/norway_counties/akershus.png b/boards/geography/norway_counties/akershus.png
new file mode 100644
index 0000000..966a8e0
--- /dev/null
+++ b/boards/geography/norway_counties/akershus.png
diff --git a/boards/geography/norway_counties/aust-agder.png b/boards/geography/norway_counties/aust-agder.png
new file mode 100644
index 0000000..15c7e83
--- /dev/null
+++ b/boards/geography/norway_counties/aust-agder.png
diff --git a/boards/geography/norway_counties/buskerud.png b/boards/geography/norway_counties/buskerud.png
new file mode 100644
index 0000000..2cc99d3
--- /dev/null
+++ b/boards/geography/norway_counties/buskerud.png
diff --git a/boards/geography/norway_counties/finnmark.png b/boards/geography/norway_counties/finnmark.png
new file mode 100644
index 0000000..ef05170
--- /dev/null
+++ b/boards/geography/norway_counties/finnmark.png
diff --git a/boards/geography/norway_counties/hedmark.png b/boards/geography/norway_counties/hedmark.png
new file mode 100644
index 0000000..33a4d8f
--- /dev/null
+++ b/boards/geography/norway_counties/hedmark.png
diff --git a/boards/geography/norway_counties/hordaland.png b/boards/geography/norway_counties/hordaland.png
new file mode 100644
index 0000000..8244943
--- /dev/null
+++ b/boards/geography/norway_counties/hordaland.png
diff --git a/boards/geography/norway_counties/more-og-romsdal.png b/boards/geography/norway_counties/more-og-romsdal.png
new file mode 100644
index 0000000..ec74396
--- /dev/null
+++ b/boards/geography/norway_counties/more-og-romsdal.png
diff --git a/boards/geography/norway_counties/nord-trondelag.png b/boards/geography/norway_counties/nord-trondelag.png
new file mode 100644
index 0000000..141c6e1
--- /dev/null
+++ b/boards/geography/norway_counties/nord-trondelag.png
diff --git a/boards/geography/norway_counties/nordland.png b/boards/geography/norway_counties/nordland.png
new file mode 100644
index 0000000..7a68ce7
--- /dev/null
+++ b/boards/geography/norway_counties/nordland.png
diff --git a/boards/geography/norway_counties/norway.png b/boards/geography/norway_counties/norway.png
new file mode 100644
index 0000000..418c584
--- /dev/null
+++ b/boards/geography/norway_counties/norway.png
diff --git a/boards/geography/norway_counties/oppland.png b/boards/geography/norway_counties/oppland.png
new file mode 100644
index 0000000..6caeee9
--- /dev/null
+++ b/boards/geography/norway_counties/oppland.png
diff --git a/boards/geography/norway_counties/oslo.png b/boards/geography/norway_counties/oslo.png
new file mode 100644
index 0000000..1b6d8f3
--- /dev/null
+++ b/boards/geography/norway_counties/oslo.png
diff --git a/boards/geography/norway_counties/ostfold.png b/boards/geography/norway_counties/ostfold.png
new file mode 100644
index 0000000..3ce69a4
--- /dev/null
+++ b/boards/geography/norway_counties/ostfold.png
diff --git a/boards/geography/norway_counties/rogaland.png b/boards/geography/norway_counties/rogaland.png
new file mode 100644
index 0000000..bdcfc8f
--- /dev/null
+++ b/boards/geography/norway_counties/rogaland.png
diff --git a/boards/geography/norway_counties/sogn-og-fjordane.png b/boards/geography/norway_counties/sogn-og-fjordane.png
new file mode 100644
index 0000000..1270e8a
--- /dev/null
+++ b/boards/geography/norway_counties/sogn-og-fjordane.png
diff --git a/boards/geography/norway_counties/sor-trondelag.png b/boards/geography/norway_counties/sor-trondelag.png
new file mode 100644
index 0000000..3a05a05
--- /dev/null
+++ b/boards/geography/norway_counties/sor-trondelag.png
diff --git a/boards/geography/norway_counties/target_akershus.png b/boards/geography/norway_counties/target_akershus.png
new file mode 100644
index 0000000..122bb18
--- /dev/null
+++ b/boards/geography/norway_counties/target_akershus.png
diff --git a/boards/geography/norway_counties/target_aust-agder.png b/boards/geography/norway_counties/target_aust-agder.png
new file mode 100644
index 0000000..eaf8e70
--- /dev/null
+++ b/boards/geography/norway_counties/target_aust-agder.png
diff --git a/boards/geography/norway_counties/target_buskerud.png b/boards/geography/norway_counties/target_buskerud.png
new file mode 100644
index 0000000..7c9d4a7
--- /dev/null
+++ b/boards/geography/norway_counties/target_buskerud.png
diff --git a/boards/geography/norway_counties/target_finnmark.png b/boards/geography/norway_counties/target_finnmark.png
new file mode 100644
index 0000000..ddb8668
--- /dev/null
+++ b/boards/geography/norway_counties/target_finnmark.png
diff --git a/boards/geography/norway_counties/target_hedmark.png b/boards/geography/norway_counties/target_hedmark.png
new file mode 100644
index 0000000..463dbc6
--- /dev/null
+++ b/boards/geography/norway_counties/target_hedmark.png
diff --git a/boards/geography/norway_counties/target_hordaland.png b/boards/geography/norway_counties/target_hordaland.png
new file mode 100644
index 0000000..5e54c1f
--- /dev/null
+++ b/boards/geography/norway_counties/target_hordaland.png
diff --git a/boards/geography/norway_counties/target_more-og-romsdal.png b/boards/geography/norway_counties/target_more-og-romsdal.png
new file mode 100644
index 0000000..3c86675
--- /dev/null
+++ b/boards/geography/norway_counties/target_more-og-romsdal.png
diff --git a/boards/geography/norway_counties/target_nord-trondelag.png b/boards/geography/norway_counties/target_nord-trondelag.png
new file mode 100644
index 0000000..f3e8ea2
--- /dev/null
+++ b/boards/geography/norway_counties/target_nord-trondelag.png
diff --git a/boards/geography/norway_counties/target_nordland.png b/boards/geography/norway_counties/target_nordland.png
new file mode 100644
index 0000000..68a7eaa
--- /dev/null
+++ b/boards/geography/norway_counties/target_nordland.png
diff --git a/boards/geography/norway_counties/target_oppland.png b/boards/geography/norway_counties/target_oppland.png
new file mode 100644
index 0000000..6427563
--- /dev/null
+++ b/boards/geography/norway_counties/target_oppland.png
diff --git a/boards/geography/norway_counties/target_oslo.png b/boards/geography/norway_counties/target_oslo.png
new file mode 100644
index 0000000..4229a19
--- /dev/null
+++ b/boards/geography/norway_counties/target_oslo.png
diff --git a/boards/geography/norway_counties/target_ostfold.png b/boards/geography/norway_counties/target_ostfold.png
new file mode 100644
index 0000000..e8818cf
--- /dev/null
+++ b/boards/geography/norway_counties/target_ostfold.png
diff --git a/boards/geography/norway_counties/target_rogaland.png b/boards/geography/norway_counties/target_rogaland.png
new file mode 100644
index 0000000..09da628
--- /dev/null
+++ b/boards/geography/norway_counties/target_rogaland.png
diff --git a/boards/geography/norway_counties/target_sogn-og-fjordane.png b/boards/geography/norway_counties/target_sogn-og-fjordane.png
new file mode 100644
index 0000000..3f53934
--- /dev/null
+++ b/boards/geography/norway_counties/target_sogn-og-fjordane.png
diff --git a/boards/geography/norway_counties/target_sor-trondelag.png b/boards/geography/norway_counties/target_sor-trondelag.png
new file mode 100644
index 0000000..6ee6097
--- /dev/null
+++ b/boards/geography/norway_counties/target_sor-trondelag.png
diff --git a/boards/geography/norway_counties/target_telemark.png b/boards/geography/norway_counties/target_telemark.png
new file mode 100644
index 0000000..5c7ff51
--- /dev/null
+++ b/boards/geography/norway_counties/target_telemark.png
diff --git a/boards/geography/norway_counties/target_troms.png b/boards/geography/norway_counties/target_troms.png
new file mode 100644
index 0000000..332c593
--- /dev/null
+++ b/boards/geography/norway_counties/target_troms.png
diff --git a/boards/geography/norway_counties/target_vest-agder.png b/boards/geography/norway_counties/target_vest-agder.png
new file mode 100644
index 0000000..70f0ecb
--- /dev/null
+++ b/boards/geography/norway_counties/target_vest-agder.png
diff --git a/boards/geography/norway_counties/target_vestfold.png b/boards/geography/norway_counties/target_vestfold.png
new file mode 100644
index 0000000..51fbc77
--- /dev/null
+++ b/boards/geography/norway_counties/target_vestfold.png
diff --git a/boards/geography/norway_counties/telemark.png b/boards/geography/norway_counties/telemark.png
new file mode 100644
index 0000000..c96b205
--- /dev/null
+++ b/boards/geography/norway_counties/telemark.png
diff --git a/boards/geography/norway_counties/troms.png b/boards/geography/norway_counties/troms.png
new file mode 100644
index 0000000..0776db0
--- /dev/null
+++ b/boards/geography/norway_counties/troms.png
diff --git a/boards/geography/norway_counties/vest-agder.png b/boards/geography/norway_counties/vest-agder.png
new file mode 100644
index 0000000..e42db12
--- /dev/null
+++ b/boards/geography/norway_counties/vest-agder.png
diff --git a/boards/geography/norway_counties/vestfold.png b/boards/geography/norway_counties/vestfold.png
new file mode 100644
index 0000000..823bb5f
--- /dev/null
+++ b/boards/geography/norway_counties/vestfold.png