/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: 2010-02-28 15:19:15 UTC
  • mfrom: (674.1.1 bzr-gtk)
  • Revision ID: jelmer@samba.org-20100228151915-bvwflj8ongj2fwqd
Merge qense's indicator application work, but don't require appindicator to be installed.

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
21
20
try:
22
21
    from xml.etree.ElementTree import Element, SubElement, tostring
23
22
except ImportError:
105
104
        :param buf: a gtksourceview2.Buffer object.
106
105
        """
107
106
        GEDIT_SCHEME_PATH = '/apps/gedit-2/preferences/editor/colors/scheme'
108
 
        GEDIT_USER_STYLES_PATH = os.path.expanduser('~/.gnome2/gedit/styles')
109
107
 
110
108
        client = gconf.client_get_default()
111
109
        style_scheme_name = client.get_string(GEDIT_SCHEME_PATH)
112
110
        if style_scheme_name is not None:
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)
 
111
            style_scheme = gtksourceview2.StyleSchemeManager().get_scheme(style_scheme_name)
 
112
            
 
113
            buf.set_style_scheme(style_scheme)
120
114
 
121
115
    @classmethod
122
116
    def apply_colordiff_colors(klass, buf):
530
524
 
531
525
class DiffController(object):
532
526
 
533
 
    def __init__(self, path, patch, window=None, allow_dirty=False):
 
527
    def __init__(self, path, patch, window=None):
534
528
        self.path = path
535
529
        self.patch = patch
536
 
        self.allow_dirty = allow_dirty
537
530
        if window is None:
538
531
            window = DiffWindow(operations=self._provide_operations())
539
532
            self.initialize_window(window)
545
538
 
546
539
    def get_diff_sections(self):
547
540
        yield "Complete Diff", None, ''.join(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:
 
541
        for patch in parse_patches(self.patch):
554
542
            oldname = patch.oldname.split('\t')[0]
555
543
            newname = patch.newname.split('\t')[0]
556
544
            yield oldname, newname, str(patch)