/b-gtk/fix-viz

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/b-gtk/fix-viz

« back to all changes in this revision

Viewing changes to viz/branchwin.py

  • Committer: Jelmer Vernooij
  • Date: 2008-10-30 13:48:44 UTC
  • Revision ID: jelmer@samba.org-20081030134844-8aayszl9iefcxt1x
Merge trunk, add cia/email fields.

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:
53
57
 
54
58
        self.set_title(branch.nick + " - 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
 
115
128
        vbox.show()
116
 
 
 
129
    
117
130
    def construct_menubar(self):
118
131
        menubar = gtk.MenuBar()
119
132
 
135
148
        edit_menuitem = gtk.MenuItem("_Edit")
136
149
        edit_menuitem.set_submenu(edit_menu)
137
150
 
138
 
        edit_menu_find = gtk.ImageMenuItem(gtk.STOCK_FIND)
139
 
 
140
151
        edit_menu_branchopts = gtk.MenuItem("Branch Settings")
141
152
        edit_menu_branchopts.connect('activate', lambda x: PreferencesWindow(self.branch.get_config()).show())
142
153
 
143
154
        edit_menu_globopts = gtk.MenuItem("Global Settings")
144
155
        edit_menu_globopts.connect('activate', lambda x: PreferencesWindow().show())
145
156
 
146
 
        edit_menu.add(edit_menu_find)
147
157
        edit_menu.add(edit_menu_branchopts)
148
158
        edit_menu.add(edit_menu_globopts)
149
159
 
159
169
 
160
170
        view_menu_toolbar = gtk.CheckMenuItem("Show Toolbar")
161
171
        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()
162
175
        view_menu_toolbar.connect('toggled', self._toolbar_visibility_changed)
163
176
 
164
177
        view_menu_compact = gtk.CheckMenuItem("Show Compact Graph")
165
178
        view_menu_compact.set_active(self.compact_view)
166
179
        view_menu_compact.connect('activate', self._brokenlines_toggled_cb)
167
 
 
 
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
                
168
199
        view_menu.add(view_menu_toolbar)
169
200
        view_menu.add(view_menu_compact)
170
201
        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())
171
206
 
172
207
        self.mnu_show_revno_column = gtk.CheckMenuItem("Show Revision _Number Column")
173
208
        self.mnu_show_date_column = gtk.CheckMenuItem("Show _Date Column")
195
230
        tag_image.set_from_file(icon_path("tag-16.png"))
196
231
        self.go_menu_tags = gtk.ImageMenuItem("_Tags")
197
232
        self.go_menu_tags.set_image(tag_image)
198
 
        self._update_tags()
 
233
        self.treeview.connect('refreshed', lambda w: self._update_tags())
199
234
 
200
235
        go_menu.add(go_menu_next)
201
236
        go_menu.add(go_menu_prev)
202
237
        go_menu.add(gtk.SeparatorMenuItem())
203
238
        go_menu.add(self.go_menu_tags)
204
239
 
205
 
        revision_menu = gtk.Menu()
 
240
        self.revision_menu = RevisionMenu(self.branch.repository, [], self.branch, parent=self)
206
241
        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)
 
242
        revision_menuitem.set_submenu(self.revision_menu)
223
243
 
224
244
        branch_menu = gtk.Menu()
225
245
        branch_menuitem = gtk.MenuItem("_Branch")
228
248
        branch_menu.add(gtk.MenuItem("Pu_ll Revisions"))
229
249
        branch_menu.add(gtk.MenuItem("Pu_sh Revisions"))
230
250
 
 
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
 
231
266
        help_menu = gtk.Menu()
232
267
        help_menuitem = gtk.MenuItem("_Help")
233
268
        help_menuitem.set_submenu(help_menu)
273
308
        align = gtk.Alignment(0.0, 0.0, 1.0, 1.0)
274
309
        align.set_padding(5, 0, 0, 0)
275
310
        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')
276
320
        align.show()
277
321
 
278
322
        return align
300
344
 
301
345
    def construct_bottom(self):
302
346
        """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
 
303
354
        from bzrlib.plugins.gtk.revisionview import RevisionView
304
355
        self.revisionview = RevisionView(branch=self.branch)
305
 
        (width, height) = self.get_size()
306
 
        self.revisionview.set_size_request(width, int(height / 2.5))
 
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')
307
363
        self.revisionview.show()
308
364
        self.revisionview.set_show_callback(self._show_clicked_cb)
309
365
        self.revisionview.connect('notify::revision', self._go_clicked_cb)
310
366
        self.treeview.connect('tag-added', lambda w, t, r: self.revisionview.update_tags())
311
 
        return self.revisionview
 
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
312
378
 
313
379
    def _tag_selected_cb(self, menuitem, revid):
314
380
        self.treeview.set_revision_id(revid)
319
385
        parents  = self.treeview.get_parents()
320
386
        children = self.treeview.get_children()
321
387
 
 
388
        self.revision_menu.set_revision_ids([revision.revision_id])
 
389
 
322
390
        if revision and revision != NULL_REVISION:
323
391
            prev_menu = gtk.Menu()
324
392
            if len(parents) > 0:
363
431
 
364
432
            self.revisionview.set_revision(revision)
365
433
            self.revisionview.set_children(children)
366
 
    
 
434
            self.update_diff_panel(revision, parents)
 
435
 
367
436
    def _tree_revision_activated(self, widget, path, col):
368
437
        # TODO: more than one parent
369
438
        """Callback for when a treeview row gets activated."""
378
447
        self.show_diff(revision.revision_id, parent_id)
379
448
        self.treeview.grab_focus()
380
449
        
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
450
    def _back_clicked_cb(self, *args):
395
451
        """Callback for when the back button is clicked."""
396
452
        self.treeview.back()
409
465
        self.show_diff(revid, parentid)
410
466
        self.treeview.grab_focus()
411
467
 
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
468
    def _set_revision_cb(self, w, revision_id):
429
469
        self.treeview.set_revision_id(revision_id)
430
470
 
440
480
        self.treeview.set_property('compact', self.compact_view)
441
481
        self.treeview.refresh()
442
482
 
443
 
    def _tag_revision_cb(self, w):
 
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
 
444
492
        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)
 
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()
458
512
 
459
513
    def _about_dialog_cb(self, w):
460
514
        from bzrlib.plugins.gtk.about import AboutDialog
467
521
 
468
522
    def _toolbar_visibility_changed(self, col):
469
523
        if col.get_active():
470
 
            self.toolbar.show() 
 
524
            self.toolbar.show()
471
525
        else:
472
526
            self.toolbar.hide()
473
 
 
 
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
    
474
562
    def _show_about_cb(self, w):
475
563
        dialog = AboutDialog()
476
564
        dialog.connect('response', lambda d,r: d.destroy())
484
572
 
485
573
        if self.branch.supports_tags():
486
574
            tags = self.branch.tags.get_tag_dict().items()
487
 
            tags.sort()
488
 
            tags.reverse()
 
575
            tags.sort(reverse=True)
489
576
            for tag, revid in tags:
490
577
                tag_image = gtk.Image()
491
578
                tag_image.set_from_file(icon_path('tag-16.png'))
492
579
                tag_item = gtk.ImageMenuItem(tag.replace('_', '__'))
493
580
                tag_item.set_image(tag_image)
494
581
                tag_item.connect('activate', self._tag_selected_cb, revid)
 
582
                tag_item.set_sensitive(self.treeview.has_revision_id(revid))
495
583
                menu.add(tag_item)
496
584
            self.go_menu_tags.set_submenu(menu)
497
585
 
501
589
 
502
590
        self.go_menu_tags.show_all()
503
591
 
 
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
 
504
620
    def show_diff(self, revid=None, parentid=None):
505
621
        """Open a new window to show a diff between the given revisions."""
506
622
        from bzrlib.plugins.gtk.diff import DiffWindow
516
632
        window.set_diff(description, rev_tree, parent_tree)
517
633
        window.show()
518
634
 
519
 
 
 
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()