Remove some debug code.

[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 4883810d06cc63379c294a328ddaccecd45eae5e..5d4581d3c48787a4818a087a78955a5aa02b0bef 100644 (file)
--- a/src/wx/new_film_dialog.cc
+++ b/src/wx/new_film_dialog.cc
@@ -18,14 +18,15 @@
 
 */
 
-#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_PICKER
 #include "dir_picker_ctrl.h"
 #endif
+#include <wx/stdpaths.h>
+#include <boost/filesystem.hpp>
+#include <boost/foreach.hpp>
 
 using namespace std;
 using namespace boost;
@@ -46,10 +47,6 @@ NewFilmDialog::NewFilmDialog (wxWindow* parent)
        _folder = new wxDirPickerCtrl (this, wxID_ANY, wxEmptyString, wxDirSelectorPromptStr, wxDefaultPosition, wxSize (300, -1));
 #endif
 
-       _use_template = new wxCheckButton (this, wxID_ANY, _("From template"));
-       add (_use_template);
-       _template_name = new wxChoice (this, wxID_ANY);
-
        if (!_directory) {
                _directory = Config::instance()->default_directory_or (wx_to_std (wxStandardPaths::Get().GetDocumentsDir()));
        }
@@ -57,10 +54,15 @@ NewFilmDialog::NewFilmDialog (wxWindow* parent)
        _folder->SetPath (std_to_wx (_directory.get().string()));
        add (_folder);
 
+       _use_template = new wxCheckBox (this, wxID_ANY, _("From template"));
+       add (_use_template);
+       _template_name = new wxChoice (this, wxID_ANY);
+       add (_template_name);
+
        _name->SetFocus ();
        _template_name->Enable (false);
 
-       BOOST_FOREACH (string i, Config::instance()->template_names ()) {
+       BOOST_FOREACH (string i, Config::instance()->templates ()) {
                _template_name->Append (std_to_wx (i));
        }
 
@@ -81,7 +83,7 @@ NewFilmDialog::~NewFilmDialog ()
 }
 
 boost::filesystem::path
-NewFilmDialog::get_path () const
+NewFilmDialog::path () const
 {
        filesystem::path p;
        p /= wx_to_std (_folder->GetPath ());
@@ -92,9 +94,9 @@ NewFilmDialog::get_path () const
 optional<string>
 NewFilmDialog::template_name () const
 {
-       if (!_use_template->GetValue ()) {
+       if (!_use_template->GetValue() || _template_name->GetSelection() == -1) {
                return optional<string> ();
        }
 
-       return wx_to_std (_template_name->GetValue ());
+       return wx_to_std (_template_name->GetString(_template_name->GetSelection()));
 }