Mercurial Repositories > eric / file diff

--- a/Preferences/ConfigurationPages/VcsPage.py	Sun Nov 25 20:22:02 2012 +0100
+++ b/Preferences/ConfigurationPages/VcsPage.py	Mon Nov 26 19:07:40 2012 +0100
@@ -7,8 +7,6 @@
 Module implementing the VCS configuration page.
 """
 
-from PyQt4.QtCore import pyqtSlot
-
 from .ConfigurationPageBase import ConfigurationPageBase
 from .Ui_VcsPage import Ui_VcsPage
 
@@ -27,8 +25,6 @@
         self.setupUi(self)
         self.setObjectName("VcsPage")
         
-        self.projectBrowserColours = {}
-        
         # set initial values
         self.vcsAutoCloseCheckBox.setChecked(Preferences.getVCS("AutoClose"))
         self.vcsAutoSaveCheckBox.setChecked(Preferences.getVCS("AutoSaveFiles"))
@@ -41,27 +37,18 @@
         self.autoUpdateCheckBox.setChecked(
             Preferences.getVCS("AutoUpdate"))
         
-        self.projectBrowserColours["VcsAdded"] = \
-            self.initColour("VcsAdded", self.pbVcsAddedButton,
-                Preferences.getProjectBrowserColour)
-        self.projectBrowserColours["VcsConflict"] = \
-            self.initColour("VcsConflict", self.pbVcsConflictButton,
-                Preferences.getProjectBrowserColour)
-        self.projectBrowserColours["VcsModified"] = \
-            self.initColour("VcsModified", self.pbVcsModifiedButton,
-                Preferences.getProjectBrowserColour)
-        self.projectBrowserColours["VcsReplaced"] = \
-            self.initColour("VcsReplaced", self.pbVcsReplacedButton,
-                Preferences.getProjectBrowserColour)
-        self.projectBrowserColours["VcsUpdate"] = \
-            self.initColour("VcsUpdate", self.pbVcsUpdateButton,
-                Preferences.getProjectBrowserColour)
-        self.projectBrowserColours["VcsConflict"] = \
-            self.initColour("VcsConflict", self.pbVcsConflictButton,
-                Preferences.getProjectBrowserColour)
-        self.projectBrowserColours["VcsRemoved"] = \
-            self.initColour("VcsRemoved", self.pbVcsRemovedButton,
-                Preferences.getProjectBrowserColour)
+        self.initColour("VcsAdded", self.pbVcsAddedButton,
+            Preferences.getProjectBrowserColour)
+        self.initColour("VcsConflict", self.pbVcsConflictButton,
+            Preferences.getProjectBrowserColour)
+        self.initColour("VcsModified", self.pbVcsModifiedButton,
+            Preferences.getProjectBrowserColour)
+        self.initColour("VcsReplaced", self.pbVcsReplacedButton,
+            Preferences.getProjectBrowserColour)
+        self.initColour("VcsUpdate", self.pbVcsUpdateButton,
+            Preferences.getProjectBrowserColour)
+        self.initColour("VcsRemoved", self.pbVcsRemovedButton,
+            Preferences.getProjectBrowserColour)
     
     def save(self):
         """
@@ -80,68 +67,7 @@
         Preferences.setVCS("AutoUpdate",
             self.autoUpdateCheckBox.isChecked())
     
-        for key in list(self.projectBrowserColours.keys()):
-            Preferences.setProjectBrowserColour(key, self.projectBrowserColours[key])
-    
-    @pyqtSlot()
-    def on_pbVcsAddedButton_clicked(self):
-        """
-        Private slot to set the background colour for entries with VCS
-        status "added".
-        """
-        self.projectBrowserColours["VcsAdded"] = \
-            self.selectColour(self.pbVcsAddedButton,
-                self.projectBrowserColours["VcsAdded"])
-    
-    @pyqtSlot()
-    def on_pbVcsConflictButton_clicked(self):
-        """
-        Private slot to set the background colour for entries with VCS
-        status "conflict".
-        """
-        self.projectBrowserColours["VcsConflict"] = \
-            self.selectColour(self.pbVcsConflictButton,
-                self.projectBrowserColours["VcsConflict"])
-    
-    @pyqtSlot()
-    def on_pbVcsModifiedButton_clicked(self):
-        """
-        Private slot to set the background colour for entries with VCS
-        status "modified".
-        """
-        self.projectBrowserColours["VcsModified"] = \
-            self.selectColour(self.pbVcsModifiedButton,
-                self.projectBrowserColours["VcsModified"])
-    
-    @pyqtSlot()
-    def on_pbVcsReplacedButton_clicked(self):
-        """
-        Private slot to set the background colour for entries with VCS
-        status "replaced".
-        """
-        self.projectBrowserColours["VcsReplaced"] = \
-            self.selectColour(self.pbVcsReplacedButton,
-                self.projectBrowserColours["VcsReplaced"])
-    
-    @pyqtSlot()
-    def on_pbVcsRemovedButton_clicked(self):
-        """
-        Private slot to set the background colour for entries with VCS
-        status "removed".
-        """
-        self.projectBrowserColours["VcsRemoved"] = \
-            self.selectColour(self.pbVcsRemovedButton,
-                self.projectBrowserColours["VcsRemoved"])
-    
-    @pyqtSlot()
-    def on_pbVcsUpdateButton_clicked(self):
-        """
-        Private slot to set the background colour for entries with VCS
-        status "needs update".
-        """
-        self.projectBrowserColours["VcsUpdate"] = \
-            self.selectColour(self.pbVcsUpdateButton,
-                self.projectBrowserColours["VcsUpdate"])
+        self.saveColours(Preferences.setProjectBrowserColour)
 
 
 def create(dlg):