fixed:restoring speech configuration

3 files changed, 18 insertions, 54 deletions

diff --git a/ListenSpell.py b/ListenSpell.py
index 689ce29..24a3f46 100755
--- a/ListenSpell.py
+++ b/ListenSpell.py
@@ -82,6 +82,7 @@ class ListenSpell(activity.Activity):
 		self.text_input.show()
 		self.text_input.connect("focus-in-event", self.text_input_focus, None)
 		self.text_input.connect("activate", self.text_input_activate, None)
+		self.text_input.set_flags(gtk.CAN_FOCUS)
 
 		self.console_text_view = gtk.TextView()
 		
@@ -130,14 +131,15 @@ class ListenSpell(activity.Activity):
 		self.change_skill_level_button = gtk.Button("Change Skill Level")
 		self.change_skill_level_button.connect("clicked", self.change_skill_level_button_clicked, None)
 		
-		self.change_skill_level_button = gtk.Button("Speech Configuration")
-		self.change_skill_level_button.connect("clicked", self.speech_configuration_button_clicked, None)
+		self.change_speechd_config_button = gtk.Button("Speech Configuration")
+		self.change_speechd_config_button.connect("clicked", self.speech_configuration_button_clicked, None)
 		
 		self.v_buttonbox.add(self.repeat_word_button)
 		self.v_buttonbox.add(self.get_def_button)
 		self.v_buttonbox.add(self.get_usage_button)
 		self.v_buttonbox.add(self.get_word_length_button)
 		self.v_buttonbox.add(self.change_skill_level_button)
+		self.v_buttonbox.add(self.change_speechd_config_button)
 
 		self.v_buttonbox.show_all()
 
@@ -221,8 +223,8 @@ class ListenSpell(activity.Activity):
 
 		self.config_dialog.vbox.pack_start(speech_frame, False, False, 0)
 		
-		speech_config = self.las.get_speechd_config()
-		previous_speechd_config = speech_config
+		speech_config = self.las.get_speechd_config().copy()
+		#print "getting config"
 		
 		volume_adj = gtk.Adjustment(float(speech_config['volume']), -100, 101, 1, 1, 1)
 		rate_adj = gtk.Adjustment(float(speech_config['rate']), -100, 101, 1, 1, 1)
@@ -308,11 +310,12 @@ class ListenSpell(activity.Activity):
 		if response == gtk.RESPONSE_OK:
 			self.config_dialog.destroy()
 		elif response == gtk.RESPONSE_CANCEL:
-			print "going back"
-			for k in previous_speechd_config:
+			#print "going back"
+			for k in speech_config:
 				#print k + " " + str(previous_speechd_config[k])
-				self.las.speechd_config(k, previous_speechd_config[k])
+				self.las.speechd_config(k, speech_config[k])
 			self.config_dialog.destroy()
+		self.text_input.grab_focus()
 		
 			
 
@@ -356,7 +359,7 @@ class ListenSpell(activity.Activity):
 			self.las.say_text(self.elem)
 		if not self.is_stand_alone:
 			self._logger.debug('repeat button clicked : ' + self.elem + '')
-
+		self.text_input.grab_focus()
 	def get_def_button_clicked(self, widget, data = None):
 		def_list = self.las.get_word_info(self.wordid, "def")
 		self.display_console("Definition: ")
@@ -364,7 +367,7 @@ class ListenSpell(activity.Activity):
 			self.display_console(pos + "(" + name + ") : " + definition)
 		if not self.is_stand_alone:
 			self._logger.debug('get defination button clicked : ' + self.elem + '')
-
+		self.text_input.grab_focus()
 	def get_usage_button_clicked(self, widget, data = None):
 		if self.usage_used == 0:
 			usage = self.las.get_word_info(self.wordid, "usage")
@@ -379,15 +382,17 @@ class ListenSpell(activity.Activity):
 			self.usage_used = self.usage_used + 1
 		if not self.is_stand_alone:
 			self._logger.debug('get usage button clicked : ' + self.elem + '')
+		self.text_input.grab_focus()
 
 	def get_word_length_button_clicked(self, widget, data = None):
 		self.display_console("Word Length: " + str(len(self.elem)))
 		if not self.is_stand_alone:
 			self._logger.debug('get word length button clicked : ' + self.elem + '')
+		self.text_input.grab_focus()
 
 	def ask_skill_level(self):
 		self.skill_level_dialog = gtk.Dialog("Enter Skill Level", self, 0,(gtk.STOCK_OK, gtk.RESPONSE_OK, "Quit Game", gtk.RESPONSE_CANCEL))
-		self.las.say_text("Skill Level")
+		self.las.say_text("Enter Skill Level")
 		hbox = gtk.HBox(False, 8)
 		hbox.set_border_width(8)
 		self.skill_level_dialog.vbox.pack_start(hbox, False, False, 0)
@@ -432,6 +437,7 @@ class ListenSpell(activity.Activity):
 	def change_skill_level_button_clicked(self, widget, data=None):
 		self.ask_skill_level()
 		self.play_game("start")
+		self.text_input.grab_focus()
 
 	def shout(self,string):
 		self.display_console("")
@@ -487,6 +493,7 @@ class ListenSpell(activity.Activity):
 		else:
 			#print "Spell... "
 			self.las.say_text("Spell..." + self.elem)
+		self.text_input.grab_focus()
 			
 	def play_game(self,mode = "start"):
 		if mode == "start":
diff --git a/conv.sh b/conv.sh
deleted file mode 100755
index 55f1874..0000000
--- a/conv.sh
+++ /dev/null
@@ -1,43 +0,0 @@
-  #!/bin/sh
-
-  if [ "x$1" == "x" ]; then
-     echo "Usage: $0 <dbname>"
-     exit
-  fi
-
-  if [ -e "$1.db" ]; then
-     echo "$1.db already exists.  I will overwrite it in 15 seconds if you do not press CTRL-C."
-     rm $1.db
-  fi
-
-  mysqldump -h 192.168.145.1 -u AI -p --compact --compatible=ansi --default-character-set=binary $1 |
-  grep -v ' KEY "' |
-  grep -v ' UNIQUE KEY "' |
-  grep -v ' PRIMARY KEY ' |
-  sed 's/ unsigned / /g' |
-  sed 's/ auto_increment/ primary key autoincrement/gi' |
-  sed 's/ smallint([0-9]*) / integer /gi' |
-  sed 's/ tinyint([0-9]*) / integer /gi' |
-  sed 's/ int([0-9]*) / integer /gi' |
-  sed 's/ character set [^ ]* / /gi' |
-  sed 's/ enum([^)]*) / varchar(255) /gi' |
-  sed 's/ on update [^,]*//gi' |
-  perl -e 'local $/;$_=<>;s/,\n\)/\n\)/gs;print "begin;\n";print;print "commit;\n"' |
-  perl -pe '
-  if (/^(INSERT.+?)\(/) {
-     $a=$1;
-     s/\\'\''/'\'\''/g;
-     s/\\n/\n/g;
-     s/\),\(/\);\n$a\(/g;
-  }
-  ' > $1.sql
-  cat $1.sql | sqlite3 $1.db > $1.err
-  ERRORS=`cat $1.err | wc -l`
-  if [ "$ERRORS" == "0" ]; then
-     echo "Conversion completed without error. Output file: $1.db"
-     rm $1.sql
-     rm $1.err
-  else
-     echo "There were errors during conversion.  Please review $1.err and $1.sql for details."
-  fi
-
diff --git a/las.py b/las.py
index 1413f53..92ecb0d 100755
--- a/las.py
+++ b/las.py
@@ -200,7 +200,7 @@ class Listenspell():
 		if mode == 'one':
 			if attribute == None or value == None:
 				return False
-			print attribute + ":" + str(value)
+			#print attribute + ":" + str(value)
 			self.__speechd_config[attribute] = value
 			fp = open(self.path + self.config_file, 'w', 0)
 			simplejson.dump(self.__speechd_config, fp)