/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-07-01 21:54:21 UTC
  • mfrom: (523.3.2 trunk)
  • Revision ID: jelmer@samba.org-20080701215421-50g2c59zx9vcn7j5
Share code between context and main revision menu.

Show diffs side-by-side

added added

removed removed

Lines of Context:
viz/branchwin.py
53
53
        else:
54
54
            self.compact_view = False
55
55
 
56
 
        self.set_title(branch._get_nick(local=True) + " - revision history")
 
56
        self.set_title(branch.nick + " - revision history")
57
57
 
58
 
        # user-configured window size
59
 
        size = self._load_size('viz-window-size')
60
 
        if size:
61
 
            width, height = size
62
 
        else:
63
 
            # Use three-quarters of the screen by default
64
 
            screen = self.get_screen()
65
 
            monitor = screen.get_monitor_geometry(0)
66
 
            width = int(monitor.width * 0.75)
67
 
            height = int(monitor.height * 0.75)
 
58
        # Use three-quarters of the screen by default
 
59
        screen = self.get_screen()
 
60
        monitor = screen.get_monitor_geometry(0)
 
61
        width = int(monitor.width * 0.75)
 
62
        height = int(monitor.height * 0.75)
68
63
        self.set_default_size(width, height)
69
 
        self.set_size_request(width/3, height/3)
70
 
        self._save_size_on_destroy(self, 'viz-window-size')
71
64
 
72
65
        # FIXME AndyFitz!
73
66
        icon = self.render_icon(gtk.STOCK_INDEX, gtk.ICON_SIZE_BUTTON)
102
95
 
103
96
        self.construct()
104
97
 
105
 
    def _save_size_on_destroy(self, widget, config_name):
106
 
        """Creates a hook that saves the size of widget to config option 
107
 
           config_name when the window is destroyed/closed."""
108
 
        def save_size(src):
109
 
            width, height = widget.allocation.width, widget.allocation.height
110
 
            value = '%sx%s' % (width, height)
111
 
            self.config.set_user_option(config_name, value)
112
 
        self.connect("destroy", save_size)
113
 
 
114
98
    def set_revision(self, revid):
115
99
        self.treeview.set_revision_id(revid)
116
100
 
120
104
        self.add(vbox)
121
105
 
122
106
        self.paned = gtk.VPaned()
123
 
        self.paned.pack1(self.construct_top(), resize=False, shrink=True)
124
 
        self.paned.pack2(self.construct_bottom(), resize=True, shrink=False)
 
107
        self.paned.pack1(self.construct_top(), resize=True, shrink=False)
 
108
        self.paned.pack2(self.construct_bottom(), resize=False, shrink=True)
125
109
        self.paned.show()
126
110
 
127
 
        nav = self.construct_navigation()
128
 
        menubar = self.construct_menubar()
129
 
        vbox.pack_start(menubar, expand=False, fill=True)
130
 
        vbox.pack_start(nav, expand=False, fill=True)
131
 
 
 
111
        vbox.pack_start(self.construct_menubar(), expand=False, fill=True)
 
112
        vbox.pack_start(self.construct_navigation(), expand=False, fill=True)
 
113
        
132
114
        vbox.pack_start(self.paned, expand=True, fill=True)
133
115
        vbox.set_focus_child(self.paned)
134
116
 
135
 
        self.treeview.connect('revision-selected',
136
 
                self._treeselection_changed_cb)
137
 
        self.treeview.connect('revision-activated',
138
 
                self._tree_revision_activated)
139
 
 
140
 
        self.treeview.connect('tag-added', lambda w, t, r: self._update_tags())
141
117
        vbox.show()
142
 
    
 
118
 
143
119
    def construct_menubar(self):
144
120
        menubar = gtk.MenuBar()
145
121
 
161
137
        edit_menuitem = gtk.MenuItem("_Edit")
162
138
        edit_menuitem.set_submenu(edit_menu)
163
139
 
 
140
        edit_menu_find = gtk.ImageMenuItem(gtk.STOCK_FIND)
 
141
 
164
142
        edit_menu_branchopts = gtk.MenuItem("Branch Settings")
165
143
        edit_menu_branchopts.connect('activate', lambda x: PreferencesWindow(self.branch.get_config()).show())
166
144
 
167
145
        edit_menu_globopts = gtk.MenuItem("Global Settings")
168
146
        edit_menu_globopts.connect('activate', lambda x: PreferencesWindow().show())
169
147
 
 
148
        edit_menu.add(edit_menu_find)
170
149
        edit_menu.add(edit_menu_branchopts)
171
150
        edit_menu.add(edit_menu_globopts)
172
151
 
182
161
 
183
162
        view_menu_toolbar = gtk.CheckMenuItem("Show Toolbar")
184
163
        view_menu_toolbar.set_active(True)
185
 
        if self.config.get_user_option('viz-toolbar-visible') == 'False':
186
 
            view_menu_toolbar.set_active(False)
187
 
            self.toolbar.hide()
188
164
        view_menu_toolbar.connect('toggled', self._toolbar_visibility_changed)
189
165
 
190
166
        view_menu_compact = gtk.CheckMenuItem("Show Compact Graph")
191
167
        view_menu_compact.set_active(self.compact_view)
192
168
        view_menu_compact.connect('activate', self._brokenlines_toggled_cb)
193
 
        
194
 
        view_menu_diffs = gtk.CheckMenuItem("Show Diffs")
195
 
        view_menu_diffs.set_active(False)
196
 
        if self.config.get_user_option('viz-show-diffs') == 'True':
197
 
            view_menu_diffs.set_active(True)
198
 
        view_menu_diffs.connect('toggled', self._diff_visibility_changed)
199
 
        
200
 
        view_menu_wide_diffs = gtk.CheckMenuItem("Wide Diffs")
201
 
        view_menu_wide_diffs.set_active(False)
202
 
        if self.config.get_user_option('viz-wide-diffs') == 'True':
203
 
            view_menu_wide_diffs.set_active(True)
204
 
        view_menu_wide_diffs.connect('toggled', self._diff_placement_changed)
205
 
        
206
 
        view_menu_wrap_diffs = gtk.CheckMenuItem("Wrap _Long Lines in Diffs")
207
 
        view_menu_wrap_diffs.set_active(False)
208
 
        if self.config.get_user_option('viz-wrap-diffs') == 'True':
209
 
            view_menu_wrap_diffs.set_active(True)
210
 
        view_menu_wrap_diffs.connect('toggled', self._diff_wrap_changed)
211
 
                
 
169
 
212
170
        view_menu.add(view_menu_toolbar)
213
171
        view_menu.add(view_menu_compact)
214
172
        view_menu.add(gtk.SeparatorMenuItem())
215
 
        view_menu.add(view_menu_diffs)
216
 
        view_menu.add(view_menu_wide_diffs)
217
 
        view_menu.add(view_menu_wrap_diffs)
218
 
        view_menu.add(gtk.SeparatorMenuItem())
219
173
 
220
174
        self.mnu_show_revno_column = gtk.CheckMenuItem("Show Revision _Number Column")
221
175
        self.mnu_show_date_column = gtk.CheckMenuItem("Show _Date Column")
243
197
        tag_image.set_from_file(icon_path("tag-16.png"))
244
198
        self.go_menu_tags = gtk.ImageMenuItem("_Tags")
245
199
        self.go_menu_tags.set_image(tag_image)
246
 
        self.treeview.connect('refreshed', lambda w: self._update_tags())
 
200
        self._update_tags()
247
201
 
248
202
        go_menu.add(go_menu_next)
249
203
        go_menu.add(go_menu_prev)
302
256
 
303
257
        self.treeview = TreeView(self.branch, self.start_revs, self.maxnum, self.compact_view)
304
258
 
 
259
        self.treeview.connect('revision-selected',
 
260
                self._treeselection_changed_cb)
 
261
        self.treeview.connect('revision-activated',
 
262
                self._tree_revision_activated)
 
263
 
 
264
        self.treeview.connect('tag-added', lambda w, t, r: self._update_tags())
 
265
 
305
266
        for col in ["revno", "date"]:
306
267
            option = self.config.get_user_option(col + '-column-visible')
307
268
            if option is not None:
314
275
        align = gtk.Alignment(0.0, 0.0, 1.0, 1.0)
315
276
        align.set_padding(5, 0, 0, 0)
316
277
        align.add(self.treeview)
317
 
        # user-configured size
318
 
        size = self._load_size('viz-graph-size')
319
 
        if size:
320
 
            width, height = size
321
 
            align.set_size_request(width, height)
322
 
        else:
323
 
            (width, height) = self.get_size()
324
 
            align.set_size_request(width, int(height / 2.5))
325
 
        self._save_size_on_destroy(align, 'viz-graph-size')
326
278
        align.show()
327
279
 
328
280
        return align
350
302
 
351
303
    def construct_bottom(self):
352
304
        """Construct the bottom half of the window."""
353
 
        if self.config.get_user_option('viz-wide-diffs') == 'True':
354
 
            self.diff_paned = gtk.VPaned()
355
 
        else:
356
 
            self.diff_paned = gtk.HPaned()
357
 
        (width, height) = self.get_size()
358
 
        self.diff_paned.set_size_request(20, 20) # shrinkable
359
 
 
360
305
        from bzrlib.plugins.gtk.revisionview import RevisionView
361
306
        self.revisionview = RevisionView(branch=self.branch)
362
 
        self.revisionview.set_size_request(width/3, int(height / 2.5))
363
 
        # user-configured size
364
 
        size = self._load_size('viz-revisionview-size')
365
 
        if size:
366
 
            width, height = size
367
 
            self.revisionview.set_size_request(width, height)
368
 
        self._save_size_on_destroy(self.revisionview, 'viz-revisionview-size')
 
307
        (width, height) = self.get_size()
 
308
        self.revisionview.set_size_request(width, int(height / 2.5))
369
309
        self.revisionview.show()
370
310
        self.revisionview.set_show_callback(self._show_clicked_cb)
371
311
        self.revisionview.connect('notify::revision', self._go_clicked_cb)
372
312
        self.treeview.connect('tag-added', lambda w, t, r: self.revisionview.update_tags())
373
 
        self.diff_paned.pack1(self.revisionview)
374
 
 
375
 
        from bzrlib.plugins.gtk.diff import DiffWidget
376
 
        self.diff = DiffWidget()
377
 
        self.diff_paned.pack2(self.diff)
378
 
 
379
 
        self.diff_paned.show_all()
380
 
        if self.config.get_user_option('viz-show-diffs') != 'True':
381
 
            self.diff.hide()
382
 
 
383
 
        return self.diff_paned
 
313
        return self.revisionview
384
314
 
385
315
    def _tag_selected_cb(self, menuitem, revid):
386
316
        self.treeview.set_revision_id(revid)
437
367
 
438
368
            self.revisionview.set_revision(revision)
439
369
            self.revisionview.set_children(children)
440
 
            self.update_diff_panel(revision, parents)
441
 
 
 
370
    
442
371
    def _tree_revision_activated(self, widget, path, col):
443
372
        # TODO: more than one parent
444
373
        """Callback for when a treeview row gets activated."""
446
375
        parents  = self.treeview.get_parents()
447
376
 
448
377
        if len(parents) == 0:
449
 
            parent_id = NULL_REVISION
 
378
            parent_id = None
450
379
        else:
451
380
            parent_id = parents[0]
452
381
 
491
420
        _mod_index.index_url(self.branch.base)
492
421
 
493
422
    def _branch_search_cb(self, w):
494
 
        from bzrlib.plugins.search import index as _mod_index
495
423
        from bzrlib.plugins.gtk.search import SearchDialog
496
 
        from bzrlib.plugins.search import errors as search_errors
497
 
 
498
 
        try:
499
 
            index = _mod_index.open_index_url(self.branch.base)
500
 
        except search_errors.NoSearchIndex:
501
 
            dialog = gtk.MessageDialog(self, type=gtk.MESSAGE_QUESTION, 
502
 
                buttons=gtk.BUTTONS_OK_CANCEL, 
503
 
                message_format="This branch has not been indexed yet. "
504
 
                               "Index now?")
505
 
            if dialog.run() == gtk.RESPONSE_OK:
506
 
                dialog.destroy()
507
 
                index = _mod_index.index_url(self.branch.base)
508
 
            else:
509
 
                dialog.destroy()
510
 
                return
511
 
 
512
 
        dialog = SearchDialog(index)
 
424
        dialog = SearchDialog(self.branch)
513
425
        
514
426
        if dialog.run() == gtk.RESPONSE_OK:
515
427
            self.set_revision(dialog.get_revision())
527
439
 
528
440
    def _toolbar_visibility_changed(self, col):
529
441
        if col.get_active():
530
 
            self.toolbar.show()
 
442
            self.toolbar.show() 
531
443
        else:
532
444
            self.toolbar.hide()
533
 
        self.config.set_user_option('viz-toolbar-visible', col.get_active())
534
 
 
535
 
    def _make_diff_nonzero_size(self):
536
 
        """make sure the diff isn't zero-width or zero-height"""
537
 
        alloc = self.diff.get_allocation()
538
 
        if (alloc.width < 10) or (alloc.height < 10):
539
 
            width, height = self.get_size()
540
 
            self.revisionview.set_size_request(width/3, int(height / 2.5))
541
 
 
542
 
    def _diff_visibility_changed(self, col):
543
 
        """Hide or show the diff panel."""
544
 
        if col.get_active():
545
 
            self.diff.show()
546
 
            self._make_diff_nonzero_size()
547
 
        else:
548
 
            self.diff.hide()
549
 
        self.config.set_user_option('viz-show-diffs', str(col.get_active()))
550
 
        self.update_diff_panel()
551
 
 
552
 
    def _diff_placement_changed(self, col):
553
 
        """Toggle the diff panel's position."""
554
 
        self.config.set_user_option('viz-wide-diffs', str(col.get_active()))
555
 
 
556
 
        old = self.paned.get_child2()
557
 
        self.paned.remove(old)
558
 
        self.paned.pack2(self.construct_bottom(), resize=True, shrink=False)
559
 
        self._make_diff_nonzero_size()
560
 
 
561
 
        self.treeview.emit('revision-selected')
562
 
    
563
 
    def _diff_wrap_changed(self, widget):
564
 
        """Toggle word wrap in the diff widget."""
565
 
        self.config.set_user_option('viz-wrap-diffs', widget.get_active())
566
 
        self.diff._on_wraplines_toggled(widget)
567
 
    
 
445
 
568
446
    def _show_about_cb(self, w):
569
447
        dialog = AboutDialog()
570
448
        dialog.connect('response', lambda d,r: d.destroy())
578
456
 
579
457
        if self.branch.supports_tags():
580
458
            tags = self.branch.tags.get_tag_dict().items()
581
 
            tags.sort(reverse=True)
 
459
            tags.sort()
 
460
            tags.reverse()
582
461
            for tag, revid in tags:
583
462
                tag_image = gtk.Image()
584
463
                tag_image.set_from_file(icon_path('tag-16.png'))
585
464
                tag_item = gtk.ImageMenuItem(tag.replace('_', '__'))
586
465
                tag_item.set_image(tag_image)
587
466
                tag_item.connect('activate', self._tag_selected_cb, revid)
588
 
                tag_item.set_sensitive(self.treeview.has_revision_id(revid))
589
467
                menu.add(tag_item)
590
468
            self.go_menu_tags.set_submenu(menu)
591
469
 
595
473
 
596
474
        self.go_menu_tags.show_all()
597
475
 
598
 
    def _load_size(self, name):
599
 
        """Read and parse 'name' from self.config.
600
 
        The value is a string, formatted as WIDTHxHEIGHT
601
 
        Returns None, or (width, height)
602
 
        """
603
 
        size = self.config.get_user_option(name)
604
 
        if size:
605
 
            width, height = [int(num) for num in size.split('x')]
606
 
            # avoid writing config every time we start
607
 
            return width, height
608
 
        return None
609
 
 
610
 
    def show_diff(self, revid=None, parentid=NULL_REVISION):
 
476
    def show_diff(self, revid=None, parentid=None):
611
477
        """Open a new window to show a diff between the given revisions."""
612
478
        from bzrlib.plugins.gtk.diff import DiffWindow
613
479
        window = DiffWindow(parent=self)
614
480
 
 
481
        if parentid is None:
 
482
            parentid = NULL_REVISION
 
483
 
615
484
        rev_tree    = self.branch.repository.revision_tree(revid)
616
485
        parent_tree = self.branch.repository.revision_tree(parentid)
617
486
 
618
 
        description = revid + " - " + self.branch._get_nick(local=True)
 
487
        description = revid + " - " + self.branch.nick
619
488
        window.set_diff(description, rev_tree, parent_tree)
620
489
        window.show()
621
490
 
622
 
    def update_diff_panel(self, revision=None, parents=None):
623
 
        """Show the current revision in the diff panel."""
624
 
        if self.config.get_user_option('viz-show-diffs') != 'True':
625
 
            return
626
 
 
627
 
        if not revision: # default to selected row
628
 
            revision = self.treeview.get_revision()
629
 
        if revision == NULL_REVISION:
630
 
            return
631
 
 
632
 
        if not parents: # default to selected row's parents
633
 
            parents  = self.treeview.get_parents()
634
 
        if len(parents) == 0:
635
 
            parent_id = NULL_REVISION
636
 
        else:
637
 
            parent_id = parents[0]
638
 
 
639
 
        rev_tree    = self.branch.repository.revision_tree(revision.revision_id)
640
 
        parent_tree = self.branch.repository.revision_tree(parent_id)
641
 
 
642
 
        self.diff.set_diff(rev_tree, parent_tree)
643
 
        if self.config.get_user_option('viz-wrap-diffs') == 'True':
644
 
            self.diff._on_wraplines_toggled(wrap=True)
645
 
        self.diff.show_all()
 
491