diff -r 44ec4168b442 -r 693e42176007 PluginTimeTracker.py
--- a/PluginTimeTracker.py Thu Jun 03 18:02:18 2021 +0200
+++ b/PluginTimeTracker.py Fri Jun 04 16:40:54 2021 +0200
@@ -9,9 +9,9 @@
import os
-from PyQt5.QtCore import QObject, QTranslator, QCoreApplication
+from PyQt6.QtCore import QObject, QTranslator, QCoreApplication
-from E5Gui.E5Application import e5App
+from EricWidgets.EricApplication import ericApp
import Preferences
@@ -22,7 +22,7 @@
author = "Detlev Offenbach <detlev@die-offenbachs.de>"
autoactivate = True
deactivateable = True
-version = "4.0.0"
+version = "1.0.0"
className = "TimeTrackerPlugin"
packageName = "TimeTracker"
shortDescription = "Time Tracker to keep track of the project time."
@@ -45,7 +45,9 @@
Module function to create the Time Tracker configuration page.
@param configDlg reference to the configuration dialog
+ @type ConfigurationWidget
@return reference to the configuration page
+ @rtype TimeTrackerPage
"""
global timeTrackerPluginObject
from TimeTracker.ConfigurationPage.TimeTrackerPage import TimeTrackerPage
@@ -57,15 +59,9 @@
Module function returning data as required by the configuration dialog.
@return dictionary containing the relevant data
+ @rtype dict
"""
- try:
- usesDarkPalette = e5App().usesDarkPalette()
- except AttributeError:
- # backward compatibility for eric6 < 20.04
- from PyQt5.QtGui import QPalette
- palette = e5App().palette()
- lightness = palette.color(QPalette.Window).lightness()
- usesDarkPalette = lightness <= 128
+ usesDarkPalette = ericApp().usesDarkPalette()
iconSuffix = "dark" if usesDarkPalette else "light"
return {
@@ -95,7 +91,8 @@
"""
Constructor
- @param ui reference to the user interface object (UI.UserInterface)
+ @param ui reference to the user interface object
+ @type UserInterface
"""
QObject.__init__(self, ui)
self.__ui = ui
@@ -116,13 +113,14 @@
"""
self.__object = None
- self.__e5project = e5App().getObject("Project")
+ self.__ericProject = ericApp().getObject("Project")
def activate(self):
"""
Public method to activate this plugin.
- @return tuple of None and activation status (boolean)
+ @return tuple of None and activation status
+ @rtype bool
"""
global error
error = "" # clear previous error
@@ -130,26 +128,22 @@
global timeTrackerPluginObject
timeTrackerPluginObject = self
- try:
- usesDarkPalette = e5App().usesDarkPalette()
- except AttributeError:
- # backward compatibility for eric6 < 20.04
- from PyQt5.QtGui import QPalette
- palette = e5App().palette()
- lightness = palette.color(QPalette.Window).lightness()
- usesDarkPalette = lightness <= 128
+ usesDarkPalette = ericApp().usesDarkPalette()
iconSuffix = "dark" if usesDarkPalette else "light"
self.__object = TimeTracker(self, iconSuffix, self.__ui)
self.__object.activate()
- e5App().registerPluginObject("TimeTracker", self.__object)
+ ericApp().registerPluginObject("TimeTracker", self.__object)
- if self.__e5project.isOpen():
+ if self.__ericProject.isOpen():
self.__object.projectOpened()
- self.__e5project.newProject.connect(self.__object.projectOpened)
- self.__e5project.projectOpened.connect(self.__object.projectOpened)
- self.__e5project.projectClosed.connect(self.__object.projectClosed)
+ self.__ericProject.newProject.connect(
+ self.__object.projectOpened)
+ self.__ericProject.projectOpened.connect(
+ self.__object.projectOpened)
+ self.__ericProject.projectClosed.connect(
+ self.__object.projectClosed)
return None, True
@@ -157,12 +151,15 @@
"""
Public method to deactivate this plugin.
"""
- e5App().unregisterPluginObject("TimeTracker")
+ ericApp().unregisterPluginObject("TimeTracker")
self.__object.deactivate()
- self.__e5project.newProject.disconnect(self.__object.projectOpened)
- self.__e5project.projectOpened.disconnect(self.__object.projectOpened)
- self.__e5project.projectClosed.disconnect(self.__object.projectClosed)
+ self.__ericProject.newProject.disconnect(
+ self.__object.projectOpened)
+ self.__ericProject.projectOpened.disconnect(
+ self.__object.projectOpened)
+ self.__ericProject.projectClosed.disconnect(
+ self.__object.projectClosed)
self.__object.projectClosed()
@@ -182,7 +179,7 @@
loaded = translator.load(translation, locale_dir)
if loaded:
self.__translator = translator
- e5App().installTranslator(self.__translator)
+ ericApp().installTranslator(self.__translator)
else:
print("Warning: translation file '{0}' could not be"
" loaded.".format(translation))
@@ -192,8 +189,10 @@
"""
Public method to retrieve the various settings.
- @param key the key of the value to get
- @return the requested setting
+ @param key key of the value to get
+ @type str
+ @return value of the requested setting
+ @rtype Any
"""
if key in ["MinimumDuration"]:
return int(Preferences.Prefs.settings.value(
@@ -210,8 +209,10 @@
"""
Public method to store the various settings.
- @param key the key of the setting to be set (string)
- @param value the value to be set
+ @param key key of the setting to be set
+ @type str
+ @param value value to be set
+ @type Any
"""
Preferences.Prefs.settings.setValue(
self.PreferencesKey + "/" + key, value)
