/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: 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:
diff.py
68
68
    """Window for displaying diffs from a diff file"""
69
69
 
70
70
    def __init__(self):
71
 
        Gtk.ScrolledWindow.__init__(self)
 
71
        super(DiffFileView, self).__init__()
72
72
        self.construct()
73
73
        self._diffs = {}
74
74
 
250
250
    """This is the soft and chewy filling for a DiffWindow."""
251
251
 
252
252
    def __init__(self):
253
 
        DiffFileView.__init__(self)
 
253
        super(DiffView, self).__init__()
254
254
        self.rev_tree = None
255
255
        self.parent_tree = None
256
256
 
411
411
    """
412
412
 
413
413
    def __init__(self, parent=None, operations=None):
414
 
        Window.__init__(self, parent)
 
414
        super(DiffWindow, self).__init__(parent=parent)
415
415
        self.set_border_width(0)
416
416
        self.set_title("bzrk diff")
417
417
 
442
442
    def _get_menu_bar(self):
443
443
        menubar = Gtk.MenuBar()
444
444
        # View menu
445
 
        mb_view = Gtk.MenuItem(label=_i18n("_View"))
 
445
        mb_view = Gtk.MenuItem.new_with_mnemonic(_i18n("_View"))
446
446
        mb_view_menu = Gtk.Menu()
447
 
        mb_view_wrapsource = Gtk.CheckMenuItem(
448
 
            label=_i18n("Wrap _Long Lines"))
 
447
        mb_view_wrapsource = Gtk.CheckMenuItem.new_with_mnemonic(
 
448
            _i18n("Wrap _Long Lines"))
449
449
        mb_view_wrapsource.connect('activate', self.diff._on_wraplines_toggled)
450
450
        mb_view_wrapsource.show()
451
451
        mb_view_menu.append(mb_view_wrapsource)
578
578
class MergeDirectiveController(DiffController):
579
579
 
580
580
    def __init__(self, path, directive, window=None):
581
 
        DiffController.__init__(self, path, directive.patch.splitlines(True),
582
 
                                window)
 
581
        super(MergeDirectiveController, self).__init__(
 
582
            path, directive.patch.splitlines(True), window)
583
583
        self.directive = directive
584
584
        self.merge_target = None
585
585