/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
 
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),
 
33
                     gobject.PARAM_READWRITE),
35
34
 
36
 
        'revision-number': (GObject.TYPE_STRING,
 
35
        'revision-number': (gobject.TYPE_STRING,
37
36
                            'Revision number',
38
37
                            'The number of the selected revision',
39
38
                            '',
40
 
                            GObject.PARAM_READABLE),
 
39
                            gobject.PARAM_READABLE),
41
40
 
42
 
        'children': (GObject.TYPE_PYOBJECT,
 
41
        'children': (gobject.TYPE_PYOBJECT,
43
42
                     'Child revisions',
44
43
                     'Children of the currently selected revision',
45
 
                     GObject.PARAM_READABLE),
 
44
                     gobject.PARAM_READABLE),
46
45
 
47
 
        'parents': (GObject.TYPE_PYOBJECT,
 
46
        'parents': (gobject.TYPE_PYOBJECT,
48
47
                    'Parent revisions',
49
48
                    'Parents to the currently selected revision',
50
 
                    GObject.PARAM_READABLE),
 
49
                    gobject.PARAM_READABLE),
51
50
 
52
 
        'revno-column-visible': (GObject.TYPE_BOOLEAN,
53
 
                                 'Revision number column',
 
51
        'revno-column-visible': (gobject.TYPE_BOOLEAN,
 
52
                                 'Revision number',
54
53
                                 'Show revision number column',
55
54
                                 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,
 
55
                                 gobject.PARAM_READWRITE),
 
56
 
 
57
        'date-column-visible': (gobject.TYPE_BOOLEAN,
65
58
                                 'Date',
66
59
                                 'Show date column',
67
60
                                 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),
 
61
                                 gobject.PARAM_READWRITE)
81
62
 
82
63
    }
83
64
 
84
65
    __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,
 
66
        'revisions-loaded': (gobject.SIGNAL_RUN_FIRST, 
 
67
                             gobject.TYPE_NONE,
 
68
                             ()),
 
69
        'revision-selected': (gobject.SIGNAL_RUN_FIRST,
 
70
                              gobject.TYPE_NONE,
95
71
                              ())
96
72
    }
97
73
 
98
 
    def __init__(self, branch, start, maxnum, compact=True):
 
74
    def __init__(self, branch, start, maxnum, broken_line_length=None):
99
75
        """Create a new TreeView.
100
76
 
101
77
        :param branch: Branch object for branch to show.
105
81
        :param broken_line_length: After how much lines to break 
106
82
                                   branches.
107
83
        """
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
 
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
126
92
        self.branch = branch
127
 
        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)
 
93
 
 
94
        gobject.idle_add(self.populate, start, maxnum, 
 
95
                         broken_line_length)
 
96
 
 
97
        self.connect("destroy", lambda x: self.branch.unlock())
144
98
 
145
99
    def do_get_property(self, property):
146
100
        if property.name == 'revno-column-visible':
147
101
            return self.revno_column.get_visible()
148
 
        elif property.name == 'graph-column-visible':
149
 
            return self.graph_column.get_visible()
150
102
        elif property.name == 'date-column-visible':
151
103
            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
104
        elif property.name == 'branch':
157
105
            return self.branch
158
106
        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)
 
107
            return self.model.get_value(self.iter, treemodel.REVISION)
163
108
        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)
 
109
            return self.model.get_value(self.iter, treemodel.REVNO)
168
110
        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)
 
111
            return self.model.get_value(self.iter, treemodel.CHILDREN)
173
112
        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)
 
113
            return self.model.get_value(self.iter, treemodel.PARENTS)
178
114
        else:
179
115
            raise AttributeError, 'unknown property %s' % property.name
180
116
 
181
117
    def do_set_property(self, property, value):
182
118
        if property.name == 'revno-column-visible':
183
119
            self.revno_column.set_visible(value)
184
 
        elif property.name == 'graph-column-visible':
185
 
            self.graph_column.set_visible(value)
186
120
        elif property.name == 'date-column-visible':
187
121
            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
122
        elif property.name == 'branch':
193
123
            self.branch = value
194
124
        elif property.name == 'revision':
200
130
        """Return revision id of currently selected revision, or None."""
201
131
        return self.get_property('revision')
202
132
 
203
 
    def has_revision_id(self, revision_id):
204
 
        return (revision_id in self.index)
205
 
 
206
133
    def set_revision(self, revision):
207
134
        self.set_property('revision', revision)
208
135
 
211
138
 
212
139
        :param revid: Revision id of revision to display.
213
140
        """
214
 
        self.treeview.set_cursor(
215
 
            Gtk.TreePath(path=self.index[revid]), None, False)
 
141
        self.treeview.set_cursor(self.index[revid])
216
142
        self.treeview.grab_focus()
217
143
 
218
144
    def get_children(self):
228
154
        :return: list of revision ids.
229
155
        """
230
156
        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
 
 
 
157
        
260
158
    def back(self):
261
159
        """Signal handler for the Back button."""
262
160
        parents = self.get_parents()
263
 
        if not parents:
 
161
        if not len(parents):
264
162
            return
265
163
 
266
164
        for parent_id in parents:
275
173
    def forward(self):
276
174
        """Signal handler for the Forward button."""
277
175
        children = self.get_children()
278
 
        if not children:
 
176
        if not len(children):
279
177
            return
280
178
 
281
179
        for child_id in children:
287
185
        else:
288
186
            self.set_revision_id(children[0])
289
187
 
290
 
    def populate(self, revision=None):
 
188
    def populate(self, start, maxnum, broken_line_length=None):
291
189
        """Fill the treeview with contents.
292
190
 
293
191
        :param start: Revision id of revision to start with.
296
194
        :param broken_line_length: After how much lines branches \
297
195
                       should be broken.
298
196
        """
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
 
        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
 
            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)
323
 
 
324
 
            self.model.set_line_graph_data(linegraphdata)
325
 
            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
332
 
            self.graph_column.set_fixed_width(width)
333
 
            self.graph_column.set_max_width(width)
334
 
            self.index = index
335
 
            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
344
 
        finally:
345
 
            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()
346
237
 
347
238
    def construct_treeview(self):
348
 
        self.treeview = Gtk.TreeView()
 
239
        self.treeview = gtk.TreeView()
349
240
 
350
241
        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
 
242
        self.treeview.set_search_column(treemodel.REVNO)
 
243
        
 
244
        # Fix old PyGTK bug - by JAM
 
245
        set_tooltip = getattr(self.treeview, 'set_tooltip_column', None)
 
246
        if set_tooltip is not None:
 
247
            set_tooltip(treemodel.MESSAGE)
 
248
 
368
249
        self.treeview.connect("cursor-changed",
369
250
                self._on_selection_changed)
370
251
 
376
257
 
377
258
        self.treeview.set_property('fixed-height-mode', True)
378
259
 
 
260
        self.add(self.treeview)
379
261
        self.treeview.show()
380
262
 
381
 
        cell = Gtk.CellRendererText()
 
263
        cell = gtk.CellRendererText()
382
264
        cell.set_property("width-chars", 15)
383
 
        cell.set_property("ellipsize", Pango.EllipsizeMode.END)
384
 
        self.revno_column = Gtk.TreeViewColumn("Revision No")
 
265
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
 
266
        self.revno_column = gtk.TreeViewColumn("Revision No")
385
267
        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)
 
268
        self.revno_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
 
269
        self.revno_column.set_fixed_width(cell.get_size(self.treeview)[2])
 
270
        self.revno_column.pack_start(cell, expand=True)
390
271
        self.revno_column.add_attribute(cell, "text", treemodel.REVNO)
391
272
        self.treeview.append_column(self.revno_column)
392
273
 
393
274
        self.graph_cell = CellRendererGraph()
394
 
        self.graph_column = Gtk.TreeViewColumn()
 
275
        self.graph_column = gtk.TreeViewColumn()
395
276
        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)
 
277
        self.graph_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
 
278
        self.graph_column.pack_start(self.graph_cell, expand=False)
 
279
        self.graph_column.add_attribute(self.graph_cell, "node", treemodel.NODE)
 
280
        self.graph_column.add_attribute(self.graph_cell, "in-lines", treemodel.LAST_LINES)
 
281
        self.graph_column.add_attribute(self.graph_cell, "out-lines", treemodel.LINES)
406
282
        self.treeview.append_column(self.graph_column)
407
283
 
408
 
        cell = Gtk.CellRendererText()
 
284
        cell = gtk.CellRendererText()
409
285
        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)
 
286
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
 
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)
420
294
 
421
 
        cell = Gtk.CellRendererText()
 
295
        cell = gtk.CellRendererText()
422
296
        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)
 
297
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
 
298
        self.committer_column = gtk.TreeViewColumn("Committer")
 
299
        self.committer_column.set_resizable(True)
 
300
        self.committer_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
 
301
        self.committer_column.set_fixed_width(cell.get_size(self.treeview)[2])
 
302
        self.committer_column.pack_start(cell, expand=True)
 
303
        self.committer_column.add_attribute(cell, "text", treemodel.COMMITER)
 
304
        self.treeview.append_column(self.committer_column)
431
305
 
432
 
        cell = Gtk.CellRendererText()
 
306
        cell = gtk.CellRendererText()
433
307
        cell.set_property("width-chars", 20)
434
 
        cell.set_property("ellipsize", Pango.EllipsizeMode.END)
435
 
        self.date_column = Gtk.TreeViewColumn("Date")
 
308
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
 
309
        self.date_column = gtk.TreeViewColumn("Date")
436
310
        self.date_column.set_visible(False)
437
311
        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)
 
312
        self.date_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
 
313
        self.date_column.set_fixed_width(cell.get_size(self.treeview)[2])
 
314
        self.date_column.pack_start(cell, expand=True)
441
315
        self.date_column.add_attribute(cell, "text", treemodel.TIMESTAMP)
442
316
        self.treeview.append_column(self.date_column)
443
317
 
444
 
        return self.treeview
445
 
 
446
318
    def _on_selection_changed(self, treeview):
447
319
        """callback for when the treeview changes."""
448
320
        (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
 
321
        if path is not None:
 
322
            self.iter = self.model.get_iter(path)
452
323
            self.emit('revision-selected')
453
324
 
454
325
    def _on_revision_selected(self, widget, event):
455
 
        from bzrlib.plugins.gtk.revisionmenu import RevisionMenu
 
326
        from bzrlib.plugins.gtk.revisionmenu import RevisionPopupMenu
456
327
        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())
 
328
            menu = RevisionPopupMenu(self.branch.repository, 
 
329
                [self.get_revision().revision_id],
 
330
                self.branch)
 
331
            menu.popup(None, None, None, event.button, event.get_time())
464
332
 
465
333
    def _on_revision_activated(self, widget, path, col):
466
 
        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()