[orca/introspection] Fix (I hope) for bug 656808. Also made some long-overdue copyright updates to the About dialog



commit 9cc053a2e1c6e29e17f8d96680485a0b57c573e4
Author: Joanmarie Diggs <joanmarie diggs gmail com>
Date:   Sun Aug 28 22:39:35 2011 -0400

    Fix (I hope) for bug 656808. Also made some long-overdue copyright updates to the About dialog
    
    * Tries to give the main window focus (if it's being used)
    * The rest of the time, I can Alt+Tab into other windows

 src/orca/orca_gui_main.py  |   13 +++++++++++--
 src/orca/orca_gui_prefs.py |    3 +++
 2 files changed, 14 insertions(+), 2 deletions(-)
---
diff --git a/src/orca/orca_gui_main.py b/src/orca/orca_gui_main.py
index c31dc11..dc2ee45 100644
--- a/src/orca/orca_gui_main.py
+++ b/src/orca/orca_gui_main.py
@@ -33,6 +33,7 @@ import locale
 import orca
 import orca_gtkbuilder
 import orca_platform
+import orca_state
 
 from orca_i18n import _           # for gettext support
 
@@ -64,7 +65,10 @@ class OrcaMainGUI(orca_gtkbuilder.GtkBuilderWrapper):
                                    modifierMask,
                                    0)
 
-        mainWindow.show()
+        ts = orca_state.lastInputEventTimestamp
+        if ts == 0:
+            ts = Gtk.get_current_event_time()
+        mainWindow.present_with_time(ts)
 
     def hideGUI(self):
         """Hide the Orca main window GUI. This assumes that the GUI has
@@ -100,7 +104,12 @@ class OrcaMainGUI(orca_gtkbuilder.GtkBuilderWrapper):
                      "support AT-SPI (e.g., the GNOME desktop).")
         # Translators: This text is used in the Orca About dialog.
         #
-        copyrights = _("Copyright (c) 2005-2010 Sun Microsystems Inc. \n" \
+        copyrights = _("Copyright (c) 2010-2011 The Orca Team \n" \
+                       "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" \
                        "Copyright (c) 2006-2009 Brailcom, o.p.s. \n" \
diff --git a/src/orca/orca_gui_prefs.py b/src/orca/orca_gui_prefs.py
index 7cbceae..f122c19 100644
--- a/src/orca/orca_gui_prefs.py
+++ b/src/orca/orca_gui_prefs.py
@@ -3353,6 +3353,9 @@ 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)



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]