/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 branchview/treeview.py

  • Committer: Jelmer Vernooij
  • Date: 2011-02-18 11:53:18 UTC
  • mfrom: (452.5.2 viz-locks)
  • Revision ID: jelmer@samba.org-20110218115318-xgsxhn13fd3m6nj9
https://launchpad.net/bugs/93652
Add lock dialog. (Daniel Schierbeck)

Show diffs side-by-side

added added

removed removed

Lines of Context:
branchview/treeview.py
16
16
from bzrlib import ui
17
17
 
18
18
from bzrlib.plugins.gtk import _i18n
 
19
from bzrlib.plugins.gtk.ui import GtkProgressBar, ProgressPanel
19
20
from linegraph import linegraph, same_branch
20
21
from graphcell import CellRendererGraph
21
22
from treemodel import TreeModel
22
23
from bzrlib.revision import NULL_REVISION
 
24
from bzrlib.plugins.gtk import lock
 
25
 
23
26
 
24
27
class TreeView(gtk.VBox):
25
28
 
91
94
                              (gobject.TYPE_PYOBJECT, gobject.TYPE_PYOBJECT)),
92
95
        'tag-added': (gobject.SIGNAL_RUN_FIRST,
93
96
                              gobject.TYPE_NONE,
94
 
                              (gobject.TYPE_STRING, gobject.TYPE_STRING))
 
97
                              (gobject.TYPE_STRING, gobject.TYPE_STRING)),
 
98
        'refreshed': (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE,
 
99
                              ())
95
100
    }
96
101
 
97
102
    def __init__(self, branch, start, maxnum, compact=True):
106
111
        """
107
112
        gtk.VBox.__init__(self, spacing=0)
108
113
 
 
114
        self.progress_widget = ProgressPanel()
 
115
        self.pack_start(self.progress_widget, expand=False, fill=True)
 
116
        if getattr(ui.ui_factory, "set_progress_bar_widget", None) is not None:
 
117
            # We'are using our own ui, let's tell it to use our widget.
 
118
            ui.ui_factory.set_progress_bar_widget(self.progress_widget)
 
119
 
109
120
        self.scrolled_window = gtk.ScrolledWindow()
110
121
        self.scrolled_window.set_policy(gtk.POLICY_AUTOMATIC,
111
122
                                        gtk.POLICY_AUTOMATIC)
115
126
 
116
127
        self.scrolled_window.add(self.construct_treeview())
117
128
 
118
 
        self.iter = None
 
129
        self.path = None
119
130
        self.branch = branch
120
131
        self.revision = None
 
132
        self.index = {}
121
133
 
122
134
        self.start = start
123
135
        self.maxnum = maxnum
125
137
 
126
138
        gobject.idle_add(self.populate)
127
139
 
128
 
        self.connect("destroy", lambda x: self.branch.unlock())
 
140
        self.connect("destroy", self._on_destroy)
 
141
 
 
142
    def _on_destroy(self, *ignored):
 
143
        self.branch.unlock()
 
144
        if getattr(ui.ui_factory, "set_progress_bar_widget", None) is not None:
 
145
            # We'are using our own ui, let's tell it to stop using our widget.
 
146
            ui.ui_factory.set_progress_bar_widget(None)
129
147
 
130
148
    def do_get_property(self, property):
131
149
        if property.name == 'revno-column-visible':
141
159
        elif property.name == 'branch':
142
160
            return self.branch
143
161
        elif property.name == 'revision':
144
 
            return self.model.get_value(self.iter, treemodel.REVISION)
 
162
            return self.model.get_value(self.model.get_iter(self.path),
 
163
                                        treemodel.REVISION)
145
164
        elif property.name == 'revision-number':
146
 
            return self.model.get_value(self.iter, treemodel.REVNO)
 
165
            return self.model.get_value(self.model.get_iter(self.path),
 
166
                                        treemodel.REVNO)
147
167
        elif property.name == 'children':
148
 
            return self.model.get_value(self.iter, treemodel.CHILDREN)
 
168
            return self.model.get_value(self.model.get_iter(self.path),
 
169
                                        treemodel.CHILDREN)
149
170
        elif property.name == 'parents':
150
 
            return self.model.get_value(self.iter, treemodel.PARENTS)
 
171
            return self.model.get_value(self.model.get_iter(self.path),
 
172
                                        treemodel.PARENTS)
151
173
        else:
152
174
            raise AttributeError, 'unknown property %s' % property.name
153
175
 
173
195
        """Return revision id of currently selected revision, or None."""
174
196
        return self.get_property('revision')
175
197
 
 
198
    def has_revision_id(self, revision_id):
 
199
        return (revision_id in self.index)
 
200
 
176
201
    def set_revision(self, revision):
177
202
        self.set_property('revision', revision)
178
203
 
201
226
    def add_tag(self, tag, revid=None):
202
227
        if revid is None: revid = self.revision.revision_id
203
228
 
204
 
        try:
205
 
            self.branch.unlock()
206
 
 
 
229
        if lock.release(self.branch):
207
230
            try:
208
 
                self.branch.lock_write()
 
231
                lock.acquire(self.branch, lock.WRITE)
209
232
                self.model.add_tag(tag, revid)
210
233
            finally:
211
 
                self.branch.unlock()
212
 
 
213
 
        finally:
214
 
            self.branch.lock_read()
215
 
 
216
 
        self.emit('tag-added', tag, revid)
 
234
                lock.release(self.branch)
 
235
 
 
236
            lock.acquire(self.branch, lock.READ)
 
237
 
 
238
            self.emit('tag-added', tag, revid)
217
239
        
218
240
    def refresh(self):
219
241
        gobject.idle_add(self.populate, self.get_revision())
269
291
                       should be broken.
270
292
        """
271
293
 
272
 
        loading_progress = ui.ui_factory.nested_progress_bar()
273
 
        loading_progress.update(msg="Loading ancestry graph", total=5)
 
294
        if getattr(ui.ui_factory, "set_progress_bar_widget", None) is not None:
 
295
            # We'are using our own ui, let's tell it to use our widget.
 
296
            ui.ui_factory.set_progress_bar_widget(self.progress_widget)
 
297
        self.progress_bar = ui.ui_factory.nested_progress_bar()
 
298
        self.progress_bar.update("Loading ancestry graph", 0, 5)
274
299
 
275
300
        try:
276
301
            if self.compact:
287
312
                                                            broken_line_length,
288
313
                                                            show_graph,
289
314
                                                            self.mainline_only,
290
 
                                                            loading_progress)
 
315
                                                            self.progress_bar)
291
316
 
292
317
            self.model = TreeModel(self.branch, linegraphdata)
293
318
            self.graph_cell.columns_len = columns_len
304
329
            else:
305
330
                self.set_revision(revision)
306
331
 
 
332
            self.emit('refreshed')
307
333
            return False
308
334
        finally:
309
 
            loading_progress.finished()
 
335
            self.progress_bar.finished()
310
336
 
311
337
    def construct_treeview(self):
312
338
        self.treeview = gtk.TreeView()
319
345
        if set_tooltip is not None:
320
346
            set_tooltip(treemodel.MESSAGE)
321
347
 
 
348
        self._prev_cursor_path = None
322
349
        self.treeview.connect("cursor-changed",
323
350
                self._on_selection_changed)
324
351
 
390
417
        self.treeview.append_column(self.date_column)
391
418
        
392
419
        return self.treeview
393
 
 
 
420
    
394
421
    def _on_selection_changed(self, treeview):
395
422
        """callback for when the treeview changes."""
396
423
        (path, focus) = treeview.get_cursor()
397
 
        if path is not None:
398
 
            self.iter = self.model.get_iter(path)
 
424
        if (path is not None) and (path != self._prev_cursor_path):
 
425
            self._prev_cursor_path = path # avoid emitting twice per click
 
426
            self.path = path
399
427
            self.emit('revision-selected')
400
428
 
401
429
    def _on_revision_selected(self, widget, event):
402
 
        from bzrlib.plugins.gtk.revisionmenu import RevisionPopupMenu
 
430
        from bzrlib.plugins.gtk.revisionmenu import RevisionMenu
403
431
        if event.button == 3:
404
 
            menu = RevisionPopupMenu(self.branch.repository, 
 
432
            menu = RevisionMenu(self.branch.repository, 
405
433
                [self.get_revision().revision_id],
406
434
                self.branch)
407
435
            menu.connect('tag-added', lambda w, t, r: self.add_tag(t, r))