GNOME.org
 

[orca] Fix for bug 689329 - Eliminate the Quit Window

commit 448687ddcaeffb15dfc6b31daca65f93b792626b
Author: Joanmarie Diggs <jdiggs igalia com>
Date:   Fri Nov 30 02:31:37 2012 -0500

    Fix for bug 689329 - Eliminate the Quit Window

 .../preferences_quit_Orca_without_confirmation.png |  Bin 2515 -> 0 bytes
 .../figures/preferences_show_Orca_main_window.png  |  Bin 2432 -> 0 bytes
 help/C/introduction.page                           |   14 ---
 help/C/preferences_general.page                    |   19 ----
 help/Makefile.am                                   |    2 -
 po/POTFILES.in                                     |    1 -
 src/orca/Makefile.am                               |    1 -
 src/orca/orca-setup.ui                             |   57 -----------
 src/orca/orca.py                                   |    9 +--
 src/orca/orca_gui_prefs.py                         |    2 -
 src/orca/orca_gui_quit.py                          |  101 --------------------
 src/orca/settings.py                               |    6 -
 12 files changed, 1 insertions(+), 211 deletions(-)
---
diff --git a/help/C/introduction.page b/help/C/introduction.page
index 339b48c..5ac5b39 100644
--- a/help/C/introduction.page
+++ b/help/C/introduction.page
@@ -57,24 +57,11 @@
       <list>
         <item>
           <p>
-            Press the <gui>Quit</gui> button in the <app>Orca</app> main
-            window.
-          </p>
-        </item>
-        <item>
-          <p>
             Press <keyseq><key>Orca Modifier</key><key>Q</key></keyseq>.
             This command works whether the <app>Orca</app> main window is
             enabled or not.
           </p>
         </item>
-        <item>
-          <p>
-            Type <cmd>orca -q</cmd> or <cmd>orca --quit</cmd> in a terminal
-            window or within the <gui>Run</gui> dialog and then press
-            <key>Return</key>.
-          </p>
-        </item>
       </list>
     </section>
     <section id="loadtime">
@@ -114,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>main-window</cmd></p></item>
             <item><p><cmd>splash-window</cmd></p></item>
           </list>
         </item>
diff --git a/help/C/preferences_general.page b/help/C/preferences_general.page
index 8971c18..b4eb777 100644
--- a/help/C/preferences_general.page
+++ b/help/C/preferences_general.page
@@ -35,25 +35,6 @@
       Default value: <gui>Desktop</gui>
     </p>
   </section>
-  <section id="quitorca">
-    <info>
-      <desc>
-        Preferences dialog box option to quit <app>Orca</app> without
-        presenting a confirmation dialog.
-      </desc>
-    </info>
-    <title>Quit Orca Without Confirmation</title>
-      <media type="image" mime="image/png" src="figures/preferences_quit_Orca_without_confirmation.png"/>
-      <p>
-        Normally, when you quit <app>Orca</app>, a confirmation dialog will
-        appear asking you if you do indeed wish to quit <app>Orca</app>.
-        Checking the <gui>Quit Orca without confirmation</gui> checkbox
-        prevents this confirmation window from appearing.
-    </p>
-    <p>
-      Default value: not checked
-    </p>
-  </section>
   <section id="presenttooltips">
     <info>
       <desc>
diff --git a/help/Makefile.am b/help/Makefile.am
index a3e440e..158b490 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -29,10 +29,8 @@ HELP_MEDIA = \
 	figures/preferences_progress_bar_updates.png \
 	figures/preferences_pronunciation.png \
 	figures/preferences_punctuation_level.png \
-	figures/preferences_quit_Orca_without_confirmation.png \
 	figures/preferences_rate_pitch_volume.png \
 	figures/preferences_say_all_by.png \
-	figures/preferences_show_Orca_main_window.png \
 	figures/preferences_speak_multicase_strings_as_words.png \
 	figures/preferences_speak_object_under_mouse.png \
 	figures/preferences_speech_verbosity.png \
diff --git a/po/POTFILES.in b/po/POTFILES.in
index c0bef04..2b4372d 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -26,7 +26,6 @@ src/orca/orca_gui_splash.py
 src/orca/orca_gui_find.py
 src/orca/orca_gui_prefs.py
 src/orca/orca_gui_profile.py
-src/orca/orca_gui_quit.py
 src/orca/orca.py
 [type: gettext/glade]src/orca/orca-setup.ui
 src/orca/phonnames.py
diff --git a/src/orca/Makefile.am b/src/orca/Makefile.am
index 48556f1..6e7bc0c 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_quit.py \
 	orca_gui_splash.py \
 	orca_i18n.py \
 	orca_state.py \
diff --git a/src/orca/orca-setup.ui b/src/orca/orca-setup.ui
index 4ebd302..81097b3 100644
--- a/src/orca/orca-setup.ui
+++ b/src/orca/orca-setup.ui
@@ -376,63 +376,6 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkFrame" id="userInterfaceFrame">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="label_xalign">0</property>
-                    <property name="shadow_type">none</property>
-                    <child>
-                      <object class="GtkAlignment" id="userInterfaceAlignment">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="left_padding">12</property>
-                        <child>
-                          <object class="GtkGrid" id="userInterfaceGrid">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <child>
-                              <object class="GtkCheckButton" id="quitOrcaNoConfirmationCheckButton">
-                                <property name="label" translatable="yes">Quit Orca _without confirmation</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="draw_indicator">True</property>
-                                <signal name="toggled" handler="checkButtonToggled" swapped="no"/>
-                              </object>
-                              <packing>
-                                <property name="left_attach">0</property>
-                                <property name="top_attach">1</property>
-                                <property name="width">1</property>
-                                <property name="height">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                        </child>
-                      </object>
-                    </child>
-                    <child type="label">
-                      <object class="GtkLabel" id="userInterfaceLabel">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">User Interface</property>
-                        <attributes>
-                          <attribute name="weight" value="bold"/>
-                        </attributes>
-                      </object>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">1</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
-                  </packing>
-                </child>
-                <child>
                   <object class="GtkFrame" id="profilesFrame">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
diff --git a/src/orca/orca.py b/src/orca/orca.py
index 5305075..236bb1b 100644
--- a/src/orca/orca.py
+++ b/src/orca/orca.py
@@ -694,14 +694,7 @@ def quitOrca(script=None, inputEvent=None):
     Returns True to indicate the input event has been consumed.
     """
 
-    if _settingsManager.getSetting("quitOrcaNoConfirmation"):
-        shutdown()
-    else:
-        try:
-            module = importlib.import_module('.orca_gui_quit', 'orca')
-            module.showQuitUI()
-        except:
-            debug.printException(debug.LEVEL_SEVERE)
+    shutdown()
 
     return True
 
diff --git a/src/orca/orca_gui_prefs.py b/src/orca/orca_gui_prefs.py
index 61bfdb7..b0508c8 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("quitOrcaNoConfirmationCheckButton").set_active(
-            prefs["quitOrcaNoConfirmation"])        
         self.get_widget("presentToolTipsCheckButton").set_active(
             prefs["presentToolTips"])
 
diff --git a/src/orca/settings.py b/src/orca/settings.py
index 17b9aa8..9b75519 100644
--- a/src/orca/settings.py
+++ b/src/orca/settings.py
@@ -71,7 +71,6 @@ userCustomizableSettings = [
     "brailleAlignmentStyle",
     "enableBrailleMonitor",
     "verbalizePunctuationStyle",
-    "quitOrcaNoConfirmation",
     "presentToolTips",
     "sayAllStyle",
     "keyboardLayout",
@@ -366,11 +365,6 @@ enablePositionSpeaking = False
 #
 showSplashWindow          = True
 
-# If True, quit Orca without confirmation when the user presses
-# <Orca-modifier>-q.
-#
-quitOrcaNoConfirmation  = False
-
 # 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]