Mercurial Repositories > eric / changeset
changeset
Fixed an issue in the various VCS diff dialogs.
Sun, 25 Jan 2015 17:30:53 +0100
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Sun, 25 Jan 2015 17:30:53 +0100
- branch
- 6_0_x
- changeset 4066
- 3dc03cbd6fd8
- parent 4064
- c918bd03f0ff
- child 4070
- 28382ba99ba4
Fixed an issue in the various VCS diff dialogs.
(grafted from 8e81259fb739ad90c0c3c2adf348639a29325fd0)
--- a/Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py Fri Jan 23 20:27:35 2015 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py Sun Jan 25 17:30:53 2015 +0100 @@ -222,11 +222,11 @@ self.inputGroup.hide() if self.paras == 0: - self.contents.insertPlainText( + self.contents.setCurrentCharFormat(self.cNormalFormat) + self.contents.setPlainText( self.tr('There is no difference.')) - return - self.buttonBox.button(QDialogButtonBox.Save).setEnabled(True) + self.buttonBox.button(QDialogButtonBox.Save).setEnabled(self.paras > 0) self.buttonBox.button(QDialogButtonBox.Close).setDefault(True) self.buttonBox.button(QDialogButtonBox.Close).setFocus( Qt.OtherFocusReason)
--- a/Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py Fri Jan 23 20:27:35 2015 +0100 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py Sun Jan 25 17:30:53 2015 +0100 @@ -267,11 +267,11 @@ self.__finish() if self.paras == 0: - self.contents.insertPlainText( + self.contents.setCurrentCharFormat(self.cNormalFormat) + self.contents.setPlainText( self.tr('There is no difference.')) - return - self.buttonBox.button(QDialogButtonBox.Save).setEnabled(True) + self.buttonBox.button(QDialogButtonBox.Save).setEnabled(self.paras > 0) def __appendText(self, line): """
--- a/Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py Fri Jan 23 20:27:35 2015 +0100 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py Sun Jan 25 17:30:53 2015 +0100 @@ -199,11 +199,11 @@ self.inputGroup.hide() if self.paras == 0: - self.contents.insertPlainText( + self.contents.setCurrentCharFormat(self.cNormalFormat) + self.contents.setPlainText( self.tr('There is no difference.')) - return - self.buttonBox.button(QDialogButtonBox.Save).setEnabled(True) + self.buttonBox.button(QDialogButtonBox.Save).setEnabled(self.paras > 0) self.buttonBox.button(QDialogButtonBox.Close).setDefault(True) self.buttonBox.button(QDialogButtonBox.Close).setFocus( Qt.OtherFocusReason)
