← Back to branch summary

~mcfletch/eric/update-to-4.5.13

« back to all changes in this revision

Viewing changes to eric/Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py

* New upstream release
* Bump standards version to 3.9.3
* Add manpage eric4_iconeditor.1
* Rename all man pages from eric4-* to eric4_* and
  edit them to reflect the changes
* Add an override file to suppress the warning about the
  empty directory /usr/share/eric/api

Show diffs side-by-side

added added

removed removed

Lines of Context:
eric/Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py
223
223
           self.currentChangelist == "":
224
224
            return
225
225
        
 
226
        if revision == "":
 
227
            rev = ""
 
228
        else:
 
229
            rev = int(revision)
 
230
        if change == "":
 
231
            chg = ""
 
232
        else:
 
233
            chg = int(change)
226
234
        statusText = self.status[status]
227
 
        itm = QTreeWidgetItem(self.statusList, 
228
 
            QStringList() \
229
 
            << "" \
230
 
            << self.currentChangelist \
231
 
            << statusText \
232
 
            << self.propStatus[propStatus] \
233
 
            << self.locked[locked] \
234
 
            << self.history[history] \
235
 
            << self.switched[switched] \
236
 
            << self.lockinfo[lockinfo] \
237
 
            << self.uptodate[uptodate] \
238
 
            << "%7s" % str(revision) \
239
 
            << "%7s" % str(change) \
240
 
            << author \
241
 
            << path
242
 
        )
 
235
        
 
236
        itm = QTreeWidgetItem(self.statusList)
 
237
        itm.setData(0, Qt.DisplayRole, "")
 
238
        itm.setData(1, Qt.DisplayRole, self.currentChangelist)
 
239
        itm.setData(2, Qt.DisplayRole, statusText)
 
240
        itm.setData(3, Qt.DisplayRole, self.propStatus[propStatus])
 
241
        itm.setData(4, Qt.DisplayRole, self.locked[locked])
 
242
        itm.setData(5, Qt.DisplayRole, self.history[history])
 
243
        itm.setData(6, Qt.DisplayRole, self.switched[switched])
 
244
        itm.setData(7, Qt.DisplayRole, self.lockinfo[lockinfo])
 
245
        itm.setData(8, Qt.DisplayRole, self.uptodate[uptodate])
 
246
        itm.setData(9, Qt.DisplayRole, rev)
 
247
        itm.setData(10, Qt.DisplayRole, chg)
 
248
        itm.setData(11, Qt.DisplayRole, author)
 
249
        itm.setData(12, Qt.DisplayRole, path)
243
250
        
244
251
        itm.setTextAlignment(1, Qt.AlignLeft)
245
252
        itm.setTextAlignment(2, Qt.AlignHCenter)
354
361
        procStarted = self.process.waitForStarted()
355
362
        if not procStarted:
356
363
            self.inputGroup.setEnabled(False)
 
364
            self.inputGroup.hide()
357
365
            KQMessageBox.critical(None,
358
366
                self.trUtf8('Process Generation Error'),
359
367
                self.trUtf8(
362
370
                ).arg('svn'))
363
371
        else:
364
372
            self.inputGroup.setEnabled(True)
 
373
            self.inputGroup.show()
365
374
        
366
375
    def __finish(self):
367
376
        """
376
385
        self.buttonBox.button(QDialogButtonBox.Close).setEnabled(True)
377
386
        self.buttonBox.button(QDialogButtonBox.Cancel).setEnabled(False)
378
387
        self.buttonBox.button(QDialogButtonBox.Close).setDefault(True)
 
388
        self.buttonBox.button(QDialogButtonBox.Close).setFocus(Qt.OtherFocusReason)
379
389
        
380
390
        self.inputGroup.setEnabled(False)
 
391
        self.inputGroup.hide()
381
392
        self.refreshButton.setEnabled(True)
382
393
        
383
394
        self.__statusFilters.sort()
536
547
        self.buttonBox.button(QDialogButtonBox.Cancel).setDefault(True)
537
548
        
538
549
        self.inputGroup.setEnabled(True)
 
550
        self.inputGroup.show()
539
551
        self.refreshButton.setEnabled(False)
540
552
        
541
553
        self.statusList.clear()