diff options
Diffstat (limited to 'TurtleArt/tawindow.py')
| -rw-r--r-- | TurtleArt/tawindow.py | 47 |
1 files changed, 22 insertions, 25 deletions
diff --git a/TurtleArt/tawindow.py b/TurtleArt/tawindow.py index 0ded3cb..f79bfe1 100644 --- a/TurtleArt/tawindow.py +++ b/TurtleArt/tawindow.py @@ -22,10 +22,7 @@ #OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN #THE SOFTWARE. -import pygtk -pygtk.require('2.0') -import gtk -import gobject +from util.gtkcompat import Gtk, Gdk, GObject, Rectangle from gettext import gettext as _ try: @@ -87,10 +84,10 @@ class TurtleArtWindow(): self.turtle_canvas = turtle_canvas self.send_event = None # method to send events over the network self.gst_available = GST_AVAILABLE - if type(canvas_window) == gtk.DrawingArea: + if type(canvas_window) == Gtk.DrawingArea: self.interactive_mode = True self.window = canvas_window - self.window.set_flags(gtk.CAN_FOCUS) + self.window.set_flags(Gtk.CAN_FOCUS) self.window.show_all() if self.parent is not None: self.parent.show_all() @@ -118,9 +115,9 @@ class TurtleArtWindow(): self.used_block_list = [] # Which blocks has the user used? self.save_folder = None self.save_file_name = None - self.width = gtk.gdk.screen_width() - self.height = gtk.gdk.screen_height() - self.rect = gtk.gdk.Rectangle(0, 0, 0, 0) + self.width = Gdk.Screen.width() + self.height = Gdk.Screen.height() + self.rect = Rectangle(0, 0, 0, 0) self.keypress = '' self.keyvalue = 0 @@ -307,7 +304,7 @@ class TurtleArtWindow(): def _add_plugin_icon_dir(self, dirname): ''' If there is an icon subdir, add it to the search path. ''' - icon_theme = gtk.icon_theme_get_default() + icon_theme = Gtk.IconTheme.get_default() icon_path = os.path.join(dirname, 'icons') if os.path.exists(icon_path): icon_theme.append_search_path(icon_path) @@ -345,10 +342,10 @@ class TurtleArtWindow(): def _setup_events(self): """ Register the events we listen to. """ - self.window.add_events(gtk.gdk.BUTTON_PRESS_MASK) - self.window.add_events(gtk.gdk.BUTTON_RELEASE_MASK) - self.window.add_events(gtk.gdk.POINTER_MOTION_MASK) - self.window.add_events(gtk.gdk.KEY_PRESS_MASK) + self.window.add_events(Gdk.EventMask.BUTTON_PRESS_MASK) + self.window.add_events(Gdk.EventMask.BUTTON_RELEASE_MASK) + self.window.add_events(Gdk.EventMask.POINTER_MOTION_MASK) + self.window.add_events(Gdk.EventMask.KEY_PRESS_MASK) # self.window.connect('realize', self.do_realize) self.window.connect("expose-event", self._expose_cb) self.window.connect("button-press-event", self._buttonpress_cb) @@ -1005,7 +1002,7 @@ class TurtleArtWindow(): self.mouse_flag = 1 self.mouse_x = x self.mouse_y = y - self.button_press(event.get_state() & gtk.gdk.CONTROL_MASK, x, y) + self.button_press(event.get_state() & Gdk.EventMask.CONTROL_MASK, x, y) return True def button_press(self, mask, x, y): @@ -1629,7 +1626,7 @@ class TurtleArtWindow(): else: if self.timeout_tag[0] > 0: try: - gobject.source_remove(self.timeout_tag[0]) + GObject.source_remove(self.timeout_tag[0]) self.timeout_tag[0] = 0 except: self.timeout_tag[0] = 0 @@ -1642,14 +1639,14 @@ class TurtleArtWindow(): else: if self.timeout_tag[0] > 0: try: - gobject.source_remove(self.timeout_tag[0]) + GObject.source_remove(self.timeout_tag[0]) self.timeout_tag[0] = 0 except: self.timeout_tag[0] = 0 else: if self.timeout_tag[0] > 0: try: - gobject.source_remove(self.timeout_tag[0]) + GObject.source_remove(self.timeout_tag[0]) self.timeout_tag[0] = 0 except: self.timeout_tag[0] = 0 @@ -2023,7 +2020,7 @@ class TurtleArtWindow(): top = find_top_block(blk) self.lc.run_blocks(top, self.just_blocks(), True) if self.interactive_mode: - gobject.idle_add(self.lc.doevalstep) + GObject.idle_add(self.lc.doevalstep) else: while self.lc.doevalstep(): pass @@ -2199,7 +2196,7 @@ class TurtleArtWindow(): blk.name = 'audio' elif image_media_type(picture): w, h = calc_image_size(blk.spr) - pixbuf = gtk.gdk.pixbuf_new_from_file_at_size(picture, w, h) + pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_size(picture, w, h) else: blk.name = 'description' if pixbuf is not None: @@ -2209,9 +2206,9 @@ class TurtleArtWindow(): def _keypress_cb(self, area, event): """ Keyboard """ - keyname = gtk.gdk.keyval_name(event.keyval) - keyunicode = gtk.gdk.keyval_to_unicode(event.keyval) - if event.get_state() & gtk.gdk.MOD1_MASK: + keyname = Gdk.keyval_name(event.keyval) + keyunicode = Gdk.keyval_to_unicode(event.keyval) + if event.get_state() & Gdk.ModifierType.MOD1_MASK: alt_mask = True alt_flag = 'T' else: @@ -2788,7 +2785,7 @@ class TurtleArtWindow(): except: try: w, h, = calc_image_size(blk.spr) - pixbuf = gtk.gdk.pixbuf_new_from_file_at_size( + pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_size( blk.values[0], w, h) x, y = self._calc_image_offset('', blk.spr) blk.set_image(pixbuf, x, y) @@ -2800,7 +2797,7 @@ class TurtleArtWindow(): if not movie_media_type(blk.values[0][-4:]): try: w, h, = calc_image_size(blk.spr) - pixbuf = gtk.gdk.pixbuf_new_from_file_at_size( + pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_size( blk.values[0], w, h) x, y = self._calc_image_offset('', blk.spr) blk.set_image(pixbuf, x, y) |