Merge master.

[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 191482a7cbcdb23ca3da8f48720dbbcdc7bf2d06..e0ad2c457625d08fd188fb829ac50bc6d0b68f3a 100644 (file)
--- a/src/wx/new_film_dialog.cc
+++ b/src/wx/new_film_dialog.cc
@@ -21,15 +21,15 @@
 #include <wx/stdpaths.h>
 #include "lib/config.h"
 #include "new_film_dialog.h"
-#ifdef __WXMSW__
+#include "wx_util.h"
+#ifdef DCPOMATIC_USE_OWN_DIR_PICKER
 #include "dir_picker_ctrl.h"
 #endif
-#include "wx_util.h"
 
 using namespace std;
 using namespace boost;
 
-boost::optional<string> NewFilmDialog::_directory;
+boost::optional<boost::filesystem::path> NewFilmDialog::_directory;
 
 NewFilmDialog::NewFilmDialog (wxWindow* parent)
        : wxDialog (parent, wxID_ANY, _("New Film"))
@@ -37,26 +37,27 @@ NewFilmDialog::NewFilmDialog (wxWindow* parent)
        wxBoxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL);
        SetSizer (overall_sizer);
        
-       wxFlexGridSizer* table = new wxFlexGridSizer (2, 6, 6);
+       wxFlexGridSizer* table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
        table->AddGrowableCol (1, 1);
-       overall_sizer->Add (table, 1, wxEXPAND | wxALL, 6);
+       overall_sizer->Add (table, 1, wxEXPAND | wxALL, DCPOMATIC_DIALOG_BORDER);
 
-       add_label_to_sizer (table, this, _("Film name"));
+       add_label_to_sizer (table, this, _("Film name"), true);
        _name = new wxTextCtrl (this, wxID_ANY);
-       table->Add (_name, 1, wxEXPAND);
+       table->Add (_name, 0, wxEXPAND);
 
-       add_label_to_sizer (table, this, _("Create in folder"));
-#ifdef __WXMSW__
-       _folder = new DirPickerCtrl (this);
+       add_label_to_sizer (table, this, _("Create in folder"), true);
+
+#ifdef DCPOMATIC_USE_OWN_DIR_PICKER
+       _folder = new DirPickerCtrl (this); 
 #else  
-       _folder = new wxDirPickerCtrl (this, wxDD_DIR_MUST_EXIST);
+       _folder = new wxDirPickerCtrl (this, wxID_ANY);
 #endif
 
        if (!_directory) {
                _directory = Config::instance()->default_directory_or (wx_to_std (wxStandardPaths::Get().GetDocumentsDir()));
        }
        
-       _folder->SetPath (std_to_wx (_directory.get()));
+       _folder->SetPath (std_to_wx (_directory.get().string()));
        table->Add (_folder, 1, wxEXPAND);
 
        wxSizer* buttons = CreateSeparatedButtonSizer (wxOK | wxCANCEL);
@@ -66,6 +67,8 @@ NewFilmDialog::NewFilmDialog (wxWindow* parent)
 
        overall_sizer->Layout ();
        overall_sizer->SetSizeHints (this);
+
+       _name->SetFocus ();
 }
 
 NewFilmDialog::~NewFilmDialog ()
@@ -73,11 +76,11 @@ 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;
 }