/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-07 14:19:09 UTC
  • mfrom: (330.3.5 trunk)
  • Revision ID: daniel.schierbeck@gmail.com-20071107141909-3zxf7nw5laldvfxi
Merged with mainline.

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
 
from gi.repository import Gtk
10
 
from gi.repository import GObject
11
 
from gi.repository import Pango
 
9
import sys
 
10
import string
 
11
import gtk
 
12
import gobject
 
13
import pango
 
14
import re
 
15
import treemodel
12
16
 
13
 
from bzrlib import ui
 
17
from linegraph import linegraph, same_branch
 
18
from graphcell import CellRendererGraph
 
19
from treemodel import TreeModel
14
20
from bzrlib.revision import NULL_REVISION
15
21
 
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
 
class TreeView(Gtk.VBox):
 
22
class TreeView(gtk.ScrolledWindow):
24
23
 
25
24
    __gproperties__ = {
26
 
        'branch': (GObject.TYPE_PYOBJECT,
 
25
        'branch': (gobject.TYPE_PYOBJECT,
27
26
                   'Branch',
28
27
                   'The Bazaar branch being visualized',
29
 
                   GObject.PARAM_CONSTRUCT_ONLY | GObject.PARAM_WRITABLE),
 
28
                   gobject.PARAM_CONSTRUCT_ONLY | gobject.PARAM_WRITABLE),
30
29
 
31
 
        'revision': (GObject.TYPE_PYOBJECT,
 
30
        'revision': (gobject.TYPE_PYOBJECT,
32
31
                     'Revision',
33
32
                     'The currently selected revision',
34
 
                     GObject.PARAM_READWRITE),
35
 
 
36
 
        'revision-number': (GObject.TYPE_STRING,
37
 
                            'Revision number',
38
 
                            'The number of the selected revision',
39
 
                            '',
40
 
                            GObject.PARAM_READABLE),
41
 
 
42
 
        'children': (GObject.TYPE_PYOBJECT,
43
 
                     'Child revisions',
44
 
                     'Children of the currently selected revision',
45
 
                     GObject.PARAM_READABLE),
46
 
 
47
 
        'parents': (GObject.TYPE_PYOBJECT,
48
 
                    'Parent revisions',
49
 
                    'Parents to the currently selected revision',
50
 
                    GObject.PARAM_READABLE),
51
 
 
52
 
        'revno-column-visible': (GObject.TYPE_BOOLEAN,
53
 
                                 'Revision number column',
 
33
                     gobject.PARAM_READWRITE),
 
34
 
 
35
        'revno-column-visible': (gobject.TYPE_BOOLEAN,
 
36
                                 'Revision number',
54
37
                                 'Show revision number column',
55
38
                                 True,
56
 
                                 GObject.PARAM_READWRITE),
57
 
 
58
 
        'graph-column-visible': (GObject.TYPE_BOOLEAN,
59
 
                                 'Graph column',
60
 
                                 'Show graph column',
61
 
                                 True,
62
 
                                 GObject.PARAM_READWRITE),
63
 
 
64
 
        'date-column-visible': (GObject.TYPE_BOOLEAN,
 
39
                                 gobject.PARAM_READWRITE),
 
40
 
 
41
        'date-column-visible': (gobject.TYPE_BOOLEAN,
65
42
                                 'Date',
66
43
                                 'Show date column',
67
44
                                 False,
68
 
                                 GObject.PARAM_READWRITE),
69
 
 
70
 
        'compact': (GObject.TYPE_BOOLEAN,
71
 
                    'Compact view',
72
 
                    'Break ancestry lines to save space',
73
 
                    True,
74
 
                    GObject.PARAM_CONSTRUCT | GObject.PARAM_READWRITE),
75
 
 
76
 
        'mainline-only': (GObject.TYPE_BOOLEAN,
77
 
                    'Mainline only',
78
 
                    'Only show the mainline history.',
79
 
                    False,
80
 
                    GObject.PARAM_CONSTRUCT | GObject.PARAM_READWRITE),
 
45
                                 gobject.PARAM_READWRITE)
81
46
 
82
47
    }
83
48
 
84
49
    __gsignals__ = {
85
 
        'revision-selected': (GObject.SignalFlags.RUN_FIRST,
86
 
                              None,
87
 
                              ()),
88
 
        'revision-activated': (GObject.SignalFlags.RUN_FIRST,
89
 
                              None,
90
 
                              (GObject.TYPE_PYOBJECT, GObject.TYPE_PYOBJECT)),
91
 
        'tag-added': (GObject.SignalFlags.RUN_FIRST,
92
 
                              None,
93
 
                              (GObject.TYPE_STRING, GObject.TYPE_STRING)),
94
 
        'refreshed': (GObject.SignalFlags.RUN_FIRST, None,
 
50
        'revisions-loaded': (gobject.SIGNAL_RUN_FIRST, 
 
51
                             gobject.TYPE_NONE,
 
52
                             ()),
 
53
        'revision-selected': (gobject.SIGNAL_RUN_FIRST,
 
54
                              gobject.TYPE_NONE,
95
55
                              ())
96
56
    }
97
57
 
98
 
    def __init__(self, branch, start, maxnum, compact=True):
 
58
    def __init__(self, branch, start, maxnum, broken_line_length=None):
99
59
        """Create a new TreeView.
100
60
 
101
61
        :param branch: Branch object for branch to show.
105
65
        :param broken_line_length: After how much lines to break 
106
66
                                   branches.
107
67
        """
108
 
        super(TreeView, self).__init__(homogeneous=False, spacing=0)
109
 
 
110
 
        self.progress_widget = ProgressPanel()
111
 
        self.pack_start(self.progress_widget, False, True, 0)
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
 
        self.scrolled_window = Gtk.ScrolledWindow()
117
 
        self.scrolled_window.set_policy(Gtk.PolicyType.AUTOMATIC,
118
 
                                        Gtk.PolicyType.AUTOMATIC)
119
 
        self.scrolled_window.set_shadow_type(Gtk.ShadowType.IN)
120
 
        self.scrolled_window.show()
121
 
        self.pack_start(self.scrolled_window, True, True, 0)
122
 
 
123
 
        self.scrolled_window.add(self.construct_treeview())
124
 
 
125
 
        self.path = None
 
68
        gtk.ScrolledWindow.__init__(self)
 
69
 
 
70
        self.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
 
71
        self.set_shadow_type(gtk.SHADOW_IN)
 
72
 
 
73
        self.construct_treeview()
 
74
 
126
75
        self.branch = branch
 
76
 
 
77
        gobject.idle_add(self.populate, start, maxnum, 
 
78
                         broken_line_length)
 
79
 
127
80
        self.revision = None
128
 
        self.index = {}
129
 
 
130
 
        self.start = start
131
 
        self.maxnum = maxnum
132
 
        self.compact = compact
133
 
 
134
 
        self.model = treemodel.BranchTreeModel(self.branch, [])
135
 
        GObject.idle_add(self.populate)
136
 
 
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)
 
81
        self.children = None
 
82
        self.parents  = None
144
83
 
145
84
    def do_get_property(self, property):
146
85
        if property.name == 'revno-column-visible':
147
86
            return self.revno_column.get_visible()
148
 
        elif property.name == 'graph-column-visible':
149
 
            return self.graph_column.get_visible()
150
87
        elif property.name == 'date-column-visible':
151
88
            return self.date_column.get_visible()
152
 
        elif property.name == 'compact':
153
 
            return self.compact
154
 
        elif property.name == 'mainline-only':
155
 
            return self.mainline_only
156
89
        elif property.name == 'branch':
157
90
            return self.branch
158
91
        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)
163
 
        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)
168
 
        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)
173
 
        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)
 
92
            return self.revision
178
93
        else:
179
94
            raise AttributeError, 'unknown property %s' % property.name
180
95
 
181
96
    def do_set_property(self, property, value):
182
97
        if property.name == 'revno-column-visible':
183
98
            self.revno_column.set_visible(value)
184
 
        elif property.name == 'graph-column-visible':
185
 
            self.graph_column.set_visible(value)
186
99
        elif property.name == 'date-column-visible':
187
100
            self.date_column.set_visible(value)
188
 
        elif property.name == 'compact':
189
 
            self.compact = value
190
 
        elif property.name == 'mainline-only':
191
 
            self.mainline_only = value
192
101
        elif property.name == 'branch':
193
102
            self.branch = value
194
103
        elif property.name == 'revision':
198
107
 
199
108
    def get_revision(self):
200
109
        """Return revision id of currently selected revision, or None."""
201
 
        return self.get_property('revision')
202
 
 
203
 
    def has_revision_id(self, revision_id):
204
 
        return (revision_id in self.index)
205
 
 
206
 
    def set_revision(self, revision):
207
 
        self.set_property('revision', revision)
 
110
        return self.revision
208
111
 
209
112
    def set_revision_id(self, revid):
210
113
        """Change the currently selected revision.
211
114
 
212
115
        :param revid: Revision id of revision to display.
213
116
        """
214
 
        self.treeview.set_cursor(
215
 
            Gtk.TreePath(path=self.index[revid]), None, False)
 
117
        self.treeview.set_cursor(self.index[revid])
216
118
        self.treeview.grab_focus()
217
119
 
218
120
    def get_children(self):
220
122
 
221
123
        :return: list of revision ids.
222
124
        """
223
 
        return self.get_property('children')
 
125
        return self.children
224
126
 
225
127
    def get_parents(self):
226
128
        """Return the parents of the currently selected revision.
227
129
 
228
130
        :return: list of revision ids.
229
131
        """
230
 
        return self.get_property('parents')
231
 
 
232
 
    def add_tag(self, tag, revid=None):
233
 
        if revid is None: revid = self.revision.revision_id
234
 
 
235
 
        if lock.release(self.branch):
236
 
            try:
237
 
                lock.acquire(self.branch, lock.WRITE)
238
 
                self.model.add_tag(tag, revid)
239
 
            finally:
240
 
                lock.release(self.branch)
241
 
 
242
 
            lock.acquire(self.branch, lock.READ)
243
 
 
244
 
            self.emit('tag-added', tag, revid)
245
 
 
246
 
    def refresh(self):
247
 
        GObject.idle_add(self.populate, self.get_revision())
248
 
 
249
 
    def update(self):
250
 
        try:
251
 
            self.branch.unlock()
252
 
            try:
253
 
                self.branch.lock_write()
254
 
                self.branch.update()
255
 
            finally:
256
 
                self.branch.unlock()
257
 
        finally:
258
 
            self.branch.lock_read()
259
 
 
 
132
        return self.parents
 
133
        
260
134
    def back(self):
261
135
        """Signal handler for the Back button."""
262
 
        parents = self.get_parents()
263
 
        if not parents:
 
136
        (path, col) = self.treeview.get_cursor()
 
137
        revision = self.model[path][treemodel.REVISION]
 
138
        parents = self.model[path][treemodel.PARENTS]
 
139
        if not len(parents):
264
140
            return
265
141
 
266
142
        for parent_id in parents:
267
143
            parent_index = self.index[parent_id]
268
144
            parent = self.model[parent_index][treemodel.REVISION]
269
 
            if same_branch(self.get_revision(), parent):
270
 
                self.set_revision(parent)
 
145
            if same_branch(revision, parent):
 
146
                self.treeview.set_cursor(parent_index)
271
147
                break
272
148
        else:
273
 
            self.set_revision_id(parents[0])
 
149
            self.treeview.set_cursor(self.index[parents[0]])
 
150
        self.treeview.grab_focus()
274
151
 
275
152
    def forward(self):
276
153
        """Signal handler for the Forward button."""
277
 
        children = self.get_children()
278
 
        if not children:
 
154
        (path, col) = self.treeview.get_cursor()
 
155
        revision = self.model[path][treemodel.REVISION]
 
156
        children = self.model[path][treemodel.CHILDREN]
 
157
        if not len(children):
279
158
            return
280
159
 
281
160
        for child_id in children:
282
161
            child_index = self.index[child_id]
283
162
            child = self.model[child_index][treemodel.REVISION]
284
 
            if same_branch(child, self.get_revision()):
285
 
                self.set_revision(child)
 
163
            if same_branch(child, revision):
 
164
                self.treeview.set_cursor(child_index)
286
165
                break
287
166
        else:
288
 
            self.set_revision_id(children[0])
 
167
            self.treeview.set_cursor(self.index[children[0]])
 
168
        self.treeview.grab_focus()
289
169
 
290
 
    def populate(self, revision=None):
 
170
    def populate(self, start, maxnum, broken_line_length=None):
291
171
        """Fill the treeview with contents.
292
172
 
293
173
        :param start: Revision id of revision to start with.
296
176
        :param broken_line_length: After how much lines branches \
297
177
                       should be broken.
298
178
        """
299
 
 
300
 
        if getattr(ui.ui_factory, "set_progress_bar_widget", None) is not None:
301
 
            # We'are using our own ui, let's tell it to use our widget.
302
 
            ui.ui_factory.set_progress_bar_widget(self.progress_widget)
303
 
        self.progress_bar = ui.ui_factory.nested_progress_bar()
304
 
        self.progress_bar.update("Loading ancestry graph", 0, 5)
305
 
 
306
179
        try:
307
 
            if self.compact:
308
 
                broken_line_length = 32
309
 
            else:
310
 
                broken_line_length = None
311
 
 
312
 
            show_graph = self.graph_column.get_visible()
313
 
 
314
180
            self.branch.lock_read()
315
 
            (linegraphdata, index, columns_len) = linegraph(
316
 
                self.branch.repository.get_graph(),
317
 
                self.start,
318
 
                self.maxnum, 
319
 
                broken_line_length,
320
 
                show_graph,
321
 
                self.mainline_only,
322
 
                self.progress_bar)
 
181
            (linegraphdata, index, columns_len) = linegraph(self.branch.repository,
 
182
                                                            start,
 
183
                                                            maxnum, 
 
184
                                                            broken_line_length)
323
185
 
324
 
            self.model.set_line_graph_data(linegraphdata)
 
186
            self.model = TreeModel(self.branch.repository, linegraphdata)
325
187
            self.graph_cell.columns_len = columns_len
326
 
            width = self.graph_cell.get_preferred_width(self.treeview)[1]
327
 
            if width > 500:
328
 
                width = 500
329
 
            elif width == 0:
330
 
                # The get_preferred_width() call got an insane value.
331
 
                width = 200
 
188
            width = self.graph_cell.get_size(self.treeview)[2]
332
189
            self.graph_column.set_fixed_width(width)
333
190
            self.graph_column.set_max_width(width)
334
191
            self.index = index
335
192
            self.treeview.set_model(self.model)
336
 
 
337
 
            if not revision or revision == NULL_REVISION:
338
 
                self.treeview.set_cursor(Gtk.TreePath(path=0), None, False)
339
 
            else:
340
 
                self.set_revision(revision)
341
 
 
342
 
            self.emit('refreshed')
343
 
            return False
 
193
            self.treeview.set_cursor(0)
 
194
            self.emit('revisions-loaded')
 
195
 
344
196
        finally:
345
 
            self.progress_bar.finished()
 
197
            self.branch.unlock()
 
198
 
 
199
        return False
 
200
 
 
201
    def show_diff(self, revid=None, parentid=None):
 
202
        """Open a new window to show a diff between the given revisions."""
 
203
        from bzrlib.plugins.gtk.diff import DiffWindow
 
204
        window = DiffWindow(parent=self)
 
205
 
 
206
        if revid is None:
 
207
            revid = self.revision.revision_id
 
208
 
 
209
            if parentid is None and len(self.parents) > 0:
 
210
                parentid = self.parents[0]
 
211
 
 
212
        if parentid is None:
 
213
            parentid = NULL_REVISION
 
214
 
 
215
        rev_tree    = self.branch.repository.revision_tree(revid)
 
216
        parent_tree = self.branch.repository.revision_tree(parentid)
 
217
 
 
218
        description = revid + " - " + self.branch.nick
 
219
        window.set_diff(description, rev_tree, parent_tree)
 
220
        window.show()
346
221
 
347
222
    def construct_treeview(self):
348
 
        self.treeview = Gtk.TreeView()
 
223
        self.treeview = gtk.TreeView()
349
224
 
350
225
        self.treeview.set_rules_hint(True)
351
 
        # combined revno/summary interactive search
352
 
        #
353
 
        # the row in a treemodel is considered "matched" if a REVNO *starts*
354
 
        # from the key (that is the key is found in a REVNO at the offset 0)
355
 
        # or if a MESSAGE *contains* the key anywhere (that is, the key is
356
 
        # found case insensitively in a MESSAGE at any offset)
357
 
        def search_equal_func(model, column, key, iter, ignored):
358
 
            return (model.get_value(iter, treemodel.REVNO).find(key) != 0
359
 
                and model.get_value(iter, treemodel.MESSAGE).lower().find(key.lower()) == -1)
360
 
 
361
 
        self.treeview.set_search_equal_func(search_equal_func, None)
362
 
        self.treeview.set_enable_search(True)
363
 
 
364
 
        self.treeview.set_tooltip_column(treemodel.MESSAGE)
365
 
        self.treeview.set_headers_visible(True)
366
 
 
367
 
        self._prev_cursor_path = None
368
 
        self.treeview.connect("cursor-changed",
 
226
        self.treeview.set_search_column(treemodel.REVNO)
 
227
        
 
228
        # Fix old PyGTK bug - by JAM
 
229
        set_tooltip = getattr(self.treeview, 'set_tooltip_column', None)
 
230
        if set_tooltip is not None:
 
231
            set_tooltip(treemodel.MESSAGE)
 
232
 
 
233
        self.treeview.get_selection().connect("changed",
369
234
                self._on_selection_changed)
370
235
 
371
236
        self.treeview.connect("row-activated", 
376
241
 
377
242
        self.treeview.set_property('fixed-height-mode', True)
378
243
 
 
244
        self.add(self.treeview)
379
245
        self.treeview.show()
380
246
 
381
 
        cell = Gtk.CellRendererText()
 
247
        cell = gtk.CellRendererText()
382
248
        cell.set_property("width-chars", 15)
383
 
        cell.set_property("ellipsize", Pango.EllipsizeMode.END)
384
 
        self.revno_column = Gtk.TreeViewColumn("Revision No")
 
249
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
 
250
        self.revno_column = gtk.TreeViewColumn("Revision No")
385
251
        self.revno_column.set_resizable(True)
386
 
        self.revno_column.set_sizing(Gtk.TreeViewColumnSizing.FIXED)
387
 
        self.revno_column.set_fixed_width(
388
 
            cell.get_preferred_width(self.treeview)[1])
389
 
        self.revno_column.pack_start(cell, True)
 
252
        self.revno_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
 
253
        self.revno_column.set_fixed_width(cell.get_size(self.treeview)[2])
 
254
        self.revno_column.pack_start(cell, expand=True)
390
255
        self.revno_column.add_attribute(cell, "text", treemodel.REVNO)
391
256
        self.treeview.append_column(self.revno_column)
392
257
 
393
258
        self.graph_cell = CellRendererGraph()
394
 
        self.graph_column = Gtk.TreeViewColumn()
 
259
        self.graph_column = gtk.TreeViewColumn()
395
260
        self.graph_column.set_resizable(True)
396
 
        self.graph_column.set_sizing(Gtk.TreeViewColumnSizing.FIXED)
397
 
        self.graph_column.pack_start(self.graph_cell, True)
398
 
        self.graph_column.add_attribute(
399
 
            self.graph_cell, "node", treemodel.NODE)
400
 
        self.graph_column.add_attribute(
401
 
            self.graph_cell, "tags", treemodel.TAGS)
402
 
        self.graph_column.add_attribute(
403
 
            self.graph_cell, "in-lines", treemodel.LAST_LINES)
404
 
        self.graph_column.add_attribute(
405
 
            self.graph_cell, "out-lines", treemodel.LINES)
 
261
        self.graph_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
 
262
        self.graph_column.pack_start(self.graph_cell, expand=False)
 
263
        self.graph_column.add_attribute(self.graph_cell, "node", treemodel.NODE)
 
264
        self.graph_column.add_attribute(self.graph_cell, "in-lines", treemodel.LAST_LINES)
 
265
        self.graph_column.add_attribute(self.graph_cell, "out-lines", treemodel.LINES)
406
266
        self.treeview.append_column(self.graph_column)
407
267
 
408
 
        cell = Gtk.CellRendererText()
 
268
        cell = gtk.CellRendererText()
409
269
        cell.set_property("width-chars", 65)
410
 
        cell.set_property("ellipsize", Pango.EllipsizeMode.END)
411
 
        self.summary_column = Gtk.TreeViewColumn("Summary")
412
 
        self.summary_column.set_resizable(True)
413
 
        self.summary_column.set_expand(True)
414
 
        self.summary_column.set_sizing(Gtk.TreeViewColumnSizing.FIXED)
415
 
        self.summary_column.set_fixed_width(
416
 
            cell.get_preferred_width(self.treeview)[1])
417
 
        self.summary_column.pack_start(cell, True)
418
 
        self.summary_column.add_attribute(cell, "markup", treemodel.SUMMARY)
419
 
        self.treeview.append_column(self.summary_column)
 
270
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
 
271
        self.msg_column = gtk.TreeViewColumn("Message")
 
272
        self.msg_column.set_resizable(True)
 
273
        self.msg_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
 
274
        self.msg_column.set_fixed_width(cell.get_size(self.treeview)[2])
 
275
        self.msg_column.pack_start(cell, expand=True)
 
276
        self.msg_column.add_attribute(cell, "text", treemodel.MESSAGE)
 
277
        self.treeview.append_column(self.msg_column)
420
278
 
421
 
        cell = Gtk.CellRendererText()
 
279
        cell = gtk.CellRendererText()
422
280
        cell.set_property("width-chars", 15)
423
 
        cell.set_property("ellipsize", Pango.EllipsizeMode.END)
424
 
        self.authors_column = Gtk.TreeViewColumn("Author(s)")
425
 
        self.authors_column.set_resizable(False)
426
 
        self.authors_column.set_sizing(Gtk.TreeViewColumnSizing.FIXED)
427
 
        self.authors_column.set_fixed_width(200)
428
 
        self.authors_column.pack_start(cell, True)
429
 
        self.authors_column.add_attribute(cell, "text", treemodel.AUTHORS)
430
 
        self.treeview.append_column(self.authors_column)
 
281
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
 
282
        self.committer_column = gtk.TreeViewColumn("Committer")
 
283
        self.committer_column.set_resizable(True)
 
284
        self.committer_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
 
285
        self.committer_column.set_fixed_width(cell.get_size(self.treeview)[2])
 
286
        self.committer_column.pack_start(cell, expand=True)
 
287
        self.committer_column.add_attribute(cell, "text", treemodel.COMMITER)
 
288
        self.treeview.append_column(self.committer_column)
431
289
 
432
 
        cell = Gtk.CellRendererText()
 
290
        cell = gtk.CellRendererText()
433
291
        cell.set_property("width-chars", 20)
434
 
        cell.set_property("ellipsize", Pango.EllipsizeMode.END)
435
 
        self.date_column = Gtk.TreeViewColumn("Date")
 
292
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
 
293
        self.date_column = gtk.TreeViewColumn("Date")
436
294
        self.date_column.set_visible(False)
437
295
        self.date_column.set_resizable(True)
438
 
        self.date_column.set_sizing(Gtk.TreeViewColumnSizing.FIXED)
439
 
        self.date_column.set_fixed_width(130)
440
 
        self.date_column.pack_start(cell, True)
 
296
        self.date_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
 
297
        self.date_column.set_fixed_width(cell.get_size(self.treeview)[2])
 
298
        self.date_column.pack_start(cell, expand=True)
441
299
        self.date_column.add_attribute(cell, "text", treemodel.TIMESTAMP)
442
300
        self.treeview.append_column(self.date_column)
443
301
 
444
 
        return self.treeview
445
 
 
446
 
    def _on_selection_changed(self, treeview):
 
302
    def _on_selection_changed(self, selection, *args):
447
303
        """callback for when the treeview changes."""
448
 
        (path, focus) = treeview.get_cursor()
449
 
        if (path is not None) and (path != self._prev_cursor_path):
450
 
            self._prev_cursor_path = path # avoid emitting twice per click
451
 
            self.path = path
 
304
        (model, selected_rows) = selection.get_selected_rows()
 
305
        if len(selected_rows) > 0:
 
306
            iter = self.model.get_iter(selected_rows[0])
 
307
            self.revision = self.model.get_value(iter, treemodel.REVISION)
 
308
            self.parents = self.model.get_value(iter, treemodel.PARENTS)
 
309
            self.children = self.model.get_value(iter, treemodel.CHILDREN)
 
310
 
452
311
            self.emit('revision-selected')
453
312
 
454
313
    def _on_revision_selected(self, widget, event):
455
 
        from bzrlib.plugins.gtk.revisionmenu import RevisionMenu
 
314
        from bzrlib.plugins.gtk.revisionmenu import RevisionPopupMenu
456
315
        if event.button == 3:
457
 
            revs = []
458
 
            rev = self.get_revision()
459
 
            if rev is not None:
460
 
                revs.append(rev.revision_id)
461
 
            menu = RevisionMenu(self.branch.repository, revs, self.branch)
462
 
            menu.connect('tag-added', lambda w, t, r: self.add_tag(t, r))
463
 
            menu.popup(None, None, None, None, event.button, event.get_time())
 
316
            menu = RevisionPopupMenu(self.branch.repository, 
 
317
                [self.get_revision().revision_id],
 
318
                self.branch)
 
319
            menu.popup(None, None, None, event.button, event.get_time())
464
320
 
465
321
    def _on_revision_activated(self, widget, path, col):
466
 
        self.emit('revision-activated', path, col)
 
322
        # TODO: more than one parent
 
323
        """Callback for when a treeview row gets activated."""
 
324
        revision_id = self.model[path][treemodel.REVID]
 
325
        parents = self.model[path][treemodel.PARENTS]
 
326
 
 
327
        if len(parents) == 0:
 
328
            parent_id = None
 
329
        else:
 
330
            parent_id = parents[0]
 
331
 
 
332
        self.show_diff(revision_id, parent_id)
 
333
        self.treeview.grab_focus()