Adapted to the project browser changes as of eric 22.12. eric7 release-10.2.0

Sat, 26 Nov 2022 17:32:14 +0100

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Sat, 26 Nov 2022 17:32:14 +0100
branch
eric7
changeset 186
bd5621e752ca
parent 185
82761067ef37
child 187
6d0d13de1005

Adapted to the project browser changes as of eric 22.12.

ChangeLog file | annotate | diff | comparison | revisions
PluginProjectDjango.py file | annotate | diff | comparison | revisions
PluginProjectDjango.zip file | annotate | diff | comparison | revisions
diff -r 82761067ef37 -r bd5621e752ca ChangeLog
--- a/ChangeLog	Tue Oct 25 10:44:07 2022 +0200
+++ b/ChangeLog	Sat Nov 26 17:32:14 2022 +0100
@@ -1,6 +1,9 @@
 ChangeLog
 ---------
-Version 10.1.0
+Version 10.2.0:
+- adapted to the project browser changes as of eric 22.12
+
+Version 10.1.0:
 - adapted the import statements to the new structure
 
 Version 10.0.1:
diff -r 82761067ef37 -r bd5621e752ca PluginProjectDjango.py
--- a/PluginProjectDjango.py	Tue Oct 25 10:44:07 2022 +0200
+++ b/PluginProjectDjango.py	Sat Nov 26 17:32:14 2022 +0100
@@ -24,7 +24,7 @@
 author = "Detlev Offenbach <detlev@die-offenbachs.de>"
 autoactivate = True
 deactivateable = True
-version = "10.1.0"
+version = "10.2.0"
 className = "ProjectDjangoPlugin"
 packageName = "ProjectDjango"
 shortDescription = "Project support for Django projects."
@@ -96,7 +96,11 @@
     """
     Module function to prepare for an uninstallation.
     """
-    Preferences.removeProjectBrowserFlags(ProjectDjangoPlugin.PreferencesKey)
+    try:
+        Preferences.removeProjectBrowsers(ProjectDjangoPlugin.PreferencesKey)
+    except AttributeError:
+        # backward compatibility for eric7 < 22.12
+        Preferences.removeProjectBrowserFlags(ProjectDjangoPlugin.PreferencesKey)
     Preferences.Prefs.settings.remove(ProjectDjangoPlugin.PreferencesKey)
     Preferences.Prefs.rsettings.remove(ProjectDjangoPlugin.PreferencesKey)
 
@@ -197,20 +201,27 @@
                 progLanguages=self.__supportedVariants[:],
             )
 
-        from eric7.Project.ProjectBrowser import (
-            SourcesBrowserFlag,
-            FormsBrowserFlag,
-            TranslationsBrowserFlag,
-            OthersBrowserFlag,
-        )
+        try:
+            # backward compatibility for eric7 < 22.12
+            from eric7.Project.ProjectBrowser import (
+                SourcesBrowserFlag,
+                FormsBrowserFlag,
+                TranslationsBrowserFlag,
+                OthersBrowserFlag,
+            )
 
-        Preferences.setProjectBrowserFlagsDefault(
-            "Django",
-            SourcesBrowserFlag
-            | FormsBrowserFlag
-            | TranslationsBrowserFlag
-            | OthersBrowserFlag,
-        )
+            Preferences.setProjectBrowserFlagsDefault(
+                "Django",
+                SourcesBrowserFlag
+                | FormsBrowserFlag
+                | TranslationsBrowserFlag
+                | OthersBrowserFlag,
+            )
+        except ImportError:
+            Preferences.setProjectBrowsersDefault(
+                "Django",
+                ("sources", "forms", "translations", "others"),
+            )
 
         if self.__ericProject.isOpen():
             self.__projectOpened()
diff -r 82761067ef37 -r bd5621e752ca PluginProjectDjango.zip
Binary file PluginProjectDjango.zip has changed

eric ide

mercurial