/b-gtk/fix-viz

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/b-gtk/fix-viz

« back to all changes in this revision

Viewing changes to window.py

  • Committer: Jelmer Vernooij
  • Date: 2011-11-02 11:11:06 UTC
  • mfrom: (734.1.55 gtk3)
  • Revision ID: jelmer@samba.org-20111102111106-7l0vso8eg24dpf87
Merge gtk3 support from Curtis.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
1
 
2
 
import pygtk
3
 
import gtk
4
 
 
5
 
class Window(gtk.Window):
 
2
from gi.repository import Gdk
 
3
from gi.repository import Gtk
 
4
 
 
5
 
 
6
class Window(Gtk.Window):
6
7
 
7
8
    def __init__(self, parent=None):
8
 
        gtk.Window.__init__(self, gtk.WINDOW_TOPLEVEL)
 
9
        super(Window, self).__init__(type=Gtk.WindowType.TOPLEVEL)
9
10
        self._parent = parent
10
11
 
11
12
        self.connect('key-press-event', self._on_key_press)
12
13
 
13
14
    def _on_key_press(self, widget, event):
14
 
        keyname = gtk.gdk.keyval_name(event.keyval)
15
 
        if event.state & gtk.gdk.CONTROL_MASK:
 
15
        keyname = Gdk.keyval_name(event.keyval)
 
16
        if event.get_state() & Gdk.ModifierType.CONTROL_MASK:
16
17
            if keyname is "w":
17
18
                self.destroy()
18
19
                if self._parent is None:
19
 
                    gtk.main_quit()
 
20
                    Gtk.main_quit()
20
21
            elif keyname is "q":
21
 
                gtk.main_quit()
 
22
                Gtk.main_quit()
22
23