Make file and dir picker look more consistent with each other.

diff --git a/src/wx/dir_picker_ctrl.cc b/src/wx/dir_picker_ctrl.cc
index 034ae5a5e747f1c7ce06a72e376879ce8e96b097..8f2830a6da5b0ab1ab3c8828f2fb7b7f6f725786 100644 (file)
--- a/src/wx/dir_picker_ctrl.cc
+++ b/src/wx/dir_picker_ctrl.cc
@@ -42,17 +42,15 @@ DirPickerCtrl::DirPickerCtrl(wxWindow* parent, bool leaf)
 {
        _sizer = new wxBoxSizer (wxHORIZONTAL);
 
-       _folder = new StaticText(this, {}, 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);
+        wxClientDC dc(parent);
+        auto size = dc.GetTextExtent(char_to_wx("This is the length of the file label it should be quite long"));
+        size.SetHeight(-1);
 
+       _folder = new Button(this, _("Browse..."), wxDefaultPosition, size, wxBU_LEFT);
+       _sizer->Add(_folder, 1, wxEXPAND, 0);
        SetSizer (_sizer);
 
-       _browse->Bind (wxEVT_BUTTON, boost::bind (&DirPickerCtrl::browse_clicked, this));
+       _folder->Bind(wxEVT_BUTTON, boost::bind(&DirPickerCtrl::browse_clicked, this));
 }
 
 void

diff --git a/src/wx/dir_picker_ctrl.h b/src/wx/dir_picker_ctrl.h
index 31df9518cda38a8104cd98e3c4eccf9f852d664c..f28623a7c47c8e925a4c8bde633a5fb5066ec511 100644 (file)
--- a/src/wx/dir_picker_ctrl.h
+++ b/src/wx/dir_picker_ctrl.h
@@ -30,6 +30,9 @@ LIBDCP_ENABLE_WARNINGS
 #include <boost/signals2.hpp>
 
 
+class Button;
+
+
 class DirPickerCtrl : public wxPanel
 {
 public:
@@ -43,8 +46,7 @@ public:
 private:
        void browse_clicked ();
 
-       wxStaticText* _folder;
-       wxButton* _browse;
+       Button* _folder;
        wxString _path;
        wxSizer* _sizer;
        bool _leaf = false;

diff --git a/src/wx/file_picker_ctrl.cc b/src/wx/file_picker_ctrl.cc
index 3511a4497c60400fb66e44a9fe48936abf9ed2bb..90f07da59a71e22cc9ed4909ed82f8ab973de965 100644 (file)
--- a/src/wx/file_picker_ctrl.cc
+++ b/src/wx/file_picker_ctrl.cc
@@ -61,7 +61,7 @@ FilePickerCtrl::FilePickerCtrl(
         wxSize size = dc.GetTextExtent(char_to_wx("This is the length of the file label it should be quite long"));
         size.SetHeight (-1);
 
-       _file = new Button (this, _("(None)"), wxDefaultPosition, size, wxBU_LEFT);
+       _file = new Button(this, _("Browse..."), wxDefaultPosition, size, wxBU_LEFT);
        _sizer->Add (_file, 1, wxEXPAND, 0);
 
        SetSizerAndFit (_sizer);
@@ -77,7 +77,7 @@ FilePickerCtrl::set_filename(boost::optional<string> filename)
        if (filename) {
                _file->SetLabel(std_to_wx(*filename));
        } else {
-               _file->SetLabel(_("None"));
+               _file->SetLabel(_("Browse..."));
        }
 }