projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Allow configurable start mode for player.
[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 9b52fc1cf2b6fe8281e681035132de955fc2544e..4cd843feb3755c710c08111416e9f9075206e2ab 100644
(file)
--- a/
src/wx/file_picker_ctrl.cc
+++ b/
src/wx/file_picker_ctrl.cc
@@
-1,19
+1,20
@@
/*
Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
/*
Copyright (C) 2012-2015 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.
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
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/>.
*/
*/
@@
-27,10
+28,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);
@@
-42,8
+44,7
@@
FilePickerCtrl::FilePickerCtrl (wxWindow* parent, wxString prompt, wxString wild
_sizer->Add (_file, 1, wxEXPAND, 0);
SetSizerAndFit (_sizer);
_sizer->Add (_file, 1, wxEXPAND, 0);
SetSizerAndFit (_sizer);
-
- _file->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&FilePickerCtrl::browse_clicked, this));
+ _file->Bind (wxEVT_BUTTON, boost::bind (&FilePickerCtrl::browse_clicked, this));
}
void
}
void
@@
-57,7
+58,7
@@
FilePickerCtrl::SetPath (wxString p)
_file->SetLabel (_("(None)"));
}
_file->SetLabel (_("(None)"));
}
- wxCommandEvent ev (wxEVT_
COMMAND_
FILEPICKER_CHANGED, wxID_ANY);
+ wxCommandEvent ev (wxEVT_FILEPICKER_CHANGED, wxID_ANY);
GetEventHandler()->ProcessEvent (ev);
}
GetEventHandler()->ProcessEvent (ev);
}
@@
-70,10
+71,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;
+}