/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 13:01:03 UTC
  • Revision ID: jelmer@samba.org-20110218130103-fiyk203auk28thpn
Remove some unused imports, fix some formatting.

Show diffs side-by-side

added added

removed removed

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