X-Git-Url: https://git.siccegge.de//index.cgi?a=blobdiff_plain;f=ghextris.py;h=5fb037d4fec43fa415587074f0c5ff24a7ae8537;hb=5d2c0edfe55ab235a0d72820becac80cbcca00df;hp=ab5b8e4ca8037cd2ea8b44109f4e4c6576762639;hpb=e69ca025e939011aabda88fc8b2e843f90b3f7ef;p=ghextris.git

diff --git a/ghextris.py b/ghextris.py
index ab5b8e4..5fb037d 100755
--- a/ghextris.py
+++ b/ghextris.py
@@ -25,14 +25,14 @@ VERSION="0.9.0"
 import os
 import sys
 
-import pygtk
-pygtk.require("2.0")
+import gi
+gi.require_version("Gtk", "3.0")
 
-import gtk
-import gnome.canvas
+from gi.repository import Gtk
+import gnomecanvas
 import gnome
-import gobject
-import gtk.glade
+import gnome.ui
+from gi.repository import GObject
 
 import gettext
 
@@ -220,7 +220,7 @@ class Hextris:
         self.next_piece()
 
         if self.running == False:
-            gobject.timeout_add(self.speed, self.timer_handler)
+            GObject.timeout_add(self.speed, self.timer_handler)
             self.running = True
         else:
             self.speed_reset = True
@@ -228,7 +228,7 @@ class Hextris:
         return True
 
     def on_about_activate(self, event):
-        aTree = gtk.glade.XML(self.glade, "about")
+        aTree = self.builder.get_object("about")
         about = aTree.get_widget("about")
         about.set_property("name", "Ghextris")
         about.set_property("version", VERSION)
@@ -244,14 +244,14 @@ class Hextris:
         return True
 
     def on_quit_activate(self, event):
-        gtk.main_quit()
+        Gtk.main_quit()
 
     def main(self):
         gnome.init("Ghextris", VERSION)
         gettext.install("ghextris")
-        self.glade = os.path.join(SHAREDIR, "ghextris.glade")
-
-        wTree = gtk.glade.XML(self.glade, "GhextrisApp")
+        self.builder = Gtk.Builder()
+        self.builder.add_from_file(os.path.join(SHAREDIR, "ghextris.builder"))
+        wTree =self.builder.get_object("GhextrisApp")
         dic = {"on_new_activate": self.on_new_activate,
                "on_pause_game_activate": self.on_pause_game_activate,
                "on_quit_activate": self.on_quit_activate,
@@ -327,7 +327,7 @@ class Hextris:
 
         if self.speed_reset == True:
             self.speed_reset = False
-            gobject.timeout_add(int(self.speed), self.timer_handler)
+            GObject.timeout_add(int(self.speed), self.timer_handler)
             return False
 
         return True
@@ -341,7 +341,7 @@ class Hextris:
         if self.lost == True:
             return False
 
-        if event.keyval == gtk.keysyms.p and self.lost == False:
+        if event.keyval == Gdk.KEY_p and self.lost == False:
             if self.paused == True:
                 self.paused = False
             else:
@@ -351,8 +351,8 @@ class Hextris:
         if self.paused == True:
             return False
 
-        if event.keyval == gtk.keysyms.Up or event.keyval == gtk.keysyms.Down:
-            if event.keyval == gtk.keysyms.Up:
+        if event.keyval == Gdk.KEY_Up or event.keyval == Gdk.KEY_Down:
+            if event.keyval == Gdk.KEY_Up:
                 attitude_change = 1
             else:
                 attitude_change = -1
@@ -371,8 +371,8 @@ class Hextris:
                                           self.piece_x, self.piece_y);
             return True
 
-        if event.keyval == gtk.keysyms.Left or event.keyval == gtk.keysyms.Right:
-            if event.keyval == gtk.keysyms.Left:
+        if event.keyval == Gdk.KEY_Left or event.keyval == Gdk.KEY_Right:
+            if event.keyval == Gdk.KEY_Left:
                 deltax = -1
             else:
                 deltax = 1
@@ -398,7 +398,7 @@ class Hextris:
             self.piece.move(deltax*(self.piecewidth+self.piecenarrow)/2, deltay)
             return True
 
-        if event.keyval == gtk.keysyms.space:
+        if event.keyval == Gdk.KEY_space:
             orig_piece_y = self.piece_y
             while self.check_collisions() == False:
                 self.piece_y += 1
@@ -491,4 +491,4 @@ class Hextris:
 if __name__ == '__main__':
     h = Hextris()
     h.main()
-    gtk.main()
+    Gtk.main()