From 91a83e6f1fda6483bfd4b449a1ef7903a00af0ab Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Sun, 13 Sep 2009 02:14:27 -0700
Subject: Reworked actions api and actions objects: Created standardized Action
 object for all gui actions. Actions module constants are actual Action
 objects (not strings). Keypresses, labels, tooltips, stock icons, etc all
 associate in the Action constructor. Usage of the action's signaling call ()
 eliminated the need for a reference to handle_states.

---
 grc/gui/Bars.py | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

(limited to 'grc/gui/Bars.py')

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
-- 
cgit 


From 14895064d7345c2223ff2b8ff3b9cbcdf69dd8c9 Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Fri, 18 Sep 2009 02:10:13 -0700
Subject: added errors dialog to show all error messages in flow graph

---
 grc/gui/Bars.py | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'grc/gui/Bars.py')

diff --git a/grc/gui/Bars.py b/grc/gui/Bars.py
index fff5ebc08..17835eb00 100644
--- a/grc/gui/Bars.py
+++ b/grc/gui/Bars.py
@@ -81,6 +81,9 @@ MENU_BAR_LIST = (
 		None,
 		Actions.BLOCK_PARAM_MODIFY,
 	]),
+	(gtk.Action('View', '_View', None, None), [
+		Actions.ERRORS_WINDOW_DISPLAY,
+	]),
 	(gtk.Action('Build', '_Build', None, None), [
 		Actions.FLOW_GRAPH_GEN,
 		Actions.FLOW_GRAPH_EXEC,
-- 
cgit 


From d28d40d33dac481296e1f836ec57f1018041d418 Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Fri, 18 Sep 2009 02:22:43 -0700
Subject: put the flow graph errors button into the toolbar

---
 grc/gui/Bars.py | 1 +
 1 file changed, 1 insertion(+)

(limited to 'grc/gui/Bars.py')

diff --git a/grc/gui/Bars.py b/grc/gui/Bars.py
index 17835eb00..8fd167869 100644
--- a/grc/gui/Bars.py
+++ b/grc/gui/Bars.py
@@ -39,6 +39,7 @@ TOOLBAR_LIST = (
 	Actions.FLOW_GRAPH_UNDO,
 	Actions.FLOW_GRAPH_REDO,
 	None,
+	Actions.ERRORS_WINDOW_DISPLAY,
 	Actions.FLOW_GRAPH_GEN,
 	Actions.FLOW_GRAPH_EXEC,
 	Actions.FLOW_GRAPH_KILL,
-- 
cgit