projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add new screen to the right place just after adding a new cinema (#2249).
[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 b05e73273d99d0703379ff109b5c1e70f200b9cf..6c8fdd1fc3e6b48c82505c7e4278b7c428156466 100644
(file)
--- a/
src/wx/dir_picker_ctrl.cc
+++ b/
src/wx/dir_picker_ctrl.cc
@@
-18,25
+18,34
@@
*/
*/
+
+#include "dcpomatic_button.h"
#include "dir_picker_ctrl.h"
#include "dir_picker_ctrl.h"
-#include "wx_util.h"
#include "static_text.h"
#include "static_text.h"
-#include "
dcpomatic_button
.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/filepicker.h>
+#include <wx/stdpaths.h>
+#include <wx/wx.h>
+LIBDCP_ENABLE_WARNINGS
#include <boost/filesystem.hpp>
#include <boost/filesystem.hpp>
+
using namespace std;
using namespace boost;
using namespace std;
using namespace boost;
+
DirPickerCtrl::DirPickerCtrl (wxWindow* parent)
: wxPanel (parent)
{
_sizer = new wxBoxSizer (wxHORIZONTAL);
_folder = new StaticText (this, wxT(""));
DirPickerCtrl::DirPickerCtrl (wxWindow* parent)
: wxPanel (parent)
{
_sizer = new wxBoxSizer (wxHORIZONTAL);
_folder = new StaticText (this, wxT(""));
- _sizer->Add (_folder, 1, wxEXPAND | wxALL, 6);
+ 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);
_browse = new Button (this, _("Browse..."));
_sizer->Add (_browse, 0);
@@
-53,7
+62,7
@@
DirPickerCtrl::SetPath (wxString p)
if (_path == wxStandardPaths::Get().GetDocumentsDir()) {
_folder->SetLabel (_("My Documents"));
} else {
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);
}
wxCommandEvent ev (wxEVT_DIRPICKER_CHANGED, wxID_ANY);
@@
-61,6
+70,8
@@
DirPickerCtrl::SetPath (wxString p)
_sizer->Layout ();
SetMinSize (wxSize (max (400, _sizer->GetSize().GetWidth()), -1));
_sizer->Layout ();
SetMinSize (wxSize (max (400, _sizer->GetSize().GetWidth()), -1));
+
+ Changed ();
}
wxString
}
wxString