/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-09-05 03:44:26 UTC
  • mto: This revision was merged to the branch mainline in revision 741.
  • Revision ID: sinzui.is@verizon.net-20110905034426-p98pxnay9rmzkr99
Fix the initializer for many classes.
Replace Gtk.Dialog.vbox with .get_content_area().

Show diffs side-by-side

added added

removed removed

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