Adapted the import statements to the new structure. eric7 release-10.1.0

Mon, 24 Oct 2022 16:08:20 +0200

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Mon, 24 Oct 2022 16:08:20 +0200
branch
eric7
changeset 56
2ca258eb5859
parent 55
ccddc623f3c1
child 57
ab0da5a0da5e

Adapted the import statements to the new structure.

ChangeLog file | annotate | diff | comparison | revisions
PluginSelectionEncloser.py file | annotate | diff | comparison | revisions
PluginSelectionEncloser.zip file | annotate | diff | comparison | revisions
SelectionEncloser/ConfigurationPage/SelectionEncloserPage.py file | annotate | diff | comparison | revisions
--- a/ChangeLog	Wed Sep 21 10:48:59 2022 +0200
+++ b/ChangeLog	Mon Oct 24 16:08:20 2022 +0200
@@ -1,5 +1,8 @@
 ChangeLog
 ---------
+Version 10.1.0
+- adapted the import statements to the new structure
+
 Version 10.0.0:
 - first release of the eric7 variant
 
--- a/PluginSelectionEncloser.py	Wed Sep 21 10:48:59 2022 +0200
+++ b/PluginSelectionEncloser.py	Mon Oct 24 16:08:20 2022 +0200
@@ -15,16 +15,16 @@
 from PyQt6.QtGui import QAction
 from PyQt6.QtWidgets import QMenu
 
-from EricWidgets.EricApplication import ericApp
+from eric7.EricWidgets.EricApplication import ericApp
 
-import Preferences
+from eric7 import Preferences
 
 # Start-Of-Header
 name = "Selection Encloser Plug-in"
 author = "Detlev Offenbach <detlev@die-offenbachs.de>"
 autoactivate = True
 deactivateable = True
-version = "10.0.0"
+version = "10.1.0"
 className = "SelectionEncloserPlugin"
 packageName = "SelectionEncloser"
 shortDescription = "Enclose the selection with a string."
Binary file PluginSelectionEncloser.zip has changed
--- a/SelectionEncloser/ConfigurationPage/SelectionEncloserPage.py	Wed Sep 21 10:48:59 2022 +0200
+++ b/SelectionEncloser/ConfigurationPage/SelectionEncloserPage.py	Mon Oct 24 16:08:20 2022 +0200
@@ -12,12 +12,15 @@
 from PyQt6.QtCore import pyqtSlot, Qt
 from PyQt6.QtWidgets import QTreeWidgetItem, QInputDialog, QLineEdit, QDialog
 
-from EricWidgets.EricApplication import ericApp
+from eric7.EricWidgets.EricApplication import ericApp
 
-from Preferences.ConfigurationPages.ConfigurationPageBase import ConfigurationPageBase
+from eric7.Preferences.ConfigurationPages.ConfigurationPageBase import ConfigurationPageBase
 from .Ui_SelectionEncloserPage import Ui_SelectionEncloserPage
 
-import UI.PixmapCache
+try:
+    from eric7.EricGui import EricPixmapCache
+except ImportError:
+    from UI import PixmapCache as EricPixmapCache
 
 
 class SelectionEncloserPage(ConfigurationPageBase, Ui_SelectionEncloserPage):
@@ -40,25 +43,25 @@
         iconSuffix = "dark" if usesDarkPalette else "light"
 
         self.editButton.setIcon(
-            UI.PixmapCache.getIcon(
+            EricPixmapCache.getIcon(
                 os.path.join(
                     "SelectionEncloser", "icons", "edit-{0}".format(iconSuffix)
                 )
             )
         )
-        self.addButton.setIcon(UI.PixmapCache.getIcon("plus"))
-        self.deleteButton.setIcon(UI.PixmapCache.getIcon("minus"))
-        self.upButton.setIcon(UI.PixmapCache.getIcon("1uparrow"))
-        self.downButton.setIcon(UI.PixmapCache.getIcon("1downarrow"))
+        self.addButton.setIcon(EricPixmapCache.getIcon("plus"))
+        self.deleteButton.setIcon(EricPixmapCache.getIcon("minus"))
+        self.upButton.setIcon(EricPixmapCache.getIcon("1uparrow"))
+        self.downButton.setIcon(EricPixmapCache.getIcon("1downarrow"))
         self.addMenuButton.setIcon(
-            UI.PixmapCache.getIcon(
+            EricPixmapCache.getIcon(
                 os.path.join(
                     "SelectionEncloser", "icons", "topAdd-{0}".format(iconSuffix)
                 )
             )
         )
         self.addSeparatorButton.setIcon(
-            UI.PixmapCache.getIcon(
+            EricPixmapCache.getIcon(
                 os.path.join(
                     "SelectionEncloser", "icons", "separatorAdd-{0}".format(iconSuffix)
                 )

eric ide

mercurial