[pitivi] Make mainwindow a parent of encodingprogress, fix modality and focusing

[Edward Hervey <edwardrv src gnome org>]

commit 55803bf6c44ea2f3211459dac551046a593ccc0a
Author: Jean-François Fortin Tam <nekohayo gmail com>
Date:   Sun Dec 5 13:14:39 2010 -0500

    Make mainwindow a parent of encodingprogress, fix modality and focusing

 pitivi/ui/encodingdialog.py      |    6 ++++--
 pitivi/ui/encodingprogress.glade |    2 +-
 pitivi/ui/encodingprogress.py    |    4 +++-
 3 files changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/pitivi/ui/encodingdialog.py b/pitivi/ui/encodingdialog.py
index b2d451a..2c3893f 100644
--- a/pitivi/ui/encodingdialog.py
+++ b/pitivi/ui/encodingdialog.py
@@ -287,7 +287,6 @@ class EncodingDialog(GladeWindow, Renderer, Loggable):
 
     def _cancelRender(self, progress):
         self.debug("aborting render")
-        self.window.show()
         self.shutdown()
 
     def _pauseRender(self, progress):
@@ -309,8 +308,11 @@ class EncodingDialog(GladeWindow, Renderer, Loggable):
         self.progress.updatePosition(fraction, text)
 
     def updateUIOnEOS(self):
-        self.window.show()  # Show the encoding dialog again
+        """
+        When a render completes or is cancelled, update the UI
+        """
         self.progress.destroy()
+        self.window.show()  # Show the encoding dialog again
         self.pipeline.disconnect_by_function(self._stateChanged)
 
     def _cancelButtonClickedCb(self, unused_button):
diff --git a/pitivi/ui/encodingprogress.glade b/pitivi/ui/encodingprogress.glade
index aabeb4e..0c008c9 100644
--- a/pitivi/ui/encodingprogress.glade
+++ b/pitivi/ui/encodingprogress.glade
@@ -7,7 +7,7 @@
     <property name="title" translatable="yes">Rendering</property>
     <property name="modal">True</property>
     <property name="window_position">center-on-parent</property>
-    <property name="type_hint">dialog</property>
+    <property name="type_hint">normal</property>
     <child internal-child="vbox">
       <widget class="GtkVBox" id="dialog-vbox2">
         <property name="visible">True</property>
diff --git a/pitivi/ui/encodingprogress.py b/pitivi/ui/encodingprogress.py
index ff3162a..7a94fd8 100644
--- a/pitivi/ui/encodingprogress.py
+++ b/pitivi/ui/encodingprogress.py
@@ -44,7 +44,9 @@ class EncodingProgressDialog(GladeWindow, Signallable):
         GladeWindow.__init__(self)
 
         self.app = app
-        self.window.set_transient_for(parent.window)
+        # Parent the dialog with mainwindow, since encodingdialog is hidden.
+        # It allows this dialog to properly minimize together with mainwindow
+        self.window.set_transient_for(self.app)
 
         # UI widgets
         self.window.set_icon_from_file(configure.get_pixmap_dir() + "/pitivi-render-16.png")