No-op; fix GPL address and use the explicit-program-name version.

[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 737b07fbb58a591e62887cc12af75bb4075cead0..04b9e10578889d8f43b59f50f1d178dfd193d9ce 100644 (file)
--- 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/>.
 
 */
 
@@ -21,46 +22,40 @@
 #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"
 
 using namespace std;
 using namespace boost;
 
-string NewFilmDialog::_directory = Config::instance()->default_directory_or (wx_to_std (wxStandardPaths::Get().GetDocumentsDir()));
+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 (_directory));
-       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);
+
+       _name->SetFocus ();
+
+       layout ();
 }
 
 NewFilmDialog::~NewFilmDialog ()
@@ -68,11 +63,11 @@ NewFilmDialog::~NewFilmDialog ()
        _directory = wx_to_std (_folder->GetPath ());
 }
 
-string
+boost::filesystem::path
 NewFilmDialog::get_path () const
 {
        filesystem::path p;
        p /= wx_to_std (_folder->GetPath ());
        p /= wx_to_std (_name->GetValue ());
-       return p.string ();
+       return p;
 }