[orca] Fix for bug 652373 - Orca's magnification keybindings are no longer needed in GNOME 3 and should the

[Joanmarie Diggs <joanied src gnome org>]

commit 0de471054d1a55d81cdf6f3f13215466cf5f0cb0
Author: Joanmarie Diggs <joanmarie diggs gmail com>
Date:   Sat Jun 11 20:24:19 2011 -0400

    Fix for bug 652373 - Orca's magnification keybindings are no longer needed in GNOME 3 and should therefore be removed

 src/orca/common_keyboardmap.py |   22 +--------------
 src/orca/gsmag.py              |   50 -----------------------------------
 src/orca/mag.py                |   18 ------------
 src/orca/scripts/default.py    |   57 ----------------------------------------
 4 files changed, 2 insertions(+), 145 deletions(-)
---
diff --git a/src/orca/common_keyboardmap.py b/src/orca/common_keyboardmap.py
index 341b3ad..75a08dc 100644
--- a/src/orca/common_keyboardmap.py
+++ b/src/orca/common_keyboardmap.py
@@ -1,6 +1,6 @@
 # Orca
 #
-# Copyright 2010 Joanmarie Diggs, Mesar Hameed.
+# Copyright 2010-2011 The Orca Team
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -25,7 +25,7 @@
 __id__ = "$Id$"
 __version__   = "$Revision$"
 __date__      = "$Date$"
-__copyright__ = "Copyright (c) 2010 Joanmarie Diggs, Mesar Hameed."
+__copyright__ = "Copyright (c) 2010-2011 The Orca Team"
 __license__   = "LGPL"
 
 import settings
@@ -181,24 +181,6 @@ keymap = (
     "increaseSpeechPitchHandler"),
 
     ("", defaultModifierMask, NO_MODIFIER_MASK,
-    "toggleColorEnhancementsHandler"),
-
-    ("", defaultModifierMask, NO_MODIFIER_MASK,
-    "toggleMouseEnhancementsHandler"),
-
-    ("", defaultModifierMask, NO_MODIFIER_MASK,
-    "increaseMagnificationHandler"),
-
-    ("", defaultModifierMask, NO_MODIFIER_MASK,
-    "decreaseMagnificationHandler"),
-
-    ("", defaultModifierMask, NO_MODIFIER_MASK,
-    "toggleMagnifierHandler"),
-
-    ("", defaultModifierMask, NO_MODIFIER_MASK,
-    "cycleZoomerTypeHandler"),
-
-    ("", defaultModifierMask, NO_MODIFIER_MASK,
     "panBrailleLeftHandler"),
 
     ("",defaultModifierMask, NO_MODIFIER_MASK,
diff --git a/src/orca/gsmag.py b/src/orca/gsmag.py
index 9582bf4..95c63d1 100644
--- a/src/orca/gsmag.py
+++ b/src/orca/gsmag.py
@@ -43,8 +43,6 @@ import settings
 import orca_state
 import gconf
 
-from orca_i18n import _
-
 # Some GConf settings that gs-mag uses
 #
 A11Y_MAG_PREFS_DIR  = "/desktop/gnome/accessibility/magnifier"
@@ -746,54 +744,6 @@ def setZoomerSmoothingType(smoothingType, updateScreen=True):
 
 ########################################################################
 #                                                                      #
-# Methods for changing settings via keyboard/mouse events              #
-#                                                                      #
-########################################################################
-
-def cycleZoomerType(script=None, inputEvent=None):
-    """Allows the user to cycle through the available zoomer types."""
-    # [[[WDW - To be implemented]]]
-    pass
-
-def decreaseMagnification(script=None, inputEvent=None):
-    """Decreases the magnification level."""
-    # [[[WDW - To be implemented]]]
-    pass
-
-def increaseMagnification(script=None, inputEvent=None):
-    """Increases the magnification level."""
-    # [[[WDW - To be implemented]]]
-    pass
-
-def toggleColorEnhancements(script=None, inputEvent=None):
-    """Toggles the color enhancements on/off."""
-    # [[[WDW - To be implemented]]]
-    pass
-
-def toggleMouseEnhancements(script=None, inputEvent=None):
-    """Toggles the mouse enhancements on/off."""
-    # [[[WDW - To be implemented]]]
-    pass
-
-def toggleMagnifier(script=None, inputEvent=None):
-    """Toggles the magnifier."""
-    if not _magnifier.isActive():
-        init()
-        # Translators: this is the message spoken when a user enables the
-        # magnifier.  In addition to screen magnification, the user's
-        # preferred colors and mouse customizations are loaded.
-        #
-        orca_state.activeScript.presentMessage(_("Magnifier enabled."))
-    else:
-        shutdown()
-        # Translators: this is the message spoken when a user disables the
-        # magnifier, restoring the screen contents to their normal colors
-        # and sizes.
-        #
-        orca_state.activeScript.presentMessage(_("Magnifier disabled."))
-
-########################################################################
-#                                                                      #
 # Methods for obtaining magnifier capabilities                         #
 #                                                                      #
 ########################################################################
diff --git a/src/orca/mag.py b/src/orca/mag.py
index ba8d3e1..a13d26f 100644
--- a/src/orca/mag.py
+++ b/src/orca/mag.py
@@ -114,21 +114,3 @@ def updatePointerFollowsZoomer(enabled):
 
 def finishLiveUpdating():
     pass
-
-def toggleColorEnhancements(script=None, inputEvent=None):
-    pass
-
-def toggleMouseEnhancements(script=None, inputEvent=None):
-    pass
-
-def increaseMagnification(script=None, inputEvent=None):
-    pass
-
-def decreaseMagnification(script=None, inputEvent=None):
-    pass
-
-def toggleMagnifier(script=None, inputEvent=None):
-    pass
-
-def cycleZoomerType(script=None, inputEvent=None):
-    pass
diff --git a/src/orca/scripts/default.py b/src/orca/scripts/default.py
index 04b55cf..0207357 100644
--- a/src/orca/scripts/default.py
+++ b/src/orca/scripts/default.py
@@ -1002,63 +1002,6 @@ class Script(script.Script):
                 #
                 _("Go to previous bookmark location."))
 
-        self.inputEventHandlers["toggleColorEnhancementsHandler"] = \
-            input_event.InputEventHandler(
-                mag.toggleColorEnhancements,
-                # Translators: "color enhancements" are changes users can
-                # make to the appearance of the screen to make things easier
-                # to see, such as inverting the colors or applying a tint.
-                # This command toggles these enhancements on/off.
-                #
-                _("Toggles color enhancements."))
-
-        self.inputEventHandlers["toggleMouseEnhancementsHandler"] = \
-            input_event.InputEventHandler(
-                mag.toggleMouseEnhancements,
-                # Translators: "mouse enhancements" are changes users can
-                # make to the appearance of the mouse pointer to make it
-                # easier to see, such as increasing its size, changing its
-                # color, and surrounding it with crosshairs.  This command
-                # toggles these enhancements on/off.
-                #
-                _("Toggles mouse enhancements."))
-
-        self.inputEventHandlers["increaseMagnificationHandler"] = \
-            input_event.InputEventHandler(
-                mag.increaseMagnification,
-                # Translators: this command increases the magnification
-                # level.
-                #
-                _("Increases the magnification level."))
-
-        self.inputEventHandlers["decreaseMagnificationHandler"] = \
-            input_event.InputEventHandler(
-                mag.decreaseMagnification,
-                # Translators: this command decreases the magnification
-                # level.
-                #
-                _("Decreases the magnification level."))
-
-        self.inputEventHandlers["toggleMagnifierHandler"] = \
-            input_event.InputEventHandler(
-                mag.toggleMagnifier,
-                # Translators: Orca allows the user to turn the magnifier
-                # on or off. This command not only toggles magnification,
-                # but also all of the color and pointer customizations
-                # made through the magnifier.
-                #
-                _("Toggles the magnifier."))
-
-        self.inputEventHandlers["cycleZoomerTypeHandler"] = \
-            input_event.InputEventHandler(
-                mag.cycleZoomerType,
-                # Translators: the user can choose between several different
-                # types of magnification, including full screen and split
-                # screen.  The "position" here refers to location of the
-                # magnifier.
-                #
-                _("Cycles to the next magnifier position."))
-
         self.inputEventHandlers["toggleMouseReviewHandler"] = \
             input_event.InputEventHandler(
                 mouse_review.toggle,