/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-06-29 18:12:29 UTC
  • mto: This revision was merged to the branch mainline in revision 519.
  • Revision ID: jelmer@samba.org-20080629181229-1l2m4cf7vvbyh8qg
Simplify progress bar code, use embedded progress bar inside viz window.

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
9
11
import gtk
10
12
import gobject
11
13
import pango
12
 
 
 
14
import re
 
15
import treemodel
13
16
from bzrlib import ui
 
17
 
 
18
from bzrlib.plugins.gtk import _i18n
 
19
from bzrlib.plugins.gtk.ui import GtkProgressBar, ProgressPanel
 
20
from linegraph import linegraph, same_branch
 
21
from graphcell import CellRendererGraph
 
22
from treemodel import TreeModel
14
23
from bzrlib.revision import NULL_REVISION
15
24
 
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
25
 
23
26
class TreeView(gtk.VBox):
24
27
 
90
93
                              (gobject.TYPE_PYOBJECT, gobject.TYPE_PYOBJECT)),
91
94
        'tag-added': (gobject.SIGNAL_RUN_FIRST,
92
95
                              gobject.TYPE_NONE,
93
 
                              (gobject.TYPE_STRING, gobject.TYPE_STRING)),
94
 
        'refreshed': (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE,
95
 
                              ())
 
96
                              (gobject.TYPE_STRING, gobject.TYPE_STRING))
96
97
    }
97
98
 
98
99
    def __init__(self, branch, start, maxnum, compact=True):
107
108
        """
108
109
        gtk.VBox.__init__(self, spacing=0)
109
110
 
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)
 
111
        loading_msg_widget = ProgressPanel()
 
112
        ui.ui_factory.set_nested_progress_bar_widget(loading_msg_widget.get_progress_bar)
 
113
        self.pack_start(loading_msg_widget, expand=False, fill=True)
115
114
 
116
115
        self.scrolled_window = gtk.ScrolledWindow()
117
116
        self.scrolled_window.set_policy(gtk.POLICY_AUTOMATIC,
122
121
 
123
122
        self.scrolled_window.add(self.construct_treeview())
124
123
 
125
 
        self.path = None
 
124
        self.iter = None
126
125
        self.branch = branch
127
126
        self.revision = None
128
 
        self.index = {}
129
127
 
130
128
        self.start = start
131
129
        self.maxnum = maxnum
132
130
        self.compact = compact
133
131
 
134
 
        self.model = treemodel.TreeModel(self.branch, [])
135
132
        gobject.idle_add(self.populate)
136
133
 
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)
 
134
        self.connect("destroy", lambda x: self.branch.unlock())
144
135
 
145
136
    def do_get_property(self, property):
146
137
        if property.name == 'revno-column-visible':
156
147
        elif property.name == 'branch':
157
148
            return self.branch
158
149
        elif property.name == '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)
 
150
            return self.model.get_value(self.iter, treemodel.REVISION)
163
151
        elif property.name == 'revision-number':
164
 
            if self.path is None:
165
 
                return None
166
 
            return self.model.get_value(self.model.get_iter(self.path),
167
 
                                        treemodel.REVNO)
 
152
            return self.model.get_value(self.iter, treemodel.REVNO)
168
153
        elif property.name == '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)
 
154
            return self.model.get_value(self.iter, treemodel.CHILDREN)
173
155
        elif property.name == '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)
 
156
            return self.model.get_value(self.iter, treemodel.PARENTS)
178
157
        else:
179
158
            raise AttributeError, 'unknown property %s' % property.name
180
159
 
200
179
        """Return revision id of currently selected revision, or None."""
201
180
        return self.get_property('revision')
202
181
 
203
 
    def has_revision_id(self, revision_id):
204
 
        return (revision_id in self.index)
205
 
 
206
182
    def set_revision(self, revision):
207
183
        self.set_property('revision', revision)
208
184
 
231
207
    def add_tag(self, tag, revid=None):
232
208
        if revid is None: revid = self.revision.revision_id
233
209
 
234
 
        if lock.release(self.branch):
 
210
        try:
 
211
            self.branch.unlock()
 
212
 
235
213
            try:
236
 
                lock.acquire(self.branch, lock.WRITE)
 
214
                self.branch.lock_write()
237
215
                self.model.add_tag(tag, revid)
238
216
            finally:
239
 
                lock.release(self.branch)
240
 
 
241
 
            lock.acquire(self.branch, lock.READ)
242
 
 
243
 
            self.emit('tag-added', tag, revid)
244
 
 
 
217
                self.branch.unlock()
 
218
 
 
219
        finally:
 
220
            self.branch.lock_read()
 
221
 
 
222
        self.emit('tag-added', tag, revid)
 
223
        
245
224
    def refresh(self):
246
225
        gobject.idle_add(self.populate, self.get_revision())
247
226
 
296
275
                       should be broken.
297
276
        """
298
277
 
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
278
        self.progress_bar = ui.ui_factory.nested_progress_bar()
303
 
        self.progress_bar.update("Loading ancestry graph", 0, 5)
 
279
        self.progress_bar.update(msg="Loading ancestry graph", total_cnt=5)
304
280
 
305
281
        try:
306
282
            if self.compact:
307
283
                broken_line_length = 32
308
284
            else:
309
285
                broken_line_length = None
310
 
 
 
286
            
311
287
            show_graph = self.graph_column.get_visible()
312
288
 
313
289
            self.branch.lock_read()
319
295
                                                            self.mainline_only,
320
296
                                                            self.progress_bar)
321
297
 
322
 
            self.model.line_graph_data = linegraphdata
 
298
            self.model = TreeModel(self.branch, linegraphdata)
323
299
            self.graph_cell.columns_len = columns_len
324
300
            width = self.graph_cell.get_size(self.treeview)[2]
325
301
            if width > 500:
334
310
            else:
335
311
                self.set_revision(revision)
336
312
 
337
 
            self.emit('refreshed')
338
313
            return False
339
314
        finally:
340
315
            self.progress_bar.finished()
343
318
        self.treeview = gtk.TreeView()
344
319
 
345
320
        self.treeview.set_rules_hint(True)
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
 
 
 
321
        self.treeview.set_search_column(treemodel.REVNO)
 
322
        
359
323
        # Fix old PyGTK bug - by JAM
360
324
        set_tooltip = getattr(self.treeview, 'set_tooltip_column', None)
361
325
        if set_tooltip is not None:
362
326
            set_tooltip(treemodel.MESSAGE)
363
327
 
364
 
        self._prev_cursor_path = None
365
328
        self.treeview.connect("cursor-changed",
366
329
                self._on_selection_changed)
367
330
 
379
342
        cell.set_property("width-chars", 15)
380
343
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
381
344
        self.revno_column = gtk.TreeViewColumn("Revision No")
382
 
        self.revno_column.set_resizable(True)
 
345
        self.revno_column.set_resizable(False)
383
346
        self.revno_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
384
347
        self.revno_column.set_fixed_width(cell.get_size(self.treeview)[2])
385
348
        self.revno_column.pack_start(cell, expand=True)
388
351
 
389
352
        self.graph_cell = CellRendererGraph()
390
353
        self.graph_column = gtk.TreeViewColumn()
391
 
        self.graph_column.set_resizable(True)
 
354
        self.graph_column.set_resizable(False)
392
355
        self.graph_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
393
356
        self.graph_column.pack_start(self.graph_cell, expand=True)
394
357
        self.graph_column.add_attribute(self.graph_cell, "node", treemodel.NODE)
401
364
        cell.set_property("width-chars", 65)
402
365
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
403
366
        self.summary_column = gtk.TreeViewColumn("Summary")
404
 
        self.summary_column.set_resizable(True)
 
367
        self.summary_column.set_resizable(False)
405
368
        self.summary_column.set_expand(True)
406
369
        self.summary_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
407
370
        self.summary_column.set_fixed_width(cell.get_size(self.treeview)[2])
412
375
        cell = gtk.CellRendererText()
413
376
        cell.set_property("width-chars", 15)
414
377
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
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)
 
378
        self.committer_column = gtk.TreeViewColumn("Committer")
 
379
        self.committer_column.set_resizable(False)
 
380
        self.committer_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
 
381
        self.committer_column.set_fixed_width(200)
 
382
        self.committer_column.pack_start(cell, expand=True)
 
383
        self.committer_column.add_attribute(cell, "text", treemodel.COMMITTER)
 
384
        self.treeview.append_column(self.committer_column)
422
385
 
423
386
        cell = gtk.CellRendererText()
424
387
        cell.set_property("width-chars", 20)
425
388
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
426
389
        self.date_column = gtk.TreeViewColumn("Date")
427
390
        self.date_column.set_visible(False)
428
 
        self.date_column.set_resizable(True)
 
391
        self.date_column.set_resizable(False)
429
392
        self.date_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
430
393
        self.date_column.set_fixed_width(130)
431
394
        self.date_column.pack_start(cell, expand=True)
432
395
        self.date_column.add_attribute(cell, "text", treemodel.TIMESTAMP)
433
396
        self.treeview.append_column(self.date_column)
434
 
 
 
397
        
435
398
        return self.treeview
436
 
 
 
399
    
437
400
    def _on_selection_changed(self, treeview):
438
401
        """callback for when the treeview changes."""
439
402
        (path, focus) = treeview.get_cursor()
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
 
403
        if path is not None:
 
404
            self.iter = self.model.get_iter(path)
443
405
            self.emit('revision-selected')
444
406
 
445
407
    def _on_revision_selected(self, widget, event):
446
 
        from bzrlib.plugins.gtk.revisionmenu import RevisionMenu
 
408
        from bzrlib.plugins.gtk.revisionmenu import RevisionPopupMenu
447
409
        if event.button == 3:
448
 
            menu = RevisionMenu(self.branch.repository, 
 
410
            menu = RevisionPopupMenu(self.branch.repository, 
449
411
                [self.get_revision().revision_id],
450
412
                self.branch)
451
413
            menu.connect('tag-added', lambda w, t, r: self.add_tag(t, r))