/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: John Arbash Meinel
  • Date: 2007-10-02 23:08:12 UTC
  • mto: (322.1.1 trunk) (330.3.3 trunk)
  • mto: This revision was merged to the branch mainline in revision 368.
  • Revision ID: john@arbash-meinel.com-20071002230812-h8i6pq8fwvodute4
Start testing with Unicode data.
It seems there is some brokenness with serializing Unicode messages.
But otherwise everything seems to be working.

Show diffs side-by-side

added added

removed removed

Lines of Context:
viz/branchwin.py
12
12
import gtk
13
13
import gobject
14
14
import pango
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
 
 
24
 
class BranchWindow(Window):
 
15
import treemodel
 
16
 
 
17
from bzrlib.osutils import format_date
 
18
 
 
19
from linegraph import linegraph, same_branch
 
20
from graphcell import CellRendererGraph
 
21
from treemodel import TreeModel
 
22
 
 
23
 
 
24
class BranchWindow(gtk.Window):
25
25
    """Branch window.
26
26
 
27
27
    This object represents and manages a single window containing information
28
28
    for a particular branch.
29
29
    """
30
30
 
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
    def __init__(self, parent=None):
 
32
        gtk.Window.__init__(self, gtk.WINDOW_TOPLEVEL)
41
33
        self.set_border_width(0)
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")
 
34
        self.set_title("bzrk")
 
35
 
 
36
        self._parent = parent
 
37
 
 
38
        self.connect('key-press-event', self._on_key_pressed)
54
39
 
55
40
        # Use three-quarters of the screen by default
56
41
        screen = self.get_screen()
63
48
        icon = self.render_icon(gtk.STOCK_INDEX, gtk.ICON_SIZE_BUTTON)
64
49
        self.set_icon(icon)
65
50
 
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
 
 
69
51
        self.accel_group = gtk.AccelGroup()
70
52
        self.add_accel_group(self.accel_group)
71
53
 
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
 
 
86
54
        self.construct()
87
55
 
88
 
    def set_revision(self, revid):
89
 
        self.treeview.set_revision_id(revid)
90
 
 
91
56
    def construct(self):
92
57
        """Construct the window contents."""
93
58
        vbox = gtk.VBox(spacing=0)
94
59
        self.add(vbox)
95
60
 
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)
102
61
        vbox.pack_start(self.construct_navigation(), expand=False, fill=True)
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)
 
62
 
 
63
        paned = gtk.VPaned()
 
64
        paned.pack1(self.construct_top(), resize=True, shrink=False)
 
65
        paned.pack2(self.construct_bottom(), resize=False, shrink=True)
 
66
        paned.show()
 
67
        vbox.pack_start(paned, expand=True, fill=True)
 
68
        vbox.set_focus_child(paned)
107
69
 
108
70
        vbox.show()
109
71
 
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
 
 
244
72
    def construct_top(self):
245
73
        """Construct the top-half of the window."""
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
 
 
 
74
        scrollwin = gtk.ScrolledWindow()
 
75
        scrollwin.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
 
76
        scrollwin.set_shadow_type(gtk.SHADOW_IN)
 
77
        scrollwin.show()
 
78
 
 
79
        self.treeview = gtk.TreeView()
 
80
        self.treeview.set_rules_hint(True)
 
81
        self.treeview.set_search_column(4)
 
82
        self.treeview.get_selection().connect("changed", self._treeselection_changed_cb)
 
83
        self.treeview.connect("row-activated", self._treeview_row_activated_cb)
 
84
        self.treeview.connect("button-release-event", 
 
85
                self._treeview_row_mouseclick)
 
86
        self.treeview.set_property('fixed-height-mode', True)
 
87
        scrollwin.add(self.treeview)
261
88
        self.treeview.show()
262
89
 
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
 
90
        cell = gtk.CellRendererText()
 
91
        cell.set_property("width-chars", 15)
 
92
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
 
93
        column = gtk.TreeViewColumn("Revision No")
 
94
        column.set_resizable(True)
 
95
        column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
 
96
        column.set_fixed_width(cell.get_size(self.treeview)[2])
 
97
        column.pack_start(cell, expand=True)
 
98
        column.add_attribute(cell, "text", treemodel.REVNO)
 
99
        self.treeview.append_column(column)
 
100
 
 
101
        self.graph_cell = CellRendererGraph()
 
102
        self.graph_column = gtk.TreeViewColumn()
 
103
        self.graph_column.set_resizable(True)
 
104
        self.graph_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
 
105
        self.graph_column.pack_start(self.graph_cell, expand=False)
 
106
        self.graph_column.add_attribute(self.graph_cell, "node", treemodel.NODE)
 
107
        self.graph_column.add_attribute(self.graph_cell, "in-lines", treemodel.LAST_LINES)
 
108
        self.graph_column.add_attribute(self.graph_cell, "out-lines", treemodel.LINES)
 
109
        self.treeview.append_column(self.graph_column)
 
110
 
 
111
        cell = gtk.CellRendererText()
 
112
        cell.set_property("width-chars", 40)
 
113
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
 
114
        column = gtk.TreeViewColumn("Message")
 
115
        column.set_resizable(True)
 
116
        column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
 
117
        column.set_fixed_width(cell.get_size(self.treeview)[2])
 
118
        column.pack_start(cell, expand=True)
 
119
        column.add_attribute(cell, "text", treemodel.MESSAGE)
 
120
        self.treeview.append_column(column)
 
121
 
 
122
        cell = gtk.CellRendererText()
 
123
        cell.set_property("width-chars", 40)
 
124
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
 
125
        column = gtk.TreeViewColumn("Committer")
 
126
        column.set_resizable(True)
 
127
        column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
 
128
        column.set_fixed_width(cell.get_size(self.treeview)[2])
 
129
        column.pack_start(cell, expand=True)
 
130
        column.add_attribute(cell, "text", treemodel.COMMITER)
 
131
        self.treeview.append_column(column)
 
132
 
 
133
        cell = gtk.CellRendererText()
 
134
        cell.set_property("width-chars", 40)
 
135
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
 
136
        column = gtk.TreeViewColumn("Date")
 
137
        column.set_resizable(True)
 
138
        column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
 
139
        column.set_fixed_width(cell.get_size(self.treeview)[2])
 
140
        column.pack_start(cell, expand=True)
 
141
        column.add_attribute(cell, "text", treemodel.TIMESTAMP)
 
142
        self.treeview.append_column(column)
 
143
 
 
144
        return scrollwin
269
145
 
270
146
    def construct_navigation(self):
271
147
        """Construct the navigation buttons."""
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
 
148
        frame = gtk.Frame()
 
149
        frame.set_shadow_type(gtk.SHADOW_OUT)
 
150
        frame.show()
 
151
        
 
152
        hbox = gtk.HBox(spacing=12)
 
153
        frame.add(hbox)
 
154
        hbox.show()
 
155
 
 
156
        self.back_button = gtk.Button(stock=gtk.STOCK_GO_BACK)
 
157
        self.back_button.set_relief(gtk.RELIEF_NONE)
 
158
        self.back_button.add_accelerator("clicked", self.accel_group, ord('['),
 
159
                                         0, 0)
 
160
        self.back_button.connect("clicked", self._back_clicked_cb)
 
161
        hbox.pack_start(self.back_button, expand=False, fill=True)
 
162
        self.back_button.show()
 
163
 
 
164
        self.fwd_button = gtk.Button(stock=gtk.STOCK_GO_FORWARD)
 
165
        self.fwd_button.set_relief(gtk.RELIEF_NONE)
 
166
        self.fwd_button.add_accelerator("clicked", self.accel_group, ord(']'),
 
167
                                        0, 0)
 
168
        self.fwd_button.connect("clicked", self._fwd_clicked_cb)
 
169
        hbox.pack_start(self.fwd_button, expand=False, fill=True)
 
170
        self.fwd_button.show()
 
171
 
 
172
        return frame
290
173
 
291
174
    def construct_bottom(self):
292
175
        """Construct the bottom half of the window."""
293
 
        from bzrlib.plugins.gtk.revisionview import RevisionView
294
 
        self.revisionview = RevisionView(branch=self.branch)
 
176
        from bzrlib.plugins.gtk.logview import LogView
 
177
        self.logview = LogView(None, True, [], True)
295
178
        (width, height) = self.get_size()
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.set_go_callback(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
 
 
 
179
        self.logview.set_size_request(width, int(height / 2.5))
 
180
        self.logview.show()
 
181
        self.logview.set_show_callback(self._show_clicked_cb)
 
182
        self.logview.set_go_callback(self._go_clicked_cb)
 
183
        return self.logview
 
184
 
 
185
    def set_branch(self, branch, start, maxnum):
 
186
        """Set the branch and start position for this window.
 
187
 
 
188
        Creates a new TreeModel and populates it with information about
 
189
        the new branch before updating the window title and model of the
 
190
        treeview itself.
 
191
        """
 
192
        self.branch = branch
 
193
        self.set_title(branch.nick + " - bzrk")
 
194
        gobject.idle_add(self.populate_model, start, maxnum)
 
195
 
 
196
    def populate_model(self, start, maxnum):
 
197
        (linegraphdata, index, columns_len) = linegraph(self.branch,
 
198
                                                        start,
 
199
                                                        maxnum)
 
200
        self.model = TreeModel(self.branch, linegraphdata)
 
201
        self.graph_cell.columns_len = columns_len
 
202
        width = self.graph_cell.get_size(self.treeview)[2]
 
203
        self.graph_column.set_fixed_width(width)
 
204
        self.graph_column.set_max_width(width)
 
205
        self.index = index
 
206
        self.treeview.set_model(self.model)
 
207
        self.treeview.get_selection().select_path(0)
 
208
        return False
 
209
    
 
210
    def _on_key_pressed(self, widget, event):
 
211
        """ Key press event handler. """
 
212
        keyname = gtk.gdk.keyval_name(event.keyval)
 
213
        func = getattr(self, '_on_key_press_' + keyname, None)
 
214
        if func:
 
215
            return func(event)
 
216
 
 
217
    def _on_key_press_w(self, event):
 
218
        if event.state & gtk.gdk.CONTROL_MASK:
 
219
            self.destroy()
 
220
            if self._parent is None:
 
221
                gtk.main_quit()
 
222
 
 
223
    def _on_key_press_q(self, event):
 
224
        if event.state & gtk.gdk.CONTROL_MASK:
 
225
            gtk.main_quit()
 
226
    
305
227
    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)
 
228
        """Callback for when the treeview changes."""
 
229
        (model, selected_rows) = selection.get_selected_rows()
 
230
        if len(selected_rows) > 0:
 
231
            iter = self.model.get_iter(selected_rows[0])
 
232
            revision = self.model.get_value(iter, treemodel.REVISION)
 
233
            parents = self.model.get_value(iter, treemodel.PARENTS)
 
234
            children = self.model.get_value(iter, treemodel.CHILDREN)
 
235
            
 
236
            self.back_button.set_sensitive(len(parents) > 0)
 
237
            self.fwd_button.set_sensitive(len(children) > 0)
 
238
            tags = []
 
239
            if self.branch.supports_tags():
 
240
                tagdict = self.branch.tags.get_reverse_tag_dict()
 
241
                if tagdict.has_key(revision.revision_id):
 
242
                    tags = tagdict[revision.revision_id]
 
243
            self.logview.set_revision(revision, tags, children)
353
244
 
354
245
    def _back_clicked_cb(self, *args):
355
246
        """Callback for when the back button is clicked."""
356
 
        self.treeview.back()
357
 
        
 
247
        (path, col) = self.treeview.get_cursor()
 
248
        revision = self.model[path][0]
 
249
        parents = self.model[path][4]
 
250
        if not len(parents):
 
251
            return
 
252
 
 
253
        for parent_id in parents:
 
254
            parent = self.revisions[self.index[parent_id]]
 
255
            if same_branch(revision, parent):
 
256
                self.treeview.set_cursor(self.index[parent_id])
 
257
                break
 
258
        else:
 
259
            self.treeview.set_cursor(self.index[parents[0]])
 
260
        self.treeview.grab_focus()
 
261
 
358
262
    def _fwd_clicked_cb(self, *args):
359
263
        """Callback for when the forward button is clicked."""
360
 
        self.treeview.forward()
 
264
        (path, col) = self.treeview.get_cursor()
 
265
        revision = self.model[path][0]
 
266
        children = self.model[path][5]
 
267
        if not len(children):
 
268
            return
 
269
 
 
270
        for child_id in children:
 
271
            child = self.revisions[self.index[child_id]]
 
272
            if same_branch(child, revision):
 
273
                self.treeview.set_cursor(self.index[child_id])
 
274
                break
 
275
        else:
 
276
            self.treeview.set_cursor(self.index[children[0]])
 
277
        self.treeview.grab_focus()
361
278
 
362
279
    def _go_clicked_cb(self, revid):
363
280
        """Callback for when the go button for a parent is clicked."""
364
 
        self.treeview.set_revision_id(revid)
 
281
        self.treeview.set_cursor(self.index[revid])
 
282
        self.treeview.grab_focus()
 
283
 
 
284
    def show_diff(self, branch, revid, parentid):
 
285
        """Open a new window to show a diff between the given revisions."""
 
286
        from bzrlib.plugins.gtk.diff import DiffWindow
 
287
        window = DiffWindow()
 
288
        (parent_tree, rev_tree) = branch.repository.revision_trees([parentid, 
 
289
                                                                   revid])
 
290
        description = revid + " - " + branch.nick
 
291
        window.set_diff(description, rev_tree, parent_tree)
 
292
        window.show()
365
293
 
366
294
    def _show_clicked_cb(self, revid, parentid):
367
295
        """Callback for when the show button for a parent is clicked."""
368
 
        self.treeview.show_diff(revid, parentid)
369
 
        self.treeview.grab_focus()
370
 
 
371
 
    def _set_revision_cb(self, w, revision_id):
372
 
        self.treeview.set_revision_id(revision_id)
373
 
 
374
 
    def _brokenlines_toggled_cb(self, button):
375
 
        self.compact_view = button.get_active()
376
 
 
377
 
        if self.compact_view:
378
 
            option = 'yes'
379
 
        else:
380
 
            option = 'no'
381
 
 
382
 
        self.config.set_user_option('viz-compact-view', option)
383
 
        self.treeview.set_property('compact', self.compact_view)
384
 
        self.treeview.refresh()
385
 
 
386
 
    def _tag_revision_cb(self, w):
387
 
        try:
388
 
            self.treeview.set_sensitive(False)
389
 
            self.branch.unlock()
390
 
            dialog = AddTagDialog(self.branch.repository, self.treeview.get_revision().revision_id, self.branch)
391
 
            response = dialog.run()
392
 
            if response != gtk.RESPONSE_NONE:
393
 
                dialog.hide()
394
 
            
395
 
                if response == gtk.RESPONSE_OK:
396
 
                    try:
397
 
                        self.branch.lock_write()
398
 
                        self.branch.tags.set_tag(dialog.tagname, dialog._revid)
399
 
                    finally:
400
 
                        self.branch.unlock()
401
 
                
402
 
                dialog.destroy()
403
 
 
404
 
        finally:
405
 
            self.branch.lock_read()
406
 
            self.treeview.emit("revision-selected")
407
 
            self.treeview.set_sensitive(True)
408
 
 
409
 
    def _col_visibility_changed(self, col, property):
410
 
        self.config.set_user_option(property + '-column-visible', col.get_active())
411
 
        self.treeview.set_property(property + '-column-visible', col.get_active())
412
 
 
413
 
    def _toolbar_visibility_changed(self, col):
414
 
        if col.get_active():
415
 
            self.toolbar.show() 
416
 
        else:
417
 
            self.toolbar.hide()
418
 
 
419
 
    def _show_about_cb(self, w):
420
 
        dialog = AboutDialog()
421
 
        dialog.connect('response', lambda d,r: d.destroy())
422
 
        dialog.run()
423
 
 
424
 
    def _refresh_clicked(self, w):
425
 
        self.treeview.update()
 
296
        self.show_diff(self.branch, revid, parentid)
 
297
        self.treeview.grab_focus()
 
298
 
 
299
    def _treeview_row_mouseclick(self, widget, event):
 
300
        from bzrlib.plugins.gtk.revisionmenu import RevisionPopupMenu
 
301
        if event.button == 3:
 
302
            menu = RevisionPopupMenu(self.branch.repository, 
 
303
                [x.revision_id for x in self.selected_revisions()],
 
304
                self.branch)
 
305
            menu.popup(None, None, None, event.button, event.get_time())
 
306
 
 
307
    def selected_revision(self, path):
 
308
        return self.model[path][treemodel.REVISION]
 
309
 
 
310
    def selected_revisions(self):
 
311
        return [self.selected_revision(path) for path in \
 
312
                self.treeview.get_selection().get_selected_rows()[1]]
 
313
 
 
314
    def _treeview_row_activated_cb(self, widget, path, col):
 
315
        # TODO: more than one parent
 
316
        """Callback for when a treeview row gets activated."""
 
317
        revision_id = self.model[path][treemodel.REVID]
 
318
        parents = self.model[path][treemodel.PARENTS]
 
319
        if len(parents) == 0:
 
320
            # Ignore revisions without parent
 
321
            return
 
322
        parent_id = parents[0]
 
323
        self.show_diff(self.branch, revision_id, parent_id)
 
324
        self.treeview.grab_focus()