/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: 2007-12-06 23:37:06 UTC
  • mto: This revision was merged to the branch mainline in revision 417.
  • Revision ID: daniel.schierbeck@gmail.com-20071206233706-eeinks66w86r3gfm
Fixed bug in gmissing.

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
 
 
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
        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
        menubar.add(file_menuitem)
 
217
        menubar.add(edit_menuitem)
 
218
        menubar.add(view_menuitem)
 
219
        menubar.add(go_menuitem)
 
220
        menubar.add(revision_menuitem)
 
221
        menubar.add(branch_menuitem)
 
222
        menubar.show_all()
 
223
 
 
224
        return menubar
 
225
    
 
226
    def construct_loading_msg(self):
 
227
        image_loading = gtk.image_new_from_stock(gtk.STOCK_REFRESH,
 
228
                                                 gtk.ICON_SIZE_BUTTON)
 
229
        image_loading.show()
 
230
        
 
231
        label_loading = gtk.Label(_("Please wait, loading ancestral graph..."))
 
232
        label_loading.set_alignment(0.0, 0.5)
 
233
        label_loading.show()
 
234
        
 
235
        self.loading_msg_box = gtk.HBox()
 
236
        self.loading_msg_box.set_spacing(5)
 
237
        self.loading_msg_box.set_border_width(5)        
 
238
        self.loading_msg_box.pack_start(image_loading, False, False)
 
239
        self.loading_msg_box.pack_start(label_loading, True, True)
 
240
        self.loading_msg_box.show()
 
241
        
 
242
        return self.loading_msg_box
 
243
 
66
244
    def construct_top(self):
67
245
        """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)
 
246
        # FIXME: Make broken_line_length configurable
 
247
 
 
248
        self.treeview = TreeView(self.branch, self.start, self.maxnum, self.compact_view)
 
249
 
 
250
        self.treeview.connect('revision-selected',
 
251
                self._treeselection_changed_cb)
 
252
 
 
253
        self.treeview.connect('revisions-loaded', 
 
254
                lambda x: self.loading_msg_box.hide())
 
255
 
 
256
        for col in ["revno", "date"]:
 
257
            option = self.config.get_user_option(col + '-column-visible')
 
258
            if option is not None:
 
259
                self.treeview.set_property(col + '-column-visible', option == 'True')
 
260
 
81
261
        self.treeview.show()
82
262
 
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
 
263
        align = gtk.Alignment(0.0, 0.0, 1.0, 1.0)
 
264
        align.set_padding(5, 0, 0, 0)
 
265
        align.add(self.treeview)
 
266
        align.show()
 
267
 
 
268
        return align
119
269
 
120
270
    def construct_navigation(self):
121
271
        """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
 
272
        self.toolbar = gtk.Toolbar()
 
273
        self.toolbar.set_style(gtk.TOOLBAR_BOTH_HORIZ)
 
274
 
 
275
        self.prev_button = self.prev_rev_action.create_tool_item()
 
276
        self.toolbar.insert(self.prev_button, -1)
 
277
 
 
278
        self.next_button = self.next_rev_action.create_tool_item()
 
279
        self.toolbar.insert(self.next_button, -1)
 
280
 
 
281
        self.toolbar.insert(gtk.SeparatorToolItem(), -1)
 
282
 
 
283
        refresh_button = gtk.ToolButton(gtk.STOCK_REFRESH)
 
284
        refresh_button.connect('clicked', self._refresh_clicked)
 
285
        self.toolbar.insert(refresh_button, -1)
 
286
 
 
287
        self.toolbar.show_all()
 
288
 
 
289
        return self.toolbar
147
290
 
148
291
    def construct_bottom(self):
149
292
        """Construct the bottom half of the window."""
150
 
        from bzrlib.plugins.gtk.logview import LogView
151
 
        self.logview = LogView()
 
293
        from bzrlib.plugins.gtk.revisionview import RevisionView
 
294
        self.revisionview = RevisionView(branch=self.branch)
152
295
        (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
 
        self.set_title(branch.nick + " - bzrk")
176
 
        gobject.idle_add(self.populate_model, start, maxnum)
177
 
 
178
 
    def populate_model(self, start, maxnum):
179
 
        index = 0
180
 
        
181
 
        last_lines = []
182
 
        (self.revisions, colours, self.children, self.parent_ids,
183
 
            merge_sorted) = distances(self.branch.repository, start)
184
 
        for (index, (revision, node, lines)) in enumerate(graph(
185
 
                self.revisions, colours, merge_sorted)):
186
 
            # FIXME: at this point we should be able to show the graph order
187
 
            # and lines with no message or commit data - and then incrementally
188
 
            # fill the timestamp, committer etc data as desired.
189
 
            message = revision.message.split("\n")[0]
190
 
            if revision.committer is not None:
191
 
                timestamp = format_date(revision.timestamp, revision.timezone)
192
 
            else:
193
 
                timestamp = None
194
 
            self.model.append([revision, node, last_lines, lines,
195
 
                               message, revision.committer, timestamp])
196
 
            self.index[revision] = index
197
 
            last_lines = lines
198
 
            if maxnum is not None and index > maxnum:
199
 
                break
200
 
        self.treeview.set_model(self.model)
201
 
        return False
202
 
    
203
 
    
204
 
    def _treeview_cursor_cb(self, *args):
205
 
        """Callback for when the treeview cursor changes."""
206
 
        (path, col) = self.treeview.get_cursor()
207
 
        revision = self.model[path][0]
208
 
 
209
 
        self.back_button.set_sensitive(len(self.parent_ids[revision]) > 0)
210
 
        self.fwd_button.set_sensitive(len(self.children[revision]) > 0)
211
 
        tags = []
212
 
        if self.branch.supports_tags():
213
 
            tagdict = self.branch.tags.get_reverse_tag_dict()
214
 
            if tagdict.has_key(revision.revision_id):
215
 
                tags = tagdict[revision.revision_id]
216
 
        self.logview.set_revision(revision, tags)
 
296
        self.revisionview.set_size_request(width, int(height / 2.5))
 
297
        self.revisionview.show()
 
298
        self.revisionview.set_show_callback(self._show_clicked_cb)
 
299
        self.revisionview.connect('notify::revision', self._go_clicked_cb)
 
300
        return self.revisionview
 
301
 
 
302
    def _tag_selected_cb(self, menuitem, revid):
 
303
        self.treeview.set_revision_id(revid)
 
304
 
 
305
    def _treeselection_changed_cb(self, selection, *args):
 
306
        """callback for when the treeview changes."""
 
307
        revision = self.treeview.get_revision()
 
308
        parents  = self.treeview.get_parents()
 
309
        children = self.treeview.get_children()
 
310
 
 
311
        if revision is not None:
 
312
            prev_menu = gtk.Menu()
 
313
            if len(parents) > 0:
 
314
                self.prev_rev_action.set_sensitive(True)
 
315
                for parent_id in parents:
 
316
                    parent = self.branch.repository.get_revision(parent_id)
 
317
                    try:
 
318
                        str = ' (' + parent.properties['branch-nick'] + ')'
 
319
                    except KeyError:
 
320
                        str = ""
 
321
 
 
322
                    item = gtk.MenuItem(parent.message.split("\n")[0] + str)
 
323
                    item.connect('activate', self._set_revision_cb, parent_id)
 
324
                    prev_menu.add(item)
 
325
                prev_menu.show_all()
 
326
            else:
 
327
                self.prev_rev_action.set_sensitive(False)
 
328
                prev_menu.hide()
 
329
 
 
330
            self.prev_button.set_menu(prev_menu)
 
331
 
 
332
            next_menu = gtk.Menu()
 
333
            if len(children) > 0:
 
334
                self.next_rev_action.set_sensitive(True)
 
335
                for child_id in children:
 
336
                    child = self.branch.repository.get_revision(child_id)
 
337
                    try:
 
338
                        str = ' (' + child.properties['branch-nick'] + ')'
 
339
                    except KeyError:
 
340
                        str = ""
 
341
 
 
342
                    item = gtk.MenuItem(child.message.split("\n")[0] + str)
 
343
                    item.connect('activate', self._set_revision_cb, child_id)
 
344
                    next_menu.add(item)
 
345
                next_menu.show_all()
 
346
            else:
 
347
                self.next_rev_action.set_sensitive(False)
 
348
                next_menu.hide()
 
349
 
 
350
            self.next_button.set_menu(next_menu)
 
351
 
 
352
            self.revisionview.set_revision(revision, children)
217
353
 
218
354
    def _back_clicked_cb(self, *args):
219
355
        """Callback for when the back button is clicked."""
220
 
        (path, col) = self.treeview.get_cursor()
221
 
        revision = self.model[path][0]
222
 
        if not len(self.parent_ids[revision]):
223
 
            return
224
 
 
225
 
        for parent_id in self.parent_ids[revision]:
226
 
            parent = self.revisions[parent_id]
227
 
            if same_branch(revision, parent):
228
 
                self.treeview.set_cursor(self.index[parent])
229
 
                break
230
 
        else:
231
 
            next = self.revisions[self.parent_ids[revision][0]]
232
 
            self.treeview.set_cursor(self.index[next])
233
 
        self.treeview.grab_focus()
234
 
 
 
356
        self.treeview.back()
 
357
        
235
358
    def _fwd_clicked_cb(self, *args):
236
359
        """Callback for when the forward button is clicked."""
237
 
        (path, col) = self.treeview.get_cursor()
238
 
        revision = self.model[path][0]
239
 
        if not len(self.children[revision]):
240
 
            return
241
 
 
242
 
        for child in self.children[revision]:
243
 
            if same_branch(child, revision):
244
 
                self.treeview.set_cursor(self.index[child])
245
 
                break
246
 
        else:
247
 
            prev = list(self.children[revision])[0]
248
 
            self.treeview.set_cursor(self.index[prev])
249
 
        self.treeview.grab_focus()
250
 
 
251
 
    def _go_clicked_cb(self, revid):
 
360
        self.treeview.forward()
 
361
 
 
362
    def _go_clicked_cb(self, w, p):
252
363
        """Callback for when the go button for a parent is clicked."""
253
 
        self.treeview.set_cursor(self.index[self.revisions[revid]])
254
 
        self.treeview.grab_focus()
255
 
 
256
 
    def show_diff(self, branch, revid, parentid):
257
 
        """Open a new window to show a diff between the given revisions."""
258
 
        from bzrlib.plugins.gtk.diff import DiffWindow
259
 
        window = DiffWindow()
260
 
        (parent_tree, rev_tree) = branch.repository.revision_trees([parentid, 
261
 
                                                                   revid])
262
 
        description = revid + " - " + branch.nick
263
 
        window.set_diff(description, rev_tree, parent_tree)
264
 
        window.show()
 
364
        if self.revisionview.get_revision() is not None:
 
365
            self.treeview.set_revision(self.revisionview.get_revision())
265
366
 
266
367
    def _show_clicked_cb(self, revid, parentid):
267
368
        """Callback for when the show button for a parent is clicked."""
268
 
        self.show_diff(self.branch, revid, parentid)
269
 
        self.treeview.grab_focus()
270
 
 
271
 
    def _treeview_row_mouseclick(self, widget, event):
272
 
        from bzrlib.plugins.gtk.revisionmenu import RevisionPopupMenu
273
 
        if event.button == 3:
274
 
            menu = RevisionPopupMenu(self.branch.repository, 
275
 
                [x.revision_id for x in self.selected_revisions()],
276
 
                self.branch)
277
 
            menu.popup(None, None, None, event.button, event.get_time())
278
 
 
279
 
    def selected_revision(self, path):
280
 
        return self.model[path][0]
281
 
 
282
 
    def selected_revisions(self):
283
 
        return [self.selected_revision(path) for path in \
284
 
                self.treeview.get_selection().get_selected_rows()[1]]
285
 
 
286
 
    def _treeview_row_activated_cb(self, widget, path, col):
287
 
        # TODO: more than one parent
288
 
        """Callback for when a treeview row gets activated."""
289
 
        revision = self.selected_revision(path)
290
 
        if len(self.parent_ids[revision]) == 0:
291
 
            # Ignore revisions without parent
292
 
            return
293
 
        parent_id = self.parent_ids[revision][0]
294
 
        self.show_diff(self.branch, revision.revision_id, parent_id)
295
 
        self.treeview.grab_focus()
 
369
        self.treeview.show_diff(revid, parentid)
 
370
        self.treeview.grab_focus()
 
371
 
 
372
    def _set_revision_cb(self, w, revision_id):
 
373
        self.treeview.set_revision_id(revision_id)
 
374
 
 
375
    def _brokenlines_toggled_cb(self, button):
 
376
        self.compact_view = button.get_active()
 
377
 
 
378
        if self.compact_view:
 
379
            option = 'yes'
 
380
        else:
 
381
            option = 'no'
 
382
 
 
383
        self.config.set_user_option('viz-compact-view', option)
 
384
        self.treeview.set_property('compact', self.compact_view)
 
385
        self.treeview.refresh()
 
386
 
 
387
    def _tag_revision_cb(self, w):
 
388
        try:
 
389
            self.treeview.set_sensitive(False)
 
390
            self.branch.unlock()
 
391
            dialog = AddTagDialog(self.branch.repository, self.treeview.get_revision().revision_id, self.branch)
 
392
            response = dialog.run()
 
393
            if response != gtk.RESPONSE_NONE:
 
394
                dialog.hide()
 
395
            
 
396
                if response == gtk.RESPONSE_OK:
 
397
                    try:
 
398
                        self.branch.lock_write()
 
399
                        self.branch.tags.set_tag(dialog.tagname, dialog._revid)
 
400
                    finally:
 
401
                        self.branch.unlock()
 
402
                
 
403
                dialog.destroy()
 
404
 
 
405
        finally:
 
406
            self.branch.lock_read()
 
407
            self.treeview.emit("revision-selected")
 
408
            self.treeview.set_sensitive(True)
 
409
 
 
410
    def _col_visibility_changed(self, col, property):
 
411
        self.config.set_user_option(property + '-column-visible', col.get_active())
 
412
        self.treeview.set_property(property + '-column-visible', col.get_active())
 
413
 
 
414
    def _toolbar_visibility_changed(self, col):
 
415
        if col.get_active():
 
416
            self.toolbar.show() 
 
417
        else:
 
418
            self.toolbar.hide()
 
419
 
 
420
    def _show_about_cb(self, w):
 
421
        dialog = AboutDialog()
 
422
        dialog.connect('response', lambda d,r: d.destroy())
 
423
        dialog.run()
 
424
 
 
425
    def _refresh_clicked(self, w):
 
426
        self.treeview.update()