/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: John Arbash Meinel
  • Date: 2007-10-02 23:08:12 UTC
  • mto: (322.1.1 trunk) (330.3.3 trunk)
  • mto: This revision was merged to the branch mainline in revision 368.
  • Revision ID: john@arbash-meinel.com-20071002230812-h8i6pq8fwvodute4
Start testing with Unicode data.
It seems there is some brokenness with serializing Unicode messages.
But otherwise everything seems to be working.

Show diffs side-by-side

added added

removed removed

Lines of Context:
diff.py
34
34
from bzrlib.diff import show_diff_trees, internal_diff
35
35
from bzrlib.errors import NoSuchFile
36
36
from bzrlib.trace import warning
37
 
from bzrlib.plugins.gtk.window import Window
38
37
 
39
38
 
40
39
class DiffView(gtk.ScrolledWindow):
261
260
        self.buffer.set_text(decoded.encode('UTF-8'))
262
261
 
263
262
 
264
 
class DiffWindow(Window):
 
263
class DiffWindow(gtk.Window):
265
264
    """Diff window.
266
265
 
267
266
    This object represents and manages a single window containing the
268
267
    differences between two revisions on a branch.
269
268
    """
270
269
 
271
 
    def __init__(self, parent=None):
272
 
        Window.__init__(self, parent)
 
270
    def __init__(self):
 
271
        gtk.Window.__init__(self, gtk.WINDOW_TOPLEVEL)
273
272
        self.set_border_width(0)
274
273
        self.set_title("bzrk diff")
275
274