projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
No-op: remove all trailing whitespace.
[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 d4b78d5bff1ad845afd1732c3ef79c83720aecf7..96c8a0b0c59fef512ba3791c3d01ae5dca4b440f 100644
(file)
--- a/
src/wx/new_film_dialog.cc
+++ b/
src/wx/new_film_dialog.cc
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012
-2014
Carl Hetherington <cth@carlh.net>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-29,44
+29,32
@@
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)
NewFilmDialog::NewFilmDialog (wxWindow* parent)
- :
wxDialog (parent, wxID_ANY, _("New Film")
)
+ :
TableDialog (parent, _("New Film"), 2, true
)
{
{
- wxBoxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL);
- SetSizer (overall_sizer);
-
- wxFlexGridSizer* table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
- table->AddGrowableCol (1, 1);
- overall_sizer->Add (table, 1, wxEXPAND | wxALL, 6);
+ add (_("Film name"), true);
+ _name = add (new wxTextCtrl (this, wxID_ANY));
- add_label_to_sizer (table, this, _("Film name"), true);
- _name = new wxTextCtrl (this, wxID_ANY);
- table->Add (_name, 0, wxEXPAND);
-
- add_label_to_sizer (table, this, _("Create in folder"), true);
+ add (_("Create in folder"), true);
#ifdef DCPOMATIC_USE_OWN_DIR_PICKER
#ifdef DCPOMATIC_USE_OWN_DIR_PICKER
- _folder = new DirPickerCtrl (this);
-#else
- _folder = new wxDirPickerCtrl (this, wx
DD_DIR_MUST_EXIST
);
+ _folder = new DirPickerCtrl (this);
+#else
+ _folder = new wxDirPickerCtrl (this, wx
ID_ANY, wxEmptyString, wxDirSelectorPromptStr, wxDefaultPosition, wxSize (300, -1)
);
#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()));
- table->Add (_folder, 1, wxEXPAND);
-
wxSizer* buttons = CreateSeparatedButtonSizer (wxOK | wxCANCEL
);
- if (buttons) {
- overall_sizer->Add (buttons, wxSizerFlags().Expand().DoubleBorder());
- }
+
_folder->SetPath (std_to_wx (_directory.get().string())
);
+ add (_folder);
+
+ _name->SetFocus ();
- overall_sizer->Layout ();
- overall_sizer->SetSizeHints (this);
+ layout ();
}
NewFilmDialog::~NewFilmDialog ()
}
NewFilmDialog::~NewFilmDialog ()
@@
-74,11
+62,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;
}
}