[orca] Fix for bug 689330 - Eliminate the Splash Window
- From: Joanmarie Diggs <joanied src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [orca] Fix for bug 689330 - Eliminate the Splash Window
- Date: Fri, 30 Nov 2012 08:34:10 +0000 (UTC)
commit 4a0de155b0e0c97ff6da82ce0251d2d46fecb896
Author: Joanmarie Diggs <jdiggs igalia com>
Date: Fri Nov 30 03:33:35 2012 -0500
Fix for bug 689330 - Eliminate the Splash Window
help/C/introduction.page | 3 -
orca-autostart.desktop.in | 2 +-
po/POTFILES.in | 1 -
src/orca/Makefile.am | 4 --
src/orca/orca-splash.png | Bin 106028 -> 0 bytes
src/orca/orca.py | 19 -------
src/orca/orca_gui_splash.py | 121 -------------------------------------------
src/orca/settings.py | 4 --
8 files changed, 1 insertions(+), 153 deletions(-)
---
diff --git a/help/C/introduction.page b/help/C/introduction.page
index 5ac5b39..460320f 100644
--- a/help/C/introduction.page
+++ b/help/C/introduction.page
@@ -101,7 +101,6 @@
<item><p><cmd>speech</cmd></p></item>
<item><p><cmd>braille</cmd></p></item>
<item><p><cmd>braille-monitor</cmd></p></item>
- <item><p><cmd>splash-window</cmd></p></item>
</list>
</item>
<item>
@@ -114,8 +113,6 @@
<item><p><cmd>speech</cmd></p></item>
<item><p><cmd>braille</cmd></p></item>
<item><p><cmd>braille-monitor</cmd></p></item>
- <item><p><cmd>main-window</cmd></p></item>
- <item><p><cmd>splash-window</cmd></p></item>
</list>
</item>
<item>
diff --git a/orca-autostart.desktop.in b/orca-autostart.desktop.in
index ea08a75..76cb81f 100644
--- a/orca-autostart.desktop.in
+++ b/orca-autostart.desktop.in
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=Application
Name=Orca screen reader
-Exec=orca --disable splash-window --enable speech,braille
+Exec=orca --enable speech,braille
NoDisplay=true
AutostartCondition=GSettings org.gnome.desktop.a11y.applications screen-reader-enabled
X-GNOME-AutoRestart=true
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 2b4372d..53fb6f4 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -22,7 +22,6 @@ src/orca/notification_messages.py
src/orca/orca_bin.py.in
src/orca/orca_console_prefs.py
[type: gettext/glade]src/orca/orca-find.ui
-src/orca/orca_gui_splash.py
src/orca/orca_gui_find.py
src/orca/orca_gui_prefs.py
src/orca/orca_gui_profile.py
diff --git a/src/orca/Makefile.am b/src/orca/Makefile.am
index 6e7bc0c..ca22684 100644
--- a/src/orca/Makefile.am
+++ b/src/orca/Makefile.am
@@ -43,7 +43,6 @@ orca_python_PYTHON = \
orca_gui_find.py \
orca_gui_prefs.py \
orca_gui_profile.py \
- orca_gui_splash.py \
orca_i18n.py \
orca_state.py \
outline.py \
@@ -76,9 +75,6 @@ ui_DATA = \
orca-find.ui \
orca-setup.ui
-gfx_DATA = \
- orca-splash.png
-
EXTRA_DIST = \
$(ui_DATA) \
$(gfx_DATA)
diff --git a/src/orca/orca.py b/src/orca/orca.py
index 236bb1b..9c850a2 100644
--- a/src/orca/orca.py
+++ b/src/orca/orca.py
@@ -710,24 +710,6 @@ def showFindGUI(script=None, inputEvent=None):
except:
debug.printException(debug.LEVEL_SEVERE)
-def showSplashGUI(script=None, inputEvent=None):
- """Displays a splash screen.
-
- Returns True to indicate the input event has been consumed.
- """
-
- try:
- module = importlib.import_module('.orca_gui_splash', 'orca')
- if _settingsManager.getSetting("showSplashWindow"):
- module.showSplashUI()
- else:
- module.hideSplashUI()
-
- except:
- debug.printException(debug.LEVEL_SEVERE)
-
- return True
-
# If True, this module has been initialized.
#
_initialized = False
@@ -971,7 +953,6 @@ def main():
except:
debug.printException(debug.LEVEL_SEVERE)
- showSplashGUI()
script = orca_state.activeScript
if script:
window = script.utilities.activeWindow()
diff --git a/src/orca/settings.py b/src/orca/settings.py
index 9b75519..f474744 100644
--- a/src/orca/settings.py
+++ b/src/orca/settings.py
@@ -361,10 +361,6 @@ enableMnemonicSpeaking = False
#
enablePositionSpeaking = False
-# If True, show the splash window.
-#
-showSplashWindow = True
-
# If True, always present locking key state changes; if False, never present
# locking key state changes. If None, make the decision based on Orca's normal
# behavior.
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]