/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-04-10 18:44:39 UTC
  • mto: This revision was merged to the branch mainline in revision 730.
  • Revision ID: jelmer@samba.org-20110410184439-g7hqaacexqtviq13
Move i18n support to a separate file, so gettext files aren't loaded unless bzr-gtk is used.

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
11
import gtk
13
 
import gobject
14
 
import pango
15
12
 
16
 
from bzrlib.plugins.gtk.window import Window
17
13
from bzrlib.plugins.gtk import icon_path
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
 
from bzrlib.plugins.gtk.branchview import TreeView, treemodel
21
 
from bzrlib.revision import Revision, NULL_REVISION
22
 
from bzrlib.config import BranchConfig
 
16
from bzrlib.plugins.gtk.revisionmenu import RevisionMenu
 
17
from bzrlib.plugins.gtk.window import Window
 
18
 
23
19
from bzrlib.config import GlobalConfig
 
20
from bzrlib.revision import NULL_REVISION
 
21
from bzrlib.trace import mutter
 
22
 
24
23
 
25
24
class BranchWindow(Window):
26
25
    """Branch window.
51
50
        else:
52
51
            self.compact_view = False
53
52
 
54
 
        self.set_title(branch.nick + " - revision history")
 
53
        self.set_title(branch._get_nick(local=True) + " - revision history")
55
54
 
56
 
        # Use three-quarters of the screen by default
57
 
        screen = self.get_screen()
58
 
        monitor = screen.get_monitor_geometry(0)
59
 
        width = int(monitor.width * 0.75)
60
 
        height = int(monitor.height * 0.75)
 
55
        # user-configured window size
 
56
        size = self._load_size('viz-window-size')
 
57
        if size:
 
58
            width, height = size
 
59
        else:
 
60
            # Use three-quarters of the screen by default
 
61
            screen = self.get_screen()
 
62
            monitor = screen.get_monitor_geometry(0)
 
63
            width = int(monitor.width * 0.75)
 
64
            height = int(monitor.height * 0.75)
61
65
        self.set_default_size(width, height)
 
66
        self.set_size_request(width/3, height/3)
 
67
        self._save_size_on_destroy(self, 'viz-window-size')
62
68
 
63
69
        # FIXME AndyFitz!
64
70
        icon = self.render_icon(gtk.STOCK_INDEX, gtk.ICON_SIZE_BUTTON)
71
77
        self.accel_group = gtk.AccelGroup()
72
78
        self.add_accel_group(self.accel_group)
73
79
 
74
 
        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)
75
83
 
76
84
        self.prev_rev_action = gtk.Action("prev-rev", "_Previous Revision", "Go to the previous revision", gtk.STOCK_GO_DOWN)
77
85
        self.prev_rev_action.set_accel_path("<viz>/Go/Previous Revision")
93
101
 
94
102
        self.construct()
95
103
 
 
104
    def _save_size_on_destroy(self, widget, config_name):
 
105
        """Creates a hook that saves the size of widget to config option 
 
106
           config_name when the window is destroyed/closed."""
 
107
        def save_size(src):
 
108
            width, height = widget.allocation.width, widget.allocation.height
 
109
            value = '%sx%s' % (width, height)
 
110
            self.config.set_user_option(config_name, value)
 
111
        self.connect("destroy", save_size)
 
112
 
96
113
    def set_revision(self, revid):
97
114
        self.treeview.set_revision_id(revid)
98
115
 
102
119
        self.add(vbox)
103
120
 
104
121
        self.paned = gtk.VPaned()
105
 
        self.paned.pack1(self.construct_top(), resize=True, shrink=False)
106
 
        self.paned.pack2(self.construct_bottom(), resize=False, shrink=True)
 
122
        self.paned.pack1(self.construct_top(), resize=False, shrink=True)
 
123
        self.paned.pack2(self.construct_bottom(), resize=True, shrink=False)
107
124
        self.paned.show()
108
125
 
109
 
        vbox.pack_start(self.construct_menubar(), expand=False, fill=True)
110
 
        vbox.pack_start(self.construct_navigation(), expand=False, fill=True)
111
 
        
 
126
        nav = self.construct_navigation()
 
127
        menubar = self.construct_menubar()
 
128
        vbox.pack_start(menubar, expand=False, fill=True)
 
129
        vbox.pack_start(nav, expand=False, fill=True)
 
130
 
112
131
        vbox.pack_start(self.paned, expand=True, fill=True)
113
132
        vbox.set_focus_child(self.paned)
114
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())
115
140
        vbox.show()
116
141
 
117
142
    def construct_menubar(self):
123
148
 
124
149
        file_menu_close = gtk.ImageMenuItem(gtk.STOCK_CLOSE, self.accel_group)
125
150
        file_menu_close.connect('activate', lambda x: self.destroy())
126
 
        
 
151
 
127
152
        file_menu_quit = gtk.ImageMenuItem(gtk.STOCK_QUIT, self.accel_group)
128
153
        file_menu_quit.connect('activate', lambda x: gtk.main_quit())
129
 
        
 
154
 
130
155
        if self._parent is not None:
131
156
            file_menu.add(file_menu_close)
132
157
        file_menu.add(file_menu_quit)
135
160
        edit_menuitem = gtk.MenuItem("_Edit")
136
161
        edit_menuitem.set_submenu(edit_menu)
137
162
 
138
 
        edit_menu_find = gtk.ImageMenuItem(gtk.STOCK_FIND)
139
 
 
140
163
        edit_menu_branchopts = gtk.MenuItem("Branch Settings")
141
164
        edit_menu_branchopts.connect('activate', lambda x: PreferencesWindow(self.branch.get_config()).show())
142
165
 
143
166
        edit_menu_globopts = gtk.MenuItem("Global Settings")
144
167
        edit_menu_globopts.connect('activate', lambda x: PreferencesWindow().show())
145
168
 
146
 
        edit_menu.add(edit_menu_find)
147
169
        edit_menu.add(edit_menu_branchopts)
148
170
        edit_menu.add(edit_menu_globopts)
149
171
 
159
181
 
160
182
        view_menu_toolbar = gtk.CheckMenuItem("Show Toolbar")
161
183
        view_menu_toolbar.set_active(True)
 
184
        if self.config.get_user_option('viz-toolbar-visible') == 'False':
 
185
            view_menu_toolbar.set_active(False)
 
186
            self.toolbar.hide()
162
187
        view_menu_toolbar.connect('toggled', self._toolbar_visibility_changed)
163
188
 
164
189
        view_menu_compact = gtk.CheckMenuItem("Show Compact Graph")
165
190
        view_menu_compact.set_active(self.compact_view)
166
191
        view_menu_compact.connect('activate', self._brokenlines_toggled_cb)
167
192
 
 
193
        view_menu_diffs = gtk.CheckMenuItem("Show Diffs")
 
194
        view_menu_diffs.set_active(False)
 
195
        if self.config.get_user_option('viz-show-diffs') == 'True':
 
196
            view_menu_diffs.set_active(True)
 
197
        view_menu_diffs.connect('toggled', self._diff_visibility_changed)
 
198
 
 
199
        view_menu_wide_diffs = gtk.CheckMenuItem("Wide Diffs")
 
200
        view_menu_wide_diffs.set_active(False)
 
201
        if self.config.get_user_option('viz-wide-diffs') == 'True':
 
202
            view_menu_wide_diffs.set_active(True)
 
203
        view_menu_wide_diffs.connect('toggled', self._diff_placement_changed)
 
204
 
 
205
        view_menu_wrap_diffs = gtk.CheckMenuItem("Wrap _Long Lines in Diffs")
 
206
        view_menu_wrap_diffs.set_active(False)
 
207
        if self.config.get_user_option('viz-wrap-diffs') == 'True':
 
208
            view_menu_wrap_diffs.set_active(True)
 
209
        view_menu_wrap_diffs.connect('toggled', self._diff_wrap_changed)
 
210
 
168
211
        view_menu.add(view_menu_toolbar)
169
212
        view_menu.add(view_menu_compact)
170
213
        view_menu.add(gtk.SeparatorMenuItem())
 
214
        view_menu.add(view_menu_diffs)
 
215
        view_menu.add(view_menu_wide_diffs)
 
216
        view_menu.add(view_menu_wrap_diffs)
 
217
        view_menu.add(gtk.SeparatorMenuItem())
171
218
 
172
219
        self.mnu_show_revno_column = gtk.CheckMenuItem("Show Revision _Number Column")
173
220
        self.mnu_show_date_column = gtk.CheckMenuItem("Show _Date Column")
187
234
        go_menu.set_accel_group(self.accel_group)
188
235
        go_menuitem = gtk.MenuItem("_Go")
189
236
        go_menuitem.set_submenu(go_menu)
190
 
        
 
237
 
191
238
        go_menu_next = self.next_rev_action.create_menu_item()
192
239
        go_menu_prev = self.prev_rev_action.create_menu_item()
193
240
 
195
242
        tag_image.set_from_file(icon_path("tag-16.png"))
196
243
        self.go_menu_tags = gtk.ImageMenuItem("_Tags")
197
244
        self.go_menu_tags.set_image(tag_image)
198
 
        self._update_tags()
 
245
        self.treeview.connect('refreshed', lambda w: self._update_tags())
199
246
 
200
247
        go_menu.add(go_menu_next)
201
248
        go_menu.add(go_menu_prev)
202
249
        go_menu.add(gtk.SeparatorMenuItem())
203
250
        go_menu.add(self.go_menu_tags)
204
251
 
205
 
        revision_menu = gtk.Menu()
 
252
        self.revision_menu = RevisionMenu(self.branch.repository, [], self.branch, parent=self)
206
253
        revision_menuitem = gtk.MenuItem("_Revision")
207
 
        revision_menuitem.set_submenu(revision_menu)
208
 
 
209
 
        revision_menu_diff = gtk.MenuItem("View Changes")
210
 
        revision_menu_diff.connect('activate', 
211
 
                self._menu_diff_cb)
212
 
        
213
 
        revision_menu_compare = gtk.MenuItem("Compare with...")
214
 
        revision_menu_compare.connect('activate',
215
 
                self._compare_with_cb)
216
 
 
217
 
        revision_menu_tag = gtk.MenuItem("Tag Revision")
218
 
        revision_menu_tag.connect('activate', self._tag_revision_cb)
219
 
 
220
 
        revision_menu.add(revision_menu_tag)
221
 
        revision_menu.add(revision_menu_diff)
222
 
        revision_menu.add(revision_menu_compare)
 
254
        revision_menuitem.set_submenu(self.revision_menu)
223
255
 
224
256
        branch_menu = gtk.Menu()
225
257
        branch_menuitem = gtk.MenuItem("_Branch")
228
260
        branch_menu.add(gtk.MenuItem("Pu_ll Revisions"))
229
261
        branch_menu.add(gtk.MenuItem("Pu_sh Revisions"))
230
262
 
 
263
        try:
 
264
            from bzrlib.plugins import search
 
265
        except ImportError:
 
266
            mutter("Didn't find search plugin")
 
267
        else:
 
268
            branch_menu.add(gtk.SeparatorMenuItem())
 
269
 
 
270
            branch_index_menuitem = gtk.MenuItem("_Index")
 
271
            branch_index_menuitem.connect('activate', self._branch_index_cb)
 
272
            branch_menu.add(branch_index_menuitem)
 
273
 
 
274
            branch_search_menuitem = gtk.MenuItem("_Search")
 
275
            branch_search_menuitem.connect('activate', self._branch_search_cb)
 
276
            branch_menu.add(branch_search_menuitem)
 
277
 
231
278
        help_menu = gtk.Menu()
232
279
        help_menuitem = gtk.MenuItem("_Help")
233
280
        help_menuitem.set_submenu(help_menu)
254
301
 
255
302
        self.treeview = TreeView(self.branch, self.start_revs, self.maxnum, self.compact_view)
256
303
 
257
 
        self.treeview.connect('revision-selected',
258
 
                self._treeselection_changed_cb)
259
 
        self.treeview.connect('revision-activated',
260
 
                self._tree_revision_activated)
261
 
 
262
 
        self.treeview.connect('tag-added', lambda w, t, r: self._update_tags())
263
 
 
264
304
        for col in ["revno", "date"]:
265
305
            option = self.config.get_user_option(col + '-column-visible')
266
306
            if option is not None:
273
313
        align = gtk.Alignment(0.0, 0.0, 1.0, 1.0)
274
314
        align.set_padding(5, 0, 0, 0)
275
315
        align.add(self.treeview)
 
316
        # user-configured size
 
317
        size = self._load_size('viz-graph-size')
 
318
        if size:
 
319
            width, height = size
 
320
            align.set_size_request(width, height)
 
321
        else:
 
322
            (width, height) = self.get_size()
 
323
            align.set_size_request(width, int(height / 2.5))
 
324
        self._save_size_on_destroy(align, 'viz-graph-size')
276
325
        align.show()
277
326
 
278
327
        return align
300
349
 
301
350
    def construct_bottom(self):
302
351
        """Construct the bottom half of the window."""
 
352
        if self.config.get_user_option('viz-wide-diffs') == 'True':
 
353
            self.diff_paned = gtk.VPaned()
 
354
        else:
 
355
            self.diff_paned = gtk.HPaned()
 
356
        (width, height) = self.get_size()
 
357
        self.diff_paned.set_size_request(20, 20) # shrinkable
 
358
 
303
359
        from bzrlib.plugins.gtk.revisionview import RevisionView
304
360
        self.revisionview = RevisionView(branch=self.branch)
305
 
        (width, height) = self.get_size()
306
 
        self.revisionview.set_size_request(width, int(height / 2.5))
 
361
        self.revisionview.set_size_request(width/3, int(height / 2.5))
 
362
        # user-configured size
 
363
        size = self._load_size('viz-revisionview-size')
 
364
        if size:
 
365
            width, height = size
 
366
            self.revisionview.set_size_request(width, height)
 
367
        self._save_size_on_destroy(self.revisionview, 'viz-revisionview-size')
307
368
        self.revisionview.show()
308
369
        self.revisionview.set_show_callback(self._show_clicked_cb)
309
370
        self.revisionview.connect('notify::revision', self._go_clicked_cb)
310
371
        self.treeview.connect('tag-added', lambda w, t, r: self.revisionview.update_tags())
311
 
        return self.revisionview
 
372
        self.diff_paned.pack1(self.revisionview)
 
373
 
 
374
        from bzrlib.plugins.gtk.diff import DiffWidget
 
375
        self.diff = DiffWidget()
 
376
        self.diff_paned.pack2(self.diff)
 
377
 
 
378
        self.diff_paned.show_all()
 
379
        if self.config.get_user_option('viz-show-diffs') != 'True':
 
380
            self.diff.hide()
 
381
 
 
382
        return self.diff_paned
312
383
 
313
384
    def _tag_selected_cb(self, menuitem, revid):
314
385
        self.treeview.set_revision_id(revid)
319
390
        parents  = self.treeview.get_parents()
320
391
        children = self.treeview.get_children()
321
392
 
 
393
        self.revision_menu.set_revision_ids([revision.revision_id])
 
394
 
322
395
        if revision and revision != NULL_REVISION:
323
396
            prev_menu = gtk.Menu()
324
397
            if len(parents) > 0:
339
412
                self.prev_rev_action.set_sensitive(False)
340
413
                prev_menu.hide()
341
414
 
342
 
            self.prev_button.set_menu(prev_menu)
 
415
            if getattr(self.prev_button, 'set_menu', None) is not None:
 
416
                self.prev_button.set_menu(prev_menu)
343
417
 
344
418
            next_menu = gtk.Menu()
345
419
            if len(children) > 0:
359
433
                self.next_rev_action.set_sensitive(False)
360
434
                next_menu.hide()
361
435
 
362
 
            self.next_button.set_menu(next_menu)
 
436
            if getattr(self.next_button, 'set_menu', None) is not None:
 
437
                self.next_button.set_menu(next_menu)
363
438
 
364
439
            self.revisionview.set_revision(revision)
365
440
            self.revisionview.set_children(children)
366
 
    
 
441
            self.update_diff_panel(revision, parents)
 
442
 
367
443
    def _tree_revision_activated(self, widget, path, col):
368
444
        # TODO: more than one parent
369
445
        """Callback for when a treeview row gets activated."""
371
447
        parents  = self.treeview.get_parents()
372
448
 
373
449
        if len(parents) == 0:
374
 
            parent_id = None
 
450
            parent_id = NULL_REVISION
375
451
        else:
376
452
            parent_id = parents[0]
377
453
 
378
454
        self.show_diff(revision.revision_id, parent_id)
379
455
        self.treeview.grab_focus()
380
 
        
381
 
    def _menu_diff_cb(self,w):
382
 
        (path, focus) = self.treeview.treeview.get_cursor()
383
 
        revid = self.treeview.model[path][treemodel.REVID]
384
 
        
385
 
        parentids = self.branch.repository.revision_parents(revid)
386
 
 
387
 
        if len(parentids) == 0:
388
 
            parentid = NULL_REVISION
389
 
        else:
390
 
            parentid = parentids[0]
391
 
        
392
 
        self.show_diff(revid,parentid)    
393
456
 
394
457
    def _back_clicked_cb(self, *args):
395
458
        """Callback for when the back button is clicked."""
396
459
        self.treeview.back()
397
 
        
 
460
 
398
461
    def _fwd_clicked_cb(self, *args):
399
462
        """Callback for when the forward button is clicked."""
400
463
        self.treeview.forward()
409
472
        self.show_diff(revid, parentid)
410
473
        self.treeview.grab_focus()
411
474
 
412
 
    def _compare_with_cb(self,w):
413
 
        """Callback for revision 'compare with' menu. Will show a small
414
 
            dialog with branch revisions to compare with selected revision in TreeView"""
415
 
        
416
 
        from bzrlib.plugins.gtk.revbrowser import RevisionBrowser
417
 
        
418
 
        rb = RevisionBrowser(self.branch,self)
419
 
        ret = rb.run()
420
 
        
421
 
        if ret == gtk.RESPONSE_OK:          
422
 
            (path, focus) = self.treeview.treeview.get_cursor()
423
 
            revid = self.treeview.model[path][treemodel.REVID]
424
 
            self.show_diff(revid, rb.selected_revid)
425
 
            
426
 
        rb.destroy()
427
 
            
428
475
    def _set_revision_cb(self, w, revision_id):
429
476
        self.treeview.set_revision_id(revision_id)
430
477
 
440
487
        self.treeview.set_property('compact', self.compact_view)
441
488
        self.treeview.refresh()
442
489
 
443
 
    def _tag_revision_cb(self, w):
 
490
    def _branch_index_cb(self, w):
 
491
        from bzrlib.plugins.search import index as _mod_index
 
492
        _mod_index.index_url(self.branch.base)
 
493
 
 
494
    def _branch_search_cb(self, w):
 
495
        from bzrlib.plugins.search import index as _mod_index
 
496
        from bzrlib.plugins.gtk.search import SearchDialog
 
497
        from bzrlib.plugins.search import errors as search_errors
 
498
 
444
499
        try:
445
 
            self.treeview.set_sensitive(False)
446
 
            dialog = AddTagDialog(self.branch.repository, self.treeview.get_revision().revision_id, self.branch)
447
 
            response = dialog.run()
448
 
            if response != gtk.RESPONSE_NONE:
449
 
                dialog.hide()
450
 
            
451
 
                if response == gtk.RESPONSE_OK:
452
 
                    self.treeview.add_tag(dialog.tagname, dialog._revid)
453
 
                
454
 
                dialog.destroy()
455
 
 
456
 
        finally:
457
 
            self.treeview.set_sensitive(True)
 
500
            index = _mod_index.open_index_url(self.branch.base)
 
501
        except search_errors.NoSearchIndex:
 
502
            dialog = gtk.MessageDialog(self, type=gtk.MESSAGE_QUESTION, 
 
503
                buttons=gtk.BUTTONS_OK_CANCEL, 
 
504
                message_format="This branch has not been indexed yet. "
 
505
                               "Index now?")
 
506
            if dialog.run() == gtk.RESPONSE_OK:
 
507
                dialog.destroy()
 
508
                index = _mod_index.index_url(self.branch.base)
 
509
            else:
 
510
                dialog.destroy()
 
511
                return
 
512
 
 
513
        dialog = SearchDialog(index)
 
514
 
 
515
        if dialog.run() == gtk.RESPONSE_OK:
 
516
            self.set_revision(dialog.get_revision())
 
517
 
 
518
        dialog.destroy()
458
519
 
459
520
    def _about_dialog_cb(self, w):
460
521
        from bzrlib.plugins.gtk.about import AboutDialog
461
 
 
462
522
        AboutDialog().run()
463
523
 
464
524
    def _col_visibility_changed(self, col, property):
467
527
 
468
528
    def _toolbar_visibility_changed(self, col):
469
529
        if col.get_active():
470
 
            self.toolbar.show() 
 
530
            self.toolbar.show()
471
531
        else:
472
532
            self.toolbar.hide()
473
 
 
474
 
    def _show_about_cb(self, w):
475
 
        dialog = AboutDialog()
476
 
        dialog.connect('response', lambda d,r: d.destroy())
477
 
        dialog.run()
 
533
        self.config.set_user_option('viz-toolbar-visible', col.get_active())
 
534
 
 
535
    def _make_diff_nonzero_size(self):
 
536
        """make sure the diff isn't zero-width or zero-height"""
 
537
        alloc = self.diff.get_allocation()
 
538
        if (alloc.width < 10) or (alloc.height < 10):
 
539
            width, height = self.get_size()
 
540
            self.revisionview.set_size_request(width/3, int(height / 2.5))
 
541
 
 
542
    def _diff_visibility_changed(self, col):
 
543
        """Hide or show the diff panel."""
 
544
        if col.get_active():
 
545
            self.diff.show()
 
546
            self._make_diff_nonzero_size()
 
547
        else:
 
548
            self.diff.hide()
 
549
        self.config.set_user_option('viz-show-diffs', str(col.get_active()))
 
550
        self.update_diff_panel()
 
551
 
 
552
    def _diff_placement_changed(self, col):
 
553
        """Toggle the diff panel's position."""
 
554
        self.config.set_user_option('viz-wide-diffs', str(col.get_active()))
 
555
 
 
556
        old = self.paned.get_child2()
 
557
        self.paned.remove(old)
 
558
        self.paned.pack2(self.construct_bottom(), resize=True, shrink=False)
 
559
        self._make_diff_nonzero_size()
 
560
 
 
561
        self.treeview.emit('revision-selected')
 
562
 
 
563
    def _diff_wrap_changed(self, widget):
 
564
        """Toggle word wrap in the diff widget."""
 
565
        self.config.set_user_option('viz-wrap-diffs', widget.get_active())
 
566
        self.diff._on_wraplines_toggled(widget)
478
567
 
479
568
    def _refresh_clicked(self, w):
480
569
        self.treeview.refresh()
484
573
 
485
574
        if self.branch.supports_tags():
486
575
            tags = self.branch.tags.get_tag_dict().items()
487
 
            tags.sort()
488
 
            tags.reverse()
 
576
            tags.sort(reverse=True)
489
577
            for tag, revid in tags:
490
578
                tag_image = gtk.Image()
491
579
                tag_image.set_from_file(icon_path('tag-16.png'))
492
580
                tag_item = gtk.ImageMenuItem(tag.replace('_', '__'))
493
581
                tag_item.set_image(tag_image)
494
582
                tag_item.connect('activate', self._tag_selected_cb, revid)
 
583
                tag_item.set_sensitive(self.treeview.has_revision_id(revid))
495
584
                menu.add(tag_item)
496
585
            self.go_menu_tags.set_submenu(menu)
497
586
 
501
590
 
502
591
        self.go_menu_tags.show_all()
503
592
 
504
 
    def show_diff(self, revid=None, parentid=None):
 
593
    def _load_size(self, name):
 
594
        """Read and parse 'name' from self.config.
 
595
        The value is a string, formatted as WIDTHxHEIGHT
 
596
        Returns None, or (width, height)
 
597
        """
 
598
        size = self.config.get_user_option(name)
 
599
        if size:
 
600
            width, height = [int(num) for num in size.split('x')]
 
601
            # avoid writing config every time we start
 
602
            return width, height
 
603
        return None
 
604
 
 
605
    def show_diff(self, revid=None, parentid=NULL_REVISION):
505
606
        """Open a new window to show a diff between the given revisions."""
506
607
        from bzrlib.plugins.gtk.diff import DiffWindow
507
608
        window = DiffWindow(parent=self)
508
609
 
509
 
        if parentid is None:
510
 
            parentid = NULL_REVISION
511
 
 
512
610
        rev_tree    = self.branch.repository.revision_tree(revid)
513
611
        parent_tree = self.branch.repository.revision_tree(parentid)
514
612
 
515
 
        description = revid + " - " + self.branch.nick
 
613
        description = revid + " - " + self.branch._get_nick(local=True)
516
614
        window.set_diff(description, rev_tree, parent_tree)
517
615
        window.show()
518
616
 
519
 
 
 
617
    def update_diff_panel(self, revision=None, parents=None):
 
618
        """Show the current revision in the diff panel."""
 
619
        if self.config.get_user_option('viz-show-diffs') != 'True':
 
620
            return
 
621
 
 
622
        if not revision: # default to selected row
 
623
            revision = self.treeview.get_revision()
 
624
        if revision == NULL_REVISION:
 
625
            return
 
626
 
 
627
        if not parents: # default to selected row's parents
 
628
            parents  = self.treeview.get_parents()
 
629
        if len(parents) == 0:
 
630
            parent_id = NULL_REVISION
 
631
        else:
 
632
            parent_id = parents[0]
 
633
 
 
634
        rev_tree    = self.branch.repository.revision_tree(revision.revision_id)
 
635
        parent_tree = self.branch.repository.revision_tree(parent_id)
 
636
 
 
637
        self.diff.set_diff(rev_tree, parent_tree)
 
638
        if self.config.get_user_option('viz-wrap-diffs') == 'True':
 
639
            self.diff._on_wraplines_toggled(wrap=True)
 
640
        self.diff.show_all()