/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 diff.py

  • Committer: Daniel Schierbeck
  • Date: 2007-10-21 16:55:31 UTC
  • mfrom: (298.2.2 refactor)
  • Revision ID: daniel.schierbeck@gmail.com-20071021165531-c1l9hxrpqxr8zz8c
Merged window refactoring branch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
diff.py
35
35
from bzrlib.diff import show_diff_trees
36
36
from bzrlib.errors import NoSuchFile
37
37
from bzrlib.trace import warning
38
 
 
39
 
 
40
 
class DiffWindow(gtk.Window):
 
38
from bzrlib.plugins.gtk.window import Window
 
39
 
 
40
class DiffWindow(Window):
41
41
    """Diff window.
42
42
 
43
43
    This object represents and manages a single window containing the
45
45
    """
46
46
 
47
47
    def __init__(self, parent=None):
48
 
        gtk.Window.__init__(self, gtk.WINDOW_TOPLEVEL)
 
48
        Window.__init__(self, parent)
49
49
        self.set_border_width(0)
50
50
        self.set_title("bzrk diff")
51
51
 
56
56
        height = int(monitor.height * 0.66)
57
57
        self.set_default_size(width, height)
58
58
 
59
 
        self._parent = parent
60
 
        self.connect('key-press-event', self._on_key_pressed)
61
 
        if parent is None:
62
 
            self.connect('delete-event', gtk.main_quit)
63
 
 
64
59
        self.construct()
65
60
 
66
61
    def construct(self):
321
316
            colors[key.strip()] = val.strip()
322
317
        return colors
323
318
 
324
 
    def _on_key_pressed(self, widget, event):
325
 
        """ Key press event handler. """
326
 
        keyname = gtk.gdk.keyval_name(event.keyval)
327
 
        func = getattr(self, '_on_key_press_' + keyname, None)
328
 
        if func:
329
 
            return func(event)
330
 
 
331
 
    def _on_key_press_w(self, event):
332
 
        if event.state & gtk.gdk.CONTROL_MASK:
333
 
            self.destroy()
334
 
            if self._parent is None:
335
 
                gtk.main_quit()
336
 
 
337
 
    def _on_key_press_q(self, event):
338
 
        if event.state & gtk.gdk.CONTROL_MASK:
339
 
            gtk.main_quit()
340
 
    
341