From 0f42e807a707249cd1a60fa6e476cb47a4147c5a Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 9 May 2017 13:44:43 +0100 Subject: Basica save-as (duplicate) (#746). --- src/wx/film_name_location_dialog.cc | 136 ++++++++++++++++++++++++++++++++++++ src/wx/film_name_location_dialog.h | 50 +++++++++++++ src/wx/new_film_dialog.cc | 102 --------------------------- src/wx/new_film_dialog.h | 49 ------------- src/wx/wscript | 2 +- 5 files changed, 187 insertions(+), 152 deletions(-) create mode 100644 src/wx/film_name_location_dialog.cc create mode 100644 src/wx/film_name_location_dialog.h delete mode 100644 src/wx/new_film_dialog.cc delete mode 100644 src/wx/new_film_dialog.h (limited to 'src/wx') diff --git a/src/wx/film_name_location_dialog.cc b/src/wx/film_name_location_dialog.cc new file mode 100644 index 000000000..d91171acb --- /dev/null +++ b/src/wx/film_name_location_dialog.cc @@ -0,0 +1,136 @@ +/* + Copyright (C) 2012-2017 Carl Hetherington + + 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. + + 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 + along with DCP-o-matic. If not, see . + +*/ + +#include "wx_util.h" +#include "film_name_location_dialog.h" +#ifdef DCPOMATIC_USE_OWN_PICKER +#include "dir_picker_ctrl.h" +#endif +#include "lib/config.h" +#include "lib/compose.hpp" +#include +#include +#include + +using namespace std; +using namespace boost; + +boost::optional FilmNameLocationDialog::_directory; + +FilmNameLocationDialog::FilmNameLocationDialog (wxWindow* parent, wxString title, bool offer_templates) + : TableDialog (parent, title, 2, 1, true) +{ + add (_("Film name"), true); + _name = add (new wxTextCtrl (this, wxID_ANY)); + + add (_("Create in folder"), true); + +#ifdef DCPOMATIC_USE_OWN_PICKER + _folder = new DirPickerCtrl (this); +#else + _folder = new wxDirPickerCtrl (this, wxID_ANY, wxEmptyString, wxDirSelectorPromptStr, wxDefaultPosition, wxSize (300, -1)); +#endif + + if (!_directory) { + _directory = Config::instance()->default_directory_or (wx_to_std (wxStandardPaths::Get().GetDocumentsDir())); + } + + _folder->SetPath (std_to_wx (_directory.get().string())); + add (_folder); + + if (offer_templates) { + _use_template = new wxCheckBox (this, wxID_ANY, _("From template")); + add (_use_template); + _template_name = new wxChoice (this, wxID_ANY); + add (_template_name); + } + + _name->SetFocus (); + + if (offer_templates) { + _template_name->Enable (false); + + BOOST_FOREACH (string i, Config::instance()->templates ()) { + _template_name->Append (std_to_wx (i)); + } + + _use_template->Bind (wxEVT_CHECKBOX, bind (&FilmNameLocationDialog::use_template_clicked, this)); + } + + layout (); +} + +void +FilmNameLocationDialog::use_template_clicked () +{ + _template_name->Enable (_use_template->GetValue ()); +} + +FilmNameLocationDialog::~FilmNameLocationDialog () +{ + _directory = wx_to_std (_folder->GetPath ()); +} + +boost::filesystem::path +FilmNameLocationDialog::path () const +{ + filesystem::path p; + p /= wx_to_std (_folder->GetPath ()); + p /= wx_to_std (_name->GetValue ()); + return p; +} + +optional +FilmNameLocationDialog::template_name () const +{ + if (!_use_template->GetValue() || _template_name->GetSelection() == -1) { + return optional (); + } + + return wx_to_std (_template_name->GetString(_template_name->GetSelection())); +} + +/** Check the path that is in our controls and offer confirmations or errors as required. + * @return true if the path should be used. + */ +bool +FilmNameLocationDialog::check_path () +{ + if (boost::filesystem::is_directory (path()) && !boost::filesystem::is_empty(path())) { + if (!confirm_dialog ( + this, + std_to_wx ( + String::compose (wx_to_std (_("The directory %1 already exists and is not empty. " + "Are you sure you want to use it?")), + path().string().c_str()) + ) + )) { + return false; + } + } else if (boost::filesystem::is_regular_file (path())) { + error_dialog ( + this, + String::compose (wx_to_std (_("%1 already exists as a file, so you cannot use it for a film.")), path().c_str()) + ); + return false; + } + + return true; +} diff --git a/src/wx/film_name_location_dialog.h b/src/wx/film_name_location_dialog.h new file mode 100644 index 000000000..cfa296701 --- /dev/null +++ b/src/wx/film_name_location_dialog.h @@ -0,0 +1,50 @@ +/* + Copyright (C) 2012-2014 Carl Hetherington + + 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. + + 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 + along with DCP-o-matic. If not, see . + +*/ + +#include +#include +#include "wx_util.h" +#include "table_dialog.h" + +class DirPickerCtrl; + +class FilmNameLocationDialog : public TableDialog +{ +public: + FilmNameLocationDialog (wxWindow *, wxString title, bool offer_templates); + ~FilmNameLocationDialog (); + + boost::filesystem::path path () const; + bool check_path (); + boost::optional template_name () const; + +private: + void use_template_clicked (); + + wxTextCtrl* _name; +#ifdef DCPOMATIC_USE_OWN_PICKER + DirPickerCtrl* _folder; +#else + wxDirPickerCtrl* _folder; +#endif + wxCheckBox* _use_template; + wxChoice* _template_name; + static boost::optional _directory; +}; diff --git a/src/wx/new_film_dialog.cc b/src/wx/new_film_dialog.cc deleted file mode 100644 index ef072c9fc..000000000 --- a/src/wx/new_film_dialog.cc +++ /dev/null @@ -1,102 +0,0 @@ -/* - Copyright (C) 2012-2014 Carl Hetherington - - 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. - - 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 - along with DCP-o-matic. If not, see . - -*/ - -#include "lib/config.h" -#include "new_film_dialog.h" -#include "wx_util.h" -#ifdef DCPOMATIC_USE_OWN_PICKER -#include "dir_picker_ctrl.h" -#endif -#include -#include -#include - -using namespace std; -using namespace boost; - -boost::optional NewFilmDialog::_directory; - -NewFilmDialog::NewFilmDialog (wxWindow* parent) - : TableDialog (parent, _("New Film"), 2, 1, true) -{ - add (_("Film name"), true); - _name = add (new wxTextCtrl (this, wxID_ANY)); - - add (_("Create in folder"), true); - -#ifdef DCPOMATIC_USE_OWN_PICKER - _folder = new DirPickerCtrl (this); -#else - _folder = new wxDirPickerCtrl (this, wxID_ANY, wxEmptyString, wxDirSelectorPromptStr, wxDefaultPosition, wxSize (300, -1)); -#endif - - if (!_directory) { - _directory = Config::instance()->default_directory_or (wx_to_std (wxStandardPaths::Get().GetDocumentsDir())); - } - - _folder->SetPath (std_to_wx (_directory.get().string())); - add (_folder); - - _use_template = new wxCheckBox (this, wxID_ANY, _("From template")); - add (_use_template); - _template_name = new wxChoice (this, wxID_ANY); - add (_template_name); - - _name->SetFocus (); - _template_name->Enable (false); - - BOOST_FOREACH (string i, Config::instance()->templates ()) { - _template_name->Append (std_to_wx (i)); - } - - _use_template->Bind (wxEVT_CHECKBOX, 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 ()); -} - -boost::filesystem::path -NewFilmDialog::path () const -{ - filesystem::path p; - p /= wx_to_std (_folder->GetPath ()); - p /= wx_to_std (_name->GetValue ()); - return p; -} - -optional -NewFilmDialog::template_name () const -{ - if (!_use_template->GetValue() || _template_name->GetSelection() == -1) { - return optional (); - } - - return wx_to_std (_template_name->GetString(_template_name->GetSelection())); -} diff --git a/src/wx/new_film_dialog.h b/src/wx/new_film_dialog.h deleted file mode 100644 index 81dd29fea..000000000 --- a/src/wx/new_film_dialog.h +++ /dev/null @@ -1,49 +0,0 @@ -/* - Copyright (C) 2012-2014 Carl Hetherington - - 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. - - 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 - along with DCP-o-matic. If not, see . - -*/ - -#include -#include -#include "wx_util.h" -#include "table_dialog.h" - -class DirPickerCtrl; - -class NewFilmDialog : public TableDialog -{ -public: - NewFilmDialog (wxWindow *); - ~NewFilmDialog (); - - boost::filesystem::path path () const; - boost::optional template_name () const; - -private: - void use_template_clicked (); - - wxTextCtrl* _name; -#ifdef DCPOMATIC_USE_OWN_PICKER - DirPickerCtrl* _folder; -#else - wxDirPickerCtrl* _folder; -#endif - wxCheckBox* _use_template; - wxChoice* _template_name; - static boost::optional _directory; -}; diff --git a/src/wx/wscript b/src/wx/wscript index 332a04ac5..8297f37c9 100644 --- a/src/wx/wscript +++ b/src/wx/wscript @@ -51,6 +51,7 @@ sources = """ download_certificate_panel.cc file_picker_ctrl.cc film_editor.cc + film_name_location_dialog.cc film_viewer.cc filter_dialog.cc filter_editor.cc @@ -70,7 +71,6 @@ sources = """ move_to_dialog.cc nag_dialog.cc name_format_editor.cc - new_film_dialog.cc normal_job_view.cc playhead_to_timecode_dialog.cc playhead_to_frame_dialog.cc -- cgit v1.2.3