GNOME.org
 

[orca] Fix for bug 689327 - Eliminate the Main Window

commit ab0b27c7545c0b58b4eddbfa2f13b9956ba06998
Author: Joanmarie Diggs <jdiggs igalia com>
Date:   Fri Nov 30 01:37:37 2012 -0500

    Fix for bug 689327 - Eliminate the Main Window

 help/C/figures/main_window.png                     |  Bin 10305 -> 0 bytes
 help/C/preferences_general.page                    |   31 ---
 help/Makefile.am                                   |    1 -
 orca-autostart.desktop.in                          |    2 +-
 po/POTFILES.in                                     |    1 -
 src/orca/Makefile.am                               |    1 -
 src/orca/orca-setup.ui                             |   21 --
 src/orca/orca.py                                   |   19 --
 src/orca/orca_gui_main.py                          |  197 --------------------
 src/orca/orca_gui_prefs.py                         |    9 -
 src/orca/orca_gui_quit.py                          |    2 -
 src/orca/settings.py                               |    5 -
 test/harness/user-settings.conf.in                 |    1 -
 .../firefox/sayAll_bug-591351-1.settings           |    1 -
 .../gtk-demo/spoken_indentation.settings           |    1 -
 15 files changed, 1 insertions(+), 291 deletions(-)
---
diff --git a/help/C/preferences_general.page b/help/C/preferences_general.page
index ee3c00d..8971c18 100644
--- a/help/C/preferences_general.page
+++ b/help/C/preferences_general.page
@@ -74,37 +74,6 @@
       Default value: not checked
     </p>
   </section>
-  <section id="showmainwindow">
-    <info>
-      <desc>
-        Preferences dialog box option for showing or hiding the <app>Orca</app>
-        main window.
-      </desc>
-    </info>
-    <title>Show Orca Main Window</title>
-    <media type="image" mime="image/png" src="figures/preferences_show_Orca_main_window.png"/>
-    <figure>
-      <title>
-        The Orca Main Window
-      </title>
-      <media type="image" mime="image/png" src="figures/main_window.png"/>
-      <desc>
-        <app>Orca</app>'s main window provides you with a graphical way to
-        display the <link xref="preferences">Orca Preferences</link> dialog,
-        access help content, bring up the About dialog, and quit <app>Orca</app>.
-      </desc>
-    </figure>
-    <p>
-      Many users do not like the <app>Orca</app> main window because it shows
-      up in the window manager's Tab order when you press <keyseq>
-      <key>Alt</key><key>Tab</key></keyseq> to switch windows. By unchecking
-      the <gui>Show <app>Orca</app> main window</gui> checkbox, you can tell
-      <app>Orca</app> to not show <app>Orca</app>'s main window.
-    </p>
-    <p>
-      Default value: checked
-    </p>
-  </section>
   <section id="objectundermouse">
     <info>
       <desc>
diff --git a/help/Makefile.am b/help/Makefile.am
index 5c09463..a3e440e 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -2,7 +2,6 @@
 
 HELP_ID = orca
 HELP_MEDIA = \
-	figures/main_window.png \
 	figures/orca_find.png \
 	figures/orca-logo.png \
 	figures/perferences_table_navigation.png \
diff --git a/orca-autostart.desktop.in b/orca-autostart.desktop.in
index a0d6090..ea08a75 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 main-window,splash-window --enable speech,braille
+Exec=orca --disable splash-window --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 43b0469..c0bef04 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -24,7 +24,6 @@ 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_main.py
 src/orca/orca_gui_prefs.py
 src/orca/orca_gui_profile.py
 src/orca/orca_gui_quit.py
diff --git a/src/orca/Makefile.am b/src/orca/Makefile.am
index 78b01d9..48556f1 100644
--- a/src/orca/Makefile.am
+++ b/src/orca/Makefile.am
@@ -41,7 +41,6 @@ orca_python_PYTHON = \
 	orca_console_prefs.py \
 	orca_gtkbuilder.py \
 	orca_gui_find.py \
-	orca_gui_main.py \
 	orca_gui_prefs.py \
 	orca_gui_profile.py \
 	orca_gui_quit.py \
diff --git a/src/orca/orca-setup.ui b/src/orca/orca-setup.ui
index 38378fa..4ebd302 100644
--- a/src/orca/orca-setup.ui
+++ b/src/orca/orca-setup.ui
@@ -391,27 +391,6 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <child>
-                              <object class="GtkCheckButton" id="showMainWindowCheckButton">
-                                <property name="label" translatable="yes">Show Orca _main window</property>
-                                <property name="use_action_appearance">False</property>
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">False</property>
-                                <property name="use_action_appearance">False</property>
-                                <property name="use_underline">True</property>
-                                <property name="xalign">0</property>
-                                <property name="active">True</property>
-                                <property name="draw_indicator">True</property>
-                                <signal name="toggled" handler="checkButtonToggled" swapped="no"/>
-                              </object>
-                              <packing>
-                                <property name="left_attach">0</property>
-                                <property name="top_attach">0</property>
-                                <property name="width">1</property>
-                                <property name="height">1</property>
-                              </packing>
-                            </child>
-                            <child>
                               <object class="GtkCheckButton" id="quitOrcaNoConfirmationCheckButton">
                                 <property name="label" translatable="yes">Quit Orca _without confirmation</property>
                                 <property name="use_action_appearance">False</property>
diff --git a/src/orca/orca.py b/src/orca/orca.py
index fc39f34..5305075 100644
--- a/src/orca/orca.py
+++ b/src/orca/orca.py
@@ -468,8 +468,6 @@ def loadUserSettings(script=None, inputEvent=None, skipReloadMessage=False):
     _storeXmodmap(_orcaModifiers)
     _createOrcaXmodmap()
 
-    showMainWindowGUI()
-
     _scriptManager.activate()
     _eventManager.activate()
 
@@ -508,23 +506,6 @@ def showPreferencesGUI(script=None, inputEvent=None):
 
     return True
 
-def showMainWindowGUI(script=None, inputEvent=None):
-    """Displays the Orca main window.
-
-    Returns True to indicate the input event has been consumed.
-    """
-
-    try:
-        module = importlib.import_module('.orca_gui_main', 'orca')
-        if settings.showMainWindow or settings.overrideDisabledMainWindow:
-            module.showMainUI()
-        else:
-            module.hideMainUI()
-    except:
-        debug.printException(debug.LEVEL_SEVERE)
-
-    return True
-
 def helpForOrca(script=None, inputEvent=None, page=""):
     """Show Orca Help window (part of the GNOME Access Guide).
 
diff --git a/src/orca/orca_gui_prefs.py b/src/orca/orca_gui_prefs.py
index 9a37d9e..61bfdb7 100644
--- a/src/orca/orca_gui_prefs.py
+++ b/src/orca/orca_gui_prefs.py
@@ -1669,8 +1669,6 @@ class OrcaSetupGUI(orca_gtkbuilder.GtkBuilderWrapper):
 
         # General pane.
         #
-        self.get_widget("showMainWindowCheckButton").set_active(
-            prefs["showMainWindow"])
         self.get_widget("quitOrcaNoConfirmationCheckButton").set_active(
             prefs["quitOrcaNoConfirmation"])        
         self.get_widget("presentToolTipsCheckButton").set_active(
@@ -3292,9 +3290,6 @@ class OrcaSetupGUI(orca_gtkbuilder.GtkBuilderWrapper):
         - widget: the component that generated the signal.
         """
 
-        if settings.showMainWindow:
-            orca.showMainWindowGUI()
-
         self.keyBindView.set_model(None)
         self.getTextAttributesView.set_model(None)
         self.pronunciationView.set_model(None)
@@ -3426,10 +3421,6 @@ class OrcaSetupGUI(orca_gtkbuilder.GtkBuilderWrapper):
         _settingsManager.setProfile(activeProfile[1])
         self.prefsDict = _settingsManager.getGeneralSettings(activeProfile[1])
 
-        orca.showMainWindowGUI()
-        if _settingsManager.getSetting('showMainWindow'):
-            self.window.present()
-
         orca.loadUserSettings(skipReloadMessage=True)
 
         self._initGUIState()
diff --git a/src/orca/orca_gui_quit.py b/src/orca/orca_gui_quit.py
index 7a9770e..d009ec5 100644
--- a/src/orca/orca_gui_quit.py
+++ b/src/orca/orca_gui_quit.py
@@ -72,8 +72,6 @@ class OrcaQuitGUI(Gtk.MessageDialog):
 
         if response in [Gtk.ResponseType.CANCEL, Gtk.ResponseType.DELETE_EVENT]:
             self.hide()
-            if settings.showMainWindow:
-                orca.showMainWindowGUI()
 
     def onDestroy(self, widget):
         """Signal handler for the 'destroy' signal of the dialog."""
diff --git a/src/orca/settings.py b/src/orca/settings.py
index 00398e5..17b9aa8 100644
--- a/src/orca/settings.py
+++ b/src/orca/settings.py
@@ -71,7 +71,6 @@ userCustomizableSettings = [
     "brailleAlignmentStyle",
     "enableBrailleMonitor",
     "verbalizePunctuationStyle",
-    "showMainWindow",
     "quitOrcaNoConfirmation",
     "presentToolTips",
     "sayAllStyle",
@@ -363,10 +362,6 @@ enableMnemonicSpeaking = False
 #
 enablePositionSpeaking = False
 
-# If True, show the main Orca window.
-#
-showMainWindow          = True
-
 # If True, show the splash window.
 #
 showSplashWindow          = True
diff --git a/test/harness/user-settings.conf.in b/test/harness/user-settings.conf.in
index 886676b..ea2757b 100644
--- a/test/harness/user-settings.conf.in
+++ b/test/harness/user-settings.conf.in
@@ -45,7 +45,6 @@
         "magCursorSize": 32, 
         "magSmoothingMode": 0, 
         "magZoomerLeft": 1200, 
-        "showMainWindow": true, 
         "sayAllStyle": 1, 
         "brailleSelectorIndicator": 192, 
         "presentDateFormat": "%x", 
diff --git a/test/keystrokes/firefox/sayAll_bug-591351-1.settings b/test/keystrokes/firefox/sayAll_bug-591351-1.settings
index 82a2353..2d75cbb 100644
--- a/test/keystrokes/firefox/sayAll_bug-591351-1.settings
+++ b/test/keystrokes/firefox/sayAll_bug-591351-1.settings
@@ -45,7 +45,6 @@
         "magCursorSize": 32, 
         "magSmoothingMode": 0, 
         "magZoomerLeft": 1200, 
-        "showMainWindow": true, 
         "sayAllStyle": 1, 
         "brailleSelectorIndicator": 192, 
         "presentDateFormat": "%x", 
diff --git a/test/keystrokes/gtk-demo/spoken_indentation.settings b/test/keystrokes/gtk-demo/spoken_indentation.settings
index 0d954ce..8e0fb01 100644
--- a/test/keystrokes/gtk-demo/spoken_indentation.settings
+++ b/test/keystrokes/gtk-demo/spoken_indentation.settings
@@ -45,7 +45,6 @@
         "magCursorSize": 32, 
         "magSmoothingMode": 0, 
         "magZoomerLeft": 1200, 
-        "showMainWindow": true, 
         "sayAllStyle": 1, 
         "brailleSelectorIndicator": 192, 
         "presentDateFormat": "%x",
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]