/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: Curtis Hovey
  • Date: 2011-07-31 16:50:29 UTC
  • mto: This revision was merged to the branch mainline in revision 741.
  • Revision ID: sinzui.is@verizon.net-20110731165029-9gixuqypi3lwapzm
Removed import_pygtk because gi does not impicitly call Main(). Inlined checks for gtk availablility.

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
 
        super(DiffFileView, self).__init__()
 
71
        GObject.GObject.__init__(self)
72
72
        self.construct()
73
73
        self._diffs = {}
74
74
 
78
78
 
79
79
        if have_gtksourceview:
80
80
            self.buffer = GtkSource.Buffer()
81
 
            lang_manager = GtkSource.LanguageManager.get_default()
82
 
            language = lang_manager.guess_language(None, "text/x-patch")
 
81
            slm = GtkSource.LanguageManager()
 
82
            guess_language = getattr(GtkSource.LanguageManager, 
 
83
                "guess_language", fallback_guess_language)
 
84
            gsl = guess_language(slm, content_type="text/x-patch")
83
85
            if have_gconf:
84
86
                self.apply_gedit_colors(self.buffer)
85
87
            self.apply_colordiff_colors(self.buffer)
86
 
            self.buffer.set_language(language)
 
88
            self.buffer.set_language(gsl)
87
89
            self.buffer.set_highlight_syntax(True)
88
90
 
89
 
            self.sourceview = GtkSource.View(buffer=self.buffer)
 
91
            self.sourceview = GtkSource.View(self.buffer)
90
92
        else:
91
93
            self.buffer = Gtk.TextBuffer()
92
94
            self.sourceview = Gtk.TextView(self.buffer)
250
252
    """This is the soft and chewy filling for a DiffWindow."""
251
253
 
252
254
    def __init__(self):
253
 
        super(DiffView, self).__init__()
 
255
        DiffFileView.__init__(self)
254
256
        self.rev_tree = None
255
257
        self.parent_tree = None
256
258
 
295
297
        scrollwin.show()
296
298
        
297
299
        self.model = Gtk.TreeStore(str, str)
298
 
        self.treeview = Gtk.TreeView(model=self.model)
 
300
        self.treeview = Gtk.TreeView(self.model)
299
301
        self.treeview.set_headers_visible(False)
300
302
        self.treeview.set_search_column(1)
301
303
        self.treeview.connect("cursor-changed", self._treeview_cursor_cb)
305
307
        cell = Gtk.CellRendererText()
306
308
        cell.set_property("width-chars", 20)
307
309
        column = Gtk.TreeViewColumn()
308
 
        column.pack_start(cell, True)
 
310
        column.pack_start(cell, True, True, 0)
309
311
        column.add_attribute(cell, "text", 0)
310
312
        self.treeview.append_column(column)
311
313
 
382
384
                    break
383
385
        if tv_path is None:
384
386
            raise errors.NoSuchFile(file_path)
385
 
        self.treeview.set_cursor(tv_path, None, False)
 
387
        self.treeview.set_cursor(tv_path)
386
388
        self.treeview.scroll_to_cell(tv_path)
387
389
 
388
390
    def _treeview_cursor_cb(self, *args):
411
413
    """
412
414
 
413
415
    def __init__(self, parent=None, operations=None):
414
 
        super(DiffWindow, self).__init__(parent=parent)
 
416
        Window.__init__(self, parent)
415
417
        self.set_border_width(0)
416
418
        self.set_title("bzrk diff")
417
419
 
442
444
    def _get_menu_bar(self):
443
445
        menubar = Gtk.MenuBar()
444
446
        # View menu
445
 
        mb_view = Gtk.MenuItem.new_with_mnemonic(_i18n("_View"))
 
447
        mb_view = Gtk.MenuItem(_i18n("_View"))
446
448
        mb_view_menu = Gtk.Menu()
447
 
        mb_view_wrapsource = Gtk.CheckMenuItem.new_with_mnemonic(
448
 
            _i18n("Wrap _Long Lines"))
 
449
        mb_view_wrapsource = Gtk.CheckMenuItem(_i18n("Wrap _Long Lines"))
449
450
        mb_view_wrapsource.connect('activate', self.diff._on_wraplines_toggled)
450
451
        mb_view_wrapsource.show()
451
452
        mb_view_menu.append(mb_view_wrapsource)
578
579
class MergeDirectiveController(DiffController):
579
580
 
580
581
    def __init__(self, path, directive, window=None):
581
 
        super(MergeDirectiveController, self).__init__(
582
 
            path, directive.patch.splitlines(True), window)
 
582
        DiffController.__init__(self, path, directive.patch.splitlines(True),
 
583
                                window)
583
584
        self.directive = directive
584
585
        self.merge_target = None
585
586