Mercurial Repositories > Time Tracker / file diff

--- a/TimeTracker/TimeTrackerWidget.py	Mon Oct 24 18:11:34 2022 +0200
+++ b/TimeTracker/TimeTrackerWidget.py	Tue Dec 20 16:45:00 2022 +0100
@@ -9,12 +9,23 @@
 
 import os
 
-from PyQt6.QtCore import pyqtSlot, QPoint, Qt, QDate, QTime, QFileInfo
+from PyQt6.QtCore import QDate, QFileInfo, QPoint, Qt, QTime, pyqtSlot
 from PyQt6.QtGui import QCursor
-from PyQt6.QtWidgets import QWidget, QMenu, QTreeWidgetItem, QDialog
+from PyQt6.QtWidgets import QDialog, QMenu, QTreeWidgetItem, QWidget
+
+from eric7 import Preferences
+from eric7.EricWidgets import EricFileDialog, EricMessageBox
 
-from eric7 import Preferences, Utilities
-from eric7.EricWidgets import EricMessageBox, EricFileDialog
+try:
+    from eric7.SystemUtilities.FileSystemUtilities import toNativeSeparators
+except ImportError:
+    # imports for eric < 23.1
+    from eric7.Utilities import toNativeSeparators
+try:
+    from eric7.SystemUtilities.OSUtilities import getHomeDir
+except ImportError:
+    # imports for eric < 23.1
+    from eric7.Utilities import getHomeDir
 
 from .Ui_TimeTrackerWidget import Ui_TimeTrackerWidget
 
@@ -247,7 +258,7 @@
         """
         Private slot to import tracker entries.
         """
-        path = Preferences.getMultiProject("Workspace") or Utilities.getHomeDir()
+        path = Preferences.getMultiProject("Workspace") or getHomeDir()
         fname = EricFileDialog.getOpenFileName(
             None,
             self.tr("Import Time Tracker Entries"),
@@ -255,7 +266,7 @@
             self.tr("Time Tracker Files (*.ttj);;All Files (*)"),
         )
         if fname:
-            fname = Utilities.toNativeSeparators(fname)
+            fname = toNativeSeparators(fname)
             if not os.path.exists(fname):
                 EricMessageBox.critical(
                     self,
@@ -273,7 +284,7 @@
         @param ids list of IDs to export or all if empty
         @type list of int
         """
-        path = Preferences.getMultiProject("Workspace") or Utilities.getHomeDir()
+        path = Preferences.getMultiProject("Workspace") or getHomeDir()
         fname, selectedFilter = EricFileDialog.getSaveFileNameAndFilter(
             self,
             self.tr("Export Time Tracker Entries"),
@@ -299,7 +310,7 @@
                 )
                 if not res:
                     return
-                fname = Utilities.toNativeSeparators(fname)
+                fname = toNativeSeparators(fname)
             self.__tracker.saveTrackerEntries(filePath=fname, ids=ids)
 
     def __exportSelectedEntries(self):