Mercurial Repositories > Time Tracker / changeset

diff -r dcd42dec1035 -r 08e308c7a85d ChangeLog
--- a/ChangeLog	Mon Nov 05 11:44:48 2012 +0100
+++ b/ChangeLog	Tue Nov 06 17:16:22 2012 +0100
@@ -1,7 +1,7 @@
 ChangeLog
 ---------
 Version 0.3.0:
-- fixed a few bugs
+- bug fix related to uninstalling the plug-in via the external plug-in uninstaller
 - added Spanish translations
 
 Version 0.2.0:

diff -r dcd42dec1035 -r 08e308c7a85d PluginTimeTracker.py
--- a/PluginTimeTracker.py	Mon Nov 05 11:44:48 2012 +0100
+++ b/PluginTimeTracker.py	Tue Nov 06 17:16:22 2012 +0100
@@ -71,14 +71,15 @@
     """
     Module function to prepare for an uninstallation.
     """
-    tracker = TimeTrackerPlugin(None)
-    tracker.prepareUninstall()
+    Preferences.Prefs.settings.remove(TimeTrackerPlugin.PreferencesKey)
 
 
 class TimeTrackerPlugin(QObject):
     """
     Class implementing the Eric assistant plugin.
     """
+    PreferencesKey = "TimeTracker"
+    
     def __init__(self, ui):
         """
         Constructor
@@ -97,14 +98,14 @@
         
         self.__translator = None
         self.__loadTranslator()
-        
-        self.__e5project = e5App().getObject("Project")
     
     def __initialize(self):
         """
         Private slot to (re)initialize the plugin.
         """
         self.__object = None
+        
+        self.__e5project = e5App().getObject("Project")
     
     def __checkVersions(self):
         """
@@ -194,14 +195,14 @@
         @return the requested setting
         """
         if key in ["MinimumDuration"]:
-            return int(Preferences.Prefs.settings.value("TimeTracker/" + key,
+            return int(Preferences.Prefs.settings.value(self.PreferencesKey + "/" + key,
                 self.__defaults[key]))
         elif key in ["AutoSave", "AllowDuplicates"]:
             return Preferences.toBool(
-                Preferences.Prefs.settings.value("TimeTracker/" + key,
+                Preferences.Prefs.settings.value(self.PreferencesKey + "/" + key,
                     self.__defaults[key]))
         else:
-            return Preferences.Prefs.settings.value("TimeTracker/" + key,
+            return Preferences.Prefs.settings.value(self.PreferencesKey + "/" + key,
                 self.__defaults[key])
     
     def setPreferences(self, key, value):
@@ -213,9 +214,3 @@
         @param prefClass preferences class used as the storage area
         """
         Preferences.Prefs.settings.setValue("TimeTracker/" + key, value)
-    
-    def prepareUninstall(self):
-        """
-        Public method to prepare for an uninstallation.
-        """
-        Preferences.Prefs.settings.remove("TimeTracker")

diff -r dcd42dec1035 -r 08e308c7a85d PluginTimeTracker.zip
Binary file PluginTimeTracker.zip has changed

diff -r dcd42dec1035 -r 08e308c7a85d TimeTracker/Documentation/source/Plugin_Time_Tracker.PluginTimeTracker.html
--- a/TimeTracker/Documentation/source/Plugin_Time_Tracker.PluginTimeTracker.html	Mon Nov 05 11:44:48 2012 +0100
+++ b/TimeTracker/Documentation/source/Plugin_Time_Tracker.PluginTimeTracker.html	Tue Nov 06 17:16:22 2012 +0100
@@ -58,7 +58,7 @@
 QObject
 <h3>Class Attributes</h3>
 <table>
-<tr><td>None</td></tr>
+<tr><td>PreferencesKey</td></tr>
 </table>
 <h3>Class Methods</h3>
 <table>
@@ -88,9 +88,6 @@
 <td><a href="#TimeTrackerPlugin.getPreferences">getPreferences</a></td>
 <td>Public method to retrieve the various settings.</td>
 </tr><tr>
-<td><a href="#TimeTrackerPlugin.prepareUninstall">prepareUninstall</a></td>
-<td>Public method to prepare for an uninstallation.</td>
-</tr><tr>
 <td><a href="#TimeTrackerPlugin.setPreferences">setPreferences</a></td>
 <td>Public method to store the various settings.</td>
 </tr>
@@ -159,12 +156,7 @@
 <dd>
 the requested setting
 </dd>
-</dl><a NAME="TimeTrackerPlugin.prepareUninstall" ID="TimeTrackerPlugin.prepareUninstall"></a>
-<h4>TimeTrackerPlugin.prepareUninstall</h4>
-<b>prepareUninstall</b>(<i></i>)
-<p>
-        Public method to prepare for an uninstallation.
-</p><a NAME="TimeTrackerPlugin.setPreferences" ID="TimeTrackerPlugin.setPreferences"></a>
+</dl><a NAME="TimeTrackerPlugin.setPreferences" ID="TimeTrackerPlugin.setPreferences"></a>
 <h4>TimeTrackerPlugin.setPreferences</h4>
 <b>setPreferences</b>(<i>key, value</i>)
 <p>