Merge remote-tracking branch 'origin/master' into 2.0

[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 93d0f3b194c05a6ecb14331863c4a6e8c993ae3e..8f317f42ffa665f72d007579da3e90ec3dfc1337 100644 (file)
--- a/src/wx/new_film_dialog.cc
+++ b/src/wx/new_film_dialog.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -18,43 +18,55 @@
 */
 
 #include <boost/filesystem.hpp>
+#include <wx/stdpaths.h>
+#include "lib/config.h"
 #include "new_film_dialog.h"
 #include "wx_util.h"
+#ifdef DCPOMATIC_USE_OWN_DIR_PICKER
+#include "dir_picker_ctrl.h"
+#endif
 
 using namespace std;
 using namespace boost;
 
+boost::optional<boost::filesystem::path> NewFilmDialog::_directory;
+
 NewFilmDialog::NewFilmDialog (wxWindow* parent)
-       : wxDialog (parent, wxID_ANY, wxString (_("New Film")))
+       : TableDialog (parent, _("New Film"), 2, true)
 {
-       wxBoxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL);
-       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");
-       _name = new wxTextCtrl (this, wxID_ANY);
-       table->Add (_name, 1, wxEXPAND);
-
-       add_label_to_sizer (table, this, "Create in folder");
-       _folder = new wxDirPickerCtrl (this, wxDD_DIR_MUST_EXIST);
-       table->Add (_folder, 1, wxEXPAND);
-
-       wxSizer* buttons = CreateSeparatedButtonSizer (wxOK | wxCANCEL);
-       if (buttons) {
-               overall_sizer->Add (buttons, wxSizerFlags().Expand().DoubleBorder());
+       add (_("Film name"), true);
+       _name = add (new wxTextCtrl (this, wxID_ANY));
+
+       add (_("Create in folder"), true);
+
+#ifdef DCPOMATIC_USE_OWN_DIR_PICKER
+       _folder = new DirPickerCtrl (this); 
+#else  
+       _folder = new wxDirPickerCtrl (this, wxID_ANY, wxEmptyString, wxDirSelectorPromptStr, wxDefaultPosition, wxSize (300, -1));
+#endif
+
+       if (!_directory) {
+               _directory = Config::instance()->default_directory_or (wx_to_std (wxStandardPaths::Get().GetDocumentsDir()));
        }
+       
+       _folder->SetPath (std_to_wx (_directory.get().string()));
+       add (_folder);
 
-       SetSizer (overall_sizer);
-       overall_sizer->Layout ();
-       overall_sizer->SetSizeHints (this);
+       _name->SetFocus ();
+
+       layout ();
+}
+
+NewFilmDialog::~NewFilmDialog ()
+{
+       _directory = wx_to_std (_folder->GetPath ());
 }
 
-string
+boost::filesystem::path
 NewFilmDialog::get_path () const
 {
        filesystem::path p;
        p /= wx_to_std (_folder->GetPath ());
        p /= wx_to_std (_name->GetValue ());
-       return p.string ();
+       return p;
 }