[pitivi] application: clean up the welcome dialog grab focus commit

[Thibault Saunier <tsaunier src gnome org>]

commit 44bd3e61c3bd60358a404efa7d63f2f0424b7fee
Author: Thibault Saunier <thibault saunier collabora co uk>
Date:   Sun May 22 20:49:26 2011 -0400

    application: clean up the welcome dialog grab focus commit

 pitivi/application.py |   20 ++++++++------------
 1 files changed, 8 insertions(+), 12 deletions(-)
---
diff --git a/pitivi/application.py b/pitivi/application.py
index e9535f0..ac71d5f 100644
--- a/pitivi/application.py
+++ b/pitivi/application.py
@@ -293,17 +293,8 @@ class GuiPitivi(InteractivePitivi):
 
     def _showGui(self):
         """Creates and shows the UI."""
-
         self.gui = self._createGui()
-        
-        if isinstance(self, StartupWizardGuiPitivi):
-            # A hack to ensure that the welcome dialog is really shown
-            # and focused *after* the main window
-            self.wizard.hide()
-            self.gui.show()
-            self.wizard.show()
-        else:
-            self.gui.show()
+        self.gui.show()
 
     def shutdown(self):
         if Pitivi.shutdown(self):
@@ -316,7 +307,7 @@ class GuiPitivi(InteractivePitivi):
 class FullGuiPitivi(GuiPitivi):
     """
     Creates an instance of PiTiVi with the UI
-    
+
     This is called when we start the UI with a project passed as a parameter,
     but not when we start with the welcome dialog.
     """
@@ -384,7 +375,7 @@ class ProjectLoaderGuiPitivi(FullGuiPitivi):
 class StartupWizardGuiPitivi(FullGuiPitivi):
     """
     Creates an instance of the PiTiVi UI with the welcome dialog
-    
+
     This is not called when a project is passed as a parameter.
     """
 
@@ -396,8 +387,13 @@ class StartupWizardGuiPitivi(FullGuiPitivi):
         self.projectManager.connect("new-project-loading", self._hideWizardCb)
         self.projectManager.connect("new-project-failed", self._showWizardCb)
         self.wizard = StartUpWizard(self)
+        self.wizard.hide()
         return FullGuiPitivi._createGui(self)
 
+    def _showGui(self):
+        FullGuiPitivi._showGui(self)
+        self.wizard.show()
+
     def _hideWizardCb(self, unused_projectManager, uri):
         if uri is not None:
             self.wizard.hide()