diff -r a0beac325e5a -r 058c6a316ca8 TimeTracker/TimeTracker.py --- a/TimeTracker/TimeTracker.py Fri Oct 19 13:06:56 2012 +0200 +++ b/TimeTracker/TimeTracker.py Fri Oct 19 15:54:12 2012 +0200 @@ -9,20 +9,21 @@ import os -from PyQt4.QtCore import pyqtSignal, QObject +from PyQt4.QtCore import QObject from E5Gui.E5Application import e5App from E5Gui import E5MessageBox from .TimeTrackEntry import TimeTrackEntry +from .TimeTrackerWidget import TimeTrackerWidget + +import UI.PixmapCache class TimeTracker(QObject): """ Class implementing the time tracker object. """ - currentEntryChanged = pyqtSignal() - FileName = "TimeTracker.txt" def __init__(self, plugin, parent=None): @@ -39,6 +40,11 @@ self.__e5project = e5App().getObject("Project") + self.__widget = TimeTrackerWidget(self) + self.__ui.addSideWidget(self.__ui.BottomSide, self.__widget, + UI.PixmapCache.getIcon(os.path.join("TimeTracker", "icons", "clock.png")), + self.tr("Time Tracker")) + self.__initialize() def __initialize(self): @@ -51,6 +57,8 @@ self.__entries = [] self.__currentEntry = None + + self.__widget.clear() def projectOpened(self): """ @@ -66,10 +74,11 @@ TimeTracker.FileName) self.__readTrackerEntries() + self.__widget.showTrackerEntries(sorted(self.__entries, reverse=True)) self.__currentEntry = TimeTrackEntry() self.__currentEntry.start() - self.currentEntryChanged.emit() + self.__widget.setCurrentEntry(self.__currentEntry) def projectClosed(self): """ @@ -167,4 +176,3 @@ # start a new time tracker entry self.__currentEntry = TimeTrackEntry() self.__currentEntry.start() - self.currentEntryChanged.emit()