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/NotebookPage.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

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

diff --git a/grc/gui/NotebookPage.py b/grc/gui/NotebookPage.py
index cb6b7ed30..645af3f7f 100644
--- a/grc/gui/NotebookPage.py
+++ b/grc/gui/NotebookPage.py
@@ -80,9 +80,8 @@ class NotebookPage(gtk.HBox):
 		self.drawing_area = DrawingArea(self.get_flow_graph())
 		self.scrolled_window.add_with_viewport(self.get_drawing_area())
 		self.pack_start(self.scrolled_window)
-		#inject drawing area and handle states into flow graph
+		#inject drawing area into flow graph
 		self.get_flow_graph().drawing_area = self.get_drawing_area()
-		self.get_flow_graph().handle_states = main_window.handle_states
 		self.show_all()
 
 	def get_drawing_area(self): return self.drawing_area
@@ -104,7 +103,7 @@ class NotebookPage(gtk.HBox):
 		@param the button
 		"""
 		self.main_window.page_to_be_closed = self
-		self.main_window.handle_states(FLOW_GRAPH_CLOSE)
+		FLOW_GRAPH_CLOSE()
 
 	def set_markup(self, markup):
 		"""
-- 
cgit 


From 8442dfc877a89de00e5fd0fd1b4b1890a91af630 Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Sun, 13 Sep 2009 02:29:26 -0700
Subject: Simply Actions module imports, using module prefix.

---
 grc/gui/NotebookPage.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/grc/gui/NotebookPage.py b/grc/gui/NotebookPage.py
index 645af3f7f..fddfeaf5f 100644
--- a/grc/gui/NotebookPage.py
+++ b/grc/gui/NotebookPage.py
@@ -17,10 +17,10 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 """
 
-from Actions import FLOW_GRAPH_CLOSE
 import pygtk
 pygtk.require('2.0')
 import gtk
+import Actions
 from StateCache import StateCache
 from Constants import MIN_WINDOW_WIDTH, MIN_WINDOW_HEIGHT
 from DrawingArea import DrawingArea
@@ -103,7 +103,7 @@ class NotebookPage(gtk.HBox):
 		@param the button
 		"""
 		self.main_window.page_to_be_closed = self
-		FLOW_GRAPH_CLOSE()
+		Actions.FLOW_GRAPH_CLOSE()
 
 	def set_markup(self, markup):
 		"""
-- 
cgit