Note that newer libsub version is required.

[dcpomatic.git] / src / wx / file_picker_ctrl.cc

diff --git a/src/wx/file_picker_ctrl.cc b/src/wx/file_picker_ctrl.cc
index 4bb6518efc2fe33a91ac26812a701a5fba9bd55e..7aa0bfb40cc9d9031a238c7e3f39f2980773a34d 100644 (file)
--- a/src/wx/file_picker_ctrl.cc
+++ b/src/wx/file_picker_ctrl.cc
@@ -20,6 +20,7 @@
 
 
 #include "dcpomatic_button.h"
+#include "file_dialog.h"
 #include "file_picker_ctrl.h"
 #include "wx_util.h"
 #include <dcp/warnings.h>
@@ -35,12 +36,24 @@ using namespace std;
 using namespace boost;
 
 
-FilePickerCtrl::FilePickerCtrl (wxWindow* parent, wxString prompt, wxString wildcard, bool open, bool warn_overwrite)
+FilePickerCtrl::FilePickerCtrl(
+       wxWindow* parent,
+       wxString prompt,
+       wxString wildcard,
+       bool open,
+       bool warn_overwrite,
+       std::string initial_path_key,
+       optional<std::string> initial_filename,
+       optional<filesystem::path> override_path
+       )
        : wxPanel (parent)
        , _prompt (prompt)
        , _wildcard (wildcard)
        , _open (open)
        , _warn_overwrite (warn_overwrite)
+       , _initial_path_key(initial_path_key)
+       , _initial_filename(initial_filename)
+       , _override_path(override_path)
 {
        _sizer = new wxBoxSizer (wxHORIZONTAL);
 
@@ -53,29 +66,45 @@ FilePickerCtrl::FilePickerCtrl (wxWindow* parent, wxString prompt, wxString wild
 
        SetSizerAndFit (_sizer);
        _file->Bind (wxEVT_BUTTON, boost::bind (&FilePickerCtrl::browse_clicked, this));
+
+       set_filename(_initial_filename);
 }
 
+
 void
-FilePickerCtrl::SetPath (wxString p)
+FilePickerCtrl::set_filename(optional<string> filename)
 {
-       _path = p;
+       if (filename) {
+               _file->SetLabel(std_to_wx(*filename));
+       } else {
+               _file->SetLabel(_("None"));
+       }
+}
+
 
-       if (!_path.IsEmpty ()) {
-               _file->SetLabel(std_to_wx(filesystem::path(wx_to_std(_path)).filename().string()));
+void
+FilePickerCtrl::set_path(optional<boost::filesystem::path> path)
+{
+       _path = path;
+
+       if (_path) {
+               set_filename(_path->filename().string());
        } else {
-               _file->SetLabel (_("(None)"));
+               set_filename({});
        }
 
        wxCommandEvent ev (wxEVT_FILEPICKER_CHANGED, wxID_ANY);
        GetEventHandler()->ProcessEvent (ev);
 }
 
-wxString
-FilePickerCtrl::GetPath () const
+
+boost::optional<boost::filesystem::path>
+FilePickerCtrl::path() const
 {
        return _path;
 }
 
+
 void
 FilePickerCtrl::browse_clicked ()
 {
@@ -83,15 +112,14 @@ FilePickerCtrl::browse_clicked ()
        if (_warn_overwrite) {
                style |= wxFD_OVERWRITE_PROMPT;
        }
-       wxFileDialog dialog(this, _prompt, wxEmptyString, wxEmptyString, _wildcard, style);
-       dialog.SetPath(_path);
-       if (dialog.ShowModal() == wxID_OK) {
-               SetPath(dialog.GetPath());
+       FileDialog dialog(this, _prompt, _wildcard, style, _initial_path_key, _initial_filename, _path);
+       if (dialog.show()) {
+               set_path(dialog.path());
        }
 }
 
 void
-FilePickerCtrl::SetWildcard (wxString w)
+FilePickerCtrl::set_wildcard(wxString w)
 {
        _wildcard = w;
 }