summaryrefslogtreecommitdiff
path: root/src/wx
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2016-08-24 11:38:53 +0100
committerCarl Hetherington <cth@carlh.net>2016-08-24 11:38:53 +0100
commitb8ab7864ea798d633c4dbfa6be69c58a227d9ca2 (patch)
tree6891668d2b7022c19045a746817c28e985e77a14 /src/wx
parent3412af70b950dcdc604413ef05c26becda6da789 (diff)
Revert "Bump libdcp for new method."
This reverts commit 3412af70b950dcdc604413ef05c26becda6da789.
Diffstat (limited to 'src/wx')
-rw-r--r--src/wx/new_film_dialog.cc27
-rw-r--r--src/wx/new_film_dialog.h5
-rw-r--r--src/wx/wscript1
3 files changed, 1 insertions, 32 deletions
diff --git a/src/wx/new_film_dialog.cc b/src/wx/new_film_dialog.cc
index 4883810d0..04b9e1057 100644
--- a/src/wx/new_film_dialog.cc
+++ b/src/wx/new_film_dialog.cc
@@ -46,10 +46,6 @@ NewFilmDialog::NewFilmDialog (wxWindow* parent)
_folder = new wxDirPickerCtrl (this, wxID_ANY, wxEmptyString, wxDirSelectorPromptStr, wxDefaultPosition, wxSize (300, -1));
#endif
- _use_template = new wxCheckButton (this, wxID_ANY, _("From template"));
- add (_use_template);
- _template_name = new wxChoice (this, wxID_ANY);
-
if (!_directory) {
_directory = Config::instance()->default_directory_or (wx_to_std (wxStandardPaths::Get().GetDocumentsDir()));
}
@@ -58,23 +54,10 @@ NewFilmDialog::NewFilmDialog (wxWindow* parent)
add (_folder);
_name->SetFocus ();
- _template_name->Enable (false);
-
- BOOST_FOREACH (string i, Config::instance()->template_names ()) {
- _template_name->Append (std_to_wx (i));
- }
-
- _use_template->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, bind (&NewFilmDialog::use_template_clicked, this));
layout ();
}
-void
-NewFilmDialog::use_template_clicked ()
-{
- _template_name->Enable (_use_template->GetValue ());
-}
-
NewFilmDialog::~NewFilmDialog ()
{
_directory = wx_to_std (_folder->GetPath ());
@@ -88,13 +71,3 @@ NewFilmDialog::get_path () const
p /= wx_to_std (_name->GetValue ());
return p;
}
-
-optional<string>
-NewFilmDialog::template_name () const
-{
- if (!_use_template->GetValue ()) {
- return optional<string> ();
- }
-
- return wx_to_std (_template_name->GetValue ());
-}
diff --git a/src/wx/new_film_dialog.h b/src/wx/new_film_dialog.h
index 4096b4303..6dc83d815 100644
--- a/src/wx/new_film_dialog.h
+++ b/src/wx/new_film_dialog.h
@@ -31,8 +31,7 @@ public:
NewFilmDialog (wxWindow *);
~NewFilmDialog ();
- boost::filesystem::path path () const;
- boost::optional<std::string> template_name () const;
+ boost::filesystem::path get_path () const;
private:
wxTextCtrl* _name;
@@ -41,7 +40,5 @@ private:
#else
wxDirPickerCtrl* _folder;
#endif
- wxCheckButton* _use_template;
- wxChoice* _template_name;
static boost::optional<boost::filesystem::path> _directory;
};
diff --git a/src/wx/wscript b/src/wx/wscript
index 1f9aed6b3..ee77e6c20 100644
--- a/src/wx/wscript
+++ b/src/wx/wscript
@@ -75,7 +75,6 @@ sources = """
repeat_dialog.cc
report_problem_dialog.cc
rgba_colour_picker.cc
- save_template_dialog.cc
screen_dialog.cc
screens_panel.cc
self_dkdm_dialog.cc