/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
"""Branch window.
2
3
This module contains the code to manage the branch information window,
4
which contains both the revision graph and details panes.
5
"""
6
671.2.1 by Vincent Ladeuil
Ensure compatibility with PyGtk-2.8.
7
__copyright__ = "Copyright (c) 2005 Canonical Ltd."
1 by Scott James Remnant
Commit the first version of bzrk.
8
__author__    = "Scott James Remnant <scott@ubuntu.com>"
9
10
734.1.24 by Curtis Hovey
Updated most of BranchView to gtk3.
11
from gi.repository import Gdk
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
12
from gi.repository import Gtk
1 by Scott James Remnant
Commit the first version of bzrk.
13
450.4.1 by Daniel Schierbeck
Added tag icon to branch history window.
14
from bzrlib.plugins.gtk import icon_path
713 by Jelmer Vernooij
Remove some unused imports, fix some formatting.
15
from bzrlib.plugins.gtk.branchview import TreeView
338 by Daniel Schierbeck
Added Preferences menu item.
16
from bzrlib.plugins.gtk.preferences import PreferencesWindow
523.3.2 by Jelmer Vernooij
Share same menu for context menu and main menu.
17
from bzrlib.plugins.gtk.revisionmenu import RevisionMenu
18
from bzrlib.plugins.gtk.window import Window
511.6.1 by Jelmer Vernooij
Add Branch/Index option if bzr-search is available.
19
713 by Jelmer Vernooij
Remove some unused imports, fix some formatting.
20
from bzrlib.config import GlobalConfig
21
from bzrlib.revision import NULL_REVISION
511.6.1 by Jelmer Vernooij
Add Branch/Index option if bzr-search is available.
22
from bzrlib.trace import mutter
1 by Scott James Remnant
Commit the first version of bzrk.
23
724 by Jelmer Vernooij
Fix formatting, imports.
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
734.1.51 by Curtis Hovey
Fix the initializer for many classes.
41
        super(BranchWindow, self).__init__(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
630 by Jelmer Vernooij
Use _get_nick(local=True) rather than .nick to get at a branches' nick, since
54
        self.set_title(branch._get_nick(local=True) + " - revision history")
1 by Scott James Remnant
Commit the first version of bzrk.
55
531.7.9 by Scott Scriven
Made vis remember window and panel sizes.
56
        # user-configured window size
531.7.10 by Scott Scriven
Simplified size-loading code. No longer saves identical config every time vis runs.
57
        size = self._load_size('viz-window-size')
58
        if size:
59
            width, height = size
555.2.1 by Jasper Groenewegen
Modify DiffWidget to include a checkbutton to wrap long lines in the diff view
60
        else:
61
            # Use three-quarters of the screen by default
62
            screen = self.get_screen()
63
            monitor = screen.get_monitor_geometry(0)
64
            width = int(monitor.width * 0.75)
65
            height = int(monitor.height * 0.75)
1 by Scott James Remnant
Commit the first version of bzrk.
66
        self.set_default_size(width, height)
531.7.8 by Scott Scriven
Made viz window shrinkable.
67
        self.set_size_request(width/3, height/3)
625.1.8 by Torsten Landschoff
Save widget sizes only when closing the BranchWindow.
68
        self._save_size_on_destroy(self, 'viz-window-size')
1 by Scott James Remnant
Commit the first version of bzrk.
69
70
        # FIXME AndyFitz!
734.1.24 by Curtis Hovey
Updated most of BranchView to gtk3.
71
        icon = self.render_icon_pixbuf(Gtk.STOCK_INDEX, Gtk.IconSize.BUTTON)
1 by Scott James Remnant
Commit the first version of bzrk.
72
        self.set_icon(icon)
73
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
74
        Gtk.AccelMap.add_entry("<viz>/Go/Next Revision", Gdk.KEY_Up, Gdk.ModifierType.MOD1_MASK)
75
        Gtk.AccelMap.add_entry("<viz>/Go/Previous Revision", Gdk.KEY_Down, Gdk.ModifierType.MOD1_MASK)
76
        Gtk.AccelMap.add_entry("<viz>/View/Refresh", Gdk.KEY_F5, 0)
382 by Daniel Schierbeck
Made accelerator for Previous Revision work.
77
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
78
        self.accel_group = Gtk.AccelGroup()
3 by Scott James Remnant
Split the display in two with a pane, we'll use the bottom half to show
79
        self.add_accel_group(self.accel_group)
80
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
81
        self.prev_rev_action = Gtk.Action("prev-rev", "_Previous Revision", "Go to the previous revision", Gtk.STOCK_GO_DOWN)
385 by Daniel Schierbeck
Created a single action for Previous Revision.
82
        self.prev_rev_action.set_accel_path("<viz>/Go/Previous Revision")
83
        self.prev_rev_action.set_accel_group(self.accel_group)
84
        self.prev_rev_action.connect("activate", self._back_clicked_cb)
85
        self.prev_rev_action.connect_accelerator()
86
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
87
        self.next_rev_action = Gtk.Action("next-rev", "_Next Revision", "Go to the next revision", Gtk.STOCK_GO_UP)
386 by Daniel Schierbeck
Created a single action for Next Revision.
88
        self.next_rev_action.set_accel_path("<viz>/Go/Next Revision")
89
        self.next_rev_action.set_accel_group(self.accel_group)
90
        self.next_rev_action.connect("activate", self._fwd_clicked_cb)
91
        self.next_rev_action.connect_accelerator()
92
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
93
        self.refresh_action = Gtk.Action("refresh", "_Refresh", "Refresh view", Gtk.STOCK_REFRESH)
499.1.1 by Russ Brown
Added Refresh menu option with keyboard shortcut to viz
94
        self.refresh_action.set_accel_path("<viz>/View/Refresh")
95
        self.refresh_action.set_accel_group(self.accel_group)
96
        self.refresh_action.connect("activate", self._refresh_clicked)
97
        self.refresh_action.connect_accelerator()
98
713.2.1 by Ximin Luo
Add option to use 'bzr viz' with a vertical layout.
99
        self.vbox = self.construct()
1 by Scott James Remnant
Commit the first version of bzrk.
100
625.1.8 by Torsten Landschoff
Save widget sizes only when closing the BranchWindow.
101
    def _save_size_on_destroy(self, widget, config_name):
102
        """Creates a hook that saves the size of widget to config option 
103
           config_name when the window is destroyed/closed."""
104
        def save_size(src):
734.1.27 by Curtis Hovey
Fixed allocation accessor.
105
            allocation = widget.get_allocation()
106
            width, height = allocation.width, allocation.height
625.1.8 by Torsten Landschoff
Save widget sizes only when closing the BranchWindow.
107
            value = '%sx%s' % (width, height)
108
            self.config.set_user_option(config_name, value)
109
        self.connect("destroy", save_size)
110
369 by Daniel Schierbeck
Fixed bug with compact view toggling.
111
    def set_revision(self, revid):
112
        self.treeview.set_revision_id(revid)
330.2.4 by Daniel Schierbeck
Made use of compact view optional.
113
1 by Scott James Remnant
Commit the first version of bzrk.
114
    def construct(self):
115
        """Construct the window contents."""
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
116
        vbox = Gtk.VBox(spacing=0)
44 by David Allouche
reorganise branch window
117
        self.add(vbox)
118
713.2.1 by Ximin Luo
Add option to use 'bzr viz' with a vertical layout.
119
        # order is important here
120
        paned = self.construct_paned()
531.7.2 by Scott Scriven
Made 'vis' save/load visibility of its toolbar.
121
        nav = self.construct_navigation()
122
        menubar = self.construct_menubar()
713.2.1 by Ximin Luo
Add option to use 'bzr viz' with a vertical layout.
123
734.1.24 by Curtis Hovey
Updated most of BranchView to gtk3.
124
        vbox.pack_start(menubar, False, True, 0)
125
        vbox.pack_start(nav, False, True, 0)
126
        vbox.pack_start(paned, True, True, 0)
713.2.1 by Ximin Luo
Add option to use 'bzr viz' with a vertical layout.
127
        vbox.set_focus_child(paned)
44 by David Allouche
reorganise branch window
128
624 by Jelmer Vernooij
Delay registration of signals to prevent problems when signal handlers use not yet constructed widgets.
129
44 by David Allouche
reorganise branch window
130
        vbox.show()
713 by Jelmer Vernooij
Remove some unused imports, fix some formatting.
131
713.2.1 by Ximin Luo
Add option to use 'bzr viz' with a vertical layout.
132
        return vbox
133
134
    def construct_paned(self):
135
        """Construct the main HPaned/VPaned contents."""
136
        if self.config.get_user_option('viz-vertical') == 'True':
775.1.5 by Curtis Hovey
Replace Gtk.HPaned() with Gtk.Paned.new(Gtk.Orientation.HORIZONTAL).
137
            self.paned = Gtk.Paned.new(Gtk.Orientation.HORIZONTAL)
713.2.1 by Ximin Luo
Add option to use 'bzr viz' with a vertical layout.
138
        else:
775.1.4 by Curtis Hovey
Switched from Gtk.VPaned to Gtk.Paned.new(Gtk.Orientation.VERTICAL).
139
            self.paned = Gtk.Paned.new(Gtk.Orientation.VERTICAL)
713.2.1 by Ximin Luo
Add option to use 'bzr viz' with a vertical layout.
140
141
        self.paned.pack1(self.construct_top(), resize=False, shrink=True)
142
        self.paned.pack2(self.construct_bottom(), resize=True, shrink=False)
143
        self.paned.show()
144
145
        return self.paned
146
331 by Daniel Schierbeck
Added basic menu bar.
147
    def construct_menubar(self):
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
148
        menubar = Gtk.MenuBar()
331 by Daniel Schierbeck
Added basic menu bar.
149
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
150
        file_menu = Gtk.Menu()
734.1.24 by Curtis Hovey
Updated most of BranchView to gtk3.
151
        file_menuitem = Gtk.MenuItem.new_with_mnemonic("_File")
331 by Daniel Schierbeck
Added basic menu bar.
152
        file_menuitem.set_submenu(file_menu)
153
734.1.24 by Curtis Hovey
Updated most of BranchView to gtk3.
154
        file_menu_close = Gtk.ImageMenuItem.new_from_stock(
155
            Gtk.STOCK_CLOSE, self.accel_group)
331 by Daniel Schierbeck
Added basic menu bar.
156
        file_menu_close.connect('activate', lambda x: self.destroy())
713 by Jelmer Vernooij
Remove some unused imports, fix some formatting.
157
734.1.24 by Curtis Hovey
Updated most of BranchView to gtk3.
158
        file_menu_quit = Gtk.ImageMenuItem.new_from_stock(
159
            Gtk.STOCK_QUIT, self.accel_group)
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
160
        file_menu_quit.connect('activate', lambda x: Gtk.main_quit())
713 by Jelmer Vernooij
Remove some unused imports, fix some formatting.
161
408 by Daniel Schierbeck
Made the close menu item actually appear when the viz is opened from another window.
162
        if self._parent is not None:
406 by Daniel Schierbeck
Made the viz show the close menu item only if opened from another window.
163
            file_menu.add(file_menu_close)
363 by Daniel Schierbeck
Added File -> Quit menu item.
164
        file_menu.add(file_menu_quit)
331 by Daniel Schierbeck
Added basic menu bar.
165
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
166
        edit_menu = Gtk.Menu()
734.1.24 by Curtis Hovey
Updated most of BranchView to gtk3.
167
        edit_menuitem = Gtk.MenuItem.new_with_mnemonic("_Edit")
338 by Daniel Schierbeck
Added Preferences menu item.
168
        edit_menuitem.set_submenu(edit_menu)
169
734.1.24 by Curtis Hovey
Updated most of BranchView to gtk3.
170
        edit_menu_branchopts = Gtk.MenuItem(label="Branch Settings")
361 by Daniel Schierbeck
Added branch settings menu item.
171
        edit_menu_branchopts.connect('activate', lambda x: PreferencesWindow(self.branch.get_config()).show())
172
734.1.24 by Curtis Hovey
Updated most of BranchView to gtk3.
173
        edit_menu_globopts = Gtk.MenuItem(label="Global Settings")
407 by Daniel Schierbeck
Renamed Preferences menu item into Global Settings.
174
        edit_menu_globopts.connect('activate', lambda x: PreferencesWindow().show())
338 by Daniel Schierbeck
Added Preferences menu item.
175
361 by Daniel Schierbeck
Added branch settings menu item.
176
        edit_menu.add(edit_menu_branchopts)
407 by Daniel Schierbeck
Renamed Preferences menu item into Global Settings.
177
        edit_menu.add(edit_menu_globopts)
338 by Daniel Schierbeck
Added Preferences menu item.
178
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
179
        view_menu = Gtk.Menu()
734.1.24 by Curtis Hovey
Updated most of BranchView to gtk3.
180
        view_menuitem = Gtk.MenuItem.new_with_mnemonic("_View")
348 by Daniel Schierbeck
Added toggle item for revision number column.
181
        view_menuitem.set_submenu(view_menu)
182
499.1.1 by Russ Brown
Added Refresh menu option with keyboard shortcut to viz
183
        view_menu_refresh = self.refresh_action.create_menu_item()
184
        view_menu_refresh.connect('activate', self._refresh_clicked)
185
186
        view_menu.add(view_menu_refresh)
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
187
        view_menu.add(Gtk.SeparatorMenuItem())
499.1.1 by Russ Brown
Added Refresh menu option with keyboard shortcut to viz
188
734.1.24 by Curtis Hovey
Updated most of BranchView to gtk3.
189
        view_menu_toolbar = Gtk.CheckMenuItem(label="Show Toolbar")
351 by Daniel Schierbeck
Added option to hide the toolbar.
190
        view_menu_toolbar.set_active(True)
531.7.2 by Scott Scriven
Made 'vis' save/load visibility of its toolbar.
191
        if self.config.get_user_option('viz-toolbar-visible') == 'False':
192
            view_menu_toolbar.set_active(False)
193
            self.toolbar.hide()
351 by Daniel Schierbeck
Added option to hide the toolbar.
194
        view_menu_toolbar.connect('toggled', self._toolbar_visibility_changed)
195
734.1.24 by Curtis Hovey
Updated most of BranchView to gtk3.
196
        view_menu_compact = Gtk.CheckMenuItem(label="Show Compact Graph")
370 by Daniel Schierbeck
Moved compact graph toggle to the menubar.
197
        view_menu_compact.set_active(self.compact_view)
198
        view_menu_compact.connect('activate', self._brokenlines_toggled_cb)
713 by Jelmer Vernooij
Remove some unused imports, fix some formatting.
199
734.1.24 by Curtis Hovey
Updated most of BranchView to gtk3.
200
        view_menu_vertical = Gtk.CheckMenuItem(label="Side-by-side Layout")
713.2.1 by Ximin Luo
Add option to use 'bzr viz' with a vertical layout.
201
        view_menu_vertical.set_active(False)
202
        if self.config.get_user_option('viz-vertical') == 'True':
203
            view_menu_vertical.set_active(True)
204
        view_menu_vertical.connect('toggled', self._vertical_layout)
205
734.1.24 by Curtis Hovey
Updated most of BranchView to gtk3.
206
        view_menu_diffs = Gtk.CheckMenuItem(label="Show Diffs")
531.7.12 by Scott Scriven
Made diff panel default to off.
207
        view_menu_diffs.set_active(False)
208
        if self.config.get_user_option('viz-show-diffs') == 'True':
209
            view_menu_diffs.set_active(True)
531.7.3 by Scott Scriven
Added an option to show/hide the diff panel.
210
        view_menu_diffs.connect('toggled', self._diff_visibility_changed)
713 by Jelmer Vernooij
Remove some unused imports, fix some formatting.
211
734.1.24 by Curtis Hovey
Updated most of BranchView to gtk3.
212
        view_menu_wide_diffs = Gtk.CheckMenuItem(label="Wide Diffs")
531.7.14 by Scott Scriven
Made diff placement configurable (bottom-right, or bottom full-width).
213
        view_menu_wide_diffs.set_active(False)
214
        if self.config.get_user_option('viz-wide-diffs') == 'True':
215
            view_menu_wide_diffs.set_active(True)
216
        view_menu_wide_diffs.connect('toggled', self._diff_placement_changed)
713 by Jelmer Vernooij
Remove some unused imports, fix some formatting.
217
734.1.24 by Curtis Hovey
Updated most of BranchView to gtk3.
218
        view_menu_wrap_diffs = Gtk.CheckMenuItem.new_with_mnemonic(
219
            "Wrap _Long Lines in Diffs")
555.2.2 by Jasper Groenewegen
Change from checkbox to menu item in bzr vis, add menu bar + item in gdiff
220
        view_menu_wrap_diffs.set_active(False)
221
        if self.config.get_user_option('viz-wrap-diffs') == 'True':
222
            view_menu_wrap_diffs.set_active(True)
223
        view_menu_wrap_diffs.connect('toggled', self._diff_wrap_changed)
713 by Jelmer Vernooij
Remove some unused imports, fix some formatting.
224
351 by Daniel Schierbeck
Added option to hide the toolbar.
225
        view_menu.add(view_menu_toolbar)
370 by Daniel Schierbeck
Moved compact graph toggle to the menubar.
226
        view_menu.add(view_menu_compact)
713.2.1 by Ximin Luo
Add option to use 'bzr viz' with a vertical layout.
227
        view_menu.add(view_menu_vertical)
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
228
        view_menu.add(Gtk.SeparatorMenuItem())
531.7.3 by Scott Scriven
Added an option to show/hide the diff panel.
229
        view_menu.add(view_menu_diffs)
531.7.14 by Scott Scriven
Made diff placement configurable (bottom-right, or bottom full-width).
230
        view_menu.add(view_menu_wide_diffs)
555.2.2 by Jasper Groenewegen
Change from checkbox to menu item in bzr vis, add menu bar + item in gdiff
231
        view_menu.add(view_menu_wrap_diffs)
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
232
        view_menu.add(Gtk.SeparatorMenuItem())
358 by Daniel Schierbeck
Generalized the hiding/showing code.
233
734.1.24 by Curtis Hovey
Updated most of BranchView to gtk3.
234
        self.mnu_show_revno_column = Gtk.CheckMenuItem.new_with_mnemonic(
235
            "Show Revision _Number Column")
236
        self.mnu_show_date_column = Gtk.CheckMenuItem.new_with_mnemonic(
237
            "Show _Date Column")
452.4.2 by Jelmer Vernooij
Hide revision number column if more than one branch was specified.
238
239
        # Revision numbers are pointless if there are multiple branches
240
        if len(self.start_revs) > 1:
241
            self.mnu_show_revno_column.set_sensitive(False)
242
            self.treeview.set_property('revno-column-visible', False)
243
244
        for (col, name) in [(self.mnu_show_revno_column, "revno"), 
245
                            (self.mnu_show_date_column, "date")]:
358 by Daniel Schierbeck
Generalized the hiding/showing code.
246
            col.set_active(self.treeview.get_property(name + "-column-visible"))
247
            col.connect('toggled', self._col_visibility_changed, name)
248
            view_menu.add(col)
348 by Daniel Schierbeck
Added toggle item for revision number column.
249
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
250
        go_menu = Gtk.Menu()
382 by Daniel Schierbeck
Made accelerator for Previous Revision work.
251
        go_menu.set_accel_group(self.accel_group)
734.1.24 by Curtis Hovey
Updated most of BranchView to gtk3.
252
        go_menuitem = Gtk.MenuItem.new_with_mnemonic("_Go")
331 by Daniel Schierbeck
Added basic menu bar.
253
        go_menuitem.set_submenu(go_menu)
713 by Jelmer Vernooij
Remove some unused imports, fix some formatting.
254
390 by Daniel Schierbeck
Made the Previous/Next Revision menu items local variables.
255
        go_menu_next = self.next_rev_action.create_menu_item()
256
        go_menu_prev = self.prev_rev_action.create_menu_item()
334 by Daniel Schierbeck
Added icons to menus.
257
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
258
        tag_image = Gtk.Image()
450.4.1 by Daniel Schierbeck
Added tag icon to branch history window.
259
        tag_image.set_from_file(icon_path("tag-16.png"))
734.1.24 by Curtis Hovey
Updated most of BranchView to gtk3.
260
        self.go_menu_tags = Gtk.ImageMenuItem.new_with_mnemonic("_Tags")
450.4.1 by Daniel Schierbeck
Added tag icon to branch history window.
261
        self.go_menu_tags.set_image(tag_image)
587 by Jelmer Vernooij
Avoid determining tags until tags widget has been added.
262
        self.treeview.connect('refreshed', lambda w: self._update_tags())
399 by Daniel Schierbeck
Made tags menu insensitive when there are no tags to display.
263
390 by Daniel Schierbeck
Made the Previous/Next Revision menu items local variables.
264
        go_menu.add(go_menu_next)
265
        go_menu.add(go_menu_prev)
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
266
        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.
267
        go_menu.add(self.go_menu_tags)
334 by Daniel Schierbeck
Added icons to menus.
268
713.2.4 by Jelmer Vernooij
Fix some formatting.
269
        self.revision_menu = RevisionMenu(self.branch.repository, [],
270
            self.branch, parent=self)
734.1.24 by Curtis Hovey
Updated most of BranchView to gtk3.
271
        revision_menuitem = Gtk.MenuItem.new_with_mnemonic("_Revision")
523.3.2 by Jelmer Vernooij
Share same menu for context menu and main menu.
272
        revision_menuitem.set_submenu(self.revision_menu)
335 by Daniel Schierbeck
Added Revision menu.
273
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
274
        branch_menu = Gtk.Menu()
734.1.24 by Curtis Hovey
Updated most of BranchView to gtk3.
275
        branch_menuitem = Gtk.MenuItem.new_with_mnemonic("_Branch")
334 by Daniel Schierbeck
Added icons to menus.
276
        branch_menuitem.set_submenu(branch_menu)
277
734.1.24 by Curtis Hovey
Updated most of BranchView to gtk3.
278
        branch_menu.add(Gtk.MenuItem.new_with_mnemonic("Pu_ll Revisions"))
279
        branch_menu.add(Gtk.MenuItem.new_with_mnemonic("Pu_sh Revisions"))
371.1.1 by Daniel Schierbeck
Added About dialog to the viz.
280
511.6.1 by Jelmer Vernooij
Add Branch/Index option if bzr-search is available.
281
        try:
282
            from bzrlib.plugins import search
283
        except ImportError:
284
            mutter("Didn't find search plugin")
285
        else:
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
286
            branch_menu.add(Gtk.SeparatorMenuItem())
526 by Jelmer Vernooij
Switch to found revision when clicking ok in search window.
287
734.1.24 by Curtis Hovey
Updated most of BranchView to gtk3.
288
            branch_index_menuitem = Gtk.MenuItem.new_with_mnemonic("_Index")
511.6.1 by Jelmer Vernooij
Add Branch/Index option if bzr-search is available.
289
            branch_index_menuitem.connect('activate', self._branch_index_cb)
290
            branch_menu.add(branch_index_menuitem)
291
734.1.24 by Curtis Hovey
Updated most of BranchView to gtk3.
292
            branch_search_menuitem = Gtk.MenuItem.new_with_mnemonic("_Search")
524 by Jelmer Vernooij
Add search dialog.
293
            branch_search_menuitem.connect('activate', self._branch_search_cb)
294
            branch_menu.add(branch_search_menuitem)
295
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
296
        help_menu = Gtk.Menu()
734.1.24 by Curtis Hovey
Updated most of BranchView to gtk3.
297
        help_menuitem = Gtk.MenuItem.new_with_mnemonic("_Help")
423.9.1 by Daniel Schierbeck
Added Help->About menu item to the viz.
298
        help_menuitem.set_submenu(help_menu)
299
734.1.24 by Curtis Hovey
Updated most of BranchView to gtk3.
300
        help_about_menuitem = Gtk.ImageMenuItem.new_from_stock(
301
            Gtk.STOCK_ABOUT, self.accel_group)
423.9.1 by Daniel Schierbeck
Added Help->About menu item to the viz.
302
        help_about_menuitem.connect('activate', self._about_dialog_cb)
303
304
        help_menu.add(help_about_menuitem)
305
331 by Daniel Schierbeck
Added basic menu bar.
306
        menubar.add(file_menuitem)
338 by Daniel Schierbeck
Added Preferences menu item.
307
        menubar.add(edit_menuitem)
348 by Daniel Schierbeck
Added toggle item for revision number column.
308
        menubar.add(view_menuitem)
331 by Daniel Schierbeck
Added basic menu bar.
309
        menubar.add(go_menuitem)
335 by Daniel Schierbeck
Added Revision menu.
310
        menubar.add(revision_menuitem)
331 by Daniel Schierbeck
Added basic menu bar.
311
        menubar.add(branch_menuitem)
423.9.1 by Daniel Schierbeck
Added Help->About menu item to the viz.
312
        menubar.add(help_menuitem)
331 by Daniel Schierbeck
Added basic menu bar.
313
        menubar.show_all()
314
315
        return menubar
3 by Scott James Remnant
Split the display in two with a pane, we'll use the bottom half to show
316
317
    def construct_top(self):
318
        """Construct the top-half of the window."""
329 by Jelmer Vernooij
Make broken_line_length setting from higher up.
319
        # FIXME: Make broken_line_length configurable
330.2.5 by Daniel Schierbeck
Support persistence of compact view option.
320
713.2.4 by Jelmer Vernooij
Fix some formatting.
321
        self.treeview = TreeView(self.branch, self.start_revs, self.maxnum,
322
            self.compact_view)
423.7.5 by Daniel Schierbeck
Made the revision history window update the Go->Tags menu when a tag is added.
323
373 by Daniel Schierbeck
Made column display options persisted.
324
        for col in ["revno", "date"]:
325
            option = self.config.get_user_option(col + '-column-visible')
326
            if option is not None:
713.2.4 by Jelmer Vernooij
Fix some formatting.
327
                self.treeview.set_property(col + '-column-visible',
328
                    option == 'True')
464.1.1 by Adrian Wilkins
Fixed column visibility properties not loading
329
            else:
330
                self.treeview.set_property(col + '-column-visible', False)
373 by Daniel Schierbeck
Made column display options persisted.
331
1 by Scott James Remnant
Commit the first version of bzrk.
332
        self.treeview.show()
333
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
334
        align = Gtk.Alignment.new(0.0, 0.0, 1.0, 1.0)
375 by Daniel Schierbeck
Fixed crash when toggling compact view.
335
        align.set_padding(5, 0, 0, 0)
336
        align.add(self.treeview)
531.7.9 by Scott Scriven
Made vis remember window and panel sizes.
337
        # user-configured size
531.7.10 by Scott Scriven
Simplified size-loading code. No longer saves identical config every time vis runs.
338
        size = self._load_size('viz-graph-size')
339
        if size:
340
            width, height = size
531.7.9 by Scott Scriven
Made vis remember window and panel sizes.
341
            align.set_size_request(width, height)
342
        else:
343
            (width, height) = self.get_size()
344
            align.set_size_request(width, int(height / 2.5))
625.1.8 by Torsten Landschoff
Save widget sizes only when closing the BranchWindow.
345
        self._save_size_on_destroy(align, 'viz-graph-size')
375 by Daniel Schierbeck
Fixed crash when toggling compact view.
346
        align.show()
347
348
        return align
44 by David Allouche
reorganise branch window
349
350
    def construct_navigation(self):
351
        """Construct the navigation buttons."""
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
352
        self.toolbar = Gtk.Toolbar()
734.1.24 by Curtis Hovey
Updated most of BranchView to gtk3.
353
        self.toolbar.set_style(Gtk.ToolbarStyle.BOTH_HORIZ)
3 by Scott James Remnant
Split the display in two with a pane, we'll use the bottom half to show
354
388 by Daniel Schierbeck
Switched to using the Previous/Next Revision actions to create tool buttons.
355
        self.prev_button = self.prev_rev_action.create_tool_item()
376 by Daniel Schierbeck
Changed 'back' into 'prev' and 'fwd' into 'next'.
356
        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
357
388 by Daniel Schierbeck
Switched to using the Previous/Next Revision actions to create tool buttons.
358
        self.next_button = self.next_rev_action.create_tool_item()
376 by Daniel Schierbeck
Changed 'back' into 'prev' and 'fwd' into 'next'.
359
        self.toolbar.insert(self.next_button, -1)
330.2.4 by Daniel Schierbeck
Made use of compact view optional.
360
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
361
        self.toolbar.insert(Gtk.SeparatorToolItem(), -1)
401.1.2 by Daniel Schierbeck
Allowed the treeview to be refreshed.
362
734.1.24 by Curtis Hovey
Updated most of BranchView to gtk3.
363
        refresh_button = Gtk.ToolButton.new_from_stock(Gtk.STOCK_REFRESH)
404 by Daniel Schierbeck
Made the refresh use proper locking.
364
        refresh_button.connect('clicked', self._refresh_clicked)
401.1.2 by Daniel Schierbeck
Allowed the treeview to be refreshed.
365
        self.toolbar.insert(refresh_button, -1)
366
330.2.4 by Daniel Schierbeck
Made use of compact view optional.
367
        self.toolbar.show_all()
325 by Daniel Schierbeck
Switched to using a real toolbar for the viz navigation.
368
369
        return self.toolbar
3 by Scott James Remnant
Split the display in two with a pane, we'll use the bottom half to show
370
371
    def construct_bottom(self):
372
        """Construct the bottom half of the window."""
531.7.14 by Scott Scriven
Made diff placement configurable (bottom-right, or bottom full-width).
373
        if self.config.get_user_option('viz-wide-diffs') == 'True':
775.1.4 by Curtis Hovey
Switched from Gtk.VPaned to Gtk.Paned.new(Gtk.Orientation.VERTICAL).
374
            self.diff_paned = Gtk.Paned.new(Gtk.Orientation.VERTICAL)
531.7.14 by Scott Scriven
Made diff placement configurable (bottom-right, or bottom full-width).
375
        else:
775.1.5 by Curtis Hovey
Replace Gtk.HPaned() with Gtk.Paned.new(Gtk.Orientation.HORIZONTAL).
376
            self.diff_paned = Gtk.Paned.new(Gtk.Orientation.HORIZONTAL)
531.7.1 by Scott Scriven
Added a diff panel to otherwise-blank area in 'bzr vis'.
377
        (width, height) = self.get_size()
531.7.14 by Scott Scriven
Made diff placement configurable (bottom-right, or bottom full-width).
378
        self.diff_paned.set_size_request(20, 20) # shrinkable
531.7.1 by Scott Scriven
Added a diff panel to otherwise-blank area in 'bzr vis'.
379
330.3.1 by Daniel Schierbeck
Renamed logview 'revisionview'.
380
        from bzrlib.plugins.gtk.revisionview import RevisionView
412.1.2 by Daniel Schierbeck
Moved retrieval of tags into the revisionview itself.
381
        self.revisionview = RevisionView(branch=self.branch)
531.7.1 by Scott Scriven
Added a diff panel to otherwise-blank area in 'bzr vis'.
382
        self.revisionview.set_size_request(width/3, int(height / 2.5))
531.7.9 by Scott Scriven
Made vis remember window and panel sizes.
383
        # user-configured size
531.7.10 by Scott Scriven
Simplified size-loading code. No longer saves identical config every time vis runs.
384
        size = self._load_size('viz-revisionview-size')
385
        if size:
386
            width, height = size
531.7.9 by Scott Scriven
Made vis remember window and panel sizes.
387
            self.revisionview.set_size_request(width, height)
625.1.8 by Torsten Landschoff
Save widget sizes only when closing the BranchWindow.
388
        self._save_size_on_destroy(self.revisionview, 'viz-revisionview-size')
330.3.1 by Daniel Schierbeck
Renamed logview 'revisionview'.
389
        self.revisionview.show()
390
        self.revisionview.set_show_callback(self._show_clicked_cb)
412.1.9 by Daniel Schierbeck
Removed the use of RevisionView.set_go_callback().
391
        self.revisionview.connect('notify::revision', self._go_clicked_cb)
713.2.4 by Jelmer Vernooij
Fix some formatting.
392
        self.treeview.connect('tag-added',
393
            lambda w, t, r: self.revisionview.update_tags())
713.2.6 by Jelmer Vernooij
Fix signal handling.
394
        self.treeview.connect('revision-selected',
395
                self._treeselection_changed_cb)
396
        self.treeview.connect('revision-activated',
397
                self._tree_revision_activated)
531.7.14 by Scott Scriven
Made diff placement configurable (bottom-right, or bottom full-width).
398
        self.diff_paned.pack1(self.revisionview)
531.7.1 by Scott Scriven
Added a diff panel to otherwise-blank area in 'bzr vis'.
399
400
        from bzrlib.plugins.gtk.diff import DiffWidget
401
        self.diff = DiffWidget()
531.7.14 by Scott Scriven
Made diff placement configurable (bottom-right, or bottom full-width).
402
        self.diff_paned.pack2(self.diff)
531.7.1 by Scott Scriven
Added a diff panel to otherwise-blank area in 'bzr vis'.
403
531.7.14 by Scott Scriven
Made diff placement configurable (bottom-right, or bottom full-width).
404
        self.diff_paned.show_all()
531.7.12 by Scott Scriven
Made diff panel default to off.
405
        if self.config.get_user_option('viz-show-diffs') != 'True':
531.7.3 by Scott Scriven
Added an option to show/hide the diff panel.
406
            self.diff.hide()
407
531.7.14 by Scott Scriven
Made diff placement configurable (bottom-right, or bottom full-width).
408
        return self.diff_paned
332 by Daniel Schierbeck
Made tag selection work.
409
410
    def _tag_selected_cb(self, menuitem, revid):
356 by Daniel Schierbeck
Made revision a property on TreeView.
411
        self.treeview.set_revision_id(revid)
341 by Daniel Schierbeck
Merged with trunk.
412
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)
413
    def _treeselection_changed_cb(self, selection, *args):
303 by Daniel Schierbeck
Made basic signaling work.
414
        """callback for when the treeview changes."""
415
        revision = self.treeview.get_revision()
416
        parents  = self.treeview.get_parents()
417
        children = self.treeview.get_children()
418
713.2.6 by Jelmer Vernooij
Fix signal handling.
419
        if revision and revision.revision_id != NULL_REVISION:
420
            self.revision_menu.set_revision_ids([revision.revision_id])
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
421
            prev_menu = Gtk.Menu()
352.1.1 by Daniel Schierbeck
Added dropdown menu to Back button.
422
            if len(parents) > 0:
385 by Daniel Schierbeck
Created a single action for Previous Revision.
423
                self.prev_rev_action.set_sensitive(True)
352.1.1 by Daniel Schierbeck
Added dropdown menu to Back button.
424
                for parent_id in parents:
464.2.1 by Adrian Wilkins
Detect the reserved null: revision in appropriate places.
425
                    if parent_id and parent_id != NULL_REVISION:
426
                        parent = self.branch.repository.get_revision(parent_id)
427
                        try:
713.2.4 by Jelmer Vernooij
Fix some formatting.
428
                            str = ' (%s)' % parent.properties['branch-nick']
464.2.1 by Adrian Wilkins
Detect the reserved null: revision in appropriate places.
429
                        except KeyError:
430
                            str = ""
355 by Daniel Schierbeck
Appended branch nick to parent and child popup menus.
431
734.1.38 by Curtis Hovey
Menu fixes.
432
                        item = Gtk.MenuItem(
433
                            label=parent.message.split("\n")[0] + str)
464.2.1 by Adrian Wilkins
Detect the reserved null: revision in appropriate places.
434
                        item.connect('activate', self._set_revision_cb, parent_id)
435
                        prev_menu.add(item)
376 by Daniel Schierbeck
Changed 'back' into 'prev' and 'fwd' into 'next'.
436
                prev_menu.show_all()
352.1.1 by Daniel Schierbeck
Added dropdown menu to Back button.
437
            else:
385 by Daniel Schierbeck
Created a single action for Previous Revision.
438
                self.prev_rev_action.set_sensitive(False)
376 by Daniel Schierbeck
Changed 'back' into 'prev' and 'fwd' into 'next'.
439
                prev_menu.hide()
440
671.1.2 by David Roberts
Further consequential changes for PyGtk-2.8
441
            if getattr(self.prev_button, 'set_menu', None) is not None:
724 by Jelmer Vernooij
Fix formatting, imports.
442
                self.prev_button.set_menu(prev_menu)
376 by Daniel Schierbeck
Changed 'back' into 'prev' and 'fwd' into 'next'.
443
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
444
            next_menu = Gtk.Menu()
352.1.2 by Daniel Schierbeck
Added dropdown menu to Forward button.
445
            if len(children) > 0:
386 by Daniel Schierbeck
Created a single action for Next Revision.
446
                self.next_rev_action.set_sensitive(True)
352.1.2 by Daniel Schierbeck
Added dropdown menu to Forward button.
447
                for child_id in children:
448
                    child = self.branch.repository.get_revision(child_id)
355 by Daniel Schierbeck
Appended branch nick to parent and child popup menus.
449
                    try:
713.2.4 by Jelmer Vernooij
Fix some formatting.
450
                        str = ' (%s)' % child.properties['branch-nick']
355 by Daniel Schierbeck
Appended branch nick to parent and child popup menus.
451
                    except KeyError:
452
                        str = ""
453
734.1.40 by Curtis Hovey
Fixed menu item.
454
                    item = Gtk.MenuItem(
455
                        label=child.message.split("\n")[0] + str)
352.1.2 by Daniel Schierbeck
Added dropdown menu to Forward button.
456
                    item.connect('activate', self._set_revision_cb, child_id)
376 by Daniel Schierbeck
Changed 'back' into 'prev' and 'fwd' into 'next'.
457
                    next_menu.add(item)
458
                next_menu.show_all()
352.1.2 by Daniel Schierbeck
Added dropdown menu to Forward button.
459
            else:
386 by Daniel Schierbeck
Created a single action for Next Revision.
460
                self.next_rev_action.set_sensitive(False)
376 by Daniel Schierbeck
Changed 'back' into 'prev' and 'fwd' into 'next'.
461
                next_menu.hide()
352.1.2 by Daniel Schierbeck
Added dropdown menu to Forward button.
462
671.1.2 by David Roberts
Further consequential changes for PyGtk-2.8
463
            if getattr(self.next_button, 'set_menu', None) is not None:
724 by Jelmer Vernooij
Fix formatting, imports.
464
                self.next_button.set_menu(next_menu)
352.1.2 by Daniel Schierbeck
Added dropdown menu to Forward button.
465
412.1.13 by Daniel Schierbeck
Re-added support for displaying the children of a revision.
466
            self.revisionview.set_revision(revision)
467
            self.revisionview.set_children(children)
531.7.3 by Scott Scriven
Added an option to show/hide the diff panel.
468
            self.update_diff_panel(revision, parents)
531.7.1 by Scott Scriven
Added a diff panel to otherwise-blank area in 'bzr vis'.
469
423.1.17 by Gary van der Merwe
Reuse the viz treeview in the revision browser.
470
    def _tree_revision_activated(self, widget, path, col):
471
        # TODO: more than one parent
472
        """Callback for when a treeview row gets activated."""
473
        revision = self.treeview.get_revision()
474
        parents  = self.treeview.get_parents()
475
476
        if len(parents) == 0:
627 by Jelmer Vernooij
Use NULL_REVISION rather than None.
477
            parent_id = NULL_REVISION
423.1.17 by Gary van der Merwe
Reuse the viz treeview in the revision browser.
478
        else:
479
            parent_id = parents[0]
480
778.1.2 by Jelmer Vernooij
Properly handle popup menus when there is no selected revision in 'bzr viz'.
481
        if revision is not None:
482
            self.show_diff(revision.revision_id, parent_id)
483
        else:
484
            self.show_diff(NULL_REVISION)
423.1.17 by Gary van der Merwe
Reuse the viz treeview in the revision browser.
485
        self.treeview.grab_focus()
713 by Jelmer Vernooij
Remove some unused imports, fix some formatting.
486
3 by Scott James Remnant
Split the display in two with a pane, we'll use the bottom half to show
487
    def _back_clicked_cb(self, *args):
488
        """Callback for when the back button is clicked."""
304 by Daniel Schierbeck
Made forward/back buttons work again.
489
        self.treeview.back()
713 by Jelmer Vernooij
Remove some unused imports, fix some formatting.
490
5 by Scott James Remnant
Reverse the meaning of the Back and Forward buttons so Back actually
491
    def _fwd_clicked_cb(self, *args):
492
        """Callback for when the forward button is clicked."""
304 by Daniel Schierbeck
Made forward/back buttons work again.
493
        self.treeview.forward()
7 by Scott James Remnant
Put some information about the highlighted revision in the bottom pane,
494
412.1.9 by Daniel Schierbeck
Removed the use of RevisionView.set_go_callback().
495
    def _go_clicked_cb(self, w, p):
7 by Scott James Remnant
Put some information about the highlighted revision in the bottom pane,
496
        """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().
497
        if self.revisionview.get_revision() is not None:
498
            self.treeview.set_revision(self.revisionview.get_revision())
152 by Jelmer Vernooij
Cleanup some more code.
499
147 by Jelmer Vernooij
Remove a bunch of duplicate functionality.
500
    def _show_clicked_cb(self, revid, parentid):
7 by Scott James Remnant
Put some information about the highlighted revision in the bottom pane,
501
        """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.
502
        self.show_diff(revid, parentid)
13 by Scott James Remnant
Keep the focus on the treeview
503
        self.treeview.grab_focus()
46 by Wouter van Heyst
show diff on row activation, LP# 44591
504
352.1.1 by Daniel Schierbeck
Added dropdown menu to Back button.
505
    def _set_revision_cb(self, w, revision_id):
356 by Daniel Schierbeck
Made revision a property on TreeView.
506
        self.treeview.set_revision_id(revision_id)
352.1.1 by Daniel Schierbeck
Added dropdown menu to Back button.
507
330.2.4 by Daniel Schierbeck
Made use of compact view optional.
508
    def _brokenlines_toggled_cb(self, button):
330.2.5 by Daniel Schierbeck
Support persistence of compact view option.
509
        self.compact_view = button.get_active()
510
511
        if self.compact_view:
512
            option = 'yes'
330.2.4 by Daniel Schierbeck
Made use of compact view optional.
513
        else:
330.2.5 by Daniel Schierbeck
Support persistence of compact view option.
514
            option = 'no'
515
516
        self.config.set_user_option('viz-compact-view', option)
401.1.3 by Daniel Schierbeck
Made the compact view toggling cleaner.
517
        self.treeview.set_property('compact', self.compact_view)
518
        self.treeview.refresh()
368 by Daniel Schierbeck
Merged with mainline.
519
511.6.1 by Jelmer Vernooij
Add Branch/Index option if bzr-search is available.
520
    def _branch_index_cb(self, w):
521
        from bzrlib.plugins.search import index as _mod_index
522
        _mod_index.index_url(self.branch.base)
523
524 by Jelmer Vernooij
Add search dialog.
524
    def _branch_search_cb(self, w):
713.2.4 by Jelmer Vernooij
Fix some formatting.
525
        from bzrlib.plugins.search import (
526
            index as _mod_index,
527
            errors as search_errors,
528
            )
524 by Jelmer Vernooij
Add search dialog.
529
        from bzrlib.plugins.gtk.search import SearchDialog
533.11.1 by Jelmer Vernooij
Ask user whether to index if there is no index present yet.
530
531
        try:
532
            index = _mod_index.open_index_url(self.branch.base)
533
        except search_errors.NoSearchIndex:
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
534
            dialog = Gtk.MessageDialog(self, type=Gtk.MessageType.QUESTION, 
535
                buttons=Gtk.ButtonsType.OK_CANCEL, 
533.11.1 by Jelmer Vernooij
Ask user whether to index if there is no index present yet.
536
                message_format="This branch has not been indexed yet. "
537
                               "Index now?")
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
538
            if dialog.run() == Gtk.ResponseType.OK:
553 by Jelmer Vernooij
Merge asking the user whether to create an index.
539
                dialog.destroy()
533.11.1 by Jelmer Vernooij
Ask user whether to index if there is no index present yet.
540
                index = _mod_index.index_url(self.branch.base)
541
            else:
553 by Jelmer Vernooij
Merge asking the user whether to create an index.
542
                dialog.destroy()
533.11.1 by Jelmer Vernooij
Ask user whether to index if there is no index present yet.
543
                return
544
545
        dialog = SearchDialog(index)
713 by Jelmer Vernooij
Remove some unused imports, fix some formatting.
546
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
547
        if dialog.run() == Gtk.ResponseType.OK:
758 by Jelmer Vernooij
Cope with no results in search dialog.
548
            revid = dialog.get_revision()
549
            if revid is not None:
550
                self.set_revision(revid)
526 by Jelmer Vernooij
Switch to found revision when clicking ok in search window.
551
552
        dialog.destroy()
524 by Jelmer Vernooij
Add search dialog.
553
423.9.1 by Daniel Schierbeck
Added Help->About menu item to the viz.
554
    def _about_dialog_cb(self, w):
555
        from bzrlib.plugins.gtk.about import AboutDialog
556
        AboutDialog().run()
557
348 by Daniel Schierbeck
Added toggle item for revision number column.
558
    def _col_visibility_changed(self, col, property):
373 by Daniel Schierbeck
Made column display options persisted.
559
        self.config.set_user_option(property + '-column-visible', col.get_active())
348 by Daniel Schierbeck
Added toggle item for revision number column.
560
        self.treeview.set_property(property + '-column-visible', col.get_active())
351 by Daniel Schierbeck
Added option to hide the toolbar.
561
562
    def _toolbar_visibility_changed(self, col):
563
        if col.get_active():
531.7.2 by Scott Scriven
Made 'vis' save/load visibility of its toolbar.
564
            self.toolbar.show()
351 by Daniel Schierbeck
Added option to hide the toolbar.
565
        else:
566
            self.toolbar.hide()
531.7.2 by Scott Scriven
Made 'vis' save/load visibility of its toolbar.
567
        self.config.set_user_option('viz-toolbar-visible', col.get_active())
371.1.1 by Daniel Schierbeck
Added About dialog to the viz.
568
713.2.1 by Ximin Luo
Add option to use 'bzr viz' with a vertical layout.
569
    def _vertical_layout(self, col):
570
        """Toggle the layout vertical/horizontal"""
571
        self.config.set_user_option('viz-vertical', str(col.get_active()))
572
573
        old = self.paned
574
        self.vbox.remove(old)
734.1.8 by Curtis Hovey
pass all the required args to pack_start().
575
        self.vbox.pack_start(
734.1.53 by Curtis Hovey
Fixed packing args.
576
            self.construct_paned(), True, True, 0)
713.2.1 by Ximin Luo
Add option to use 'bzr viz' with a vertical layout.
577
        self._make_diff_paned_nonzero_size()
578
        self._make_diff_nonzero_size()
579
580
        self.treeview.emit('revision-selected')
581
582
    def _make_diff_paned_nonzero_size(self):
583
        """make sure the diff/revision pane isn't zero-width or zero-height"""
584
        alloc = self.diff_paned.get_allocation()
585
        if (alloc.width < 10) or (alloc.height < 10):
586
            width, height = self.get_size()
587
            self.diff_paned.set_size_request(width/3, int(height / 2.5))
588
531.7.14 by Scott Scriven
Made diff placement configurable (bottom-right, or bottom full-width).
589
    def _make_diff_nonzero_size(self):
590
        """make sure the diff isn't zero-width or zero-height"""
591
        alloc = self.diff.get_allocation()
592
        if (alloc.width < 10) or (alloc.height < 10):
593
            width, height = self.get_size()
594
            self.revisionview.set_size_request(width/3, int(height / 2.5))
595
531.7.3 by Scott Scriven
Added an option to show/hide the diff panel.
596
    def _diff_visibility_changed(self, col):
531.7.14 by Scott Scriven
Made diff placement configurable (bottom-right, or bottom full-width).
597
        """Hide or show the diff panel."""
531.7.3 by Scott Scriven
Added an option to show/hide the diff panel.
598
        if col.get_active():
599
            self.diff.show()
531.7.14 by Scott Scriven
Made diff placement configurable (bottom-right, or bottom full-width).
600
            self._make_diff_nonzero_size()
531.7.3 by Scott Scriven
Added an option to show/hide the diff panel.
601
        else:
602
            self.diff.hide()
603
        self.config.set_user_option('viz-show-diffs', str(col.get_active()))
604
        self.update_diff_panel()
605
531.7.14 by Scott Scriven
Made diff placement configurable (bottom-right, or bottom full-width).
606
    def _diff_placement_changed(self, col):
607
        """Toggle the diff panel's position."""
608
        self.config.set_user_option('viz-wide-diffs', str(col.get_active()))
609
610
        old = self.paned.get_child2()
611
        self.paned.remove(old)
612
        self.paned.pack2(self.construct_bottom(), resize=True, shrink=False)
613
        self._make_diff_nonzero_size()
614
615
        self.treeview.emit('revision-selected')
713 by Jelmer Vernooij
Remove some unused imports, fix some formatting.
616
555.2.2 by Jasper Groenewegen
Change from checkbox to menu item in bzr vis, add menu bar + item in gdiff
617
    def _diff_wrap_changed(self, widget):
618
        """Toggle word wrap in the diff widget."""
619
        self.config.set_user_option('viz-wrap-diffs', widget.get_active())
620
        self.diff._on_wraplines_toggled(widget)
404 by Daniel Schierbeck
Made the refresh use proper locking.
621
622
    def _refresh_clicked(self, w):
423.1.13 by Gary van der Merwe
Move viz loading msg from branchwin to treeview.
623
        self.treeview.refresh()
423.7.5 by Daniel Schierbeck
Made the revision history window update the Go->Tags menu when a tag is added.
624
625
    def _update_tags(self):
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
626
        menu = Gtk.Menu()
423.7.5 by Daniel Schierbeck
Made the revision history window update the Go->Tags menu when a tag is added.
627
628
        if self.branch.supports_tags():
629
            tags = self.branch.tags.get_tag_dict().items()
576.5.1 by Jelmer Vernooij
Disable the ability to click on tags that are not available in the current view.
630
            tags.sort(reverse=True)
423.7.5 by Daniel Schierbeck
Made the revision history window update the Go->Tags menu when a tag is added.
631
            for tag, revid in tags:
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
632
                tag_image = Gtk.Image()
450.4.1 by Daniel Schierbeck
Added tag icon to branch history window.
633
                tag_image.set_from_file(icon_path('tag-16.png'))
734.1.24 by Curtis Hovey
Updated most of BranchView to gtk3.
634
                tag_item = Gtk.ImageMenuItem.new_with_mnemonic(
635
                    tag.replace('_', '__'))
450.4.1 by Daniel Schierbeck
Added tag icon to branch history window.
636
                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.
637
                tag_item.connect('activate', self._tag_selected_cb, revid)
576.5.1 by Jelmer Vernooij
Disable the ability to click on tags that are not available in the current view.
638
                tag_item.set_sensitive(self.treeview.has_revision_id(revid))
423.7.5 by Daniel Schierbeck
Made the revision history window update the Go->Tags menu when a tag is added.
639
                menu.add(tag_item)
640
            self.go_menu_tags.set_submenu(menu)
641
642
            self.go_menu_tags.set_sensitive(len(tags) != 0)
643
        else:
644
            self.go_menu_tags.set_sensitive(False)
645
646
        self.go_menu_tags.show_all()
647
531.7.10 by Scott Scriven
Simplified size-loading code. No longer saves identical config every time vis runs.
648
    def _load_size(self, name):
649
        """Read and parse 'name' from self.config.
650
        The value is a string, formatted as WIDTHxHEIGHT
651
        Returns None, or (width, height)
652
        """
653
        size = self.config.get_user_option(name)
654
        if size:
655
            width, height = [int(num) for num in size.split('x')]
656
            # avoid writing config every time we start
657
            return width, height
658
        return None
659
778.1.2 by Jelmer Vernooij
Properly handle popup menus when there is no selected revision in 'bzr viz'.
660
    def show_diff(self, revid, parentid=NULL_REVISION):
423.1.17 by Gary van der Merwe
Reuse the viz treeview in the revision browser.
661
        """Open a new window to show a diff between the given revisions."""
662
        from bzrlib.plugins.gtk.diff import DiffWindow
663
        window = DiffWindow(parent=self)
664
665
        rev_tree    = self.branch.repository.revision_tree(revid)
666
        parent_tree = self.branch.repository.revision_tree(parentid)
667
630 by Jelmer Vernooij
Use _get_nick(local=True) rather than .nick to get at a branches' nick, since
668
        description = revid + " - " + self.branch._get_nick(local=True)
423.1.17 by Gary van der Merwe
Reuse the viz treeview in the revision browser.
669
        window.set_diff(description, rev_tree, parent_tree)
670
        window.show()
671
531.7.3 by Scott Scriven
Added an option to show/hide the diff panel.
672
    def update_diff_panel(self, revision=None, parents=None):
673
        """Show the current revision in the diff panel."""
531.7.12 by Scott Scriven
Made diff panel default to off.
674
        if self.config.get_user_option('viz-show-diffs') != 'True':
531.7.3 by Scott Scriven
Added an option to show/hide the diff panel.
675
            return
676
677
        if not revision: # default to selected row
678
            revision = self.treeview.get_revision()
627 by Jelmer Vernooij
Use NULL_REVISION rather than None.
679
        if revision == NULL_REVISION:
531.7.3 by Scott Scriven
Added an option to show/hide the diff panel.
680
            return
681
682
        if not parents: # default to selected row's parents
683
            parents  = self.treeview.get_parents()
684
        if len(parents) == 0:
627 by Jelmer Vernooij
Use NULL_REVISION rather than None.
685
            parent_id = NULL_REVISION
531.7.3 by Scott Scriven
Added an option to show/hide the diff panel.
686
        else:
687
            parent_id = parents[0]
688
689
        rev_tree    = self.branch.repository.revision_tree(revision.revision_id)
690
        parent_tree = self.branch.repository.revision_tree(parent_id)
531.7.5 by Scott Scriven
Fixed DiffWidget so more than one call to set_diff() will work.
691
531.7.3 by Scott Scriven
Added an option to show/hide the diff panel.
692
        self.diff.set_diff(rev_tree, parent_tree)
555.2.2 by Jasper Groenewegen
Change from checkbox to menu item in bzr vis, add menu bar + item in gdiff
693
        if self.config.get_user_option('viz-wrap-diffs') == 'True':
694
            self.diff._on_wraplines_toggled(wrap=True)
531.7.3 by Scott Scriven
Added an option to show/hide the diff panel.
695
        self.diff.show_all()