/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: Daniel Schierbeck
  • Date: 2008-01-23 16:36:21 UTC
  • mto: (423.1.8 trunk)
  • mto: This revision was merged to the branch mainline in revision 429.
  • Revision ID: daniel.schierbeck@gmail.com-20080123163621-x8kublc38ojipnly
Made the revision popup menu correctly add tags.

Show diffs side-by-side

added added

removed removed

Lines of Context:
viz/branchwin.py
13
13
import gobject
14
14
import pango
15
15
 
16
 
from bzrlib.plugins.gtk import icon_path
17
 
from bzrlib.plugins.gtk.branchview import TreeView, treemodel
 
16
from bzrlib.plugins.gtk.window import Window
18
17
from bzrlib.plugins.gtk.tags import AddTagDialog
19
18
from bzrlib.plugins.gtk.preferences import PreferencesWindow
20
 
from bzrlib.plugins.gtk.revisionmenu import RevisionMenu
21
 
from bzrlib.plugins.gtk.window import Window
22
 
 
23
 
from bzrlib.config import BranchConfig, GlobalConfig
24
 
from bzrlib.revision import Revision, NULL_REVISION
25
 
from bzrlib.trace import mutter
 
19
from bzrlib.plugins.gtk.branchview import TreeView
 
20
from bzrlib.revision import Revision
 
21
from bzrlib.config import BranchConfig
 
22
from bzrlib.config import GlobalConfig
26
23
 
27
24
class BranchWindow(Window):
28
25
    """Branch window.
31
28
    for a particular branch.
32
29
    """
33
30
 
34
 
    def __init__(self, branch, start_revs, maxnum, parent=None):
 
31
    def __init__(self, branch, start, maxnum, parent=None):
35
32
        """Create a new BranchWindow.
36
33
 
37
34
        :param branch: Branch object for branch to show.
38
 
        :param start_revs: Revision ids of top revisions.
 
35
        :param start: Revision id of top revision.
39
36
        :param maxnum: Maximum number of revisions to display, 
40
37
                       None for no limit.
41
38
        """
44
41
        self.set_border_width(0)
45
42
 
46
43
        self.branch      = branch
47
 
        self.start_revs  = start_revs
 
44
        self.start       = start
48
45
        self.maxnum      = maxnum
49
46
        self.config      = GlobalConfig()
50
47
 
51
 
        self._sizes      = {} # window and widget sizes
52
 
 
53
48
        if self.config.get_user_option('viz-compact-view') == 'yes':
54
49
            self.compact_view = True
55
50
        else:
57
52
 
58
53
        self.set_title(branch.nick + " - revision history")
59
54
 
60
 
        # user-configured window size
61
 
        size = self._load_size('viz-window-size')
62
 
        if size:
63
 
            width, height = size
64
 
        else:
65
 
            # Use three-quarters of the screen by default
66
 
            screen = self.get_screen()
67
 
            monitor = screen.get_monitor_geometry(0)
68
 
            width = int(monitor.width * 0.75)
69
 
            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)
70
60
        self.set_default_size(width, height)
71
 
        self.set_size_request(width/3, height/3)
72
 
        self.connect("size-allocate", self._on_size_allocate, 'viz-window-size')
73
61
 
74
62
        # FIXME AndyFitz!
75
63
        icon = self.render_icon(gtk.STOCK_INDEX, gtk.ICON_SIZE_BUTTON)
77
65
 
78
66
        gtk.accel_map_add_entry("<viz>/Go/Next Revision", gtk.keysyms.Up, gtk.gdk.MOD1_MASK)
79
67
        gtk.accel_map_add_entry("<viz>/Go/Previous Revision", gtk.keysyms.Down, gtk.gdk.MOD1_MASK)
80
 
        gtk.accel_map_add_entry("<viz>/View/Refresh", gtk.keysyms.F5, 0)
81
68
 
82
69
        self.accel_group = gtk.AccelGroup()
83
70
        self.add_accel_group(self.accel_group)
96
83
        self.next_rev_action.connect("activate", self._fwd_clicked_cb)
97
84
        self.next_rev_action.connect_accelerator()
98
85
 
99
 
        self.refresh_action = gtk.Action("refresh", "_Refresh", "Refresh view", gtk.STOCK_REFRESH)
100
 
        self.refresh_action.set_accel_path("<viz>/View/Refresh")
101
 
        self.refresh_action.set_accel_group(self.accel_group)
102
 
        self.refresh_action.connect("activate", self._refresh_clicked)
103
 
        self.refresh_action.connect_accelerator()
104
 
 
105
86
        self.construct()
106
87
 
107
88
    def set_revision(self, revid):
113
94
        self.add(vbox)
114
95
 
115
96
        self.paned = gtk.VPaned()
116
 
        self.paned.pack1(self.construct_top(), resize=False, shrink=True)
117
 
        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)
118
99
        self.paned.show()
119
100
 
120
 
        nav = self.construct_navigation()
121
 
        menubar = self.construct_menubar()
122
 
        vbox.pack_start(menubar, expand=False, fill=True)
123
 
        vbox.pack_start(nav, expand=False, fill=True)
124
 
 
 
101
        vbox.pack_start(self.construct_menubar(), expand=False, fill=True)
 
102
        vbox.pack_start(self.construct_navigation(), expand=False, fill=True)
 
103
        vbox.pack_start(self.construct_loading_msg(), expand=False, fill=True)
 
104
        
125
105
        vbox.pack_start(self.paned, expand=True, fill=True)
126
106
        vbox.set_focus_child(self.paned)
127
107
 
128
108
        vbox.show()
129
 
    
 
109
 
130
110
    def construct_menubar(self):
131
111
        menubar = gtk.MenuBar()
132
112
 
148
128
        edit_menuitem = gtk.MenuItem("_Edit")
149
129
        edit_menuitem.set_submenu(edit_menu)
150
130
 
 
131
        edit_menu_find = gtk.ImageMenuItem(gtk.STOCK_FIND)
 
132
 
151
133
        edit_menu_branchopts = gtk.MenuItem("Branch Settings")
152
134
        edit_menu_branchopts.connect('activate', lambda x: PreferencesWindow(self.branch.get_config()).show())
153
135
 
154
136
        edit_menu_globopts = gtk.MenuItem("Global Settings")
155
137
        edit_menu_globopts.connect('activate', lambda x: PreferencesWindow().show())
156
138
 
 
139
        edit_menu.add(edit_menu_find)
157
140
        edit_menu.add(edit_menu_branchopts)
158
141
        edit_menu.add(edit_menu_globopts)
159
142
 
161
144
        view_menuitem = gtk.MenuItem("_View")
162
145
        view_menuitem.set_submenu(view_menu)
163
146
 
164
 
        view_menu_refresh = self.refresh_action.create_menu_item()
165
 
        view_menu_refresh.connect('activate', self._refresh_clicked)
166
 
 
167
 
        view_menu.add(view_menu_refresh)
168
 
        view_menu.add(gtk.SeparatorMenuItem())
169
 
 
170
147
        view_menu_toolbar = gtk.CheckMenuItem("Show Toolbar")
171
148
        view_menu_toolbar.set_active(True)
172
 
        if self.config.get_user_option('viz-toolbar-visible') == 'False':
173
 
            view_menu_toolbar.set_active(False)
174
 
            self.toolbar.hide()
175
149
        view_menu_toolbar.connect('toggled', self._toolbar_visibility_changed)
176
150
 
177
151
        view_menu_compact = gtk.CheckMenuItem("Show Compact Graph")
178
152
        view_menu_compact.set_active(self.compact_view)
179
153
        view_menu_compact.connect('activate', self._brokenlines_toggled_cb)
180
 
        
181
 
        view_menu_diffs = gtk.CheckMenuItem("Show Diffs")
182
 
        view_menu_diffs.set_active(False)
183
 
        if self.config.get_user_option('viz-show-diffs') == 'True':
184
 
            view_menu_diffs.set_active(True)
185
 
        view_menu_diffs.connect('toggled', self._diff_visibility_changed)
186
 
        
187
 
        view_menu_wide_diffs = gtk.CheckMenuItem("Wide Diffs")
188
 
        view_menu_wide_diffs.set_active(False)
189
 
        if self.config.get_user_option('viz-wide-diffs') == 'True':
190
 
            view_menu_wide_diffs.set_active(True)
191
 
        view_menu_wide_diffs.connect('toggled', self._diff_placement_changed)
192
 
        
193
 
        view_menu_wrap_diffs = gtk.CheckMenuItem("Wrap _Long Lines in Diffs")
194
 
        view_menu_wrap_diffs.set_active(False)
195
 
        if self.config.get_user_option('viz-wrap-diffs') == 'True':
196
 
            view_menu_wrap_diffs.set_active(True)
197
 
        view_menu_wrap_diffs.connect('toggled', self._diff_wrap_changed)
198
 
                
 
154
 
199
155
        view_menu.add(view_menu_toolbar)
200
156
        view_menu.add(view_menu_compact)
201
157
        view_menu.add(gtk.SeparatorMenuItem())
202
 
        view_menu.add(view_menu_diffs)
203
 
        view_menu.add(view_menu_wide_diffs)
204
 
        view_menu.add(view_menu_wrap_diffs)
205
 
        view_menu.add(gtk.SeparatorMenuItem())
206
 
 
207
 
        self.mnu_show_revno_column = gtk.CheckMenuItem("Show Revision _Number Column")
208
 
        self.mnu_show_date_column = gtk.CheckMenuItem("Show _Date Column")
209
 
 
210
 
        # Revision numbers are pointless if there are multiple branches
211
 
        if len(self.start_revs) > 1:
212
 
            self.mnu_show_revno_column.set_sensitive(False)
213
 
            self.treeview.set_property('revno-column-visible', False)
214
 
 
215
 
        for (col, name) in [(self.mnu_show_revno_column, "revno"), 
216
 
                            (self.mnu_show_date_column, "date")]:
 
158
 
 
159
        for (label, name) in [("Revision _Number", "revno"), ("_Date", "date")]:
 
160
            col = gtk.CheckMenuItem("Show " + label + " Column")
217
161
            col.set_active(self.treeview.get_property(name + "-column-visible"))
218
162
            col.connect('toggled', self._col_visibility_changed, name)
219
163
            view_menu.add(col)
226
170
        go_menu_next = self.next_rev_action.create_menu_item()
227
171
        go_menu_prev = self.prev_rev_action.create_menu_item()
228
172
 
229
 
        tag_image = gtk.Image()
230
 
        tag_image.set_from_file(icon_path("tag-16.png"))
231
 
        self.go_menu_tags = gtk.ImageMenuItem("_Tags")
232
 
        self.go_menu_tags.set_image(tag_image)
 
173
        self.go_menu_tags = gtk.MenuItem("_Tags")
233
174
        self._update_tags()
234
175
 
235
176
        go_menu.add(go_menu_next)
237
178
        go_menu.add(gtk.SeparatorMenuItem())
238
179
        go_menu.add(self.go_menu_tags)
239
180
 
240
 
        self.revision_menu = RevisionMenu(self.branch.repository, [], self.branch, parent=self)
 
181
        revision_menu = gtk.Menu()
241
182
        revision_menuitem = gtk.MenuItem("_Revision")
242
 
        revision_menuitem.set_submenu(self.revision_menu)
 
183
        revision_menuitem.set_submenu(revision_menu)
 
184
 
 
185
        revision_menu_diff = gtk.MenuItem("View Changes")
 
186
        revision_menu_diff.connect('activate', 
 
187
                lambda w: self.treeview.show_diff())
 
188
 
 
189
        revision_menu_tag = gtk.MenuItem("Tag Revision")
 
190
        revision_menu_tag.connect('activate', self._tag_revision_cb)
 
191
 
 
192
        revision_menu.add(revision_menu_tag)
 
193
        revision_menu.add(revision_menu_diff)
243
194
 
244
195
        branch_menu = gtk.Menu()
245
196
        branch_menuitem = gtk.MenuItem("_Branch")
248
199
        branch_menu.add(gtk.MenuItem("Pu_ll Revisions"))
249
200
        branch_menu.add(gtk.MenuItem("Pu_sh Revisions"))
250
201
 
251
 
        try:
252
 
            from bzrlib.plugins import search
253
 
        except ImportError:
254
 
            mutter("Didn't find search plugin")
255
 
        else:
256
 
            branch_menu.add(gtk.SeparatorMenuItem())
257
 
 
258
 
            branch_index_menuitem = gtk.MenuItem("_Index")
259
 
            branch_index_menuitem.connect('activate', self._branch_index_cb)
260
 
            branch_menu.add(branch_index_menuitem)
261
 
 
262
 
            branch_search_menuitem = gtk.MenuItem("_Search")
263
 
            branch_search_menuitem.connect('activate', self._branch_search_cb)
264
 
            branch_menu.add(branch_search_menuitem)
265
 
 
266
 
        help_menu = gtk.Menu()
267
 
        help_menuitem = gtk.MenuItem("_Help")
268
 
        help_menuitem.set_submenu(help_menu)
269
 
 
270
 
        help_about_menuitem = gtk.ImageMenuItem(gtk.STOCK_ABOUT, self.accel_group)
271
 
        help_about_menuitem.connect('activate', self._about_dialog_cb)
272
 
 
273
 
        help_menu.add(help_about_menuitem)
274
 
 
275
202
        menubar.add(file_menuitem)
276
203
        menubar.add(edit_menuitem)
277
204
        menubar.add(view_menuitem)
278
205
        menubar.add(go_menuitem)
279
206
        menubar.add(revision_menuitem)
280
207
        menubar.add(branch_menuitem)
281
 
        menubar.add(help_menuitem)
282
208
        menubar.show_all()
283
209
 
284
210
        return menubar
 
211
    
 
212
    def construct_loading_msg(self):
 
213
        image_loading = gtk.image_new_from_stock(gtk.STOCK_REFRESH,
 
214
                                                 gtk.ICON_SIZE_BUTTON)
 
215
        image_loading.show()
 
216
        
 
217
        label_loading = gtk.Label(_("Please wait, loading ancestral graph..."))
 
218
        label_loading.set_alignment(0.0, 0.5)
 
219
        label_loading.show()
 
220
        
 
221
        self.loading_msg_box = gtk.HBox()
 
222
        self.loading_msg_box.set_spacing(5)
 
223
        self.loading_msg_box.set_border_width(5)        
 
224
        self.loading_msg_box.pack_start(image_loading, False, False)
 
225
        self.loading_msg_box.pack_start(label_loading, True, True)
 
226
        self.loading_msg_box.show()
 
227
        
 
228
        return self.loading_msg_box
285
229
 
286
230
    def construct_top(self):
287
231
        """Construct the top-half of the window."""
288
232
        # FIXME: Make broken_line_length configurable
289
233
 
290
 
        self.treeview = TreeView(self.branch, self.start_revs, self.maxnum, self.compact_view)
 
234
        self.treeview = TreeView(self.branch, self.start, self.maxnum, self.compact_view)
291
235
 
292
236
        self.treeview.connect('revision-selected',
293
237
                self._treeselection_changed_cb)
294
 
        self.treeview.connect('revision-activated',
295
 
                self._tree_revision_activated)
 
238
 
 
239
        self.treeview.connect('revisions-loaded', 
 
240
                lambda x: self.loading_msg_box.hide())
296
241
 
297
242
        self.treeview.connect('tag-added', lambda w, t, r: self._update_tags())
298
243
 
300
245
            option = self.config.get_user_option(col + '-column-visible')
301
246
            if option is not None:
302
247
                self.treeview.set_property(col + '-column-visible', option == 'True')
303
 
            else:
304
 
                self.treeview.set_property(col + '-column-visible', False)
305
248
 
306
249
        self.treeview.show()
307
250
 
308
251
        align = gtk.Alignment(0.0, 0.0, 1.0, 1.0)
309
252
        align.set_padding(5, 0, 0, 0)
310
253
        align.add(self.treeview)
311
 
        # user-configured size
312
 
        size = self._load_size('viz-graph-size')
313
 
        if size:
314
 
            width, height = size
315
 
            align.set_size_request(width, height)
316
 
        else:
317
 
            (width, height) = self.get_size()
318
 
            align.set_size_request(width, int(height / 2.5))
319
 
        align.connect('size-allocate', self._on_size_allocate, 'viz-graph-size')
320
254
        align.show()
321
255
 
322
256
        return align
344
278
 
345
279
    def construct_bottom(self):
346
280
        """Construct the bottom half of the window."""
347
 
        if self.config.get_user_option('viz-wide-diffs') == 'True':
348
 
            self.diff_paned = gtk.VPaned()
349
 
        else:
350
 
            self.diff_paned = gtk.HPaned()
351
 
        (width, height) = self.get_size()
352
 
        self.diff_paned.set_size_request(20, 20) # shrinkable
353
 
 
354
281
        from bzrlib.plugins.gtk.revisionview import RevisionView
355
282
        self.revisionview = RevisionView(branch=self.branch)
356
 
        self.revisionview.set_size_request(width/3, int(height / 2.5))
357
 
        # user-configured size
358
 
        size = self._load_size('viz-revisionview-size')
359
 
        if size:
360
 
            width, height = size
361
 
            self.revisionview.set_size_request(width, height)
362
 
        self.revisionview.connect('size-allocate', self._on_size_allocate, 'viz-revisionview-size')
 
283
        (width, height) = self.get_size()
 
284
        self.revisionview.set_size_request(width, int(height / 2.5))
363
285
        self.revisionview.show()
364
286
        self.revisionview.set_show_callback(self._show_clicked_cb)
365
287
        self.revisionview.connect('notify::revision', self._go_clicked_cb)
366
288
        self.treeview.connect('tag-added', lambda w, t, r: self.revisionview.update_tags())
367
 
        self.diff_paned.pack1(self.revisionview)
368
 
 
369
 
        from bzrlib.plugins.gtk.diff import DiffWidget
370
 
        self.diff = DiffWidget()
371
 
        self.diff_paned.pack2(self.diff)
372
 
 
373
 
        self.diff_paned.show_all()
374
 
        if self.config.get_user_option('viz-show-diffs') != 'True':
375
 
            self.diff.hide()
376
 
 
377
 
        return self.diff_paned
 
289
        return self.revisionview
378
290
 
379
291
    def _tag_selected_cb(self, menuitem, revid):
380
292
        self.treeview.set_revision_id(revid)
385
297
        parents  = self.treeview.get_parents()
386
298
        children = self.treeview.get_children()
387
299
 
388
 
        self.revision_menu.set_revision_ids([revision.revision_id])
389
 
 
390
 
        if revision and revision != NULL_REVISION:
 
300
        if revision is not None:
391
301
            prev_menu = gtk.Menu()
392
302
            if len(parents) > 0:
393
303
                self.prev_rev_action.set_sensitive(True)
394
304
                for parent_id in parents:
395
 
                    if parent_id and parent_id != NULL_REVISION:
396
 
                        parent = self.branch.repository.get_revision(parent_id)
397
 
                        try:
398
 
                            str = ' (' + parent.properties['branch-nick'] + ')'
399
 
                        except KeyError:
400
 
                            str = ""
 
305
                    parent = self.branch.repository.get_revision(parent_id)
 
306
                    try:
 
307
                        str = ' (' + parent.properties['branch-nick'] + ')'
 
308
                    except KeyError:
 
309
                        str = ""
401
310
 
402
 
                        item = gtk.MenuItem(parent.message.split("\n")[0] + str)
403
 
                        item.connect('activate', self._set_revision_cb, parent_id)
404
 
                        prev_menu.add(item)
 
311
                    item = gtk.MenuItem(parent.message.split("\n")[0] + str)
 
312
                    item.connect('activate', self._set_revision_cb, parent_id)
 
313
                    prev_menu.add(item)
405
314
                prev_menu.show_all()
406
315
            else:
407
316
                self.prev_rev_action.set_sensitive(False)
431
340
 
432
341
            self.revisionview.set_revision(revision)
433
342
            self.revisionview.set_children(children)
434
 
            self.update_diff_panel(revision, parents)
435
 
 
436
 
    def _tree_revision_activated(self, widget, path, col):
437
 
        # TODO: more than one parent
438
 
        """Callback for when a treeview row gets activated."""
439
 
        revision = self.treeview.get_revision()
440
 
        parents  = self.treeview.get_parents()
441
 
 
442
 
        if len(parents) == 0:
443
 
            parent_id = None
444
 
        else:
445
 
            parent_id = parents[0]
446
 
 
447
 
        self.show_diff(revision.revision_id, parent_id)
448
 
        self.treeview.grab_focus()
449
 
        
 
343
 
450
344
    def _back_clicked_cb(self, *args):
451
345
        """Callback for when the back button is clicked."""
452
346
        self.treeview.back()
462
356
 
463
357
    def _show_clicked_cb(self, revid, parentid):
464
358
        """Callback for when the show button for a parent is clicked."""
465
 
        self.show_diff(revid, parentid)
 
359
        self.treeview.show_diff(revid, parentid)
466
360
        self.treeview.grab_focus()
467
361
 
468
362
    def _set_revision_cb(self, w, revision_id):
480
374
        self.treeview.set_property('compact', self.compact_view)
481
375
        self.treeview.refresh()
482
376
 
483
 
    def _branch_index_cb(self, w):
484
 
        from bzrlib.plugins.search import index as _mod_index
485
 
        _mod_index.index_url(self.branch.base)
486
 
 
487
 
    def _branch_search_cb(self, w):
488
 
        from bzrlib.plugins.search import index as _mod_index
489
 
        from bzrlib.plugins.gtk.search import SearchDialog
490
 
        from bzrlib.plugins.search import errors as search_errors
491
 
 
 
377
    def _tag_revision_cb(self, w):
492
378
        try:
493
 
            index = _mod_index.open_index_url(self.branch.base)
494
 
        except search_errors.NoSearchIndex:
495
 
            dialog = gtk.MessageDialog(self, type=gtk.MESSAGE_QUESTION, 
496
 
                buttons=gtk.BUTTONS_OK_CANCEL, 
497
 
                message_format="This branch has not been indexed yet. "
498
 
                               "Index now?")
499
 
            if dialog.run() == gtk.RESPONSE_OK:
500
 
                dialog.destroy()
501
 
                index = _mod_index.index_url(self.branch.base)
502
 
            else:
503
 
                dialog.destroy()
504
 
                return
505
 
 
506
 
        dialog = SearchDialog(index)
507
 
        
508
 
        if dialog.run() == gtk.RESPONSE_OK:
509
 
            self.set_revision(dialog.get_revision())
510
 
 
511
 
        dialog.destroy()
512
 
 
513
 
    def _about_dialog_cb(self, w):
514
 
        from bzrlib.plugins.gtk.about import AboutDialog
515
 
 
516
 
        AboutDialog().run()
 
379
            self.treeview.set_sensitive(False)
 
380
            dialog = AddTagDialog(self.branch.repository, self.treeview.get_revision().revision_id, self.branch)
 
381
            response = dialog.run()
 
382
            if response != gtk.RESPONSE_NONE:
 
383
                dialog.hide()
 
384
            
 
385
                if response == gtk.RESPONSE_OK:
 
386
                    self.treeview.add_tag(dialog.tagname, dialog._revid)
 
387
                
 
388
                dialog.destroy()
 
389
 
 
390
        finally:
 
391
            self.treeview.set_sensitive(True)
517
392
 
518
393
    def _col_visibility_changed(self, col, property):
519
394
        self.config.set_user_option(property + '-column-visible', col.get_active())
521
396
 
522
397
    def _toolbar_visibility_changed(self, col):
523
398
        if col.get_active():
524
 
            self.toolbar.show()
 
399
            self.toolbar.show() 
525
400
        else:
526
401
            self.toolbar.hide()
527
 
        self.config.set_user_option('viz-toolbar-visible', col.get_active())
528
 
 
529
 
    def _make_diff_nonzero_size(self):
530
 
        """make sure the diff isn't zero-width or zero-height"""
531
 
        alloc = self.diff.get_allocation()
532
 
        if (alloc.width < 10) or (alloc.height < 10):
533
 
            width, height = self.get_size()
534
 
            self.revisionview.set_size_request(width/3, int(height / 2.5))
535
 
 
536
 
    def _diff_visibility_changed(self, col):
537
 
        """Hide or show the diff panel."""
538
 
        if col.get_active():
539
 
            self.diff.show()
540
 
            self._make_diff_nonzero_size()
541
 
        else:
542
 
            self.diff.hide()
543
 
        self.config.set_user_option('viz-show-diffs', str(col.get_active()))
544
 
        self.update_diff_panel()
545
 
 
546
 
    def _diff_placement_changed(self, col):
547
 
        """Toggle the diff panel's position."""
548
 
        self.config.set_user_option('viz-wide-diffs', str(col.get_active()))
549
 
 
550
 
        old = self.paned.get_child2()
551
 
        self.paned.remove(old)
552
 
        self.paned.pack2(self.construct_bottom(), resize=True, shrink=False)
553
 
        self._make_diff_nonzero_size()
554
 
 
555
 
        self.treeview.emit('revision-selected')
556
 
    
557
 
    def _diff_wrap_changed(self, widget):
558
 
        """Toggle word wrap in the diff widget."""
559
 
        self.config.set_user_option('viz-wrap-diffs', widget.get_active())
560
 
        self.diff._on_wraplines_toggled(widget)
561
 
    
 
402
 
562
403
    def _show_about_cb(self, w):
563
404
        dialog = AboutDialog()
564
405
        dialog.connect('response', lambda d,r: d.destroy())
565
406
        dialog.run()
566
407
 
567
408
    def _refresh_clicked(self, w):
568
 
        self.treeview.refresh()
 
409
        self.treeview.update()
569
410
 
570
411
    def _update_tags(self):
571
412
        menu = gtk.Menu()
575
416
            tags.sort()
576
417
            tags.reverse()
577
418
            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)
 
419
                tag_item = gtk.MenuItem(tag)
582
420
                tag_item.connect('activate', self._tag_selected_cb, revid)
583
421
                menu.add(tag_item)
584
422
            self.go_menu_tags.set_submenu(menu)
589
427
 
590
428
        self.go_menu_tags.show_all()
591
429
 
592
 
    def _load_size(self, name):
593
 
        """Read and parse 'name' from self.config.
594
 
        The value is a string, formatted as WIDTHxHEIGHT
595
 
        Returns None, or (width, height)
596
 
        """
597
 
        size = self.config.get_user_option(name)
598
 
        if size:
599
 
            width, height = [int(num) for num in size.split('x')]
600
 
            # avoid writing config every time we start
601
 
            self._sizes[name] = (width, height)
602
 
            return width, height
603
 
        return None
604
 
 
605
 
    def _on_size_allocate(self, widget, allocation, name):
606
 
        """When window has been resized, save the new size."""
607
 
        width, height = 0, 0
608
 
        if name in self._sizes:
609
 
            width, height = self._sizes[name]
610
 
 
611
 
        size_changed = (width != allocation.width) or \
612
 
                (height != allocation.height)
613
 
 
614
 
        if size_changed:
615
 
            width, height = allocation.width, allocation.height
616
 
            self._sizes[name] = (width, height)
617
 
            value = '%sx%s' % (width, height)
618
 
            self.config.set_user_option(name, value)
619
 
 
620
 
    def show_diff(self, revid=None, parentid=None):
621
 
        """Open a new window to show a diff between the given revisions."""
622
 
        from bzrlib.plugins.gtk.diff import DiffWindow
623
 
        window = DiffWindow(parent=self)
624
 
 
625
 
        if parentid is None:
626
 
            parentid = NULL_REVISION
627
 
 
628
 
        rev_tree    = self.branch.repository.revision_tree(revid)
629
 
        parent_tree = self.branch.repository.revision_tree(parentid)
630
 
 
631
 
        description = revid + " - " + self.branch.nick
632
 
        window.set_diff(description, rev_tree, parent_tree)
633
 
        window.show()
634
 
 
635
 
    def update_diff_panel(self, revision=None, parents=None):
636
 
        """Show the current revision in the diff panel."""
637
 
        if self.config.get_user_option('viz-show-diffs') != 'True':
638
 
            return
639
 
 
640
 
        if not revision: # default to selected row
641
 
            revision = self.treeview.get_revision()
642
 
        if (not revision) or (revision == NULL_REVISION):
643
 
            return
644
 
 
645
 
        if not parents: # default to selected row's parents
646
 
            parents  = self.treeview.get_parents()
647
 
        if len(parents) == 0:
648
 
            parent_id = None
649
 
        else:
650
 
            parent_id = parents[0]
651
 
 
652
 
        rev_tree    = self.branch.repository.revision_tree(revision.revision_id)
653
 
        parent_tree = self.branch.repository.revision_tree(parent_id)
654
 
 
655
 
        self.diff.set_diff(rev_tree, parent_tree)
656
 
        if self.config.get_user_option('viz-wrap-diffs') == 'True':
657
 
            self.diff._on_wraplines_toggled(wrap=True)
658
 
        self.diff.show_all()
 
430