/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: Jelmer Vernooij
  • Date: 2007-12-21 20:20:37 UTC
  • mto: This revision was merged to the branch mainline in revision 422.
  • Revision ID: jelmer@samba.org-20071221202037-6zvbwefvrte3e2zy
Fix URL.

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