X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ffile_picker_ctrl.cc;h=bf4877891a2344860c862f8d77599118e4341842;hb=4e2e10d256f8a1c107db9ce33042a2ed28fdc0bd;hp=8de1596a9dc725840f2ab2a6c9fb95fd202ceae1;hpb=dd7ba98abf729061e30c0b0fbb4cb6fd0485f16a;p=dcpomatic.git

diff --git a/src/wx/file_picker_ctrl.cc b/src/wx/file_picker_ctrl.cc
index 8de1596a9..bf4877891 100644
--- a/src/wx/file_picker_ctrl.cc
+++ b/src/wx/file_picker_ctrl.cc
@@ -1,36 +1,46 @@
 /*
     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.
 
-    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
-    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/>.
 
 */
 
+
+#include "dcpomatic_button.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/stdpaths.h>
+#include <wx/wx.h>
+LIBDCP_ENABLE_WARNINGS
 #include <boost/filesystem.hpp>
 
+
 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)
 	: wxPanel (parent)
 	, _prompt (prompt)
 	, _wildcard (wildcard)
+	, _open (open)
+	, _warn_overwrite (warn_overwrite)
 {
 	_sizer = new wxBoxSizer (wxHORIZONTAL);
 
@@ -38,12 +48,11 @@ 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);
 
-	_file = new wxButton (this, wxID_ANY, _("(None)"), wxDefaultPosition, size, wxBU_LEFT);
-	_sizer->Add (_file, 1, wxEXPAND | wxALL, 6);
+	_file = new Button (this, _("(None)"), wxDefaultPosition, size, wxBU_LEFT);
+	_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
@@ -57,7 +66,7 @@ FilePickerCtrl::SetPath (wxString p)
 		_file->SetLabel (_("(None)"));
 	}
 
-	wxCommandEvent ev (wxEVT_COMMAND_FILEPICKER_CHANGED, wxID_ANY);
+	wxCommandEvent ev (wxEVT_FILEPICKER_CHANGED, wxID_ANY);
 	GetEventHandler()->ProcessEvent (ev);
 }
 
@@ -70,9 +79,19 @@ FilePickerCtrl::GetPath () const
 void
 FilePickerCtrl::browse_clicked ()
 {
-	wxFileDialog* d = new wxFileDialog (this, _prompt, wxEmptyString, wxEmptyString, _wildcard);
-	if (d->ShowModal () == wxID_OK) {
-		SetPath (d->GetPath ());
+	long style = _open ? wxFD_OPEN : wxFD_SAVE;
+	if (_warn_overwrite) {
+		style |= wxFD_OVERWRITE_PROMPT;
 	}
-	d->Destroy ();
+	wxFileDialog dialog(this, _prompt, wxEmptyString, wxEmptyString, _wildcard, style);
+	dialog.SetPath(_path);
+	if (dialog.ShowModal() == wxID_OK) {
+		SetPath(dialog.GetPath());
+	}
+}
+
+void
+FilePickerCtrl::SetWildcard (wxString w)
+{
+	_wildcard = w;
 }