X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fnew_film_dialog.cc;h=907b289b5c5fba150902771f1df7125ef0353784;hb=1a693725f9a8cc6ba58f65b2f1ef03255d295f23;hp=90c2d727ef27defab61568d07025d7ec1408af76;hpb=3b6af76dc7a9089a35d2d2815d4fb8fb55876d1b;p=dcpomatic.git

diff --git a/src/wx/new_film_dialog.cc b/src/wx/new_film_dialog.cc
index 90c2d727e..907b289b5 100644
--- a/src/wx/new_film_dialog.cc
+++ b/src/wx/new_film_dialog.cc
@@ -1,71 +1,102 @@
 /*
-    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
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
-#include <boost/filesystem.hpp>
-#include <wx/stdpaths.h>
 #include "lib/config.h"
 #include "new_film_dialog.h"
-#ifdef __WXMSW__
+#include "wx_util.h"
+#ifdef DCPOMATIC_USE_OWN_PICKER
 #include "dir_picker_ctrl.h"
 #endif
-#include "wx_util.h"
+#include <wx/stdpaths.h>
+#include <boost/filesystem.hpp>
+#include <boost/foreach.hpp>
 
 using namespace std;
 using namespace boost;
 
+boost::optional<boost::filesystem::path> NewFilmDialog::_directory;
+
 NewFilmDialog::NewFilmDialog (wxWindow* parent)
-	: wxDialog (parent, wxID_ANY, _("New Film"))
+	: TableDialog (parent, _("New Film"), 2, 1, true)
 {
-	wxBoxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL);
-	SetSizer (overall_sizer);
-	
-	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"));
-#ifdef __WXMSW__
+	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, wxDD_DIR_MUST_EXIST);
+#else
+	_folder = new wxDirPickerCtrl (this, wxID_ANY, wxEmptyString, wxDirSelectorPromptStr, wxDefaultPosition, wxSize (300, -1));
 #endif
-	_folder->SetPath (std_to_wx (Config::instance()->default_directory_or (wx_to_std (wxStandardPaths::Get().GetDocumentsDir()))));
-	table->Add (_folder, 1, wxEXPAND);
 
-	wxSizer* buttons = CreateSeparatedButtonSizer (wxOK | wxCANCEL);
-	if (buttons) {
-		overall_sizer->Add (buttons, wxSizerFlags().Expand().DoubleBorder());
+	if (!_directory) {
+		_directory = Config::instance()->default_directory_or (wx_to_std (wxStandardPaths::Get().GetDocumentsDir()));
 	}
 
-	overall_sizer->Layout ();
-	overall_sizer->SetSizeHints (this);
+	_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 ()) {
+		_template_name->Append (std_to_wx (i));
+	}
+
+	_use_template->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, bind (&NewFilmDialog::use_template_clicked, this));
+
+	layout ();
 }
 
-string
-NewFilmDialog::get_path () const
+void
+NewFilmDialog::use_template_clicked ()
+{
+	_template_name->Enable (_use_template->GetValue ());
+}
+
+NewFilmDialog::~NewFilmDialog ()
+{
+	_directory = wx_to_std (_folder->GetPath ());
+}
+
+boost::filesystem::path
+NewFilmDialog::path () const
 {
 	filesystem::path p;
 	p /= wx_to_std (_folder->GetPath ());
 	p /= wx_to_std (_name->GetValue ());
-	return p.string ();
+	return p;
+}
+
+optional<string>
+NewFilmDialog::template_name () const
+{
+	if (!_use_template->GetValue() || _template_name->GetSelection() == -1) {
+		return optional<string> ();
+	}
+
+	return wx_to_std (_template_name->GetString(_template_name->GetSelection()));
 }