Merge branch 'master' of ssh://192.168.1.201/home/carl/git/dvdomatic

[dcpomatic.git] / src / wx / new_film_dialog.cc

diff --git a/src/wx/new_film_dialog.cc b/src/wx/new_film_dialog.cc
index eb6f2849b5cdd5ebc910b794bbff3ddcbb5bb6b9..191482a7cbcdb23ca3da8f48720dbbcdc7bf2d06 100644 (file)
--- a/src/wx/new_film_dialog.cc
+++ b/src/wx/new_film_dialog.cc
@@ -29,8 +29,10 @@
 using namespace std;
 using namespace boost;
 
+boost::optional<string> NewFilmDialog::_directory;
+
 NewFilmDialog::NewFilmDialog (wxWindow* parent)
-       : wxDialog (parent, wxID_ANY, wxString (_("New Film")))
+       : wxDialog (parent, wxID_ANY, _("New Film"))
 {
        wxBoxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL);
        SetSizer (overall_sizer);
@@ -39,17 +41,22 @@ NewFilmDialog::NewFilmDialog (wxWindow* parent)
        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
-       _folder->SetPath (std_to_wx (Config::instance()->default_directory_or (wx_to_std (wxStandardPaths::Get().GetDocumentsDir()))));
+
+       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);
@@ -61,6 +68,11 @@ NewFilmDialog::NewFilmDialog (wxWindow* parent)
        overall_sizer->SetSizeHints (this);
 }
 
+NewFilmDialog::~NewFilmDialog ()
+{
+       _directory = wx_to_std (_folder->GetPath ());
+}
+
 string
 NewFilmDialog::get_path () const
 {