/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: Mikkel Kamstrup Erlandsen
  • Date: 2011-09-28 07:45:39 UTC
  • mto: This revision was merged to the branch mainline in revision 740.
  • Revision ID: mikkel.kamstrup@gmail.com-20110928074539-qxl1yn1bkjel6ir0
https://launchpad.net/bugs/861201
Add X-GNOME-Autostart-Delay=30 to bzr-notify.desktop

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
 
import treemodel
16
12
 
17
 
from bzrlib.plugins.gtk import _i18n
18
 
from linegraph import linegraph, same_branch
19
 
from graphcell import CellRendererGraph
20
 
from treemodel import TreeModel
 
13
from bzrlib import ui
21
14
from bzrlib.revision import NULL_REVISION
22
15
 
 
16
from bzrlib.plugins.gtk import lock
 
17
from bzrlib.plugins.gtk.ui import ProgressPanel
 
18
from bzrlib.plugins.gtk.branchview import treemodel
 
19
from bzrlib.plugins.gtk.branchview.linegraph import linegraph, same_branch
 
20
from bzrlib.plugins.gtk.branchview.graphcell import CellRendererGraph
 
21
 
 
22
 
23
23
class TreeView(gtk.VBox):
24
24
 
25
25
    __gproperties__ = {
82
82
    }
83
83
 
84
84
    __gsignals__ = {
85
 
        'revisions-loaded': (gobject.SIGNAL_RUN_FIRST, 
86
 
                             gobject.TYPE_NONE,
87
 
                             ()),
88
85
        'revision-selected': (gobject.SIGNAL_RUN_FIRST,
89
86
                              gobject.TYPE_NONE,
90
87
                              ()),
93
90
                              (gobject.TYPE_PYOBJECT, gobject.TYPE_PYOBJECT)),
94
91
        'tag-added': (gobject.SIGNAL_RUN_FIRST,
95
92
                              gobject.TYPE_NONE,
96
 
                              (gobject.TYPE_STRING, gobject.TYPE_STRING))
 
93
                              (gobject.TYPE_STRING, gobject.TYPE_STRING)),
 
94
        'refreshed': (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE,
 
95
                              ())
97
96
    }
98
97
 
99
98
    def __init__(self, branch, start, maxnum, compact=True):
108
107
        """
109
108
        gtk.VBox.__init__(self, spacing=0)
110
109
 
111
 
        self.pack_start(self.construct_loading_msg(), expand=False, fill=True)
112
 
        self.connect('revisions-loaded', 
113
 
                lambda x: self.loading_msg_box.hide())
 
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)
114
115
 
115
116
        self.scrolled_window = gtk.ScrolledWindow()
116
117
        self.scrolled_window.set_policy(gtk.POLICY_AUTOMATIC,
120
121
        self.pack_start(self.scrolled_window, expand=True, fill=True)
121
122
 
122
123
        self.scrolled_window.add(self.construct_treeview())
123
 
        
124
124
 
125
 
        self.iter = None
 
125
        self.path = None
126
126
        self.branch = branch
127
127
        self.revision = None
 
128
        self.index = {}
128
129
 
129
130
        self.start = start
130
131
        self.maxnum = maxnum
131
132
        self.compact = compact
132
133
 
 
134
        self.model = treemodel.TreeModel(self.branch, [])
133
135
        gobject.idle_add(self.populate)
134
136
 
135
 
        self.connect("destroy", lambda x: self.branch.unlock())
 
137
        self.connect("destroy", self._on_destroy)
 
138
 
 
139
    def _on_destroy(self, *ignored):
 
140
        self.branch.unlock()
 
141
        if getattr(ui.ui_factory, "set_progress_bar_widget", None) is not None:
 
142
            # We'are using our own ui, let's tell it to stop using our widget.
 
143
            ui.ui_factory.set_progress_bar_widget(None)
136
144
 
137
145
    def do_get_property(self, property):
138
146
        if property.name == 'revno-column-visible':
148
156
        elif property.name == 'branch':
149
157
            return self.branch
150
158
        elif property.name == 'revision':
151
 
            return self.model.get_value(self.iter, treemodel.REVISION)
 
159
            if self.path is None:
 
160
                return None
 
161
            return self.model.get_value(self.model.get_iter(self.path),
 
162
                                        treemodel.REVISION)
152
163
        elif property.name == 'revision-number':
153
 
            return self.model.get_value(self.iter, treemodel.REVNO)
 
164
            if self.path is None:
 
165
                return None
 
166
            return self.model.get_value(self.model.get_iter(self.path),
 
167
                                        treemodel.REVNO)
154
168
        elif property.name == 'children':
155
 
            return self.model.get_value(self.iter, treemodel.CHILDREN)
 
169
            if self.path is None:
 
170
                return None
 
171
            return self.model.get_value(self.model.get_iter(self.path),
 
172
                                        treemodel.CHILDREN)
156
173
        elif property.name == 'parents':
157
 
            return self.model.get_value(self.iter, treemodel.PARENTS)
 
174
            if self.path is None:
 
175
                return None
 
176
            return self.model.get_value(self.model.get_iter(self.path),
 
177
                                        treemodel.PARENTS)
158
178
        else:
159
179
            raise AttributeError, 'unknown property %s' % property.name
160
180
 
180
200
        """Return revision id of currently selected revision, or None."""
181
201
        return self.get_property('revision')
182
202
 
 
203
    def has_revision_id(self, revision_id):
 
204
        return (revision_id in self.index)
 
205
 
183
206
    def set_revision(self, revision):
184
207
        self.set_property('revision', revision)
185
208
 
208
231
    def add_tag(self, tag, revid=None):
209
232
        if revid is None: revid = self.revision.revision_id
210
233
 
211
 
        try:
212
 
            self.branch.unlock()
213
 
 
 
234
        if lock.release(self.branch):
214
235
            try:
215
 
                self.branch.lock_write()
 
236
                lock.acquire(self.branch, lock.WRITE)
216
237
                self.model.add_tag(tag, revid)
217
238
            finally:
218
 
                self.branch.unlock()
219
 
 
220
 
        finally:
221
 
            self.branch.lock_read()
222
 
 
223
 
        self.emit('tag-added', tag, revid)
224
 
        
 
239
                lock.release(self.branch)
 
240
 
 
241
            lock.acquire(self.branch, lock.READ)
 
242
 
 
243
            self.emit('tag-added', tag, revid)
 
244
 
225
245
    def refresh(self):
226
 
        self.loading_msg_box.show()
227
246
        gobject.idle_add(self.populate, self.get_revision())
228
247
 
229
248
    def update(self):
277
296
                       should be broken.
278
297
        """
279
298
 
280
 
        if self.compact:
281
 
            broken_line_length = 32
282
 
        else:
283
 
            broken_line_length = None
284
 
        
285
 
        show_graph = self.graph_column.get_visible()
286
 
 
287
 
        self.branch.lock_read()
288
 
        (linegraphdata, index, columns_len) = linegraph(self.branch.repository,
289
 
                                                        (self.start,) , # Sequence of start revisions
290
 
                                                        self.maxnum, 
291
 
                                                        broken_line_length,
292
 
                                                        show_graph,
293
 
                                                        self.mainline_only)
294
 
 
295
 
        self.model = TreeModel(self.branch, linegraphdata)
296
 
        self.graph_cell.columns_len = columns_len
297
 
        width = self.graph_cell.get_size(self.treeview)[2]
298
 
        if width > 500:
299
 
            width = 500
300
 
        self.graph_column.set_fixed_width(width)
301
 
        self.graph_column.set_max_width(width)
302
 
        self.index = index
303
 
        self.treeview.set_model(self.model)
304
 
 
305
 
        if not revision or revision == NULL_REVISION:
306
 
            self.treeview.set_cursor(0)
307
 
        else:
308
 
            self.set_revision(revision)
309
 
 
310
 
        self.emit('revisions-loaded')
311
 
 
312
 
        return False
 
299
        if getattr(ui.ui_factory, "set_progress_bar_widget", None) is not None:
 
300
            # We'are using our own ui, let's tell it to use our widget.
 
301
            ui.ui_factory.set_progress_bar_widget(self.progress_widget)
 
302
        self.progress_bar = ui.ui_factory.nested_progress_bar()
 
303
        self.progress_bar.update("Loading ancestry graph", 0, 5)
 
304
 
 
305
        try:
 
306
            if self.compact:
 
307
                broken_line_length = 32
 
308
            else:
 
309
                broken_line_length = None
 
310
 
 
311
            show_graph = self.graph_column.get_visible()
 
312
 
 
313
            self.branch.lock_read()
 
314
            (linegraphdata, index, columns_len) = linegraph(self.branch.repository.get_graph(),
 
315
                                                            self.start,
 
316
                                                            self.maxnum, 
 
317
                                                            broken_line_length,
 
318
                                                            show_graph,
 
319
                                                            self.mainline_only,
 
320
                                                            self.progress_bar)
 
321
 
 
322
            self.model.line_graph_data = linegraphdata
 
323
            self.graph_cell.columns_len = columns_len
 
324
            width = self.graph_cell.get_size(self.treeview)[2]
 
325
            if width > 500:
 
326
                width = 500
 
327
            self.graph_column.set_fixed_width(width)
 
328
            self.graph_column.set_max_width(width)
 
329
            self.index = index
 
330
            self.treeview.set_model(self.model)
 
331
 
 
332
            if not revision or revision == NULL_REVISION:
 
333
                self.treeview.set_cursor(0)
 
334
            else:
 
335
                self.set_revision(revision)
 
336
 
 
337
            self.emit('refreshed')
 
338
            return False
 
339
        finally:
 
340
            self.progress_bar.finished()
313
341
 
314
342
    def construct_treeview(self):
315
343
        self.treeview = gtk.TreeView()
316
344
 
317
345
        self.treeview.set_rules_hint(True)
318
 
        self.treeview.set_search_column(treemodel.REVNO)
319
 
        
 
346
        # combined revno/summary interactive search
 
347
        #
 
348
        # the row in a treemodel is considered "matched" if a REVNO *starts*
 
349
        # from the key (that is the key is found in a REVNO at the offset 0)
 
350
        # or if a MESSAGE *contains* the key anywhere (that is, the key is
 
351
        # found case insensitively in a MESSAGE at any offset)
 
352
        def search_equal_func(model, column, key, iter):
 
353
            return (model.get_value(iter, treemodel.REVNO).find(key) != 0
 
354
                and model.get_value(iter, treemodel.MESSAGE).lower().find(key.lower()) == -1)
 
355
 
 
356
        self.treeview.set_search_equal_func(search_equal_func)
 
357
        self.treeview.set_enable_search(True)
 
358
 
320
359
        # Fix old PyGTK bug - by JAM
321
360
        set_tooltip = getattr(self.treeview, 'set_tooltip_column', None)
322
361
        if set_tooltip is not None:
323
362
            set_tooltip(treemodel.MESSAGE)
324
363
 
 
364
        self._prev_cursor_path = None
325
365
        self.treeview.connect("cursor-changed",
326
366
                self._on_selection_changed)
327
367
 
339
379
        cell.set_property("width-chars", 15)
340
380
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
341
381
        self.revno_column = gtk.TreeViewColumn("Revision No")
342
 
        self.revno_column.set_resizable(False)
 
382
        self.revno_column.set_resizable(True)
343
383
        self.revno_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
344
384
        self.revno_column.set_fixed_width(cell.get_size(self.treeview)[2])
345
385
        self.revno_column.pack_start(cell, expand=True)
348
388
 
349
389
        self.graph_cell = CellRendererGraph()
350
390
        self.graph_column = gtk.TreeViewColumn()
351
 
        self.graph_column.set_resizable(False)
 
391
        self.graph_column.set_resizable(True)
352
392
        self.graph_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
353
393
        self.graph_column.pack_start(self.graph_cell, expand=True)
354
394
        self.graph_column.add_attribute(self.graph_cell, "node", treemodel.NODE)
361
401
        cell.set_property("width-chars", 65)
362
402
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
363
403
        self.summary_column = gtk.TreeViewColumn("Summary")
364
 
        self.summary_column.set_resizable(False)
 
404
        self.summary_column.set_resizable(True)
365
405
        self.summary_column.set_expand(True)
366
406
        self.summary_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
367
407
        self.summary_column.set_fixed_width(cell.get_size(self.treeview)[2])
372
412
        cell = gtk.CellRendererText()
373
413
        cell.set_property("width-chars", 15)
374
414
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
375
 
        self.committer_column = gtk.TreeViewColumn("Committer")
376
 
        self.committer_column.set_resizable(False)
377
 
        self.committer_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
378
 
        self.committer_column.set_fixed_width(200)
379
 
        self.committer_column.pack_start(cell, expand=True)
380
 
        self.committer_column.add_attribute(cell, "text", treemodel.COMMITTER)
381
 
        self.treeview.append_column(self.committer_column)
 
415
        self.authors_column = gtk.TreeViewColumn("Author(s)")
 
416
        self.authors_column.set_resizable(False)
 
417
        self.authors_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
 
418
        self.authors_column.set_fixed_width(200)
 
419
        self.authors_column.pack_start(cell, expand=True)
 
420
        self.authors_column.add_attribute(cell, "text", treemodel.AUTHORS)
 
421
        self.treeview.append_column(self.authors_column)
382
422
 
383
423
        cell = gtk.CellRendererText()
384
424
        cell.set_property("width-chars", 20)
385
425
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
386
426
        self.date_column = gtk.TreeViewColumn("Date")
387
427
        self.date_column.set_visible(False)
388
 
        self.date_column.set_resizable(False)
 
428
        self.date_column.set_resizable(True)
389
429
        self.date_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
390
430
        self.date_column.set_fixed_width(130)
391
431
        self.date_column.pack_start(cell, expand=True)
392
432
        self.date_column.add_attribute(cell, "text", treemodel.TIMESTAMP)
393
433
        self.treeview.append_column(self.date_column)
394
 
        
 
434
 
395
435
        return self.treeview
396
 
    
397
 
    def construct_loading_msg(self):
398
 
        image_loading = gtk.image_new_from_stock(gtk.STOCK_REFRESH,
399
 
                                                 gtk.ICON_SIZE_BUTTON)
400
 
        image_loading.show()
401
 
        
402
 
        label_loading = gtk.Label(
403
 
            _i18n("Please wait, loading ancestral graph..."))
404
 
        label_loading.set_alignment(0.0, 0.5)
405
 
        label_loading.show()
406
 
        
407
 
        self.loading_msg_box = gtk.HBox()
408
 
        self.loading_msg_box.set_spacing(5)
409
 
        self.loading_msg_box.set_border_width(5)        
410
 
        self.loading_msg_box.pack_start(image_loading, False, False)
411
 
        self.loading_msg_box.pack_start(label_loading, True, True)
412
 
        self.loading_msg_box.show()
413
 
        
414
 
        return self.loading_msg_box
415
436
 
416
437
    def _on_selection_changed(self, treeview):
417
438
        """callback for when the treeview changes."""
418
439
        (path, focus) = treeview.get_cursor()
419
 
        if path is not None:
420
 
            self.iter = self.model.get_iter(path)
 
440
        if (path is not None) and (path != self._prev_cursor_path):
 
441
            self._prev_cursor_path = path # avoid emitting twice per click
 
442
            self.path = path
421
443
            self.emit('revision-selected')
422
444
 
423
445
    def _on_revision_selected(self, widget, event):
424
 
        from bzrlib.plugins.gtk.revisionmenu import RevisionPopupMenu
 
446
        from bzrlib.plugins.gtk.revisionmenu import RevisionMenu
425
447
        if event.button == 3:
426
 
            menu = RevisionPopupMenu(self.branch.repository, 
 
448
            menu = RevisionMenu(self.branch.repository, 
427
449
                [self.get_revision().revision_id],
428
450
                self.branch)
429
451
            menu.connect('tag-added', lambda w, t, r: self.add_tag(t, r))