projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix font ID allocation from DCP when there are subs and ccaps using the same IDs...
[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 6272a80163c6256c28f216bbc574196313bbd430..7aa0bfb40cc9d9031a238c7e3f39f2980773a34d 100644
(file)
--- a/
src/wx/file_picker_ctrl.cc
+++ b/
src/wx/file_picker_ctrl.cc
@@
-18,20
+18,42
@@
*/
*/
+
+#include "dcpomatic_button.h"
+#include "file_dialog.h"
#include "file_picker_ctrl.h"
#include "wx_util.h"
#include "file_picker_ctrl.h"
#include "wx_util.h"
-#include <
wx/wx
.h>
-#include <wx/stdpaths.h>
+#include <
dcp/warnings
.h>
+LIBDCP_DISABLE_WARNINGS
#include <wx/filepicker.h>
#include <wx/filepicker.h>
+#include <wx/stdpaths.h>
+#include <wx/wx.h>
+LIBDCP_ENABLE_WARNINGS
#include <boost/filesystem.hpp>
#include <boost/filesystem.hpp>
+
using namespace std;
using namespace boost;
using namespace std;
using namespace boost;
-FilePickerCtrl::FilePickerCtrl (wxWindow* parent, wxString prompt, wxString wildcard)
+
+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)
: 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);
{
_sizer = new wxBoxSizer (wxHORIZONTAL);
@@
-39,42
+61,65
@@
FilePickerCtrl::FilePickerCtrl (wxWindow* parent, wxString prompt, wxString wild
wxSize size = dc.GetTextExtent (wxT ("This is the length of the file label it should be quite long"));
size.SetHeight (-1);
wxSize size = dc.GetTextExtent (wxT ("This is the length of the file label it should be quite long"));
size.SetHeight (-1);
- _file = new
wxButton (this, wxID_ANY
, _("(None)"), wxDefaultPosition, size, wxBU_LEFT);
+ _file = new
Button (this
, _("(None)"), wxDefaultPosition, size, wxBU_LEFT);
_sizer->Add (_file, 1, wxEXPAND, 0);
SetSizerAndFit (_sizer);
_sizer->Add (_file, 1, wxEXPAND, 0);
SetSizerAndFit (_sizer);
+ _file->Bind (wxEVT_BUTTON, boost::bind (&FilePickerCtrl::browse_clicked, this));
+
+ set_filename(_initial_filename);
+}
- _file->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&FilePickerCtrl::browse_clicked, this));
+
+void
+FilePickerCtrl::set_filename(optional<string> filename)
+{
+ if (filename) {
+ _file->SetLabel(std_to_wx(*filename));
+ } else {
+ _file->SetLabel(_("None"));
+ }
}
}
+
void
void
-FilePickerCtrl::
SetPath (wxString p
)
+FilePickerCtrl::
set_path(optional<boost::filesystem::path> path
)
{
{
- _path = p;
+ _path = p
ath
;
- if (
!_path.IsEmpty ()
) {
-
_file->SetLabel (std_to_wx (filesystem::path (wx_to_std (_path)).leaf().string()
));
+ if (
_path
) {
+
set_filename(_path->filename().string(
));
} else {
} else {
-
_file->SetLabel (_("(None)")
);
+
set_filename({}
);
}
}
- wxCommandEvent ev (wxEVT_
COMMAND_
FILEPICKER_CHANGED, wxID_ANY);
+ wxCommandEvent ev (wxEVT_FILEPICKER_CHANGED, wxID_ANY);
GetEventHandler()->ProcessEvent (ev);
}
GetEventHandler()->ProcessEvent (ev);
}
-wxString
-FilePickerCtrl::GetPath () const
+
+boost::optional<boost::filesystem::path>
+FilePickerCtrl::path() const
{
return _path;
}
{
return _path;
}
+
void
FilePickerCtrl::browse_clicked ()
{
void
FilePickerCtrl::browse_clicked ()
{
- wxFileDialog* d = new wxFileDialog (this, _prompt, wxEmptyString, wxEmptyString, _wildcard);
- d->SetPath (_path);
- if (d->ShowModal () == wxID_OK) {
- SetPath (d->GetPath ());
+ long style = _open ? wxFD_OPEN : wxFD_SAVE;
+ if (_warn_overwrite) {
+ style |= wxFD_OVERWRITE_PROMPT;
}
}
- d->Destroy ();
+ FileDialog dialog(this, _prompt, _wildcard, style, _initial_path_key, _initial_filename, _path);
+ if (dialog.show()) {
+ set_path(dialog.path());
+ }
+}
+
+void
+FilePickerCtrl::set_wildcard(wxString w)
+{
+ _wildcard = w;
}
}