X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fnew_film_dialog.cc;h=191482a7cbcdb23ca3da8f48720dbbcdc7bf2d06;hb=b8540eaf3e2bb7d611117bb26185b7d6fc5743aa;hp=c7106633e4fc3a3d3425b355dcf740f195209879;hpb=a650e785467a9d7784d2ece4a477acd8cfa9181a;p=dcpomatic.git

diff --git a/src/wx/new_film_dialog.cc b/src/wx/new_film_dialog.cc
index c7106633e..191482a7c 100644
--- a/src/wx/new_film_dialog.cc
+++ b/src/wx/new_film_dialog.cc
@@ -18,26 +18,45 @@
 */
 
 #include <boost/filesystem.hpp>
+#include <wx/stdpaths.h>
+#include "lib/config.h"
 #include "new_film_dialog.h"
+#ifdef __WXMSW__
+#include "dir_picker_ctrl.h"
+#endif
 #include "wx_util.h"
 
 using namespace std;
 using namespace boost;
 
+boost::optional<string> NewFilmDialog::_directory;
+
 NewFilmDialog::NewFilmDialog (wxWindow* parent)
 	: wxDialog (parent, wxID_ANY, _("New Film"))
 {
 	wxBoxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL);
+	SetSizer (overall_sizer);
+	
 	wxFlexGridSizer* table = new wxFlexGridSizer (2, 6, 6);
 	table->AddGrowableCol (1, 1);
 	overall_sizer->Add (table, 1, wxEXPAND | wxALL, 6);
 
-	add_label_to_sizer (table, this, "Film name");
+	add_label_to_sizer (table, this, _("Film name"));
 	_name = new wxTextCtrl (this, wxID_ANY);
 	table->Add (_name, 1, wxEXPAND);
 
-	add_label_to_sizer (table, this, "Create in folder");
+	add_label_to_sizer (table, this, _("Create in folder"));
+#ifdef __WXMSW__
+	_folder = new DirPickerCtrl (this);
+#else	
 	_folder = new wxDirPickerCtrl (this, wxDD_DIR_MUST_EXIST);
+#endif
+
+	if (!_directory) {
+		_directory = Config::instance()->default_directory_or (wx_to_std (wxStandardPaths::Get().GetDocumentsDir()));
+	}
+	
+	_folder->SetPath (std_to_wx (_directory.get()));
 	table->Add (_folder, 1, wxEXPAND);
 
 	wxSizer* buttons = CreateSeparatedButtonSizer (wxOK | wxCANCEL);
@@ -45,11 +64,15 @@ NewFilmDialog::NewFilmDialog (wxWindow* parent)
 		overall_sizer->Add (buttons, wxSizerFlags().Expand().DoubleBorder());
 	}
 
-	SetSizer (overall_sizer);
 	overall_sizer->Layout ();
 	overall_sizer->SetSizeHints (this);
 }
 
+NewFilmDialog::~NewFilmDialog ()
+{
+	_directory = wx_to_std (_folder->GetPath ());
+}
+
 string
 NewFilmDialog::get_path () const
 {