[pitivi/ges: 110/287] Prevent the render dialog from having a blank output filename

[Jean-FranÃois Fortin Tam <jfft src gnome org>]

commit d95adebe3d9b8e09d13b42c13fc98873db3f900f
Author: Jean-FranÃois Fortin Tam <nekohayo gmail com>
Date:   Thu Dec 22 12:54:53 2011 -0500

    Prevent the render dialog from having a blank output filename

 pitivi/ui/encodingdialog.py |    9 ++++-----
 pitivi/ui/mainwindow.py     |    4 ++--
 2 files changed, 6 insertions(+), 7 deletions(-)
---
diff --git a/pitivi/ui/encodingdialog.py b/pitivi/ui/encodingdialog.py
index fae1f46..86f3767 100644
--- a/pitivi/ui/encodingdialog.py
+++ b/pitivi/ui/encodingdialog.py
@@ -205,7 +205,10 @@ class EncodingDialog(Loggable):
 
         # Directory and Filename
         self.filebutton.set_current_folder(self.app.settings.lastExportFolder)
-        self.updateFilename(self.project.name)
+        if not self.project.name:
+            self.updateFilename(_("Untitled"))
+        else:
+            self.updateFilename(self.project.name)
 
         # We store these so that when the user tries various container formats,
         # (AKA muxers) we select these a/v encoders, if they are compatible with
@@ -581,10 +584,6 @@ class EncodingDialog(Loggable):
         set_combo_value(self.muxercombobox,
             gst.element_factory_find(self.settings.muxer))
 
-        # File
-        self.filebutton.set_current_folder(self.app.settings.lastExportFolder)
-        self.updateFilename(self.project.name)
-
     def _checkForExistingFile(self, *args):
         """
         Display a warning icon and tooltip if the file path already exists.
diff --git a/pitivi/ui/mainwindow.py b/pitivi/ui/mainwindow.py
index bdacf78..de05127 100644
--- a/pitivi/ui/mainwindow.py
+++ b/pitivi/ui/mainwindow.py
@@ -1015,7 +1015,7 @@ class PitiviMainWindow(gtk.Window, Loggable):
 
         chooser.set_icon_name("pitivi")
         chooser.set_select_multiple(False)
-        chooser.set_current_name(_("Untitled.xptv"))
+        chooser.set_current_name(_("Untitled") + ".xptv")
         chooser.set_current_folder(self.settings.lastProjectFolder)
         chooser.props.do_overwrite_confirmation = True
         for format in formats:
@@ -1131,7 +1131,7 @@ class PitiviMainWindow(gtk.Window, Loggable):
             if self.project.name:
                 name = self.project.name
             else:
-                name = _("Untitled project")
+                name = _("Untitled")
             if self.project.hasUnsavedModifications():
                 touched = "*"
         title = u"%s%s \u2014 %s" % (touched, name, APPNAME)