More sound support added.

src/cthulhu/sound_theme_manager.py

@@ -59,6 +59,7 @@ ROLE_SOUND_ALIASES = {
     Atspi.Role.TOGGLE_BUTTON: ["toggle_button", "button"],
     Atspi.Role.RADIO_BUTTON: ["radio_button", "radio"],
     Atspi.Role.CHECK_BOX: ["checkbox", "check_box"],
+    Atspi.Role.COMBO_BOX: ["combobox", "combo_box"],
 }
 
 ROLE_STATE_SOUND_BASES = {

src/cthulhu/speech_generator.py

@@ -710,8 +710,8 @@ class SpeechGenerator(generator.Generator):
         if not result:
             return result
 
-        if _settingsManager.getSetting('roleSoundPresentation') \
-                == settings.ROLE_SOUND_PRESENTATION_SPEECH_ONLY:
+        roleSoundPresentation = _settingsManager.getSetting('roleSoundPresentation')
+        if roleSoundPresentation == settings.ROLE_SOUND_PRESENTATION_SPEECH_ONLY:
             return result
 
         if not _settingsManager.getSetting('enableSound'):
@@ -721,6 +721,9 @@ class SpeechGenerator(generator.Generator):
         if not icon:
             return result
 
+        if roleSoundPresentation == settings.ROLE_SOUND_PRESENTATION_SOUND_ONLY:
+            return [icon]
+
         return [icon] + result
 
     def _generateCheckedState(self, obj, **args):