/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 13:32:06 UTC
  • mfrom: (555.2.2 wrapped-diffs)
  • Revision ID: colbrac@xs4all.nl-20080725133206-ozuyp2mukoze4kmr
Merge addition of word wrap control to gdiff and visualise windows

Show diffs side-by-side

added added

removed removed

Lines of Context:
viz/branchwin.py
57
57
 
58
58
        self.set_title(branch.nick + " - revision history")
59
59
 
60
 
        # Use three-quarters of the screen by default
61
 
        screen = self.get_screen()
62
 
        monitor = screen.get_monitor_geometry(0)
63
 
        width = int(monitor.width * 0.75)
64
 
        height = int(monitor.height * 0.75)
65
60
        # user-configured window size
66
61
        size = self._load_size('viz-window-size')
67
62
        if size:
68
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)
69
70
        self.set_default_size(width, height)
70
71
        self.set_size_request(width/3, height/3)
71
72
        self.connect("size-allocate", self._on_size_allocate, 'viz-window-size')
125
126
        vbox.set_focus_child(self.paned)
126
127
 
127
128
        vbox.show()
128
 
 
 
129
    
129
130
    def construct_menubar(self):
130
131
        menubar = gtk.MenuBar()
131
132
 
176
177
        view_menu_compact = gtk.CheckMenuItem("Show Compact Graph")
177
178
        view_menu_compact.set_active(self.compact_view)
178
179
        view_menu_compact.connect('activate', self._brokenlines_toggled_cb)
179
 
 
 
180
        
180
181
        view_menu_diffs = gtk.CheckMenuItem("Show Diffs")
181
182
        view_menu_diffs.set_active(False)
182
183
        if self.config.get_user_option('viz-show-diffs') == 'True':
183
184
            view_menu_diffs.set_active(True)
184
185
        view_menu_diffs.connect('toggled', self._diff_visibility_changed)
185
 
 
 
186
        
186
187
        view_menu_wide_diffs = gtk.CheckMenuItem("Wide Diffs")
187
188
        view_menu_wide_diffs.set_active(False)
188
189
        if self.config.get_user_option('viz-wide-diffs') == 'True':
189
190
            view_menu_wide_diffs.set_active(True)
190
191
        view_menu_wide_diffs.connect('toggled', self._diff_placement_changed)
191
 
 
 
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
                
192
199
        view_menu.add(view_menu_toolbar)
193
200
        view_menu.add(view_menu_compact)
 
201
        view_menu.add(gtk.SeparatorMenuItem())
194
202
        view_menu.add(view_menu_diffs)
195
203
        view_menu.add(view_menu_wide_diffs)
 
204
        view_menu.add(view_menu_wrap_diffs)
196
205
        view_menu.add(gtk.SeparatorMenuItem())
197
206
 
198
207
        self.mnu_show_revno_column = gtk.CheckMenuItem("Show Revision _Number Column")
422
431
 
423
432
            self.revisionview.set_revision(revision)
424
433
            self.revisionview.set_children(children)
425
 
 
426
434
            self.update_diff_panel(revision, parents)
427
435
 
428
436
    def _tree_revision_activated(self, widget, path, col):
545
553
        self._make_diff_nonzero_size()
546
554
 
547
555
        self.treeview.emit('revision-selected')
548
 
 
 
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
    
549
562
    def _show_about_cb(self, w):
550
563
        dialog = AboutDialog()
551
564
        dialog.connect('response', lambda d,r: d.destroy())
640
653
        parent_tree = self.branch.repository.revision_tree(parent_id)
641
654
 
642
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)
643
658
        self.diff.show_all()