Add leaf parameter to DirPickerCtrl.

diff --git a/src/wx/dir_picker_ctrl.cc b/src/wx/dir_picker_ctrl.cc
index 3371c734bdfc194274ecd8a8c3342b02a3ddc984..a8c09e3342e3959940afd94f8e685767bdceba34 100644 (file)
--- a/src/wx/dir_picker_ctrl.cc
+++ b/src/wx/dir_picker_ctrl.cc
@@ -36,8 +36,9 @@ using namespace std;
 using namespace boost;
 
 
-DirPickerCtrl::DirPickerCtrl (wxWindow* parent)
+DirPickerCtrl::DirPickerCtrl(wxWindow* parent, bool leaf)
        : wxPanel (parent)
+       , _leaf(leaf)
 {
        _sizer = new wxBoxSizer (wxHORIZONTAL);
 
@@ -62,7 +63,11 @@ DirPickerCtrl::SetPath (wxString p)
        if (_path == wxStandardPaths::Get().GetDocumentsDir()) {
                _folder->SetLabel (_("My Documents"));
        } else {
-               _folder->SetLabel (_path);
+               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);

diff --git a/src/wx/dir_picker_ctrl.h b/src/wx/dir_picker_ctrl.h
index f70168db48fa98f08be28deab3d2d34c78cb0bb5..31df9518cda38a8104cd98e3c4eccf9f852d664c 100644 (file)
--- a/src/wx/dir_picker_ctrl.h
+++ b/src/wx/dir_picker_ctrl.h
@@ -33,7 +33,7 @@ LIBDCP_ENABLE_WARNINGS
 class DirPickerCtrl : public wxPanel
 {
 public:
-       explicit DirPickerCtrl (wxWindow *);
+       DirPickerCtrl(wxWindow *, bool leaf = false);
 
        wxString GetPath () const;
        void SetPath (wxString);
@@ -47,6 +47,7 @@ private:
        wxButton* _browse;
        wxString _path;
        wxSizer* _sizer;
+       bool _leaf = false;
 };
 
 #endif