Merged with changes from Tobias.

Tue, 27 Aug 2013 19:08:40 +0200

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Tue, 27 Aug 2013 19:08:40 +0200
changeset 37
0cbb04007ff1
parent 35
27e7499eca6f (current diff)
parent 36
d3312087bb1d (diff)
child 38
dbe25d151ec5

Merged with changes from Tobias.

PluginTimeTracker.zip file | annotate | diff | comparison | revisions
--- a/ChangeLog	Sat Jul 13 11:42:49 2013 +0200
+++ b/ChangeLog	Tue Aug 27 19:08:40 2013 +0200
@@ -1,5 +1,8 @@
 ChangeLog
 ---------
+Version 1.2.0:
+- Python 2 compatibility for Eric 5
+
 Version 1.1.0:
 - bug fixes
 - modified code to do lazy import
--- a/PluginTimeTracker.py	Sat Jul 13 11:42:49 2013 +0200
+++ b/PluginTimeTracker.py	Tue Aug 27 19:08:40 2013 +0200
@@ -7,6 +7,8 @@
 Module implementing the Time Tracker plugin.
 """
 
+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os
 
 from PyQt4.QtCore import QObject, QTranslator, QCoreApplication
@@ -22,7 +24,7 @@
 author = "Detlev Offenbach <detlev@die-offenbachs.de>"
 autoactivate = True
 deactivateable = True
-version = "1.1.0"
+version = "1.2.0"
 className = "TimeTrackerPlugin"
 packageName = "TimeTracker"
 shortDescription = "Time Tracker to keep track of the project time."
Binary file PluginTimeTracker.zip has changed
--- a/TimeTracker/ConfigurationPage/TimeTrackerPage.py	Sat Jul 13 11:42:49 2013 +0200
+++ b/TimeTracker/ConfigurationPage/TimeTrackerPage.py	Tue Aug 27 19:08:40 2013 +0200
@@ -7,6 +7,8 @@
 Module implementing the Time Tracker configuration page.
 """
 
+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from Preferences.ConfigurationPages.ConfigurationPageBase import ConfigurationPageBase
 from .Ui_TimeTrackerPage import Ui_TimeTrackerPage
 
@@ -21,7 +23,7 @@
         
         @param plugin reference to the plugin object
         """
-        super().__init__()
+        super(TimeTrackerPage, self).__init__()
         self.setupUi(self)
         self.setObjectName("TimeTrackerPage")
         
--- a/TimeTracker/TimeTrackEntry.py	Sat Jul 13 11:42:49 2013 +0200
+++ b/TimeTracker/TimeTrackEntry.py	Tue Aug 27 19:08:40 2013 +0200
@@ -7,6 +7,8 @@
 Module implementing the time track entry class.
 """
 
+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import Qt, QDateTime, QTime
 
 
--- a/TimeTracker/TimeTracker.py	Sat Jul 13 11:42:49 2013 +0200
+++ b/TimeTracker/TimeTracker.py	Tue Aug 27 19:08:40 2013 +0200
@@ -7,6 +7,8 @@
 Module implementing the time tracker object.
 """
 
+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os
 
 from PyQt4.QtCore import Qt, QObject
--- a/TimeTracker/TimeTrackerEntryDialog.py	Sat Jul 13 11:42:49 2013 +0200
+++ b/TimeTracker/TimeTrackerEntryDialog.py	Tue Aug 27 19:08:40 2013 +0200
@@ -7,6 +7,8 @@
 Module implementing the time tracker edit dialog.
 """
 
+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import pyqtSlot, QDateTime, QDate
 from PyQt4.QtGui import QDialog, QDialogButtonBox
 
@@ -29,7 +31,7 @@
             comment combo box (list of strings)
         @param parent reference to the parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(TimeTrackerEntryDialog, self).__init__(parent)
         self.setupUi(self)
         
         self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(False)
--- a/TimeTracker/TimeTrackerWidget.py	Sat Jul 13 11:42:49 2013 +0200
+++ b/TimeTracker/TimeTrackerWidget.py	Tue Aug 27 19:08:40 2013 +0200
@@ -7,6 +7,8 @@
 Module implementing the time tracker widget.
 """
 
+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os
 
 from PyQt4.QtCore import pyqtSlot, QPoint, Qt, QDate, QTime, QFileInfo
@@ -35,7 +37,7 @@
         @param tracker reference to the time tracker (TimeTracker)
         @param parent reference to the parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(TimeTrackerWidget, self).__init__(parent)
         self.setupUi(self)
         
         self.__tracker = tracker

eric ide

mercurial