[orca/new-settings: 137/139] Merged changes from master

From: Juanje Ojeda Croissier <jojeda src gnome org>
To: commits-list gnome org
Cc:
Subject: [orca/new-settings: 137/139] Merged changes from master
Date: Wed, 8 Sep 2010 16:56:37 +0000 (UTC)
commit 1f6d2b09fae67d64dd34f710b9e5787eb9c574bd
Merge: de10b66 4f03089
Author: Juanje Ojeda <jojeda emergya es>
Date:   Tue Sep 7 12:33:59 2010 +0200

    Merged changes from master

 MAINTAINERS                                        |    8 +-
 NEWS                                               |  222 +
 README                                             |    2 +-
 configure.in                                       |   16 +-
 icons/orca-splash.svg                              |   64 +
 orca.doap                                          |   27 +-
 po/POTFILES.in                                     |    2 +
 po/cs.po                                           | 3268 +++++++-----
 po/de.po                                           | 3161 +++++++----
 po/el.po                                           | 3723 ++++++++-----
 po/en_GB.po                                        | 3278 ++++++++----
 po/es.po                                           | 1660 ++++---
 po/gl.po                                           | 2145 +++++---
 po/hu.po                                           | 2142 +++++---
 po/ja.po                                           | 5699 ++++++++++++--------
 po/nb.po                                           | 1994 ++++---
 po/pt.po                                           | 3897 ++++++++------
 po/sl.po                                           | 4028 +++++++++------
 po/sv.po                                           | 3304 ++++++++----
 po/ta.po                                           | 3138 +++++++----
 po/zh_CN.po                                        | 3521 ++++++++-----
 po/zh_HK.po                                        | 3169 +++++++----
 po/zh_TW.po                                        | 3167 +++++++----
 pylintrc                                           |    2 +-
 src/orca/.cvsignore                                |    2 +-
 src/orca/.gitignore                                |    2 +-
 src/orca/Makefile.am                               |   18 +-
 src/orca/app_gui_prefs.py                          |   20 +-
 src/orca/app_prefs.py                              |   26 +-
 src/orca/bookmarks.py                              |   13 +-
 src/orca/braille.py                                |    4 +-
 src/orca/chnames.py                                |  114 +-
 src/orca/common_keyboardmap.py                     |    9 +
 src/orca/debug.py                                  |    8 +-
 src/orca/default.py                                |  105 +-
 src/orca/find.py                                   |    6 +-
 src/orca/flat_review.py                            |    6 +-
 src/orca/focus_tracking_presenter.py               |  124 +-
 src/orca/gsmag.py                                  |    5 +-
 src/orca/httpserver.py                             |    4 +-
 src/orca/input_event.py                            |    7 +-
 src/orca/laptop_keyboardmap.py                     |    3 +
 src/orca/liveregions.py                            |   17 +-
 src/orca/mag.py                                    |   21 +-
 src/orca/notification_messages.py                  |  258 +
 src/orca/openttsfactory.py                         |   89 +-
 src/orca/orca-setup.ui                             |  342 +-
 src/orca/orca-splash.png                           |  Bin 0 -> 106028 bytes
 src/orca/orca-splash.ui                            |   24 +
 src/orca/orca.in                                   |   33 +-
 src/orca/orca.py                                   |  622 ++-
 src/orca/orca_console_prefs.py                     |    4 +-
 src/orca/orca_gui_find.py                          |    8 +-
 src/orca/orca_gui_main.py                          |   10 +-
 src/orca/orca_gui_prefs.py                         |  164 +-
 src/orca/orca_gui_splash.py                        |  131 +
 src/orca/{platform.py.in => orca_platform.py.in}   |    0
 src/orca/orca_prefs.py                             |   18 +-
 src/orca/orca_quit.py                              |    8 +-
 src/orca/orca_state.py                             |   12 -
 src/orca/punctuation_settings.py                   |   68 +-
 src/orca/script_utilities.py                       |   49 +-
 src/orca/scripts/apps/Eclipse/script.py            |   16 +-
 src/orca/scripts/apps/acroread/script.py           |   23 +-
 .../scripts/apps/evolution/speech_generator.py     |    9 +
 .../scripts/apps/gcalctool/speech_generator.py     |   11 +-
 src/orca/scripts/apps/gedit/script.py              |    6 +-
 src/orca/scripts/apps/gnome-search-tool/script.py  |    9 +-
 src/orca/scripts/apps/gnome-terminal/script.py     |    4 +-
 src/orca/scripts/apps/notify-osd/script.py         |   28 +-
 src/orca/scripts/apps/soffice/formatting.py        |    1 +
 src/orca/scripts/apps/soffice/script.py            |   84 +-
 src/orca/scripts/apps/soffice/speech_generator.py  |   73 +
 .../scripts/apps/soffice/structural_navigation.py  |    6 +-
 src/orca/scripts/apps/yelp/script.py               |    8 +-
 src/orca/scripts/apps/yelp/script_settings.py      |    2 +-
 src/orca/scripts/toolkits/Gecko/bookmarks.py       |   14 +-
 src/orca/scripts/toolkits/Gecko/script.py          |    8 +-
 .../scripts/toolkits/Gecko/speech_generator.py     |   41 +-
 .../J2SE-access-bridge/speech_generator.py         |   11 +-
 src/orca/settings.py                               |   40 +-
 src/orca/speech.py                                 |  107 +-
 src/orca/speech_generator.py                       |  404 ++-
 src/orca/speechdispatcherfactory.py                |   91 +-
 src/orca/structural_navigation.py                  |   43 +-
 test/harness/orca-customizations.py.in             |    2 +-
 test/harness/runone.sh                             |    6 +-
 test/harness/user-settings.py.in                   |    2 +-
 test/harness/utils.py                              |    4 +-
 test/keystrokes/firefox/bug_512303.py              |    6 +-
 test/keystrokes/firefox/bug_552887a.py             |  195 +-
 test/keystrokes/firefox/bug_568631.py              |    6 +-
 test/keystrokes/firefox/bug_568768.py              |    4 +-
 test/keystrokes/firefox/bug_589455.py              |   24 +-
 test/keystrokes/firefox/codetalks_alert.py         |   29 +-
 test/keystrokes/firefox/codetalks_button.py        |   16 +-
 test/keystrokes/firefox/codetalks_panel_text.py    |   60 +-
 test/keystrokes/firefox/codetalks_tree.py          |   32 +-
 test/keystrokes/firefox/codetalks_treegrid.py      |   42 +-
 test/keystrokes/firefox/dojo_bug_570566.py         |   41 +-
 test/keystrokes/firefox/dojo_button.py             |  630 ++-
 test/keystrokes/firefox/dojo_checkbox.py           |   37 +-
 test/keystrokes/firefox/find_wiki.py               |   20 +-
 test/keystrokes/firefox/flat_review_combo_box.py   |   18 +-
 .../keystrokes/firefox/flat_review_text_by_line.py |    6 +-
 .../firefox/flat_review_text_by_word_and_char.py   |   50 +-
 test/keystrokes/firefox/html_role_combo_box.py     |   55 +-
 test/keystrokes/firefox/html_role_links.py         |   11 +-
 test/keystrokes/firefox/html_role_lists.py         |    2 +
 .../firefox/html_struct_nav_blockquote.py          |   10 +-
 .../firefox/html_struct_nav_bug_554616.py          |   58 +-
 .../firefox/html_struct_nav_bug_556470.py          |   22 +-
 .../firefox/html_struct_nav_bug_567984.py          |    7 +-
 .../firefox/html_struct_nav_bug_591592.py          |    4 +-
 .../firefox/html_struct_nav_large_obj.py           |  150 +-
 test/keystrokes/firefox/html_struct_nav_links.py   |   56 +-
 .../firefox/html_struct_nav_list_item.py           |   10 +-
 test/keystrokes/firefox/html_struct_nav_lists.py   |   12 +-
 test/keystrokes/firefox/label_guess_bug_546815.py  |    4 +-
 .../firefox/label_guess_bugzilla_search.py         |   27 +-
 test/keystrokes/firefox/label_guess_entries.py     |   14 +-
 test/keystrokes/firefox/line_nav_bug_555055.py     |   42 +-
 test/keystrokes/firefox/line_nav_bug_592383.py     |    6 +-
 .../keystrokes/firefox/line_nav_bugzilla_search.py |   31 +-
 test/keystrokes/firefox/line_nav_empty_anchor.py   |   38 +-
 .../keystrokes/firefox/line_nav_heading_section.py |    2 +
 test/keystrokes/firefox/line_nav_nested_tables.py  |   20 +-
 test/keystrokes/firefox/line_nav_simple_form.py    |    5 +-
 test/keystrokes/firefox/line_nav_slash_test.py     |   10 +-
 test/keystrokes/firefox/line_nav_twitter_bug.py    |    5 +-
 test/keystrokes/firefox/line_nav_wiki.py           |   94 +-
 test/keystrokes/firefox/link_where_am_i.py         |    2 +-
 .../firefox/mouseover_javascript_alert.py          |    5 +-
 test/keystrokes/firefox/mouseover_yahoo_menus.py   |    4 +-
 test/keystrokes/firefox/moz_progressbar.py         |    4 +-
 test/keystrokes/firefox/sayAll_blockquote.py       |    8 +-
 test/keystrokes/firefox/sayAll_bug_512303.py       |    6 +-
 test/keystrokes/firefox/sayAll_heading_section.py  |    2 +
 test/keystrokes/firefox/sayAll_multi_line_text.py  |    4 +-
 test/keystrokes/firefox/sayAll_role_links.py       |    6 +-
 test/keystrokes/firefox/sayAll_role_lists.py       |    6 +-
 test/keystrokes/firefox/sayAll_table_cell_links.py |    2 +
 test/keystrokes/firefox/sayAll_wiki.py             |    8 +-
 test/keystrokes/firefox/spelling_errors.py         |  165 +-
 .../keystrokes/firefox/xul_role_check_menu_item.py |    3 +-
 test/keystrokes/gtk-demo/role_accel_label.py       |    6 +-
 test/keystrokes/gtk-demo/role_alert.py             |    4 +-
 test/keystrokes/gtk-demo/role_combo_box.py         |    5 +-
 test/keystrokes/gtk-demo/role_status_bar.py        |    6 +-
 test/keystrokes/gtk-demo/role_table.py             |   34 +-
 .../gtk-demo/role_text_multiline_navigation.py     |   18 +-
 test/keystrokes/gtk-demo/role_window.py            |    4 +-
 test/keystrokes/java/role_dialog.py                |    2 +-
 test/keystrokes/java/role_push_button.py           |   14 +-
 test/keystrokes/oocalc/bug_356334.py               |    4 +-
 test/keystrokes/oocalc/bug_361167.py               |   22 +-
 test/keystrokes/oocalc/bug_363801.py               |   14 +-
 test/keystrokes/oocalc/bug_363802.py               |   14 +-
 test/keystrokes/oocalc/bug_363804.py               |    6 +-
 test/keystrokes/oocalc/bug_363804b.py              |    6 +-
 test/keystrokes/oocalc/bug_364086.py               |   22 +-
 test/keystrokes/oocalc/bug_364407.py               |   40 +-
 test/keystrokes/oocalc/bug_433398.py               |   21 +-
 test/keystrokes/oocalc/bug_435307.py               |   18 +-
 test/keystrokes/oocalc/bug_435852.py               |    8 +-
 test/keystrokes/oowriter/bug_342602.py             |   13 +-
 test/keystrokes/oowriter/bug_350219.py             |   16 +-
 test/keystrokes/oowriter/bug_353268.py             |    6 +-
 test/keystrokes/oowriter/bug_355733.py             |    8 +-
 test/keystrokes/oowriter/bug_361624.py             |    2 -
 test/keystrokes/oowriter/bug_361747.py             |    5 +-
 test/keystrokes/oowriter/bug_362979.py             |    6 +-
 test/keystrokes/oowriter/bug_364765.py             |    8 +-
 test/keystrokes/oowriter/bug_382408.py             |   10 +-
 test/keystrokes/oowriter/bug_382415.py             |    6 +-
 test/keystrokes/oowriter/bug_382418.py             |   23 +-
 test/keystrokes/oowriter/bug_382880.py             |    6 +-
 test/keystrokes/oowriter/bug_382888.py             |    6 +-
 test/keystrokes/oowriter/bug_385828.py             |   12 +-
 test/keystrokes/oowriter/bug_413909.py             |   49 +-
 test/keystrokes/oowriter/bug_430402.py             |   10 +-
 test/keystrokes/oowriter/bug_450210.py             |    4 +-
 test/keystrokes/oowriter/bug_546941.py             |   29 +-
 test/keystrokes/oowriter/row_inserted.py           |  121 +
 test/keystrokes/oowriter/table_cells.py            |   10 +-
 .../oowriter/table_cells_structural_navigation1.py |   90 +-
 test/keystrokes/oowriter/toolbar-buttons.py        |  158 +-
 test/keystrokes/oowriter/word-navigation.py        |   66 +-
 188 files changed, 36503 insertions(+), 21609 deletions(-)
---
diff --cc configure.in
index a864220,41811f5..56f7fbd
--- a/configure.in
+++ b/configure.in
@@@ -114,10 -126,9 +126,10 @@@ src/orca/scripts/toolkits/Makefil
  src/orca/scripts/toolkits/Gecko/Makefile
  src/orca/scripts/toolkits/J2SE-access-bridge/Makefile
  src/orca/scripts/toolkits/CALLY/Makefile
 +src/orca/backends/Makefile
  src/orca/orca
  src/orca/orca_i18n.py
- src/orca/platform.py
+ src/orca/orca_platform.py
  ],[chmod +x run_pylint.sh])
  
  if test "x$brlapi_available" = "xno" ; then
diff --cc po/POTFILES.in
index d4574cb,6248cce..f140f84
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@@ -31,9 -32,9 +32,10 @@@ src/orca/orca.i
  [type: gettext/glade]src/orca/orca-mainwin.ui
  src/orca/orca.py
  [type: gettext/glade]src/orca/orca-preferences-warning.ui
 +[type: gettext/glade]src/orca/orca-profile.ui
  [type: gettext/glade]src/orca/orca-quit.ui
  [type: gettext/glade]src/orca/orca-setup.ui
+ [type: gettext/glade]src/orca/orca-splash.ui
  src/orca/phonnames.py
  src/orca/rolenames.py
  src/orca/script_utilities.py
diff --cc src/orca/Makefile.am
index 165fa54,17530dd..d6ea0d0
--- a/src/orca/Makefile.am
+++ b/src/orca/Makefile.am
@@@ -47,7 -49,7 +49,8 @@@ orca_python_PYTHON = 
  	orca_gui_find.py \
  	orca_gui_main.py \
  	orca_gui_prefs.py \
-         orca_gui_profile.py \
++	orca_gui_profile.py \
+ 	orca_gui_splash.py \
  	orca_i18n.py \
  	orca_prefs.py \
  	orca_quit.py \
@@@ -63,7 -65,6 +66,7 @@@
  	script.py \
  	script_utilities.py \
  	settings.py \
-         settings_manager.py \
++	settings_manager.py \
  	sound.py \
  	speech.py \
  	speechdispatcherfactory.py \
@@@ -87,7 -86,11 +90,12 @@@ ui_DATA = 
  	orca-preferences-warning.ui \
  	orca-quit.ui \
  	orca-setup.ui \
-         orca-profile.ui
++	orca-profile.ui \
+ 	orca-splash.ui
+ 
+ gfx_DATA = \
+ 	orca-splash.png
  
  EXTRA_DIST = \
- 	$(ui_DATA)
+ 	$(ui_DATA) \
+ 	$(gfx_DATA)
diff --cc src/orca/orca.py
index adb19cb,9309684..7c5a56e
--- a/src/orca/orca.py
+++ b/src/orca/orca.py
@@@ -92,9 -93,8 +93,10 @@@ from input_event import MouseButtonEven
  from input_event import keyEventToString
  
  from orca_i18n import _           # for gettext support
+ from orca_i18n import ngettext
  
 +from settings_manager import SettingsManager
 +
  if settings.debugMemoryUsage:
      import gc
      gc.set_debug(gc.DEBUG_UNCOLLECTABLE
diff --cc src/orca/orca_gui_prefs.py
index 7d65e0a,4295417..063de14
--- a/src/orca/orca_gui_prefs.py
+++ b/src/orca/orca_gui_prefs.py
@@@ -502,11 -491,12 +504,11 @@@ class OrcaSetupGUI(orca_gtkbuilder.GtkB
      def writeUserPreferences(self):
          """Write out the user's generic Orca preferences.
          """
 -
 -        if orca_prefs.writePreferences(self.prefsDict, self.keyBindingsModel,
 +        if _settingsManager.writeSettings(self.prefsDict, self.keyBindingsModel,
                                         self.pronunciationModel):
-             self._say( \
+             self._presentMessage(
                  _("Accessibility support for GNOME has just been enabled."))
-             self._say( \
+             self._presentMessage(
                  _("You need to log out and log back in for the change to " \
                    "take effect."))
  
@@@ -2160,45 -2151,11 +2186,46 @@@
          self.enableAutostart = settings.isOrcaAutostarted()
          self.get_widget("autostartOrcaCheckButton").set_active( \
                           self.enableAutostart)
- 
 +        
 +        # Orca User Profiles
 +        #
 +        self.profilesCombo = self.get_widget('availableProfilesComboBox')
 +        self.profilesComboModel = self.get_widget('model9')
 +        self.__initProfileCombo()
 +
 +    def __initProfileCombo(self):
 +        """Adding available profiles and setting active as the active one"""
 +
 +        availableProfiles = self.__getAvailableProfiles()
 +        iterChilds = {}
 +        self.profilesComboModel.clear()
 +
 +        if not len(availableProfiles):
 +            iterChilds.update({'default' : self.profilesComboModel.append(['default'])})
 +        else:
 +            for profile in availableProfiles:
 +                iterChilds.update({profile: self.profilesComboModel.append([profile])})
 +
 +        activeProfile = self.prefsDict.get('activeProfile') or 'default'
 +        activeProfileItem = int(self.profilesComboModel.get_string_from_iter(iterChilds[activeProfile]))
 +
 +        # If not classic backend, show active profile
 +        self.profilesCombo.set_active(activeProfileItem)
 +
-         
 +    def __getAvailableProfiles(self):
 +        """Get available user profiles or remove profiles page
 +        if classic backend"""
 +
 +        if _settingsManager.DEFAULT_BACKEND == 'classic':
 +            self.get_widget('notebook').remove_page(8)
 +            return ['default']
 +        else:
 +            return _settingsManager.availableProfiles()
  
- 
+     def _updateOrcaModifier(self):
+         combobox = self.get_widget("orcaModifierComboBox")
+         keystring = ", ".join(self.prefsDict["orcaModifierKeys"])
+         combobox.set_active(self.getComboBoxIndex(combobox, keystring))
  
      def populateComboBox(self, combobox, items):
          """Populates the combobox with the items provided.
@@@ -4259,11 -4240,10 +4310,12 @@@
              self.prefsDict["voices"] = {
                  settings.DEFAULT_VOICE   : acss.ACSS(self.defaultVoice),
                  settings.UPPERCASE_VOICE : acss.ACSS(self.uppercaseVoice),
-                 settings.HYPERLINK_VOICE : acss.ACSS(self.hyperlinkVoice)
+                 settings.HYPERLINK_VOICE : acss.ACSS(self.hyperlinkVoice),
+                 settings.SYSTEM_VOICE    : acss.ACSS(self.systemVoice),
              }
  
 +        #self.prefsDict['activeProfile'] = self.profilesCombo.get_active_text()
 +
          settings.setGKSUGrabDisabled(self.disableKeyGrabPref)
  
          try:
@@@ -5215,15 -5069,18 +5267,19 @@@ def showPreferencesUI()
          # Translators: Orca Preferences is the configuration GUI for Orca.
          #
          line = _("Starting Orca Preferences.")
-         braille.displayMessage(line)
-         speech.speak(line)
+         defScript = default.Script(None)
+         defScript.speakMessage(line)
+         try:
+             defScript.displayBrailleMessage(line, flashTime=-1)
+         except:
+             pass
  
 -        prefsDict = orca_prefs.readPreferences()
 +        prefsDict = _settingsManager.readPreferences()
 +
          orca_state.prefsUIFile = \
-             os.path.join(platform.prefix,
-                          platform.datadirname,
-                          platform.package,
+             os.path.join(orca_platform.prefix,
+                          orca_platform.datadirname,
+                          orca_platform.package,
                           "ui",
                           "orca-setup.ui")
          orca_state.advancedMagUIFile = \
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]