/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: Vincent Ladeuil
  • Date: 2009-05-28 15:14:14 UTC
  • mto: This revision was merged to the branch mainline in revision 640.
  • Revision ID: v.ladeuil+lp@free.fr-20090528151414-q5rlh8kaicx2hgqo
Implement commit message saving without modifying bzrlib.

* tests/test_commit.py:
(TestSavedCommitMessages.setUp): Install the post_uncommit hook
for all relevant tests.
(TestUncommitHook.setUp): Use explicit rev-ids to ease debugging.

* commit.py: 
Fix imports. Integrate SavedCommitMessagesManager so that we don't
need to modify bzrlib anymore.
(CommitDialog.__init__, CommitDialog._fill_in_files,
CommitDialog._construct_global_message, CommitDialog._do_cancel,
CommitDialog._do_commit): Stop testing can_save_commit_messages,
SavedCommitMessagesManager is always available now.
(SavedCommitMessagesManager): Borrowed from Anne Mohsen's patch.
(save_commit_messages): Implement the post_uncommit hook.

* __init__.py:
Install a lazy hook.

Show diffs side-by-side

added added

removed removed

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