1 files changed, 49 insertions, 134 deletions
diff --git a/grc/gui/NotebookPage.py b/grc/gui/NotebookPage.py
index c9e8d0f186..347be8eea0 100644
--- a/grc/gui/NotebookPage.py
+++ b/grc/gui/NotebookPage.py
@@ -17,17 +17,18 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 """
 
-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
+from __future__ import absolute_import
 import os
 
+from gi.repository import Gtk, Gdk, GObject
 
-class NotebookPage(gtk.HBox):
+from . import Actions
+from .StateCache import StateCache
+from .Constants import MIN_WINDOW_WIDTH, MIN_WINDOW_HEIGHT
+from .DrawingArea import DrawingArea
+
+
+class NotebookPage(Gtk.HBox):
     """A page in the notebook."""
 
     def __init__(self, main_window, flow_graph, file_path=''):
@@ -38,59 +39,53 @@ class NotebookPage(gtk.HBox):
             main_window: main window
             file_path: path to a flow graph file
         """
-        self._flow_graph = flow_graph
-        self.process = None
-        #import the file
+        Gtk.HBox.__init__(self)
+
         self.main_window = main_window
+        self.flow_graph = flow_graph
         self.file_path = file_path
-        initial_state = flow_graph.get_parent().parse_flow_graph(file_path)
-        self.state_cache = StateCache(initial_state)
+
+        self.process = None
         self.saved = True
-        #import the data to the flow graph
-        self.get_flow_graph().import_data(initial_state)
-        #initialize page gui
-        gtk.HBox.__init__(self, False, 0)
-        self.show()
-        #tab box to hold label and close button
-        self.tab = gtk.HBox(False, 0)
-        #setup tab label
-        self.label = gtk.Label()
-        self.tab.pack_start(self.label, False)
-        #setup button image
-        image = gtk.Image()
-        image.set_from_stock('gtk-close', gtk.ICON_SIZE_MENU)
-        #setup image box
-        image_box = gtk.HBox(False, 0)
+
+        # import the file
+        initial_state = flow_graph.parent_platform.parse_flow_graph(file_path)
+        flow_graph.import_data(initial_state)
+        self.state_cache = StateCache(initial_state)
+
+        # tab box to hold label and close button
+        self.label = Gtk.Label()
+        image = Gtk.Image.new_from_icon_name('window-close', Gtk.IconSize.MENU)
+        image_box = Gtk.HBox(homogeneous=False, spacing=0)
         image_box.pack_start(image, True, False, 0)
-        #setup the button
-        button = gtk.Button()
+        button = Gtk.Button()
         button.connect("clicked", self._handle_button)
-        button.set_relief(gtk.RELIEF_NONE)
+        button.set_relief(Gtk.ReliefStyle.NONE)
         button.add(image_box)
-        #button size
-        w, h = gtk.icon_size_lookup_for_settings(button.get_settings(), gtk.ICON_SIZE_MENU)
-        button.set_size_request(w+6, h+6)
-        self.tab.pack_start(button, False)
-        self.tab.show_all()
-        #setup scroll window and drawing area
-        self.scrolled_window = gtk.ScrolledWindow()
+
+        tab = self.tab = Gtk.HBox(homogeneous=False, spacing=0)
+        tab.pack_start(self.label, False, False, 0)
+        tab.pack_start(button, False, False, 0)
+        tab.show_all()
+
+        # setup scroll window and drawing area
+        self.drawing_area = DrawingArea(flow_graph)
+        flow_graph.drawing_area = self.drawing_area
+
+        self.scrolled_window = Gtk.ScrolledWindow()
         self.scrolled_window.set_size_request(MIN_WINDOW_WIDTH, MIN_WINDOW_HEIGHT)
-        self.scrolled_window.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
+        self.scrolled_window.set_policy(Gtk.PolicyType.ALWAYS, Gtk.PolicyType.ALWAYS)
         self.scrolled_window.connect('key-press-event', self._handle_scroll_window_key_press)
-        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 into flow graph
-        self.get_flow_graph().drawing_area = self.get_drawing_area()
-        self.show_all()
+        self.scrolled_window.add(self.drawing_area)
+        self.pack_start(self.scrolled_window, True, True, 0)
 
-    def get_drawing_area(self): return self.drawing_area
+        self.show_all()
 
     def _handle_scroll_window_key_press(self, widget, event):
         """forward Ctrl-PgUp/Down to NotebookPage (switch fg instead of horiz. scroll"""
         is_ctrl_pg = (
-            event.state & gtk.gdk.CONTROL_MASK and
-            event.keyval in (gtk.keysyms.Page_Up, gtk.keysyms.Page_Down)
+            event.state & Gdk.ModifierType.CONTROL_MASK and
+            event.keyval in (Gdk.KEY_Page_Up, Gdk.KEY_Page_Down)
         )
         if is_ctrl_pg:
             return self.get_parent().event(event)
@@ -102,8 +97,8 @@ class NotebookPage(gtk.HBox):
         Returns:
             generator
         """
-        platform = self.get_flow_graph().get_parent()
-        return platform.Generator(self.get_flow_graph(), self.get_file_path())
+        platform = self.flow_graph.parent_platform
+        return platform.Generator(self.flow_graph, self.file_path)
 
     def _handle_button(self, button):
         """
@@ -125,42 +120,6 @@ class NotebookPage(gtk.HBox):
         """
         self.label.set_markup(markup)
 
-    def get_tab(self):
-        """
-        Get the gtk widget for this page's tab.
-
-        Returns:
-            gtk widget
-        """
-        return self.tab
-
-    def get_proc(self):
-        """
-        Get the subprocess for the flow graph.
-
-        Returns:
-            the subprocess object
-        """
-        return self.process
-
-    def set_proc(self, process):
-        """
-        Set the subprocess object.
-
-        Args:
-            process: the new subprocess
-        """
-        self.process = process
-
-    def get_flow_graph(self):
-        """
-        Get the flow graph.
-
-        Returns:
-            the flow graph
-        """
-        return self._flow_graph
-
     def get_read_only(self):
         """
         Get the read-only state of the file.
@@ -169,51 +128,7 @@ class NotebookPage(gtk.HBox):
         Returns:
             true for read-only
         """
-        if not self.get_file_path(): return False
-        return os.path.exists(self.get_file_path()) and \
-        not os.access(self.get_file_path(), os.W_OK)
-
-    def get_file_path(self):
-        """
-        Get the file path for the flow graph.
-
-        Returns:
-            the file path or ''
-        """
-        return self.file_path
-
-    def set_file_path(self, file_path=''):
-        """
-        Set the file path, '' for no file path.
-
-        Args:
-            file_path: file path string
-        """
-        self.file_path = os.path.abspath(file_path) if file_path else ''
-
-    def get_saved(self):
-        """
-        Get the saved status for the flow graph.
-
-        Returns:
-            true if saved
-        """
-        return self.saved
-
-    def set_saved(self, saved=True):
-        """
-        Set the saved status.
-
-        Args:
-            saved: boolean status
-        """
-        self.saved = saved
-
-    def get_state_cache(self):
-        """
-        Get the state cache for the flow graph.
-
-        Returns:
-            the state cache
-        """
-        return self.state_cache
+        if not self.file_path:
+            return False
+        return (os.path.exists(self.file_path) and
+                not os.access(self.file_path, os.W_OK))