GNOME.org
 

[orca/new-settings] Converting the constant references to strings so the backends can use them

commit 2b04775c22eaa44c055c8f23cc27a6c8c6ce7c37
Author: Juanje Ojeda <jojeda emergya es>
Date:   Sun Oct 24 22:48:09 2010 +0200

    Converting the constant references to strings so the backends can use them

 src/orca/settings.py |   76 +++++++++++++++++++++++++-------------------------
 1 files changed, 38 insertions(+), 38 deletions(-)
---
diff --git a/src/orca/settings.py b/src/orca/settings.py
index e82889b..859268e 100644
--- a/src/orca/settings.py
+++ b/src/orca/settings.py
@@ -254,7 +254,7 @@ firstStart = True
 #
 DESKTOP_MODIFIER_KEYS = ["Insert", "KP_Insert"]
 LAPTOP_MODIFIER_KEYS  = ["Caps_Lock"]
-orcaModifierKeys      = DESKTOP_MODIFIER_KEYS
+orcaModifierKeys      = 'DESKTOP_MODIFIER_KEYS'
 
 # If True, some validation of the keybindings will be done to check for
 # missing keysyms and duplicate keys used for different operations.
@@ -272,14 +272,14 @@ MODIFIER_ORCA = 8
 #
 VERBOSITY_LEVEL_BRIEF   = 0
 VERBOSITY_LEVEL_VERBOSE = 1
-speechVerbosityLevel    = VERBOSITY_LEVEL_VERBOSE
-brailleVerbosityLevel   = VERBOSITY_LEVEL_VERBOSE
-flashVerbosityLevel     = VERBOSITY_LEVEL_VERBOSE
-messageVerbosityLevel   = VERBOSITY_LEVEL_VERBOSE
+speechVerbosityLevel    = 'VERBOSITY_LEVEL_VERBOSE'
+brailleVerbosityLevel   = 'VERBOSITY_LEVEL_VERBOSE'
+flashVerbosityLevel     = 'VERBOSITY_LEVEL_VERBOSE'
+messageVerbosityLevel   = 'VERBOSITY_LEVEL_VERBOSE'
 
 BRAILLE_ROLENAME_STYLE_SHORT = 0 # three letter abbreviations
 BRAILLE_ROLENAME_STYLE_LONG  = 1 # full rolename
-brailleRolenameStyle    = BRAILLE_ROLENAME_STYLE_LONG
+brailleRolenameStyle    = 'BRAILLE_ROLENAME_STYLE_LONG'
 
 # Roles to force to be displayed even when the verbosity level
 # is not verbose.
@@ -296,7 +296,7 @@ BRAILLE_SEL_NONE = 0x00 # 00000000
 BRAILLE_SEL_7    = 0x40 # 01000000
 BRAILLE_SEL_8    = 0x80 # 10000000
 BRAILLE_SEL_BOTH = 0xc0 # 11000000
-brailleSelectorIndicator = BRAILLE_SEL_BOTH
+brailleSelectorIndicator = 'BRAILLE_SEL_BOTH'
 
 # Braille Link Indicator (see brailleLinkIndicator).
 # The values represent the character to be used in the attrOr
@@ -306,7 +306,7 @@ BRAILLE_LINK_NONE = 0x00 # 00000000
 BRAILLE_LINK_7    = 0x40 # 01000000
 BRAILLE_LINK_8    = 0x80 # 10000000
 BRAILLE_LINK_BOTH = 0xc0 # 11000000
-brailleLinkIndicator = BRAILLE_LINK_BOTH
+brailleLinkIndicator = 'BRAILLE_LINK_BOTH'
 
 # Braille alignment styles.  These say how to align text on the
 # edges of the braille display.  The brailleAlignmentMargin value
@@ -319,7 +319,7 @@ ALIGN_BRAILLE_BY_MARGIN = 1
 ALIGN_BRAILLE_BY_WORD   = 2
 brailleAlignmentMargin  = 3
 brailleMaximumJump      = 8
-brailleAlignmentStyle   = ALIGN_BRAILLE_BY_EDGE
+brailleAlignmentStyle   = 'ALIGN_BRAILLE_BY_EDGE'
 
 # Speech punctuation levels (see verbalizePunctuationStyle).
 #
@@ -327,13 +327,13 @@ PUNCTUATION_STYLE_NONE = 3
 PUNCTUATION_STYLE_SOME = 2
 PUNCTUATION_STYLE_MOST = 1
 PUNCTUATION_STYLE_ALL  = 0
-verbalizePunctuationStyle = PUNCTUATION_STYLE_MOST
+verbalizePunctuationStyle = 'PUNCTUATION_STYLE_MOST'
 
 # Say All styles (see sayAllStyle).
 #
 SAYALL_STYLE_LINE     = 0
 SAYALL_STYLE_SENTENCE = 1
-sayAllStyle = SAYALL_STYLE_SENTENCE
+sayAllStyle = 'SAYALL_STYLE_SENTENCE'
 
 # The absolue amount to change the speech rate when
 # increasing or decreasing speech.  This is a numerical
@@ -398,10 +398,10 @@ HYPERLINK_VOICE         = "hyperlink"
 SYSTEM_VOICE            = "system"
 
 voices = {
-    DEFAULT_VOICE   : ACSS({}),
-    UPPERCASE_VOICE : ACSS({ACSS.AVERAGE_PITCH : 5.6}),
-    HYPERLINK_VOICE : ACSS({}),
-    SYSTEM_VOICE    : ACSS({}),
+    'DEFAULT_VOICE'   : 'ACSS({})',
+    'UPPERCASE_VOICE' : 'ACSS({ACSS.AVERAGE_PITCH : 5.6})',
+    'HYPERLINK_VOICE' : 'ACSS({})',
+    'SYSTEM_VOICE'    : 'ACSS({})',
 }
 
 # If True, enable speaking of speech indentation and justification.
@@ -496,14 +496,14 @@ MAG_ZOOMER_TYPE_BOTTOM_HALF      = 2
 MAG_ZOOMER_TYPE_LEFT_HALF        = 3
 MAG_ZOOMER_TYPE_RIGHT_HALF       = 4
 MAG_ZOOMER_TYPE_CUSTOM           = 5
-magZoomerType                    = MAG_ZOOMER_TYPE_FULL_SCREEN
+magZoomerType                    = 'MAG_ZOOMER_TYPE_FULL_SCREEN'
 
 # Magnification zoomer region placement.
 #
-magZoomerLeft                    = screenWidth / 2
-magZoomerRight                   = screenWidth
+magZoomerLeft                    = 'screenWidth / 2'
+magZoomerRight                   = 'screenWidth'
 magZoomerTop                     = 0
-magZoomerBottom                  = screenHeight
+magZoomerBottom                  = 'screenHeight'
 
 # Magnification zoom factor.
 #
@@ -550,13 +550,13 @@ MAG_COLOR_FILTERING_MODE_DESATURATE_GREEN     = 5
 MAG_COLOR_FILTERING_MODE_DESATURATE_BLUE      = 6
 MAG_COLOR_FILTERING_MODE_POSITIVE_HUE_SHIFT   = 7
 MAG_COLOR_FILTERING_MODE_NEGATIVE_HUE_SHIFT   = 8
-magColorFilteringMode = MAG_COLOR_FILTERING_MODE_NONE
+magColorFilteringMode = 'MAG_COLOR_FILTERING_MODE_NONE'
 
 # Magnification smoothing mode (see magSmoothingMode).
 #
 MAG_SMOOTHING_MODE_BILINEAR      = 0
 MAG_SMOOTHING_MODE_NONE          = 1
-magSmoothingMode                 = MAG_SMOOTHING_MODE_BILINEAR
+magSmoothingMode                 = 'MAG_SMOOTHING_MODE_BILINEAR'
 
 # Magnification tracking mode styles (see magMouseTrackingMode,
 # magControlTrackingMode and magTextTrackingMode).
@@ -568,22 +568,22 @@ MAG_TRACKING_MODE_NONE         = 3
 
 # To retain backward compatibility with previous versions of Orca.
 #
-MAG_MOUSE_TRACKING_MODE_CENTERED = MAG_TRACKING_MODE_CENTERED
-MAG_MOUSE_TRACKING_MODE_PROPORTIONAL = MAG_TRACKING_MODE_PROPORTIONAL
-MAG_MOUSE_TRACKING_MODE_PUSH = MAG_TRACKING_MODE_PUSH
-MAG_MOUSE_TRACKING_MODE_NONE = MAG_TRACKING_MODE_NONE
+MAG_MOUSE_TRACKING_MODE_CENTERED = 'MAG_TRACKING_MODE_CENTERED'
+MAG_MOUSE_TRACKING_MODE_PROPORTIONAL = 'MAG_TRACKING_MODE_PROPORTIONAL'
+MAG_MOUSE_TRACKING_MODE_PUSH = 'MAG_TRACKING_MODE_PUSH'
+MAG_MOUSE_TRACKING_MODE_NONE = 'MAG_TRACKING_MODE_NONE'
 
 # Magnification mouse tracking mode.
 #
-magMouseTrackingMode           = MAG_TRACKING_MODE_CENTERED
+magMouseTrackingMode           = 'MAG_TRACKING_MODE_CENTERED'
 
 # Magnification control and menu item tracking mode.
 #
-magControlTrackingMode         = MAG_TRACKING_MODE_PUSH
+magControlTrackingMode         = 'MAG_TRACKING_MODE_PUSH'
 
 # Magnification text cursor tracking mode.
 #
-magTextTrackingMode            = MAG_TRACKING_MODE_PUSH
+magTextTrackingMode            = 'MAG_TRACKING_MODE_PUSH'
 
 # Magnification edge margin (percentage of screen).
 #
@@ -688,7 +688,7 @@ presentToolTips = False and canPresentToolTips
 #
 GENERAL_KEYBOARD_LAYOUT_DESKTOP = 1
 GENERAL_KEYBOARD_LAYOUT_LAPTOP  = 2
-keyboardLayout                  = GENERAL_KEYBOARD_LAYOUT_DESKTOP
+keyboardLayout                  = 'GENERAL_KEYBOARD_LAYOUT_DESKTOP'
 
 # The red, green, blue values to use to outline the current item in
 # flat review mode. They are values between 0 and 65535 (0xFFFF), with
@@ -711,7 +711,7 @@ OUTLINE_NONE = 0
 OUTLINE_BOX = 1
 OUTLINE_LINE = 2
 OUTLINE_WEDGES = 3
-outlineStyle = OUTLINE_BOX
+outlineStyle = 'OUTLINE_BOX'
 
 # If True, speak blank lines.
 #
@@ -745,7 +745,7 @@ progressBarUpdateInterval = 10
 PROGRESS_BAR_ALL = 0
 PROGRESS_BAR_APPLICATION = 1
 PROGRESS_BAR_WINDOW = 2
-progressBarVerbosity = PROGRESS_BAR_APPLICATION
+progressBarVerbosity = 'PROGRESS_BAR_APPLICATION'
 
 # Whether or not to present the 'read only' attribute of text areas
 # if we can detect they are read only or not.
@@ -799,7 +799,7 @@ TEXT_ATTR_BRAILLE_NONE = 0x00 # 00000000
 TEXT_ATTR_BRAILLE_7    = 0x40 # 01000000
 TEXT_ATTR_BRAILLE_8    = 0x80 # 10000000
 TEXT_ATTR_BRAILLE_BOTH = 0xc0 # 11000000
-textAttributesBrailleIndicator = TEXT_ATTR_BRAILLE_NONE
+textAttributesBrailleIndicator = 'TEXT_ATTR_BRAILLE_NONE'
 
 # The limit to enable a repeat character count to be spoken.
 # If set to 0, then there will be no repeat character count.
@@ -959,7 +959,7 @@ CHAT_SPEAK_ALL             = 0
 CHAT_SPEAK_ALL_IF_FOCUSED  = 1
 CHAT_SPEAK_FOCUSED_CHANNEL = 2
 
-chatMessageVerbosity = CHAT_SPEAK_ALL
+chatMessageVerbosity = 'CHAT_SPEAK_ALL'
 
 # Whether we prefix chat room messages with the name of the chat room.
 #
@@ -1348,7 +1348,7 @@ ALL_BUT_NUMLOCK_MODIFIER_MASK = (1 << MODIFIER_ORCA |
 # conflicts with other commands, such as Orca's command for moving
 # among headings (H) and the Help menu (Alt+H).
 #
-defaultModifierMask = NON_LOCKING_MODIFIER_MASK
+defaultModifierMask = 'NON_LOCKING_MODIFIER_MASK'
 
 # Whether or not we should present objects with STATE_REQUIRED to
 # the user. Currently, this is only seen with ARIA widgets.
@@ -1539,7 +1539,7 @@ TIME_FORMAT_24_HM = "%H:%M"
 #
 TIME_FORMAT_24_HM_WITH_WORDS = _("%H hours and %M minutes.")
 TIME_FORMAT_CUSTOM = "%X"
-presentTimeFormat = TIME_FORMAT_LOCALE
+presentTimeFormat = 'TIME_FORMAT_LOCALE'
 
 # Format directives to use in presentDate function.
 # By default we use the date format according to the current locale.
@@ -1566,7 +1566,7 @@ DATE_FORMAT_ABBREVIATED_YMD = "%Y. %b %-d, %a."
 
 # To keep Orca from spitting up upon launch.
 #
-DATE_FORMAT_WITH_LONG_NAMES = DATE_FORMAT_FULL_DMY
-DATE_FORMAT_WITH_SHORT_NAMES = DATE_FORMAT_ABBREVIATED_DMY
+DATE_FORMAT_WITH_LONG_NAMES = 'DATE_FORMAT_FULL_DMY'
+DATE_FORMAT_WITH_SHORT_NAMES = 'DATE_FORMAT_ABBREVIATED_DMY'
 
-presentDateFormat = DATE_FORMAT_LOCALE
+presentDateFormat = 'DATE_FORMAT_LOCALE'
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]