projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Spacing tweaks; rename ImageMagick -> StillImage.
[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 93d0f3b194c05a6ecb14331863c4a6e8c993ae3e..4b12c1714adcfc4ecd315056f7d29f4b4b09c486 100644
(file)
--- a/
src/wx/new_film_dialog.cc
+++ b/
src/wx/new_film_dialog.cc
@@
-18,26
+18,46
@@
*/
#include <boost/filesystem.hpp>
*/
#include <boost/filesystem.hpp>
+#include <wx/stdpaths.h>
+#include "lib/config.h"
#include "new_film_dialog.h"
#include "wx_util.h"
#include "new_film_dialog.h"
#include "wx_util.h"
+#ifdef DCPOMATIC_USE_OWN_DIR_PICKER
+#include "dir_picker_ctrl.h"
+#endif
using namespace std;
using namespace boost;
using namespace std;
using namespace boost;
+boost::optional<string> NewFilmDialog::_directory;
+
NewFilmDialog::NewFilmDialog (wxWindow* parent)
NewFilmDialog::NewFilmDialog (wxWindow* parent)
- : wxDialog (parent, wxID_ANY,
wxString (_("New Film")
))
+ : wxDialog (parent, wxID_ANY,
_("New Film"
))
{
wxBoxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL);
{
wxBoxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL);
- wxFlexGridSizer* table = new wxFlexGridSizer (2, 6, 6);
+ SetSizer (overall_sizer);
+
+ 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 DCPOMATIC_USE_OWN_DIR_PICKER
+ _folder = new DirPickerCtrl (this);
+#else
_folder = new wxDirPickerCtrl (this, wxDD_DIR_MUST_EXIST);
_folder = new wxDirPickerCtrl (this, wxDD_DIR_MUST_EXIST);
+#endif
+
+ if (!_directory) {
+ _directory = Config::instance()->default_directory_or (wx_to_std (wxStandardPaths::Get().GetDocumentsDir()));
+ }
+
+ _folder->SetPath (std_to_wx (_directory.get()));
table->Add (_folder, 1, wxEXPAND);
wxSizer* buttons = CreateSeparatedButtonSizer (wxOK | wxCANCEL);
table->Add (_folder, 1, wxEXPAND);
wxSizer* buttons = CreateSeparatedButtonSizer (wxOK | wxCANCEL);
@@
-45,11
+65,15
@@
NewFilmDialog::NewFilmDialog (wxWindow* parent)
overall_sizer->Add (buttons, wxSizerFlags().Expand().DoubleBorder());
}
overall_sizer->Add (buttons, wxSizerFlags().Expand().DoubleBorder());
}
- SetSizer (overall_sizer);
overall_sizer->Layout ();
overall_sizer->SetSizeHints (this);
}
overall_sizer->Layout ();
overall_sizer->SetSizeHints (this);
}
+NewFilmDialog::~NewFilmDialog ()
+{
+ _directory = wx_to_std (_folder->GetPath ());
+}
+
string
NewFilmDialog::get_path () const
{
string
NewFilmDialog::get_path () const
{