No-op: remove all trailing whitespace.

[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 91caa4963c268e3c3727b5af5c456ebec254b6f3..96c8a0b0c59fef512ba3791c3d01ae5dca4b440f 100644 (file)
--- a/src/wx/new_film_dialog.cc
+++ b/src/wx/new_film_dialog.cc
@@ -1,5 +1,5 @@
 /*
-    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
     it under the terms of the GNU General Public License as published by
@@ -21,55 +21,40 @@
 #include <wx/stdpaths.h>
 #include "lib/config.h"
 #include "new_film_dialog.h"
-#if defined(__WXMSW__) || (GTK_MAJOR_VERSION == 2 && GTK_MINOR_VERSION == 24 && GTK_MICRO_VERSION == 17)
+#include "wx_util.h"
+#ifdef DCPOMATIC_USE_OWN_DIR_PICKER
 #include "dir_picker_ctrl.h"
 #endif
-#include "wx_util.h"
 
 using namespace std;
 using namespace boost;
 
-boost::optional<string> NewFilmDialog::_directory;
+boost::optional<boost::filesystem::path> NewFilmDialog::_directory;
 
 NewFilmDialog::NewFilmDialog (wxWindow* parent)
-       : wxDialog (parent, wxID_ANY, _("New Film"))
+       : TableDialog (parent, _("New Film"), 2, 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"));
-
-       /* GTK 2.24.17 has a buggy GtkFileChooserButton and it was put in Ubuntu 13.04.
-          Use our own dir picker as this is the least bad option I can think of.
-       */
-#if defined(__WXMSW__) || (GTK_MAJOR_VERSION == 2 && GTK_MINOR_VERSION == 24 && GTK_MICRO_VERSION == 17)
-       _folder = new DirPickerCtrl (this); 
-#else  
-       _folder = new wxDirPickerCtrl (this, wxDD_DIR_MUST_EXIST);
+       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
+       _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()));
-       table->Add (_folder, 1, wxEXPAND);
 
-       wxSizer* buttons = CreateSeparatedButtonSizer (wxOK | wxCANCEL);
-       if (buttons) {
-               overall_sizer->Add (buttons, wxSizerFlags().Expand().DoubleBorder());
-       }
+       _folder->SetPath (std_to_wx (_directory.get().string()));
+       add (_folder);
+
+       _name->SetFocus ();
 
-       overall_sizer->Layout ();
-       overall_sizer->SetSizeHints (this);
+       layout ();
 }
 
 NewFilmDialog::~NewFilmDialog ()
@@ -77,11 +62,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;
 }