/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 viz/treeview.py

  • Committer: Daniel Schierbeck
  • Date: 2007-11-21 23:49:58 UTC
  • Revision ID: daniel.schierbeck@gmail.com-20071121234958-pvxq0dk51dscqzep
Made the push dialog close when the cancel button is clicked.

Show diffs side-by-side

added added

removed removed

Lines of Context:
viz/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
21
 
25
 
 
26
 
class TreeView(gtk.VBox):
 
22
class TreeView(gtk.ScrolledWindow):
27
23
 
28
24
    __gproperties__ = {
29
25
        'branch': (gobject.TYPE_PYOBJECT,
53
49
                    gobject.PARAM_READABLE),
54
50
 
55
51
        'revno-column-visible': (gobject.TYPE_BOOLEAN,
56
 
                                 'Revision number column',
 
52
                                 'Revision number',
57
53
                                 'Show revision number column',
58
54
                                 True,
59
55
                                 gobject.PARAM_READWRITE),
60
56
 
61
 
        'graph-column-visible': (gobject.TYPE_BOOLEAN,
62
 
                                 'Graph column',
63
 
                                 'Show graph column',
64
 
                                 True,
65
 
                                 gobject.PARAM_READWRITE),
66
 
 
67
57
        'date-column-visible': (gobject.TYPE_BOOLEAN,
68
58
                                 'Date',
69
59
                                 'Show date column',
70
60
                                 False,
71
 
                                 gobject.PARAM_READWRITE),
72
 
 
73
 
        'compact': (gobject.TYPE_BOOLEAN,
74
 
                    'Compact view',
75
 
                    'Break ancestry lines to save space',
76
 
                    True,
77
 
                    gobject.PARAM_CONSTRUCT | gobject.PARAM_READWRITE),
78
 
 
79
 
        'mainline-only': (gobject.TYPE_BOOLEAN,
80
 
                    'Mainline only',
81
 
                    'Only show the mainline history.',
82
 
                    False,
83
 
                    gobject.PARAM_CONSTRUCT | gobject.PARAM_READWRITE),
 
61
                                 gobject.PARAM_READWRITE)
84
62
 
85
63
    }
86
64
 
87
65
    __gsignals__ = {
 
66
        'revisions-loaded': (gobject.SIGNAL_RUN_FIRST, 
 
67
                             gobject.TYPE_NONE,
 
68
                             ()),
88
69
        'revision-selected': (gobject.SIGNAL_RUN_FIRST,
89
70
                              gobject.TYPE_NONE,
90
 
                              ()),
91
 
        'revision-activated': (gobject.SIGNAL_RUN_FIRST,
92
 
                              gobject.TYPE_NONE,
93
 
                              (gobject.TYPE_PYOBJECT, gobject.TYPE_PYOBJECT)),
94
 
        'tag-added': (gobject.SIGNAL_RUN_FIRST,
95
 
                              gobject.TYPE_NONE,
96
 
                              (gobject.TYPE_STRING, gobject.TYPE_STRING))
 
71
                              ())
97
72
    }
98
73
 
99
 
    def __init__(self, branch, start, maxnum, compact=True):
 
74
    def __init__(self, branch, start, maxnum, broken_line_length=None):
100
75
        """Create a new TreeView.
101
76
 
102
77
        :param branch: Branch object for branch to show.
106
81
        :param broken_line_length: After how much lines to break 
107
82
                                   branches.
108
83
        """
109
 
        gtk.VBox.__init__(self, spacing=0)
110
 
 
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)
114
 
 
115
 
        self.scrolled_window = gtk.ScrolledWindow()
116
 
        self.scrolled_window.set_policy(gtk.POLICY_AUTOMATIC,
117
 
                                        gtk.POLICY_AUTOMATIC)
118
 
        self.scrolled_window.set_shadow_type(gtk.SHADOW_IN)
119
 
        self.scrolled_window.show()
120
 
        self.pack_start(self.scrolled_window, expand=True, fill=True)
121
 
 
122
 
        self.scrolled_window.add(self.construct_treeview())
123
 
 
124
 
        self.iter = None
 
84
        gtk.ScrolledWindow.__init__(self)
 
85
 
 
86
        self.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
 
87
        self.set_shadow_type(gtk.SHADOW_IN)
 
88
 
 
89
        self.construct_treeview()
 
90
 
 
91
        self.iter   = None
125
92
        self.branch = branch
126
 
        self.revision = None
127
 
 
128
 
        self.start = start
129
 
        self.maxnum = maxnum
130
 
        self.compact = compact
131
 
 
132
 
        gobject.idle_add(self.populate)
 
93
 
 
94
        gobject.idle_add(self.populate, start, maxnum, 
 
95
                         broken_line_length)
133
96
 
134
97
        self.connect("destroy", lambda x: self.branch.unlock())
135
98
 
136
99
    def do_get_property(self, property):
137
100
        if property.name == 'revno-column-visible':
138
101
            return self.revno_column.get_visible()
139
 
        elif property.name == 'graph-column-visible':
140
 
            return self.graph_column.get_visible()
141
102
        elif property.name == 'date-column-visible':
142
103
            return self.date_column.get_visible()
143
 
        elif property.name == 'compact':
144
 
            return self.compact
145
 
        elif property.name == 'mainline-only':
146
 
            return self.mainline_only
147
104
        elif property.name == 'branch':
148
105
            return self.branch
149
106
        elif property.name == 'revision':
160
117
    def do_set_property(self, property, value):
161
118
        if property.name == 'revno-column-visible':
162
119
            self.revno_column.set_visible(value)
163
 
        elif property.name == 'graph-column-visible':
164
 
            self.graph_column.set_visible(value)
165
120
        elif property.name == 'date-column-visible':
166
121
            self.date_column.set_visible(value)
167
 
        elif property.name == 'compact':
168
 
            self.compact = value
169
 
        elif property.name == 'mainline-only':
170
 
            self.mainline_only = value
171
122
        elif property.name == 'branch':
172
123
            self.branch = value
173
124
        elif property.name == 'revision':
203
154
        :return: list of revision ids.
204
155
        """
205
156
        return self.get_property('parents')
206
 
 
207
 
    def add_tag(self, tag, revid=None):
208
 
        if revid is None: revid = self.revision.revision_id
209
 
 
210
 
        try:
211
 
            self.branch.unlock()
212
 
 
213
 
            try:
214
 
                self.branch.lock_write()
215
 
                self.model.add_tag(tag, revid)
216
 
            finally:
217
 
                self.branch.unlock()
218
 
 
219
 
        finally:
220
 
            self.branch.lock_read()
221
 
 
222
 
        self.emit('tag-added', tag, revid)
223
157
        
224
 
    def refresh(self):
225
 
        gobject.idle_add(self.populate, self.get_revision())
226
 
 
227
 
    def update(self):
228
 
        try:
229
 
            self.branch.unlock()
230
 
            try:
231
 
                self.branch.lock_write()
232
 
                self.branch.update()
233
 
            finally:
234
 
                self.branch.unlock()
235
 
        finally:
236
 
            self.branch.lock_read()
237
 
 
238
158
    def back(self):
239
159
        """Signal handler for the Back button."""
240
160
        parents = self.get_parents()
265
185
        else:
266
186
            self.set_revision_id(children[0])
267
187
 
268
 
    def populate(self, revision=None):
 
188
    def populate(self, start, maxnum, broken_line_length=None):
269
189
        """Fill the treeview with contents.
270
190
 
271
191
        :param start: Revision id of revision to start with.
274
194
        :param broken_line_length: After how much lines branches \
275
195
                       should be broken.
276
196
        """
277
 
 
278
 
        self.progress_bar = ui.ui_factory.nested_progress_bar()
279
 
        self.progress_bar.update(msg="Loading ancestry graph", total_cnt=5)
280
 
 
281
 
        try:
282
 
            if self.compact:
283
 
                broken_line_length = 32
284
 
            else:
285
 
                broken_line_length = None
286
 
            
287
 
            show_graph = self.graph_column.get_visible()
288
 
 
289
 
            self.branch.lock_read()
290
 
            (linegraphdata, index, columns_len) = linegraph(self.branch.repository.get_graph(),
291
 
                                                            self.start,
292
 
                                                            self.maxnum, 
293
 
                                                            broken_line_length,
294
 
                                                            show_graph,
295
 
                                                            self.mainline_only,
296
 
                                                            self.progress_bar)
297
 
 
298
 
            self.model = TreeModel(self.branch, linegraphdata)
299
 
            self.graph_cell.columns_len = columns_len
300
 
            width = self.graph_cell.get_size(self.treeview)[2]
301
 
            if width > 500:
302
 
                width = 500
303
 
            self.graph_column.set_fixed_width(width)
304
 
            self.graph_column.set_max_width(width)
305
 
            self.index = index
306
 
            self.treeview.set_model(self.model)
307
 
 
308
 
            if not revision or revision == NULL_REVISION:
309
 
                self.treeview.set_cursor(0)
310
 
            else:
311
 
                self.set_revision(revision)
312
 
 
313
 
            return False
314
 
        finally:
315
 
            self.progress_bar.finished()
 
197
        self.branch.lock_read()
 
198
        (linegraphdata, index, columns_len) = linegraph(self.branch.repository,
 
199
                                                        start,
 
200
                                                        maxnum, 
 
201
                                                        broken_line_length)
 
202
 
 
203
        self.model = TreeModel(self.branch.repository, linegraphdata)
 
204
        self.graph_cell.columns_len = columns_len
 
205
        width = self.graph_cell.get_size(self.treeview)[2]
 
206
        self.graph_column.set_fixed_width(width)
 
207
        self.graph_column.set_max_width(width)
 
208
        self.index = index
 
209
        self.treeview.set_model(self.model)
 
210
        self.treeview.set_cursor(0)
 
211
        self.emit('revisions-loaded')
 
212
 
 
213
        return False
 
214
 
 
215
    def show_diff(self, revid=None, parentid=None):
 
216
        """Open a new window to show a diff between the given revisions."""
 
217
        from bzrlib.plugins.gtk.diff import DiffWindow
 
218
        window = DiffWindow(parent=self)
 
219
 
 
220
        parents = self.get_parents()
 
221
 
 
222
        if revid is None:
 
223
            revid = self.get_revision().revision_id
 
224
 
 
225
            if parentid is None and len(parents) > 0:
 
226
                parentid = parents[0]
 
227
 
 
228
        if parentid is None:
 
229
            parentid = NULL_REVISION
 
230
 
 
231
        rev_tree    = self.branch.repository.revision_tree(revid)
 
232
        parent_tree = self.branch.repository.revision_tree(parentid)
 
233
 
 
234
        description = revid + " - " + self.branch.nick
 
235
        window.set_diff(description, rev_tree, parent_tree)
 
236
        window.show()
316
237
 
317
238
    def construct_treeview(self):
318
239
        self.treeview = gtk.TreeView()
336
257
 
337
258
        self.treeview.set_property('fixed-height-mode', True)
338
259
 
 
260
        self.add(self.treeview)
339
261
        self.treeview.show()
340
262
 
341
263
        cell = gtk.CellRendererText()
342
264
        cell.set_property("width-chars", 15)
343
265
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
344
266
        self.revno_column = gtk.TreeViewColumn("Revision No")
345
 
        self.revno_column.set_resizable(False)
 
267
        self.revno_column.set_resizable(True)
346
268
        self.revno_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
347
269
        self.revno_column.set_fixed_width(cell.get_size(self.treeview)[2])
348
270
        self.revno_column.pack_start(cell, expand=True)
351
273
 
352
274
        self.graph_cell = CellRendererGraph()
353
275
        self.graph_column = gtk.TreeViewColumn()
354
 
        self.graph_column.set_resizable(False)
 
276
        self.graph_column.set_resizable(True)
355
277
        self.graph_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
356
 
        self.graph_column.pack_start(self.graph_cell, expand=True)
 
278
        self.graph_column.pack_start(self.graph_cell, expand=False)
357
279
        self.graph_column.add_attribute(self.graph_cell, "node", treemodel.NODE)
358
 
        self.graph_column.add_attribute(self.graph_cell, "tags", treemodel.TAGS)
359
280
        self.graph_column.add_attribute(self.graph_cell, "in-lines", treemodel.LAST_LINES)
360
281
        self.graph_column.add_attribute(self.graph_cell, "out-lines", treemodel.LINES)
361
282
        self.treeview.append_column(self.graph_column)
363
284
        cell = gtk.CellRendererText()
364
285
        cell.set_property("width-chars", 65)
365
286
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
366
 
        self.summary_column = gtk.TreeViewColumn("Summary")
367
 
        self.summary_column.set_resizable(False)
368
 
        self.summary_column.set_expand(True)
369
 
        self.summary_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
370
 
        self.summary_column.set_fixed_width(cell.get_size(self.treeview)[2])
371
 
        self.summary_column.pack_start(cell, expand=True)
372
 
        self.summary_column.add_attribute(cell, "markup", treemodel.SUMMARY)
373
 
        self.treeview.append_column(self.summary_column)
 
287
        self.msg_column = gtk.TreeViewColumn("Message")
 
288
        self.msg_column.set_resizable(True)
 
289
        self.msg_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
 
290
        self.msg_column.set_fixed_width(cell.get_size(self.treeview)[2])
 
291
        self.msg_column.pack_start(cell, expand=True)
 
292
        self.msg_column.add_attribute(cell, "text", treemodel.MESSAGE)
 
293
        self.treeview.append_column(self.msg_column)
374
294
 
375
295
        cell = gtk.CellRendererText()
376
296
        cell.set_property("width-chars", 15)
377
297
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
378
298
        self.committer_column = gtk.TreeViewColumn("Committer")
379
 
        self.committer_column.set_resizable(False)
 
299
        self.committer_column.set_resizable(True)
380
300
        self.committer_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
381
 
        self.committer_column.set_fixed_width(200)
 
301
        self.committer_column.set_fixed_width(cell.get_size(self.treeview)[2])
382
302
        self.committer_column.pack_start(cell, expand=True)
383
 
        self.committer_column.add_attribute(cell, "text", treemodel.COMMITTER)
 
303
        self.committer_column.add_attribute(cell, "text", treemodel.COMMITER)
384
304
        self.treeview.append_column(self.committer_column)
385
305
 
386
306
        cell = gtk.CellRendererText()
388
308
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
389
309
        self.date_column = gtk.TreeViewColumn("Date")
390
310
        self.date_column.set_visible(False)
391
 
        self.date_column.set_resizable(False)
 
311
        self.date_column.set_resizable(True)
392
312
        self.date_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
393
 
        self.date_column.set_fixed_width(130)
 
313
        self.date_column.set_fixed_width(cell.get_size(self.treeview)[2])
394
314
        self.date_column.pack_start(cell, expand=True)
395
315
        self.date_column.add_attribute(cell, "text", treemodel.TIMESTAMP)
396
316
        self.treeview.append_column(self.date_column)
397
 
        
398
 
        return self.treeview
399
 
    
 
317
 
400
318
    def _on_selection_changed(self, treeview):
401
319
        """callback for when the treeview changes."""
402
320
        (path, focus) = treeview.get_cursor()
410
328
            menu = RevisionPopupMenu(self.branch.repository, 
411
329
                [self.get_revision().revision_id],
412
330
                self.branch)
413
 
            menu.connect('tag-added', lambda w, t, r: self.add_tag(t, r))
414
331
            menu.popup(None, None, None, event.button, event.get_time())
415
332
 
416
333
    def _on_revision_activated(self, widget, path, col):
417
 
        self.emit('revision-activated', path, col)
 
334
        # TODO: more than one parent
 
335
        """Callback for when a treeview row gets activated."""
 
336
        revision_id = self.model[path][treemodel.REVID]
 
337
        parents = self.model[path][treemodel.PARENTS]
 
338
 
 
339
        if len(parents) == 0:
 
340
            parent_id = None
 
341
        else:
 
342
            parent_id = parents[0]
 
343
 
 
344
        self.show_diff(revision_id, parent_id)
 
345
        self.treeview.grab_focus()