Add leaf parameter to DirPickerCtrl.

[dcpomatic.git] / src / wx / dir_picker_ctrl.cc

diff --git a/src/wx/dir_picker_ctrl.cc b/src/wx/dir_picker_ctrl.cc
index ffd3b6fa115a116b63d6c352c1c7d29d2c5487b0..a8c09e3342e3959940afd94f8e685767bdceba34 100644 (file)
--- a/src/wx/dir_picker_ctrl.cc
+++ b/src/wx/dir_picker_ctrl.cc
@@ -18,25 +18,36 @@
 
 */
 
+
+#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)
+
+DirPickerCtrl::DirPickerCtrl(wxWindow* parent, bool leaf)
        : wxPanel (parent)
+       , _leaf(leaf)
 {
        _sizer = new wxBoxSizer (wxHORIZONTAL);
 
-       _folder = new StaticText (this, wxT(""));
-       _sizer->Add (_folder, 1, wxEXPAND | wxALL, 6);
-       _browse = new wxButton (this, wxID_ANY, _("Browse..."));
+       _folder = new StaticText(this, wxT(""), wxDefaultPosition, wxDefaultSize, wxST_ELLIPSIZE_END);
+       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 +63,11 @@ 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()));
+               if (_leaf) {
+                       _folder->SetLabel(std_to_wx(boost::filesystem::path(wx_to_std(_path)).filename().string()));
+               } else {
+                       _folder->SetLabel(_path);
+               }
        }
 
        wxCommandEvent ev (wxEVT_DIRPICKER_CHANGED, wxID_ANY);
@@ -60,6 +75,8 @@ DirPickerCtrl::SetPath (wxString p)
 
        _sizer->Layout ();
        SetMinSize (wxSize (max (400, _sizer->GetSize().GetWidth()), -1));
+
+       Changed ();
 }
 
 wxString
@@ -71,9 +88,8 @@ DirPickerCtrl::GetPath () const
 void
 DirPickerCtrl::browse_clicked ()
 {
-       wxDirDialog* d = new wxDirDialog (this);
+       auto d = make_wx<wxDirDialog>(this);
        if (d->ShowModal () == wxID_OK) {
                SetPath (d->GetPath ());
        }
-       d->Destroy ();
 }