GNOME.org
 

[orca] Remove the old text setup

commit 5b134baa8b702c21113ae2dfeb2c2ade9dc9c3e8
Author: Joanmarie Diggs <jdiggs igalia com>
Date:   Fri Feb 12 17:44:01 2016 -0500

    Remove the old text setup
    
    * It's been broken for years (since at least as far back as 3.10)
    * It's obsolete given orca -s/--setup and orca -u/--user-prefs

 docs/man/orca.1                   |    4 +-
 help/C/howto_setting_up_orca.page |   25 +--
 help/C/howto_text_setup.page      |  193 ---------------
 help/C/introduction.page          |    3 +-
 help/Makefile.am                  |    1 -
 src/orca/Makefile.am              |    1 -
 src/orca/messages.py              |  150 ------------
 src/orca/orca_bin.py.in           |    5 -
 src/orca/orca_console_prefs.py    |  467 -------------------------------------
 9 files changed, 10 insertions(+), 839 deletions(-)
---
diff --git a/docs/man/orca.1 b/docs/man/orca.1
index c1612be..32fb068 100644
--- a/docs/man/orca.1
+++ b/docs/man/orca.1
@@ -35,10 +35,10 @@ Gecko, and WebKitGtk. AT-SPI support for the KDE Qt toolkit is being
 pursued.
 .SH OPTIONS
 .TP
-.B \-t, --text-setup
+.B \-s, --setup
 When starting
 .BR orca ,
-initiate the text-based configuration.
+initiate the GUI-based configuration.
 .TP
 .BI "\-u, --user-prefs-dir=" dirname
 When starting
diff --git a/help/C/howto_setting_up_orca.page b/help/C/howto_setting_up_orca.page
index 40989f8..f6ad294 100644
--- a/help/C/howto_setting_up_orca.page
+++ b/help/C/howto_setting_up_orca.page
@@ -19,24 +19,13 @@
   <title>Orca Configuration</title>
     <section id="configuring_orca">
       <p>
-        If you want to configure <app>Orca</app>, you can do one
-        of the following:
+        If you want to configure <app>Orca</app>, get into the
+        <link xref="preferences">Preferences</link> dialog by pressing
+        <keyseq><key>Orca Modifier</key><key>Space</key></keyseq> from
+        within any accessible application. Alternatively, you can type
+        <cmd>orca</cmd> followed by either <cmd>-s</cmd> or <cmd>--setup</cmd>
+        in a terminal window or within the <gui>Run</gui> dialog and then press
+        <key>Return</key>.
       </p>
-      <list>
-        <item>
-          <p>
-            Get into the <link xref="preferences">Preferences</link> dialog
-            by pressing <keyseq><key>Orca Modifier</key><key>Space</key>
-            </keyseq> from within any accessible application.
-          </p>
-        </item>
-        <item>
-          <p>
-            Pass the <cmd>--text-setup</cmd> option to <app>Orca</app> to
-            re-run <app>Orca</app>'s <link xref="howto_text_setup">text-based
-            setup</link>.
-          </p>
-        </item> 
-      </list>
     </section>
 </page>
diff --git a/help/C/introduction.page b/help/C/introduction.page
index 7bce224..b4a1406 100644
--- a/help/C/introduction.page
+++ b/help/C/introduction.page
@@ -75,8 +75,7 @@
         </item>
         <item>
           <p>
-            <cmd>-t</cmd>, <cmd>--text-setup</cmd>: Set up user preferences
-            (text version)
+            <cmd>-s</cmd>, <cmd>--setup</cmd>: Set up user preferences
           </p>
         </item>
         <item>
diff --git a/help/Makefile.am b/help/Makefile.am
index df496d0..9f83936 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -38,7 +38,6 @@ HELP_FILES = \
        howto_structural_navigation.page \
        howto_tables.page \
        howto_text_attributes.page \
-       howto_text_setup.page \
        howto_the_orca_modifier.page \
        howto_toggling_caps_lock.page \
        howto_whereami.page \
diff --git a/src/orca/Makefile.am b/src/orca/Makefile.am
index 5bf182d..a2ad57e 100644
--- a/src/orca/Makefile.am
+++ b/src/orca/Makefile.am
@@ -42,7 +42,6 @@ orca_python_PYTHON = \
        notification_messages.py \
        object_properties.py \
        orca.py \
-       orca_console_prefs.py \
        orca_gtkbuilder.py \
        orca_gui_find.py \
        orca_gui_commandlist.py \
diff --git a/src/orca/messages.py b/src/orca/messages.py
index a8ced24..794cb63 100644
--- a/src/orca/messages.py
+++ b/src/orca/messages.py
@@ -329,156 +329,6 @@ CHAT_SEPARATE_HISTORIES_OFF = \
 # translated is presented when the value of the setting is toggled.
 CHAT_SEPARATE_HISTORIES_ON = _("Provide chat room specific message histories.")
 
-# Translators: this is a regular expression that is intended to match
-# a positive 'yes' response from a user at the command line.  The expression
-# as given means - does it begin with (that's the '^' character) any of
-# the characters in the '[' ']'?  In this case, we've chosen 'Y', 'y', and
-# '1' to mean positive answers, so any string beginning with 'Y', 'y', or
-# '1' will match.  For an example of translation, assume your language has
-# the words 'posolutely' and 'absitively' as common words that mean the
-# equivalent of 'yes'.  You might make the expression match the upper and
-# lower case forms: "^[aApP1]".  If the 'yes' and 'no' words for your
-# locale begin with the same character, the regular expression should be
-# modified to use words.  For example: "^(yes|Yes)" (note the change from
-# using '[' and ']' to '(' and ')').
-#
-# Finally, this expression should match what you've chosen for the
-# translation of the "Enter y or n:" strings for this file.
-CONSOLE_SETUP_YESEXPR = _("^[Yy1]")
-
-# Translators: this is a regular expression that is intended to match
-# a positive 'yes' response from a user at the command line.  The expression
-# as given means - does it begin with (that's the '^' character) any of
-# the characters in the '[' ']'?  In this case, we've chosen 'Y', 'y', and
-# '1' to mean positive answers, so any string beginning with 'Y', 'y', or
-# '1' will match.  For an example of translation, assume your language has
-# the words 'posolutely' and 'absitively' as common words that mean the
-# equivalent of 'yes'.  You might make the expression match the upper and
-# lower case forms: "^[aApP1]".  If the 'yes' and 'no' words for your
-# locale begin with the same character, the regular expression should be
-# modified to use words.  For example: "^(yes|Yes)" (note the change from
-# using '[' and ']' to '(' and ')').
-#
-# Finally, this expression should match what you've chosen for the
-# translation of the "Enter y or n:" strings for this file.
-CONSOLE_SETUP_NOEXPR = _("^[Nn0]")
-
-# Translators: This is prompting for whether the user wants to use a refreshable
-# braille display (an external hardware device) or not. It is part of Orca's
-# console-based setup.
-CONSOLE_SETUP_ENABLE_BRAILLE = _("Enable Braille?  Enter y or n: ")
-
-# Translators: If key echo is enabled, Orca will speak the name of a key as the
-# user types on the keyboard. This message is presented during Orca's console-
-# based setup. If the user wants key echo, they will then be prompted for which
-# classes of keys they want echoed.
-CONSOLE_SETUP_ENABLE_ECHO_KEY = _("Enable key echo?  Enter y or n: ")
-
-# Translators: This is in reference to key echo for alphabetic keys and
-# is part of Orca's console-based setup.
-CONSOLE_SETUP_ENABLE_ECHO_ALPHABETIC_KEYS = \
-    _("Enable alphabetic keys?  Enter y or n: ")
-
-# Translators: This is in reference to key echo for numeric keys and
-# is part of Orca's console-based setup.
-CONSOLE_SETUP_ENABLE_ECHO_NUMERIC_KEYS = \
-    _("Enable numeric keys?  Enter y or n: ")
-
-# Translators: This is in reference to key echo for punctuation keys and
-# is part of Orca's console-based setup.
-CONSOLE_SETUP_ENABLE_ECHO_PUNCTUATION_KEYS = \
-    _("Enable punctuation keys?  Enter y or n: ")
-
-# Translators: This is in reference to key echo for the space key and
-# is part of Orca's console-based setup.
-CONSOLE_SETUP_ENABLE_SPACE = \
-    _("Enable space?  Enter y or n: ")
-
-# Translators: This is in reference to key echo for keys such as CTRL, ALT,
-# Shift, Insert, etc. It is part of Orca's console-based setup.
-CONSOLE_SETUP_ENABLE_ECHO_MODIFIER_KEYS = \
-    _("Enable modifier keys?  Enter y or n: ")
-
-# Translators: This is in reference to key echo for function keys (F1-F12).
-# It is part of Orca's console-based setup.
-CONSOLE_SETUP_ENABLE_ECHO_FUNCTION_KEYS =  \
-    _("Enable function keys?  Enter y or n: ")
-
-# Translators: This is in reference to key echo for keys that perform actions
-# such as enter, escape, tab, backspace, delete, arrow keys, page up/down, etc.
-# It is part of Orca's console-based setup.
-CONSOLE_SETUP_ENABLE_ECHO_ACTION_KEYS = _("Enable action keys?  Enter y or n: ")
-
-# Translators: The word echo feature of Orca will speak the word prior to the
-# caret when the user types a word delimiter. This message is presented during
-# Orca's console-based setup.
-CONSOLE_SETUP_ENABLE_ECHO_WORD = _("Enable echo by word?  Enter y or n: ")
-
-# Translators: This is prompting for a numerical choice to be typed at Orca's
-# console-based setup.
-CONSOLE_SETUP_ENTER_CHOICE = _("Enter choice: ")
-
-# Translators: This is letting the user they input an invalid integer value on
-# the command line and is also requesting they enter a valid integer value.
-# This message is part of Orca's console-based setup.
-CONSOLE_SETUP_ENTER_VALID_NUMBER = _("Please enter a valid number.")
-
-# Translators: This is letting the user they input an invalid yes/no value on
-# the command line and is also requesting they enter a valid one. This message
-# is part of Orca's console-based setup.
-CONSOLE_SETUP_ENTER_Y_OR_N = _("Please enter y or n.")
-
-# Translators: Orca has two keyboard layouts which impact what keybindings are
-# used to perform Orca commands. The two layouts are "Laptop" and "Desktop".
-# This message is part of Orca's console-based setup.
-CONSOLE_SETUP_SELECT_KEYBOARD_LAYOUT = _("Select desired keyboard layout.")
-
-# Translators: Orca has two keyboard layouts which impact what keybindings are
-# used to perform Orca commands. The two layouts are "Laptop" and "Desktop".
-# This message is part of Orca's console-based setup.
-CONSOLE_SETUP_KEYBOARD_LAYOUT_DESKTOP = _("1. Desktop")
-
-# Translators: Orca has two keyboard layouts which impact what keybindings are
-# used to perform Orca commands. The two layouts are "Laptop" and "Desktop".
-# This message is part of Orca's console-based setup.
-CONSOLE_SETUP_KEYBOARD_LAYOUT_LAPTOP = _("2. Laptop")
-
-# Translators: This is prompting the user for a numerical choice from a list of
-# available speech synthesis engines. It is part of Orca's console-based setup.
-CONSOLE_SETUP_SELECT_SPEECH_SERVER = _("Select desired speech server.")
-
-# Translators: The speech system represents what general speech wrapper is going
-# to be used. Speech-dispatcher is an example of a speech system. It provides
-# wrappers around specific speech servers (engines). This message is part of
-# Orca's console-based setup.
-CONSOLE_SETUP_SELECT_SPEECH_SYSTEM = _("Select desired speech system:")
-
-# Translators: This is prompting for a numerical value from a list of choices of
-# speech synthesis voices (e.g., male, female, child). This message is part of
-# Orca's console-based setup.
-CONSOLE_SETUP_SELECT_VOICE = _("Select desired voice:")
-
-# Translators: This message indicates that no working speech servers (speech
-# synthesis engines) can be found. It is part of Orca's console-based setup.
-CONSOLE_SETUP_SERVERS_NOT_AVAILABLE = _("No servers available.\n")
-
-# Translators: This message indicates that the speech server (speech synthesis
-# engine) is not working properly and no voices (e.g., male, female, child) are
-# available. This message is part of Orca's console-based setup.
-CONSOLE_SETUP_VOICES_NOT_AVAILABLE = _("No voices available.\n")
-
-# Translators: This message indicates that speech synthesis will not be used.
-# It is part of Orca's console-based setup.
-CONSOLE_SETUP_SPEECH_NOT_USED = _("Speech will not be used.\n")
-
-# Translators: This message is presented at the beginning of Orca's console-
-# based setup.
-CONSOLE_SETUP_START = _("Screen reader setup.")
-
-# Translators: This message is presented at the completion of Orca's console-
-# based setup.
-CONSOLE_SETUP_COMPLETE = _("Setup complete.  Press Return to continue.")
-
 DATE_FORMAT_LOCALE = "%x"
 DATE_FORMAT_NUMBERS_DM = "%d/%m"
 DATE_FORMAT_NUMBERS_MD = "%m/%d"
diff --git a/src/orca/orca_bin.py.in b/src/orca/orca_bin.py.in
index f8c86f9..94edaf3 100644
--- a/src/orca/orca_bin.py.in
+++ b/src/orca/orca_bin.py.in
@@ -42,7 +42,6 @@ sys.path.insert(1, pythondir)
 from orca import debug
 from orca import messages
 from orca import orca
-from orca import orca_console_prefs
 from orca import settings
 from orca.orca_platform import version
 
@@ -99,8 +98,6 @@ class Parser(argparse.ArgumentParser):
         self.add_argument(
             "-s", "--setup", action="store_true", help=messages.CLI_GUI_SETUP)
         self.add_argument(
-            "-t", "--text-setup", action="store_true", help=messages.CLI_SETUP)
-        self.add_argument(
             "-l", "--list-apps", action=ListApps, nargs=0,
             help=messages.CLI_LIST_APPS)
         self.add_argument(
@@ -227,8 +224,6 @@ def main():
         cleanup(signal.SIGKILL)
 
     settingsDict = getattr(args, 'settings', {})
-    if args.text_setup:
-        orca_console_prefs.showPreferencesUI(settingsDict)
 
     if not inGraphicalDesktop():
         print(messages.CLI_NO_DESKTOP_ERROR)
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]