/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-15 01:02:16 UTC
  • mto: This revision was merged to the branch mainline in revision 731.
  • Revision ID: jelmer@samba.org-20110415010216-u6h7cxpv3cu7bvmg
Construct model early.

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")
91
99
        self.refresh_action.connect("activate", self._refresh_clicked)
92
100
        self.refresh_action.connect_accelerator()
93
101
 
94
 
        self.construct()
 
102
        self.vbox = self.construct()
 
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)
95
112
 
96
113
    def set_revision(self, revid):
97
114
        self.treeview.set_revision_id(revid)
101
118
        vbox = gtk.VBox(spacing=0)
102
119
        self.add(vbox)
103
120
 
104
 
        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)
 
121
        # order is important here
 
122
        paned = self.construct_paned()
 
123
        nav = self.construct_navigation()
 
124
        menubar = self.construct_menubar()
 
125
 
 
126
        vbox.pack_start(menubar, expand=False, fill=True)
 
127
        vbox.pack_start(nav, expand=False, fill=True)
 
128
        vbox.pack_start(paned, expand=True, fill=True)
 
129
        vbox.set_focus_child(paned)
 
130
 
 
131
        self.treeview.connect('revision-selected',
 
132
                self._treeselection_changed_cb)
 
133
        self.treeview.connect('revision-activated',
 
134
                self._tree_revision_activated)
 
135
 
 
136
        self.treeview.connect('tag-added', lambda w, t, r: self._update_tags())
 
137
        vbox.show()
 
138
 
 
139
        return vbox
 
140
 
 
141
    def construct_paned(self):
 
142
        """Construct the main HPaned/VPaned contents."""
 
143
        if self.config.get_user_option('viz-vertical') == 'True':
 
144
            self.paned = gtk.HPaned()
 
145
        else:
 
146
            self.paned = gtk.VPaned()
 
147
 
 
148
        self.paned.pack1(self.construct_top(), resize=False, shrink=True)
 
149
        self.paned.pack2(self.construct_bottom(), resize=True, shrink=False)
107
150
        self.paned.show()
108
151
 
109
 
        vbox.pack_start(self.construct_menubar(), expand=False, fill=True)
110
 
        vbox.pack_start(self.construct_navigation(), expand=False, fill=True)
111
 
        
112
 
        vbox.pack_start(self.paned, expand=True, fill=True)
113
 
        vbox.set_focus_child(self.paned)
114
 
 
115
 
        vbox.show()
 
152
        return self.paned
116
153
 
117
154
    def construct_menubar(self):
118
155
        menubar = gtk.MenuBar()
123
160
 
124
161
        file_menu_close = gtk.ImageMenuItem(gtk.STOCK_CLOSE, self.accel_group)
125
162
        file_menu_close.connect('activate', lambda x: self.destroy())
126
 
        
 
163
 
127
164
        file_menu_quit = gtk.ImageMenuItem(gtk.STOCK_QUIT, self.accel_group)
128
165
        file_menu_quit.connect('activate', lambda x: gtk.main_quit())
129
 
        
 
166
 
130
167
        if self._parent is not None:
131
168
            file_menu.add(file_menu_close)
132
169
        file_menu.add(file_menu_quit)
135
172
        edit_menuitem = gtk.MenuItem("_Edit")
136
173
        edit_menuitem.set_submenu(edit_menu)
137
174
 
138
 
        edit_menu_find = gtk.ImageMenuItem(gtk.STOCK_FIND)
139
 
 
140
175
        edit_menu_branchopts = gtk.MenuItem("Branch Settings")
141
176
        edit_menu_branchopts.connect('activate', lambda x: PreferencesWindow(self.branch.get_config()).show())
142
177
 
143
178
        edit_menu_globopts = gtk.MenuItem("Global Settings")
144
179
        edit_menu_globopts.connect('activate', lambda x: PreferencesWindow().show())
145
180
 
146
 
        edit_menu.add(edit_menu_find)
147
181
        edit_menu.add(edit_menu_branchopts)
148
182
        edit_menu.add(edit_menu_globopts)
149
183
 
159
193
 
160
194
        view_menu_toolbar = gtk.CheckMenuItem("Show Toolbar")
161
195
        view_menu_toolbar.set_active(True)
 
196
        if self.config.get_user_option('viz-toolbar-visible') == 'False':
 
197
            view_menu_toolbar.set_active(False)
 
198
            self.toolbar.hide()
162
199
        view_menu_toolbar.connect('toggled', self._toolbar_visibility_changed)
163
200
 
164
201
        view_menu_compact = gtk.CheckMenuItem("Show Compact Graph")
165
202
        view_menu_compact.set_active(self.compact_view)
166
203
        view_menu_compact.connect('activate', self._brokenlines_toggled_cb)
167
204
 
 
205
        view_menu_vertical = gtk.CheckMenuItem("Side-by-side Layout")
 
206
        view_menu_vertical.set_active(False)
 
207
        if self.config.get_user_option('viz-vertical') == 'True':
 
208
            view_menu_vertical.set_active(True)
 
209
        view_menu_vertical.connect('toggled', self._vertical_layout)
 
210
 
 
211
        view_menu_diffs = gtk.CheckMenuItem("Show Diffs")
 
212
        view_menu_diffs.set_active(False)
 
213
        if self.config.get_user_option('viz-show-diffs') == 'True':
 
214
            view_menu_diffs.set_active(True)
 
215
        view_menu_diffs.connect('toggled', self._diff_visibility_changed)
 
216
 
 
217
        view_menu_wide_diffs = gtk.CheckMenuItem("Wide Diffs")
 
218
        view_menu_wide_diffs.set_active(False)
 
219
        if self.config.get_user_option('viz-wide-diffs') == 'True':
 
220
            view_menu_wide_diffs.set_active(True)
 
221
        view_menu_wide_diffs.connect('toggled', self._diff_placement_changed)
 
222
 
 
223
        view_menu_wrap_diffs = gtk.CheckMenuItem("Wrap _Long Lines in Diffs")
 
224
        view_menu_wrap_diffs.set_active(False)
 
225
        if self.config.get_user_option('viz-wrap-diffs') == 'True':
 
226
            view_menu_wrap_diffs.set_active(True)
 
227
        view_menu_wrap_diffs.connect('toggled', self._diff_wrap_changed)
 
228
 
168
229
        view_menu.add(view_menu_toolbar)
169
230
        view_menu.add(view_menu_compact)
 
231
        view_menu.add(view_menu_vertical)
 
232
        view_menu.add(gtk.SeparatorMenuItem())
 
233
        view_menu.add(view_menu_diffs)
 
234
        view_menu.add(view_menu_wide_diffs)
 
235
        view_menu.add(view_menu_wrap_diffs)
170
236
        view_menu.add(gtk.SeparatorMenuItem())
171
237
 
172
238
        self.mnu_show_revno_column = gtk.CheckMenuItem("Show Revision _Number Column")
187
253
        go_menu.set_accel_group(self.accel_group)
188
254
        go_menuitem = gtk.MenuItem("_Go")
189
255
        go_menuitem.set_submenu(go_menu)
190
 
        
 
256
 
191
257
        go_menu_next = self.next_rev_action.create_menu_item()
192
258
        go_menu_prev = self.prev_rev_action.create_menu_item()
193
259
 
195
261
        tag_image.set_from_file(icon_path("tag-16.png"))
196
262
        self.go_menu_tags = gtk.ImageMenuItem("_Tags")
197
263
        self.go_menu_tags.set_image(tag_image)
198
 
        self._update_tags()
 
264
        self.treeview.connect('refreshed', lambda w: self._update_tags())
199
265
 
200
266
        go_menu.add(go_menu_next)
201
267
        go_menu.add(go_menu_prev)
202
268
        go_menu.add(gtk.SeparatorMenuItem())
203
269
        go_menu.add(self.go_menu_tags)
204
270
 
205
 
        revision_menu = gtk.Menu()
 
271
        self.revision_menu = RevisionMenu(self.branch.repository, [],
 
272
            self.branch, parent=self)
206
273
        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)
 
274
        revision_menuitem.set_submenu(self.revision_menu)
223
275
 
224
276
        branch_menu = gtk.Menu()
225
277
        branch_menuitem = gtk.MenuItem("_Branch")
228
280
        branch_menu.add(gtk.MenuItem("Pu_ll Revisions"))
229
281
        branch_menu.add(gtk.MenuItem("Pu_sh Revisions"))
230
282
 
 
283
        try:
 
284
            from bzrlib.plugins import search
 
285
        except ImportError:
 
286
            mutter("Didn't find search plugin")
 
287
        else:
 
288
            branch_menu.add(gtk.SeparatorMenuItem())
 
289
 
 
290
            branch_index_menuitem = gtk.MenuItem("_Index")
 
291
            branch_index_menuitem.connect('activate', self._branch_index_cb)
 
292
            branch_menu.add(branch_index_menuitem)
 
293
 
 
294
            branch_search_menuitem = gtk.MenuItem("_Search")
 
295
            branch_search_menuitem.connect('activate', self._branch_search_cb)
 
296
            branch_menu.add(branch_search_menuitem)
 
297
 
231
298
        help_menu = gtk.Menu()
232
299
        help_menuitem = gtk.MenuItem("_Help")
233
300
        help_menuitem.set_submenu(help_menu)
234
301
 
235
 
        help_about_menuitem = gtk.ImageMenuItem(gtk.STOCK_ABOUT, self.accel_group)
 
302
        help_about_menuitem = gtk.ImageMenuItem(gtk.STOCK_ABOUT,
 
303
            self.accel_group)
236
304
        help_about_menuitem.connect('activate', self._about_dialog_cb)
237
305
 
238
306
        help_menu.add(help_about_menuitem)
252
320
        """Construct the top-half of the window."""
253
321
        # FIXME: Make broken_line_length configurable
254
322
 
255
 
        self.treeview = TreeView(self.branch, self.start_revs, self.maxnum, self.compact_view)
256
 
 
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())
 
323
        self.treeview = TreeView(self.branch, self.start_revs, self.maxnum,
 
324
            self.compact_view)
263
325
 
264
326
        for col in ["revno", "date"]:
265
327
            option = self.config.get_user_option(col + '-column-visible')
266
328
            if option is not None:
267
 
                self.treeview.set_property(col + '-column-visible', option == 'True')
 
329
                self.treeview.set_property(col + '-column-visible',
 
330
                    option == 'True')
268
331
            else:
269
332
                self.treeview.set_property(col + '-column-visible', False)
270
333
 
273
336
        align = gtk.Alignment(0.0, 0.0, 1.0, 1.0)
274
337
        align.set_padding(5, 0, 0, 0)
275
338
        align.add(self.treeview)
 
339
        # user-configured size
 
340
        size = self._load_size('viz-graph-size')
 
341
        if size:
 
342
            width, height = size
 
343
            align.set_size_request(width, height)
 
344
        else:
 
345
            (width, height) = self.get_size()
 
346
            align.set_size_request(width, int(height / 2.5))
 
347
        self._save_size_on_destroy(align, 'viz-graph-size')
276
348
        align.show()
277
349
 
278
350
        return align
300
372
 
301
373
    def construct_bottom(self):
302
374
        """Construct the bottom half of the window."""
 
375
        if self.config.get_user_option('viz-wide-diffs') == 'True':
 
376
            self.diff_paned = gtk.VPaned()
 
377
        else:
 
378
            self.diff_paned = gtk.HPaned()
 
379
        (width, height) = self.get_size()
 
380
        self.diff_paned.set_size_request(20, 20) # shrinkable
 
381
 
303
382
        from bzrlib.plugins.gtk.revisionview import RevisionView
304
383
        self.revisionview = RevisionView(branch=self.branch)
305
 
        (width, height) = self.get_size()
306
 
        self.revisionview.set_size_request(width, int(height / 2.5))
 
384
        self.revisionview.set_size_request(width/3, int(height / 2.5))
 
385
        # user-configured size
 
386
        size = self._load_size('viz-revisionview-size')
 
387
        if size:
 
388
            width, height = size
 
389
            self.revisionview.set_size_request(width, height)
 
390
        self._save_size_on_destroy(self.revisionview, 'viz-revisionview-size')
307
391
        self.revisionview.show()
308
392
        self.revisionview.set_show_callback(self._show_clicked_cb)
309
393
        self.revisionview.connect('notify::revision', self._go_clicked_cb)
310
 
        self.treeview.connect('tag-added', lambda w, t, r: self.revisionview.update_tags())
311
 
        return self.revisionview
 
394
        self.treeview.connect('tag-added',
 
395
            lambda w, t, r: self.revisionview.update_tags())
 
396
        self.diff_paned.pack1(self.revisionview)
 
397
 
 
398
        from bzrlib.plugins.gtk.diff import DiffWidget
 
399
        self.diff = DiffWidget()
 
400
        self.diff_paned.pack2(self.diff)
 
401
 
 
402
        self.diff_paned.show_all()
 
403
        if self.config.get_user_option('viz-show-diffs') != 'True':
 
404
            self.diff.hide()
 
405
 
 
406
        return self.diff_paned
312
407
 
313
408
    def _tag_selected_cb(self, menuitem, revid):
314
409
        self.treeview.set_revision_id(revid)
319
414
        parents  = self.treeview.get_parents()
320
415
        children = self.treeview.get_children()
321
416
 
 
417
        self.revision_menu.set_revision_ids([revision.revision_id])
 
418
 
322
419
        if revision and revision != NULL_REVISION:
323
420
            prev_menu = gtk.Menu()
324
421
            if len(parents) > 0:
327
424
                    if parent_id and parent_id != NULL_REVISION:
328
425
                        parent = self.branch.repository.get_revision(parent_id)
329
426
                        try:
330
 
                            str = ' (' + parent.properties['branch-nick'] + ')'
 
427
                            str = ' (%s)' % parent.properties['branch-nick']
331
428
                        except KeyError:
332
429
                            str = ""
333
430
 
339
436
                self.prev_rev_action.set_sensitive(False)
340
437
                prev_menu.hide()
341
438
 
342
 
            self.prev_button.set_menu(prev_menu)
 
439
            if getattr(self.prev_button, 'set_menu', None) is not None:
 
440
                self.prev_button.set_menu(prev_menu)
343
441
 
344
442
            next_menu = gtk.Menu()
345
443
            if len(children) > 0:
347
445
                for child_id in children:
348
446
                    child = self.branch.repository.get_revision(child_id)
349
447
                    try:
350
 
                        str = ' (' + child.properties['branch-nick'] + ')'
 
448
                        str = ' (%s)' % child.properties['branch-nick']
351
449
                    except KeyError:
352
450
                        str = ""
353
451
 
359
457
                self.next_rev_action.set_sensitive(False)
360
458
                next_menu.hide()
361
459
 
362
 
            self.next_button.set_menu(next_menu)
 
460
            if getattr(self.next_button, 'set_menu', None) is not None:
 
461
                self.next_button.set_menu(next_menu)
363
462
 
364
463
            self.revisionview.set_revision(revision)
365
464
            self.revisionview.set_children(children)
366
 
    
 
465
            self.update_diff_panel(revision, parents)
 
466
 
367
467
    def _tree_revision_activated(self, widget, path, col):
368
468
        # TODO: more than one parent
369
469
        """Callback for when a treeview row gets activated."""
371
471
        parents  = self.treeview.get_parents()
372
472
 
373
473
        if len(parents) == 0:
374
 
            parent_id = None
 
474
            parent_id = NULL_REVISION
375
475
        else:
376
476
            parent_id = parents[0]
377
477
 
378
478
        self.show_diff(revision.revision_id, parent_id)
379
479
        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
480
 
394
481
    def _back_clicked_cb(self, *args):
395
482
        """Callback for when the back button is clicked."""
396
483
        self.treeview.back()
397
 
        
 
484
 
398
485
    def _fwd_clicked_cb(self, *args):
399
486
        """Callback for when the forward button is clicked."""
400
487
        self.treeview.forward()
409
496
        self.show_diff(revid, parentid)
410
497
        self.treeview.grab_focus()
411
498
 
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
499
    def _set_revision_cb(self, w, revision_id):
429
500
        self.treeview.set_revision_id(revision_id)
430
501
 
440
511
        self.treeview.set_property('compact', self.compact_view)
441
512
        self.treeview.refresh()
442
513
 
443
 
    def _tag_revision_cb(self, w):
 
514
    def _branch_index_cb(self, w):
 
515
        from bzrlib.plugins.search import index as _mod_index
 
516
        _mod_index.index_url(self.branch.base)
 
517
 
 
518
    def _branch_search_cb(self, w):
 
519
        from bzrlib.plugins.search import (
 
520
            index as _mod_index,
 
521
            errors as search_errors,
 
522
            )
 
523
        from bzrlib.plugins.gtk.search import SearchDialog
 
524
 
444
525
        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)
 
526
            index = _mod_index.open_index_url(self.branch.base)
 
527
        except search_errors.NoSearchIndex:
 
528
            dialog = gtk.MessageDialog(self, type=gtk.MESSAGE_QUESTION, 
 
529
                buttons=gtk.BUTTONS_OK_CANCEL, 
 
530
                message_format="This branch has not been indexed yet. "
 
531
                               "Index now?")
 
532
            if dialog.run() == gtk.RESPONSE_OK:
 
533
                dialog.destroy()
 
534
                index = _mod_index.index_url(self.branch.base)
 
535
            else:
 
536
                dialog.destroy()
 
537
                return
 
538
 
 
539
        dialog = SearchDialog(index)
 
540
 
 
541
        if dialog.run() == gtk.RESPONSE_OK:
 
542
            self.set_revision(dialog.get_revision())
 
543
 
 
544
        dialog.destroy()
458
545
 
459
546
    def _about_dialog_cb(self, w):
460
547
        from bzrlib.plugins.gtk.about import AboutDialog
461
 
 
462
548
        AboutDialog().run()
463
549
 
464
550
    def _col_visibility_changed(self, col, property):
467
553
 
468
554
    def _toolbar_visibility_changed(self, col):
469
555
        if col.get_active():
470
 
            self.toolbar.show() 
 
556
            self.toolbar.show()
471
557
        else:
472
558
            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()
 
559
        self.config.set_user_option('viz-toolbar-visible', col.get_active())
 
560
 
 
561
    def _vertical_layout(self, col):
 
562
        """Toggle the layout vertical/horizontal"""
 
563
        self.config.set_user_option('viz-vertical', str(col.get_active()))
 
564
 
 
565
        old = self.paned
 
566
        self.vbox.remove(old)
 
567
        self.vbox.pack_start(self.construct_paned(), expand=True, fill=True)
 
568
        self._make_diff_paned_nonzero_size()
 
569
        self._make_diff_nonzero_size()
 
570
 
 
571
        self.treeview.emit('revision-selected')
 
572
 
 
573
    def _make_diff_paned_nonzero_size(self):
 
574
        """make sure the diff/revision pane isn't zero-width or zero-height"""
 
575
        alloc = self.diff_paned.get_allocation()
 
576
        if (alloc.width < 10) or (alloc.height < 10):
 
577
            width, height = self.get_size()
 
578
            self.diff_paned.set_size_request(width/3, int(height / 2.5))
 
579
 
 
580
    def _make_diff_nonzero_size(self):
 
581
        """make sure the diff isn't zero-width or zero-height"""
 
582
        alloc = self.diff.get_allocation()
 
583
        if (alloc.width < 10) or (alloc.height < 10):
 
584
            width, height = self.get_size()
 
585
            self.revisionview.set_size_request(width/3, int(height / 2.5))
 
586
 
 
587
    def _diff_visibility_changed(self, col):
 
588
        """Hide or show the diff panel."""
 
589
        if col.get_active():
 
590
            self.diff.show()
 
591
            self._make_diff_nonzero_size()
 
592
        else:
 
593
            self.diff.hide()
 
594
        self.config.set_user_option('viz-show-diffs', str(col.get_active()))
 
595
        self.update_diff_panel()
 
596
 
 
597
    def _diff_placement_changed(self, col):
 
598
        """Toggle the diff panel's position."""
 
599
        self.config.set_user_option('viz-wide-diffs', str(col.get_active()))
 
600
 
 
601
        old = self.paned.get_child2()
 
602
        self.paned.remove(old)
 
603
        self.paned.pack2(self.construct_bottom(), resize=True, shrink=False)
 
604
        self._make_diff_nonzero_size()
 
605
 
 
606
        self.treeview.emit('revision-selected')
 
607
 
 
608
    def _diff_wrap_changed(self, widget):
 
609
        """Toggle word wrap in the diff widget."""
 
610
        self.config.set_user_option('viz-wrap-diffs', widget.get_active())
 
611
        self.diff._on_wraplines_toggled(widget)
478
612
 
479
613
    def _refresh_clicked(self, w):
480
614
        self.treeview.refresh()
484
618
 
485
619
        if self.branch.supports_tags():
486
620
            tags = self.branch.tags.get_tag_dict().items()
487
 
            tags.sort()
488
 
            tags.reverse()
 
621
            tags.sort(reverse=True)
489
622
            for tag, revid in tags:
490
623
                tag_image = gtk.Image()
491
624
                tag_image.set_from_file(icon_path('tag-16.png'))
492
625
                tag_item = gtk.ImageMenuItem(tag.replace('_', '__'))
493
626
                tag_item.set_image(tag_image)
494
627
                tag_item.connect('activate', self._tag_selected_cb, revid)
 
628
                tag_item.set_sensitive(self.treeview.has_revision_id(revid))
495
629
                menu.add(tag_item)
496
630
            self.go_menu_tags.set_submenu(menu)
497
631
 
501
635
 
502
636
        self.go_menu_tags.show_all()
503
637
 
504
 
    def show_diff(self, revid=None, parentid=None):
 
638
    def _load_size(self, name):
 
639
        """Read and parse 'name' from self.config.
 
640
        The value is a string, formatted as WIDTHxHEIGHT
 
641
        Returns None, or (width, height)
 
642
        """
 
643
        size = self.config.get_user_option(name)
 
644
        if size:
 
645
            width, height = [int(num) for num in size.split('x')]
 
646
            # avoid writing config every time we start
 
647
            return width, height
 
648
        return None
 
649
 
 
650
    def show_diff(self, revid=None, parentid=NULL_REVISION):
505
651
        """Open a new window to show a diff between the given revisions."""
506
652
        from bzrlib.plugins.gtk.diff import DiffWindow
507
653
        window = DiffWindow(parent=self)
508
654
 
509
 
        if parentid is None:
510
 
            parentid = NULL_REVISION
511
 
 
512
655
        rev_tree    = self.branch.repository.revision_tree(revid)
513
656
        parent_tree = self.branch.repository.revision_tree(parentid)
514
657
 
515
 
        description = revid + " - " + self.branch.nick
 
658
        description = revid + " - " + self.branch._get_nick(local=True)
516
659
        window.set_diff(description, rev_tree, parent_tree)
517
660
        window.show()
518
661
 
519
 
 
 
662
    def update_diff_panel(self, revision=None, parents=None):
 
663
        """Show the current revision in the diff panel."""
 
664
        if self.config.get_user_option('viz-show-diffs') != 'True':
 
665
            return
 
666
 
 
667
        if not revision: # default to selected row
 
668
            revision = self.treeview.get_revision()
 
669
        if revision == NULL_REVISION:
 
670
            return
 
671
 
 
672
        if not parents: # default to selected row's parents
 
673
            parents  = self.treeview.get_parents()
 
674
        if len(parents) == 0:
 
675
            parent_id = NULL_REVISION
 
676
        else:
 
677
            parent_id = parents[0]
 
678
 
 
679
        rev_tree    = self.branch.repository.revision_tree(revision.revision_id)
 
680
        parent_tree = self.branch.repository.revision_tree(parent_id)
 
681
 
 
682
        self.diff.set_diff(rev_tree, parent_tree)
 
683
        if self.config.get_user_option('viz-wrap-diffs') == 'True':
 
684
            self.diff._on_wraplines_toggled(wrap=True)
 
685
        self.diff.show_all()