Mercurial Repositories > eric / changeset

--- a/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py	Mon Sep 19 11:58:40 2022 +0200
+++ b/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py	Mon Sep 19 16:43:18 2022 +0200
@@ -169,8 +169,6 @@
         self.fixButton.setEnabled(False)
 
         self.checkProgress.setVisible(False)
-        self.checkProgressLabel.setVisible(False)
-        self.checkProgressLabel.setMaximumWidth(600)
 
         self.styleCheckService = styleCheckService
         self.styleCheckService.styleChecked.connect(self.__processResult)
@@ -694,7 +692,6 @@
         self.progressList.clear()
         if len(self.files) > 0:
             self.checkProgress.setMaximum(len(self.files))
-            self.checkProgressLabel.setVisible(len(self.files) > 1)
             self.checkProgress.setVisible(len(self.files) > 1)
             if len(self.files) > 1:
                 if self.__project:
@@ -933,7 +930,6 @@
         @type str
         """
         if not self.files:
-            self.checkProgressLabel.setPath("")
             self.checkProgress.setMaximum(1)
             self.checkProgress.setValue(1)
             self.__finish()
@@ -941,7 +937,6 @@
 
         self.filename = self.files.pop(0)
         self.checkProgress.setValue(self.progress)
-        self.checkProgressLabel.setPath(self.filename)
         QApplication.processEvents()
 
         if self.cancelled:
@@ -993,8 +988,6 @@
         """
         self.__lastFileItem = None
 
-        self.checkProgressLabel.setPath(self.tr("Preparing files..."))
-
         argumentsList = []
         for progress, filename in enumerate(self.files, start=1):
             self.checkProgress.setValue(progress)
@@ -1032,7 +1025,6 @@
 
         # reset the progress bar to the checked files
         self.checkProgress.setValue(self.progress)
-        self.checkProgressLabel.setPath(self.tr("Transferring data..."))
         QApplication.processEvents()
 
         self.__finished = False
@@ -1042,7 +1034,6 @@
         """
         Private slot handling the completion of a batch job.
         """
-        self.checkProgressLabel.setPath("")
         self.checkProgress.setMaximum(1)
         self.checkProgress.setValue(1)
         self.__finish()
@@ -1137,7 +1128,6 @@
             fn = os.path.join("...", self.__project.getRelativePath(fn))
 
         self.checkProgress.setValue(self.progress)
-        self.checkProgressLabel.setPath(fn)
 
         # remove file from the list of jobs to do
         fileItems = self.progressList.findItems(fn, Qt.MatchFlag.MatchExactly)
@@ -1193,7 +1183,6 @@
                 self.filterButton.setEnabled(True)
 
             self.checkProgress.setVisible(False)
-            self.checkProgressLabel.setVisible(False)
 
             self.__resort()
             self.resultList.setUpdatesEnabled(True)

--- a/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui	Mon Sep 19 11:58:40 2022 +0200
+++ b/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui	Mon Sep 19 16:43:18 2022 +0200
@@ -267,7 +267,7 @@
                <rect>
                 <x>0</x>
                 <y>0</y>
-                <width>611</width>
+                <width>389</width>
                 <height>923</height>
                </rect>
               </property>
@@ -1521,19 +1521,6 @@
           </widget>
          </item>
          <item>
-          <widget class="EricSqueezeLabelPath" 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 code style check</string>
@@ -1768,13 +1755,6 @@
   </layout>
  </widget>
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
- <customwidgets>
-  <customwidget>
-   <class>EricSqueezeLabelPath</class>
-   <extends>QLabel</extends>
-   <header>EricWidgets/EricSqueezeLabels.h</header>
-  </customwidget>
- </customwidgets>
  <tabstops>
   <tabstop>mainWidget</tabstop>
   <tabstop>optionsTabWidget</tabstop>

--- a/src/eric7/Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py	Mon Sep 19 11:58:40 2022 +0200
+++ b/src/eric7/Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py	Mon Sep 19 16:43:18 2022 +0200
@@ -74,8 +74,6 @@
         self.filterFrame.setVisible(False)
 
         self.checkProgress.setVisible(False)
-        self.checkProgressLabel.setVisible(False)
-        self.checkProgressLabel.setMaximumWidth(600)
 
         try:
             self.syntaxCheckService = ericApp().getObject("SyntaxCheckService")
@@ -220,7 +218,6 @@
             if codestring or len(self.files) > 0:
                 self.checkProgress.setMaximum(max(1, len(self.files)))
                 self.checkProgress.setVisible(len(self.files) > 1)
-                self.checkProgressLabel.setVisible(len(self.files) > 1)
                 QApplication.processEvents()
 
                 # now go through all the files
@@ -243,7 +240,6 @@
         @param codestring optional sourcestring (str)
         """
         if self.syntaxCheckService is None or not self.files:
-            self.checkProgressLabel.setPath("")
             self.checkProgress.setMaximum(1)
             self.checkProgress.setValue(1)
             self.__finish()
@@ -251,7 +247,6 @@
 
         self.filename = self.files.pop(0)
         self.checkProgress.setValue(self.progress)
-        self.checkProgressLabel.setPath(self.filename)
         QApplication.processEvents()
         self.__resort()
 
@@ -291,7 +286,6 @@
         """
         self.__lastFileItem = None
 
-        self.checkProgressLabel.setPath(self.tr("Preparing files..."))
 
         argumentsList = []
         for progress, filename in enumerate(self.files, start=1):
@@ -318,7 +312,6 @@
 
         # reset the progress bar to the checked files
         self.checkProgress.setValue(self.progress)
-        self.checkProgressLabel.setPath(self.tr("Transferring data..."))
         QApplication.processEvents()
 
         self.__finished = False
@@ -328,7 +321,6 @@
         """
         Private slot handling the completion of a batch job.
         """
-        self.checkProgressLabel.setPath("")
         self.checkProgress.setMaximum(1)
         self.checkProgress.setValue(1)
         self.__finish()
@@ -395,7 +387,6 @@
 
         self.progress += 1
         self.checkProgress.setValue(self.progress)
-        self.checkProgressLabel.setPath(fn)
         if time.monotonic() - self.__timenow > 0.01:
             QApplication.processEvents()
             self.__timenow = time.monotonic()
@@ -435,7 +426,6 @@
             self.resultList.header().setStretchLastSection(True)
 
             self.checkProgress.setVisible(False)
-            self.checkProgressLabel.setVisible(False)
 
     def on_buttonBox_clicked(self, button):
         """

--- a/src/eric7/Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.ui	Mon Sep 19 11:58:40 2022 +0200
+++ b/src/eric7/Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.ui	Mon Sep 19 16:43:18 2022 +0200
@@ -115,19 +115,6 @@
     </widget>
    </item>
    <item>
-    <widget class="EricSqueezeLabelPath" 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>
@@ -156,13 +143,6 @@
   </layout>
  </widget>
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
- <customwidgets>
-  <customwidget>
-   <class>EricSqueezeLabelPath</class>
-   <extends>QLabel</extends>
-   <header>EricWidgets/EricSqueezeLabels.h</header>
-  </customwidget>
- </customwidgets>
  <tabstops>
   <tabstop>startButton</tabstop>
   <tabstop>excludeFilesEdit</tabstop>