Mercurial Repositories > eric / file diff

diff -r 78539385a8df -r 2b1b9265156c Preferences/ConfigurationPages/TasksPage.py
--- a/Preferences/ConfigurationPages/TasksPage.py	Sun Nov 25 20:22:02 2012 +0100
+++ b/Preferences/ConfigurationPages/TasksPage.py	Mon Nov 26 19:07:40 2012 +0100
@@ -7,8 +7,6 @@
 Module implementing the Tasks configuration page.
 """
 
-from PyQt4.QtCore import pyqtSlot
-
 from .ConfigurationPageBase import ConfigurationPageBase
 from .Ui_TasksPage import Ui_TasksPage
 
@@ -27,8 +25,6 @@
         self.setupUi(self)
         self.setObjectName("TasksPage")
         
-        self.tasksColours = {}
-        
         # set initial values
         self.tasksMarkerFixmeEdit.setText(
             Preferences.getTasks("TasksFixmeMarkers"))
@@ -39,18 +35,14 @@
         self.tasksMarkerNoteEdit.setText(
             Preferences.getTasks("TasksNoteMarkers"))
         
-        self.tasksColours["TasksFixmeColor"] = \
-            self.initColour("TasksFixmeColor", self.tasksFixmeColourButton,
-                Preferences.getTasks)
-        self.tasksColours["TasksWarningColor"] = \
-            self.initColour("TasksWarningColor", self.tasksWarningColourButton,
-                Preferences.getTasks)
-        self.tasksColours["TasksTodoColor"] = \
-            self.initColour("TasksTodoColor", self.tasksTodoColourButton,
-                Preferences.getTasks)
-        self.tasksColours["TasksNoteColor"] = \
-            self.initColour("TasksNoteColor", self.tasksNoteColourButton,
-                Preferences.getTasks)
+        self.initColour("TasksFixmeColor", self.tasksFixmeColourButton,
+            Preferences.getTasks)
+        self.initColour("TasksWarningColor", self.tasksWarningColourButton,
+            Preferences.getTasks)
+        self.initColour("TasksTodoColor", self.tasksTodoColourButton,
+            Preferences.getTasks)
+        self.initColour("TasksNoteColor", self.tasksNoteColourButton,
+            Preferences.getTasks)
         
         self.clearCheckBox.setChecked(Preferences.getTasks("ClearOnFileClose"))
         
@@ -66,44 +58,9 @@
             self.tasksMarkerTodoEdit.text())
         Preferences.setTasks("TasksNoteMarkers",
             self.tasksMarkerNoteEdit.text())
-        for key in list(self.tasksColours.keys()):
-            Preferences.setTasks(key, self.tasksColours[key])
         Preferences.setTasks("ClearOnFileClose", self.clearCheckBox.isChecked())
         
-    @pyqtSlot()
-    def on_tasksFixmeColourButton_clicked(self):
-        """
-        Private slot to set the colour for standard tasks.
-        """
-        self.tasksColours["TasksColour"] = \
-            self.selectColour(self.tasksColourButton, self.tasksColours["TasksColour"])
-        
-    @pyqtSlot()
-    def on_tasksWarningColourButton_clicked(self):
-        """
-        Private slot to set the colour for bugfix tasks.
-        """
-        self.tasksColours["TasksBugfixColour"] = \
-            self.selectColour(self.tasksBugfixColourButton,
-                self.tasksColours["TasksBugfixColour"])
-        
-    @pyqtSlot()
-    def on_tasksTodoColourButton_clicked(self):
-        """
-        Private slot to set the background colour for global tasks.
-        """
-        self.tasksColours["TasksBgColour"] = \
-            self.selectColour(self.tasksBgColourButton,
-                self.tasksColours["TasksBgColour"])
-        
-    @pyqtSlot()
-    def on_tasksNoteColourButton_clicked(self):
-        """
-        Private slot to set the backgroundcolour for project tasks.
-        """
-        self.tasksColours["TasksProjectBgColour"] = \
-            self.selectColour(self.tasksProjectBgColourButton,
-                self.tasksColours["TasksProjectBgColour"])
+        self.saveColours(Preferences.setTasks)
     
 
 def create(dlg):