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