Mercurial Repositories > eric / changeset
changeset
Some little enhancements to the Subversion interface.
Sat, 31 Mar 2012 15:08:26 +0200
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Sat, 31 Mar 2012 15:08:26 +0200
- changeset 1746
- 6c74208f22a2
- parent 1743
- 4f9afcd8eb9d
- child 1747
- cfd59f4b4851
Some little enhancements to the Subversion interface.
--- a/Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py Sat Mar 31 12:08:28 2012 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py Sat Mar 31 15:08:26 2012 +0200 @@ -187,6 +187,7 @@ if not procStarted: QApplication.restoreOverrideCursor() self.inputGroup.setEnabled(False) + self.inputGroup.hide() E5MessageBox.critical(self, self.trUtf8('Process Generation Error'), self.trUtf8(
--- a/Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py Sat Mar 31 12:08:28 2012 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py Sat Mar 31 15:08:26 2012 +0200 @@ -180,6 +180,7 @@ procStarted = self.process.waitForStarted() if not procStarted: self.inputGroup.setEnabled(False) + self.inputGroup.hide() E5MessageBox.critical(self, self.trUtf8('Process Generation Error'), self.trUtf8(
--- a/Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.py Sat Mar 31 12:08:28 2012 +0200 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.py Sat Mar 31 15:08:26 2012 +0200 @@ -95,6 +95,7 @@ procStarted = self.process.waitForStarted() if not procStarted: self.inputGroup.setEnabled(False) + self.inputGroup.hide() E5MessageBox.critical(self, self.trUtf8('Process Generation Error'), self.trUtf8( @@ -103,6 +104,7 @@ ).format('svn')) else: self.inputGroup.setEnabled(True) + self.inputGroup.show() def __finish(self): """ @@ -117,8 +119,10 @@ self.buttonBox.button(QDialogButtonBox.Close).setEnabled(True) self.buttonBox.button(QDialogButtonBox.Cancel).setEnabled(False) self.buttonBox.button(QDialogButtonBox.Close).setDefault(True) + self.buttonBox.button(QDialogButtonBox.Close).setFocus(Qt.OtherFocusReason) self.inputGroup.setEnabled(False) + self.inputGroup.hide() self.process = None
--- a/Plugins/VcsPlugins/vcsSubversion/SvnDialog.py Sat Mar 31 12:08:28 2012 +0200 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnDialog.py Sat Mar 31 15:08:26 2012 +0200 @@ -9,7 +9,7 @@ import os -from PyQt4.QtCore import QTimer, QProcess, pyqtSlot +from PyQt4.QtCore import QTimer, QProcess, pyqtSlot, Qt from PyQt4.QtGui import QLineEdit, QDialog, QDialogButtonBox from E5Gui import E5MessageBox @@ -61,9 +61,15 @@ self.buttonBox.button(QDialogButtonBox.Close).setDefault(True) self.inputGroup.setEnabled(False) + self.inputGroup.hide() self.proc = None + self.buttonBox.button(QDialogButtonBox.Close).setEnabled(True) + self.buttonBox.button(QDialogButtonBox.Cancel).setEnabled(False) + self.buttonBox.button(QDialogButtonBox.Close).setDefault(True) + self.buttonBox.button(QDialogButtonBox.Close).setFocus(Qt.OtherFocusReason) + if Preferences.getVCS("AutoClose") and \ self.normal and \ self.errors.toPlainText() == "": @@ -130,6 +136,7 @@ if not procStarted: self.buttonBox.setFocus() self.inputGroup.setEnabled(False) + self.inputGroup.hide() E5MessageBox.critical(self, self.trUtf8('Process Generation Error'), self.trUtf8( @@ -138,6 +145,7 @@ ).format('svn')) else: self.inputGroup.setEnabled(True) + self.inputGroup.show() return procStarted def normalExit(self):
--- a/Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py Sat Mar 31 12:08:28 2012 +0200 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py Sat Mar 31 15:08:26 2012 +0200 @@ -9,7 +9,7 @@ import os -from PyQt4.QtCore import QTimer, QFileInfo, QProcess, pyqtSlot +from PyQt4.QtCore import QTimer, QFileInfo, QProcess, pyqtSlot, Qt from PyQt4.QtGui import QWidget, QColor, QLineEdit, QBrush, QTextCursor, QDialogButtonBox from E5Gui.E5Application import e5App @@ -95,6 +95,7 @@ (only valid for URL diffs) (boolean) """ self.errorGroup.hide() + self.inputGroup.show() self.intercept = False self.filename = fn @@ -169,6 +170,7 @@ procStarted = self.process.waitForStarted() if not procStarted: self.inputGroup.setEnabled(False) + self.inputGroup.hide() E5MessageBox.critical(self, self.trUtf8('Process Generation Error'), self.trUtf8( @@ -184,6 +186,7 @@ @param exitStatus exit status of the process (QProcess.ExitStatus) """ self.inputGroup.setEnabled(False) + self.inputGroup.hide() if self.paras == 0: self.contents.insertPlainText( @@ -191,6 +194,9 @@ return self.buttonBox.button(QDialogButtonBox.Save).setEnabled(True) + self.buttonBox.button(QDialogButtonBox.Close).setDefault(True) + self.buttonBox.button(QDialogButtonBox.Close).setFocus(Qt.OtherFocusReason) + tc = self.contents.textCursor() tc.movePosition(QTextCursor.Start) self.contents.setTextCursor(tc)
--- a/Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py Sat Mar 31 12:08:28 2012 +0200 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py Sat Mar 31 15:08:26 2012 +0200 @@ -235,10 +235,14 @@ self.process.setWorkingDirectory(self.dname) + self.inputGroup.setEnabled(True) + self.inputGroup.show() + self.process.start('svn', args) procStarted = self.process.waitForStarted() if not procStarted: self.inputGroup.setEnabled(False) + self.inputGroup.hide() E5MessageBox.critical(self, self.trUtf8('Process Generation Error'), self.trUtf8( @@ -292,6 +296,8 @@ self.buttonBox.button(QDialogButtonBox.Close).setDefault(True) self.inputGroup.setEnabled(False) + self.inputGroup.hide() + self.inputGroup.setEnabled(False) def __processBuffer(self): """
--- a/Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py Sat Mar 31 12:08:28 2012 +0200 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py Sat Mar 31 15:08:26 2012 +0200 @@ -140,6 +140,7 @@ @param exitStatus exit status of the process (QProcess.ExitStatus) """ self.inputGroup.setEnabled(False) + self.inputGroup.hide() self.contents.clear()
--- a/Plugins/VcsPlugins/vcsSubversion/SvnRepoBrowserDialog.py Sat Mar 31 12:08:28 2012 +0200 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnRepoBrowserDialog.py Sat Mar 31 15:08:26 2012 +0200 @@ -247,6 +247,7 @@ if not procStarted: self.__finish() self.inputGroup.setEnabled(False) + self.inputGroup.hide() E5MessageBox.critical(self, self.trUtf8('Process Generation Error'), self.trUtf8( @@ -255,6 +256,7 @@ ).format('svn')) else: self.inputGroup.setEnabled(True) + self.inputGroup.show() def __normalizeUrl(self, url): """ @@ -351,6 +353,7 @@ self.process.waitForFinished(3000) self.inputGroup.setEnabled(False) + self.inputGroup.hide() self.__resizeColumns() self.__resort()
--- a/Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py Sat Mar 31 12:08:28 2012 +0200 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py Sat Mar 31 15:08:26 2012 +0200 @@ -381,6 +381,7 @@ procStarted = self.process.waitForStarted() if not procStarted: self.inputGroup.setEnabled(False) + self.inputGroup.hide() E5MessageBox.critical(self, self.trUtf8('Process Generation Error'), self.trUtf8( @@ -389,6 +390,7 @@ ).format('svn')) else: self.inputGroup.setEnabled(True) + self.inputGroup.show() def __finish(self): """ @@ -404,8 +406,10 @@ self.buttonBox.button(QDialogButtonBox.Close).setEnabled(True) self.buttonBox.button(QDialogButtonBox.Cancel).setEnabled(False) self.buttonBox.button(QDialogButtonBox.Close).setDefault(True) + self.buttonBox.button(QDialogButtonBox.Close).setFocus(Qt.OtherFocusReason) self.inputGroup.setEnabled(False) + self.inputGroup.hide() self.refreshButton.setEnabled(True) self.__statusFilters.sort() @@ -570,6 +574,7 @@ self.buttonBox.button(QDialogButtonBox.Cancel).setDefault(True) self.inputGroup.setEnabled(True) + self.inputGroup.show() self.refreshButton.setEnabled(False) self.statusList.clear()
--- a/Plugins/VcsPlugins/vcsSubversion/SvnTagBranchListDialog.py Sat Mar 31 12:08:28 2012 +0200 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnTagBranchListDialog.py Sat Mar 31 15:08:26 2012 +0200 @@ -147,6 +147,7 @@ procStarted = self.process.waitForStarted() if not procStarted: self.inputGroup.setEnabled(False) + self.inputGroup.hide() E5MessageBox.critical(self, self.trUtf8('Process Generation Error'), self.trUtf8( @@ -155,6 +156,7 @@ ).format('svn')) else: self.inputGroup.setEnabled(True) + self.inputGroup.show() def __finish(self): """ @@ -169,8 +171,10 @@ self.buttonBox.button(QDialogButtonBox.Close).setEnabled(True) self.buttonBox.button(QDialogButtonBox.Cancel).setEnabled(False) self.buttonBox.button(QDialogButtonBox.Close).setDefault(True) + self.buttonBox.button(QDialogButtonBox.Close).setFocus(Qt.OtherFocusReason) self.inputGroup.setEnabled(False) + self.inputGroup.hide() self.process = None
