/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: David Planella
  • Date: 2011-03-06 08:24:07 UTC
  • mfrom: (718 trunk)
  • mto: This revision was merged to the branch mainline in revision 719.
  • Revision ID: david.planella@ubuntu.com-20110306082407-y9zwkjje5oue9egw
Added preliminary internationalization support. Merged from trunk.

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