/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-22 19:46:47 UTC
  • mfrom: (560.2.1 LP151818-no-push-Q)
  • Revision ID: colbrac@xs4all.nl-20080722194647-25sbnnkj9wdt2v00
Merge removal of question to set default push location

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