/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: 2012-07-09 15:23:26 UTC
  • mto: This revision was merged to the branch mainline in revision 794.
  • Revision ID: jelmer@samba.org-20120709152326-dzxb8zoz0btull7n
https://launchpad.net/bugs/714767
https://launchpad.net/bugs/949798
https://launchpad.net/bugs/998994
https://launchpad.net/bugs/342135
https://launchpad.net/bugs/342136
https://launchpad.net/bugs/394536
Remove bzr-notify.

Show diffs side-by-side

added added

removed removed

Lines of Context:
viz/branchwin.py
1
 
# -*- coding: UTF-8 -*-
2
1
"""Branch window.
3
2
 
4
3
This module contains the code to manage the branch information window,
5
4
which contains both the revision graph and details panes.
6
5
"""
7
6
 
8
 
__copyright__ = "Copyright © 2005 Canonical Ltd."
 
7
__copyright__ = "Copyright (c) 2005 Canonical Ltd."
9
8
__author__    = "Scott James Remnant <scott@ubuntu.com>"
10
9
 
11
10
 
12
 
import gtk
13
 
import gobject
14
 
import pango
 
11
from gi.repository import Gdk
 
12
from gi.repository import Gtk
15
13
 
16
14
from bzrlib.plugins.gtk import icon_path
17
 
from bzrlib.plugins.gtk.branchview import TreeView, treemodel
18
 
from bzrlib.plugins.gtk.tags import AddTagDialog
 
15
from bzrlib.plugins.gtk.branchview import TreeView
19
16
from bzrlib.plugins.gtk.preferences import PreferencesWindow
20
17
from bzrlib.plugins.gtk.revisionmenu import RevisionMenu
21
18
from bzrlib.plugins.gtk.window import Window
22
19
 
23
 
from bzrlib.config import BranchConfig, GlobalConfig
24
 
from bzrlib.revision import Revision, NULL_REVISION
 
20
from bzrlib.config import GlobalConfig
 
21
from bzrlib.revision import NULL_REVISION
25
22
from bzrlib.trace import mutter
26
23
 
 
24
 
27
25
class BranchWindow(Window):
28
26
    """Branch window.
29
27
 
40
38
                       None for no limit.
41
39
        """
42
40
 
43
 
        Window.__init__(self, parent=parent)
 
41
        super(BranchWindow, self).__init__(parent=parent)
44
42
        self.set_border_width(0)
45
43
 
46
44
        self.branch      = branch
70
68
        self._save_size_on_destroy(self, 'viz-window-size')
71
69
 
72
70
        # FIXME AndyFitz!
73
 
        icon = self.render_icon(gtk.STOCK_INDEX, gtk.ICON_SIZE_BUTTON)
 
71
        icon = self.render_icon_pixbuf(Gtk.STOCK_INDEX, Gtk.IconSize.BUTTON)
74
72
        self.set_icon(icon)
75
73
 
76
 
        gtk.accel_map_add_entry("<viz>/Go/Next Revision", gtk.keysyms.Up, gtk.gdk.MOD1_MASK)
77
 
        gtk.accel_map_add_entry("<viz>/Go/Previous Revision", gtk.keysyms.Down, gtk.gdk.MOD1_MASK)
78
 
        gtk.accel_map_add_entry("<viz>/View/Refresh", gtk.keysyms.F5, 0)
 
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)
79
77
 
80
 
        self.accel_group = gtk.AccelGroup()
 
78
        self.accel_group = Gtk.AccelGroup()
81
79
        self.add_accel_group(self.accel_group)
82
80
 
83
 
        gtk.Action.set_tool_item_type(gtk.MenuToolButton)
84
 
 
85
 
        self.prev_rev_action = gtk.Action("prev-rev", "_Previous Revision", "Go to the previous revision", gtk.STOCK_GO_DOWN)
 
81
        self.prev_rev_action = Gtk.Action("prev-rev", "_Previous Revision", "Go to the previous revision", Gtk.STOCK_GO_DOWN)
86
82
        self.prev_rev_action.set_accel_path("<viz>/Go/Previous Revision")
87
83
        self.prev_rev_action.set_accel_group(self.accel_group)
88
84
        self.prev_rev_action.connect("activate", self._back_clicked_cb)
89
85
        self.prev_rev_action.connect_accelerator()
90
86
 
91
 
        self.next_rev_action = gtk.Action("next-rev", "_Next Revision", "Go to the next revision", gtk.STOCK_GO_UP)
 
87
        self.next_rev_action = Gtk.Action("next-rev", "_Next Revision", "Go to the next revision", Gtk.STOCK_GO_UP)
92
88
        self.next_rev_action.set_accel_path("<viz>/Go/Next Revision")
93
89
        self.next_rev_action.set_accel_group(self.accel_group)
94
90
        self.next_rev_action.connect("activate", self._fwd_clicked_cb)
95
91
        self.next_rev_action.connect_accelerator()
96
92
 
97
 
        self.refresh_action = gtk.Action("refresh", "_Refresh", "Refresh view", gtk.STOCK_REFRESH)
 
93
        self.refresh_action = Gtk.Action("refresh", "_Refresh", "Refresh view", Gtk.STOCK_REFRESH)
98
94
        self.refresh_action.set_accel_path("<viz>/View/Refresh")
99
95
        self.refresh_action.set_accel_group(self.accel_group)
100
96
        self.refresh_action.connect("activate", self._refresh_clicked)
101
97
        self.refresh_action.connect_accelerator()
102
98
 
103
 
        self.construct()
 
99
        self.vbox = self.construct()
104
100
 
105
101
    def _save_size_on_destroy(self, widget, config_name):
106
102
        """Creates a hook that saves the size of widget to config option 
107
103
           config_name when the window is destroyed/closed."""
108
104
        def save_size(src):
109
 
            width, height = widget.allocation.width, widget.allocation.height
 
105
            allocation = widget.get_allocation()
 
106
            width, height = allocation.width, allocation.height
110
107
            value = '%sx%s' % (width, height)
111
108
            self.config.set_user_option(config_name, value)
112
109
        self.connect("destroy", save_size)
116
113
 
117
114
    def construct(self):
118
115
        """Construct the window contents."""
119
 
        vbox = gtk.VBox(spacing=0)
 
116
        vbox = Gtk.VBox(spacing=0)
120
117
        self.add(vbox)
121
118
 
122
 
        self.paned = gtk.VPaned()
123
 
        self.paned.pack1(self.construct_top(), resize=False, shrink=True)
124
 
        self.paned.pack2(self.construct_bottom(), resize=True, shrink=False)
125
 
        self.paned.show()
126
 
 
 
119
        # order is important here
 
120
        paned = self.construct_paned()
127
121
        nav = self.construct_navigation()
128
122
        menubar = self.construct_menubar()
129
 
        vbox.pack_start(menubar, expand=False, fill=True)
130
 
        vbox.pack_start(nav, expand=False, fill=True)
131
 
 
132
 
        vbox.pack_start(self.paned, expand=True, fill=True)
133
 
        vbox.set_focus_child(self.paned)
134
 
 
135
 
        self.treeview.connect('revision-selected',
136
 
                self._treeselection_changed_cb)
137
 
        self.treeview.connect('revision-activated',
138
 
                self._tree_revision_activated)
139
 
 
140
 
        self.treeview.connect('tag-added', lambda w, t, r: self._update_tags())
 
123
 
 
124
        vbox.pack_start(menubar, False, True, 0)
 
125
        vbox.pack_start(nav, False, True, 0)
 
126
        vbox.pack_start(paned, True, True, 0)
 
127
        vbox.set_focus_child(paned)
 
128
 
 
129
 
141
130
        vbox.show()
142
 
    
 
131
 
 
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':
 
137
            self.paned = Gtk.Paned.new(Gtk.Orientation.HORIZONTAL)
 
138
        else:
 
139
            self.paned = Gtk.Paned.new(Gtk.Orientation.VERTICAL)
 
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
 
143
147
    def construct_menubar(self):
144
 
        menubar = gtk.MenuBar()
 
148
        menubar = Gtk.MenuBar()
145
149
 
146
 
        file_menu = gtk.Menu()
147
 
        file_menuitem = gtk.MenuItem("_File")
 
150
        file_menu = Gtk.Menu()
 
151
        file_menuitem = Gtk.MenuItem.new_with_mnemonic("_File")
148
152
        file_menuitem.set_submenu(file_menu)
149
153
 
150
 
        file_menu_close = gtk.ImageMenuItem(gtk.STOCK_CLOSE, self.accel_group)
 
154
        file_menu_close = Gtk.ImageMenuItem.new_from_stock(
 
155
            Gtk.STOCK_CLOSE, self.accel_group)
151
156
        file_menu_close.connect('activate', lambda x: self.destroy())
152
 
        
153
 
        file_menu_quit = gtk.ImageMenuItem(gtk.STOCK_QUIT, self.accel_group)
154
 
        file_menu_quit.connect('activate', lambda x: gtk.main_quit())
155
 
        
 
157
 
 
158
        file_menu_quit = Gtk.ImageMenuItem.new_from_stock(
 
159
            Gtk.STOCK_QUIT, self.accel_group)
 
160
        file_menu_quit.connect('activate', lambda x: Gtk.main_quit())
 
161
 
156
162
        if self._parent is not None:
157
163
            file_menu.add(file_menu_close)
158
164
        file_menu.add(file_menu_quit)
159
165
 
160
 
        edit_menu = gtk.Menu()
161
 
        edit_menuitem = gtk.MenuItem("_Edit")
 
166
        edit_menu = Gtk.Menu()
 
167
        edit_menuitem = Gtk.MenuItem.new_with_mnemonic("_Edit")
162
168
        edit_menuitem.set_submenu(edit_menu)
163
169
 
164
 
        edit_menu_branchopts = gtk.MenuItem("Branch Settings")
 
170
        edit_menu_branchopts = Gtk.MenuItem(label="Branch Settings")
165
171
        edit_menu_branchopts.connect('activate', lambda x: PreferencesWindow(self.branch.get_config()).show())
166
172
 
167
 
        edit_menu_globopts = gtk.MenuItem("Global Settings")
 
173
        edit_menu_globopts = Gtk.MenuItem(label="Global Settings")
168
174
        edit_menu_globopts.connect('activate', lambda x: PreferencesWindow().show())
169
175
 
170
176
        edit_menu.add(edit_menu_branchopts)
171
177
        edit_menu.add(edit_menu_globopts)
172
178
 
173
 
        view_menu = gtk.Menu()
174
 
        view_menuitem = gtk.MenuItem("_View")
 
179
        view_menu = Gtk.Menu()
 
180
        view_menuitem = Gtk.MenuItem.new_with_mnemonic("_View")
175
181
        view_menuitem.set_submenu(view_menu)
176
182
 
177
183
        view_menu_refresh = self.refresh_action.create_menu_item()
178
184
        view_menu_refresh.connect('activate', self._refresh_clicked)
179
185
 
180
186
        view_menu.add(view_menu_refresh)
181
 
        view_menu.add(gtk.SeparatorMenuItem())
 
187
        view_menu.add(Gtk.SeparatorMenuItem())
182
188
 
183
 
        view_menu_toolbar = gtk.CheckMenuItem("Show Toolbar")
 
189
        view_menu_toolbar = Gtk.CheckMenuItem(label="Show Toolbar")
184
190
        view_menu_toolbar.set_active(True)
185
191
        if self.config.get_user_option('viz-toolbar-visible') == 'False':
186
192
            view_menu_toolbar.set_active(False)
187
193
            self.toolbar.hide()
188
194
        view_menu_toolbar.connect('toggled', self._toolbar_visibility_changed)
189
195
 
190
 
        view_menu_compact = gtk.CheckMenuItem("Show Compact Graph")
 
196
        view_menu_compact = Gtk.CheckMenuItem(label="Show Compact Graph")
191
197
        view_menu_compact.set_active(self.compact_view)
192
198
        view_menu_compact.connect('activate', self._brokenlines_toggled_cb)
193
 
        
194
 
        view_menu_diffs = gtk.CheckMenuItem("Show Diffs")
 
199
 
 
200
        view_menu_vertical = Gtk.CheckMenuItem(label="Side-by-side 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
 
 
206
        view_menu_diffs = Gtk.CheckMenuItem(label="Show Diffs")
195
207
        view_menu_diffs.set_active(False)
196
208
        if self.config.get_user_option('viz-show-diffs') == 'True':
197
209
            view_menu_diffs.set_active(True)
198
210
        view_menu_diffs.connect('toggled', self._diff_visibility_changed)
199
 
        
200
 
        view_menu_wide_diffs = gtk.CheckMenuItem("Wide Diffs")
 
211
 
 
212
        view_menu_wide_diffs = Gtk.CheckMenuItem(label="Wide Diffs")
201
213
        view_menu_wide_diffs.set_active(False)
202
214
        if self.config.get_user_option('viz-wide-diffs') == 'True':
203
215
            view_menu_wide_diffs.set_active(True)
204
216
        view_menu_wide_diffs.connect('toggled', self._diff_placement_changed)
205
 
        
206
 
        view_menu_wrap_diffs = gtk.CheckMenuItem("Wrap _Long Lines in Diffs")
 
217
 
 
218
        view_menu_wrap_diffs = Gtk.CheckMenuItem.new_with_mnemonic(
 
219
            "Wrap _Long Lines in Diffs")
207
220
        view_menu_wrap_diffs.set_active(False)
208
221
        if self.config.get_user_option('viz-wrap-diffs') == 'True':
209
222
            view_menu_wrap_diffs.set_active(True)
210
223
        view_menu_wrap_diffs.connect('toggled', self._diff_wrap_changed)
211
 
                
 
224
 
212
225
        view_menu.add(view_menu_toolbar)
213
226
        view_menu.add(view_menu_compact)
214
 
        view_menu.add(gtk.SeparatorMenuItem())
 
227
        view_menu.add(view_menu_vertical)
 
228
        view_menu.add(Gtk.SeparatorMenuItem())
215
229
        view_menu.add(view_menu_diffs)
216
230
        view_menu.add(view_menu_wide_diffs)
217
231
        view_menu.add(view_menu_wrap_diffs)
218
 
        view_menu.add(gtk.SeparatorMenuItem())
 
232
        view_menu.add(Gtk.SeparatorMenuItem())
219
233
 
220
 
        self.mnu_show_revno_column = gtk.CheckMenuItem("Show Revision _Number Column")
221
 
        self.mnu_show_date_column = gtk.CheckMenuItem("Show _Date Column")
 
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")
222
238
 
223
239
        # Revision numbers are pointless if there are multiple branches
224
240
        if len(self.start_revs) > 1:
231
247
            col.connect('toggled', self._col_visibility_changed, name)
232
248
            view_menu.add(col)
233
249
 
234
 
        go_menu = gtk.Menu()
 
250
        go_menu = Gtk.Menu()
235
251
        go_menu.set_accel_group(self.accel_group)
236
 
        go_menuitem = gtk.MenuItem("_Go")
 
252
        go_menuitem = Gtk.MenuItem.new_with_mnemonic("_Go")
237
253
        go_menuitem.set_submenu(go_menu)
238
 
        
 
254
 
239
255
        go_menu_next = self.next_rev_action.create_menu_item()
240
256
        go_menu_prev = self.prev_rev_action.create_menu_item()
241
257
 
242
 
        tag_image = gtk.Image()
 
258
        tag_image = Gtk.Image()
243
259
        tag_image.set_from_file(icon_path("tag-16.png"))
244
 
        self.go_menu_tags = gtk.ImageMenuItem("_Tags")
 
260
        self.go_menu_tags = Gtk.ImageMenuItem.new_with_mnemonic("_Tags")
245
261
        self.go_menu_tags.set_image(tag_image)
246
262
        self.treeview.connect('refreshed', lambda w: self._update_tags())
247
263
 
248
264
        go_menu.add(go_menu_next)
249
265
        go_menu.add(go_menu_prev)
250
 
        go_menu.add(gtk.SeparatorMenuItem())
 
266
        go_menu.add(Gtk.SeparatorMenuItem())
251
267
        go_menu.add(self.go_menu_tags)
252
268
 
253
 
        self.revision_menu = RevisionMenu(self.branch.repository, [], self.branch, parent=self)
254
 
        revision_menuitem = gtk.MenuItem("_Revision")
 
269
        self.revision_menu = RevisionMenu(self.branch.repository, [],
 
270
            self.branch, parent=self)
 
271
        revision_menuitem = Gtk.MenuItem.new_with_mnemonic("_Revision")
255
272
        revision_menuitem.set_submenu(self.revision_menu)
256
273
 
257
 
        branch_menu = gtk.Menu()
258
 
        branch_menuitem = gtk.MenuItem("_Branch")
 
274
        branch_menu = Gtk.Menu()
 
275
        branch_menuitem = Gtk.MenuItem.new_with_mnemonic("_Branch")
259
276
        branch_menuitem.set_submenu(branch_menu)
260
277
 
261
 
        branch_menu.add(gtk.MenuItem("Pu_ll Revisions"))
262
 
        branch_menu.add(gtk.MenuItem("Pu_sh Revisions"))
 
278
        branch_menu.add(Gtk.MenuItem.new_with_mnemonic("Pu_ll Revisions"))
 
279
        branch_menu.add(Gtk.MenuItem.new_with_mnemonic("Pu_sh Revisions"))
263
280
 
264
281
        try:
265
282
            from bzrlib.plugins import search
266
283
        except ImportError:
267
284
            mutter("Didn't find search plugin")
268
285
        else:
269
 
            branch_menu.add(gtk.SeparatorMenuItem())
 
286
            branch_menu.add(Gtk.SeparatorMenuItem())
270
287
 
271
 
            branch_index_menuitem = gtk.MenuItem("_Index")
 
288
            branch_index_menuitem = Gtk.MenuItem.new_with_mnemonic("_Index")
272
289
            branch_index_menuitem.connect('activate', self._branch_index_cb)
273
290
            branch_menu.add(branch_index_menuitem)
274
291
 
275
 
            branch_search_menuitem = gtk.MenuItem("_Search")
 
292
            branch_search_menuitem = Gtk.MenuItem.new_with_mnemonic("_Search")
276
293
            branch_search_menuitem.connect('activate', self._branch_search_cb)
277
294
            branch_menu.add(branch_search_menuitem)
278
295
 
279
 
        help_menu = gtk.Menu()
280
 
        help_menuitem = gtk.MenuItem("_Help")
 
296
        help_menu = Gtk.Menu()
 
297
        help_menuitem = Gtk.MenuItem.new_with_mnemonic("_Help")
281
298
        help_menuitem.set_submenu(help_menu)
282
299
 
283
 
        help_about_menuitem = gtk.ImageMenuItem(gtk.STOCK_ABOUT, self.accel_group)
 
300
        help_about_menuitem = Gtk.ImageMenuItem.new_from_stock(
 
301
            Gtk.STOCK_ABOUT, self.accel_group)
284
302
        help_about_menuitem.connect('activate', self._about_dialog_cb)
285
303
 
286
304
        help_menu.add(help_about_menuitem)
300
318
        """Construct the top-half of the window."""
301
319
        # FIXME: Make broken_line_length configurable
302
320
 
303
 
        self.treeview = TreeView(self.branch, self.start_revs, self.maxnum, self.compact_view)
 
321
        self.treeview = TreeView(self.branch, self.start_revs, self.maxnum,
 
322
            self.compact_view)
304
323
 
305
324
        for col in ["revno", "date"]:
306
325
            option = self.config.get_user_option(col + '-column-visible')
307
326
            if option is not None:
308
 
                self.treeview.set_property(col + '-column-visible', option == 'True')
 
327
                self.treeview.set_property(col + '-column-visible',
 
328
                    option == 'True')
309
329
            else:
310
330
                self.treeview.set_property(col + '-column-visible', False)
311
331
 
312
332
        self.treeview.show()
313
333
 
314
 
        align = gtk.Alignment(0.0, 0.0, 1.0, 1.0)
 
334
        align = Gtk.Alignment.new(0.0, 0.0, 1.0, 1.0)
315
335
        align.set_padding(5, 0, 0, 0)
316
336
        align.add(self.treeview)
317
337
        # user-configured size
329
349
 
330
350
    def construct_navigation(self):
331
351
        """Construct the navigation buttons."""
332
 
        self.toolbar = gtk.Toolbar()
333
 
        self.toolbar.set_style(gtk.TOOLBAR_BOTH_HORIZ)
 
352
        self.toolbar = Gtk.Toolbar()
 
353
        self.toolbar.set_style(Gtk.ToolbarStyle.BOTH_HORIZ)
334
354
 
335
355
        self.prev_button = self.prev_rev_action.create_tool_item()
336
356
        self.toolbar.insert(self.prev_button, -1)
338
358
        self.next_button = self.next_rev_action.create_tool_item()
339
359
        self.toolbar.insert(self.next_button, -1)
340
360
 
341
 
        self.toolbar.insert(gtk.SeparatorToolItem(), -1)
 
361
        self.toolbar.insert(Gtk.SeparatorToolItem(), -1)
342
362
 
343
 
        refresh_button = gtk.ToolButton(gtk.STOCK_REFRESH)
 
363
        refresh_button = Gtk.ToolButton.new_from_stock(Gtk.STOCK_REFRESH)
344
364
        refresh_button.connect('clicked', self._refresh_clicked)
345
365
        self.toolbar.insert(refresh_button, -1)
346
366
 
351
371
    def construct_bottom(self):
352
372
        """Construct the bottom half of the window."""
353
373
        if self.config.get_user_option('viz-wide-diffs') == 'True':
354
 
            self.diff_paned = gtk.VPaned()
 
374
            self.diff_paned = Gtk.Paned.new(Gtk.Orientation.VERTICAL)
355
375
        else:
356
 
            self.diff_paned = gtk.HPaned()
 
376
            self.diff_paned = Gtk.Paned.new(Gtk.Orientation.HORIZONTAL)
357
377
        (width, height) = self.get_size()
358
378
        self.diff_paned.set_size_request(20, 20) # shrinkable
359
379
 
369
389
        self.revisionview.show()
370
390
        self.revisionview.set_show_callback(self._show_clicked_cb)
371
391
        self.revisionview.connect('notify::revision', self._go_clicked_cb)
372
 
        self.treeview.connect('tag-added', lambda w, t, r: self.revisionview.update_tags())
 
392
        self.treeview.connect('tag-added',
 
393
            lambda w, t, r: self.revisionview.update_tags())
 
394
        self.treeview.connect('revision-selected',
 
395
                self._treeselection_changed_cb)
 
396
        self.treeview.connect('revision-activated',
 
397
                self._tree_revision_activated)
373
398
        self.diff_paned.pack1(self.revisionview)
374
399
 
375
400
        from bzrlib.plugins.gtk.diff import DiffWidget
391
416
        parents  = self.treeview.get_parents()
392
417
        children = self.treeview.get_children()
393
418
 
394
 
        self.revision_menu.set_revision_ids([revision.revision_id])
395
 
 
396
 
        if revision and revision != NULL_REVISION:
397
 
            prev_menu = gtk.Menu()
 
419
        if revision and revision.revision_id != NULL_REVISION:
 
420
            self.revision_menu.set_revision_ids([revision.revision_id])
 
421
            prev_menu = Gtk.Menu()
398
422
            if len(parents) > 0:
399
423
                self.prev_rev_action.set_sensitive(True)
400
424
                for parent_id in parents:
401
425
                    if parent_id and parent_id != NULL_REVISION:
402
426
                        parent = self.branch.repository.get_revision(parent_id)
403
427
                        try:
404
 
                            str = ' (' + parent.properties['branch-nick'] + ')'
 
428
                            str = ' (%s)' % parent.properties['branch-nick']
405
429
                        except KeyError:
406
430
                            str = ""
407
431
 
408
 
                        item = gtk.MenuItem(parent.message.split("\n")[0] + str)
 
432
                        item = Gtk.MenuItem(
 
433
                            label=parent.message.split("\n")[0] + str)
409
434
                        item.connect('activate', self._set_revision_cb, parent_id)
410
435
                        prev_menu.add(item)
411
436
                prev_menu.show_all()
413
438
                self.prev_rev_action.set_sensitive(False)
414
439
                prev_menu.hide()
415
440
 
416
 
            self.prev_button.set_menu(prev_menu)
 
441
            if getattr(self.prev_button, 'set_menu', None) is not None:
 
442
                self.prev_button.set_menu(prev_menu)
417
443
 
418
 
            next_menu = gtk.Menu()
 
444
            next_menu = Gtk.Menu()
419
445
            if len(children) > 0:
420
446
                self.next_rev_action.set_sensitive(True)
421
447
                for child_id in children:
422
448
                    child = self.branch.repository.get_revision(child_id)
423
449
                    try:
424
 
                        str = ' (' + child.properties['branch-nick'] + ')'
 
450
                        str = ' (%s)' % child.properties['branch-nick']
425
451
                    except KeyError:
426
452
                        str = ""
427
453
 
428
 
                    item = gtk.MenuItem(child.message.split("\n")[0] + str)
 
454
                    item = Gtk.MenuItem(
 
455
                        label=child.message.split("\n")[0] + str)
429
456
                    item.connect('activate', self._set_revision_cb, child_id)
430
457
                    next_menu.add(item)
431
458
                next_menu.show_all()
433
460
                self.next_rev_action.set_sensitive(False)
434
461
                next_menu.hide()
435
462
 
436
 
            self.next_button.set_menu(next_menu)
 
463
            if getattr(self.next_button, 'set_menu', None) is not None:
 
464
                self.next_button.set_menu(next_menu)
437
465
 
438
466
            self.revisionview.set_revision(revision)
439
467
            self.revisionview.set_children(children)
450
478
        else:
451
479
            parent_id = parents[0]
452
480
 
453
 
        self.show_diff(revision.revision_id, parent_id)
 
481
        if revision is not None:
 
482
            self.show_diff(revision.revision_id, parent_id)
 
483
        else:
 
484
            self.show_diff(NULL_REVISION)
454
485
        self.treeview.grab_focus()
455
 
        
 
486
 
456
487
    def _back_clicked_cb(self, *args):
457
488
        """Callback for when the back button is clicked."""
458
489
        self.treeview.back()
459
 
        
 
490
 
460
491
    def _fwd_clicked_cb(self, *args):
461
492
        """Callback for when the forward button is clicked."""
462
493
        self.treeview.forward()
491
522
        _mod_index.index_url(self.branch.base)
492
523
 
493
524
    def _branch_search_cb(self, w):
494
 
        from bzrlib.plugins.search import index as _mod_index
 
525
        from bzrlib.plugins.search import (
 
526
            index as _mod_index,
 
527
            errors as search_errors,
 
528
            )
495
529
        from bzrlib.plugins.gtk.search import SearchDialog
496
 
        from bzrlib.plugins.search import errors as search_errors
497
530
 
498
531
        try:
499
532
            index = _mod_index.open_index_url(self.branch.base)
500
533
        except search_errors.NoSearchIndex:
501
 
            dialog = gtk.MessageDialog(self, type=gtk.MESSAGE_QUESTION, 
502
 
                buttons=gtk.BUTTONS_OK_CANCEL, 
 
534
            dialog = Gtk.MessageDialog(self, type=Gtk.MessageType.QUESTION, 
 
535
                buttons=Gtk.ButtonsType.OK_CANCEL, 
503
536
                message_format="This branch has not been indexed yet. "
504
537
                               "Index now?")
505
 
            if dialog.run() == gtk.RESPONSE_OK:
 
538
            if dialog.run() == Gtk.ResponseType.OK:
506
539
                dialog.destroy()
507
540
                index = _mod_index.index_url(self.branch.base)
508
541
            else:
510
543
                return
511
544
 
512
545
        dialog = SearchDialog(index)
513
 
        
514
 
        if dialog.run() == gtk.RESPONSE_OK:
515
 
            self.set_revision(dialog.get_revision())
 
546
 
 
547
        if dialog.run() == Gtk.ResponseType.OK:
 
548
            revid = dialog.get_revision()
 
549
            if revid is not None:
 
550
                self.set_revision(revid)
516
551
 
517
552
        dialog.destroy()
518
553
 
519
554
    def _about_dialog_cb(self, w):
520
555
        from bzrlib.plugins.gtk.about import AboutDialog
521
 
 
522
556
        AboutDialog().run()
523
557
 
524
558
    def _col_visibility_changed(self, col, property):
532
566
            self.toolbar.hide()
533
567
        self.config.set_user_option('viz-toolbar-visible', col.get_active())
534
568
 
 
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)
 
575
        self.vbox.pack_start(
 
576
            self.construct_paned(), True, True, 0)
 
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
 
535
589
    def _make_diff_nonzero_size(self):
536
590
        """make sure the diff isn't zero-width or zero-height"""
537
591
        alloc = self.diff.get_allocation()
559
613
        self._make_diff_nonzero_size()
560
614
 
561
615
        self.treeview.emit('revision-selected')
562
 
    
 
616
 
563
617
    def _diff_wrap_changed(self, widget):
564
618
        """Toggle word wrap in the diff widget."""
565
619
        self.config.set_user_option('viz-wrap-diffs', widget.get_active())
566
620
        self.diff._on_wraplines_toggled(widget)
567
 
    
568
 
    def _show_about_cb(self, w):
569
 
        dialog = AboutDialog()
570
 
        dialog.connect('response', lambda d,r: d.destroy())
571
 
        dialog.run()
572
621
 
573
622
    def _refresh_clicked(self, w):
574
623
        self.treeview.refresh()
575
624
 
576
625
    def _update_tags(self):
577
 
        menu = gtk.Menu()
 
626
        menu = Gtk.Menu()
578
627
 
579
628
        if self.branch.supports_tags():
580
629
            tags = self.branch.tags.get_tag_dict().items()
581
630
            tags.sort(reverse=True)
582
631
            for tag, revid in tags:
583
 
                tag_image = gtk.Image()
 
632
                tag_image = Gtk.Image()
584
633
                tag_image.set_from_file(icon_path('tag-16.png'))
585
 
                tag_item = gtk.ImageMenuItem(tag.replace('_', '__'))
 
634
                tag_item = Gtk.ImageMenuItem.new_with_mnemonic(
 
635
                    tag.replace('_', '__'))
586
636
                tag_item.set_image(tag_image)
587
637
                tag_item.connect('activate', self._tag_selected_cb, revid)
588
638
                tag_item.set_sensitive(self.treeview.has_revision_id(revid))
607
657
            return width, height
608
658
        return None
609
659
 
610
 
    def show_diff(self, revid=None, parentid=NULL_REVISION):
 
660
    def show_diff(self, revid, parentid=NULL_REVISION):
611
661
        """Open a new window to show a diff between the given revisions."""
612
662
        from bzrlib.plugins.gtk.diff import DiffWindow
613
663
        window = DiffWindow(parent=self)