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

Mon, 24 Oct 2022 16:34:33 +0200

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Mon, 24 Oct 2022 16:34:33 +0200
branch
eric7
changeset 63
273252fd0d99
parent 62
81f446717433
child 64
46b737cfb40b

Adapted the import statements to the new structure.

ChangeLog file | annotate | diff | comparison | revisions
PKGLIST file | annotate | diff | comparison | revisions
PluginPrintRemover.py file | annotate | diff | comparison | revisions
PluginPrintRemover.zip file | annotate | diff | comparison | revisions
PrintRemover.epj file | annotate | diff | comparison | revisions
PrintRemover/ConfigurationPage/PrintRemoverPage.py file | annotate | diff | comparison | revisions
--- a/ChangeLog	Wed Sep 21 10:58:59 2022 +0200
+++ b/ChangeLog	Mon Oct 24 16:34:33 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/PKGLIST	Wed Sep 21 10:58:59 2022 +0200
+++ b/PKGLIST	Mon Oct 24 16:34:33 2022 +0200
@@ -7,7 +7,6 @@
 PrintRemover/i18n/printremover_de.qm
 PrintRemover/i18n/printremover_en.qm
 PrintRemover/i18n/printremover_es.qm
-PrintRemover/i18n/printremover_pt.qm
 PrintRemover/i18n/printremover_ru.qm
 PrintRemover/icons/edit-dark.svg
 PrintRemover/icons/edit-light.svg
--- a/PluginPrintRemover.py	Wed Sep 21 10:58:59 2022 +0200
+++ b/PluginPrintRemover.py	Mon Oct 24 16:34:33 2022 +0200
@@ -14,16 +14,16 @@
 from PyQt6.QtGui import QAction
 from PyQt6.QtWidgets import QMenu
 
-from EricWidgets.EricApplication import ericApp
+from eric7 import Preferences
 
-import Preferences
+from eric7.EricWidgets.EricApplication import ericApp
 
 # Start-Of-Header
 name = "Print Remover Plug-in"
 author = "Detlev Offenbach <detlev@die-offenbachs.de>"
 autoactivate = True
 deactivateable = True
-version = "10.0.0"
+version = "10.1.0"
 className = "PrintRemoverPlugin"
 packageName = "PrintRemover"
 shortDescription = "Remove print() like debug statements."
Binary file PluginPrintRemover.zip has changed
--- a/PrintRemover.epj	Wed Sep 21 10:58:59 2022 +0200
+++ b/PrintRemover.epj	Mon Oct 24 16:34:33 2022 +0200
@@ -156,6 +156,7 @@
       "Makefile": "OTHERS",
       "README": "OTHERS",
       "README.*": "OTHERS",
+      "Ui_*.py": "__IGNORE__",
       "makefile": "OTHERS"
     },
     "FORMS": [
@@ -251,6 +252,7 @@
       "PrintRemover/i18n/printremover_ru.ts"
     ],
     "TRANSLATIONSBINPATH": "",
+    "TRANSLATIONSOURCESTARTPATH": "",
     "UICPARAMS": {
       "Package": "",
       "PackagesRoot": "",
--- a/PrintRemover/ConfigurationPage/PrintRemoverPage.py	Wed Sep 21 10:58:59 2022 +0200
+++ b/PrintRemover/ConfigurationPage/PrintRemoverPage.py	Mon Oct 24 16:34:33 2022 +0200
@@ -12,12 +12,17 @@
 from PyQt6.QtCore import pyqtSlot
 from PyQt6.QtWidgets import QListWidgetItem, QInputDialog, QLineEdit
 
-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_PrintRemoverPage import Ui_PrintRemoverPage
 
-import UI.PixmapCache
+try:
+    from eric7.EricGui import EricPixmapCache
+except ImportError:
+    from UI import PixmapCache as EricPixmapCache
 
 
 class PrintRemoverPage(ConfigurationPageBase, Ui_PrintRemoverPage):
@@ -40,21 +45,21 @@
         iconSuffix = "dark" if usesDarkPalette else "light"
 
         self.editButton.setIcon(
-            UI.PixmapCache.getIcon(
+            EricPixmapCache.getIcon(
                 os.path.join("PrintRemover", "icons", "edit-{0}".format(iconSuffix))
             )
         )
-        self.addButton.setIcon(UI.PixmapCache.getIcon("plus"))
+        self.addButton.setIcon(EricPixmapCache.getIcon("plus"))
         self.addSeparatorButton.setIcon(
-            UI.PixmapCache.getIcon(
+            EricPixmapCache.getIcon(
                 os.path.join(
                     "PrintRemover", "icons", "separatorAdd-{0}".format(iconSuffix)
                 )
             )
         )
-        self.deleteButton.setIcon(UI.PixmapCache.getIcon("minus"))
-        self.upButton.setIcon(UI.PixmapCache.getIcon("1uparrow"))
-        self.downButton.setIcon(UI.PixmapCache.getIcon("1downarrow"))
+        self.deleteButton.setIcon(EricPixmapCache.getIcon("minus"))
+        self.upButton.setIcon(EricPixmapCache.getIcon("1uparrow"))
+        self.downButton.setIcon(EricPixmapCache.getIcon("1downarrow"))
 
         self.editButton.setEnabled(False)
         self.deleteButton.setEnabled(False)

eric ide

mercurial