/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
133
131
 
134
132
        gobject.idle_add(self.populate)
135
133
 
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)
 
134
        self.connect("destroy", lambda x: self.branch.unlock())
143
135
 
144
136
    def do_get_property(self, property):
145
137
        if property.name == 'revno-column-visible':
155
147
        elif property.name == 'branch':
156
148
            return self.branch
157
149
        elif property.name == 'revision':
158
 
            return self.model.get_value(self.model.get_iter(self.path),
159
 
                                        treemodel.REVISION)
 
150
            return self.model.get_value(self.iter, treemodel.REVISION)
160
151
        elif property.name == 'revision-number':
161
 
            return self.model.get_value(self.model.get_iter(self.path),
162
 
                                        treemodel.REVNO)
 
152
            return self.model.get_value(self.iter, treemodel.REVNO)
163
153
        elif property.name == 'children':
164
 
            return self.model.get_value(self.model.get_iter(self.path),
165
 
                                        treemodel.CHILDREN)
 
154
            return self.model.get_value(self.iter, treemodel.CHILDREN)
166
155
        elif property.name == 'parents':
167
 
            return self.model.get_value(self.model.get_iter(self.path),
168
 
                                        treemodel.PARENTS)
 
156
            return self.model.get_value(self.iter, treemodel.PARENTS)
169
157
        else:
170
158
            raise AttributeError, 'unknown property %s' % property.name
171
159
 
191
179
        """Return revision id of currently selected revision, or None."""
192
180
        return self.get_property('revision')
193
181
 
194
 
    def has_revision_id(self, revision_id):
195
 
        return (revision_id in self.index)
196
 
 
197
182
    def set_revision(self, revision):
198
183
        self.set_property('revision', revision)
199
184
 
222
207
    def add_tag(self, tag, revid=None):
223
208
        if revid is None: revid = self.revision.revision_id
224
209
 
225
 
        if lock.release(self.branch):
 
210
        try:
 
211
            self.branch.unlock()
 
212
 
226
213
            try:
227
 
                lock.acquire(self.branch, lock.WRITE)
 
214
                self.branch.lock_write()
228
215
                self.model.add_tag(tag, revid)
229
216
            finally:
230
 
                lock.release(self.branch)
231
 
 
232
 
            lock.acquire(self.branch, lock.READ)
233
 
 
234
 
            self.emit('tag-added', tag, revid)
235
 
 
 
217
                self.branch.unlock()
 
218
 
 
219
        finally:
 
220
            self.branch.lock_read()
 
221
 
 
222
        self.emit('tag-added', tag, revid)
 
223
        
236
224
    def refresh(self):
237
225
        gobject.idle_add(self.populate, self.get_revision())
238
226
 
287
275
                       should be broken.
288
276
        """
289
277
 
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
278
        self.progress_bar = ui.ui_factory.nested_progress_bar()
294
 
        self.progress_bar.update("Loading ancestry graph", 0, 5)
 
279
        self.progress_bar.update(msg="Loading ancestry graph", total_cnt=5)
295
280
 
296
281
        try:
297
282
            if self.compact:
298
283
                broken_line_length = 32
299
284
            else:
300
285
                broken_line_length = None
301
 
 
 
286
            
302
287
            show_graph = self.graph_column.get_visible()
303
288
 
304
289
            self.branch.lock_read()
310
295
                                                            self.mainline_only,
311
296
                                                            self.progress_bar)
312
297
 
313
 
            self.model = treemodel.TreeModel(self.branch, linegraphdata)
 
298
            self.model = TreeModel(self.branch, linegraphdata)
314
299
            self.graph_cell.columns_len = columns_len
315
300
            width = self.graph_cell.get_size(self.treeview)[2]
316
301
            if width > 500:
325
310
            else:
326
311
                self.set_revision(revision)
327
312
 
328
 
            self.emit('refreshed')
329
313
            return False
330
314
        finally:
331
315
            self.progress_bar.finished()
334
318
        self.treeview = gtk.TreeView()
335
319
 
336
320
        self.treeview.set_rules_hint(True)
337
 
        # combined revno/summary interactive search
338
 
        #
339
 
        # the row in a treemodel is considered "matched" if a REVNO *starts*
340
 
        # from the key (that is the key is found in a REVNO at the offset 0)
341
 
        # or if a MESSAGE *contains* the key anywhere (that is, the key is
342
 
        # found case insensitively in a MESSAGE at any offset)
343
 
        def search_equal_func(model, column, key, iter):
344
 
            return (model.get_value(iter, treemodel.REVNO).find(key) != 0
345
 
                and model.get_value(iter, treemodel.MESSAGE).lower().find(key.lower()) == -1)
346
 
 
347
 
        self.treeview.set_search_equal_func(search_equal_func)
348
 
        self.treeview.set_enable_search(True)
349
 
 
 
321
        self.treeview.set_search_column(treemodel.REVNO)
 
322
        
350
323
        # Fix old PyGTK bug - by JAM
351
324
        set_tooltip = getattr(self.treeview, 'set_tooltip_column', None)
352
325
        if set_tooltip is not None:
353
326
            set_tooltip(treemodel.MESSAGE)
354
327
 
355
 
        self._prev_cursor_path = None
356
328
        self.treeview.connect("cursor-changed",
357
329
                self._on_selection_changed)
358
330
 
403
375
        cell = gtk.CellRendererText()
404
376
        cell.set_property("width-chars", 15)
405
377
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
406
 
        self.authors_column = gtk.TreeViewColumn("Author(s)")
407
 
        self.authors_column.set_resizable(False)
408
 
        self.authors_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
409
 
        self.authors_column.set_fixed_width(200)
410
 
        self.authors_column.pack_start(cell, expand=True)
411
 
        self.authors_column.add_attribute(cell, "text", treemodel.AUTHORS)
412
 
        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)
413
385
 
414
386
        cell = gtk.CellRendererText()
415
387
        cell.set_property("width-chars", 20)
422
394
        self.date_column.pack_start(cell, expand=True)
423
395
        self.date_column.add_attribute(cell, "text", treemodel.TIMESTAMP)
424
396
        self.treeview.append_column(self.date_column)
425
 
 
 
397
        
426
398
        return self.treeview
427
 
 
 
399
    
428
400
    def _on_selection_changed(self, treeview):
429
401
        """callback for when the treeview changes."""
430
402
        (path, focus) = treeview.get_cursor()
431
 
        if (path is not None) and (path != self._prev_cursor_path):
432
 
            self._prev_cursor_path = path # avoid emitting twice per click
433
 
            self.path = path
 
403
        if path is not None:
 
404
            self.iter = self.model.get_iter(path)
434
405
            self.emit('revision-selected')
435
406
 
436
407
    def _on_revision_selected(self, widget, event):
437
 
        from bzrlib.plugins.gtk.revisionmenu import RevisionMenu
 
408
        from bzrlib.plugins.gtk.revisionmenu import RevisionPopupMenu
438
409
        if event.button == 3:
439
 
            menu = RevisionMenu(self.branch.repository, 
 
410
            menu = RevisionPopupMenu(self.branch.repository, 
440
411
                [self.get_revision().revision_id],
441
412
                self.branch)
442
413
            menu.connect('tag-added', lambda w, t, r: self.add_tag(t, r))