tuna: tuna_gui.py: Chanages to port to Gtk-3.0

Change to port to Gtk-3.0

Signed-off-by: John Kacur <jkacur@redhat.com>

1 files changed, 19 insertions, 16 deletions

diff --git a/tuna/tuna_gui.py b/tuna/tuna_gui.py
index f9d44c0..2360f53 100755
--- a/tuna/tuna_gui.py
+++ b/tuna/tuna_gui.py
@@ -3,12 +3,14 @@
 
 import sys
 import os
+import locale
 
 import gi
 gi.require_version("Gtk", "3.0")
 from gi.repository import Gtk
-
+from gi.repository import Gdk
 from gi.repository import GObject
+import procfs
 from .gui.cpuview import cpuview
 from .gui.irqview import irqview
 from .gui.procview import procview
@@ -16,8 +18,6 @@ from .gui.commonview import commonview
 from .gui.profileview import profileview
 from .config import Config
 
-import procfs
-
 tuna_glade_dirs = [".", "tuna", "/usr/share/tuna"]
 tuna_glade = None
 
@@ -27,8 +27,8 @@ class main_gui:
         global tuna_glade
 
         (app, localedir) = ('tuna', '/usr/share/locale')
-        Gtk.glade.bindtextdomain(app, localedir)
-        Gtk.glade.textdomain(app)
+        locale.bindtextdomain(app, localedir)
+        locale.textdomain(app)
 
         if self.check_root():
             sys.exit(1)
@@ -36,30 +36,32 @@ class main_gui:
             tuna_glade = "%s/tuna_gui.glade" % dir
             if os.access(tuna_glade, os.F_OK):
                 break
-        self.wtree = Gtk.glade.XML(tuna_glade, "mainbig_window", "tuna")
+        self.wtree = Gtk.Builder()
+        self.wtree.add_from_file(tuna_glade)
+        #self.wtree = Gtk.glade.XML(tuna_glade, "mainbig_window", "tuna")
         self.ps = procfs.pidstats()
         self.irqs = procfs.interrupts()
-        self.window = self.wtree.get_widget("mainbig_window")
+        self.window = self.wtree.get_object("mainbig_window")
 
         self.procview = procview(
-            self.wtree.get_widget("processlist"),
+            self.wtree.get_object("processlist"),
             self.ps, show_kthreads, show_uthreads,
             cpus_filtered, tuna_glade)
         self.irqview = irqview(
-            self.wtree.get_widget("irqlist"),
+            self.wtree.get_object("irqlist"),
             self.irqs, self.ps, cpus_filtered,
             tuna_glade)
         self.cpuview = cpuview(
-            self.wtree.get_widget("vpaned1"),
-            self.wtree.get_widget("hpaned2"),
-            self.wtree.get_widget("cpuview"),
+            self.wtree.get_object("vpaned1"),
+            self.wtree.get_object("hpaned2"),
+            self.wtree.get_object("cpuview"),
             self.procview, self.irqview, cpus_filtered)
 
         self.config = Config()
         self.check_env()
         self.commonview = commonview()
-        self.commonview.contentTable = self.wtree.get_widget("commonTbl")
-        self.commonview.configFileCombo = self.wtree.get_widget("profileSelector")
+        self.commonview.contentTable = self.wtree.get_object("commonTbl")
+        self.commonview.configFileCombo = self.wtree.get_object("profileSelector")
 
         self.profileview = profileview()
         self.profileview.config = self.config
@@ -97,7 +99,8 @@ class main_gui:
             : self.profileview.on_profileTree_button_press_event
         }
 
-        self.wtree.signal_autoconnect(event_handlers)
+        #self.wtree.signal_autoconnect(event_handlers)
+        self.wtree.connect_signals(event_handlers)
 
         self.ps.reload_threads()
         self.show()
@@ -150,7 +153,7 @@ class main_gui:
             return False
         self.binpath = sys.executable.strip(os.path.basename(sys.executable))
         os.execv(self.binpath + 'pkexec',
-                [sys.executable] + [self.binpath + 'tuna'] + sys.argv[1:])
+                 [sys.executable] + [self.binpath + 'tuna'] + sys.argv[1:])
         return True
 
     def check_env(self):