[orca] Fix for bug #664651 - Remove the legacy magnification code
- From: Joanmarie Diggs <joanied src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [orca] Fix for bug #664651 - Remove the legacy magnification code
- Date: Wed, 23 Nov 2011 16:38:17 +0000 (UTC)
commit 6e9c3bc6d749d5fcc7be7fde8b50611ef61a2e02
Author: Joanmarie Diggs <jdiggs igalia com>
Date: Wed Nov 23 16:22:50 2011 +0100
Fix for bug #664651 - Remove the legacy magnification code
docs/doc-set/architecture.sgml | 22 +--
docs/doc-set/blurb.sgml | 11 +-
docs/doc-set/internals.html | 24 +--
docs/doc-set/script_guide.sgml | 10 +-
docs/man/orca.1 | 10 +-
po/POTFILES.in | 2 -
src/orca/Makefile.am | 2 -
src/orca/gsmag.py | 324 ------------------------
src/orca/mag.py | 45 ----
src/orca/orca.py | 37 +---
src/orca/orca_gui_main.py | 1 -
src/orca/scripts/apps/Eclipse/script.py | 5 +-
src/orca/scripts/apps/metacity/script.py | 5 -
src/orca/scripts/apps/packagemanager/script.py | 7 +-
src/orca/scripts/default.py | 15 +-
src/orca/scripts/toolkits/Gecko/script.py | 11 -
src/orca/settings.py | 4 -
17 files changed, 36 insertions(+), 499 deletions(-)
---
diff --git a/docs/doc-set/architecture.sgml b/docs/doc-set/architecture.sgml
index c3a3a3c..0c200ab 100644
--- a/docs/doc-set/architecture.sgml
+++ b/docs/doc-set/architecture.sgml
@@ -20,7 +20,7 @@
traditional keyboard navigation techniques to move from component
to component in the application (e.g., pressing the Tab key to
move from pushbutton to text area to toggle button, etc.), Orca
- will present this to the user via braille, speech, magnification,
+ will present this to the user via braille, speech,
or a combination thereof. In the cases where more complex
navigation is needed, such as structural navigation of complex
text documents, Orca also provides a facility to define keyboard
@@ -51,7 +51,7 @@
the main components of Orca are as follows: desktop applications
that support the AT-SPI, the AT-SPI registry and infrastructure,
Orca itself, Orca Scripts, and system services (e.g., speech,
- braille, magnification).</para>
+ braille).</para>
<figure>
<title>High Level Orca Architecture. The main components of Orca
@@ -225,7 +225,7 @@
<para>The <literal>orca.settings</literal> module (not depicted in
the high level Orca architecture diagram) holds preferences
set by the user during configuration. These settings include
- the following: use of speech, braille, and/or magnification,
+ the following: use of speech and/or braille,
voice styles, key echo, text echo, etc.</para>
<para>Any Orca module can check the value of a setting by
@@ -266,7 +266,7 @@
<section id="archsystemservices"><title>System Services</title>
<para> Orca relies on existing system services to provide
- support for speech synthesis, braille, and screen magnification.
+ support for speech synthesis and braille.
To interact with these services, Orca provides the modules
described in the following sections.</para>
@@ -360,19 +360,5 @@
&scriptguidelink;.</para>
<para>&todo; flesh this section out more.</para>
</section>
-
- <section id="archmag"><title>orca.mag</title>
- <para> The <literal>orca.mag</literal> module
- provides Orca's Python interface to the system's gnome-mag
- <citation><xref linkend="gnome-mag"
- endterm="gnome-mag.abbrev"/></citation> CORBA service(s). The
- magnification component provides methods that permit Orca
- discover screen magnification services and set their desktop
- region of interest. The script is responsible for
- calling <literal>orca.mag.magnifyAccessible</literal> with the
- appropriate parameters to set the magnifier's region of
- interest.</para>
- <para>&todo; flesh this section out more.</para>
- </section>
</section>
</chapter>
diff --git a/docs/doc-set/blurb.sgml b/docs/doc-set/blurb.sgml
index 73c9fae..bd87572 100644
--- a/docs/doc-set/blurb.sgml
+++ b/docs/doc-set/blurb.sgml
@@ -2,18 +2,15 @@
<para>Orca is a free, open source, flexible, and extensible screen
reader that provides access to the graphical desktop via
-user-customizable combinations of speech, braille, and/or
-magnification. Under development by the Sun Microsystems, Inc.,
-Accessibility Program Office since 2004, Orca has been created with
-early input from and continued engagement with its end users.</para>
+user-customizable combinations of speech and/or braille.</para>
<para>Orca works with applications and toolkits that support the
assistive technology service provider interface (AT-SPI), which is the
primary assistive technology infrastructure for the Solaris and Linux
-operating environments. Applications and toolkits supporting the
+operating environments. Applications and toolkits supporting the
AT-SPI include the GNOME GTK+ toolkit, the Java platform's Swing
-toolkit, OpenOffice, and Mozilla. AT-SPI support for WebKit and the
-KDE Qt toolkit is currently being pursued.</para>
+toolkit, SWT, OpenOffice/LibreOffice, Mozilla, and WebKitGtk. AT-SPI
+support for the KDE Qt toolkit is currently being pursued.</para>
<para>See also http://live.gnome.org/Orca for detailed English and
Spanish information on Orca, including how to run Orca, how to
diff --git a/docs/doc-set/internals.html b/docs/doc-set/internals.html
index 43c10ba..d06a1c2 100644
--- a/docs/doc-set/internals.html
+++ b/docs/doc-set/internals.html
@@ -4,10 +4,9 @@
Scripts, and system services. The key communication between the
components is depicted.</a></dt><dt>4.1. <a href="#id2493928">Orca Script Diagram</a></dt></dl></div><div class="preface" lang="en"><div class="titlepage"><div><div><h2 class="title"><a name="archforward"></a>Foreword</h2></div></div></div><p>Orca is a free, open source, flexible, and extensible screen
reader that provides access to the graphical desktop via
-user-customizable combinations of speech, braille, and/or
-magnification. Under development by the Sun Microsystems, Inc.,
-Accessibility Program Office since 2004, Orca has been created with
-early input from and continued engagement with its end users.</p><p>Orca works with applications and toolkits that support the
+user-customizable combinations of speech and/or braille.
+</p>
+<p>Orca works with applications and toolkits that support the
assistive technology service provider interface (AT-SPI), which is the
primary assistive technology infrastructure for the Solaris and Linux
operating environments. Applications and toolkits supporting the
@@ -63,7 +62,7 @@ python -V
traditional keyboard navigation techniques to move from component
to component in the application (e.g., pressing the Tab key to
move from pushbutton to text area to toggle button, etc.), Orca
- will present this to the user via braille, speech, magnification,
+ will present this to the user via braille, speech,
or a combination thereof. In the cases where more complex
navigation is needed, such as structural navigation of complex
text documents, Orca also provides a facility to define keyboard
@@ -88,7 +87,7 @@ python -V
the main components of Orca are as follows: desktop applications
that support the AT-SPI, the AT-SPI registry and infrastructure,
Orca itself, Orca Scripts, and system services (e.g., speech,
- braille, magnification).</p><div class="figure"><a name="id2489678"></a><p class="title"><b>Figure 2.1. High Level Orca Architecture. The main components of Orca
+ braille).</p><div class="figure"><a name="id2489678"></a><p class="title"><b>Figure 2.1. High Level Orca Architecture. The main components of Orca
are as follows: desktop applications that support the AT-SPI,
the AT-SPI registry and infrastructure, Orca itself, Orca
Scripts, and system services. The key communication between the
@@ -195,7 +194,7 @@ python -V
never be set directly.</p><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="archsettings"></a>settings</h3></div></div></div><p>The <code class="literal">orca.settings</code> module (not depicted in
the high level Orca architecture diagram) holds preferences
set by the user during configuration. These settings include
- the following: use of speech, braille, and/or magnification,
+ the following: use of speech and/or braille,
voice styles, key echo, text echo, etc.</p><p>Any Orca module can check the value of a setting by
examining the field directly in the
<code class="literal">orca.settings</code> module. In addition, the
@@ -291,15 +290,8 @@ python -V
instance to help generate text to be sent to
the <code class="literal">orca.braille</code> module. More information
on braille generators can be found in the
- <a href="#scriptguide" title="Chapter 3. Introduction to Scripting">Orca Script Writing Guide</a>.</p><p><span class="emphasis"><em>TODO:</em></span> flesh this section out more.</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="archmag"></a>orca.mag</h3></div></div></div><p> The <code class="literal">orca.mag</code> module
- provides Orca's Python interface to the system's gnome-mag
- [<span class="citation"><a href="#gnome-mag">gnome-mag</a></span>] CORBA service(s). The
- magnification component provides methods that permit Orca
- discover screen magnification services and set their desktop
- region of interest. The script is responsible for
- calling <code class="literal">orca.mag.magnifyAccessible</code> with the
- appropriate parameters to set the magnifier's region of
- interest.</p><p><span class="emphasis"><em>TODO:</em></span> flesh this section out more.</p></div></div></div><div class="chapter" lang="en"><div class="titlepage"><div><div><h2 class="title"><a name="scriptguide"></a>Chapter 3. Introduction to Scripting</h2></div></div></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="section"><a href="#sgcontract">Script Contract</a></span></dt><dt><span class="section"><a href="#sglifecycle">Script Life Cycle</a></span></dt><dd><dl><dt><span class="section"><a href="#birth">Birth</a></span></dt><dt><span class="section"><a href="#birth">Life</a></span></dt><dt><span class="section"><a href="#birth">Death</a></span></dt></dl></dd></dl></div><p>The goal of scripting is to provide Orca with the capability
+ <a href="#scriptguide" title="Chapter 3. Introduction to Scripting">Orca Script Writing Guide</a>.</p><p><span class="emphasis"><em>TODO:</em></span> flesh this section out more.</p></div><div class="section" lang="en">
+ </div></div><div class="chapter" lang="en"><div class="titlepage"><div><div><h2 class="title"><a name="scriptguide"></a>Chapter 3. Introduction to Scripting</h2></div></div></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="section"><a href="#sgcontract">Script Contract</a></span></dt><dt><span class="section"><a href="#sglifecycle">Script Life Cycle</a></span></dt><dd><dl><dt><span class="section"><a href="#birth">Birth</a></span></dt><dt><span class="section"><a href="#birth">Life</a></span></dt><dt><span class="section"><a href="#birth">Death</a></span></dt></dl></dd></dl></div><p>The goal of scripting is to provide Orca with the capability
of providing a natural feeling and compelling user experience for
the various user interaction models of different desktop
applications.</p><p>The Orca scripting approach allows scripts to extend and/or
diff --git a/docs/doc-set/script_guide.sgml b/docs/doc-set/script_guide.sgml
index 82495c4..2fa00ee 100644
--- a/docs/doc-set/script_guide.sgml
+++ b/docs/doc-set/script_guide.sgml
@@ -293,7 +293,7 @@
<literal>locusOfFocusChanged</literal> method of the active
script. The <literal>locusOfFocusChanged</literal> method is the
primary entry point where a script will present information to
- the user via speech, braille, and magnification.</para>
+ the user via speech and/or braille.</para>
<para>In many cases, the locus of focus doesn't change, but some
property of the current locus of focus changes. For example,
@@ -417,7 +417,7 @@
<para>Event listeners are what make Orca work. Orca's main goal
in life is to listen for AT-SPI events
from <literal>pyatspi</literal> and then perform some action,
- such as speech, braille, or magnification.</para>
+ such as speech and/or braille.</para>
<para>¬e; as a script writer, the majority of the "trickery"
you will be doing is figuring out which event(s) you need to
@@ -524,7 +524,7 @@ def onChildrenChanged(self, event):
</programlisting>
<para>As seen in this method, it is possible for an event handler
- to use speech, braille, and magnification if it wants. Usually,
+ to use speech and/or braille if it wants. Usually,
however, the <literal>locusOfFocusChanged</literal> and
<literal>visualAppearanceChanged</literal> script methods should
be reserved for those actions.</para>
@@ -794,8 +794,8 @@ def getBrailleBindings(self):
things a script writer wants to do, especially getting debug
output to determine just what the AT-SPI is sending it. This
chapter discusses the debug utilities of Orca as well as a
- variety of utilities to assist a script in managing speech,
- braille, and magnification.</para>
+ variety of utilities to assist a script in managing speech and
+ braille.</para>
<section id="sgtts"><title>Speech Synthesis</title>
diff --git a/docs/man/orca.1 b/docs/man/orca.1
index 46a7c1d..ee2c9d0 100644
--- a/docs/man/orca.1
+++ b/docs/man/orca.1
@@ -16,14 +16,14 @@
'\"
.TH orca 1 "10 Nov 2008" "GNOME"
.SH NAME
-orca \- is a scriptable screen reader and magnifier
+orca \- is a scriptable screen reader
.SH SYNOPSIS
.B orca
.RI [ option... ]
.SH DESCRIPTION
.B orca
is a screen reader for people with visual impairments,
-it provides alternative access to the desktop by using speech synthesis, braille, and magnification.
+it provides alternative access to the desktop by using speech synthesis and braille.
.P
In addition,
.B orca
@@ -65,12 +65,12 @@ use
.I dirname
as an alternate directory for the user preferences.
.TP
-.BI "\-e, \-\-enable=" speech|braille|braille\-monitor|magnifier|main\-window
+.BI "\-e, \-\-enable=" speech|braille|braille\-monitor|main\-window
When starting
.BR orca ,
force the enabling of the supplied options.
.TP
-.BI "\-d, \-\-disable=" speech|braille|braille\-monitor|magnifier|main\-window
+.BI "\-d, \-\-disable=" speech|braille|braille\-monitor|main\-window
When starting
.BR orca ,
force the disabling of the supplied options.
@@ -377,7 +377,7 @@ user application specific settings directory
.SH AUTHOR
.B Orca
-development is a community effort led by the Sun Microsystems Inc.
+originated as a community effort led by the Sun Microsystems Inc.
Accessibility Program Office and with contributions from many community members.
.SH SEE ALSO
For more information please visit
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 9abfe3b..56b302f 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -14,11 +14,9 @@ src/orca/event_manager.py
src/orca/find.py
src/orca/flat_review.py
src/orca/generator.py
-src/orca/gsmag.py
src/orca/keybindings.py
src/orca/keynames.py
src/orca/liveregions.py
-src/orca/mag.py
src/orca/notification_messages.py
src/orca/orca_console_prefs.py
[type: gettext/glade]src/orca/orca-find.ui
diff --git a/src/orca/Makefile.am b/src/orca/Makefile.am
index 7da6186..30288eb 100644
--- a/src/orca/Makefile.am
+++ b/src/orca/Makefile.am
@@ -30,14 +30,12 @@ orca_python_PYTHON = \
flat_review.py \
formatting.py \
generator.py \
- gsmag.py \
httpserver.py \
input_event.py \
keybindings.py \
keynames.py \
laptop_keyboardmap.py \
liveregions.py \
- mag.py \
mouse_review.py \
notification_messages.py \
orca.py \
diff --git a/src/orca/orca.py b/src/orca/orca.py
index f34a4fa..34ff40d 100644
--- a/src/orca/orca.py
+++ b/src/orca/orca.py
@@ -76,15 +76,6 @@ def onEnabledChanged(gsetting, key):
if key == 'screen-reader-enabled' and not enabled:
shutdown()
- elif key == 'screen-magnifier-enabled':
- settings.enableMagnifier = enabled
- if enabled:
- try:
- mag.init()
- except:
- debug.printException(debug.LEVEL_SEVERE)
- debug.println(debug.LEVEL_SEVERE,
- "Could not initialize connection to magnifier.")
class Options:
"""Class to handle getting run-time options."""
@@ -547,12 +538,6 @@ if settings.useDBus:
import dbus.mainloop.glib
dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
import dbusserver
- try:
- import gsmag as mag
- except:
- import mag
-else:
- import mag
import braille
import httpserver
@@ -1514,7 +1499,6 @@ def loadUserSettings(script=None, inputEvent=None, skipReloadMessage=False):
httpserver.shutdown()
speech.shutdown()
braille.shutdown()
- mag.shutdown()
_scriptManager.deactivate()
@@ -1575,19 +1559,6 @@ def loadUserSettings(script=None, inputEvent=None, skipReloadMessage=False):
debug.println(debug.LEVEL_WARNING,
"Could not initialize connection to braille.")
- if a11yAppSettings.get_boolean('screen-magnifier-enabled'):
- try:
- mag.init()
- debug.println(debug.LEVEL_CONFIGURATION,
- "Magnification module has been initialized.")
- except:
- debug.printException(debug.LEVEL_SEVERE)
- debug.println(debug.LEVEL_SEVERE,
- "Could not initialize connection to magnifier.")
- else:
- debug.println(debug.LEVEL_CONFIGURATION,
- "Magnification module has NOT been initialized.")
-
# I'm not sure where else this should go. But it doesn't really look
# right here.
try:
@@ -1985,9 +1956,9 @@ def showSplashGUI(script=None, inputEvent=None):
_initialized = False
def init(registry):
- """Initialize the orca module, which initializes speech, braille,
- and mag modules. Also builds up the application list, registers
- for AT-SPI events, and creates scripts for all known applications.
+ """Initialize the orca module, which initializes the speech and braille
+ modules. Also builds up the application list, registers for AT-SPI events,
+ and creates scripts for all known applications.
Returns True if the initialization procedure has run, or False if this
module has already been initialized.
@@ -2119,8 +2090,6 @@ def shutdown(script=None, inputEvent=None):
speech.shutdown()
if settings.enableBraille:
braille.shutdown()
- if settings.enableMagnifier:
- mag.shutdown()
if settings.timeoutCallback and (settings.timeoutTime > 0):
signal.alarm(0)
diff --git a/src/orca/orca_gui_main.py b/src/orca/orca_gui_main.py
index 98b26a8..a3f2d0d 100644
--- a/src/orca/orca_gui_main.py
+++ b/src/orca/orca_gui_main.py
@@ -114,7 +114,6 @@ class OrcaMainGUI(Gtk.Window):
"Copyright (c) 2010 Consorcio Fernando de los Rios \n" \
"Copyright (c) 2010 Igalia, S.L. \n" \
"Copyright (c) 2010 Informal Informatica LTDA. \n" \
- "Copyright (c) 2010 Willie Walker \n" \
"Copyright (c) 2005-2010 Sun Microsystems Inc. \n" \
"Copyright (c) 2005-2008 Google Inc. \n" \
"Copyright (c) 2008, 2009 Eitan Isaacson \n" \
diff --git a/src/orca/scripts/apps/Eclipse/script.py b/src/orca/scripts/apps/Eclipse/script.py
index a0af800..c6af821 100644
--- a/src/orca/scripts/apps/Eclipse/script.py
+++ b/src/orca/scripts/apps/Eclipse/script.py
@@ -43,9 +43,8 @@ class Script(default.Script):
"Page_Down", "Home", "End"]
def _presentTextAtNewCaretPosition(self, event, otherObj=None):
- """Updates braille, magnification, and outputs speech for the
- event.source or the otherObj. Overridden here so that we can
- give more feedback to user
+ """Updates braille and outputs speech for the event.source or the
+ otherObj. Overridden here so that we can give more feedback to user.
"""
if self.utilities.isDuplicateEvent(event):
diff --git a/src/orca/scripts/apps/metacity/script.py b/src/orca/scripts/apps/metacity/script.py
index e7b37ff..a0e9141 100644
--- a/src/orca/scripts/apps/metacity/script.py
+++ b/src/orca/scripts/apps/metacity/script.py
@@ -26,10 +26,6 @@ __copyright__ = "Copyright (c) 2005-2008 Sun Microsystems Inc."
__license__ = "LGPL"
import orca.scripts.default as default
-try:
- import orca.gsmag as mag
-except:
- import orca.mag as mag
import orca.speech as speech
import pyatspi
@@ -115,7 +111,6 @@ class Script(default.Script):
self.displayBrailleMessage(text)
speech.speak(text)
- mag.magnifyAccessible(None, obj)
def onNameChanged(self, event):
"""The status bar in metacity tells us what toplevel window
diff --git a/src/orca/scripts/apps/packagemanager/script.py b/src/orca/scripts/apps/packagemanager/script.py
index 2098bae..ffa5d9a 100644
--- a/src/orca/scripts/apps/packagemanager/script.py
+++ b/src/orca/scripts/apps/packagemanager/script.py
@@ -358,10 +358,9 @@ class Script(default.Script):
orca_state.locusOfFocus.getIndexInParent()]
def _presentTextAtNewCaretPosition(self, event, otherObj=None):
- """Updates braille, magnification, and outputs speech for the
- event.source or the otherObj. Overridden here to force the braille
- display to be updated when the user arrows left/right into another
- object."""
+ """Updates braille and outputs speech for the event.source or the
+ otherObj. Overridden here to force the braille display to be updated
+ when the user arrows left/right into another object."""
default.Script._presentTextAtNewCaretPosition(self, event, otherObj)
diff --git a/src/orca/scripts/default.py b/src/orca/scripts/default.py
index 4d5625e..c75f2f4 100644
--- a/src/orca/scripts/default.py
+++ b/src/orca/scripts/default.py
@@ -44,10 +44,6 @@ import orca.find as find
import orca.flat_review as flat_review
import orca.input_event as input_event
import orca.keybindings as keybindings
-try:
- import orca.gsmag as mag
-except:
- import orca.mag as mag
import orca.outline as outline
import orca.orca_state as orca_state
import orca.phonnames as phonnames
@@ -1237,9 +1233,6 @@ class Script(script.Script):
except:
pass
- if newLocusOfFocus:
- mag.magnifyAccessible(event, newLocusOfFocus)
-
# We always automatically go back to focus tracking mode when
# the focus changes.
#
@@ -1432,7 +1425,6 @@ class Script(script.Script):
"VISUAL CHANGE: '%s' '%s' (event=None)" \
% (obj.name, obj.getRole()))
- mag.magnifyAccessible(event, obj)
self.updateBraille(obj)
utterances = self.speechGenerator.generateSpeech(
obj, alreadyFocused=True)
@@ -3776,15 +3768,12 @@ class Script(script.Script):
########################################################################
def _presentTextAtNewCaretPosition(self, event, otherObj=None):
- """Updates braille, magnification, and outputs speech for the
- event.source or the otherObj."""
+ """Updates braille and outputs speech for the event.source or the
+ otherObj."""
obj = otherObj or event.source
text = obj.queryText()
- if obj:
- mag.magnifyAccessible(event, obj)
-
# Update the Braille display - if we can just reposition
# the cursor, then go for it.
#
diff --git a/src/orca/scripts/toolkits/Gecko/script.py b/src/orca/scripts/toolkits/Gecko/script.py
index df89e77..ae0062f 100644
--- a/src/orca/scripts/toolkits/Gecko/script.py
+++ b/src/orca/scripts/toolkits/Gecko/script.py
@@ -55,10 +55,6 @@ import orca.eventsynthesizer as eventsynthesizer
import orca.input_event as input_event
import orca.keybindings as keybindings
import orca.liveregions as liveregions
-try:
- import orca.gsmag as mag
-except:
- import orca.mag as mag
import orca.orca as orca
import orca.orca_state as orca_state
import orca.rolenames as rolenames
@@ -5430,13 +5426,6 @@ class Script(default.Script):
text = self.utilities.queryNonEmptyText(obj)
if text:
text.setCaretOffset(characterOffset)
- if characterOffset == text.characterCount:
- characterOffset -= 1
- mag.magnifyAccessible(None,
- obj,
- self.getExtents(obj,
- characterOffset,
- characterOffset + 1))
def moveToMouseOver(self, inputEvent):
"""Positions the caret offset to the next character or object
diff --git a/src/orca/settings.py b/src/orca/settings.py
index 68d6610..91cea92 100644
--- a/src/orca/settings.py
+++ b/src/orca/settings.py
@@ -389,10 +389,6 @@ flashIsPersistent = False
#
enableBrailleMonitor = False
-# If True, enable magnification.
-#
-enableMagnifier = False
-
# if True, enable character echo.
# Note that it is allowable for both enableEchoByCharacter and enableKeyEcho
# to be True
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
