Merged with branch 'eric7' in order to track these changes. server

Fri, 07 Jun 2024 13:58:16 +0200

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Fri, 07 Jun 2024 13:58:16 +0200
branch
server
changeset 10752
3cf5ee0c3e9f
parent 10748
d14a35b8dc2c (current diff)
parent 10751
d4dbb6b75bdc (diff)
child 10759
aeb98b3fa008

Merged with branch 'eric7' in order to track these changes.

diff -r d14a35b8dc2c -r 3cf5ee0c3e9f docs/eric7-plugin.odt
Binary file docs/eric7-plugin.odt has changed
diff -r d14a35b8dc2c -r 3cf5ee0c3e9f docs/eric7-plugin.pdf
Binary file docs/eric7-plugin.pdf has changed
diff -r d14a35b8dc2c -r 3cf5ee0c3e9f src/eric7/PluginManager/PluginInstallDialog.py
--- a/src/eric7/PluginManager/PluginInstallDialog.py	Fri Jun 07 11:16:15 2024 +0200
+++ b/src/eric7/PluginManager/PluginInstallDialog.py	Fri Jun 07 13:58:16 2024 +0200
@@ -344,6 +344,7 @@
         needsRestart = False
         pyqtApi = 0
         doCompile = True
+        doCompileForms = True
 
         separator = "="  # initialize for old-style header
         insideHeader = False
@@ -386,6 +387,8 @@
                         pyqtApi = int(value)
                 elif key == "doNotCompile" and value == "True":
                     doCompile = False
+                elif key == "hasCompiledForms" and value == "True":
+                    doCompileForms = False
 
         if not packageName:
             return (
@@ -497,8 +500,10 @@
                                 f.write(zipFile.read(name))
                             self.__installedFiles.append(outname)
                 self.progress.setValue(tot)
-                # now compile user interface files
-                compileUiFiles(os.path.join(destination, packageName), True)
+
+                if doCompileForms:
+                    # now compile user interface files
+                    compileUiFiles(os.path.join(destination, packageName), True)
             else:
                 outname = os.path.join(destination, pluginFileName)
                 with open(outname, "w", encoding="utf-8") as f:

eric ide

mercurial