Merge branch 'testing' fixed preferences GUI.

src/cthulhu/cthulhu.py

@@ -554,6 +554,23 @@ def _showPreferencesUI(script, prefs):
     cthulhu_state.cthulhuOS.init(script)
     cthulhu_state.cthulhuOS.showGUI()
 
+def showAppPreferencesGUI(script=None, inputEvent=None):
+    """Displays the user interface to configure the settings for a
+    specific applications within Cthulhu and set up those app-specific
+    user preferences using a GUI.
+
+    Returns True to indicate the input event has been consumed.
+    """
+
+    prefs = {}
+    for key in settings.userCustomizableSettings:
+        prefs[key] = _settingsManager.getSetting(key)
+
+    script = script or cthulhu_state.activeScript
+    _showPreferencesUI(script, prefs)
+
+    return True
+
 def showPreferencesGUI(script=None, inputEvent=None):
     """Displays the user interface to configure Cthulhu and set up
     user preferences using a GUI.

src/cthulhu/scripts/default.py

@@ -209,6 +209,16 @@ class Script(script.Script):
                 cthulhu.quitCthulhu,
                 cmdnames.QUIT_CTHULHU)
 
+        self.inputEventHandlers["preferencesSettingsHandler"] = \
+            input_event.InputEventHandler(
+                cthulhu.showPreferencesGUI,
+                cmdnames.SHOW_PREFERENCES_GUI)
+
+        self.inputEventHandlers["appPreferencesSettingsHandler"] = \
+            input_event.InputEventHandler(
+                cthulhu.showAppPreferencesGUI,
+                cmdnames.SHOW_APP_PREFERENCES_GUI)
+
         self.inputEventHandlers["cycleSettingsProfileHandler"] = \
             input_event.InputEventHandler(
                 Script.cycleSettingsProfile,