/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 commit.py

  • Committer: Gary van der Merwe
  • Date: 2007-10-22 18:37:19 UTC
  • Revision ID: garyvdm@gmail.com-20071022183719-vjm627ux8meup6yh
Make it possible to view the diff from the commit window when there are pending merges.

Show diffs side-by-side

added added

removed removed

Lines of Context:
commit.py
100
100
            self._vpaned_list = gtk.VPaned()
101
101
            self._scrolledwindow_merges = gtk.ScrolledWindow()
102
102
            self._treeview_merges = gtk.TreeView()
 
103
            self._scrolledwindow_merges.set_policy(gtk.POLICY_AUTOMATIC,
 
104
                                                   gtk.POLICY_AUTOMATIC)
103
105
 
104
106
        # Set callbacks
105
107
        self._button_commit.connect('clicked', self._on_commit_clicked)
115
117
        self._vpaned_main.set_position(200)
116
118
        self._button_commit.set_flags(gtk.CAN_DEFAULT)
117
119
 
118
 
        if self._is_pending:
119
 
            self._scrolledwindow_merges.set_policy(gtk.POLICY_AUTOMATIC,
120
 
                                                   gtk.POLICY_AUTOMATIC)
121
 
            self._treeview_files.set_sensitive(False)
122
 
        
123
120
        # Construct the dialog
124
121
        self.action_area.pack_end(self._button_commit)
125
122
        
320
317
        crt = gtk.CellRendererToggle()
321
318
        crt.set_property("activatable", True)
322
319
        crt.connect("toggled", self._toggle_commit, self._file_store)
323
 
        self._treeview_files.append_column(gtk.TreeViewColumn(_('Commit'),
324
 
                                     crt, active=0))
 
320
        commit_column = gtk.TreeViewColumn(_('Commit'), crt, active=0)
 
321
        if self._is_pending:
 
322
            commit_column.set_visible(False)
 
323
        self._treeview_files.append_column(commit_column)
325
324
        self._treeview_files.append_column(gtk.TreeViewColumn(_('Path'),
326
325
                                     gtk.CellRendererText(), text=1))
327
326
        self._treeview_files.append_column(gtk.TreeViewColumn(_('Type'),