- 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_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()));