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