[orca/new-settings] Adding exclude keys for avoiding to put only generic keys into profiles



commit a4f52f6a874a9589f7e983da8dd3978e1c284d6f
Author: Javier Hernández Antúnez <jhernandez emergya es>
Date:   Tue Nov 2 18:41:22 2010 +0100

    Adding exclude keys for avoiding to put only generic keys into profiles

 src/orca/backends/yaml_backend.py |    2 +-
 src/orca/settings.py              |    6 ++++++
 src/orca/settings_manager.py      |    4 ++--
 3 files changed, 9 insertions(+), 3 deletions(-)
---
diff --git a/src/orca/backends/yaml_backend.py b/src/orca/backends/yaml_backend.py
index 9088490..aa08524 100644
--- a/src/orca/backends/yaml_backend.py
+++ b/src/orca/backends/yaml_backend.py
@@ -97,7 +97,7 @@ class Backend:
         generalSettings = self.general.copy()
         profileSettings = self.profiles[profile].copy()
         for key, value in profileSettings.items():
-            if key not in ['pronunciations', 'keybindings']:
+            if key not in settings.excludeKeys:
                 generalSettings[key] = value
         return generalSettings
 
diff --git a/src/orca/settings.py b/src/orca/settings.py
index 386b30c..16b9771 100644
--- a/src/orca/settings.py
+++ b/src/orca/settings.py
@@ -205,6 +205,12 @@ userCustomizableSettings = [
     "firstStart"
 ]
 
+excludeKeys = ["pronunciations",
+               "keybindings",
+               "startingProfile",
+               "activeProfile",
+               "firstStart"]
+
 # The name of the module that hold the user interface for the main window
 # for Orca. This module is expected to have two methods, showMainUI and
 # hideMainUI, which will show and hide the main window GUI.
diff --git a/src/orca/settings_manager.py b/src/orca/settings_manager.py
index 685e095..374ae7c 100644
--- a/src/orca/settings_manager.py
+++ b/src/orca/settings_manager.py
@@ -295,7 +295,7 @@ class SettingsManager(object):
         self.profileGeneral = {}
 
         for key, value in general.items():
-            if key in ['pronunciations', 'keybindings']:
+            if key in settings.excludeKeys:
                 continue
             elif key == 'profile':
                 self.profileGeneral[key] = value
@@ -404,7 +404,7 @@ class SettingsManager(object):
         general = {}
 
         for key, value in prefs.items():
-            if key not in ['pronunciations', 'keybindings']:
+            if key not in settings.excludeKeys:
                 general[key] = value
 
         pronunciations = prefs.get('pronunciations', {})



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]