/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: 2011-03-23 09:49:44 UTC
  • mfrom: (723.1.1 isearch)
  • Revision ID: jelmer@samba.org-20110323094944-7n5h1vif3xpbze3p
Merge support for interactive substring search in bzr viz and annotate.

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