X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fdir_picker_ctrl.cc;h=6c8fdd1fc3e6b48c82505c7e4278b7c428156466;hb=600e0c67c61b29427602918daebb38a4822f95cb;hp=ffd3b6fa115a116b63d6c352c1c7d29d2c5487b0;hpb=9c1bb2e5ca7c80c4e26b1b2e41159aa171360a94;p=dcpomatic.git

diff --git a/src/wx/dir_picker_ctrl.cc b/src/wx/dir_picker_ctrl.cc
index ffd3b6fa1..6c8fdd1fc 100644
--- a/src/wx/dir_picker_ctrl.cc
+++ b/src/wx/dir_picker_ctrl.cc
@@ -18,25 +18,35 @@
 
 */
 
+
+#include "dcpomatic_button.h"
 #include "dir_picker_ctrl.h"
-#include "wx_util.h"
 #include "static_text.h"
-#include <wx/wx.h>
-#include <wx/stdpaths.h>
+#include "wx_util.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;
 
+
 DirPickerCtrl::DirPickerCtrl (wxWindow* parent)
 	: wxPanel (parent)
 {
 	_sizer = new wxBoxSizer (wxHORIZONTAL);
 
 	_folder = new StaticText (this, wxT(""));
-	_sizer->Add (_folder, 1, wxEXPAND | wxALL, 6);
-	_browse = new wxButton (this, wxID_ANY, _("Browse..."));
+	wxFont font = _folder->GetFont ();
+	font.SetStyle (wxFONTSTYLE_ITALIC);
+	_folder->SetFont (font);
+	_sizer->Add (_folder, 1, wxEXPAND | wxALL, DCPOMATIC_SIZER_GAP);
+	_browse = new Button (this, _("Browse..."));
 	_sizer->Add (_browse, 0);
 
 	SetSizer (_sizer);
@@ -52,7 +62,7 @@ DirPickerCtrl::SetPath (wxString p)
 	if (_path == wxStandardPaths::Get().GetDocumentsDir()) {
 		_folder->SetLabel (_("My Documents"));
 	} else {
-		_folder->SetLabel (std_to_wx (filesystem::path (wx_to_std (_path)).leaf().string()));
+		_folder->SetLabel (_path);
 	}
 
 	wxCommandEvent ev (wxEVT_DIRPICKER_CHANGED, wxID_ANY);
@@ -60,6 +70,8 @@ DirPickerCtrl::SetPath (wxString p)
 
 	_sizer->Layout ();
 	SetMinSize (wxSize (max (400, _sizer->GetSize().GetWidth()), -1));
+
+	Changed ();
 }
 
 wxString