From: Carl Hetherington Date: Tue, 9 Apr 2024 01:15:19 +0000 (+0200) Subject: Add leaf parameter to DirPickerCtrl. X-Git-Tag: v2.17.16~16 X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=1e3e63c16db89f8f8623283d683139587aa139b6 Add leaf parameter to DirPickerCtrl. --- diff --git a/src/wx/dir_picker_ctrl.cc b/src/wx/dir_picker_ctrl.cc index 3371c734b..a8c09e334 100644 --- 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 f70168db4..31df9518c 100644 --- 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