diff -r ad21e6a32d82 -r d0afa82c3deb TimeTracker/TimeTracker.py
--- a/TimeTracker/TimeTracker.py Thu Apr 24 19:22:51 2014 +0200
+++ b/TimeTracker/TimeTracker.py Sat Jul 12 16:29:25 2014 +0200
@@ -11,8 +11,8 @@
import os
-from PyQt4.QtCore import Qt, QObject
-from PyQt4.QtGui import QKeySequence
+from PyQt5.QtCore import Qt, QObject
+from PyQt5.QtGui import QKeySequence
from E5Gui.E5Application import e5App
from E5Gui import E5MessageBox
@@ -43,7 +43,7 @@
def __initialize(self):
"""
- Public slot to initialize some member variables.
+ Private slot to initialize some member variables.
"""
self.__projectPath = ''
self.__trackerFilePath = ''
@@ -69,19 +69,19 @@
self.tr("Time Tracker"))
self.__activateAct = E5Action(
- self.trUtf8('Time Tracker'),
- self.trUtf8('T&ime Tracker'),
- QKeySequence(self.trUtf8("Alt+Shift+I")),
+ self.tr('Time Tracker'),
+ self.tr('T&ime Tracker'),
+ QKeySequence(self.tr("Alt+Shift+I")),
0, self,
'time_tracker_activate')
- self.__activateAct.setStatusTip(self.trUtf8(
+ self.__activateAct.setStatusTip(self.tr(
"Switch the input focus to the Time Tracker window."))
- self.__activateAct.setWhatsThis(self.trUtf8(
+ self.__activateAct.setWhatsThis(self.tr(
"""<b>Activate Time Tracker</b>"""
"""<p>This switches the input focus to the Time Tracker"""
""" window.</p>"""
))
- self.__activateAct.triggered[()].connect(self.__activateWidget)
+ self.__activateAct.triggered.connect(self.__activateWidget)
self.__ui.addE5Actions([self.__activateAct], 'ui')
menu = self.__ui.getMenu("subwindow")
@@ -139,9 +139,9 @@
except (IOError, OSError) as err:
E5MessageBox.critical(
self.__ui,
- self.trUtf8("Read Time Tracker File"),
- self.trUtf8("""<p>The time tracker file <b>{0}</b> could"""
- """ not be read.</p><p>Reason: {1}</p>""")
+ self.tr("Read Time Tracker File"),
+ self.tr("""<p>The time tracker file <b>{0}</b> could"""
+ """ not be read.</p><p>Reason: {1}</p>""")
.format(self.__trackerFilePath, str(err)))
return
@@ -159,11 +159,11 @@
if invalidCount:
E5MessageBox.information(
self.__ui,
- self.trUtf8("Read Time Tracker File"),
- self.trUtf8("""<p>The time tracker file <b>{0}</b>"""
- """ contained %n invalid entries. These"""
- """ have been discarded.</p>""", "",
- invalidCount).format(self.__trackerFilePath))
+ self.tr("Read Time Tracker File"),
+ self.tr("""<p>The time tracker file <b>{0}</b>"""
+ """ contained %n invalid entries. These"""
+ """ have been discarded.</p>""", "",
+ invalidCount).format(self.__trackerFilePath))
def saveTrackerEntries(self, filePath="", ids=[]):
"""
@@ -189,9 +189,9 @@
except (IOError, OSError) as err:
E5MessageBox.critical(
self.__ui,
- self.trUtf8("Save Time Tracker File"),
- self.trUtf8("""<p>The time tracker file <b>{0}</b> could"""
- """ not be saved.</p><p>Reason: {1}</p>""")
+ self.tr("Save Time Tracker File"),
+ self.tr("""<p>The time tracker file <b>{0}</b> could"""
+ """ not be saved.</p><p>Reason: {1}</p>""")
.format(self.__trackerFilePath, str(err)))
def importTrackerEntries(self, fname):
@@ -207,9 +207,9 @@
except (IOError, OSError) as err:
E5MessageBox.critical(
self.__ui,
- self.trUtf8("Import Time Tracker File"),
- self.trUtf8("""<p>The time tracker file <b>{0}</b> could"""
- """ not be read.</p><p>Reason: {1}</p>""")
+ self.tr("Import Time Tracker File"),
+ self.tr("""<p>The time tracker file <b>{0}</b> could"""
+ """ not be read.</p><p>Reason: {1}</p>""")
.format(fname, str(err)))
return
@@ -228,7 +228,7 @@
if not self.__plugin.getPreferences("AllowDuplicates"):
startDateTimes = [
- entry.getStartDateTime() for entry in self.__entries.values()]
+ e.getStartDateTime() for e in self.__entries.values()]
for entry in entries[:]:
if entry.getStartDateTime() in startDateTimes:
entries.remove(entry)
@@ -270,7 +270,7 @@
"", invalidCount + duplicateCount)
E5MessageBox.information(
self.__ui,
- self.trUtf8("Import Time Tracker File"),
+ self.tr("Import Time Tracker File"),
msg)
self.__widget.clear()
