/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: Curtis Hovey
  • Date: 2011-08-12 20:25:28 UTC
  • mto: This revision was merged to the branch mainline in revision 741.
  • Revision ID: sinzui.is@verizon.net-20110812202528-4xf4a2t23urx50d2
Updated gst to gtk3.

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