/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: Szilveszter Farkas (Phanatic)
  • Date: 2007-03-15 12:43:48 UTC
  • mto: (126.1.38 bzr-gtk)
  • mto: This revision was merged to the branch mainline in revision 172.
  • Revision ID: szilveszter.farkas@gmail.com-20070315124348-0nx0zb7fv4pa8xk6
Fix the indentation error in the TortoiseBZR test.

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.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):
 
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):
26
23
    """Branch window.
27
24
 
28
25
    This object represents and manages a single window containing information
29
26
    for a particular branch.
30
27
    """
31
28
 
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)
 
29
    def __init__(self):
 
30
        gtk.Window.__init__(self, gtk.WINDOW_TOPLEVEL)
42
31
        self.set_border_width(0)
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")
 
32
        self.set_title("bzrk")
55
33
 
56
34
        # Use three-quarters of the screen by default
57
35
        screen = self.get_screen()
64
42
        icon = self.render_icon(gtk.STOCK_INDEX, gtk.ICON_SIZE_BUTTON)
65
43
        self.set_icon(icon)
66
44
 
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
 
 
70
45
        self.accel_group = gtk.AccelGroup()
71
46
        self.add_accel_group(self.accel_group)
72
47
 
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
 
 
87
48
        self.construct()
88
49
 
89
 
    def set_revision(self, revid):
90
 
        self.treeview.set_revision_id(revid)
91
 
 
92
50
    def construct(self):
93
51
        """Construct the window contents."""
94
52
        vbox = gtk.VBox(spacing=0)
95
53
        self.add(vbox)
96
54
 
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)
103
55
        vbox.pack_start(self.construct_navigation(), expand=False, fill=True)
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)
 
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)
108
63
 
109
64
        vbox.show()
110
65
 
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
 
        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_prefs = gtk.ImageMenuItem(gtk.STOCK_PREFERENCES)
137
 
        edit_menu_prefs.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_prefs)
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
 
        tags_menu = gtk.Menu()
174
 
        go_menu_tags = gtk.MenuItem("_Tags")
175
 
        go_menu_tags.set_submenu(tags_menu)
176
 
 
177
 
        if self.branch.supports_tags():
178
 
            tags = self.branch.tags.get_tag_dict().items()
179
 
            tags.sort()
180
 
            tags.reverse()
181
 
            for tag, revid in tags:
182
 
                tag_item = gtk.MenuItem(tag)
183
 
                tag_item.connect('activate', self._tag_selected_cb, revid)
184
 
                tags_menu.add(tag_item)
185
 
 
186
 
            go_menu_tags.set_sensitive(len(tags) != 0)
187
 
        else:
188
 
            go_menu_tags.set_sensitive(False)
189
 
 
190
 
        go_menu.add(go_menu_next)
191
 
        go_menu.add(go_menu_prev)
192
 
        go_menu.add(gtk.SeparatorMenuItem())
193
 
        go_menu.add(go_menu_tags)
194
 
 
195
 
        revision_menu = gtk.Menu()
196
 
        revision_menuitem = gtk.MenuItem("_Revision")
197
 
        revision_menuitem.set_submenu(revision_menu)
198
 
 
199
 
        revision_menu_diff = gtk.MenuItem("View Changes")
200
 
        revision_menu_diff.connect('activate', 
201
 
                lambda w: self.treeview.show_diff())
202
 
 
203
 
        revision_menu_tag = gtk.MenuItem("Tag Revision")
204
 
        revision_menu_tag.connect('activate', self._tag_revision_cb)
205
 
 
206
 
        revision_menu.add(revision_menu_tag)
207
 
        revision_menu.add(revision_menu_diff)
208
 
 
209
 
        branch_menu = gtk.Menu()
210
 
        branch_menuitem = gtk.MenuItem("_Branch")
211
 
        branch_menuitem.set_submenu(branch_menu)
212
 
 
213
 
        branch_menu.add(gtk.MenuItem("Pu_ll Revisions"))
214
 
        branch_menu.add(gtk.MenuItem("Pu_sh Revisions"))
215
 
 
216
 
        help_menu = gtk.Menu()
217
 
        help_menuitem = gtk.MenuItem("_Help")
218
 
        help_menuitem.set_submenu(help_menu)
219
 
 
220
 
        help_menu_about = gtk.ImageMenuItem(gtk.STOCK_ABOUT)
221
 
        help_menu_about.connect('activate', self._show_about_cb)
222
 
 
223
 
        help_menu.add(help_menu_about)
224
 
       
225
 
        menubar.add(file_menuitem)
226
 
        menubar.add(edit_menuitem)
227
 
        menubar.add(view_menuitem)
228
 
        menubar.add(go_menuitem)
229
 
        menubar.add(revision_menuitem)
230
 
        menubar.add(branch_menuitem)
231
 
        menubar.add(help_menuitem)
232
 
        menubar.show_all()
233
 
 
234
 
        return menubar
235
 
    
236
 
    def construct_loading_msg(self):
237
 
        image_loading = gtk.image_new_from_stock(gtk.STOCK_REFRESH,
238
 
                                                 gtk.ICON_SIZE_BUTTON)
239
 
        image_loading.show()
240
 
        
241
 
        label_loading = gtk.Label(_("Please wait, loading ancestral graph..."))
242
 
        label_loading.set_alignment(0.0, 0.5)
243
 
        label_loading.show()
244
 
        
245
 
        self.loading_msg_box = gtk.HBox()
246
 
        self.loading_msg_box.set_spacing(5)
247
 
        self.loading_msg_box.set_border_width(5)        
248
 
        self.loading_msg_box.pack_start(image_loading, False, False)
249
 
        self.loading_msg_box.pack_start(label_loading, True, True)
250
 
        self.loading_msg_box.show()
251
 
        
252
 
        return self.loading_msg_box
253
 
 
254
66
    def construct_top(self):
255
67
        """Construct the top-half of the window."""
256
 
        # FIXME: Make broken_line_length configurable
257
 
        if self.compact_view:
258
 
            brokenlines = 32
259
 
        else:
260
 
            brokenlines = None
261
 
 
262
 
        self.treeview = TreeView(self.branch, self.start, self.maxnum, brokenlines)
263
 
 
264
 
        self.treeview.connect('revision-selected',
265
 
                self._treeselection_changed_cb)
266
 
 
267
 
        self.treeview.connect('revisions-loaded', 
268
 
                lambda x: self.loading_msg_box.hide())
269
 
 
270
 
        for col in ["revno", "date"]:
271
 
            option = self.config.get_user_option(col + '-column-visible')
272
 
            if option is not None:
273
 
                self.treeview.set_property(col + '-column-visible', option == 'True')
274
 
 
 
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
        scrollwin.add(self.treeview)
275
79
        self.treeview.show()
276
80
 
277
 
        align = gtk.Alignment(0.0, 0.0, 1.0, 1.0)
278
 
        align.set_padding(5, 0, 0, 0)
279
 
        align.add(self.treeview)
280
 
        align.show()
281
 
 
282
 
        return align
 
81
        cell = CellRendererGraph()
 
82
        column = gtk.TreeViewColumn()
 
83
        column.set_resizable(True)
 
84
        column.pack_start(cell, expand=False)
 
85
        column.add_attribute(cell, "node", 1)
 
86
        column.add_attribute(cell, "in-lines", 2)
 
87
        column.add_attribute(cell, "out-lines", 3)
 
88
        self.treeview.append_column(column)
 
89
 
 
90
        cell = gtk.CellRendererText()
 
91
        cell.set_property("width-chars", 40)
 
92
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
 
93
        column = gtk.TreeViewColumn("Message")
 
94
        column.set_resizable(True)
 
95
        column.pack_start(cell, expand=True)
 
96
        column.add_attribute(cell, "text", 4)
 
97
        self.treeview.append_column(column)
 
98
 
 
99
        cell = gtk.CellRendererText()
 
100
        cell.set_property("width-chars", 40)
 
101
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
 
102
        column = gtk.TreeViewColumn("Committer")
 
103
        column.set_resizable(True)
 
104
        column.pack_start(cell, expand=True)
 
105
        column.add_attribute(cell, "text", 5)
 
106
        self.treeview.append_column(column)
 
107
 
 
108
        cell = gtk.CellRendererText()
 
109
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
 
110
        column = gtk.TreeViewColumn("Date")
 
111
        column.set_resizable(True)
 
112
        column.pack_start(cell, expand=True)
 
113
        column.add_attribute(cell, "text", 6)
 
114
        self.treeview.append_column(column)
 
115
 
 
116
        return scrollwin
283
117
 
284
118
    def construct_navigation(self):
285
119
        """Construct the navigation buttons."""
286
 
        self.toolbar = gtk.Toolbar()
287
 
        self.toolbar.set_style(gtk.TOOLBAR_BOTH_HORIZ)
288
 
 
289
 
        self.prev_button = self.prev_rev_action.create_tool_item()
290
 
        self.toolbar.insert(self.prev_button, -1)
291
 
 
292
 
        self.next_button = self.next_rev_action.create_tool_item()
293
 
        self.toolbar.insert(self.next_button, -1)
294
 
 
295
 
        self.toolbar.show_all()
296
 
 
297
 
        return self.toolbar
 
120
        frame = gtk.Frame()
 
121
        frame.set_shadow_type(gtk.SHADOW_OUT)
 
122
        frame.show()
 
123
        
 
124
        hbox = gtk.HBox(spacing=12)
 
125
        frame.add(hbox)
 
126
        hbox.show()
 
127
 
 
128
        self.back_button = gtk.Button(stock=gtk.STOCK_GO_BACK)
 
129
        self.back_button.set_relief(gtk.RELIEF_NONE)
 
130
        self.back_button.add_accelerator("clicked", self.accel_group, ord('['),
 
131
                                         0, 0)
 
132
        self.back_button.connect("clicked", self._back_clicked_cb)
 
133
        hbox.pack_start(self.back_button, expand=False, fill=True)
 
134
        self.back_button.show()
 
135
 
 
136
        self.fwd_button = gtk.Button(stock=gtk.STOCK_GO_FORWARD)
 
137
        self.fwd_button.set_relief(gtk.RELIEF_NONE)
 
138
        self.fwd_button.add_accelerator("clicked", self.accel_group, ord(']'),
 
139
                                        0, 0)
 
140
        self.fwd_button.connect("clicked", self._fwd_clicked_cb)
 
141
        hbox.pack_start(self.fwd_button, expand=False, fill=True)
 
142
        self.fwd_button.show()
 
143
 
 
144
        return frame
298
145
 
299
146
    def construct_bottom(self):
300
147
        """Construct the bottom half of the window."""
301
 
        from bzrlib.plugins.gtk.revisionview import RevisionView
302
 
        self.revisionview = RevisionView(None, tags=[], show_children=True, branch=self.branch)
 
148
        from bzrlib.plugins.gtk.logview import LogView
 
149
        self.logview = LogView()
 
150
        self.logview.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
 
151
        self.logview.set_shadow_type(gtk.SHADOW_NONE)
303
152
        (width, height) = self.get_size()
304
 
        self.revisionview.set_size_request(width, int(height / 2.5))
305
 
        self.revisionview.show()
306
 
        self.revisionview.set_show_callback(self._show_clicked_cb)
307
 
        self.revisionview.set_go_callback(self._go_clicked_cb)
308
 
        return self.revisionview
309
 
 
310
 
    def _tag_selected_cb(self, menuitem, revid):
311
 
        self.treeview.set_revision_id(revid)
312
 
 
313
 
    def _treeselection_changed_cb(self, selection, *args):
314
 
        """callback for when the treeview changes."""
315
 
        revision = self.treeview.get_revision()
316
 
        parents  = self.treeview.get_parents()
317
 
        children = self.treeview.get_children()
318
 
 
319
 
        if revision is not None:
320
 
            prev_menu = gtk.Menu()
321
 
            if len(parents) > 0:
322
 
                self.prev_rev_action.set_sensitive(True)
323
 
                for parent_id in parents:
324
 
                    parent = self.branch.repository.get_revision(parent_id)
325
 
                    try:
326
 
                        str = ' (' + parent.properties['branch-nick'] + ')'
327
 
                    except KeyError:
328
 
                        str = ""
329
 
 
330
 
                    item = gtk.MenuItem(parent.message.split("\n")[0] + str)
331
 
                    item.connect('activate', self._set_revision_cb, parent_id)
332
 
                    prev_menu.add(item)
333
 
                prev_menu.show_all()
334
 
            else:
335
 
                self.prev_rev_action.set_sensitive(False)
336
 
                prev_menu.hide()
337
 
 
338
 
            self.prev_button.set_menu(prev_menu)
339
 
 
340
 
            next_menu = gtk.Menu()
341
 
            if len(children) > 0:
342
 
                self.next_rev_action.set_sensitive(True)
343
 
                for child_id in children:
344
 
                    child = self.branch.repository.get_revision(child_id)
345
 
                    try:
346
 
                        str = ' (' + child.properties['branch-nick'] + ')'
347
 
                    except KeyError:
348
 
                        str = ""
349
 
 
350
 
                    item = gtk.MenuItem(child.message.split("\n")[0] + str)
351
 
                    item.connect('activate', self._set_revision_cb, child_id)
352
 
                    next_menu.add(item)
353
 
                next_menu.show_all()
354
 
            else:
355
 
                self.next_rev_action.set_sensitive(False)
356
 
                next_menu.hide()
357
 
 
358
 
            self.next_button.set_menu(next_menu)
359
 
 
360
 
            tags = []
361
 
            if self.branch.supports_tags():
362
 
                tagdict = self.branch.tags.get_reverse_tag_dict()
363
 
                if tagdict.has_key(revision.revision_id):
364
 
                    tags = tagdict[revision.revision_id]
365
 
            self.revisionview.set_revision(revision, tags, children)
 
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
        self.logview.set_revision(revision)
366
208
 
367
209
    def _back_clicked_cb(self, *args):
368
210
        """Callback for when the back button is clicked."""
369
 
        self.treeview.back()
370
 
        
 
211
        (path, col) = self.treeview.get_cursor()
 
212
        revision = self.model[path][0]
 
213
        if not len(self.parent_ids[revision]):
 
214
            return
 
215
 
 
216
        for parent_id in self.parent_ids[revision]:
 
217
            parent = self.revisions[parent_id]
 
218
            if same_branch(revision, parent):
 
219
                self.treeview.set_cursor(self.index[parent])
 
220
                break
 
221
        else:
 
222
            next = self.revisions[self.parent_ids[revision][0]]
 
223
            self.treeview.set_cursor(self.index[next])
 
224
        self.treeview.grab_focus()
 
225
 
371
226
    def _fwd_clicked_cb(self, *args):
372
227
        """Callback for when the forward button is clicked."""
373
 
        self.treeview.forward()
 
228
        (path, col) = self.treeview.get_cursor()
 
229
        revision = self.model[path][0]
 
230
        if not len(self.children[revision]):
 
231
            return
 
232
 
 
233
        for child in self.children[revision]:
 
234
            if same_branch(child, revision):
 
235
                self.treeview.set_cursor(self.index[child])
 
236
                break
 
237
        else:
 
238
            prev = list(self.children[revision])[0]
 
239
            self.treeview.set_cursor(self.index[prev])
 
240
        self.treeview.grab_focus()
374
241
 
375
242
    def _go_clicked_cb(self, revid):
376
243
        """Callback for when the go button for a parent is clicked."""
377
 
        self.treeview.set_revision_id(revid)
 
244
        self.treeview.set_cursor(self.index[self.revisions[revid]])
 
245
        self.treeview.grab_focus()
 
246
 
 
247
    def show_diff(self, branch, revid, parentid):
 
248
        """Open a new window to show a diff between the given revisions."""
 
249
        from bzrlib.plugins.gtk.diff import DiffWindow
 
250
        window = DiffWindow()
 
251
        rev_tree = branch.repository.revision_tree(revid)
 
252
        parent_tree = branch.repository.revision_tree(parentid)
 
253
        description = revid + " - " + branch.nick
 
254
        window.set_diff(description, rev_tree, parent_tree)
 
255
        window.show()
378
256
 
379
257
    def _show_clicked_cb(self, revid, parentid):
380
258
        """Callback for when the show button for a parent is clicked."""
381
 
        self.treeview.show_diff(revid, parentid)
382
 
        self.treeview.grab_focus()
383
 
 
384
 
    def _set_revision_cb(self, w, revision_id):
385
 
        self.treeview.set_revision_id(revision_id)
386
 
 
387
 
    def _brokenlines_toggled_cb(self, button):
388
 
        self.compact_view = button.get_active()
389
 
 
390
 
        if self.compact_view:
391
 
            option = 'yes'
392
 
        else:
393
 
            option = 'no'
394
 
 
395
 
        self.config.set_user_option('viz-compact-view', option)
396
 
 
397
 
        revision = self.treeview.get_revision()
398
 
 
399
 
        self.paned.get_child1().destroy()
400
 
        self.paned.pack1(self.construct_top(), resize=True, shrink=False)
401
 
 
402
 
        gobject.idle_add(self.set_revision, revision.revision_id)
403
 
 
404
 
    def _tag_revision_cb(self, w):
405
 
        try:
406
 
            self.treeview.set_sensitive(False)
407
 
            self.branch.unlock()
408
 
            dialog = AddTagDialog(self.branch.repository, self.treeview.get_revision().revision_id, self.branch)
409
 
            response = dialog.run()
410
 
            if response != gtk.RESPONSE_NONE:
411
 
                dialog.hide()
412
 
            
413
 
                if response == gtk.RESPONSE_OK:
414
 
                    try:
415
 
                        self.branch.lock_write()
416
 
                        self.branch.tags.set_tag(dialog.tagname, dialog._revid)
417
 
                    finally:
418
 
                        self.branch.unlock()
419
 
                
420
 
                dialog.destroy()
421
 
 
422
 
        finally:
423
 
            self.branch.lock_read()
424
 
            self.treeview.emit("revision-selected")
425
 
            self.treeview.set_sensitive(True)
426
 
 
427
 
    def _col_visibility_changed(self, col, property):
428
 
        self.config.set_user_option(property + '-column-visible', col.get_active())
429
 
        self.treeview.set_property(property + '-column-visible', col.get_active())
430
 
 
431
 
    def _toolbar_visibility_changed(self, col):
432
 
        if col.get_active():
433
 
            self.toolbar.show() 
434
 
        else:
435
 
            self.toolbar.hide()
436
 
 
437
 
    def _show_about_cb(self, w):
438
 
        dialog = AboutDialog()
439
 
        dialog.connect('response', lambda d,r: d.destroy())
440
 
        dialog.run()
 
259
        self.show_diff(self.branch, revid, parentid)
 
260
        self.treeview.grab_focus()
 
261
 
 
262
    def _treeview_row_activated_cb(self, widget, path, col):
 
263
        # TODO: more than one parent
 
264
        """Callback for when a treeview row gets activated."""
 
265
        revision = self.model[path][0]
 
266
        if len(self.parent_ids[revision]) == 0:
 
267
            # Ignore revisions without parent
 
268
            return
 
269
        parent_id = self.parent_ids[revision][0]
 
270
        self.show_diff(self.branch, revision.revision_id, parent_id)
 
271
        self.treeview.grab_focus()