Fixed issues in the syntax checker and indentation checker dialogs.

Sat, 14 Dec 2013 19:12:26 +0100

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Sat, 14 Dec 2013 19:12:26 +0100
changeset 3137
59d9f8c238f0
parent 3136
0ede9c1c7284
child 3139
c818d09040a6

Fixed issues in the syntax checker and indentation checker dialogs.

Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py file | annotate | diff | comparison | revisions
Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.ui file | annotate | diff | comparison | revisions
Plugins/CheckerPlugins/Tabnanny/TabnannyDialog.py file | annotate | diff | comparison | revisions
Plugins/CheckerPlugins/Tabnanny/TabnannyDialog.ui file | annotate | diff | comparison | revisions
--- a/Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py	Sun Dec 08 13:28:04 2013 +0100
+++ b/Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py	Sat Dec 14 19:12:26 2013 +0100
@@ -61,6 +61,8 @@
         self.filterFrame.setVisible(False)
         
         self.checkProgress.setVisible(False)
+        self.checkProgressLabel.setVisible(False)
+        self.checkProgressLabel.setMaximumWidth(600)
         
     def __resort(self):
         """
@@ -170,6 +172,8 @@
             self.checkProgress.setMaximum(len(py3files) + len(py2files))
             self.checkProgressLabel.setVisible(
                 len(py3files) + len(py2files) > 1)
+            self.checkProgress.setVisible(
+                len(py3files) + len(py2files) > 1)
             QApplication.processEvents()
             
             ignoreStarImportWarnings = \
@@ -179,6 +183,7 @@
             progress = 0
             for file in py3files + py2files:
                 self.checkProgress.setValue(progress)
+                self.checkProgressLabel.setPath(file)
                 QApplication.processEvents()
                 self.__resort()
                 
@@ -265,6 +270,7 @@
                                     warning[2], "", isWarning=True)
                 progress += 1
             self.checkProgress.setValue(progress)
+            self.checkProgressLabel.setPath("")
             QApplication.processEvents()
             self.__resort()
         else:
@@ -293,6 +299,7 @@
         self.resultList.header().setStretchLastSection(True)
         
         self.checkProgress.setVisible(False)
+        self.checkProgressLabel.setVisible(False)
         
     def on_buttonBox_clicked(self, button):
         """
--- a/Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.ui	Sun Dec 08 13:28:04 2013 +0100
+++ b/Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.ui	Sat Dec 14 19:12:26 2013 +0100
@@ -103,6 +103,19 @@
     </widget>
    </item>
    <item>
+    <widget class="E5SqueezeLabelPath" name="checkProgressLabel">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="text">
+      <string/>
+     </property>
+    </widget>
+   </item>
+   <item>
     <widget class="QProgressBar" name="checkProgress">
      <property name="toolTip">
       <string>Shows the progress of the syntax check action</string>
@@ -134,6 +147,11 @@
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <customwidgets>
   <customwidget>
+   <class>E5SqueezeLabelPath</class>
+   <extends>QLabel</extends>
+   <header>E5Gui/E5SqueezeLabels.h</header>
+  </customwidget>
+  <customwidget>
    <class>E5ClearableLineEdit</class>
    <extends>QLineEdit</extends>
    <header>E5Gui/E5LineEdit.h</header>
--- a/Plugins/CheckerPlugins/Tabnanny/TabnannyDialog.py	Sun Dec 08 13:28:04 2013 +0100
+++ b/Plugins/CheckerPlugins/Tabnanny/TabnannyDialog.py	Sat Dec 14 19:12:26 2013 +0100
@@ -52,6 +52,8 @@
         self.filterFrame.setVisible(False)
         
         self.checkProgress.setVisible(False)
+        self.checkProgressLabel.setVisible(False)
+        self.checkProgressLabel.setMaximumWidth(600)
         
     def __resort(self):
         """
@@ -136,12 +138,15 @@
             self.checkProgress.setMaximum(len(py3files) + len(py2files))
             self.checkProgressLabel.setVisible(
                 len(py3files) + len(py2files) > 1)
+            self.checkProgress.setVisible(
+                len(py3files) + len(py2files) > 1)
             QApplication.processEvents()
             
             # now go through all the files
             progress = 0
             for file in py3files + py2files:
                 self.checkProgress.setValue(progress)
+                self.checkProgressLabel.setPath(file)
                 QApplication.processEvents()
                 self.__resort()
                 
@@ -181,6 +186,7 @@
                 progress += 1
                 
             self.checkProgress.setValue(progress)
+            self.checkProgressLabel.setPath("")
             QApplication.processEvents()
             self.__resort()
         else:
@@ -205,6 +211,7 @@
         self.resultList.header().setStretchLastSection(True)
         
         self.checkProgress.setVisible(False)
+        self.checkProgressLabel.setVisible(False)
         
     def on_buttonBox_clicked(self, button):
         """
--- a/Plugins/CheckerPlugins/Tabnanny/TabnannyDialog.ui	Sun Dec 08 13:28:04 2013 +0100
+++ b/Plugins/CheckerPlugins/Tabnanny/TabnannyDialog.ui	Sat Dec 14 19:12:26 2013 +0100
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>650</width>
-    <height>350</height>
+    <height>400</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -109,6 +109,19 @@
     </widget>
    </item>
    <item>
+    <widget class="E5SqueezeLabelPath" name="checkProgressLabel">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="text">
+      <string/>
+     </property>
+    </widget>
+   </item>
+   <item>
     <widget class="QProgressBar" name="checkProgress">
      <property name="toolTip">
       <string>Shows the progress of the tabnanny action</string>
@@ -140,6 +153,11 @@
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <customwidgets>
   <customwidget>
+   <class>E5SqueezeLabelPath</class>
+   <extends>QLabel</extends>
+   <header>E5Gui/E5SqueezeLabels.h</header>
+  </customwidget>
+  <customwidget>
    <class>E5ClearableLineEdit</class>
    <extends>QLineEdit</extends>
    <header>E5Gui/E5LineEdit.h</header>

eric ide

mercurial