Mercurial Repositories > Time Tracker / changeset
changeset
Updated version info to indicate relation to eric7.
Thu, 30 Dec 2021 12:37:37 +0100
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Thu, 30 Dec 2021 12:37:37 +0100
- branch
- eric7
- changeset 106
- 6deb942739dc
- parent 105
- 44bfd9e7e65e
- child 107
- 09f25e6d99ee
Updated version info to indicate relation to eric7.
--- a/ChangeLog Thu Dec 30 11:20:04 2021 +0100 +++ b/ChangeLog Thu Dec 30 12:37:37 2021 +0100 @@ -1,9 +1,9 @@ ChangeLog --------- -Version 1.0.1: +Version 10.0.1: - added an icon for the new sidebars layout -Version 1.0.0: +Version 10.0.0: - first release of the eric7 variant ************************************************************
--- a/PluginTimeTracker.py Thu Dec 30 11:20:04 2021 +0100 +++ b/PluginTimeTracker.py Thu Dec 30 12:37:37 2021 +0100 @@ -22,7 +22,7 @@ author = "Detlev Offenbach <detlev@die-offenbachs.de>" autoactivate = True deactivateable = True -version = "1.0.1" +version = "10.0.1" className = "TimeTrackerPlugin" packageName = "TimeTracker" shortDescription = "Time Tracker to keep track of the project time."
--- a/TimeTracker/Documentation/source/Plugin_Time_Tracker.PluginTimeTracker.html Thu Dec 30 11:20:04 2021 +0100 +++ b/TimeTracker/Documentation/source/Plugin_Time_Tracker.PluginTimeTracker.html Thu Dec 30 12:37:37 2021 +0100 @@ -2,21 +2,7 @@ <html><head> <title>Plugin_Time_Tracker.PluginTimeTracker</title> <meta charset="UTF-8"> -<style> -body { - background: #EDECE6; - margin: 0em 1em 10em 1em; - color: black; -} - -h1 { color: white; background: #85774A; } -h2 { color: white; background: #85774A; } -h3 { color: white; background: #9D936E; } -h4 { color: white; background: #9D936E; } - -a { color: #BA6D36; } - -</style> +<link rel="stylesheet" href="styles.css"> </head> <body> <a NAME="top" ID="top"></a>
--- a/TimeTracker/Documentation/source/Plugin_Time_Tracker.TimeTracker.ConfigurationPage.TimeTrackerPage.html Thu Dec 30 11:20:04 2021 +0100 +++ b/TimeTracker/Documentation/source/Plugin_Time_Tracker.TimeTracker.ConfigurationPage.TimeTrackerPage.html Thu Dec 30 12:37:37 2021 +0100 @@ -2,21 +2,7 @@ <html><head> <title>Plugin_Time_Tracker.TimeTracker.ConfigurationPage.TimeTrackerPage</title> <meta charset="UTF-8"> -<style> -body { - background: #EDECE6; - margin: 0em 1em 10em 1em; - color: black; -} - -h1 { color: white; background: #85774A; } -h2 { color: white; background: #85774A; } -h3 { color: white; background: #9D936E; } -h4 { color: white; background: #9D936E; } - -a { color: #BA6D36; } - -</style> +<link rel="stylesheet" href="styles.css"> </head> <body> <a NAME="top" ID="top"></a>
--- a/TimeTracker/Documentation/source/Plugin_Time_Tracker.TimeTracker.TimeTrackEntry.html Thu Dec 30 11:20:04 2021 +0100 +++ b/TimeTracker/Documentation/source/Plugin_Time_Tracker.TimeTracker.TimeTrackEntry.html Thu Dec 30 12:37:37 2021 +0100 @@ -2,21 +2,7 @@ <html><head> <title>Plugin_Time_Tracker.TimeTracker.TimeTrackEntry</title> <meta charset="UTF-8"> -<style> -body { - background: #EDECE6; - margin: 0em 1em 10em 1em; - color: black; -} - -h1 { color: white; background: #85774A; } -h2 { color: white; background: #85774A; } -h3 { color: white; background: #9D936E; } -h4 { color: white; background: #9D936E; } - -a { color: #BA6D36; } - -</style> +<link rel="stylesheet" href="styles.css"> </head> <body> <a NAME="top" ID="top"></a>
--- a/TimeTracker/Documentation/source/Plugin_Time_Tracker.TimeTracker.TimeTracker.html Thu Dec 30 11:20:04 2021 +0100 +++ b/TimeTracker/Documentation/source/Plugin_Time_Tracker.TimeTracker.TimeTracker.html Thu Dec 30 12:37:37 2021 +0100 @@ -2,21 +2,7 @@ <html><head> <title>Plugin_Time_Tracker.TimeTracker.TimeTracker</title> <meta charset="UTF-8"> -<style> -body { - background: #EDECE6; - margin: 0em 1em 10em 1em; - color: black; -} - -h1 { color: white; background: #85774A; } -h2 { color: white; background: #85774A; } -h3 { color: white; background: #9D936E; } -h4 { color: white; background: #9D936E; } - -a { color: #BA6D36; } - -</style> +<link rel="stylesheet" href="styles.css"> </head> <body> <a NAME="top" ID="top"></a>
--- a/TimeTracker/Documentation/source/Plugin_Time_Tracker.TimeTracker.TimeTrackerEntryDialog.html Thu Dec 30 11:20:04 2021 +0100 +++ b/TimeTracker/Documentation/source/Plugin_Time_Tracker.TimeTracker.TimeTrackerEntryDialog.html Thu Dec 30 12:37:37 2021 +0100 @@ -2,21 +2,7 @@ <html><head> <title>Plugin_Time_Tracker.TimeTracker.TimeTrackerEntryDialog</title> <meta charset="UTF-8"> -<style> -body { - background: #EDECE6; - margin: 0em 1em 10em 1em; - color: black; -} - -h1 { color: white; background: #85774A; } -h2 { color: white; background: #85774A; } -h3 { color: white; background: #9D936E; } -h4 { color: white; background: #9D936E; } - -a { color: #BA6D36; } - -</style> +<link rel="stylesheet" href="styles.css"> </head> <body> <a NAME="top" ID="top"></a>
--- a/TimeTracker/Documentation/source/Plugin_Time_Tracker.TimeTracker.TimeTrackerWidget.html Thu Dec 30 11:20:04 2021 +0100 +++ b/TimeTracker/Documentation/source/Plugin_Time_Tracker.TimeTracker.TimeTrackerWidget.html Thu Dec 30 12:37:37 2021 +0100 @@ -2,21 +2,7 @@ <html><head> <title>Plugin_Time_Tracker.TimeTracker.TimeTrackerWidget</title> <meta charset="UTF-8"> -<style> -body { - background: #EDECE6; - margin: 0em 1em 10em 1em; - color: black; -} - -h1 { color: white; background: #85774A; } -h2 { color: white; background: #85774A; } -h3 { color: white; background: #9D936E; } -h4 { color: white; background: #9D936E; } - -a { color: #BA6D36; } - -</style> +<link rel="stylesheet" href="styles.css"> </head> <body> <a NAME="top" ID="top"></a>
--- a/TimeTracker/Documentation/source/index-Plugin_Time_Tracker.TimeTracker.ConfigurationPage.html Thu Dec 30 11:20:04 2021 +0100 +++ b/TimeTracker/Documentation/source/index-Plugin_Time_Tracker.TimeTracker.ConfigurationPage.html Thu Dec 30 12:37:37 2021 +0100 @@ -2,21 +2,7 @@ <html><head> <title>Plugin_Time_Tracker.TimeTracker.ConfigurationPage</title> <meta charset="UTF-8"> -<style> -body { - background: #EDECE6; - margin: 0em 1em 10em 1em; - color: black; -} - -h1 { color: white; background: #85774A; } -h2 { color: white; background: #85774A; } -h3 { color: white; background: #9D936E; } -h4 { color: white; background: #9D936E; } - -a { color: #BA6D36; } - -</style> +<link rel="stylesheet" href="styles.css"> </head> <body> <h1>Plugin_Time_Tracker.TimeTracker.ConfigurationPage</h1>
--- a/TimeTracker/Documentation/source/index-Plugin_Time_Tracker.TimeTracker.html Thu Dec 30 11:20:04 2021 +0100 +++ b/TimeTracker/Documentation/source/index-Plugin_Time_Tracker.TimeTracker.html Thu Dec 30 12:37:37 2021 +0100 @@ -2,21 +2,7 @@ <html><head> <title>Plugin_Time_Tracker.TimeTracker</title> <meta charset="UTF-8"> -<style> -body { - background: #EDECE6; - margin: 0em 1em 10em 1em; - color: black; -} - -h1 { color: white; background: #85774A; } -h2 { color: white; background: #85774A; } -h3 { color: white; background: #9D936E; } -h4 { color: white; background: #9D936E; } - -a { color: #BA6D36; } - -</style> +<link rel="stylesheet" href="styles.css"> </head> <body> <h1>Plugin_Time_Tracker.TimeTracker</h1>
--- a/TimeTracker/Documentation/source/index-Plugin_Time_Tracker.html Thu Dec 30 11:20:04 2021 +0100 +++ b/TimeTracker/Documentation/source/index-Plugin_Time_Tracker.html Thu Dec 30 12:37:37 2021 +0100 @@ -2,21 +2,7 @@ <html><head> <title>Plugin_Time_Tracker</title> <meta charset="UTF-8"> -<style> -body { - background: #EDECE6; - margin: 0em 1em 10em 1em; - color: black; -} - -h1 { color: white; background: #85774A; } -h2 { color: white; background: #85774A; } -h3 { color: white; background: #9D936E; } -h4 { color: white; background: #9D936E; } - -a { color: #BA6D36; } - -</style> +<link rel="stylesheet" href="styles.css"> </head> <body> <h1>Plugin_Time_Tracker</h1>
--- a/TimeTracker/Documentation/source/index.html Thu Dec 30 11:20:04 2021 +0100 +++ b/TimeTracker/Documentation/source/index.html Thu Dec 30 12:37:37 2021 +0100 @@ -2,21 +2,7 @@ <html><head> <title>Table of contents</title> <meta charset="UTF-8"> -<style> -body { - background: #EDECE6; - margin: 0em 1em 10em 1em; - color: black; -} - -h1 { color: white; background: #85774A; } -h2 { color: white; background: #85774A; } -h3 { color: white; background: #9D936E; } -h4 { color: white; background: #9D936E; } - -a { color: #BA6D36; } - -</style> +<link rel="stylesheet" href="styles.css"> </head> <body> <h1>Table of contents</h1>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/TimeTracker/Documentation/source/styles.css Thu Dec 30 12:37:37 2021 +0100 @@ -0,0 +1,12 @@ +body { + color: black; + background: #EDECE6; + margin: 0em 1em 10em 1em; +} + +h1 { color: white; background: #85774A; } +h2 { color: white; background: #85774A; } +h3 { color: white; background: #9D936E; } +h4 { color: white; background: #9D936E; } + +a { color: #BA6D36; }
--- a/TimeTracker/TimeTrackEntry.py Thu Dec 30 11:20:04 2021 +0100 +++ b/TimeTracker/TimeTrackEntry.py Thu Dec 30 12:37:37 2021 +0100 @@ -91,62 +91,7 @@ self.__valid = True return self.__id - -## def toString(self): -## """ -## Public method to get a string representation of the entry. -## -## @return string representation of the entry (string) -## """ -## if self.__valid: -## dataLine = TimeTrackEntry.Separator.join([ -## str(self.__id), -## self.__startDateTime.toString(Qt.DateFormat.ISODate), -## str(self.__duration), -## self.__task, -## self.__comment, -## ]) -## return "{0}{1}".format(TimeTrackEntry.LineMarker, dataLine) -## else: -## return "" -## -## def fromString(self, line): -## """ -## Public method to populate the entry from the given string. -## -## @param line stringified entry data as generated by toString() (string) -## @return ID of the tracker entry; -1 indicates an error (integer) -## """ -## if not line.startswith(TimeTrackEntry.LineMarker): -## return -1 -## -## line = line.replace(TimeTrackEntry.LineMarker, "") -## dataList = line.split(TimeTrackEntry.Separator) -## if len(dataList) != self.__entryMembersCount: -## return -1 -## -## try: -## self.__id = int(dataList[0]) -## except ValueError: -## return -1 -## -## dt = QDateTime.fromString(dataList[1], Qt.DateFormat.ISODate) -## if not dt.isValid(): -## return -1 -## self.__startDateTime = dt -## -## try: -## dt = int(dataList[2]) -## except ValueError: -## return -1 -## self.__duration = dt -## -## self.__task = dataList[3] -## self.__comment = dataList[4] -## -## self.__valid = True -## return self.__id -## + def isValid(self): """ Public method to check the validity of the entry.
--- a/TimeTracker/TimeTracker.py Thu Dec 30 11:20:04 2021 +0100 +++ b/TimeTracker/TimeTracker.py Thu Dec 30 12:37:37 2021 +0100 @@ -66,10 +66,11 @@ from .TimeTrackerWidget import TimeTrackerWidget self.__widget = TimeTrackerWidget(self) - if self.__ui.getLayoutType() == "Sidebars": - iconName = "sbTimeTracker96" - else: - iconName = "clock-{0}".format(self.__iconSuffix) + iconName = ( + "sbTimeTracker96" + if self.__ui.getLayoutType() == "Sidebars" else + "clock-{0}".format(self.__iconSuffix) + ) self.__ui.addSideWidget( self.__ui.BottomSide, self.__widget, UI.PixmapCache.getIcon( @@ -158,7 +159,7 @@ invalidCount = 0 for data in entriesDataList: - entry = TimeTrackEntry(self.__plugin) + entry = TimeTrackEntry(self.__plugin) eid = entry.fromDict(data) if eid > -1: self.__entries[eid] = entry
