Mercurial Repositories > Time Tracker / changeset

--- a/ChangeLog	Tue Sep 20 19:10:20 2022 +0200
+++ b/ChangeLog	Mon Oct 24 18:11:15 2022 +0200
@@ -1,5 +1,8 @@
 ChangeLog
 ---------
+Version 10.1.0
+- adapted the import statements to the new structure
+
 Version 10.0.1:
 - added an icon for the new sidebars layout
 

--- a/PluginTimeTracker.epj	Tue Sep 20 19:10:20 2022 +0200
+++ b/PluginTimeTracker.epj	Mon Oct 24 18:11:15 2022 +0200
@@ -196,7 +196,7 @@
     ],
     "OTHERTOOLSPARMS": {
       "Black": {
-        "exclude": "/(\\.direnv|\\.eggs|\\.git|\\.hg|\\.mypy_cache|\\.nox|\\.tox|\\.venv|venv|\\.svn|_build|buck-out|build|dist|__pypackages__)/",
+        "exclude": "/(\\.direnv|\\.eggs|\\.git|\\.hg|\\.mypy_cache|\\.nox|\\.tox|\\.venv|venv|\\.svn|\\.ipynb_checkpoints|_build|buck-out|build|dist|__pypackages__)/",
         "extend-exclude": "",
         "force-exclude": "",
         "line-length": 88,
@@ -254,6 +254,7 @@
       "TimeTracker/i18n/timetracker_ru.ts"
     ],
     "TRANSLATIONSBINPATH": "",
+    "TRANSLATIONSOURCESTARTPATH": "",
     "UICPARAMS": {
       "Package": "",
       "PackagesRoot": "",

--- a/PluginTimeTracker.py	Tue Sep 20 19:10:20 2022 +0200
+++ b/PluginTimeTracker.py	Mon Oct 24 18:11:15 2022 +0200
@@ -11,9 +11,8 @@
 
 from PyQt6.QtCore import QObject, QTranslator, QCoreApplication
 
-from EricWidgets.EricApplication import ericApp
-
-import Preferences
+from eric7 import Preferences
+from eric7.EricWidgets.EricApplication import ericApp
 
 from TimeTracker.TimeTracker import TimeTracker
 
@@ -22,7 +21,7 @@
 author = "Detlev Offenbach <detlev@die-offenbachs.de>"
 autoactivate = True
 deactivateable = True
-version = "10.0.1"
+version = "10.1.0"
 className = "TimeTrackerPlugin"
 packageName = "TimeTracker"
 shortDescription = "Time Tracker to keep track of the project time."

Binary file PluginTimeTracker.zip has changed

--- a/TimeTracker/ConfigurationPage/TimeTrackerPage.py	Tue Sep 20 19:10:20 2022 +0200
+++ b/TimeTracker/ConfigurationPage/TimeTrackerPage.py	Mon Oct 24 18:11:15 2022 +0200
@@ -7,7 +7,10 @@
 Module implementing the Time Tracker configuration page.
 """
 
-from Preferences.ConfigurationPages.ConfigurationPageBase import ConfigurationPageBase
+from eric7.Preferences.ConfigurationPages.ConfigurationPageBase import (
+    ConfigurationPageBase,
+)
+
 from .Ui_TimeTrackerPage import Ui_TimeTrackerPage
 
 

--- a/TimeTracker/TimeTracker.py	Tue Sep 20 19:10:20 2022 +0200
+++ b/TimeTracker/TimeTracker.py	Mon Oct 24 18:11:15 2022 +0200
@@ -13,11 +13,13 @@
 from PyQt6.QtCore import Qt, QObject
 from PyQt6.QtGui import QKeySequence
 
-from EricWidgets.EricApplication import ericApp
-from EricWidgets import EricMessageBox
-from EricGui.EricAction import EricAction
-
-import UI.PixmapCache
+try:
+    from eric7.EricGui import EricPixmapCache
+except ImportError:
+    from UI import PixmapCache as EricPixmapCache
+from eric7.EricGui.EricAction import EricAction
+from eric7.EricWidgets import EricMessageBox
+from eric7.EricWidgets.EricApplication import ericApp
 
 
 class TimeTracker(QObject):
@@ -75,7 +77,7 @@
         self.__ui.addSideWidget(
             self.__ui.BottomSide,
             self.__widget,
-            UI.PixmapCache.getIcon(os.path.join("TimeTracker", "icons", iconName)),
+            EricPixmapCache.getIcon(os.path.join("TimeTracker", "icons", iconName)),
             self.tr("Time Tracker"),
         )
 

--- a/TimeTracker/TimeTrackerWidget.py	Tue Sep 20 19:10:20 2022 +0200
+++ b/TimeTracker/TimeTrackerWidget.py	Mon Oct 24 18:11:15 2022 +0200
@@ -13,13 +13,11 @@
 from PyQt6.QtGui import QCursor
 from PyQt6.QtWidgets import QWidget, QMenu, QTreeWidgetItem, QDialog
 
-from EricWidgets import EricMessageBox, EricFileDialog
+from eric7 import Preferences, Utilities
+from eric7.EricWidgets import EricMessageBox, EricFileDialog
 
 from .Ui_TimeTrackerWidget import Ui_TimeTrackerWidget
 
-import Preferences
-import Utilities
-
 
 class TimeTrackerWidget(QWidget, Ui_TimeTrackerWidget):
     """