fixed:restoring speech configuration

1 files changed, 17 insertions, 10 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":