/b-gtk/fix-viz

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/b-gtk/fix-viz
1 by Scott James Remnant
Commit the first version of bzrk.
1
# -*- coding: UTF-8 -*-
2
"""Branch window.
3
4
This module contains the code to manage the branch information window,
5
which contains both the revision graph and details panes.
6
"""
7
8
__copyright__ = "Copyright © 2005 Canonical Ltd."
9
__author__    = "Scott James Remnant <scott@ubuntu.com>"
10
11
12
import gtk
13
import gobject
14
import pango
15
298.2.1 by Daniel Schierbeck
Refactored the GTK window code, creating a single base window class that handles keyboard events.
16
from bzrlib.plugins.gtk.window import Window
450.4.1 by Daniel Schierbeck
Added tag icon to branch history window.
17
from bzrlib.plugins.gtk import icon_path
365 by Daniel Schierbeck
Fixed locks and made tagging work.
18
from bzrlib.plugins.gtk.tags import AddTagDialog
338 by Daniel Schierbeck
Added Preferences menu item.
19
from bzrlib.plugins.gtk.preferences import PreferencesWindow
423.1.17 by Gary van der Merwe
Reuse the viz treeview in the revision browser.
20
from bzrlib.plugins.gtk.branchview import TreeView, treemodel
443 by Szilveszter Farkas (Phanatic)
Trivial fix for #149061 (be able to show the diff for revision 1).
21
from bzrlib.revision import Revision, NULL_REVISION
361 by Daniel Schierbeck
Added branch settings menu item.
22
from bzrlib.config import BranchConfig
330.2.5 by Daniel Schierbeck
Support persistence of compact view option.
23
from bzrlib.config import GlobalConfig
1 by Scott James Remnant
Commit the first version of bzrk.
24
298.2.1 by Daniel Schierbeck
Refactored the GTK window code, creating a single base window class that handles keyboard events.
25
class BranchWindow(Window):
1 by Scott James Remnant
Commit the first version of bzrk.
26
    """Branch window.
27
28
    This object represents and manages a single window containing information
29
    for a particular branch.
30
    """
31
452.4.1 by Jelmer Vernooij
Support displaying multiple tips in viz.
32
    def __init__(self, branch, start_revs, maxnum, parent=None):
322 by Jelmer Vernooij
Add docstrings.
33
        """Create a new BranchWindow.
34
35
        :param branch: Branch object for branch to show.
452.4.1 by Jelmer Vernooij
Support displaying multiple tips in viz.
36
        :param start_revs: Revision ids of top revisions.
322 by Jelmer Vernooij
Add docstrings.
37
        :param maxnum: Maximum number of revisions to display, 
38
                       None for no limit.
39
        """
40
298.2.1 by Daniel Schierbeck
Refactored the GTK window code, creating a single base window class that handles keyboard events.
41
        Window.__init__(self, parent=parent)
1 by Scott James Remnant
Commit the first version of bzrk.
42
        self.set_border_width(0)
315 by Daniel Schierbeck
Removed BranchWindow.set_branch(), used constructor instead.
43
330.2.4 by Daniel Schierbeck
Made use of compact view optional.
44
        self.branch      = branch
452.4.1 by Jelmer Vernooij
Support displaying multiple tips in viz.
45
        self.start_revs  = start_revs
330.2.4 by Daniel Schierbeck
Made use of compact view optional.
46
        self.maxnum      = maxnum
330.2.5 by Daniel Schierbeck
Support persistence of compact view option.
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
315 by Daniel Schierbeck
Removed BranchWindow.set_branch(), used constructor instead.
53
54
        self.set_title(branch.nick + " - revision history")
1 by Scott James Remnant
Commit the first version of bzrk.
55
56
        # Use three-quarters of the screen by default
57
        screen = self.get_screen()
4 by Scott James Remnant
Use the size of the first monitor rather than the entire screen
58
        monitor = screen.get_monitor_geometry(0)
59
        width = int(monitor.width * 0.75)
60
        height = int(monitor.height * 0.75)
1 by Scott James Remnant
Commit the first version of bzrk.
61
        self.set_default_size(width, height)
62
63
        # FIXME AndyFitz!
64
        icon = self.render_icon(gtk.STOCK_INDEX, gtk.ICON_SIZE_BUTTON)
65
        self.set_icon(icon)
66
384 by Daniel Schierbeck
Added accelerator for Next Revision action.
67
        gtk.accel_map_add_entry("<viz>/Go/Next Revision", gtk.keysyms.Up, gtk.gdk.MOD1_MASK)
383 by Daniel Schierbeck
Switched to using symbolic names for keyvals.
68
        gtk.accel_map_add_entry("<viz>/Go/Previous Revision", gtk.keysyms.Down, gtk.gdk.MOD1_MASK)
382 by Daniel Schierbeck
Made accelerator for Previous Revision work.
69
3 by Scott James Remnant
Split the display in two with a pane, we'll use the bottom half to show
70
        self.accel_group = gtk.AccelGroup()
71
        self.add_accel_group(self.accel_group)
72
388 by Daniel Schierbeck
Switched to using the Previous/Next Revision actions to create tool buttons.
73
        gtk.Action.set_tool_item_type(gtk.MenuToolButton)
74
385 by Daniel Schierbeck
Created a single action for Previous Revision.
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
386 by Daniel Schierbeck
Created a single action for Next Revision.
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
1 by Scott James Remnant
Commit the first version of bzrk.
87
        self.construct()
88
369 by Daniel Schierbeck
Fixed bug with compact view toggling.
89
    def set_revision(self, revid):
90
        self.treeview.set_revision_id(revid)
330.2.4 by Daniel Schierbeck
Made use of compact view optional.
91
1 by Scott James Remnant
Commit the first version of bzrk.
92
    def construct(self):
93
        """Construct the window contents."""
331 by Daniel Schierbeck
Added basic menu bar.
94
        vbox = gtk.VBox(spacing=0)
44 by David Allouche
reorganise branch window
95
        self.add(vbox)
96
375 by Daniel Schierbeck
Fixed crash when toggling compact view.
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()
358 by Daniel Schierbeck
Generalized the hiding/showing code.
101
331 by Daniel Schierbeck
Added basic menu bar.
102
        vbox.pack_start(self.construct_menubar(), expand=False, fill=True)
44 by David Allouche
reorganise branch window
103
        vbox.pack_start(self.construct_navigation(), expand=False, fill=True)
280.2.1 by Gary van der Merwe
Add a message to the viz window to indicate that graph is still loading.
104
        
369 by Daniel Schierbeck
Fixed bug with compact view toggling.
105
        vbox.pack_start(self.paned, expand=True, fill=True)
106
        vbox.set_focus_child(self.paned)
44 by David Allouche
reorganise branch window
107
108
        vbox.show()
331 by Daniel Schierbeck
Added basic menu bar.
109
110
    def construct_menubar(self):
111
        menubar = gtk.MenuBar()
112
113
        file_menu = gtk.Menu()
334 by Daniel Schierbeck
Added icons to menus.
114
        file_menuitem = gtk.MenuItem("_File")
331 by Daniel Schierbeck
Added basic menu bar.
115
        file_menuitem.set_submenu(file_menu)
116
362 by Daniel Schierbeck
Added accel group to File -> Close menu item.
117
        file_menu_close = gtk.ImageMenuItem(gtk.STOCK_CLOSE, self.accel_group)
331 by Daniel Schierbeck
Added basic menu bar.
118
        file_menu_close.connect('activate', lambda x: self.destroy())
119
        
363 by Daniel Schierbeck
Added File -> Quit menu item.
120
        file_menu_quit = gtk.ImageMenuItem(gtk.STOCK_QUIT, self.accel_group)
121
        file_menu_quit.connect('activate', lambda x: gtk.main_quit())
122
        
408 by Daniel Schierbeck
Made the close menu item actually appear when the viz is opened from another window.
123
        if self._parent is not None:
406 by Daniel Schierbeck
Made the viz show the close menu item only if opened from another window.
124
            file_menu.add(file_menu_close)
363 by Daniel Schierbeck
Added File -> Quit menu item.
125
        file_menu.add(file_menu_quit)
331 by Daniel Schierbeck
Added basic menu bar.
126
338 by Daniel Schierbeck
Added Preferences menu item.
127
        edit_menu = gtk.Menu()
128
        edit_menuitem = gtk.MenuItem("_Edit")
129
        edit_menuitem.set_submenu(edit_menu)
130
340 by Daniel Schierbeck
Added edit->find menu item stub.
131
        edit_menu_find = gtk.ImageMenuItem(gtk.STOCK_FIND)
132
361 by Daniel Schierbeck
Added branch settings menu item.
133
        edit_menu_branchopts = gtk.MenuItem("Branch Settings")
134
        edit_menu_branchopts.connect('activate', lambda x: PreferencesWindow(self.branch.get_config()).show())
135
407 by Daniel Schierbeck
Renamed Preferences menu item into Global Settings.
136
        edit_menu_globopts = gtk.MenuItem("Global Settings")
137
        edit_menu_globopts.connect('activate', lambda x: PreferencesWindow().show())
338 by Daniel Schierbeck
Added Preferences menu item.
138
340 by Daniel Schierbeck
Added edit->find menu item stub.
139
        edit_menu.add(edit_menu_find)
361 by Daniel Schierbeck
Added branch settings menu item.
140
        edit_menu.add(edit_menu_branchopts)
407 by Daniel Schierbeck
Renamed Preferences menu item into Global Settings.
141
        edit_menu.add(edit_menu_globopts)
338 by Daniel Schierbeck
Added Preferences menu item.
142
348 by Daniel Schierbeck
Added toggle item for revision number column.
143
        view_menu = gtk.Menu()
144
        view_menuitem = gtk.MenuItem("_View")
145
        view_menuitem.set_submenu(view_menu)
146
351 by Daniel Schierbeck
Added option to hide the toolbar.
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
370 by Daniel Schierbeck
Moved compact graph toggle to the menubar.
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
351 by Daniel Schierbeck
Added option to hide the toolbar.
155
        view_menu.add(view_menu_toolbar)
370 by Daniel Schierbeck
Moved compact graph toggle to the menubar.
156
        view_menu.add(view_menu_compact)
351 by Daniel Schierbeck
Added option to hide the toolbar.
157
        view_menu.add(gtk.SeparatorMenuItem())
358 by Daniel Schierbeck
Generalized the hiding/showing code.
158
452.4.2 by Jelmer Vernooij
Hide revision number column if more than one branch was specified.
159
        self.mnu_show_revno_column = gtk.CheckMenuItem("Show Revision _Number Column")
160
        self.mnu_show_date_column = gtk.CheckMenuItem("Show _Date Column")
161
162
        # Revision numbers are pointless if there are multiple branches
163
        if len(self.start_revs) > 1:
164
            self.mnu_show_revno_column.set_sensitive(False)
165
            self.treeview.set_property('revno-column-visible', False)
166
167
        for (col, name) in [(self.mnu_show_revno_column, "revno"), 
168
                            (self.mnu_show_date_column, "date")]:
358 by Daniel Schierbeck
Generalized the hiding/showing code.
169
            col.set_active(self.treeview.get_property(name + "-column-visible"))
170
            col.connect('toggled', self._col_visibility_changed, name)
171
            view_menu.add(col)
348 by Daniel Schierbeck
Added toggle item for revision number column.
172
331 by Daniel Schierbeck
Added basic menu bar.
173
        go_menu = gtk.Menu()
382 by Daniel Schierbeck
Made accelerator for Previous Revision work.
174
        go_menu.set_accel_group(self.accel_group)
334 by Daniel Schierbeck
Added icons to menus.
175
        go_menuitem = gtk.MenuItem("_Go")
331 by Daniel Schierbeck
Added basic menu bar.
176
        go_menuitem.set_submenu(go_menu)
177
        
390 by Daniel Schierbeck
Made the Previous/Next Revision menu items local variables.
178
        go_menu_next = self.next_rev_action.create_menu_item()
179
        go_menu_prev = self.prev_rev_action.create_menu_item()
334 by Daniel Schierbeck
Added icons to menus.
180
450.4.1 by Daniel Schierbeck
Added tag icon to branch history window.
181
        tag_image = gtk.Image()
182
        tag_image.set_from_file(icon_path("tag-16.png"))
183
        self.go_menu_tags = gtk.ImageMenuItem("_Tags")
184
        self.go_menu_tags.set_image(tag_image)
423.7.5 by Daniel Schierbeck
Made the revision history window update the Go->Tags menu when a tag is added.
185
        self._update_tags()
399 by Daniel Schierbeck
Made tags menu insensitive when there are no tags to display.
186
390 by Daniel Schierbeck
Made the Previous/Next Revision menu items local variables.
187
        go_menu.add(go_menu_next)
188
        go_menu.add(go_menu_prev)
334 by Daniel Schierbeck
Added icons to menus.
189
        go_menu.add(gtk.SeparatorMenuItem())
423.7.5 by Daniel Schierbeck
Made the revision history window update the Go->Tags menu when a tag is added.
190
        go_menu.add(self.go_menu_tags)
334 by Daniel Schierbeck
Added icons to menus.
191
335 by Daniel Schierbeck
Added Revision menu.
192
        revision_menu = gtk.Menu()
193
        revision_menuitem = gtk.MenuItem("_Revision")
194
        revision_menuitem.set_submenu(revision_menu)
195
364 by Daniel Schierbeck
Simplified TreeView.show_diff() and made the Revision -> View Changes menu item work.
196
        revision_menu_diff = gtk.MenuItem("View Changes")
197
        revision_menu_diff.connect('activate', 
198
                lambda w: self.treeview.show_diff())
199
365 by Daniel Schierbeck
Fixed locks and made tagging work.
200
        revision_menu_tag = gtk.MenuItem("Tag Revision")
201
        revision_menu_tag.connect('activate', self._tag_revision_cb)
202
203
        revision_menu.add(revision_menu_tag)
364 by Daniel Schierbeck
Simplified TreeView.show_diff() and made the Revision -> View Changes menu item work.
204
        revision_menu.add(revision_menu_diff)
335 by Daniel Schierbeck
Added Revision menu.
205
334 by Daniel Schierbeck
Added icons to menus.
206
        branch_menu = gtk.Menu()
207
        branch_menuitem = gtk.MenuItem("_Branch")
208
        branch_menuitem.set_submenu(branch_menu)
209
336 by Daniel Schierbeck
Changed wording to comply with HIG guidelines.
210
        branch_menu.add(gtk.MenuItem("Pu_ll Revisions"))
211
        branch_menu.add(gtk.MenuItem("Pu_sh Revisions"))
371.1.1 by Daniel Schierbeck
Added About dialog to the viz.
212
423.9.1 by Daniel Schierbeck
Added Help->About menu item to the viz.
213
        help_menu = gtk.Menu()
214
        help_menuitem = gtk.MenuItem("_Help")
215
        help_menuitem.set_submenu(help_menu)
216
217
        help_about_menuitem = gtk.ImageMenuItem(gtk.STOCK_ABOUT, self.accel_group)
218
        help_about_menuitem.connect('activate', self._about_dialog_cb)
219
220
        help_menu.add(help_about_menuitem)
221
331 by Daniel Schierbeck
Added basic menu bar.
222
        menubar.add(file_menuitem)
338 by Daniel Schierbeck
Added Preferences menu item.
223
        menubar.add(edit_menuitem)
348 by Daniel Schierbeck
Added toggle item for revision number column.
224
        menubar.add(view_menuitem)
331 by Daniel Schierbeck
Added basic menu bar.
225
        menubar.add(go_menuitem)
335 by Daniel Schierbeck
Added Revision menu.
226
        menubar.add(revision_menuitem)
331 by Daniel Schierbeck
Added basic menu bar.
227
        menubar.add(branch_menuitem)
423.9.1 by Daniel Schierbeck
Added Help->About menu item to the viz.
228
        menubar.add(help_menuitem)
331 by Daniel Schierbeck
Added basic menu bar.
229
        menubar.show_all()
230
231
        return menubar
3 by Scott James Remnant
Split the display in two with a pane, we'll use the bottom half to show
232
233
    def construct_top(self):
234
        """Construct the top-half of the window."""
329 by Jelmer Vernooij
Make broken_line_length setting from higher up.
235
        # FIXME: Make broken_line_length configurable
330.2.5 by Daniel Schierbeck
Support persistence of compact view option.
236
452.4.1 by Jelmer Vernooij
Support displaying multiple tips in viz.
237
        self.treeview = TreeView(self.branch, self.start_revs, self.maxnum, self.compact_view)
315 by Daniel Schierbeck
Removed BranchWindow.set_branch(), used constructor instead.
238
373 by Daniel Schierbeck
Made column display options persisted.
239
        self.treeview.connect('revision-selected',
303 by Daniel Schierbeck
Made basic signaling work.
240
                self._treeselection_changed_cb)
423.1.17 by Gary van der Merwe
Reuse the viz treeview in the revision browser.
241
        self.treeview.connect('revision-activated',
242
                self._tree_revision_activated)
303 by Daniel Schierbeck
Made basic signaling work.
243
423.7.5 by Daniel Schierbeck
Made the revision history window update the Go->Tags menu when a tag is added.
244
        self.treeview.connect('tag-added', lambda w, t, r: self._update_tags())
245
373 by Daniel Schierbeck
Made column display options persisted.
246
        for col in ["revno", "date"]:
247
            option = self.config.get_user_option(col + '-column-visible')
248
            if option is not None:
249
                self.treeview.set_property(col + '-column-visible', option == 'True')
250
452.4.2 by Jelmer Vernooij
Hide revision number column if more than one branch was specified.
251
        self.treeview.set_property(col + '-column-visible', False)
1 by Scott James Remnant
Commit the first version of bzrk.
252
        self.treeview.show()
253
375 by Daniel Schierbeck
Fixed crash when toggling compact view.
254
        align = gtk.Alignment(0.0, 0.0, 1.0, 1.0)
255
        align.set_padding(5, 0, 0, 0)
256
        align.add(self.treeview)
257
        align.show()
258
259
        return align
44 by David Allouche
reorganise branch window
260
261
    def construct_navigation(self):
262
        """Construct the navigation buttons."""
325 by Daniel Schierbeck
Switched to using a real toolbar for the viz navigation.
263
        self.toolbar = gtk.Toolbar()
264
        self.toolbar.set_style(gtk.TOOLBAR_BOTH_HORIZ)
3 by Scott James Remnant
Split the display in two with a pane, we'll use the bottom half to show
265
388 by Daniel Schierbeck
Switched to using the Previous/Next Revision actions to create tool buttons.
266
        self.prev_button = self.prev_rev_action.create_tool_item()
376 by Daniel Schierbeck
Changed 'back' into 'prev' and 'fwd' into 'next'.
267
        self.toolbar.insert(self.prev_button, -1)
3 by Scott James Remnant
Split the display in two with a pane, we'll use the bottom half to show
268
388 by Daniel Schierbeck
Switched to using the Previous/Next Revision actions to create tool buttons.
269
        self.next_button = self.next_rev_action.create_tool_item()
376 by Daniel Schierbeck
Changed 'back' into 'prev' and 'fwd' into 'next'.
270
        self.toolbar.insert(self.next_button, -1)
330.2.4 by Daniel Schierbeck
Made use of compact view optional.
271
401.1.2 by Daniel Schierbeck
Allowed the treeview to be refreshed.
272
        self.toolbar.insert(gtk.SeparatorToolItem(), -1)
273
274
        refresh_button = gtk.ToolButton(gtk.STOCK_REFRESH)
404 by Daniel Schierbeck
Made the refresh use proper locking.
275
        refresh_button.connect('clicked', self._refresh_clicked)
401.1.2 by Daniel Schierbeck
Allowed the treeview to be refreshed.
276
        self.toolbar.insert(refresh_button, -1)
277
330.2.4 by Daniel Schierbeck
Made use of compact view optional.
278
        self.toolbar.show_all()
325 by Daniel Schierbeck
Switched to using a real toolbar for the viz navigation.
279
280
        return self.toolbar
3 by Scott James Remnant
Split the display in two with a pane, we'll use the bottom half to show
281
282
    def construct_bottom(self):
283
        """Construct the bottom half of the window."""
330.3.1 by Daniel Schierbeck
Renamed logview 'revisionview'.
284
        from bzrlib.plugins.gtk.revisionview import RevisionView
412.1.2 by Daniel Schierbeck
Moved retrieval of tags into the revisionview itself.
285
        self.revisionview = RevisionView(branch=self.branch)
44 by David Allouche
reorganise branch window
286
        (width, height) = self.get_size()
330.3.1 by Daniel Schierbeck
Renamed logview 'revisionview'.
287
        self.revisionview.set_size_request(width, int(height / 2.5))
288
        self.revisionview.show()
289
        self.revisionview.set_show_callback(self._show_clicked_cb)
412.1.9 by Daniel Schierbeck
Removed the use of RevisionView.set_go_callback().
290
        self.revisionview.connect('notify::revision', self._go_clicked_cb)
423.7.4 by Daniel Schierbeck
Made revisionview and branchview update when a tag is added.
291
        self.treeview.connect('tag-added', lambda w, t, r: self.revisionview.update_tags())
330.3.1 by Daniel Schierbeck
Renamed logview 'revisionview'.
292
        return self.revisionview
332 by Daniel Schierbeck
Made tag selection work.
293
294
    def _tag_selected_cb(self, menuitem, revid):
356 by Daniel Schierbeck
Made revision a property on TreeView.
295
        self.treeview.set_revision_id(revid)
341 by Daniel Schierbeck
Merged with trunk.
296
280.1.2 by Daniel Schierbeck
Switched to handle the 'changed' signal from the treeview's treeselection instead of the 'cursor-changed' signal from the treeview itself, allowing more flexibility (particularly the ability to handle programmatic selections)
297
    def _treeselection_changed_cb(self, selection, *args):
303 by Daniel Schierbeck
Made basic signaling work.
298
        """callback for when the treeview changes."""
299
        revision = self.treeview.get_revision()
300
        parents  = self.treeview.get_parents()
301
        children = self.treeview.get_children()
302
464.2.1 by Adrian Wilkins
Detect the reserved null: revision in appropriate places.
303
        if revision and revision != NULL_REVISION:
376 by Daniel Schierbeck
Changed 'back' into 'prev' and 'fwd' into 'next'.
304
            prev_menu = gtk.Menu()
352.1.1 by Daniel Schierbeck
Added dropdown menu to Back button.
305
            if len(parents) > 0:
385 by Daniel Schierbeck
Created a single action for Previous Revision.
306
                self.prev_rev_action.set_sensitive(True)
352.1.1 by Daniel Schierbeck
Added dropdown menu to Back button.
307
                for parent_id in parents:
464.2.1 by Adrian Wilkins
Detect the reserved null: revision in appropriate places.
308
                    if parent_id and parent_id != NULL_REVISION:
309
                        parent = self.branch.repository.get_revision(parent_id)
310
                        try:
311
                            str = ' (' + parent.properties['branch-nick'] + ')'
312
                        except KeyError:
313
                            str = ""
355 by Daniel Schierbeck
Appended branch nick to parent and child popup menus.
314
464.2.1 by Adrian Wilkins
Detect the reserved null: revision in appropriate places.
315
                        item = gtk.MenuItem(parent.message.split("\n")[0] + str)
316
                        item.connect('activate', self._set_revision_cb, parent_id)
317
                        prev_menu.add(item)
376 by Daniel Schierbeck
Changed 'back' into 'prev' and 'fwd' into 'next'.
318
                prev_menu.show_all()
352.1.1 by Daniel Schierbeck
Added dropdown menu to Back button.
319
            else:
385 by Daniel Schierbeck
Created a single action for Previous Revision.
320
                self.prev_rev_action.set_sensitive(False)
376 by Daniel Schierbeck
Changed 'back' into 'prev' and 'fwd' into 'next'.
321
                prev_menu.hide()
322
323
            self.prev_button.set_menu(prev_menu)
324
325
            next_menu = gtk.Menu()
352.1.2 by Daniel Schierbeck
Added dropdown menu to Forward button.
326
            if len(children) > 0:
386 by Daniel Schierbeck
Created a single action for Next Revision.
327
                self.next_rev_action.set_sensitive(True)
352.1.2 by Daniel Schierbeck
Added dropdown menu to Forward button.
328
                for child_id in children:
329
                    child = self.branch.repository.get_revision(child_id)
355 by Daniel Schierbeck
Appended branch nick to parent and child popup menus.
330
                    try:
331
                        str = ' (' + child.properties['branch-nick'] + ')'
332
                    except KeyError:
333
                        str = ""
334
335
                    item = gtk.MenuItem(child.message.split("\n")[0] + str)
352.1.2 by Daniel Schierbeck
Added dropdown menu to Forward button.
336
                    item.connect('activate', self._set_revision_cb, child_id)
376 by Daniel Schierbeck
Changed 'back' into 'prev' and 'fwd' into 'next'.
337
                    next_menu.add(item)
338
                next_menu.show_all()
352.1.2 by Daniel Schierbeck
Added dropdown menu to Forward button.
339
            else:
386 by Daniel Schierbeck
Created a single action for Next Revision.
340
                self.next_rev_action.set_sensitive(False)
376 by Daniel Schierbeck
Changed 'back' into 'prev' and 'fwd' into 'next'.
341
                next_menu.hide()
352.1.2 by Daniel Schierbeck
Added dropdown menu to Forward button.
342
376 by Daniel Schierbeck
Changed 'back' into 'prev' and 'fwd' into 'next'.
343
            self.next_button.set_menu(next_menu)
352.1.2 by Daniel Schierbeck
Added dropdown menu to Forward button.
344
412.1.13 by Daniel Schierbeck
Re-added support for displaying the children of a revision.
345
            self.revisionview.set_revision(revision)
346
            self.revisionview.set_children(children)
423.1.17 by Gary van der Merwe
Reuse the viz treeview in the revision browser.
347
    
348
    def _tree_revision_activated(self, widget, path, col):
349
        # TODO: more than one parent
350
        """Callback for when a treeview row gets activated."""
351
        revision = self.treeview.get_revision()
352
        parents  = self.treeview.get_parents()
353
354
        if len(parents) == 0:
355
            parent_id = None
356
        else:
357
            parent_id = parents[0]
358
359
        self.show_diff(revision.revision_id, parent_id)
360
        self.treeview.grab_focus()
361
    
7 by Scott James Remnant
Put some information about the highlighted revision in the bottom pane,
362
3 by Scott James Remnant
Split the display in two with a pane, we'll use the bottom half to show
363
    def _back_clicked_cb(self, *args):
364
        """Callback for when the back button is clicked."""
304 by Daniel Schierbeck
Made forward/back buttons work again.
365
        self.treeview.back()
366
        
5 by Scott James Remnant
Reverse the meaning of the Back and Forward buttons so Back actually
367
    def _fwd_clicked_cb(self, *args):
368
        """Callback for when the forward button is clicked."""
304 by Daniel Schierbeck
Made forward/back buttons work again.
369
        self.treeview.forward()
7 by Scott James Remnant
Put some information about the highlighted revision in the bottom pane,
370
412.1.9 by Daniel Schierbeck
Removed the use of RevisionView.set_go_callback().
371
    def _go_clicked_cb(self, w, p):
7 by Scott James Remnant
Put some information about the highlighted revision in the bottom pane,
372
        """Callback for when the go button for a parent is clicked."""
412.1.9 by Daniel Schierbeck
Removed the use of RevisionView.set_go_callback().
373
        if self.revisionview.get_revision() is not None:
374
            self.treeview.set_revision(self.revisionview.get_revision())
152 by Jelmer Vernooij
Cleanup some more code.
375
147 by Jelmer Vernooij
Remove a bunch of duplicate functionality.
376
    def _show_clicked_cb(self, revid, parentid):
7 by Scott James Remnant
Put some information about the highlighted revision in the bottom pane,
377
        """Callback for when the show button for a parent is clicked."""
423.1.17 by Gary van der Merwe
Reuse the viz treeview in the revision browser.
378
        self.show_diff(revid, parentid)
13 by Scott James Remnant
Keep the focus on the treeview
379
        self.treeview.grab_focus()
46 by Wouter van Heyst
show diff on row activation, LP# 44591
380
352.1.1 by Daniel Schierbeck
Added dropdown menu to Back button.
381
    def _set_revision_cb(self, w, revision_id):
356 by Daniel Schierbeck
Made revision a property on TreeView.
382
        self.treeview.set_revision_id(revision_id)
352.1.1 by Daniel Schierbeck
Added dropdown menu to Back button.
383
330.2.4 by Daniel Schierbeck
Made use of compact view optional.
384
    def _brokenlines_toggled_cb(self, button):
330.2.5 by Daniel Schierbeck
Support persistence of compact view option.
385
        self.compact_view = button.get_active()
386
387
        if self.compact_view:
388
            option = 'yes'
330.2.4 by Daniel Schierbeck
Made use of compact view optional.
389
        else:
330.2.5 by Daniel Schierbeck
Support persistence of compact view option.
390
            option = 'no'
391
392
        self.config.set_user_option('viz-compact-view', option)
401.1.3 by Daniel Schierbeck
Made the compact view toggling cleaner.
393
        self.treeview.set_property('compact', self.compact_view)
394
        self.treeview.refresh()
368 by Daniel Schierbeck
Merged with mainline.
395
365 by Daniel Schierbeck
Fixed locks and made tagging work.
396
    def _tag_revision_cb(self, w):
392.1.1 by Daniel Schierbeck
Made it possible to tag revisions again.
397
        try:
398
            self.treeview.set_sensitive(False)
399
            dialog = AddTagDialog(self.branch.repository, self.treeview.get_revision().revision_id, self.branch)
400
            response = dialog.run()
401
            if response != gtk.RESPONSE_NONE:
402
                dialog.hide()
365 by Daniel Schierbeck
Fixed locks and made tagging work.
403
            
392.1.1 by Daniel Schierbeck
Made it possible to tag revisions again.
404
                if response == gtk.RESPONSE_OK:
423.7.7 by Daniel Schierbeck
Simplified Go->Tag Revision menu item in the viz.
405
                    self.treeview.add_tag(dialog.tagname, dialog._revid)
392.1.1 by Daniel Schierbeck
Made it possible to tag revisions again.
406
                
407
                dialog.destroy()
408
409
        finally:
410
            self.treeview.set_sensitive(True)
365 by Daniel Schierbeck
Fixed locks and made tagging work.
411
423.9.1 by Daniel Schierbeck
Added Help->About menu item to the viz.
412
    def _about_dialog_cb(self, w):
413
        from bzrlib.plugins.gtk.about import AboutDialog
414
415
        AboutDialog().run()
416
348 by Daniel Schierbeck
Added toggle item for revision number column.
417
    def _col_visibility_changed(self, col, property):
373 by Daniel Schierbeck
Made column display options persisted.
418
        self.config.set_user_option(property + '-column-visible', col.get_active())
348 by Daniel Schierbeck
Added toggle item for revision number column.
419
        self.treeview.set_property(property + '-column-visible', col.get_active())
351 by Daniel Schierbeck
Added option to hide the toolbar.
420
421
    def _toolbar_visibility_changed(self, col):
422
        if col.get_active():
423
            self.toolbar.show() 
424
        else:
425
            self.toolbar.hide()
371.1.1 by Daniel Schierbeck
Added About dialog to the viz.
426
427
    def _show_about_cb(self, w):
428
        dialog = AboutDialog()
429
        dialog.connect('response', lambda d,r: d.destroy())
430
        dialog.run()
404 by Daniel Schierbeck
Made the refresh use proper locking.
431
432
    def _refresh_clicked(self, w):
423.1.13 by Gary van der Merwe
Move viz loading msg from branchwin to treeview.
433
        self.treeview.refresh()
423.7.5 by Daniel Schierbeck
Made the revision history window update the Go->Tags menu when a tag is added.
434
435
    def _update_tags(self):
436
        menu = gtk.Menu()
437
438
        if self.branch.supports_tags():
439
            tags = self.branch.tags.get_tag_dict().items()
440
            tags.sort()
441
            tags.reverse()
442
            for tag, revid in tags:
450.4.1 by Daniel Schierbeck
Added tag icon to branch history window.
443
                tag_image = gtk.Image()
444
                tag_image.set_from_file(icon_path('tag-16.png'))
445
                tag_item = gtk.ImageMenuItem(tag.replace('_', '__'))
446
                tag_item.set_image(tag_image)
423.7.5 by Daniel Schierbeck
Made the revision history window update the Go->Tags menu when a tag is added.
447
                tag_item.connect('activate', self._tag_selected_cb, revid)
448
                menu.add(tag_item)
449
            self.go_menu_tags.set_submenu(menu)
450
451
            self.go_menu_tags.set_sensitive(len(tags) != 0)
452
        else:
453
            self.go_menu_tags.set_sensitive(False)
454
455
        self.go_menu_tags.show_all()
456
423.1.17 by Gary van der Merwe
Reuse the viz treeview in the revision browser.
457
    def show_diff(self, revid=None, parentid=None):
458
        """Open a new window to show a diff between the given revisions."""
459
        from bzrlib.plugins.gtk.diff import DiffWindow
460
        window = DiffWindow(parent=self)
461
462
        if parentid is None:
463
            parentid = NULL_REVISION
464
465
        rev_tree    = self.branch.repository.revision_tree(revid)
466
        parent_tree = self.branch.repository.revision_tree(parentid)
467
468
        description = revid + " - " + self.branch.nick
469
        window.set_diff(description, rev_tree, parent_tree)
470
        window.show()
471
423.7.5 by Daniel Schierbeck
Made the revision history window update the Go->Tags menu when a tag is added.
472