grc: gtk3: update various deprecated gtk calls

author: Sebastian Koslowski <koslowski@kit.edu> 2016-08-03 21:38:56 +0200
committer: Sebastian Koslowski <koslowski@kit.edu> 2016-08-03 21:43:24 +0200
commit: 9b39ca3a9a2550c51ee934633ff9c655e1676a3b (patch)
tree: 3b14a419b44a4353ec66d9ea5ffc84c1e3b4f0ce
parent: f89685336833620de9d35a82fcf28a8d6a0455b2 (diff)
4 files changed, 24 insertions, 31 deletions
diff --git a/grc/gui/Bars.py b/grc/gui/Bars.py
index 0c18836c4e..d8d57843d7 100644
--- a/grc/gui/Bars.py
+++ b/grc/gui/Bars.py
@@ -90,7 +90,7 @@ MENU_BAR_LIST = (
         None,
         Actions.BLOCK_ROTATE_CCW,
         Actions.BLOCK_ROTATE_CW,
-        (Gtk.Action('Align', '_Align', None, None), Actions.BLOCK_ALIGNMENTS),
+        (Gtk.Action(name='Align', label='_Align', tooltip=None, stock_id=None), Actions.BLOCK_ALIGNMENTS),
         None,
         Actions.BLOCK_ENABLE,
         Actions.BLOCK_DISABLE,
@@ -298,7 +298,7 @@ class MenuBar(Gtk.MenuBar, MenuHelperMixin, SubMenuCreator):
             self.append(self._make_sub_menu(main_action, actions))
 
     def create_flow_graph_new(self):
-        main = Gtk.ImageMenuItem(Gtk.STOCK_NEW)
+        main = Gtk.ImageMenuItem(label=Gtk.STOCK_NEW)
         main.set_label(Actions.FLOW_GRAPH_NEW.get_label())
         func = self._fill_flow_graph_new_submenu
         self.submenus.append((Actions.FLOW_GRAPH_NEW, func, main))
@@ -306,7 +306,7 @@ class MenuBar(Gtk.MenuBar, MenuHelperMixin, SubMenuCreator):
         return main
 
     def create_flow_graph_recent(self):
-        main = Gtk.ImageMenuItem(Gtk.STOCK_OPEN)
+        main = Gtk.ImageMenuItem(label=Gtk.STOCK_OPEN)
         main.set_label(Actions.FLOW_GRAPH_OPEN_RECENT.get_label())
         func = self._fill_flow_graph_recent_submenu
         self.submenus.append((Actions.FLOW_GRAPH_OPEN, func, main))
diff --git a/grc/gui/BlockTreeWindow.py b/grc/gui/BlockTreeWindow.py
index e29b6b4b7f..90d4b561b7 100644
--- a/grc/gui/BlockTreeWindow.py
+++ b/grc/gui/BlockTreeWindow.py
@@ -1,5 +1,5 @@
 """
-Copyright 2007, 2008, 2009 Free Software Foundation, Inc.
+Copyright 2007, 2008, 2009, 2016 Free Software Foundation, Inc.
 This file is part of GNU Radio
 
 GNU Radio Companion is free software; you can redistribute it and/or
@@ -22,8 +22,7 @@ import six
 
 from gi.repository import Gtk, Gdk, GObject
 
-from . import Actions, Utils
-from . import Constants
+from . import Actions, Utils, Constants
 
 
 NAME_INDEX, KEY_INDEX, DOC_INDEX = range(3)
@@ -64,7 +63,7 @@ class BlockTreeWindow(Gtk.VBox):
     """The block selection panel."""
 
     __gsignals__ = {
-        'create_new_block': (GObject.SIGNAL_RUN_FIRST, None, (str,))
+        'create_new_block': (GObject.SignalFlags.RUN_FIRST, None, (str,))
     }
 
     def __init__(self, platform):
@@ -83,9 +82,9 @@ class BlockTreeWindow(Gtk.VBox):
         # search entry
         self.search_entry = Gtk.Entry()
         try:
-            self.search_entry.set_icon_from_stock(Gtk.EntryIconPosition.PRIMARY, Gtk.STOCK_FIND)
+            self.search_entry.set_icon_from_icon_name(Gtk.EntryIconPosition.PRIMARY, 'edit-find')
             self.search_entry.set_icon_activatable(Gtk.EntryIconPosition.PRIMARY, False)
-            self.search_entry.set_icon_from_stock(Gtk.EntryIconPosition.SECONDARY, Gtk.STOCK_CLOSE)
+            self.search_entry.set_icon_from_icon_name(Gtk.EntryIconPosition.SECONDARY, 'window-close')
             self.search_entry.connect('icon-release', self._handle_icon_event)
         except AttributeError:
             pass  # no icon for old pygtk
@@ -97,7 +96,7 @@ class BlockTreeWindow(Gtk.VBox):
         self.treestore = Gtk.TreeStore(GObject.TYPE_STRING, GObject.TYPE_STRING, GObject.TYPE_STRING)
         self.treestore_search = Gtk.TreeStore(GObject.TYPE_STRING, GObject.TYPE_STRING, GObject.TYPE_STRING)
 
-        self.treeview = Gtk.TreeView(self.treestore)
+        self.treeview = Gtk.TreeView(model=self.treestore)
         self.treeview.set_enable_search(False)  # disable pop up search box
         self.treeview.set_search_column(-1)  # really disable search
         self.treeview.set_headers_visible(False)
@@ -119,7 +118,7 @@ class BlockTreeWindow(Gtk.VBox):
         # make the scrolled window to hold the tree view
         scrolled_window = Gtk.ScrolledWindow()
         scrolled_window.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)
-        scrolled_window.add_with_viewport(self.treeview)
+        scrolled_window.add(self.treeview)
         scrolled_window.set_size_request(Constants.DEFAULT_BLOCKS_WINDOW_WIDTH, -1)
         self.pack_start(scrolled_window, True, True, 0)
         # map categories to iters, automatic mapping for root
diff --git a/grc/gui/NotebookPage.py b/grc/gui/NotebookPage.py
index 4745035aff..347be8eea0 100644
--- a/grc/gui/NotebookPage.py
+++ b/grc/gui/NotebookPage.py
@@ -76,7 +76,7 @@ class NotebookPage(Gtk.HBox):
         self.scrolled_window.set_size_request(MIN_WINDOW_WIDTH, MIN_WINDOW_HEIGHT)
         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.scrolled_window.add_with_viewport(self.drawing_area)
+        self.scrolled_window.add(self.drawing_area)
         self.pack_start(self.scrolled_window, True, True, 0)
 
         self.show_all()
diff --git a/grc/gui/VariableEditor.py b/grc/gui/VariableEditor.py
index 09fe629195..d97b9e9f24 100644
--- a/grc/gui/VariableEditor.py
+++ b/grc/gui/VariableEditor.py
@@ -19,15 +19,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
 from __future__ import absolute_import
 
-import gi
-gi.require_version('Gtk', '3.0')
-from gi.repository import Gtk
-from gi.repository import Gdk
-from gi.repository import GObject
+from gi.repository import Gtk, Gdk, GObject
 
-from . import Actions
-from . import Preferences
-from .Constants import DEFAULT_BLOCKS_WINDOW_WIDTH
+from . import Actions, Preferences, Constants
 
 BLOCK_INDEX = 0
 ID_INDEX = 1
@@ -39,29 +33,29 @@ class VariableEditorContextMenu(Gtk.Menu):
     def __init__(self, var_edit):
         Gtk.Menu.__init__(self)
 
-        self.imports = Gtk.MenuItem("Add _Import")
+        self.imports = Gtk.MenuItem(label="Add _Import")
         self.imports.connect('activate', var_edit.handle_action, var_edit.ADD_IMPORT)
         self.add(self.imports)
 
-        self.variables = Gtk.MenuItem("Add _Variable")
+        self.variables = Gtk.MenuItem(label="Add _Variable")
         self.variables.connect('activate', var_edit.handle_action, var_edit.ADD_VARIABLE)
         self.add(self.variables)
         self.add(Gtk.SeparatorMenuItem())
 
-        self.enable = Gtk.MenuItem("_Enable")
+        self.enable = Gtk.MenuItem(label="_Enable")
         self.enable.connect('activate', var_edit.handle_action, var_edit.ENABLE_BLOCK)
-        self.disable = Gtk.MenuItem("_Disable")
+        self.disable = Gtk.MenuItem(label="_Disable")
         self.disable.connect('activate', var_edit.handle_action, var_edit.DISABLE_BLOCK)
         self.add(self.enable)
         self.add(self.disable)
         self.add(Gtk.SeparatorMenuItem())
 
-        self.delete = Gtk.MenuItem("_Delete")
+        self.delete = Gtk.MenuItem(label="_Delete")
         self.delete.connect('activate', var_edit.handle_action, var_edit.DELETE_BLOCK)
         self.add(self.delete)
         self.add(Gtk.SeparatorMenuItem())
 
-        self.properties = Gtk.MenuItem("_Properties...")
+        self.properties = Gtk.MenuItem(label="_Properties...")
         self.properties.connect('activate', var_edit.handle_action, var_edit.OPEN_PROPERTIES)
         self.add(self.properties)
         self.show_all()
@@ -85,8 +79,8 @@ class VariableEditor(Gtk.VBox):
     DISABLE_BLOCK = 6
 
     __gsignals__ = {
-        'create_new_block': (GObject.SIGNAL_RUN_FIRST, None, (str,)),
-        'remove_block': (GObject.SIGNAL_RUN_FIRST, None, (str,))
+        'create_new_block': (GObject.SignalFlags.RUN_FIRST, None, (str,)),
+        'remove_block': (GObject.SignalFlags.RUN_FIRST, None, (str,))
     }
 
     def __init__(self):
@@ -100,7 +94,7 @@ class VariableEditor(Gtk.VBox):
         # Generate everything else dynamically
         self.treestore = Gtk.TreeStore(GObject.TYPE_PYOBJECT,  # Block reference
                                        GObject.TYPE_STRING)    # Category and block name
-        self.treeview = Gtk.TreeView(self.treestore)
+        self.treeview = Gtk.TreeView(model=self.treestore)
         self.treeview.set_enable_search(False)
         self.treeview.set_search_column(-1)
         #self.treeview.set_enable_search(True)
@@ -150,8 +144,8 @@ class VariableEditor(Gtk.VBox):
         # Make the scrolled window to hold the tree view
         scrolled_window = Gtk.ScrolledWindow()
         scrolled_window.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)
-        scrolled_window.add_with_viewport(self.treeview)
-        scrolled_window.set_size_request(DEFAULT_BLOCKS_WINDOW_WIDTH, -1)
+        scrolled_window.add(self.treeview)
+        scrolled_window.set_size_request(Constants.DEFAULT_BLOCKS_WINDOW_WIDTH, -1)
         self.pack_start(scrolled_window, True, True, 0)
 
         # Context menus
author	Sebastian Koslowski <koslowski@kit.edu>	2016-08-03 21:38:56 +0200
committer	Sebastian Koslowski <koslowski@kit.edu>	2016-08-03 21:43:24 +0200
commit	9b39ca3a9a2550c51ee934633ff9c655e1676a3b (patch)
tree	3b14a419b44a4353ec66d9ea5ffc84c1e3b4f0ce
parent	f89685336833620de9d35a82fcf28a8d6a0455b2 (diff)