GNOME.org
 

[orca/orca-gnome3: 12/23] EOL/EndOfLine refactor for gsettings related purposes

commit ee18a5a69242c36bb9ab20d090ba76fd99df3278
Author: Javier Hernández Antúnez <jhernandez emergya es>
Date:   Fri Mar 4 00:53:01 2011 +0100

    EOL/EndOfLine refactor for gsettings related purposes

 src/orca/braille.py                                |    4 ++--
 src/orca/braille_generator.py                      |    2 +-
 src/orca/flat_review.py                            |    2 +-
 src/orca/formatting.py                             |    2 +-
 src/orca/orca-setup.ui                             |    2 +-
 src/orca/orca_gui_prefs.py                         |    4 ++--
 src/orca/orca_prefs.py                             |    2 +-
 src/orca/settings.py                               |    8 ++++----
 src/orca/settings_manager.py                       |    2 +-
 test/harness/user-settings.conf.in                 |    4 ++--
 .../firefox/sayAll_bug-591351-1.settings           |    4 ++--
 .../gtk-demo/spoken_indentation.settings           |    4 ++--
 12 files changed, 20 insertions(+), 20 deletions(-)
---
diff --git a/src/orca/braille.py b/src/orca/braille.py
index fc4b1c4..845c432 100644
--- a/src/orca/braille.py
+++ b/src/orca/braille.py
@@ -639,9 +639,9 @@ class Text(Region):
 
         Region.__init__(self, string, cursorOffset, True)
 
-        if not self.contracted and not settings.disableBrailleEOL:
+        if not self.contracted and not settings.disableBrailleEndOfLine:
             self.string += self.eol
-        elif settings.disableBrailleEOL:
+        elif settings.disableBrailleEndOfLine:
             # Ensure there is a place to click on at the end of a line
             # so the user can route the caret to the end of the line.
             #
diff --git a/src/orca/braille_generator.py b/src/orca/braille_generator.py
index 213e582..0dfa0cf 100644
--- a/src/orca/braille_generator.py
+++ b/src/orca/braille_generator.py
@@ -325,7 +325,7 @@ class BrailleGenerator(generator.Generator):
 
     def _generateEol(self, obj, **args):
         result = []
-        if not _settingsManager.getSetting('disableBrailleEOL'):
+        if not _settingsManager.getSetting('disableBrailleEndOfLine'):
             if not args.get('mode', None):
                 args['mode'] = self._mode
             args['stringType'] = 'eol'
diff --git a/src/orca/flat_review.py b/src/orca/flat_review.py
index 360b481..3d968d8 100644
--- a/src/orca/flat_review.py
+++ b/src/orca/flat_review.py
@@ -575,7 +575,7 @@ class Line:
 
                 brailleOffset += len(region.string.decode("UTF-8"))
 
-            if not settings.disableBrailleEOL:
+            if not settings.disableBrailleEndOfLine:
                 if len(self.brailleRegions):
                     pad = braille.Region(" ")
                     pad.brailleOffset = brailleOffset
diff --git a/src/orca/formatting.py b/src/orca/formatting.py
index df15003..0f14645 100644
--- a/src/orca/formatting.py
+++ b/src/orca/formatting.py
@@ -65,7 +65,7 @@ formatting = {
             'groupindex'   : settings.speechGroupIndexString,
         },
         'braille' : {
-            'eol'          : settings.brailleEOLIndicator,
+            'eol'          : settings.brailleEndOfLineIndicator,
             'required'     : settings.brailleRequiredStateString,
             'readonly'     : settings.brailleReadOnlyString,
             'insensitive'  : settings.brailleInsensitiveString,
diff --git a/src/orca/orca-setup.ui b/src/orca/orca-setup.ui
index a521b3c..844de40 100644
--- a/src/orca/orca-setup.ui
+++ b/src/orca/orca-setup.ui
@@ -1761,7 +1761,7 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkCheckButton" id="disableBrailleEOLCheckButton">
+                              <object class="GtkCheckButton" id="disableBrailleEndOfLineCheckButton">
                                 <property name="label" translatable="yes">Disable _end of line symbol</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
diff --git a/src/orca/orca_gui_prefs.py b/src/orca/orca_gui_prefs.py
index cee37d6..b76433a 100644
--- a/src/orca/orca_gui_prefs.py
+++ b/src/orca/orca_gui_prefs.py
@@ -1788,8 +1788,8 @@ class OrcaSetupGUI(orca_gtkbuilder.GtkBuilderWrapper):
                             settings.BRAILLE_ROLENAME_STYLE_SHORT
         self.get_widget("abbrevRolenames").set_active(state)
 
-        self.get_widget("disableBrailleEOLCheckButton").set_active(
-            prefs["disableBrailleEOL"])
+        self.get_widget("disableBrailleEndOfLineCheckButton").set_active(
+            prefs["disableBrailleEndOfLine"])
 
         if louis is None:
             self.get_widget( \
diff --git a/src/orca/orca_prefs.py b/src/orca/orca_prefs.py
index a259bf6..ad67a08 100644
--- a/src/orca/orca_prefs.py
+++ b/src/orca/orca_prefs.py
@@ -809,7 +809,7 @@ class OrcaPrefs:
                 value = self._getProgressBarVerbosityString(prefsDict[key])
             elif key == "brailleContractionTable":
                 value = "'%s'" % prefsDict[key]
-            elif key == "brailleEOLIndicator":
+            elif key == "brailleEndOfLineIndicator":
                 value = "'%s'" % prefsDict[key]
             elif key == "brailleRequiredStateString":
                 value = "'%s'" % prefsDict[key]
diff --git a/src/orca/settings.py b/src/orca/settings.py
index 73870a2..4e25a0f 100644
--- a/src/orca/settings.py
+++ b/src/orca/settings.py
@@ -112,8 +112,8 @@ userCustomizableSettings = [
     "enableBraille",
     "enableBrailleContext",
     "enableBrailleGrouping",
-    "disableBrailleEOL",
-    "brailleEOLIndicator",
+    "disableBrailleEndOfLine",
+    "brailleEndOfLineIndicator",
     "brailleVerbosityLevel",
     "brailleRolenameStyle",
     "brailleSelectorIndicator",
@@ -1261,8 +1261,8 @@ speechGroupIndexString = _("%(index)d of %(total)d")
 
 # string to indicate end of printed line for braille displays:
 #
-disableBrailleEOL = False
-brailleEOLIndicator = " $l"
+disableBrailleEndOfLine = False
+brailleEndOfLineIndicator = " $l"
 
 # Translators: Certain objects (such as form controls on web pages)
 # can have STATE_REQUIRED set on them to inform the user that this
diff --git a/src/orca/settings_manager.py b/src/orca/settings_manager.py
index 38756db..3cf2d1f 100644
--- a/src/orca/settings_manager.py
+++ b/src/orca/settings_manager.py
@@ -548,7 +548,7 @@ def getVoiceKey(voice):
     return ""
 
 def getValueForKey(prefsDict, key):
-    need2repr = ['brailleEOLIndicator', 'brailleContractionTable',
+    need2repr = ['brailleEndOfLineIndicator', 'brailleContractionTable',
                  'brailleRequiredStateString', 'enabledBrailledTextAttributes',
                  'enabledSpokenTextAttributes', 'magZoomerBorderColor',
                  'magCursorColor', 'magCrossHairColor', 'magTargetDisplay',
diff --git a/test/harness/user-settings.conf.in b/test/harness/user-settings.conf.in
index 626ba90..c43b79e 100644
--- a/test/harness/user-settings.conf.in
+++ b/test/harness/user-settings.conf.in
@@ -55,7 +55,7 @@
         "progressBarUpdateInterval": 10, 
         "speakCellCoordinates": true, 
         "enablePauseBreaks": true, 
-        "brailleEOLIndicator": " $l", 
+        "brailleEndOfLineIndicator": " $l", 
         "verbalizePunctuationStyle": 1, 
         "progressBarVerbosity": 1, 
         "enableSpeech": true, 
@@ -121,7 +121,7 @@
         "magZoomerRight": 2400, 
         "keyboardLayout": 1, 
         "magTargetDisplay": "", 
-        "disableBrailleEOL": false, 
+        "disableBrailleEndOfLine": false, 
         "magZoomerTop": 0, 
         "magSourceDisplay": "", 
         "enableDiacriticalKeys": false, 
diff --git a/test/keystrokes/firefox/sayAll_bug-591351-1.settings b/test/keystrokes/firefox/sayAll_bug-591351-1.settings
index 82a2353..d05738a 100644
--- a/test/keystrokes/firefox/sayAll_bug-591351-1.settings
+++ b/test/keystrokes/firefox/sayAll_bug-591351-1.settings
@@ -55,7 +55,7 @@
         "progressBarUpdateInterval": 10, 
         "speakCellCoordinates": true, 
         "enablePauseBreaks": true, 
-        "brailleEOLIndicator": " $l", 
+        "brailleEndOfLineIndicator": " $l", 
         "verbalizePunctuationStyle": 1, 
         "progressBarVerbosity": 1, 
         "enableSpeech": true, 
@@ -121,7 +121,7 @@
         "magZoomerRight": 2400, 
         "keyboardLayout": 1, 
         "magTargetDisplay": "", 
-        "disableBrailleEOL": false, 
+        "disableBrailleEndOfLine": false, 
         "magZoomerTop": 0, 
         "magSourceDisplay": "", 
         "enableDiacriticalKeys": false, 
diff --git a/test/keystrokes/gtk-demo/spoken_indentation.settings b/test/keystrokes/gtk-demo/spoken_indentation.settings
index 0d954ce..b795f4c 100644
--- a/test/keystrokes/gtk-demo/spoken_indentation.settings
+++ b/test/keystrokes/gtk-demo/spoken_indentation.settings
@@ -55,7 +55,7 @@
         "progressBarUpdateInterval": 10, 
         "speakCellCoordinates": true, 
         "enablePauseBreaks": true, 
-        "brailleEOLIndicator": " $l", 
+        "brailleEndOfLineIndicator": " $l", 
         "verbalizePunctuationStyle": 1, 
         "progressBarVerbosity": 1, 
         "enableSpeech": true, 
@@ -121,7 +121,7 @@
         "magZoomerRight": 2400, 
         "keyboardLayout": 1, 
         "magTargetDisplay": "", 
-        "disableBrailleEOL": false, 
+        "disableBrailleEndOfLine": false, 
         "magZoomerTop": 0, 
         "magSourceDisplay": "", 
         "enableDiacriticalKeys": false,
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]