#include "lib/config.h"
#include "new_film_dialog.h"
#include "wx_util.h"
-#ifdef DCPOMATIC_USE_OWN_DIR_PICKER
+#ifdef DCPOMATIC_USE_OWN_PICKER
#include "dir_picker_ctrl.h"
#endif
boost::optional<boost::filesystem::path> NewFilmDialog::_directory;
NewFilmDialog::NewFilmDialog (wxWindow* parent)
- : TableDialog (parent, _("New Film"), 2, true)
+ : TableDialog (parent, _("New Film"), 2, 1, true)
{
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
+#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()));
}
-
+
_folder->SetPath (std_to_wx (_directory.get().string()));
add (_folder);