/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/branchwin.py

  • Committer: Daniel Schierbeck
  • Date: 2008-01-23 16:36:21 UTC
  • mto: (423.1.8 trunk)
  • mto: This revision was merged to the branch mainline in revision 429.
  • Revision ID: daniel.schierbeck@gmail.com-20080123163621-x8kublc38ojipnly
Made the revision popup menu correctly add tags.

Show diffs side-by-side

added added

removed removed

Lines of Context:
viz/branchwin.py
13
13
import gobject
14
14
import pango
15
15
 
16
 
from bzrlib.osutils import format_date
17
 
 
18
 
from graph import distances, graph, same_branch
19
 
from graphcell import CellRendererGraph
20
 
 
21
 
 
22
 
class BranchWindow(gtk.Window):
 
16
from bzrlib.plugins.gtk.window import Window
 
17
from bzrlib.plugins.gtk.tags import AddTagDialog
 
18
from bzrlib.plugins.gtk.preferences import PreferencesWindow
 
19
from bzrlib.plugins.gtk.branchview import TreeView
 
20
from bzrlib.revision import Revision
 
21
from bzrlib.config import BranchConfig
 
22
from bzrlib.config import GlobalConfig
 
23
 
 
24
class BranchWindow(Window):
23
25
    """Branch window.
24
26
 
25
27
    This object represents and manages a single window containing information
26
28
    for a particular branch.
27
29
    """
28
30
 
29
 
    def __init__(self):
30
 
        gtk.Window.__init__(self, gtk.WINDOW_TOPLEVEL)
 
31
    def __init__(self, branch, start, maxnum, parent=None):
 
32
        """Create a new BranchWindow.
 
33
 
 
34
        :param branch: Branch object for branch to show.
 
35
        :param start: Revision id of top revision.
 
36
        :param maxnum: Maximum number of revisions to display, 
 
37
                       None for no limit.
 
38
        """
 
39
 
 
40
        Window.__init__(self, parent=parent)
31
41
        self.set_border_width(0)
32
 
        self.set_title("bzrk")
 
42
 
 
43
        self.branch      = branch
 
44
        self.start       = start
 
45
        self.maxnum      = maxnum
 
46
        self.config      = GlobalConfig()
 
47
 
 
48
        if self.config.get_user_option('viz-compact-view') == 'yes':
 
49
            self.compact_view = True
 
50
        else:
 
51
            self.compact_view = False
 
52
 
 
53
        self.set_title(branch.nick + " - revision history")
33
54
 
34
55
        # Use three-quarters of the screen by default
35
56
        screen = self.get_screen()
42
63
        icon = self.render_icon(gtk.STOCK_INDEX, gtk.ICON_SIZE_BUTTON)
43
64
        self.set_icon(icon)
44
65
 
 
66
        gtk.accel_map_add_entry("<viz>/Go/Next Revision", gtk.keysyms.Up, gtk.gdk.MOD1_MASK)
 
67
        gtk.accel_map_add_entry("<viz>/Go/Previous Revision", gtk.keysyms.Down, gtk.gdk.MOD1_MASK)
 
68
 
45
69
        self.accel_group = gtk.AccelGroup()
46
70
        self.add_accel_group(self.accel_group)
47
71
 
 
72
        gtk.Action.set_tool_item_type(gtk.MenuToolButton)
 
73
 
 
74
        self.prev_rev_action = gtk.Action("prev-rev", "_Previous Revision", "Go to the previous revision", gtk.STOCK_GO_DOWN)
 
75
        self.prev_rev_action.set_accel_path("<viz>/Go/Previous Revision")
 
76
        self.prev_rev_action.set_accel_group(self.accel_group)
 
77
        self.prev_rev_action.connect("activate", self._back_clicked_cb)
 
78
        self.prev_rev_action.connect_accelerator()
 
79
 
 
80
        self.next_rev_action = gtk.Action("next-rev", "_Next Revision", "Go to the next revision", gtk.STOCK_GO_UP)
 
81
        self.next_rev_action.set_accel_path("<viz>/Go/Next Revision")
 
82
        self.next_rev_action.set_accel_group(self.accel_group)
 
83
        self.next_rev_action.connect("activate", self._fwd_clicked_cb)
 
84
        self.next_rev_action.connect_accelerator()
 
85
 
48
86
        self.construct()
49
87
 
 
88
    def set_revision(self, revid):
 
89
        self.treeview.set_revision_id(revid)
 
90
 
50
91
    def construct(self):
51
92
        """Construct the window contents."""
52
93
        vbox = gtk.VBox(spacing=0)
53
94
        self.add(vbox)
54
95
 
 
96
        self.paned = gtk.VPaned()
 
97
        self.paned.pack1(self.construct_top(), resize=True, shrink=False)
 
98
        self.paned.pack2(self.construct_bottom(), resize=False, shrink=True)
 
99
        self.paned.show()
 
100
 
 
101
        vbox.pack_start(self.construct_menubar(), expand=False, fill=True)
55
102
        vbox.pack_start(self.construct_navigation(), expand=False, fill=True)
56
 
 
57
 
        paned = gtk.VPaned()
58
 
        paned.pack1(self.construct_top(), resize=True, shrink=False)
59
 
        paned.pack2(self.construct_bottom(), resize=False, shrink=True)
60
 
        paned.show()
61
 
        vbox.pack_start(paned, expand=True, fill=True)
62
 
        vbox.set_focus_child(paned)
 
103
        vbox.pack_start(self.construct_loading_msg(), expand=False, fill=True)
 
104
        
 
105
        vbox.pack_start(self.paned, expand=True, fill=True)
 
106
        vbox.set_focus_child(self.paned)
63
107
 
64
108
        vbox.show()
65
109
 
 
110
    def construct_menubar(self):
 
111
        menubar = gtk.MenuBar()
 
112
 
 
113
        file_menu = gtk.Menu()
 
114
        file_menuitem = gtk.MenuItem("_File")
 
115
        file_menuitem.set_submenu(file_menu)
 
116
 
 
117
        file_menu_close = gtk.ImageMenuItem(gtk.STOCK_CLOSE, self.accel_group)
 
118
        file_menu_close.connect('activate', lambda x: self.destroy())
 
119
        
 
120
        file_menu_quit = gtk.ImageMenuItem(gtk.STOCK_QUIT, self.accel_group)
 
121
        file_menu_quit.connect('activate', lambda x: gtk.main_quit())
 
122
        
 
123
        if self._parent is not None:
 
124
            file_menu.add(file_menu_close)
 
125
        file_menu.add(file_menu_quit)
 
126
 
 
127
        edit_menu = gtk.Menu()
 
128
        edit_menuitem = gtk.MenuItem("_Edit")
 
129
        edit_menuitem.set_submenu(edit_menu)
 
130
 
 
131
        edit_menu_find = gtk.ImageMenuItem(gtk.STOCK_FIND)
 
132
 
 
133
        edit_menu_branchopts = gtk.MenuItem("Branch Settings")
 
134
        edit_menu_branchopts.connect('activate', lambda x: PreferencesWindow(self.branch.get_config()).show())
 
135
 
 
136
        edit_menu_globopts = gtk.MenuItem("Global Settings")
 
137
        edit_menu_globopts.connect('activate', lambda x: PreferencesWindow().show())
 
138
 
 
139
        edit_menu.add(edit_menu_find)
 
140
        edit_menu.add(edit_menu_branchopts)
 
141
        edit_menu.add(edit_menu_globopts)
 
142
 
 
143
        view_menu = gtk.Menu()
 
144
        view_menuitem = gtk.MenuItem("_View")
 
145
        view_menuitem.set_submenu(view_menu)
 
146
 
 
147
        view_menu_toolbar = gtk.CheckMenuItem("Show Toolbar")
 
148
        view_menu_toolbar.set_active(True)
 
149
        view_menu_toolbar.connect('toggled', self._toolbar_visibility_changed)
 
150
 
 
151
        view_menu_compact = gtk.CheckMenuItem("Show Compact Graph")
 
152
        view_menu_compact.set_active(self.compact_view)
 
153
        view_menu_compact.connect('activate', self._brokenlines_toggled_cb)
 
154
 
 
155
        view_menu.add(view_menu_toolbar)
 
156
        view_menu.add(view_menu_compact)
 
157
        view_menu.add(gtk.SeparatorMenuItem())
 
158
 
 
159
        for (label, name) in [("Revision _Number", "revno"), ("_Date", "date")]:
 
160
            col = gtk.CheckMenuItem("Show " + label + " Column")
 
161
            col.set_active(self.treeview.get_property(name + "-column-visible"))
 
162
            col.connect('toggled', self._col_visibility_changed, name)
 
163
            view_menu.add(col)
 
164
 
 
165
        go_menu = gtk.Menu()
 
166
        go_menu.set_accel_group(self.accel_group)
 
167
        go_menuitem = gtk.MenuItem("_Go")
 
168
        go_menuitem.set_submenu(go_menu)
 
169
        
 
170
        go_menu_next = self.next_rev_action.create_menu_item()
 
171
        go_menu_prev = self.prev_rev_action.create_menu_item()
 
172
 
 
173
        self.go_menu_tags = gtk.MenuItem("_Tags")
 
174
        self._update_tags()
 
175
 
 
176
        go_menu.add(go_menu_next)
 
177
        go_menu.add(go_menu_prev)
 
178
        go_menu.add(gtk.SeparatorMenuItem())
 
179
        go_menu.add(self.go_menu_tags)
 
180
 
 
181
        revision_menu = gtk.Menu()
 
182
        revision_menuitem = gtk.MenuItem("_Revision")
 
183
        revision_menuitem.set_submenu(revision_menu)
 
184
 
 
185
        revision_menu_diff = gtk.MenuItem("View Changes")
 
186
        revision_menu_diff.connect('activate', 
 
187
                lambda w: self.treeview.show_diff())
 
188
 
 
189
        revision_menu_tag = gtk.MenuItem("Tag Revision")
 
190
        revision_menu_tag.connect('activate', self._tag_revision_cb)
 
191
 
 
192
        revision_menu.add(revision_menu_tag)
 
193
        revision_menu.add(revision_menu_diff)
 
194
 
 
195
        branch_menu = gtk.Menu()
 
196
        branch_menuitem = gtk.MenuItem("_Branch")
 
197
        branch_menuitem.set_submenu(branch_menu)
 
198
 
 
199
        branch_menu.add(gtk.MenuItem("Pu_ll Revisions"))
 
200
        branch_menu.add(gtk.MenuItem("Pu_sh Revisions"))
 
201
 
 
202
        menubar.add(file_menuitem)
 
203
        menubar.add(edit_menuitem)
 
204
        menubar.add(view_menuitem)
 
205
        menubar.add(go_menuitem)
 
206
        menubar.add(revision_menuitem)
 
207
        menubar.add(branch_menuitem)
 
208
        menubar.show_all()
 
209
 
 
210
        return menubar
 
211
    
 
212
    def construct_loading_msg(self):
 
213
        image_loading = gtk.image_new_from_stock(gtk.STOCK_REFRESH,
 
214
                                                 gtk.ICON_SIZE_BUTTON)
 
215
        image_loading.show()
 
216
        
 
217
        label_loading = gtk.Label(_("Please wait, loading ancestral graph..."))
 
218
        label_loading.set_alignment(0.0, 0.5)
 
219
        label_loading.show()
 
220
        
 
221
        self.loading_msg_box = gtk.HBox()
 
222
        self.loading_msg_box.set_spacing(5)
 
223
        self.loading_msg_box.set_border_width(5)        
 
224
        self.loading_msg_box.pack_start(image_loading, False, False)
 
225
        self.loading_msg_box.pack_start(label_loading, True, True)
 
226
        self.loading_msg_box.show()
 
227
        
 
228
        return self.loading_msg_box
 
229
 
66
230
    def construct_top(self):
67
231
        """Construct the top-half of the window."""
68
 
        scrollwin = gtk.ScrolledWindow()
69
 
        scrollwin.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
70
 
        scrollwin.set_shadow_type(gtk.SHADOW_IN)
71
 
        scrollwin.show()
72
 
 
73
 
        self.treeview = gtk.TreeView()
74
 
        self.treeview.set_rules_hint(True)
75
 
        self.treeview.set_search_column(4)
76
 
        self.treeview.connect("cursor-changed", self._treeview_cursor_cb)
77
 
        self.treeview.connect("row-activated", self._treeview_row_activated_cb)
78
 
        self.treeview.connect("button-release-event", 
79
 
                self._treeview_row_mouseclick)
80
 
        scrollwin.add(self.treeview)
 
232
        # FIXME: Make broken_line_length configurable
 
233
 
 
234
        self.treeview = TreeView(self.branch, self.start, self.maxnum, self.compact_view)
 
235
 
 
236
        self.treeview.connect('revision-selected',
 
237
                self._treeselection_changed_cb)
 
238
 
 
239
        self.treeview.connect('revisions-loaded', 
 
240
                lambda x: self.loading_msg_box.hide())
 
241
 
 
242
        self.treeview.connect('tag-added', lambda w, t, r: self._update_tags())
 
243
 
 
244
        for col in ["revno", "date"]:
 
245
            option = self.config.get_user_option(col + '-column-visible')
 
246
            if option is not None:
 
247
                self.treeview.set_property(col + '-column-visible', option == 'True')
 
248
 
81
249
        self.treeview.show()
82
250
 
83
 
        cell = CellRendererGraph()
84
 
        column = gtk.TreeViewColumn()
85
 
        column.set_resizable(True)
86
 
        column.pack_start(cell, expand=False)
87
 
        column.add_attribute(cell, "node", 1)
88
 
        column.add_attribute(cell, "in-lines", 2)
89
 
        column.add_attribute(cell, "out-lines", 3)
90
 
        self.treeview.append_column(column)
91
 
 
92
 
        cell = gtk.CellRendererText()
93
 
        cell.set_property("width-chars", 40)
94
 
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
95
 
        column = gtk.TreeViewColumn("Message")
96
 
        column.set_resizable(True)
97
 
        column.pack_start(cell, expand=True)
98
 
        column.add_attribute(cell, "text", 4)
99
 
        self.treeview.append_column(column)
100
 
 
101
 
        cell = gtk.CellRendererText()
102
 
        cell.set_property("width-chars", 40)
103
 
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
104
 
        column = gtk.TreeViewColumn("Committer")
105
 
        column.set_resizable(True)
106
 
        column.pack_start(cell, expand=True)
107
 
        column.add_attribute(cell, "text", 5)
108
 
        self.treeview.append_column(column)
109
 
 
110
 
        cell = gtk.CellRendererText()
111
 
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
112
 
        column = gtk.TreeViewColumn("Date")
113
 
        column.set_resizable(True)
114
 
        column.pack_start(cell, expand=True)
115
 
        column.add_attribute(cell, "text", 6)
116
 
        self.treeview.append_column(column)
117
 
 
118
 
        return scrollwin
 
251
        align = gtk.Alignment(0.0, 0.0, 1.0, 1.0)
 
252
        align.set_padding(5, 0, 0, 0)
 
253
        align.add(self.treeview)
 
254
        align.show()
 
255
 
 
256
        return align
119
257
 
120
258
    def construct_navigation(self):
121
259
        """Construct the navigation buttons."""
122
 
        frame = gtk.Frame()
123
 
        frame.set_shadow_type(gtk.SHADOW_OUT)
124
 
        frame.show()
125
 
        
126
 
        hbox = gtk.HBox(spacing=12)
127
 
        frame.add(hbox)
128
 
        hbox.show()
129
 
 
130
 
        self.back_button = gtk.Button(stock=gtk.STOCK_GO_BACK)
131
 
        self.back_button.set_relief(gtk.RELIEF_NONE)
132
 
        self.back_button.add_accelerator("clicked", self.accel_group, ord('['),
133
 
                                         0, 0)
134
 
        self.back_button.connect("clicked", self._back_clicked_cb)
135
 
        hbox.pack_start(self.back_button, expand=False, fill=True)
136
 
        self.back_button.show()
137
 
 
138
 
        self.fwd_button = gtk.Button(stock=gtk.STOCK_GO_FORWARD)
139
 
        self.fwd_button.set_relief(gtk.RELIEF_NONE)
140
 
        self.fwd_button.add_accelerator("clicked", self.accel_group, ord(']'),
141
 
                                        0, 0)
142
 
        self.fwd_button.connect("clicked", self._fwd_clicked_cb)
143
 
        hbox.pack_start(self.fwd_button, expand=False, fill=True)
144
 
        self.fwd_button.show()
145
 
 
146
 
        return frame
 
260
        self.toolbar = gtk.Toolbar()
 
261
        self.toolbar.set_style(gtk.TOOLBAR_BOTH_HORIZ)
 
262
 
 
263
        self.prev_button = self.prev_rev_action.create_tool_item()
 
264
        self.toolbar.insert(self.prev_button, -1)
 
265
 
 
266
        self.next_button = self.next_rev_action.create_tool_item()
 
267
        self.toolbar.insert(self.next_button, -1)
 
268
 
 
269
        self.toolbar.insert(gtk.SeparatorToolItem(), -1)
 
270
 
 
271
        refresh_button = gtk.ToolButton(gtk.STOCK_REFRESH)
 
272
        refresh_button.connect('clicked', self._refresh_clicked)
 
273
        self.toolbar.insert(refresh_button, -1)
 
274
 
 
275
        self.toolbar.show_all()
 
276
 
 
277
        return self.toolbar
147
278
 
148
279
    def construct_bottom(self):
149
280
        """Construct the bottom half of the window."""
150
 
        from bzrlib.plugins.gtk.logview import LogView
151
 
        self.logview = LogView()
 
281
        from bzrlib.plugins.gtk.revisionview import RevisionView
 
282
        self.revisionview = RevisionView(branch=self.branch)
152
283
        (width, height) = self.get_size()
153
 
        self.logview.set_size_request(width, int(height / 2.5))
154
 
        self.logview.show()
155
 
        self.logview.set_show_callback(self._show_clicked_cb)
156
 
        self.logview.set_go_callback(self._go_clicked_cb)
157
 
        return self.logview
158
 
 
159
 
    def set_branch(self, branch, start, maxnum):
160
 
        """Set the branch and start position for this window.
161
 
 
162
 
        Creates a new TreeModel and populates it with information about
163
 
        the new branch before updating the window title and model of the
164
 
        treeview itself.
165
 
        """
166
 
        self.branch = branch
167
 
 
168
 
        # [ revision, node, last_lines, lines, message, committer, timestamp ]
169
 
        self.model = gtk.ListStore(gobject.TYPE_PYOBJECT,
170
 
                                   gobject.TYPE_PYOBJECT,
171
 
                                   gobject.TYPE_PYOBJECT,
172
 
                                   gobject.TYPE_PYOBJECT,
173
 
                                   str, str, str)
174
 
        self.index = {}
175
 
        index = 0
176
 
 
177
 
        last_lines = []
178
 
        (self.revisions, colours, self.children, self.parent_ids,
179
 
            merge_sorted) = distances(branch, start)
180
 
        for (index, (revision, node, lines)) in enumerate(graph(
181
 
                self.revisions, colours, merge_sorted)):
182
 
            # FIXME: at this point we should be able to show the graph order
183
 
            # and lines with no message or commit data - and then incrementally
184
 
            # fill the timestamp, committer etc data as desired.
185
 
            message = revision.message.split("\n")[0]
186
 
            if revision.committer is not None:
187
 
                timestamp = format_date(revision.timestamp, revision.timezone)
188
 
            else:
189
 
                timestamp = None
190
 
            self.model.append([revision, node, last_lines, lines,
191
 
                               message, revision.committer, timestamp])
192
 
            self.index[revision] = index
193
 
            last_lines = lines
194
 
            if maxnum is not None and index > maxnum:
195
 
                break
196
 
 
197
 
        self.set_title(branch.nick + " - bzrk")
198
 
        self.treeview.set_model(self.model)
199
 
 
200
 
    def _treeview_cursor_cb(self, *args):
201
 
        """Callback for when the treeview cursor changes."""
202
 
        (path, col) = self.treeview.get_cursor()
203
 
        revision = self.model[path][0]
204
 
 
205
 
        self.back_button.set_sensitive(len(self.parent_ids[revision]) > 0)
206
 
        self.fwd_button.set_sensitive(len(self.children[revision]) > 0)
207
 
        tags = []
208
 
        if self.branch.supports_tags():
209
 
            tagdict = self.branch.tags.get_reverse_tag_dict()
210
 
            if tagdict.has_key(revision.revision_id):
211
 
                tags = tagdict[revision.revision_id]
212
 
        self.logview.set_revision(revision, tags)
 
284
        self.revisionview.set_size_request(width, int(height / 2.5))
 
285
        self.revisionview.show()
 
286
        self.revisionview.set_show_callback(self._show_clicked_cb)
 
287
        self.revisionview.connect('notify::revision', self._go_clicked_cb)
 
288
        self.treeview.connect('tag-added', lambda w, t, r: self.revisionview.update_tags())
 
289
        return self.revisionview
 
290
 
 
291
    def _tag_selected_cb(self, menuitem, revid):
 
292
        self.treeview.set_revision_id(revid)
 
293
 
 
294
    def _treeselection_changed_cb(self, selection, *args):
 
295
        """callback for when the treeview changes."""
 
296
        revision = self.treeview.get_revision()
 
297
        parents  = self.treeview.get_parents()
 
298
        children = self.treeview.get_children()
 
299
 
 
300
        if revision is not None:
 
301
            prev_menu = gtk.Menu()
 
302
            if len(parents) > 0:
 
303
                self.prev_rev_action.set_sensitive(True)
 
304
                for parent_id in parents:
 
305
                    parent = self.branch.repository.get_revision(parent_id)
 
306
                    try:
 
307
                        str = ' (' + parent.properties['branch-nick'] + ')'
 
308
                    except KeyError:
 
309
                        str = ""
 
310
 
 
311
                    item = gtk.MenuItem(parent.message.split("\n")[0] + str)
 
312
                    item.connect('activate', self._set_revision_cb, parent_id)
 
313
                    prev_menu.add(item)
 
314
                prev_menu.show_all()
 
315
            else:
 
316
                self.prev_rev_action.set_sensitive(False)
 
317
                prev_menu.hide()
 
318
 
 
319
            self.prev_button.set_menu(prev_menu)
 
320
 
 
321
            next_menu = gtk.Menu()
 
322
            if len(children) > 0:
 
323
                self.next_rev_action.set_sensitive(True)
 
324
                for child_id in children:
 
325
                    child = self.branch.repository.get_revision(child_id)
 
326
                    try:
 
327
                        str = ' (' + child.properties['branch-nick'] + ')'
 
328
                    except KeyError:
 
329
                        str = ""
 
330
 
 
331
                    item = gtk.MenuItem(child.message.split("\n")[0] + str)
 
332
                    item.connect('activate', self._set_revision_cb, child_id)
 
333
                    next_menu.add(item)
 
334
                next_menu.show_all()
 
335
            else:
 
336
                self.next_rev_action.set_sensitive(False)
 
337
                next_menu.hide()
 
338
 
 
339
            self.next_button.set_menu(next_menu)
 
340
 
 
341
            self.revisionview.set_revision(revision)
 
342
            self.revisionview.set_children(children)
213
343
 
214
344
    def _back_clicked_cb(self, *args):
215
345
        """Callback for when the back button is clicked."""
216
 
        (path, col) = self.treeview.get_cursor()
217
 
        revision = self.model[path][0]
218
 
        if not len(self.parent_ids[revision]):
219
 
            return
220
 
 
221
 
        for parent_id in self.parent_ids[revision]:
222
 
            parent = self.revisions[parent_id]
223
 
            if same_branch(revision, parent):
224
 
                self.treeview.set_cursor(self.index[parent])
225
 
                break
226
 
        else:
227
 
            next = self.revisions[self.parent_ids[revision][0]]
228
 
            self.treeview.set_cursor(self.index[next])
229
 
        self.treeview.grab_focus()
230
 
 
 
346
        self.treeview.back()
 
347
        
231
348
    def _fwd_clicked_cb(self, *args):
232
349
        """Callback for when the forward button is clicked."""
233
 
        (path, col) = self.treeview.get_cursor()
234
 
        revision = self.model[path][0]
235
 
        if not len(self.children[revision]):
236
 
            return
237
 
 
238
 
        for child in self.children[revision]:
239
 
            if same_branch(child, revision):
240
 
                self.treeview.set_cursor(self.index[child])
241
 
                break
242
 
        else:
243
 
            prev = list(self.children[revision])[0]
244
 
            self.treeview.set_cursor(self.index[prev])
245
 
        self.treeview.grab_focus()
246
 
 
247
 
    def _go_clicked_cb(self, revid):
 
350
        self.treeview.forward()
 
351
 
 
352
    def _go_clicked_cb(self, w, p):
248
353
        """Callback for when the go button for a parent is clicked."""
249
 
        self.treeview.set_cursor(self.index[self.revisions[revid]])
250
 
        self.treeview.grab_focus()
251
 
 
252
 
    def show_diff(self, branch, revid, parentid):
253
 
        """Open a new window to show a diff between the given revisions."""
254
 
        from bzrlib.plugins.gtk.diff import DiffWindow
255
 
        window = DiffWindow()
256
 
        (parent_tree, rev_tree) = branch.repository.revision_trees([parentid, 
257
 
                                                                   revid])
258
 
        description = revid + " - " + branch.nick
259
 
        window.set_diff(description, rev_tree, parent_tree)
260
 
        window.show()
 
354
        if self.revisionview.get_revision() is not None:
 
355
            self.treeview.set_revision(self.revisionview.get_revision())
261
356
 
262
357
    def _show_clicked_cb(self, revid, parentid):
263
358
        """Callback for when the show button for a parent is clicked."""
264
 
        self.show_diff(self.branch, revid, parentid)
265
 
        self.treeview.grab_focus()
266
 
 
267
 
    def _treeview_row_mouseclick(self, widget, event):
268
 
        from bzrlib.plugins.gtk.revisionmenu import RevisionPopupMenu
269
 
        if event.button == 3:
270
 
            menu = RevisionPopupMenu(self.branch.repository, 
271
 
                [x.revision_id for x in self.selected_revisions()],
272
 
                self.branch)
273
 
            menu.popup(None, None, None, event.button, event.get_time())
274
 
 
275
 
    def selected_revision(self, path):
276
 
        return self.model[path][0]
277
 
 
278
 
    def selected_revisions(self):
279
 
        return [self.selected_revision(path) for path in \
280
 
                self.treeview.get_selection().get_selected_rows()[1]]
281
 
 
282
 
    def _treeview_row_activated_cb(self, widget, path, col):
283
 
        # TODO: more than one parent
284
 
        """Callback for when a treeview row gets activated."""
285
 
        revision = self.selected_revision(path)
286
 
        if len(self.parent_ids[revision]) == 0:
287
 
            # Ignore revisions without parent
288
 
            return
289
 
        parent_id = self.parent_ids[revision][0]
290
 
        self.show_diff(self.branch, revision.revision_id, parent_id)
291
 
        self.treeview.grab_focus()
 
359
        self.treeview.show_diff(revid, parentid)
 
360
        self.treeview.grab_focus()
 
361
 
 
362
    def _set_revision_cb(self, w, revision_id):
 
363
        self.treeview.set_revision_id(revision_id)
 
364
 
 
365
    def _brokenlines_toggled_cb(self, button):
 
366
        self.compact_view = button.get_active()
 
367
 
 
368
        if self.compact_view:
 
369
            option = 'yes'
 
370
        else:
 
371
            option = 'no'
 
372
 
 
373
        self.config.set_user_option('viz-compact-view', option)
 
374
        self.treeview.set_property('compact', self.compact_view)
 
375
        self.treeview.refresh()
 
376
 
 
377
    def _tag_revision_cb(self, w):
 
378
        try:
 
379
            self.treeview.set_sensitive(False)
 
380
            dialog = AddTagDialog(self.branch.repository, self.treeview.get_revision().revision_id, self.branch)
 
381
            response = dialog.run()
 
382
            if response != gtk.RESPONSE_NONE:
 
383
                dialog.hide()
 
384
            
 
385
                if response == gtk.RESPONSE_OK:
 
386
                    self.treeview.add_tag(dialog.tagname, dialog._revid)
 
387
                
 
388
                dialog.destroy()
 
389
 
 
390
        finally:
 
391
            self.treeview.set_sensitive(True)
 
392
 
 
393
    def _col_visibility_changed(self, col, property):
 
394
        self.config.set_user_option(property + '-column-visible', col.get_active())
 
395
        self.treeview.set_property(property + '-column-visible', col.get_active())
 
396
 
 
397
    def _toolbar_visibility_changed(self, col):
 
398
        if col.get_active():
 
399
            self.toolbar.show() 
 
400
        else:
 
401
            self.toolbar.hide()
 
402
 
 
403
    def _show_about_cb(self, w):
 
404
        dialog = AboutDialog()
 
405
        dialog.connect('response', lambda d,r: d.destroy())
 
406
        dialog.run()
 
407
 
 
408
    def _refresh_clicked(self, w):
 
409
        self.treeview.update()
 
410
 
 
411
    def _update_tags(self):
 
412
        menu = gtk.Menu()
 
413
 
 
414
        if self.branch.supports_tags():
 
415
            tags = self.branch.tags.get_tag_dict().items()
 
416
            tags.sort()
 
417
            tags.reverse()
 
418
            for tag, revid in tags:
 
419
                tag_item = gtk.MenuItem(tag)
 
420
                tag_item.connect('activate', self._tag_selected_cb, revid)
 
421
                menu.add(tag_item)
 
422
            self.go_menu_tags.set_submenu(menu)
 
423
 
 
424
            self.go_menu_tags.set_sensitive(len(tags) != 0)
 
425
        else:
 
426
            self.go_menu_tags.set_sensitive(False)
 
427
 
 
428
        self.go_menu_tags.show_all()
 
429
 
 
430