/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: Vincent Ladeuil
  • Date: 2009-05-06 11:51:38 UTC
  • mfrom: (628.1.2 gtk)
  • Revision ID: v.ladeuil+lp@free.fr-20090506115138-7abxvg2qz4gzraup
Upgrade COMPATIBLE_BZR_VERSIONS

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.window import Window
17
16
from bzrlib.plugins.gtk import icon_path
 
17
from bzrlib.plugins.gtk.branchview import TreeView, treemodel
18
18
from bzrlib.plugins.gtk.tags import AddTagDialog
19
19
from bzrlib.plugins.gtk.preferences import PreferencesWindow
20
 
from bzrlib.plugins.gtk.branchview import TreeView, treemodel
 
20
from bzrlib.plugins.gtk.revisionmenu import RevisionMenu
 
21
from bzrlib.plugins.gtk.window import Window
 
22
 
 
23
from bzrlib.config import BranchConfig, GlobalConfig
21
24
from bzrlib.revision import Revision, NULL_REVISION
22
 
from bzrlib.config import BranchConfig
23
 
from bzrlib.config import GlobalConfig
 
25
from bzrlib.trace import mutter
24
26
 
25
27
class BranchWindow(Window):
26
28
    """Branch window.
46
48
        self.maxnum      = maxnum
47
49
        self.config      = GlobalConfig()
48
50
 
 
51
        self._sizes      = {} # window and widget sizes
 
52
 
49
53
        if self.config.get_user_option('viz-compact-view') == 'yes':
50
54
            self.compact_view = True
51
55
        else:
52
56
            self.compact_view = False
53
57
 
54
 
        self.set_title(branch.nick + " - revision history")
 
58
        self.set_title(branch._get_nick(local=True) + " - revision history")
55
59
 
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)
 
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)
61
70
        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')
62
73
 
63
74
        # FIXME AndyFitz!
64
75
        icon = self.render_icon(gtk.STOCK_INDEX, gtk.ICON_SIZE_BUTTON)
102
113
        self.add(vbox)
103
114
 
104
115
        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)
 
116
        self.paned.pack1(self.construct_top(), resize=False, shrink=True)
 
117
        self.paned.pack2(self.construct_bottom(), resize=True, shrink=False)
107
118
        self.paned.show()
108
119
 
109
 
        vbox.pack_start(self.construct_menubar(), expand=False, fill=True)
110
 
        vbox.pack_start(self.construct_navigation(), expand=False, fill=True)
111
 
        
 
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
 
112
125
        vbox.pack_start(self.paned, expand=True, fill=True)
113
126
        vbox.set_focus_child(self.paned)
114
127
 
 
128
        self.treeview.connect('revision-selected',
 
129
                self._treeselection_changed_cb)
 
130
        self.treeview.connect('revision-activated',
 
131
                self._tree_revision_activated)
 
132
 
 
133
        self.treeview.connect('tag-added', lambda w, t, r: self._update_tags())
115
134
        vbox.show()
116
 
 
 
135
    
117
136
    def construct_menubar(self):
118
137
        menubar = gtk.MenuBar()
119
138
 
135
154
        edit_menuitem = gtk.MenuItem("_Edit")
136
155
        edit_menuitem.set_submenu(edit_menu)
137
156
 
138
 
        edit_menu_find = gtk.ImageMenuItem(gtk.STOCK_FIND)
139
 
 
140
157
        edit_menu_branchopts = gtk.MenuItem("Branch Settings")
141
158
        edit_menu_branchopts.connect('activate', lambda x: PreferencesWindow(self.branch.get_config()).show())
142
159
 
143
160
        edit_menu_globopts = gtk.MenuItem("Global Settings")
144
161
        edit_menu_globopts.connect('activate', lambda x: PreferencesWindow().show())
145
162
 
146
 
        edit_menu.add(edit_menu_find)
147
163
        edit_menu.add(edit_menu_branchopts)
148
164
        edit_menu.add(edit_menu_globopts)
149
165
 
159
175
 
160
176
        view_menu_toolbar = gtk.CheckMenuItem("Show Toolbar")
161
177
        view_menu_toolbar.set_active(True)
 
178
        if self.config.get_user_option('viz-toolbar-visible') == 'False':
 
179
            view_menu_toolbar.set_active(False)
 
180
            self.toolbar.hide()
162
181
        view_menu_toolbar.connect('toggled', self._toolbar_visibility_changed)
163
182
 
164
183
        view_menu_compact = gtk.CheckMenuItem("Show Compact Graph")
165
184
        view_menu_compact.set_active(self.compact_view)
166
185
        view_menu_compact.connect('activate', self._brokenlines_toggled_cb)
167
 
 
 
186
        
 
187
        view_menu_diffs = gtk.CheckMenuItem("Show Diffs")
 
188
        view_menu_diffs.set_active(False)
 
189
        if self.config.get_user_option('viz-show-diffs') == 'True':
 
190
            view_menu_diffs.set_active(True)
 
191
        view_menu_diffs.connect('toggled', self._diff_visibility_changed)
 
192
        
 
193
        view_menu_wide_diffs = gtk.CheckMenuItem("Wide Diffs")
 
194
        view_menu_wide_diffs.set_active(False)
 
195
        if self.config.get_user_option('viz-wide-diffs') == 'True':
 
196
            view_menu_wide_diffs.set_active(True)
 
197
        view_menu_wide_diffs.connect('toggled', self._diff_placement_changed)
 
198
        
 
199
        view_menu_wrap_diffs = gtk.CheckMenuItem("Wrap _Long Lines in Diffs")
 
200
        view_menu_wrap_diffs.set_active(False)
 
201
        if self.config.get_user_option('viz-wrap-diffs') == 'True':
 
202
            view_menu_wrap_diffs.set_active(True)
 
203
        view_menu_wrap_diffs.connect('toggled', self._diff_wrap_changed)
 
204
                
168
205
        view_menu.add(view_menu_toolbar)
169
206
        view_menu.add(view_menu_compact)
170
207
        view_menu.add(gtk.SeparatorMenuItem())
 
208
        view_menu.add(view_menu_diffs)
 
209
        view_menu.add(view_menu_wide_diffs)
 
210
        view_menu.add(view_menu_wrap_diffs)
 
211
        view_menu.add(gtk.SeparatorMenuItem())
171
212
 
172
213
        self.mnu_show_revno_column = gtk.CheckMenuItem("Show Revision _Number Column")
173
214
        self.mnu_show_date_column = gtk.CheckMenuItem("Show _Date Column")
195
236
        tag_image.set_from_file(icon_path("tag-16.png"))
196
237
        self.go_menu_tags = gtk.ImageMenuItem("_Tags")
197
238
        self.go_menu_tags.set_image(tag_image)
198
 
        self._update_tags()
 
239
        self.treeview.connect('refreshed', lambda w: self._update_tags())
199
240
 
200
241
        go_menu.add(go_menu_next)
201
242
        go_menu.add(go_menu_prev)
202
243
        go_menu.add(gtk.SeparatorMenuItem())
203
244
        go_menu.add(self.go_menu_tags)
204
245
 
205
 
        revision_menu = gtk.Menu()
 
246
        self.revision_menu = RevisionMenu(self.branch.repository, [], self.branch, parent=self)
206
247
        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)
 
248
        revision_menuitem.set_submenu(self.revision_menu)
223
249
 
224
250
        branch_menu = gtk.Menu()
225
251
        branch_menuitem = gtk.MenuItem("_Branch")
228
254
        branch_menu.add(gtk.MenuItem("Pu_ll Revisions"))
229
255
        branch_menu.add(gtk.MenuItem("Pu_sh Revisions"))
230
256
 
 
257
        try:
 
258
            from bzrlib.plugins import search
 
259
        except ImportError:
 
260
            mutter("Didn't find search plugin")
 
261
        else:
 
262
            branch_menu.add(gtk.SeparatorMenuItem())
 
263
 
 
264
            branch_index_menuitem = gtk.MenuItem("_Index")
 
265
            branch_index_menuitem.connect('activate', self._branch_index_cb)
 
266
            branch_menu.add(branch_index_menuitem)
 
267
 
 
268
            branch_search_menuitem = gtk.MenuItem("_Search")
 
269
            branch_search_menuitem.connect('activate', self._branch_search_cb)
 
270
            branch_menu.add(branch_search_menuitem)
 
271
 
231
272
        help_menu = gtk.Menu()
232
273
        help_menuitem = gtk.MenuItem("_Help")
233
274
        help_menuitem.set_submenu(help_menu)
254
295
 
255
296
        self.treeview = TreeView(self.branch, self.start_revs, self.maxnum, self.compact_view)
256
297
 
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
298
        for col in ["revno", "date"]:
265
299
            option = self.config.get_user_option(col + '-column-visible')
266
300
            if option is not None:
273
307
        align = gtk.Alignment(0.0, 0.0, 1.0, 1.0)
274
308
        align.set_padding(5, 0, 0, 0)
275
309
        align.add(self.treeview)
 
310
        # user-configured size
 
311
        size = self._load_size('viz-graph-size')
 
312
        if size:
 
313
            width, height = size
 
314
            align.set_size_request(width, height)
 
315
        else:
 
316
            (width, height) = self.get_size()
 
317
            align.set_size_request(width, int(height / 2.5))
 
318
        align.connect('size-allocate', self._on_size_allocate, 'viz-graph-size')
276
319
        align.show()
277
320
 
278
321
        return align
300
343
 
301
344
    def construct_bottom(self):
302
345
        """Construct the bottom half of the window."""
 
346
        if self.config.get_user_option('viz-wide-diffs') == 'True':
 
347
            self.diff_paned = gtk.VPaned()
 
348
        else:
 
349
            self.diff_paned = gtk.HPaned()
 
350
        (width, height) = self.get_size()
 
351
        self.diff_paned.set_size_request(20, 20) # shrinkable
 
352
 
303
353
        from bzrlib.plugins.gtk.revisionview import RevisionView
304
354
        self.revisionview = RevisionView(branch=self.branch)
305
 
        (width, height) = self.get_size()
306
 
        self.revisionview.set_size_request(width, int(height / 2.5))
 
355
        self.revisionview.set_size_request(width/3, int(height / 2.5))
 
356
        # user-configured size
 
357
        size = self._load_size('viz-revisionview-size')
 
358
        if size:
 
359
            width, height = size
 
360
            self.revisionview.set_size_request(width, height)
 
361
        self.revisionview.connect('size-allocate', self._on_size_allocate, 'viz-revisionview-size')
307
362
        self.revisionview.show()
308
363
        self.revisionview.set_show_callback(self._show_clicked_cb)
309
364
        self.revisionview.connect('notify::revision', self._go_clicked_cb)
310
365
        self.treeview.connect('tag-added', lambda w, t, r: self.revisionview.update_tags())
311
 
        return self.revisionview
 
366
        self.diff_paned.pack1(self.revisionview)
 
367
 
 
368
        from bzrlib.plugins.gtk.diff import DiffWidget
 
369
        self.diff = DiffWidget()
 
370
        self.diff_paned.pack2(self.diff)
 
371
 
 
372
        self.diff_paned.show_all()
 
373
        if self.config.get_user_option('viz-show-diffs') != 'True':
 
374
            self.diff.hide()
 
375
 
 
376
        return self.diff_paned
312
377
 
313
378
    def _tag_selected_cb(self, menuitem, revid):
314
379
        self.treeview.set_revision_id(revid)
319
384
        parents  = self.treeview.get_parents()
320
385
        children = self.treeview.get_children()
321
386
 
 
387
        self.revision_menu.set_revision_ids([revision.revision_id])
 
388
 
322
389
        if revision and revision != NULL_REVISION:
323
390
            prev_menu = gtk.Menu()
324
391
            if len(parents) > 0:
363
430
 
364
431
            self.revisionview.set_revision(revision)
365
432
            self.revisionview.set_children(children)
366
 
    
 
433
            self.update_diff_panel(revision, parents)
 
434
 
367
435
    def _tree_revision_activated(self, widget, path, col):
368
436
        # TODO: more than one parent
369
437
        """Callback for when a treeview row gets activated."""
371
439
        parents  = self.treeview.get_parents()
372
440
 
373
441
        if len(parents) == 0:
374
 
            parent_id = None
 
442
            parent_id = NULL_REVISION
375
443
        else:
376
444
            parent_id = parents[0]
377
445
 
378
446
        self.show_diff(revision.revision_id, parent_id)
379
447
        self.treeview.grab_focus()
380
448
        
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
 
 
394
449
    def _back_clicked_cb(self, *args):
395
450
        """Callback for when the back button is clicked."""
396
451
        self.treeview.back()
409
464
        self.show_diff(revid, parentid)
410
465
        self.treeview.grab_focus()
411
466
 
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
467
    def _set_revision_cb(self, w, revision_id):
429
468
        self.treeview.set_revision_id(revision_id)
430
469
 
440
479
        self.treeview.set_property('compact', self.compact_view)
441
480
        self.treeview.refresh()
442
481
 
443
 
    def _tag_revision_cb(self, w):
 
482
    def _branch_index_cb(self, w):
 
483
        from bzrlib.plugins.search import index as _mod_index
 
484
        _mod_index.index_url(self.branch.base)
 
485
 
 
486
    def _branch_search_cb(self, w):
 
487
        from bzrlib.plugins.search import index as _mod_index
 
488
        from bzrlib.plugins.gtk.search import SearchDialog
 
489
        from bzrlib.plugins.search import errors as search_errors
 
490
 
444
491
        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)
 
492
            index = _mod_index.open_index_url(self.branch.base)
 
493
        except search_errors.NoSearchIndex:
 
494
            dialog = gtk.MessageDialog(self, type=gtk.MESSAGE_QUESTION, 
 
495
                buttons=gtk.BUTTONS_OK_CANCEL, 
 
496
                message_format="This branch has not been indexed yet. "
 
497
                               "Index now?")
 
498
            if dialog.run() == gtk.RESPONSE_OK:
 
499
                dialog.destroy()
 
500
                index = _mod_index.index_url(self.branch.base)
 
501
            else:
 
502
                dialog.destroy()
 
503
                return
 
504
 
 
505
        dialog = SearchDialog(index)
 
506
        
 
507
        if dialog.run() == gtk.RESPONSE_OK:
 
508
            self.set_revision(dialog.get_revision())
 
509
 
 
510
        dialog.destroy()
458
511
 
459
512
    def _about_dialog_cb(self, w):
460
513
        from bzrlib.plugins.gtk.about import AboutDialog
467
520
 
468
521
    def _toolbar_visibility_changed(self, col):
469
522
        if col.get_active():
470
 
            self.toolbar.show() 
 
523
            self.toolbar.show()
471
524
        else:
472
525
            self.toolbar.hide()
473
 
 
 
526
        self.config.set_user_option('viz-toolbar-visible', col.get_active())
 
527
 
 
528
    def _make_diff_nonzero_size(self):
 
529
        """make sure the diff isn't zero-width or zero-height"""
 
530
        alloc = self.diff.get_allocation()
 
531
        if (alloc.width < 10) or (alloc.height < 10):
 
532
            width, height = self.get_size()
 
533
            self.revisionview.set_size_request(width/3, int(height / 2.5))
 
534
 
 
535
    def _diff_visibility_changed(self, col):
 
536
        """Hide or show the diff panel."""
 
537
        if col.get_active():
 
538
            self.diff.show()
 
539
            self._make_diff_nonzero_size()
 
540
        else:
 
541
            self.diff.hide()
 
542
        self.config.set_user_option('viz-show-diffs', str(col.get_active()))
 
543
        self.update_diff_panel()
 
544
 
 
545
    def _diff_placement_changed(self, col):
 
546
        """Toggle the diff panel's position."""
 
547
        self.config.set_user_option('viz-wide-diffs', str(col.get_active()))
 
548
 
 
549
        old = self.paned.get_child2()
 
550
        self.paned.remove(old)
 
551
        self.paned.pack2(self.construct_bottom(), resize=True, shrink=False)
 
552
        self._make_diff_nonzero_size()
 
553
 
 
554
        self.treeview.emit('revision-selected')
 
555
    
 
556
    def _diff_wrap_changed(self, widget):
 
557
        """Toggle word wrap in the diff widget."""
 
558
        self.config.set_user_option('viz-wrap-diffs', widget.get_active())
 
559
        self.diff._on_wraplines_toggled(widget)
 
560
    
474
561
    def _show_about_cb(self, w):
475
562
        dialog = AboutDialog()
476
563
        dialog.connect('response', lambda d,r: d.destroy())
484
571
 
485
572
        if self.branch.supports_tags():
486
573
            tags = self.branch.tags.get_tag_dict().items()
487
 
            tags.sort()
488
 
            tags.reverse()
 
574
            tags.sort(reverse=True)
489
575
            for tag, revid in tags:
490
576
                tag_image = gtk.Image()
491
577
                tag_image.set_from_file(icon_path('tag-16.png'))
492
578
                tag_item = gtk.ImageMenuItem(tag.replace('_', '__'))
493
579
                tag_item.set_image(tag_image)
494
580
                tag_item.connect('activate', self._tag_selected_cb, revid)
 
581
                tag_item.set_sensitive(self.treeview.has_revision_id(revid))
495
582
                menu.add(tag_item)
496
583
            self.go_menu_tags.set_submenu(menu)
497
584
 
501
588
 
502
589
        self.go_menu_tags.show_all()
503
590
 
504
 
    def show_diff(self, revid=None, parentid=None):
 
591
    def _load_size(self, name):
 
592
        """Read and parse 'name' from self.config.
 
593
        The value is a string, formatted as WIDTHxHEIGHT
 
594
        Returns None, or (width, height)
 
595
        """
 
596
        size = self.config.get_user_option(name)
 
597
        if size:
 
598
            width, height = [int(num) for num in size.split('x')]
 
599
            # avoid writing config every time we start
 
600
            self._sizes[name] = (width, height)
 
601
            return width, height
 
602
        return None
 
603
 
 
604
    def _on_size_allocate(self, widget, allocation, name):
 
605
        """When window has been resized, save the new size."""
 
606
        width, height = 0, 0
 
607
        if name in self._sizes:
 
608
            width, height = self._sizes[name]
 
609
 
 
610
        size_changed = (width != allocation.width) or \
 
611
                (height != allocation.height)
 
612
 
 
613
        if size_changed:
 
614
            width, height = allocation.width, allocation.height
 
615
            self._sizes[name] = (width, height)
 
616
            value = '%sx%s' % (width, height)
 
617
            self.config.set_user_option(name, value)
 
618
 
 
619
    def show_diff(self, revid=None, parentid=NULL_REVISION):
505
620
        """Open a new window to show a diff between the given revisions."""
506
621
        from bzrlib.plugins.gtk.diff import DiffWindow
507
622
        window = DiffWindow(parent=self)
508
623
 
509
 
        if parentid is None:
510
 
            parentid = NULL_REVISION
511
 
 
512
624
        rev_tree    = self.branch.repository.revision_tree(revid)
513
625
        parent_tree = self.branch.repository.revision_tree(parentid)
514
626
 
515
 
        description = revid + " - " + self.branch.nick
 
627
        description = revid + " - " + self.branch._get_nick(local=True)
516
628
        window.set_diff(description, rev_tree, parent_tree)
517
629
        window.show()
518
630
 
519
 
 
 
631
    def update_diff_panel(self, revision=None, parents=None):
 
632
        """Show the current revision in the diff panel."""
 
633
        if self.config.get_user_option('viz-show-diffs') != 'True':
 
634
            return
 
635
 
 
636
        if not revision: # default to selected row
 
637
            revision = self.treeview.get_revision()
 
638
        if revision == NULL_REVISION:
 
639
            return
 
640
 
 
641
        if not parents: # default to selected row's parents
 
642
            parents  = self.treeview.get_parents()
 
643
        if len(parents) == 0:
 
644
            parent_id = NULL_REVISION
 
645
        else:
 
646
            parent_id = parents[0]
 
647
 
 
648
        rev_tree    = self.branch.repository.revision_tree(revision.revision_id)
 
649
        parent_tree = self.branch.repository.revision_tree(parent_id)
 
650
 
 
651
        self.diff.set_diff(rev_tree, parent_tree)
 
652
        if self.config.get_user_option('viz-wrap-diffs') == 'True':
 
653
            self.diff._on_wraplines_toggled(wrap=True)
 
654
        self.diff.show_all()