/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: 2008-03-14 02:19:21 UTC
  • mto: (452.2.3 trunk)
  • mto: This revision was merged to the branch mainline in revision 453.
  • Revision ID: jelmer@samba.org-20080314021921-2dgptk62dhp7pd91
Honor child_submit_to in the submit_branch if no email address was specified.
Consistent with the changes in bzr.dev.

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
 
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):
 
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.plugins.gtk.branchview import TreeView, treemodel
 
20
from bzrlib.revision import Revision, NULL_REVISION
 
21
from bzrlib.config import BranchConfig
 
22
from bzrlib.config import GlobalConfig
 
23
 
 
24
class BranchWindow(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, parent=None):
32
 
        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)
33
41
        self.set_border_width(0)
34
 
        self.set_title("bzrk")
35
 
 
36
 
        self._parent = parent
37
 
 
38
 
        self.connect('key-press-event', self._on_key_pressed)
 
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")
39
54
 
40
55
        # Use three-quarters of the screen by default
41
56
        screen = self.get_screen()
48
63
        icon = self.render_icon(gtk.STOCK_INDEX, gtk.ICON_SIZE_BUTTON)
49
64
        self.set_icon(icon)
50
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
 
51
69
        self.accel_group = gtk.AccelGroup()
52
70
        self.add_accel_group(self.accel_group)
53
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
 
54
86
        self.construct()
55
87
 
 
88
    def set_revision(self, revid):
 
89
        self.treeview.set_revision_id(revid)
 
90
 
56
91
    def construct(self):
57
92
        """Construct the window contents."""
58
93
        vbox = gtk.VBox(spacing=0)
59
94
        self.add(vbox)
60
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)
61
102
        vbox.pack_start(self.construct_navigation(), expand=False, fill=True)
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)
 
103
        
 
104
        vbox.pack_start(self.paned, expand=True, fill=True)
 
105
        vbox.set_focus_child(self.paned)
69
106
 
70
107
        vbox.show()
71
108
 
 
109
    def construct_menubar(self):
 
110
        menubar = gtk.MenuBar()
 
111
 
 
112
        file_menu = gtk.Menu()
 
113
        file_menuitem = gtk.MenuItem("_File")
 
114
        file_menuitem.set_submenu(file_menu)
 
115
 
 
116
        file_menu_close = gtk.ImageMenuItem(gtk.STOCK_CLOSE, self.accel_group)
 
117
        file_menu_close.connect('activate', lambda x: self.destroy())
 
118
        
 
119
        file_menu_quit = gtk.ImageMenuItem(gtk.STOCK_QUIT, self.accel_group)
 
120
        file_menu_quit.connect('activate', lambda x: gtk.main_quit())
 
121
        
 
122
        if self._parent is not None:
 
123
            file_menu.add(file_menu_close)
 
124
        file_menu.add(file_menu_quit)
 
125
 
 
126
        edit_menu = gtk.Menu()
 
127
        edit_menuitem = gtk.MenuItem("_Edit")
 
128
        edit_menuitem.set_submenu(edit_menu)
 
129
 
 
130
        edit_menu_find = gtk.ImageMenuItem(gtk.STOCK_FIND)
 
131
 
 
132
        edit_menu_branchopts = gtk.MenuItem("Branch Settings")
 
133
        edit_menu_branchopts.connect('activate', lambda x: PreferencesWindow(self.branch.get_config()).show())
 
134
 
 
135
        edit_menu_globopts = gtk.MenuItem("Global Settings")
 
136
        edit_menu_globopts.connect('activate', lambda x: PreferencesWindow().show())
 
137
 
 
138
        edit_menu.add(edit_menu_find)
 
139
        edit_menu.add(edit_menu_branchopts)
 
140
        edit_menu.add(edit_menu_globopts)
 
141
 
 
142
        view_menu = gtk.Menu()
 
143
        view_menuitem = gtk.MenuItem("_View")
 
144
        view_menuitem.set_submenu(view_menu)
 
145
 
 
146
        view_menu_toolbar = gtk.CheckMenuItem("Show Toolbar")
 
147
        view_menu_toolbar.set_active(True)
 
148
        view_menu_toolbar.connect('toggled', self._toolbar_visibility_changed)
 
149
 
 
150
        view_menu_compact = gtk.CheckMenuItem("Show Compact Graph")
 
151
        view_menu_compact.set_active(self.compact_view)
 
152
        view_menu_compact.connect('activate', self._brokenlines_toggled_cb)
 
153
 
 
154
        view_menu.add(view_menu_toolbar)
 
155
        view_menu.add(view_menu_compact)
 
156
        view_menu.add(gtk.SeparatorMenuItem())
 
157
 
 
158
        for (label, name) in [("Revision _Number", "revno"), ("_Date", "date")]:
 
159
            col = gtk.CheckMenuItem("Show " + label + " Column")
 
160
            col.set_active(self.treeview.get_property(name + "-column-visible"))
 
161
            col.connect('toggled', self._col_visibility_changed, name)
 
162
            view_menu.add(col)
 
163
 
 
164
        go_menu = gtk.Menu()
 
165
        go_menu.set_accel_group(self.accel_group)
 
166
        go_menuitem = gtk.MenuItem("_Go")
 
167
        go_menuitem.set_submenu(go_menu)
 
168
        
 
169
        go_menu_next = self.next_rev_action.create_menu_item()
 
170
        go_menu_prev = self.prev_rev_action.create_menu_item()
 
171
 
 
172
        self.go_menu_tags = gtk.MenuItem("_Tags")
 
173
        self._update_tags()
 
174
 
 
175
        go_menu.add(go_menu_next)
 
176
        go_menu.add(go_menu_prev)
 
177
        go_menu.add(gtk.SeparatorMenuItem())
 
178
        go_menu.add(self.go_menu_tags)
 
179
 
 
180
        revision_menu = gtk.Menu()
 
181
        revision_menuitem = gtk.MenuItem("_Revision")
 
182
        revision_menuitem.set_submenu(revision_menu)
 
183
 
 
184
        revision_menu_diff = gtk.MenuItem("View Changes")
 
185
        revision_menu_diff.connect('activate', 
 
186
                lambda w: self.treeview.show_diff())
 
187
 
 
188
        revision_menu_tag = gtk.MenuItem("Tag Revision")
 
189
        revision_menu_tag.connect('activate', self._tag_revision_cb)
 
190
 
 
191
        revision_menu.add(revision_menu_tag)
 
192
        revision_menu.add(revision_menu_diff)
 
193
 
 
194
        branch_menu = gtk.Menu()
 
195
        branch_menuitem = gtk.MenuItem("_Branch")
 
196
        branch_menuitem.set_submenu(branch_menu)
 
197
 
 
198
        branch_menu.add(gtk.MenuItem("Pu_ll Revisions"))
 
199
        branch_menu.add(gtk.MenuItem("Pu_sh Revisions"))
 
200
 
 
201
        help_menu = gtk.Menu()
 
202
        help_menuitem = gtk.MenuItem("_Help")
 
203
        help_menuitem.set_submenu(help_menu)
 
204
 
 
205
        help_about_menuitem = gtk.ImageMenuItem(gtk.STOCK_ABOUT, self.accel_group)
 
206
        help_about_menuitem.connect('activate', self._about_dialog_cb)
 
207
 
 
208
        help_menu.add(help_about_menuitem)
 
209
 
 
210
        menubar.add(file_menuitem)
 
211
        menubar.add(edit_menuitem)
 
212
        menubar.add(view_menuitem)
 
213
        menubar.add(go_menuitem)
 
214
        menubar.add(revision_menuitem)
 
215
        menubar.add(branch_menuitem)
 
216
        menubar.add(help_menuitem)
 
217
        menubar.show_all()
 
218
 
 
219
        return menubar
 
220
 
72
221
    def construct_top(self):
73
222
        """Construct the top-half of the window."""
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)
 
223
        # FIXME: Make broken_line_length configurable
 
224
 
 
225
        self.treeview = TreeView(self.branch, self.start, self.maxnum, self.compact_view)
 
226
 
 
227
        self.treeview.connect('revision-selected',
 
228
                self._treeselection_changed_cb)
 
229
        self.treeview.connect('revision-activated',
 
230
                self._tree_revision_activated)
 
231
 
 
232
        self.treeview.connect('tag-added', lambda w, t, r: self._update_tags())
 
233
 
 
234
        for col in ["revno", "date"]:
 
235
            option = self.config.get_user_option(col + '-column-visible')
 
236
            if option is not None:
 
237
                self.treeview.set_property(col + '-column-visible', option == 'True')
 
238
 
88
239
        self.treeview.show()
89
240
 
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
 
241
        align = gtk.Alignment(0.0, 0.0, 1.0, 1.0)
 
242
        align.set_padding(5, 0, 0, 0)
 
243
        align.add(self.treeview)
 
244
        align.show()
 
245
 
 
246
        return align
145
247
 
146
248
    def construct_navigation(self):
147
249
        """Construct the navigation buttons."""
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
 
250
        self.toolbar = gtk.Toolbar()
 
251
        self.toolbar.set_style(gtk.TOOLBAR_BOTH_HORIZ)
 
252
 
 
253
        self.prev_button = self.prev_rev_action.create_tool_item()
 
254
        self.toolbar.insert(self.prev_button, -1)
 
255
 
 
256
        self.next_button = self.next_rev_action.create_tool_item()
 
257
        self.toolbar.insert(self.next_button, -1)
 
258
 
 
259
        self.toolbar.insert(gtk.SeparatorToolItem(), -1)
 
260
 
 
261
        refresh_button = gtk.ToolButton(gtk.STOCK_REFRESH)
 
262
        refresh_button.connect('clicked', self._refresh_clicked)
 
263
        self.toolbar.insert(refresh_button, -1)
 
264
 
 
265
        self.toolbar.show_all()
 
266
 
 
267
        return self.toolbar
173
268
 
174
269
    def construct_bottom(self):
175
270
        """Construct the bottom half of the window."""
176
 
        from bzrlib.plugins.gtk.logview import LogView
177
 
        self.logview = LogView(None, True, [], True)
 
271
        from bzrlib.plugins.gtk.revisionview import RevisionView
 
272
        self.revisionview = RevisionView(branch=self.branch)
178
273
        (width, height) = self.get_size()
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
 
    
 
274
        self.revisionview.set_size_request(width, int(height / 2.5))
 
275
        self.revisionview.show()
 
276
        self.revisionview.set_show_callback(self._show_clicked_cb)
 
277
        self.revisionview.connect('notify::revision', self._go_clicked_cb)
 
278
        self.treeview.connect('tag-added', lambda w, t, r: self.revisionview.update_tags())
 
279
        return self.revisionview
 
280
 
 
281
    def _tag_selected_cb(self, menuitem, revid):
 
282
        self.treeview.set_revision_id(revid)
 
283
 
227
284
    def _treeselection_changed_cb(self, selection, *args):
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)
 
285
        """callback for when the treeview changes."""
 
286
        revision = self.treeview.get_revision()
 
287
        parents  = self.treeview.get_parents()
 
288
        children = self.treeview.get_children()
 
289
 
 
290
        if revision is not None:
 
291
            prev_menu = gtk.Menu()
 
292
            if len(parents) > 0:
 
293
                self.prev_rev_action.set_sensitive(True)
 
294
                for parent_id in parents:
 
295
                    parent = self.branch.repository.get_revision(parent_id)
 
296
                    try:
 
297
                        str = ' (' + parent.properties['branch-nick'] + ')'
 
298
                    except KeyError:
 
299
                        str = ""
 
300
 
 
301
                    item = gtk.MenuItem(parent.message.split("\n")[0] + str)
 
302
                    item.connect('activate', self._set_revision_cb, parent_id)
 
303
                    prev_menu.add(item)
 
304
                prev_menu.show_all()
 
305
            else:
 
306
                self.prev_rev_action.set_sensitive(False)
 
307
                prev_menu.hide()
 
308
 
 
309
            self.prev_button.set_menu(prev_menu)
 
310
 
 
311
            next_menu = gtk.Menu()
 
312
            if len(children) > 0:
 
313
                self.next_rev_action.set_sensitive(True)
 
314
                for child_id in children:
 
315
                    child = self.branch.repository.get_revision(child_id)
 
316
                    try:
 
317
                        str = ' (' + child.properties['branch-nick'] + ')'
 
318
                    except KeyError:
 
319
                        str = ""
 
320
 
 
321
                    item = gtk.MenuItem(child.message.split("\n")[0] + str)
 
322
                    item.connect('activate', self._set_revision_cb, child_id)
 
323
                    next_menu.add(item)
 
324
                next_menu.show_all()
 
325
            else:
 
326
                self.next_rev_action.set_sensitive(False)
 
327
                next_menu.hide()
 
328
 
 
329
            self.next_button.set_menu(next_menu)
 
330
 
 
331
            self.revisionview.set_revision(revision)
 
332
            self.revisionview.set_children(children)
 
333
    
 
334
    def _tree_revision_activated(self, widget, path, col):
 
335
        # TODO: more than one parent
 
336
        """Callback for when a treeview row gets activated."""
 
337
        revision = self.treeview.get_revision()
 
338
        parents  = self.treeview.get_parents()
 
339
 
 
340
        if len(parents) == 0:
 
341
            parent_id = None
 
342
        else:
 
343
            parent_id = parents[0]
 
344
 
 
345
        self.show_diff(revision.revision_id, parent_id)
 
346
        self.treeview.grab_focus()
 
347
    
244
348
 
245
349
    def _back_clicked_cb(self, *args):
246
350
        """Callback for when the back button is clicked."""
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
 
 
 
351
        self.treeview.back()
 
352
        
262
353
    def _fwd_clicked_cb(self, *args):
263
354
        """Callback for when the forward button is clicked."""
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()
278
 
 
279
 
    def _go_clicked_cb(self, revid):
 
355
        self.treeview.forward()
 
356
 
 
357
    def _go_clicked_cb(self, w, p):
280
358
        """Callback for when the go button for a parent is clicked."""
281
 
        self.treeview.set_cursor(self.index[revid])
 
359
        if self.revisionview.get_revision() is not None:
 
360
            self.treeview.set_revision(self.revisionview.get_revision())
 
361
 
 
362
    def _show_clicked_cb(self, revid, parentid):
 
363
        """Callback for when the show button for a parent is clicked."""
 
364
        self.show_diff(revid, parentid)
282
365
        self.treeview.grab_focus()
283
366
 
284
 
    def show_diff(self, branch, revid, parentid):
 
367
    def _set_revision_cb(self, w, revision_id):
 
368
        self.treeview.set_revision_id(revision_id)
 
369
 
 
370
    def _brokenlines_toggled_cb(self, button):
 
371
        self.compact_view = button.get_active()
 
372
 
 
373
        if self.compact_view:
 
374
            option = 'yes'
 
375
        else:
 
376
            option = 'no'
 
377
 
 
378
        self.config.set_user_option('viz-compact-view', option)
 
379
        self.treeview.set_property('compact', self.compact_view)
 
380
        self.treeview.refresh()
 
381
 
 
382
    def _tag_revision_cb(self, w):
 
383
        try:
 
384
            self.treeview.set_sensitive(False)
 
385
            dialog = AddTagDialog(self.branch.repository, self.treeview.get_revision().revision_id, self.branch)
 
386
            response = dialog.run()
 
387
            if response != gtk.RESPONSE_NONE:
 
388
                dialog.hide()
 
389
            
 
390
                if response == gtk.RESPONSE_OK:
 
391
                    self.treeview.add_tag(dialog.tagname, dialog._revid)
 
392
                
 
393
                dialog.destroy()
 
394
 
 
395
        finally:
 
396
            self.treeview.set_sensitive(True)
 
397
 
 
398
    def _about_dialog_cb(self, w):
 
399
        from bzrlib.plugins.gtk.about import AboutDialog
 
400
 
 
401
        AboutDialog().run()
 
402
 
 
403
    def _col_visibility_changed(self, col, property):
 
404
        self.config.set_user_option(property + '-column-visible', col.get_active())
 
405
        self.treeview.set_property(property + '-column-visible', col.get_active())
 
406
 
 
407
    def _toolbar_visibility_changed(self, col):
 
408
        if col.get_active():
 
409
            self.toolbar.show() 
 
410
        else:
 
411
            self.toolbar.hide()
 
412
 
 
413
    def _show_about_cb(self, w):
 
414
        dialog = AboutDialog()
 
415
        dialog.connect('response', lambda d,r: d.destroy())
 
416
        dialog.run()
 
417
 
 
418
    def _refresh_clicked(self, w):
 
419
        self.treeview.refresh()
 
420
 
 
421
    def _update_tags(self):
 
422
        menu = gtk.Menu()
 
423
 
 
424
        if self.branch.supports_tags():
 
425
            tags = self.branch.tags.get_tag_dict().items()
 
426
            tags.sort()
 
427
            tags.reverse()
 
428
            for tag, revid in tags:
 
429
                tag_item = gtk.MenuItem(tag)
 
430
                tag_item.connect('activate', self._tag_selected_cb, revid)
 
431
                menu.add(tag_item)
 
432
            self.go_menu_tags.set_submenu(menu)
 
433
 
 
434
            self.go_menu_tags.set_sensitive(len(tags) != 0)
 
435
        else:
 
436
            self.go_menu_tags.set_sensitive(False)
 
437
 
 
438
        self.go_menu_tags.show_all()
 
439
 
 
440
    def show_diff(self, revid=None, parentid=None):
285
441
        """Open a new window to show a diff between the given revisions."""
286
442
        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
 
443
        window = DiffWindow(parent=self)
 
444
 
 
445
        if parentid is None:
 
446
            parentid = NULL_REVISION
 
447
 
 
448
        rev_tree    = self.branch.repository.revision_tree(revid)
 
449
        parent_tree = self.branch.repository.revision_tree(parentid)
 
450
 
 
451
        description = revid + " - " + self.branch.nick
291
452
        window.set_diff(description, rev_tree, parent_tree)
292
453
        window.show()
293
454
 
294
 
    def _show_clicked_cb(self, revid, parentid):
295
 
        """Callback for when the show button for a parent is clicked."""
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()
 
455