/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-04 07:01:58 UTC
  • mto: This revision was merged to the branch mainline in revision 631.
  • Revision ID: v.ladeuil+lp@free.fr-20090504070158-j5cvke5s82ow4v53
Upgrade COMPATIBLE_BZR_VERSIONS.

* __init__.py: 
(COMPATIBLE_BZR_VERSIONS): Add 1.15.0.

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
21
22
 
22
23
from bzrlib.config import BranchConfig, GlobalConfig
23
24
from bzrlib.revision import Revision, NULL_REVISION
47
48
        self.maxnum      = maxnum
48
49
        self.config      = GlobalConfig()
49
50
 
 
51
        self._sizes      = {} # window and widget sizes
 
52
 
50
53
        if self.config.get_user_option('viz-compact-view') == 'yes':
51
54
            self.compact_view = True
52
55
        else:
54
57
 
55
58
        self.set_title(branch.nick + " - revision history")
56
59
 
57
 
        # Use three-quarters of the screen by default
58
 
        screen = self.get_screen()
59
 
        monitor = screen.get_monitor_geometry(0)
60
 
        width = int(monitor.width * 0.75)
61
 
        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)
62
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')
63
73
 
64
74
        # FIXME AndyFitz!
65
75
        icon = self.render_icon(gtk.STOCK_INDEX, gtk.ICON_SIZE_BUTTON)
103
113
        self.add(vbox)
104
114
 
105
115
        self.paned = gtk.VPaned()
106
 
        self.paned.pack1(self.construct_top(), resize=True, shrink=False)
107
 
        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)
108
118
        self.paned.show()
109
119
 
110
 
        vbox.pack_start(self.construct_menubar(), expand=False, fill=True)
111
 
        vbox.pack_start(self.construct_navigation(), expand=False, fill=True)
112
 
        
 
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
 
113
125
        vbox.pack_start(self.paned, expand=True, fill=True)
114
126
        vbox.set_focus_child(self.paned)
115
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())
116
134
        vbox.show()
117
 
 
 
135
    
118
136
    def construct_menubar(self):
119
137
        menubar = gtk.MenuBar()
120
138
 
136
154
        edit_menuitem = gtk.MenuItem("_Edit")
137
155
        edit_menuitem.set_submenu(edit_menu)
138
156
 
139
 
        edit_menu_find = gtk.ImageMenuItem(gtk.STOCK_FIND)
140
 
 
141
157
        edit_menu_branchopts = gtk.MenuItem("Branch Settings")
142
158
        edit_menu_branchopts.connect('activate', lambda x: PreferencesWindow(self.branch.get_config()).show())
143
159
 
144
160
        edit_menu_globopts = gtk.MenuItem("Global Settings")
145
161
        edit_menu_globopts.connect('activate', lambda x: PreferencesWindow().show())
146
162
 
147
 
        edit_menu.add(edit_menu_find)
148
163
        edit_menu.add(edit_menu_branchopts)
149
164
        edit_menu.add(edit_menu_globopts)
150
165
 
160
175
 
161
176
        view_menu_toolbar = gtk.CheckMenuItem("Show Toolbar")
162
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()
163
181
        view_menu_toolbar.connect('toggled', self._toolbar_visibility_changed)
164
182
 
165
183
        view_menu_compact = gtk.CheckMenuItem("Show Compact Graph")
166
184
        view_menu_compact.set_active(self.compact_view)
167
185
        view_menu_compact.connect('activate', self._brokenlines_toggled_cb)
168
 
 
 
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
                
169
205
        view_menu.add(view_menu_toolbar)
170
206
        view_menu.add(view_menu_compact)
171
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())
172
212
 
173
213
        self.mnu_show_revno_column = gtk.CheckMenuItem("Show Revision _Number Column")
174
214
        self.mnu_show_date_column = gtk.CheckMenuItem("Show _Date Column")
196
236
        tag_image.set_from_file(icon_path("tag-16.png"))
197
237
        self.go_menu_tags = gtk.ImageMenuItem("_Tags")
198
238
        self.go_menu_tags.set_image(tag_image)
199
 
        self._update_tags()
 
239
        self.treeview.connect('refreshed', lambda w: self._update_tags())
200
240
 
201
241
        go_menu.add(go_menu_next)
202
242
        go_menu.add(go_menu_prev)
203
243
        go_menu.add(gtk.SeparatorMenuItem())
204
244
        go_menu.add(self.go_menu_tags)
205
245
 
206
 
        revision_menu = gtk.Menu()
 
246
        self.revision_menu = RevisionMenu(self.branch.repository, [], self.branch, parent=self)
207
247
        revision_menuitem = gtk.MenuItem("_Revision")
208
 
        revision_menuitem.set_submenu(revision_menu)
209
 
 
210
 
        revision_menu_diff = gtk.MenuItem("View Changes")
211
 
        revision_menu_diff.connect('activate', 
212
 
                self._menu_diff_cb)
213
 
        
214
 
        revision_menu_compare = gtk.MenuItem("Compare with...")
215
 
        revision_menu_compare.connect('activate',
216
 
                self._compare_with_cb)
217
 
 
218
 
        revision_menu_tag = gtk.MenuItem("Tag Revision")
219
 
        revision_menu_tag.connect('activate', self._tag_revision_cb)
220
 
 
221
 
        revision_menu.add(revision_menu_tag)
222
 
        revision_menu.add(revision_menu_diff)
223
 
        revision_menu.add(revision_menu_compare)
 
248
        revision_menuitem.set_submenu(self.revision_menu)
224
249
 
225
250
        branch_menu = gtk.Menu()
226
251
        branch_menuitem = gtk.MenuItem("_Branch")
234
259
        except ImportError:
235
260
            mutter("Didn't find search plugin")
236
261
        else:
 
262
            branch_menu.add(gtk.SeparatorMenuItem())
 
263
 
237
264
            branch_index_menuitem = gtk.MenuItem("_Index")
238
265
            branch_index_menuitem.connect('activate', self._branch_index_cb)
239
266
            branch_menu.add(branch_index_menuitem)
240
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
 
241
272
        help_menu = gtk.Menu()
242
273
        help_menuitem = gtk.MenuItem("_Help")
243
274
        help_menuitem.set_submenu(help_menu)
264
295
 
265
296
        self.treeview = TreeView(self.branch, self.start_revs, self.maxnum, self.compact_view)
266
297
 
267
 
        self.treeview.connect('revision-selected',
268
 
                self._treeselection_changed_cb)
269
 
        self.treeview.connect('revision-activated',
270
 
                self._tree_revision_activated)
271
 
 
272
 
        self.treeview.connect('tag-added', lambda w, t, r: self._update_tags())
273
 
 
274
298
        for col in ["revno", "date"]:
275
299
            option = self.config.get_user_option(col + '-column-visible')
276
300
            if option is not None:
283
307
        align = gtk.Alignment(0.0, 0.0, 1.0, 1.0)
284
308
        align.set_padding(5, 0, 0, 0)
285
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')
286
319
        align.show()
287
320
 
288
321
        return align
310
343
 
311
344
    def construct_bottom(self):
312
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
 
313
353
        from bzrlib.plugins.gtk.revisionview import RevisionView
314
354
        self.revisionview = RevisionView(branch=self.branch)
315
 
        (width, height) = self.get_size()
316
 
        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')
317
362
        self.revisionview.show()
318
363
        self.revisionview.set_show_callback(self._show_clicked_cb)
319
364
        self.revisionview.connect('notify::revision', self._go_clicked_cb)
320
365
        self.treeview.connect('tag-added', lambda w, t, r: self.revisionview.update_tags())
321
 
        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
322
377
 
323
378
    def _tag_selected_cb(self, menuitem, revid):
324
379
        self.treeview.set_revision_id(revid)
329
384
        parents  = self.treeview.get_parents()
330
385
        children = self.treeview.get_children()
331
386
 
 
387
        self.revision_menu.set_revision_ids([revision.revision_id])
 
388
 
332
389
        if revision and revision != NULL_REVISION:
333
390
            prev_menu = gtk.Menu()
334
391
            if len(parents) > 0:
373
430
 
374
431
            self.revisionview.set_revision(revision)
375
432
            self.revisionview.set_children(children)
376
 
    
 
433
            self.update_diff_panel(revision, parents)
 
434
 
377
435
    def _tree_revision_activated(self, widget, path, col):
378
436
        # TODO: more than one parent
379
437
        """Callback for when a treeview row gets activated."""
381
439
        parents  = self.treeview.get_parents()
382
440
 
383
441
        if len(parents) == 0:
384
 
            parent_id = None
 
442
            parent_id = NULL_REVISION
385
443
        else:
386
444
            parent_id = parents[0]
387
445
 
388
446
        self.show_diff(revision.revision_id, parent_id)
389
447
        self.treeview.grab_focus()
390
448
        
391
 
    def _menu_diff_cb(self,w):
392
 
        (path, focus) = self.treeview.treeview.get_cursor()
393
 
        revid = self.treeview.model[path][treemodel.REVID]
394
 
        
395
 
        parentids = self.branch.repository.revision_parents(revid)
396
 
 
397
 
        if len(parentids) == 0:
398
 
            parentid = NULL_REVISION
399
 
        else:
400
 
            parentid = parentids[0]
401
 
        
402
 
        self.show_diff(revid,parentid)    
403
 
 
404
449
    def _back_clicked_cb(self, *args):
405
450
        """Callback for when the back button is clicked."""
406
451
        self.treeview.back()
419
464
        self.show_diff(revid, parentid)
420
465
        self.treeview.grab_focus()
421
466
 
422
 
    def _compare_with_cb(self,w):
423
 
        """Callback for revision 'compare with' menu. Will show a small
424
 
            dialog with branch revisions to compare with selected revision in TreeView"""
425
 
        
426
 
        from bzrlib.plugins.gtk.revbrowser import RevisionBrowser
427
 
        
428
 
        rb = RevisionBrowser(self.branch,self)
429
 
        ret = rb.run()
430
 
        
431
 
        if ret == gtk.RESPONSE_OK:          
432
 
            (path, focus) = self.treeview.treeview.get_cursor()
433
 
            revid = self.treeview.model[path][treemodel.REVID]
434
 
            self.show_diff(revid, rb.selected_revid)
435
 
            
436
 
        rb.destroy()
437
 
            
438
467
    def _set_revision_cb(self, w, revision_id):
439
468
        self.treeview.set_revision_id(revision_id)
440
469
 
450
479
        self.treeview.set_property('compact', self.compact_view)
451
480
        self.treeview.refresh()
452
481
 
453
 
    def _tag_revision_cb(self, w):
454
 
        try:
455
 
            self.treeview.set_sensitive(False)
456
 
            dialog = AddTagDialog(self.branch.repository, self.treeview.get_revision().revision_id, self.branch)
457
 
            response = dialog.run()
458
 
            if response != gtk.RESPONSE_NONE:
459
 
                dialog.hide()
460
 
            
461
 
                if response == gtk.RESPONSE_OK:
462
 
                    self.treeview.add_tag(dialog.tagname, dialog._revid)
463
 
                
464
 
                dialog.destroy()
465
 
 
466
 
        finally:
467
 
            self.treeview.set_sensitive(True)
468
 
 
469
482
    def _branch_index_cb(self, w):
470
483
        from bzrlib.plugins.search import index as _mod_index
471
484
        _mod_index.index_url(self.branch.base)
472
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
 
 
491
        try:
 
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()
 
511
 
473
512
    def _about_dialog_cb(self, w):
474
513
        from bzrlib.plugins.gtk.about import AboutDialog
475
514
 
481
520
 
482
521
    def _toolbar_visibility_changed(self, col):
483
522
        if col.get_active():
484
 
            self.toolbar.show() 
 
523
            self.toolbar.show()
485
524
        else:
486
525
            self.toolbar.hide()
487
 
 
 
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
    
488
561
    def _show_about_cb(self, w):
489
562
        dialog = AboutDialog()
490
563
        dialog.connect('response', lambda d,r: d.destroy())
498
571
 
499
572
        if self.branch.supports_tags():
500
573
            tags = self.branch.tags.get_tag_dict().items()
501
 
            tags.sort()
502
 
            tags.reverse()
 
574
            tags.sort(reverse=True)
503
575
            for tag, revid in tags:
504
576
                tag_image = gtk.Image()
505
577
                tag_image.set_from_file(icon_path('tag-16.png'))
506
578
                tag_item = gtk.ImageMenuItem(tag.replace('_', '__'))
507
579
                tag_item.set_image(tag_image)
508
580
                tag_item.connect('activate', self._tag_selected_cb, revid)
 
581
                tag_item.set_sensitive(self.treeview.has_revision_id(revid))
509
582
                menu.add(tag_item)
510
583
            self.go_menu_tags.set_submenu(menu)
511
584
 
515
588
 
516
589
        self.go_menu_tags.show_all()
517
590
 
518
 
    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):
519
620
        """Open a new window to show a diff between the given revisions."""
520
621
        from bzrlib.plugins.gtk.diff import DiffWindow
521
622
        window = DiffWindow(parent=self)
522
623
 
523
 
        if parentid is None:
524
 
            parentid = NULL_REVISION
525
 
 
526
624
        rev_tree    = self.branch.repository.revision_tree(revid)
527
625
        parent_tree = self.branch.repository.revision_tree(parentid)
528
626
 
530
628
        window.set_diff(description, rev_tree, parent_tree)
531
629
        window.show()
532
630
 
533
 
 
 
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()