/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 16:20:15 UTC
  • mto: This revision was merged to the branch mainline in revision 519.
  • Revision ID: jelmer@samba.org-20080629162015-amhe7xj4cdmup4id
Rename GtkProgressBarStack to GtkWindowProgressBarStack

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 linegraph import linegraph, same_branch
 
20
from graphcell import CellRendererGraph
 
21
from treemodel import TreeModel
14
22
from bzrlib.revision import NULL_REVISION
15
23
 
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
24
class TreeView(gtk.VBox):
24
25
 
25
26
    __gproperties__ = {
90
91
                              (gobject.TYPE_PYOBJECT, gobject.TYPE_PYOBJECT)),
91
92
        'tag-added': (gobject.SIGNAL_RUN_FIRST,
92
93
                              gobject.TYPE_NONE,
93
 
                              (gobject.TYPE_STRING, gobject.TYPE_STRING)),
94
 
        'refreshed': (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE,
95
 
                              ())
 
94
                              (gobject.TYPE_STRING, gobject.TYPE_STRING))
96
95
    }
97
96
 
98
97
    def __init__(self, branch, start, maxnum, compact=True):
107
106
        """
108
107
        gtk.VBox.__init__(self, spacing=0)
109
108
 
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
 
 
116
109
        self.scrolled_window = gtk.ScrolledWindow()
117
110
        self.scrolled_window.set_policy(gtk.POLICY_AUTOMATIC,
118
111
                                        gtk.POLICY_AUTOMATIC)
122
115
 
123
116
        self.scrolled_window.add(self.construct_treeview())
124
117
 
125
 
        self.path = None
 
118
        self.iter = None
126
119
        self.branch = branch
127
120
        self.revision = None
128
 
        self.index = {}
129
121
 
130
122
        self.start = start
131
123
        self.maxnum = maxnum
133
125
 
134
126
        gobject.idle_add(self.populate)
135
127
 
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)
 
128
        self.connect("destroy", lambda x: self.branch.unlock())
143
129
 
144
130
    def do_get_property(self, property):
145
131
        if property.name == 'revno-column-visible':
155
141
        elif property.name == 'branch':
156
142
            return self.branch
157
143
        elif property.name == 'revision':
158
 
            return self.model.get_value(self.model.get_iter(self.path),
159
 
                                        treemodel.REVISION)
 
144
            return self.model.get_value(self.iter, treemodel.REVISION)
160
145
        elif property.name == 'revision-number':
161
 
            return self.model.get_value(self.model.get_iter(self.path),
162
 
                                        treemodel.REVNO)
 
146
            return self.model.get_value(self.iter, treemodel.REVNO)
163
147
        elif property.name == 'children':
164
 
            return self.model.get_value(self.model.get_iter(self.path),
165
 
                                        treemodel.CHILDREN)
 
148
            return self.model.get_value(self.iter, treemodel.CHILDREN)
166
149
        elif property.name == 'parents':
167
 
            return self.model.get_value(self.model.get_iter(self.path),
168
 
                                        treemodel.PARENTS)
 
150
            return self.model.get_value(self.iter, treemodel.PARENTS)
169
151
        else:
170
152
            raise AttributeError, 'unknown property %s' % property.name
171
153
 
191
173
        """Return revision id of currently selected revision, or None."""
192
174
        return self.get_property('revision')
193
175
 
194
 
    def has_revision_id(self, revision_id):
195
 
        return (revision_id in self.index)
196
 
 
197
176
    def set_revision(self, revision):
198
177
        self.set_property('revision', revision)
199
178
 
222
201
    def add_tag(self, tag, revid=None):
223
202
        if revid is None: revid = self.revision.revision_id
224
203
 
225
 
        if lock.release(self.branch):
 
204
        try:
 
205
            self.branch.unlock()
 
206
 
226
207
            try:
227
 
                lock.acquire(self.branch, lock.WRITE)
 
208
                self.branch.lock_write()
228
209
                self.model.add_tag(tag, revid)
229
210
            finally:
230
 
                lock.release(self.branch)
231
 
 
232
 
            lock.acquire(self.branch, lock.READ)
233
 
 
234
 
            self.emit('tag-added', tag, revid)
235
 
 
 
211
                self.branch.unlock()
 
212
 
 
213
        finally:
 
214
            self.branch.lock_read()
 
215
 
 
216
        self.emit('tag-added', tag, revid)
 
217
        
236
218
    def refresh(self):
237
219
        gobject.idle_add(self.populate, self.get_revision())
238
220
 
287
269
                       should be broken.
288
270
        """
289
271
 
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)
 
272
        loading_progress = ui.ui_factory.nested_progress_bar()
 
273
        loading_progress.update(msg="Loading ancestry graph", total=5)
295
274
 
296
275
        try:
297
276
            if self.compact:
298
277
                broken_line_length = 32
299
278
            else:
300
279
                broken_line_length = None
301
 
 
 
280
            
302
281
            show_graph = self.graph_column.get_visible()
303
282
 
304
283
            self.branch.lock_read()
308
287
                                                            broken_line_length,
309
288
                                                            show_graph,
310
289
                                                            self.mainline_only,
311
 
                                                            self.progress_bar)
 
290
                                                            loading_progress)
312
291
 
313
 
            self.model = treemodel.TreeModel(self.branch, linegraphdata)
 
292
            self.model = TreeModel(self.branch, linegraphdata)
314
293
            self.graph_cell.columns_len = columns_len
315
294
            width = self.graph_cell.get_size(self.treeview)[2]
316
295
            if width > 500:
325
304
            else:
326
305
                self.set_revision(revision)
327
306
 
328
 
            self.emit('refreshed')
 
307
            self.emit('revisions-loaded')
 
308
 
329
309
            return False
330
310
        finally:
331
 
            self.progress_bar.finished()
 
311
            loading_progress.finished()
332
312
 
333
313
    def construct_treeview(self):
334
314
        self.treeview = gtk.TreeView()
335
315
 
336
316
        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
 
 
 
317
        self.treeview.set_search_column(treemodel.REVNO)
 
318
        
350
319
        # Fix old PyGTK bug - by JAM
351
320
        set_tooltip = getattr(self.treeview, 'set_tooltip_column', None)
352
321
        if set_tooltip is not None:
353
322
            set_tooltip(treemodel.MESSAGE)
354
323
 
355
 
        self._prev_cursor_path = None
356
324
        self.treeview.connect("cursor-changed",
357
325
                self._on_selection_changed)
358
326
 
403
371
        cell = gtk.CellRendererText()
404
372
        cell.set_property("width-chars", 15)
405
373
        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)
 
374
        self.committer_column = gtk.TreeViewColumn("Committer")
 
375
        self.committer_column.set_resizable(False)
 
376
        self.committer_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
 
377
        self.committer_column.set_fixed_width(200)
 
378
        self.committer_column.pack_start(cell, expand=True)
 
379
        self.committer_column.add_attribute(cell, "text", treemodel.COMMITTER)
 
380
        self.treeview.append_column(self.committer_column)
413
381
 
414
382
        cell = gtk.CellRendererText()
415
383
        cell.set_property("width-chars", 20)
422
390
        self.date_column.pack_start(cell, expand=True)
423
391
        self.date_column.add_attribute(cell, "text", treemodel.TIMESTAMP)
424
392
        self.treeview.append_column(self.date_column)
425
 
 
 
393
        
426
394
        return self.treeview
427
395
 
428
396
    def _on_selection_changed(self, treeview):
429
397
        """callback for when the treeview changes."""
430
398
        (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
 
399
        if path is not None:
 
400
            self.iter = self.model.get_iter(path)
434
401
            self.emit('revision-selected')
435
402
 
436
403
    def _on_revision_selected(self, widget, event):
437
 
        from bzrlib.plugins.gtk.revisionmenu import RevisionMenu
 
404
        from bzrlib.plugins.gtk.revisionmenu import RevisionPopupMenu
438
405
        if event.button == 3:
439
 
            menu = RevisionMenu(self.branch.repository, 
 
406
            menu = RevisionPopupMenu(self.branch.repository, 
440
407
                [self.get_revision().revision_id],
441
408
                self.branch)
442
409
            menu.connect('tag-added', lambda w, t, r: self.add_tag(t, r))