X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fnew_film_dialog.cc;h=04b9e10578889d8f43b59f50f1d178dfd193d9ce;hb=3828baf56467224f5d44049bf1e7a7ed11f43a05;hp=e0ad2c457625d08fd188fb829ac50bc6d0b68f3a;hpb=164f71186d80798b55fad2f463918b8c514df21e;p=dcpomatic.git

diff --git a/src/wx/new_film_dialog.cc b/src/wx/new_film_dialog.cc
index e0ad2c457..04b9e1057 100644
--- a/src/wx/new_film_dialog.cc
+++ b/src/wx/new_film_dialog.cc
@@ -1,19 +1,20 @@
 /*
-    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/>.
 
 */
 
@@ -22,7 +23,7 @@
 #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
 
@@ -32,43 +33,29 @@ 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, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
-	table->AddGrowableCol (1, 1);
-	overall_sizer->Add (table, 1, wxEXPAND | wxALL, DCPOMATIC_DIALOG_BORDER);
-
-	add_label_to_sizer (table, this, _("Film name"), true);
-	_name = new wxTextCtrl (this, wxID_ANY);
-	table->Add (_name, 0, wxEXPAND);
-
-	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, wxID_ANY);
+	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()));
 	}
-	
-	_folder->SetPath (std_to_wx (_directory.get().string()));
-	table->Add (_folder, 1, wxEXPAND);
-
-	wxSizer* buttons = CreateSeparatedButtonSizer (wxOK | wxCANCEL);
-	if (buttons) {
-		overall_sizer->Add (buttons, wxSizerFlags().Expand().DoubleBorder());
-	}
 
-	overall_sizer->Layout ();
-	overall_sizer->SetSizeHints (this);
+	_folder->SetPath (std_to_wx (_directory.get().string()));
+	add (_folder);
 
 	_name->SetFocus ();
+
+	layout ();
 }
 
 NewFilmDialog::~NewFilmDialog ()