projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use content video frame rate rather than the DCP one when reading
[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 03b2880fe201d14a15fd92f6b6cae113b033fe50..47b5dbca06a7e8ade9bb710d7de8076a2312c508 100644
(file)
--- a/
src/wx/file_picker_ctrl.cc
+++ b/
src/wx/file_picker_ctrl.cc
@@
-20,6
+20,7
@@
#include "file_picker_ctrl.h"
#include "wx_util.h"
#include "file_picker_ctrl.h"
#include "wx_util.h"
+#include "dcpomatic_button.h"
#include <wx/wx.h>
#include <wx/stdpaths.h>
#include <wx/filepicker.h>
#include <wx/wx.h>
#include <wx/stdpaths.h>
#include <wx/filepicker.h>
@@
-28,10
+29,11
@@
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
)
: wxPanel (parent)
, _prompt (prompt)
, _wildcard (wildcard)
: wxPanel (parent)
, _prompt (prompt)
, _wildcard (wildcard)
+ , _open (open)
{
_sizer = new wxBoxSizer (wxHORIZONTAL);
{
_sizer = new wxBoxSizer (wxHORIZONTAL);
@@
-39,11
+41,10
@@
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));
}
_file->Bind (wxEVT_BUTTON, boost::bind (&FilePickerCtrl::browse_clicked, this));
}
@@
-71,10
+72,16
@@
FilePickerCtrl::GetPath () const
void
FilePickerCtrl::browse_clicked ()
{
void
FilePickerCtrl::browse_clicked ()
{
- wxFileDialog* d = new wxFileDialog (this, _prompt, wxEmptyString, wxEmptyString, _wildcard);
+ wxFileDialog* d = new wxFileDialog (this, _prompt, wxEmptyString, wxEmptyString, _wildcard
, _open ? wxFD_OPEN : wxFD_SAVE | wxFD_OVERWRITE_PROMPT
);
d->SetPath (_path);
if (d->ShowModal () == wxID_OK) {
SetPath (d->GetPath ());
}
d->Destroy ();
}
d->SetPath (_path);
if (d->ShowModal () == wxID_OK) {
SetPath (d->GetPath ());
}
d->Destroy ();
}
+
+void
+FilePickerCtrl::SetWildcard (wxString w)
+{
+ _wildcard = w;
+}