projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
A whole load of UTF-8/-16 confusion fixes for Windows.
[dcpomatic.git]
/
src
/
wx
/
new_film_dialog.cc
diff --git
a/src/wx/new_film_dialog.cc
b/src/wx/new_film_dialog.cc
index 191482a7cbcdb23ca3da8f48720dbbcdc7bf2d06..be5af999e86ca42861f1b9fd73e8563962037dab 100644
(file)
--- a/
src/wx/new_film_dialog.cc
+++ b/
src/wx/new_film_dialog.cc
@@
-21,15
+21,15
@@
#include <wx/stdpaths.h>
#include "lib/config.h"
#include "new_film_dialog.h"
#include <wx/stdpaths.h>
#include "lib/config.h"
#include "new_film_dialog.h"
-#ifdef __WXMSW__
+#include "wx_util.h"
+#ifdef DCPOMATIC_USE_OWN_DIR_PICKER
#include "dir_picker_ctrl.h"
#endif
#include "dir_picker_ctrl.h"
#endif
-#include "wx_util.h"
using namespace std;
using namespace boost;
using namespace std;
using namespace boost;
-boost::optional<
string
> NewFilmDialog::_directory;
+boost::optional<
boost::filesystem::path
> NewFilmDialog::_directory;
NewFilmDialog::NewFilmDialog (wxWindow* parent)
: wxDialog (parent, wxID_ANY, _("New Film"))
NewFilmDialog::NewFilmDialog (wxWindow* parent)
: wxDialog (parent, wxID_ANY, _("New Film"))
@@
-37,26
+37,27
@@
NewFilmDialog::NewFilmDialog (wxWindow* parent)
wxBoxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL);
SetSizer (overall_sizer);
wxBoxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL);
SetSizer (overall_sizer);
- wxFlexGridSizer* table = new wxFlexGridSizer (2,
6, 6
);
+ wxFlexGridSizer* table = new wxFlexGridSizer (2,
DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP
);
table->AddGrowableCol (1, 1);
table->AddGrowableCol (1, 1);
- overall_sizer->Add (table, 1, wxEXPAND | wxALL,
6
);
+ overall_sizer->Add (table, 1, wxEXPAND | wxALL,
DCPOMATIC_DIALOG_BORDER
);
- add_label_to_sizer (table, this, _("Film name"));
+ add_label_to_sizer (table, this, _("Film name")
, true
);
_name = new wxTextCtrl (this, wxID_ANY);
_name = new wxTextCtrl (this, wxID_ANY);
- table->Add (_name, 1, wxEXPAND);
+ table->Add (_name, 0, wxEXPAND);
+
+ add_label_to_sizer (table, this, _("Create in folder"), true);
- add_label_to_sizer (table, this, _("Create in folder"));
-#ifdef __WXMSW__
- _folder = new DirPickerCtrl (this);
+#ifdef DCPOMATIC_USE_OWN_DIR_PICKER
+ _folder = new DirPickerCtrl (this);
#else
#else
- _folder = new wxDirPickerCtrl (this, wx
DD_DIR_MUST_EXIST
);
+ _folder = new wxDirPickerCtrl (this, wx
ID_ANY
);
#endif
if (!_directory) {
_directory = Config::instance()->default_directory_or (wx_to_std (wxStandardPaths::Get().GetDocumentsDir()));
}
#endif
if (!_directory) {
_directory = Config::instance()->default_directory_or (wx_to_std (wxStandardPaths::Get().GetDocumentsDir()));
}
- _folder->SetPath (std_to_wx (_directory.get()));
+ _folder->SetPath (std_to_wx (_directory.get()
.string()
));
table->Add (_folder, 1, wxEXPAND);
wxSizer* buttons = CreateSeparatedButtonSizer (wxOK | wxCANCEL);
table->Add (_folder, 1, wxEXPAND);
wxSizer* buttons = CreateSeparatedButtonSizer (wxOK | wxCANCEL);
@@
-73,11
+74,11
@@
NewFilmDialog::~NewFilmDialog ()
_directory = wx_to_std (_folder->GetPath ());
}
_directory = wx_to_std (_folder->GetPath ());
}
-string
+boost::filesystem::path
NewFilmDialog::get_path () const
{
filesystem::path p;
p /= wx_to_std (_folder->GetPath ());
p /= wx_to_std (_name->GetValue ());
NewFilmDialog::get_path () const
{
filesystem::path p;
p /= wx_to_std (_folder->GetPath ());
p /= wx_to_std (_name->GetValue ());
- return p
.string ()
;
+ return p;
}
}