Changed the status and log browser dialogs to show the input widgets only when something was written to stderr in order to get less flicker.

Tue, 31 Jan 2017 19:49:58 +0100

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Tue, 31 Jan 2017 19:49:58 +0100
changeset 5463
d84b854d59c0
parent 5462
52b2f19226e7
child 5464
1d4f700489f8

Changed the status and log browser dialogs to show the input widgets only when something was written to stderr in order to get less flicker.

Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py file | annotate | diff | comparison | revisions
--- a/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py	Tue Jan 31 19:08:11 2017 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py	Tue Jan 31 19:49:58 2017 +0100
@@ -955,9 +955,6 @@
             
             self.process.setWorkingDirectory(self.repodir)
             
-            self.inputGroup.setEnabled(True)
-            self.inputGroup.show()
-            
             if preargs:
                 process = QProcess()
                 process.setWorkingDirectory(self.repodir)
@@ -1269,6 +1266,11 @@
         self.errorGroup.show()
         self.errors.insertPlainText(out)
         self.errors.ensureCursorVisible()
+        
+        if not self.__hgClient:
+            # show input in case the process asked for some input
+            self.inputGroup.setEnabled(True)
+            self.inputGroup.show()
     
     def __diffRevisions(self, rev1, rev2):
         """
@@ -1759,8 +1761,6 @@
         self.buttonBox.button(QDialogButtonBox.Cancel).setEnabled(True)
         self.buttonBox.button(QDialogButtonBox.Cancel).setDefault(True)
         
-        self.inputGroup.setEnabled(True)
-        self.inputGroup.show()
         self.refreshButton.setEnabled(False)
         
         # save the current items commit ID
@@ -1806,7 +1806,6 @@
         else:
             self.errors.insertPlainText(input)
             self.errors.ensureCursorVisible()
-        self.errorGroup.show()
         
         self.process.write(input)
         
--- a/Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py	Tue Jan 31 19:08:11 2017 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py	Tue Jan 31 19:49:58 2017 +0100
@@ -373,8 +373,6 @@
                 self.buttonBox.button(QDialogButtonBox.Cancel).setEnabled(True)
                 self.buttonBox.button(QDialogButtonBox.Cancel).setDefault(True)
                 
-                self.inputGroup.setEnabled(True)
-                self.inputGroup.show()
                 self.refreshButton.setEnabled(False)
     
     def __finish(self):
@@ -484,6 +482,11 @@
         self.errorGroup.show()
         self.errors.insertPlainText(out)
         self.errors.ensureCursorVisible()
+        
+        if not self.__hgClient:
+            # show input in case the process asked for some input
+            self.inputGroup.setEnabled(True)
+            self.inputGroup.show()
     
     def on_passwordCheckBox_toggled(self, isOn):
         """

eric ide

mercurial