/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: Jasper Groenewegen
  • Date: 2008-07-25 08:04:02 UTC
  • mto: This revision was merged to the branch mainline in revision 571.
  • Revision ID: colbrac@xs4all.nl-20080725080402-kng97ln26np9jfx6
Change from checkbox to menu item in bzr vis, add menu bar + item in gdiff

Show diffs side-by-side

added added

removed removed

Lines of Context:
viz/branchwin.py
126
126
        vbox.set_focus_child(self.paned)
127
127
 
128
128
        vbox.show()
129
 
 
 
129
    
130
130
    def construct_menubar(self):
131
131
        menubar = gtk.MenuBar()
132
132
 
177
177
        view_menu_compact = gtk.CheckMenuItem("Show Compact Graph")
178
178
        view_menu_compact.set_active(self.compact_view)
179
179
        view_menu_compact.connect('activate', self._brokenlines_toggled_cb)
180
 
 
 
180
        
181
181
        view_menu_diffs = gtk.CheckMenuItem("Show Diffs")
182
182
        view_menu_diffs.set_active(False)
183
183
        if self.config.get_user_option('viz-show-diffs') == 'True':
184
184
            view_menu_diffs.set_active(True)
185
185
        view_menu_diffs.connect('toggled', self._diff_visibility_changed)
186
 
 
 
186
        
187
187
        view_menu_wide_diffs = gtk.CheckMenuItem("Wide Diffs")
188
188
        view_menu_wide_diffs.set_active(False)
189
189
        if self.config.get_user_option('viz-wide-diffs') == 'True':
190
190
            view_menu_wide_diffs.set_active(True)
191
191
        view_menu_wide_diffs.connect('toggled', self._diff_placement_changed)
192
 
 
 
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
                
193
199
        view_menu.add(view_menu_toolbar)
194
200
        view_menu.add(view_menu_compact)
 
201
        view_menu.add(gtk.SeparatorMenuItem())
195
202
        view_menu.add(view_menu_diffs)
196
203
        view_menu.add(view_menu_wide_diffs)
 
204
        view_menu.add(view_menu_wrap_diffs)
197
205
        view_menu.add(gtk.SeparatorMenuItem())
198
206
 
199
207
        self.mnu_show_revno_column = gtk.CheckMenuItem("Show Revision _Number Column")
423
431
 
424
432
            self.revisionview.set_revision(revision)
425
433
            self.revisionview.set_children(children)
426
 
 
427
434
            self.update_diff_panel(revision, parents)
428
435
 
429
436
    def _tree_revision_activated(self, widget, path, col):
546
553
        self._make_diff_nonzero_size()
547
554
 
548
555
        self.treeview.emit('revision-selected')
549
 
 
 
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
    
550
562
    def _show_about_cb(self, w):
551
563
        dialog = AboutDialog()
552
564
        dialog.connect('response', lambda d,r: d.destroy())
641
653
        parent_tree = self.branch.repository.revision_tree(parent_id)
642
654
 
643
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)
644
658
        self.diff.show_all()