Merge branch 'grc' of http://gnuradio.org/git/jblum into master

* 'grc' of http://gnuradio.org/git/jblum:
  fixed issue where entry boxes lost focus (mishandling of hide changing)
  fixed bool converter in forms to work with non bool options
  tweaked key handling callbacks
  fix for uniformity convention with gtk signal name strings
  Simply Actions module imports, using module prefix.
  Reworked actions api and actions objects:
  Move key press extraction logic into actions module.
  rename variable, use keysyms in props dialog
  use the keymap's translate_keyboard_state, use the key value rather than name
  ignore irrelevant modifiers and events pending
  properties dialog with ok/cancel buttons

1 files changed, 5 insertions, 7 deletions

diff --git a/grc/gui/Bars.py b/grc/gui/Bars.py
index 697d48a3c..fff5ebc08 100644
--- a/grc/gui/Bars.py
+++ b/grc/gui/Bars.py
@@ -104,9 +104,8 @@ class Toolbar(gtk.Toolbar):
 		"""
 		gtk.Toolbar.__init__(self)
 		self.set_style(gtk.TOOLBAR_ICONS)
-		for action_name in TOOLBAR_LIST:
-			if action_name:	#add a tool item
-				action = Actions.get_action_from_name(action_name)
+		for action in TOOLBAR_LIST:
+			if action: #add a tool item
 				self.add(action.create_tool_item())
 				#this reset of the tooltip property is required (after creating the tool item) for the tooltip to show
 				action.set_property('tooltip', action.get_property('tooltip'))
@@ -123,16 +122,15 @@ class MenuBar(gtk.MenuBar):
 		Add the submenu to the menu bar.
 		"""
 		gtk.MenuBar.__init__(self)
-		for main_action,action_names in MENU_BAR_LIST:
+		for main_action, actions in MENU_BAR_LIST:
 			#create the main menu item
 			main_menu_item = main_action.create_menu_item()
 			self.append(main_menu_item)
 			#create the menu
 			main_menu = gtk.Menu()
 			main_menu_item.set_submenu(main_menu)
-			for action_name in action_names:
-				if action_name: #append a menu item
-					action = Actions.get_action_from_name(action_name)
+			for action in actions:
+				if action: #append a menu item
 					main_menu.append(action.create_menu_item())
 				else: main_menu.append(gtk.SeparatorMenuItem())
 			main_menu.show_all() #this show all is required for the separators to show