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

  • Committer: Alexander Belchenko
  • Date: 2006-11-15 13:33:35 UTC
  • mto: (66.2.10 trunk)
  • mto: This revision was merged to the branch mainline in revision 118.
  • Revision ID: bialix@ukr.net-20061115133335-f8445eaf6c82f3f3
If there is no pending merge on commit then don't show empty pending merge part in commit dialog.

(It's just waste screen space)

Show diffs side-by-side

added added

removed removed

Lines of Context:
olive/commit.py
148
148
            self.file_store.append([ True, path+marker, _('modified'), path ])
149
149
    
150
150
    def _create_pending_merges(self):
 
151
        if not self.pending:
 
152
            # hide unused pending merge part
 
153
            scrolled_window = self.glade.get_widget('scrolledwindow_commit_pending')
 
154
            parent = scrolled_window.get_parent()
 
155
            parent.remove(scrolled_window)
 
156
            parent = self.pending_label.get_parent()
 
157
            parent.remove(self.pending_label)
 
158
            return
 
159
        
151
160
        liststore = gtk.ListStore(gobject.TYPE_STRING,
152
161
                                  gobject.TYPE_STRING,
153
162
                                  gobject.TYPE_STRING)
160
169
        self.pending_view.append_column(gtk.TreeViewColumn(_('Summary'),
161
170
                                        gtk.CellRendererText(), text=2))
162
171
        
163
 
        if not self.pending:
164
 
            return
165
 
        
166
172
        for item in self.pending:
167
173
            liststore.append([ item['date'],
168
174
                               item['committer'],