/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 17:38:30 UTC
  • mto: This revision was merged to the branch mainline in revision 741.
  • Revision ID: sinzui.is@verizon.net-20110731173830-mjhimj25p2ahjxfa
Update diff to gtk3.

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
 
        GObject.GObject.__init__(self)
 
71
        Gtk.ScrolledWindow.__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
 
            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")
 
81
            lang_manager = GtkSource.LanguageManager.get_default()
 
82
            language = lang_manager.guess_language(None, "text/x-patch")
85
83
            if have_gconf:
86
84
                self.apply_gedit_colors(self.buffer)
87
85
            self.apply_colordiff_colors(self.buffer)
88
 
            self.buffer.set_language(gsl)
 
86
            self.buffer.set_language(language)
89
87
            self.buffer.set_highlight_syntax(True)
90
88
 
91
 
            self.sourceview = GtkSource.View(self.buffer)
 
89
            self.sourceview = GtkSource.View(buffer=self.buffer)
92
90
        else:
93
91
            self.buffer = Gtk.TextBuffer()
94
92
            self.sourceview = Gtk.TextView(self.buffer)
297
295
        scrollwin.show()
298
296
        
299
297
        self.model = Gtk.TreeStore(str, str)
300
 
        self.treeview = Gtk.TreeView(self.model)
 
298
        self.treeview = Gtk.TreeView(model=self.model)
301
299
        self.treeview.set_headers_visible(False)
302
300
        self.treeview.set_search_column(1)
303
301
        self.treeview.connect("cursor-changed", self._treeview_cursor_cb)
307
305
        cell = Gtk.CellRendererText()
308
306
        cell.set_property("width-chars", 20)
309
307
        column = Gtk.TreeViewColumn()
310
 
        column.pack_start(cell, True, True, 0)
 
308
        column.pack_start(cell, True)
311
309
        column.add_attribute(cell, "text", 0)
312
310
        self.treeview.append_column(column)
313
311
 
444
442
    def _get_menu_bar(self):
445
443
        menubar = Gtk.MenuBar()
446
444
        # View menu
447
 
        mb_view = Gtk.MenuItem(_i18n("_View"))
 
445
        mb_view = Gtk.MenuItem(label=_i18n("_View"))
448
446
        mb_view_menu = Gtk.Menu()
449
 
        mb_view_wrapsource = Gtk.CheckMenuItem(_i18n("Wrap _Long Lines"))
 
447
        mb_view_wrapsource = Gtk.CheckMenuItem(
 
448
            label=_i18n("Wrap _Long Lines"))
450
449
        mb_view_wrapsource.connect('activate', self.diff._on_wraplines_toggled)
451
450
        mb_view_wrapsource.show()
452
451
        mb_view_menu.append(mb_view_wrapsource)