/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: 2008-03-28 19:26:53 UTC
  • mto: (450.1.13 trunk)
  • mto: This revision was merged to the branch mainline in revision 458.
  • Revision ID: jelmer@samba.org-20080328192653-trzptkwahx1tulz9
Add module for preferences code.

Show diffs side-by-side

added added

removed removed

Lines of Context:
viz/branchwin.py
 
1
# -*- coding: UTF-8 -*-
1
2
"""Branch window.
2
3
 
3
4
This module contains the code to manage the branch information window,
4
5
which contains both the revision graph and details panes.
5
6
"""
6
7
 
7
 
__copyright__ = "Copyright (c) 2005 Canonical Ltd."
 
8
__copyright__ = "Copyright © 2005 Canonical Ltd."
8
9
__author__    = "Scott James Remnant <scott@ubuntu.com>"
9
10
 
10
11
 
11
12
import gtk
 
13
import gobject
 
14
import pango
12
15
 
13
 
from bzrlib.plugins.gtk import icon_path
14
 
from bzrlib.plugins.gtk.branchview import TreeView
 
16
from bzrlib.plugins.gtk.window import Window
 
17
from bzrlib.plugins.gtk.tags import AddTagDialog
15
18
from bzrlib.plugins.gtk.preferences import PreferencesWindow
16
 
from bzrlib.plugins.gtk.revisionmenu import RevisionMenu
17
 
from bzrlib.plugins.gtk.window import Window
18
 
 
 
19
from bzrlib.plugins.gtk.branchview import TreeView, treemodel
 
20
from bzrlib.revision import Revision, NULL_REVISION
 
21
from bzrlib.config import BranchConfig
19
22
from bzrlib.config import GlobalConfig
20
 
from bzrlib.revision import NULL_REVISION
21
 
from bzrlib.trace import mutter
22
 
 
23
23
 
24
24
class BranchWindow(Window):
25
25
    """Branch window.
28
28
    for a particular branch.
29
29
    """
30
30
 
31
 
    def __init__(self, branch, start_revs, maxnum, parent=None):
 
31
    def __init__(self, branch, start, maxnum, parent=None):
32
32
        """Create a new BranchWindow.
33
33
 
34
34
        :param branch: Branch object for branch to show.
35
 
        :param start_revs: Revision ids of top revisions.
 
35
        :param start: Revision id of top revision.
36
36
        :param maxnum: Maximum number of revisions to display, 
37
37
                       None for no limit.
38
38
        """
41
41
        self.set_border_width(0)
42
42
 
43
43
        self.branch      = branch
44
 
        self.start_revs  = start_revs
 
44
        self.start       = start
45
45
        self.maxnum      = maxnum
46
46
        self.config      = GlobalConfig()
47
47
 
50
50
        else:
51
51
            self.compact_view = False
52
52
 
53
 
        self.set_title(branch._get_nick(local=True) + " - revision history")
 
53
        self.set_title(branch.nick + " - revision history")
54
54
 
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)
 
55
        # Use three-quarters of the screen by default
 
56
        screen = self.get_screen()
 
57
        monitor = screen.get_monitor_geometry(0)
 
58
        width = int(monitor.width * 0.75)
 
59
        height = int(monitor.height * 0.75)
65
60
        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')
68
61
 
69
62
        # FIXME AndyFitz!
70
63
        icon = self.render_icon(gtk.STOCK_INDEX, gtk.ICON_SIZE_BUTTON)
72
65
 
73
66
        gtk.accel_map_add_entry("<viz>/Go/Next Revision", gtk.keysyms.Up, gtk.gdk.MOD1_MASK)
74
67
        gtk.accel_map_add_entry("<viz>/Go/Previous Revision", gtk.keysyms.Down, gtk.gdk.MOD1_MASK)
75
 
        gtk.accel_map_add_entry("<viz>/View/Refresh", gtk.keysyms.F5, 0)
76
68
 
77
69
        self.accel_group = gtk.AccelGroup()
78
70
        self.add_accel_group(self.accel_group)
79
71
 
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)
 
72
        gtk.Action.set_tool_item_type(gtk.MenuToolButton)
83
73
 
84
74
        self.prev_rev_action = gtk.Action("prev-rev", "_Previous Revision", "Go to the previous revision", gtk.STOCK_GO_DOWN)
85
75
        self.prev_rev_action.set_accel_path("<viz>/Go/Previous Revision")
93
83
        self.next_rev_action.connect("activate", self._fwd_clicked_cb)
94
84
        self.next_rev_action.connect_accelerator()
95
85
 
96
 
        self.refresh_action = gtk.Action("refresh", "_Refresh", "Refresh view", gtk.STOCK_REFRESH)
97
 
        self.refresh_action.set_accel_path("<viz>/View/Refresh")
98
 
        self.refresh_action.set_accel_group(self.accel_group)
99
 
        self.refresh_action.connect("activate", self._refresh_clicked)
100
 
        self.refresh_action.connect_accelerator()
101
 
 
102
86
        self.construct()
103
87
 
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
 
 
113
88
    def set_revision(self, revid):
114
89
        self.treeview.set_revision_id(revid)
115
90
 
119
94
        self.add(vbox)
120
95
 
121
96
        self.paned = gtk.VPaned()
122
 
        self.paned.pack1(self.construct_top(), resize=False, shrink=True)
123
 
        self.paned.pack2(self.construct_bottom(), resize=True, shrink=False)
 
97
        self.paned.pack1(self.construct_top(), resize=True, shrink=False)
 
98
        self.paned.pack2(self.construct_bottom(), resize=False, shrink=True)
124
99
        self.paned.show()
125
100
 
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
 
 
 
101
        vbox.pack_start(self.construct_menubar(), expand=False, fill=True)
 
102
        vbox.pack_start(self.construct_navigation(), expand=False, fill=True)
 
103
        
131
104
        vbox.pack_start(self.paned, expand=True, fill=True)
132
105
        vbox.set_focus_child(self.paned)
133
106
 
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())
140
107
        vbox.show()
141
108
 
142
109
    def construct_menubar(self):
148
115
 
149
116
        file_menu_close = gtk.ImageMenuItem(gtk.STOCK_CLOSE, self.accel_group)
150
117
        file_menu_close.connect('activate', lambda x: self.destroy())
151
 
 
 
118
        
152
119
        file_menu_quit = gtk.ImageMenuItem(gtk.STOCK_QUIT, self.accel_group)
153
120
        file_menu_quit.connect('activate', lambda x: gtk.main_quit())
154
 
 
 
121
        
155
122
        if self._parent is not None:
156
123
            file_menu.add(file_menu_close)
157
124
        file_menu.add(file_menu_quit)
160
127
        edit_menuitem = gtk.MenuItem("_Edit")
161
128
        edit_menuitem.set_submenu(edit_menu)
162
129
 
 
130
        edit_menu_find = gtk.ImageMenuItem(gtk.STOCK_FIND)
 
131
 
163
132
        edit_menu_branchopts = gtk.MenuItem("Branch Settings")
164
133
        edit_menu_branchopts.connect('activate', lambda x: PreferencesWindow(self.branch.get_config()).show())
165
134
 
166
135
        edit_menu_globopts = gtk.MenuItem("Global Settings")
167
136
        edit_menu_globopts.connect('activate', lambda x: PreferencesWindow().show())
168
137
 
 
138
        edit_menu.add(edit_menu_find)
169
139
        edit_menu.add(edit_menu_branchopts)
170
140
        edit_menu.add(edit_menu_globopts)
171
141
 
173
143
        view_menuitem = gtk.MenuItem("_View")
174
144
        view_menuitem.set_submenu(view_menu)
175
145
 
176
 
        view_menu_refresh = self.refresh_action.create_menu_item()
177
 
        view_menu_refresh.connect('activate', self._refresh_clicked)
178
 
 
179
 
        view_menu.add(view_menu_refresh)
180
 
        view_menu.add(gtk.SeparatorMenuItem())
181
 
 
182
146
        view_menu_toolbar = gtk.CheckMenuItem("Show Toolbar")
183
147
        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()
187
148
        view_menu_toolbar.connect('toggled', self._toolbar_visibility_changed)
188
149
 
189
150
        view_menu_compact = gtk.CheckMenuItem("Show Compact Graph")
190
151
        view_menu_compact.set_active(self.compact_view)
191
152
        view_menu_compact.connect('activate', self._brokenlines_toggled_cb)
192
153
 
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
 
 
211
154
        view_menu.add(view_menu_toolbar)
212
155
        view_menu.add(view_menu_compact)
213
156
        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())
218
 
 
219
 
        self.mnu_show_revno_column = gtk.CheckMenuItem("Show Revision _Number Column")
220
 
        self.mnu_show_date_column = gtk.CheckMenuItem("Show _Date Column")
221
 
 
222
 
        # Revision numbers are pointless if there are multiple branches
223
 
        if len(self.start_revs) > 1:
224
 
            self.mnu_show_revno_column.set_sensitive(False)
225
 
            self.treeview.set_property('revno-column-visible', False)
226
 
 
227
 
        for (col, name) in [(self.mnu_show_revno_column, "revno"), 
228
 
                            (self.mnu_show_date_column, "date")]:
 
157
 
 
158
        for (label, name) in [("Revision _Number", "revno"), ("_Date", "date")]:
 
159
            col = gtk.CheckMenuItem("Show " + label + " Column")
229
160
            col.set_active(self.treeview.get_property(name + "-column-visible"))
230
161
            col.connect('toggled', self._col_visibility_changed, name)
231
162
            view_menu.add(col)
234
165
        go_menu.set_accel_group(self.accel_group)
235
166
        go_menuitem = gtk.MenuItem("_Go")
236
167
        go_menuitem.set_submenu(go_menu)
237
 
 
 
168
        
238
169
        go_menu_next = self.next_rev_action.create_menu_item()
239
170
        go_menu_prev = self.prev_rev_action.create_menu_item()
240
171
 
241
 
        tag_image = gtk.Image()
242
 
        tag_image.set_from_file(icon_path("tag-16.png"))
243
 
        self.go_menu_tags = gtk.ImageMenuItem("_Tags")
244
 
        self.go_menu_tags.set_image(tag_image)
245
 
        self.treeview.connect('refreshed', lambda w: self._update_tags())
 
172
        self.go_menu_tags = gtk.MenuItem("_Tags")
 
173
        self._update_tags()
246
174
 
247
175
        go_menu.add(go_menu_next)
248
176
        go_menu.add(go_menu_prev)
249
177
        go_menu.add(gtk.SeparatorMenuItem())
250
178
        go_menu.add(self.go_menu_tags)
251
179
 
252
 
        self.revision_menu = RevisionMenu(self.branch.repository, [], self.branch, parent=self)
 
180
        revision_menu = gtk.Menu()
253
181
        revision_menuitem = gtk.MenuItem("_Revision")
254
 
        revision_menuitem.set_submenu(self.revision_menu)
 
182
        revision_menuitem.set_submenu(revision_menu)
 
183
 
 
184
        revision_menu_diff = gtk.MenuItem("View Changes")
 
185
        revision_menu_diff.connect('activate', 
 
186
                lambda w: self.treeview.show_diff())
 
187
 
 
188
        revision_menu_tag = gtk.MenuItem("Tag Revision")
 
189
        revision_menu_tag.connect('activate', self._tag_revision_cb)
 
190
 
 
191
        revision_menu.add(revision_menu_tag)
 
192
        revision_menu.add(revision_menu_diff)
255
193
 
256
194
        branch_menu = gtk.Menu()
257
195
        branch_menuitem = gtk.MenuItem("_Branch")
260
198
        branch_menu.add(gtk.MenuItem("Pu_ll Revisions"))
261
199
        branch_menu.add(gtk.MenuItem("Pu_sh Revisions"))
262
200
 
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
 
 
278
201
        help_menu = gtk.Menu()
279
202
        help_menuitem = gtk.MenuItem("_Help")
280
203
        help_menuitem.set_submenu(help_menu)
299
222
        """Construct the top-half of the window."""
300
223
        # FIXME: Make broken_line_length configurable
301
224
 
302
 
        self.treeview = TreeView(self.branch, self.start_revs, self.maxnum, self.compact_view)
 
225
        self.treeview = TreeView(self.branch, self.start, self.maxnum, self.compact_view)
 
226
 
 
227
        self.treeview.connect('revision-selected',
 
228
                self._treeselection_changed_cb)
 
229
        self.treeview.connect('revision-activated',
 
230
                self._tree_revision_activated)
 
231
 
 
232
        self.treeview.connect('tag-added', lambda w, t, r: self._update_tags())
303
233
 
304
234
        for col in ["revno", "date"]:
305
235
            option = self.config.get_user_option(col + '-column-visible')
306
236
            if option is not None:
307
237
                self.treeview.set_property(col + '-column-visible', option == 'True')
308
 
            else:
309
 
                self.treeview.set_property(col + '-column-visible', False)
310
238
 
311
239
        self.treeview.show()
312
240
 
313
241
        align = gtk.Alignment(0.0, 0.0, 1.0, 1.0)
314
242
        align.set_padding(5, 0, 0, 0)
315
243
        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')
325
244
        align.show()
326
245
 
327
246
        return align
349
268
 
350
269
    def construct_bottom(self):
351
270
        """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
 
 
359
271
        from bzrlib.plugins.gtk.revisionview import RevisionView
360
272
        self.revisionview = RevisionView(branch=self.branch)
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')
 
273
        (width, height) = self.get_size()
 
274
        self.revisionview.set_size_request(width, int(height / 2.5))
368
275
        self.revisionview.show()
369
276
        self.revisionview.set_show_callback(self._show_clicked_cb)
370
277
        self.revisionview.connect('notify::revision', self._go_clicked_cb)
371
278
        self.treeview.connect('tag-added', lambda w, t, r: self.revisionview.update_tags())
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
 
279
        return self.revisionview
383
280
 
384
281
    def _tag_selected_cb(self, menuitem, revid):
385
282
        self.treeview.set_revision_id(revid)
390
287
        parents  = self.treeview.get_parents()
391
288
        children = self.treeview.get_children()
392
289
 
393
 
        self.revision_menu.set_revision_ids([revision.revision_id])
394
 
 
395
 
        if revision and revision != NULL_REVISION:
 
290
        if revision is not None:
396
291
            prev_menu = gtk.Menu()
397
292
            if len(parents) > 0:
398
293
                self.prev_rev_action.set_sensitive(True)
399
294
                for parent_id in parents:
400
 
                    if parent_id and parent_id != NULL_REVISION:
401
 
                        parent = self.branch.repository.get_revision(parent_id)
402
 
                        try:
403
 
                            str = ' (' + parent.properties['branch-nick'] + ')'
404
 
                        except KeyError:
405
 
                            str = ""
 
295
                    parent = self.branch.repository.get_revision(parent_id)
 
296
                    try:
 
297
                        str = ' (' + parent.properties['branch-nick'] + ')'
 
298
                    except KeyError:
 
299
                        str = ""
406
300
 
407
 
                        item = gtk.MenuItem(parent.message.split("\n")[0] + str)
408
 
                        item.connect('activate', self._set_revision_cb, parent_id)
409
 
                        prev_menu.add(item)
 
301
                    item = gtk.MenuItem(parent.message.split("\n")[0] + str)
 
302
                    item.connect('activate', self._set_revision_cb, parent_id)
 
303
                    prev_menu.add(item)
410
304
                prev_menu.show_all()
411
305
            else:
412
306
                self.prev_rev_action.set_sensitive(False)
413
307
                prev_menu.hide()
414
308
 
415
 
            if getattr(self.prev_button, 'set_menu', None) is not None:
416
 
                self.prev_button.set_menu(prev_menu)
 
309
            self.prev_button.set_menu(prev_menu)
417
310
 
418
311
            next_menu = gtk.Menu()
419
312
            if len(children) > 0:
433
326
                self.next_rev_action.set_sensitive(False)
434
327
                next_menu.hide()
435
328
 
436
 
            if getattr(self.next_button, 'set_menu', None) is not None:
437
 
                self.next_button.set_menu(next_menu)
 
329
            self.next_button.set_menu(next_menu)
438
330
 
439
331
            self.revisionview.set_revision(revision)
440
332
            self.revisionview.set_children(children)
441
 
            self.update_diff_panel(revision, parents)
442
 
 
 
333
    
443
334
    def _tree_revision_activated(self, widget, path, col):
444
335
        # TODO: more than one parent
445
336
        """Callback for when a treeview row gets activated."""
447
338
        parents  = self.treeview.get_parents()
448
339
 
449
340
        if len(parents) == 0:
450
 
            parent_id = NULL_REVISION
 
341
            parent_id = None
451
342
        else:
452
343
            parent_id = parents[0]
453
344
 
454
345
        self.show_diff(revision.revision_id, parent_id)
455
346
        self.treeview.grab_focus()
 
347
    
456
348
 
457
349
    def _back_clicked_cb(self, *args):
458
350
        """Callback for when the back button is clicked."""
459
351
        self.treeview.back()
460
 
 
 
352
        
461
353
    def _fwd_clicked_cb(self, *args):
462
354
        """Callback for when the forward button is clicked."""
463
355
        self.treeview.forward()
487
379
        self.treeview.set_property('compact', self.compact_view)
488
380
        self.treeview.refresh()
489
381
 
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
 
 
 
382
    def _tag_revision_cb(self, w):
499
383
        try:
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()
 
384
            self.treeview.set_sensitive(False)
 
385
            dialog = AddTagDialog(self.branch.repository, self.treeview.get_revision().revision_id, self.branch)
 
386
            response = dialog.run()
 
387
            if response != gtk.RESPONSE_NONE:
 
388
                dialog.hide()
 
389
            
 
390
                if response == gtk.RESPONSE_OK:
 
391
                    self.treeview.add_tag(dialog.tagname, dialog._revid)
 
392
                
 
393
                dialog.destroy()
 
394
 
 
395
        finally:
 
396
            self.treeview.set_sensitive(True)
519
397
 
520
398
    def _about_dialog_cb(self, w):
521
399
        from bzrlib.plugins.gtk.about import AboutDialog
 
400
 
522
401
        AboutDialog().run()
523
402
 
524
403
    def _col_visibility_changed(self, col, property):
527
406
 
528
407
    def _toolbar_visibility_changed(self, col):
529
408
        if col.get_active():
530
 
            self.toolbar.show()
 
409
            self.toolbar.show() 
531
410
        else:
532
411
            self.toolbar.hide()
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)
 
412
 
 
413
    def _show_about_cb(self, w):
 
414
        dialog = AboutDialog()
 
415
        dialog.connect('response', lambda d,r: d.destroy())
 
416
        dialog.run()
567
417
 
568
418
    def _refresh_clicked(self, w):
569
419
        self.treeview.refresh()
573
423
 
574
424
        if self.branch.supports_tags():
575
425
            tags = self.branch.tags.get_tag_dict().items()
576
 
            tags.sort(reverse=True)
 
426
            tags.sort()
 
427
            tags.reverse()
577
428
            for tag, revid in tags:
578
 
                tag_image = gtk.Image()
579
 
                tag_image.set_from_file(icon_path('tag-16.png'))
580
 
                tag_item = gtk.ImageMenuItem(tag.replace('_', '__'))
581
 
                tag_item.set_image(tag_image)
 
429
                tag_item = gtk.MenuItem(tag, use_underline=False)
582
430
                tag_item.connect('activate', self._tag_selected_cb, revid)
583
 
                tag_item.set_sensitive(self.treeview.has_revision_id(revid))
584
431
                menu.add(tag_item)
585
432
            self.go_menu_tags.set_submenu(menu)
586
433
 
590
437
 
591
438
        self.go_menu_tags.show_all()
592
439
 
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):
 
440
    def show_diff(self, revid=None, parentid=None):
606
441
        """Open a new window to show a diff between the given revisions."""
607
442
        from bzrlib.plugins.gtk.diff import DiffWindow
608
443
        window = DiffWindow(parent=self)
609
444
 
 
445
        if parentid is None:
 
446
            parentid = NULL_REVISION
 
447
 
610
448
        rev_tree    = self.branch.repository.revision_tree(revid)
611
449
        parent_tree = self.branch.repository.revision_tree(parentid)
612
450
 
613
 
        description = revid + " - " + self.branch._get_nick(local=True)
 
451
        description = revid + " - " + self.branch.nick
614
452
        window.set_diff(description, rev_tree, parent_tree)
615
453
        window.show()
616
454
 
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()
 
455