/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: David Planella
  • Date: 2011-03-06 08:24:07 UTC
  • mfrom: (718 trunk)
  • mto: This revision was merged to the branch mainline in revision 719.
  • Revision ID: david.planella@ubuntu.com-20110306082407-y9zwkjje5oue9egw
Added preliminary internationalization support. Merged from trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
diff.py
17
17
import os
18
18
import re
19
19
import sys
 
20
import inspect
20
21
try:
21
22
    from xml.etree.ElementTree import Element, SubElement, tostring
22
23
except ImportError:
104
105
        :param buf: a gtksourceview2.Buffer object.
105
106
        """
106
107
        GEDIT_SCHEME_PATH = '/apps/gedit-2/preferences/editor/colors/scheme'
 
108
        GEDIT_USER_STYLES_PATH = os.path.expanduser('~/.gnome2/gedit/styles')
107
109
 
108
110
        client = gconf.client_get_default()
109
111
        style_scheme_name = client.get_string(GEDIT_SCHEME_PATH)
110
112
        if style_scheme_name is not None:
111
 
            style_scheme = gtksourceview2.StyleSchemeManager().get_scheme(style_scheme_name)
112
 
            
113
 
            buf.set_style_scheme(style_scheme)
 
113
            style_scheme_mgr = gtksourceview2.StyleSchemeManager()
 
114
            style_scheme_mgr.append_search_path(GEDIT_USER_STYLES_PATH)
 
115
            
 
116
            style_scheme = style_scheme_mgr.get_scheme(style_scheme_name)
 
117
            
 
118
            if style_scheme is not None:
 
119
                buf.set_style_scheme(style_scheme)
114
120
 
115
121
    @classmethod
116
122
    def apply_colordiff_colors(klass, buf):
524
530
 
525
531
class DiffController(object):
526
532
 
527
 
    def __init__(self, path, patch, window=None):
 
533
    def __init__(self, path, patch, window=None, allow_dirty=False):
528
534
        self.path = path
529
535
        self.patch = patch
 
536
        self.allow_dirty = allow_dirty
530
537
        if window is None:
531
538
            window = DiffWindow(operations=self._provide_operations())
532
539
            self.initialize_window(window)
538
545
 
539
546
    def get_diff_sections(self):
540
547
        yield "Complete Diff", None, ''.join(self.patch)
541
 
        for patch in parse_patches(self.patch):
 
548
        # allow_dirty was added to parse_patches in bzrlib 2.2b1
 
549
        if 'allow_dirty' in inspect.getargspec(parse_patches).args:
 
550
            patches = parse_patches(self.patch, allow_dirty=self.allow_dirty)
 
551
        else:
 
552
            patches = parse_patches(self.patch)
 
553
        for patch in patches:
542
554
            oldname = patch.oldname.split('\t')[0]
543
555
            newname = patch.newname.split('\t')[0]
544
556
            yield oldname, newname, str(patch)