/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 annotate/config.py

  • Committer: Vincent Ladeuil
  • Date: 2008-06-10 15:25:47 UTC
  • mto: This revision was merged to the branch mainline in revision 504.
  • Revision ID: v.ladeuil+lp@free.fr-20080610152547-dwmil1p8pd0mfpnl
Fix third failing test (thanks to jam).

* tests/test_commit.py:
(TestPendingRevisions.test_pending_revisions_multi_merge): Fix
provided by jam: bzr we now filter the pending merges so that only
the 'heads()' are included. We just ensure that the pending merges
contain the unique tips for the ancestries.

Show diffs side-by-side

added added

removed removed

Lines of Context:
annotate/config.py
20
20
 
21
21
from bzrlib.config import config_dir
22
22
import bzrlib.util.configobj.configobj as configobj
23
 
from bzrlib.util.configobj.validate import Validator
24
23
 
25
24
 
26
25
gannotate_configspec = (
52
51
                                     configspec=gannotate_configspec)
53
52
        self.window = window
54
53
        self.pane = window.pane
55
 
        self.span_selector = window.span_selector
56
54
        
57
55
        self.initial_comment = ["gannotate plugin configuration"]
58
 
        self.validate(Validator())
 
56
        self['window']['width'] = 750
 
57
        self['window']['height'] = 550
 
58
        self['window']['maximized'] = False
 
59
        self['window']['x'] = 0
 
60
        self['window']['y'] = 0
 
61
        self['window']['pane_position'] = 325
 
62
        self['spans']['max_custom_spans'] = 4
 
63
        self['spans']['custom_spans'] = []
59
64
 
60
65
        self.apply()
61
66
        self._connect_signals()
71
76
        if self["window"]["maximized"]:
72
77
            self.window.maximize()
73
78
 
74
 
        self.span_selector.max_custom_spans =\
75
 
                self["spans"]["max_custom_spans"]
76
 
 
77
79
        # XXX Don't know how to set an empty list as default in
78
80
        # gannotate_configspec.
79
 
        try:
80
 
            for span in self["spans"]["custom_spans"]:
81
 
                self.span_selector.add_custom_span(span)
82
 
        except KeyError:
83
 
            pass
84
 
 
85
81
    def _connect_signals(self):
86
82
        self.window.connect("destroy", self._write)
87
83
        self.window.connect("configure-event", self._save_window_props)
88
84
        self.window.connect("window-state-event", self._save_window_props)
89
85
        self.pane.connect("notify", self._save_pane_props)
90
 
        self.span_selector.connect("custom-span-added",
91
 
                                   self._save_custom_spans)
92
86
 
93
87
    def _save_window_props(self, w, e, *args):
94
88
        if e.window.get_state() & gtk.gdk.WINDOW_STATE_MAXIMIZED: