/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: 2008-03-14 02:19:21 UTC
  • mto: (452.2.3 trunk)
  • mto: This revision was merged to the branch mainline in revision 453.
  • Revision ID: jelmer@samba.org-20080314021921-2dgptk62dhp7pd91
Honor child_submit_to in the submit_branch if no email address was specified.
Consistent with the changes in bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
branchview/treeview.py
3
3
 
4
4
"""
5
5
 
6
 
__copyright__ = "Copyright © 2005 Canonical Ltd."
 
6
__copyright__ = "Copyright � 2005 Canonical Ltd."
7
7
__author__    = "Daniel Schierbeck <daniel.schierbeck@gmail.com>"
8
8
 
9
9
import sys
13
13
import pango
14
14
import re
15
15
import treemodel
16
 
from bzrlib import ui
17
16
 
18
 
from bzrlib.plugins.gtk import _i18n
19
 
from bzrlib.plugins.gtk.ui import GtkProgressBar, ProgressPanel
20
17
from linegraph import linegraph, same_branch
21
18
from graphcell import CellRendererGraph
22
19
from treemodel import TreeModel
23
20
from bzrlib.revision import NULL_REVISION
24
 
from bzrlib.plugins.gtk import lock
25
 
 
26
21
 
27
22
class TreeView(gtk.VBox):
28
23
 
86
81
    }
87
82
 
88
83
    __gsignals__ = {
 
84
        'revisions-loaded': (gobject.SIGNAL_RUN_FIRST, 
 
85
                             gobject.TYPE_NONE,
 
86
                             ()),
89
87
        'revision-selected': (gobject.SIGNAL_RUN_FIRST,
90
88
                              gobject.TYPE_NONE,
91
89
                              ()),
94
92
                              (gobject.TYPE_PYOBJECT, gobject.TYPE_PYOBJECT)),
95
93
        'tag-added': (gobject.SIGNAL_RUN_FIRST,
96
94
                              gobject.TYPE_NONE,
97
 
                              (gobject.TYPE_STRING, gobject.TYPE_STRING)),
98
 
        'refreshed': (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE,
99
 
                              ())
 
95
                              (gobject.TYPE_STRING, gobject.TYPE_STRING))
100
96
    }
101
97
 
102
98
    def __init__(self, branch, start, maxnum, compact=True):
111
107
        """
112
108
        gtk.VBox.__init__(self, spacing=0)
113
109
 
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)
 
110
        self.pack_start(self.construct_loading_msg(), expand=False, fill=True)
 
111
        self.connect('revisions-loaded', 
 
112
                lambda x: self.loading_msg_box.hide())
119
113
 
120
114
        self.scrolled_window = gtk.ScrolledWindow()
121
115
        self.scrolled_window.set_policy(gtk.POLICY_AUTOMATIC,
125
119
        self.pack_start(self.scrolled_window, expand=True, fill=True)
126
120
 
127
121
        self.scrolled_window.add(self.construct_treeview())
 
122
        
128
123
 
129
 
        self.path = None
 
124
        self.iter = None
130
125
        self.branch = branch
131
126
        self.revision = None
132
 
        self.index = {}
133
127
 
134
128
        self.start = start
135
129
        self.maxnum = maxnum
137
131
 
138
132
        gobject.idle_add(self.populate)
139
133
 
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)
 
134
        self.connect("destroy", lambda x: self.branch.unlock())
147
135
 
148
136
    def do_get_property(self, property):
149
137
        if property.name == 'revno-column-visible':
159
147
        elif property.name == 'branch':
160
148
            return self.branch
161
149
        elif property.name == 'revision':
162
 
            return self.model.get_value(self.model.get_iter(self.path),
163
 
                                        treemodel.REVISION)
 
150
            return self.model.get_value(self.iter, treemodel.REVISION)
164
151
        elif property.name == 'revision-number':
165
 
            return self.model.get_value(self.model.get_iter(self.path),
166
 
                                        treemodel.REVNO)
 
152
            return self.model.get_value(self.iter, treemodel.REVNO)
167
153
        elif property.name == 'children':
168
 
            return self.model.get_value(self.model.get_iter(self.path),
169
 
                                        treemodel.CHILDREN)
 
154
            return self.model.get_value(self.iter, treemodel.CHILDREN)
170
155
        elif property.name == 'parents':
171
 
            return self.model.get_value(self.model.get_iter(self.path),
172
 
                                        treemodel.PARENTS)
 
156
            return self.model.get_value(self.iter, treemodel.PARENTS)
173
157
        else:
174
158
            raise AttributeError, 'unknown property %s' % property.name
175
159
 
195
179
        """Return revision id of currently selected revision, or None."""
196
180
        return self.get_property('revision')
197
181
 
198
 
    def has_revision_id(self, revision_id):
199
 
        return (revision_id in self.index)
200
 
 
201
182
    def set_revision(self, revision):
202
183
        self.set_property('revision', revision)
203
184
 
226
207
    def add_tag(self, tag, revid=None):
227
208
        if revid is None: revid = self.revision.revision_id
228
209
 
229
 
        if lock.release(self.branch):
 
210
        try:
 
211
            self.branch.unlock()
 
212
 
230
213
            try:
231
 
                lock.acquire(self.branch, lock.WRITE)
 
214
                self.branch.lock_write()
232
215
                self.model.add_tag(tag, revid)
233
216
            finally:
234
 
                lock.release(self.branch)
235
 
 
236
 
            lock.acquire(self.branch, lock.READ)
237
 
 
238
 
            self.emit('tag-added', tag, revid)
 
217
                self.branch.unlock()
 
218
 
 
219
        finally:
 
220
            self.branch.lock_read()
 
221
 
 
222
        self.emit('tag-added', tag, revid)
239
223
        
240
224
    def refresh(self):
 
225
        self.loading_msg_box.show()
241
226
        gobject.idle_add(self.populate, self.get_revision())
242
227
 
243
228
    def update(self):
291
276
                       should be broken.
292
277
        """
293
278
 
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)
299
 
 
300
 
        try:
301
 
            if self.compact:
302
 
                broken_line_length = 32
303
 
            else:
304
 
                broken_line_length = None
305
 
            
306
 
            show_graph = self.graph_column.get_visible()
307
 
 
308
 
            self.branch.lock_read()
309
 
            (linegraphdata, index, columns_len) = linegraph(self.branch.repository.get_graph(),
310
 
                                                            self.start,
311
 
                                                            self.maxnum, 
312
 
                                                            broken_line_length,
313
 
                                                            show_graph,
314
 
                                                            self.mainline_only,
315
 
                                                            self.progress_bar)
316
 
 
317
 
            self.model = TreeModel(self.branch, linegraphdata)
318
 
            self.graph_cell.columns_len = columns_len
319
 
            width = self.graph_cell.get_size(self.treeview)[2]
320
 
            if width > 500:
321
 
                width = 500
322
 
            self.graph_column.set_fixed_width(width)
323
 
            self.graph_column.set_max_width(width)
324
 
            self.index = index
325
 
            self.treeview.set_model(self.model)
326
 
 
327
 
            if not revision or revision == NULL_REVISION:
328
 
                self.treeview.set_cursor(0)
329
 
            else:
330
 
                self.set_revision(revision)
331
 
 
332
 
            self.emit('refreshed')
333
 
            return False
334
 
        finally:
335
 
            self.progress_bar.finished()
 
279
        if self.compact:
 
280
            broken_line_length = 32
 
281
        else:
 
282
            broken_line_length = None
 
283
        
 
284
        show_graph = self.graph_column.get_visible()
 
285
 
 
286
        self.branch.lock_read()
 
287
        (linegraphdata, index, columns_len) = linegraph(self.branch.repository,
 
288
                                                        self.start,
 
289
                                                        self.maxnum, 
 
290
                                                        broken_line_length,
 
291
                                                        show_graph,
 
292
                                                        self.mainline_only)
 
293
 
 
294
        self.model = TreeModel(self.branch, linegraphdata)
 
295
        self.graph_cell.columns_len = columns_len
 
296
        width = self.graph_cell.get_size(self.treeview)[2]
 
297
        if width > 500:
 
298
            width = 500
 
299
        self.graph_column.set_fixed_width(width)
 
300
        self.graph_column.set_max_width(width)
 
301
        self.index = index
 
302
        self.treeview.set_model(self.model)
 
303
 
 
304
        if revision is None:
 
305
            self.treeview.set_cursor(0)
 
306
        else:
 
307
            self.set_revision(revision)
 
308
 
 
309
        self.emit('revisions-loaded')
 
310
 
 
311
        return False
336
312
 
337
313
    def construct_treeview(self):
338
314
        self.treeview = gtk.TreeView()
345
321
        if set_tooltip is not None:
346
322
            set_tooltip(treemodel.MESSAGE)
347
323
 
348
 
        self._prev_cursor_path = None
349
324
        self.treeview.connect("cursor-changed",
350
325
                self._on_selection_changed)
351
326
 
363
338
        cell.set_property("width-chars", 15)
364
339
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
365
340
        self.revno_column = gtk.TreeViewColumn("Revision No")
366
 
        self.revno_column.set_resizable(False)
 
341
        self.revno_column.set_resizable(True)
367
342
        self.revno_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
368
343
        self.revno_column.set_fixed_width(cell.get_size(self.treeview)[2])
369
344
        self.revno_column.pack_start(cell, expand=True)
372
347
 
373
348
        self.graph_cell = CellRendererGraph()
374
349
        self.graph_column = gtk.TreeViewColumn()
375
 
        self.graph_column.set_resizable(False)
 
350
        self.graph_column.set_resizable(True)
376
351
        self.graph_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
377
 
        self.graph_column.pack_start(self.graph_cell, expand=True)
 
352
        self.graph_column.pack_start(self.graph_cell, expand=False)
378
353
        self.graph_column.add_attribute(self.graph_cell, "node", treemodel.NODE)
379
354
        self.graph_column.add_attribute(self.graph_cell, "tags", treemodel.TAGS)
380
355
        self.graph_column.add_attribute(self.graph_cell, "in-lines", treemodel.LAST_LINES)
385
360
        cell.set_property("width-chars", 65)
386
361
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
387
362
        self.summary_column = gtk.TreeViewColumn("Summary")
388
 
        self.summary_column.set_resizable(False)
389
 
        self.summary_column.set_expand(True)
 
363
        self.summary_column.set_resizable(True)
390
364
        self.summary_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
391
365
        self.summary_column.set_fixed_width(cell.get_size(self.treeview)[2])
392
366
        self.summary_column.pack_start(cell, expand=True)
397
371
        cell.set_property("width-chars", 15)
398
372
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
399
373
        self.committer_column = gtk.TreeViewColumn("Committer")
400
 
        self.committer_column.set_resizable(False)
 
374
        self.committer_column.set_resizable(True)
401
375
        self.committer_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
402
 
        self.committer_column.set_fixed_width(200)
 
376
        self.committer_column.set_fixed_width(cell.get_size(self.treeview)[2])
403
377
        self.committer_column.pack_start(cell, expand=True)
404
378
        self.committer_column.add_attribute(cell, "text", treemodel.COMMITTER)
405
379
        self.treeview.append_column(self.committer_column)
409
383
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
410
384
        self.date_column = gtk.TreeViewColumn("Date")
411
385
        self.date_column.set_visible(False)
412
 
        self.date_column.set_resizable(False)
 
386
        self.date_column.set_resizable(True)
413
387
        self.date_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
414
 
        self.date_column.set_fixed_width(130)
 
388
        self.date_column.set_fixed_width(cell.get_size(self.treeview)[2])
415
389
        self.date_column.pack_start(cell, expand=True)
416
390
        self.date_column.add_attribute(cell, "text", treemodel.TIMESTAMP)
417
391
        self.treeview.append_column(self.date_column)
418
392
        
419
393
        return self.treeview
420
394
    
 
395
    def construct_loading_msg(self):
 
396
        image_loading = gtk.image_new_from_stock(gtk.STOCK_REFRESH,
 
397
                                                 gtk.ICON_SIZE_BUTTON)
 
398
        image_loading.show()
 
399
        
 
400
        label_loading = gtk.Label(_("Please wait, loading ancestral graph..."))
 
401
        label_loading.set_alignment(0.0, 0.5)
 
402
        label_loading.show()
 
403
        
 
404
        self.loading_msg_box = gtk.HBox()
 
405
        self.loading_msg_box.set_spacing(5)
 
406
        self.loading_msg_box.set_border_width(5)        
 
407
        self.loading_msg_box.pack_start(image_loading, False, False)
 
408
        self.loading_msg_box.pack_start(label_loading, True, True)
 
409
        self.loading_msg_box.show()
 
410
        
 
411
        return self.loading_msg_box
 
412
 
421
413
    def _on_selection_changed(self, treeview):
422
414
        """callback for when the treeview changes."""
423
415
        (path, focus) = treeview.get_cursor()
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
 
416
        if path is not None:
 
417
            self.iter = self.model.get_iter(path)
427
418
            self.emit('revision-selected')
428
419
 
429
420
    def _on_revision_selected(self, widget, event):
430
 
        from bzrlib.plugins.gtk.revisionmenu import RevisionMenu
 
421
        from bzrlib.plugins.gtk.revisionmenu import RevisionPopupMenu
431
422
        if event.button == 3:
432
 
            menu = RevisionMenu(self.branch.repository, 
 
423
            menu = RevisionPopupMenu(self.branch.repository, 
433
424
                [self.get_revision().revision_id],
434
425
                self.branch)
435
426
            menu.connect('tag-added', lambda w, t, r: self.add_tag(t, r))