projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix attempt to internationalise an empty string causing strange channel names in...
[dcpomatic.git]
/
src
/
wx
/
new_film_dialog.h
diff --git
a/src/wx/new_film_dialog.h
b/src/wx/new_film_dialog.h
index 01064f2a6e2c1ad433c9dafce0b6342ed791ea8c..81dd29feab59747dd18fbb090a728620a3e25782 100644
(file)
--- a/
src/wx/new_film_dialog.h
+++ b/
src/wx/new_film_dialog.h
@@
-1,19
+1,20
@@
/*
Copyright (C) 2012-2014 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
+ This file is part of DCP-o-matic.
+
+ DCP-o-matic is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
-
This program
is distributed in the hope that it will be useful,
+
DCP-o-matic
is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ along with DCP-o-matic. If not, see <http://www.gnu.org/licenses/>.
*/
*/
@@
-30,14
+31,19
@@
public:
NewFilmDialog (wxWindow *);
~NewFilmDialog ();
NewFilmDialog (wxWindow *);
~NewFilmDialog ();
- boost::filesystem::path get_path () const;
+ boost::filesystem::path path () const;
+ boost::optional<std::string> template_name () const;
private:
private:
+ void use_template_clicked ();
+
wxTextCtrl* _name;
#ifdef DCPOMATIC_USE_OWN_PICKER
DirPickerCtrl* _folder;
#else
wxDirPickerCtrl* _folder;
#endif
wxTextCtrl* _name;
#ifdef DCPOMATIC_USE_OWN_PICKER
DirPickerCtrl* _folder;
#else
wxDirPickerCtrl* _folder;
#endif
+ wxCheckBox* _use_template;
+ wxChoice* _template_name;
static boost::optional<boost::filesystem::path> _directory;
};
static boost::optional<boost::filesystem::path> _directory;
};