diff options
| author | Carl Hetherington <cth@carlh.net> | 2024-11-27 00:51:00 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2024-11-27 00:51:00 +0100 |
| commit | e017c800b6c563a005d1851154f8ac268382eb3b (patch) | |
| tree | e935fec797842365683abcf8634a2a0bd1028c39 /src | |
| parent | d8f193812392af5871a52b6bb5a2c20ccb0ac337 (diff) | |
Remove beta-grade warning in the Disk Writer.
I hope I don't live to regret this.
Diffstat (limited to 'src')
| -rw-r--r-- | src/tools/dcpomatic_disk.cc | 20 | ||||
| -rw-r--r-- | src/wx/disk_warning_dialog.cc | 61 | ||||
| -rw-r--r-- | src/wx/disk_warning_dialog.h | 37 | ||||
| -rw-r--r-- | src/wx/wscript | 1 |
4 files changed, 0 insertions, 119 deletions
diff --git a/src/tools/dcpomatic_disk.cc b/src/tools/dcpomatic_disk.cc index 076cf295b..b47addce9 100644 --- a/src/tools/dcpomatic_disk.cc +++ b/src/tools/dcpomatic_disk.cc @@ -19,7 +19,6 @@ */ -#include "wx/disk_warning_dialog.h" #include "wx/drive_wipe_warning_dialog.h" #include "wx/editable_list.h" #include "wx/id.h" @@ -490,22 +489,6 @@ public: */ Config::drop (); - if (!_skip_alpha_check) { - auto warning = make_wx<DiskWarningDialog>(); - if (warning->ShowModal() != wxID_OK) { - return false; - } - if (!warning->confirmed()) { - message_dialog( - nullptr, - variant::wx::insert_dcpomatic_disk_writer( - _("You did not correctly confirm that you read the warning that was just shown. %s will close now. Please try again.") - ) - ); - return false; - } - } - _frame = new DOMFrame(variant::wx::dcpomatic_disk_writer()); SetTopWindow (_frame); @@ -535,8 +518,6 @@ public: bool OnCmdLineParsed (wxCmdLineParser& parser) override { - _skip_alpha_check = parser.Found(char_to_wx("sure")); - wxString dcp; if (parser.Found(char_to_wx("dcp"), &dcp)) { _dcp_to_write = wx_to_std (dcp); @@ -602,7 +583,6 @@ public: } DOMFrame* _frame; - bool _skip_alpha_check = false; boost::optional<boost::filesystem::path> _dcp_to_write; }; diff --git a/src/wx/disk_warning_dialog.cc b/src/wx/disk_warning_dialog.cc deleted file mode 100644 index 9af4a2aca..000000000 --- a/src/wx/disk_warning_dialog.cc +++ /dev/null @@ -1,61 +0,0 @@ -/* - Copyright (C) 2020 Carl Hetherington <cth@carlh.net> - - 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 <http://www.gnu.org/licenses/>. - -*/ - - -#include "disk_warning_dialog.h" -#include "static_text.h" -#include "wx_util.h" -#include "wx_variant.h" - - -DiskWarningDialog::DiskWarningDialog () - : wxDialog(nullptr, wxID_ANY, _("Important notice")) -{ - auto sizer = new wxBoxSizer (wxVERTICAL); - auto text = new StaticText (this, wxEmptyString, wxDefaultPosition, wxSize(400, 300)); - sizer->Add (text, 1, wxEXPAND | wxALL, DCPOMATIC_DIALOG_BORDER); - _yes = new wxTextCtrl (this, wxID_ANY); - sizer->Add (_yes, 0, wxALL, DCPOMATIC_DIALOG_BORDER); - - auto buttons = CreateSeparatedButtonSizer (wxOK | wxCANCEL); - if (buttons) { - sizer->Add(buttons, wxSizerFlags().Expand().DoubleBorder()); - } - - SetSizer (sizer); - sizer->Layout (); - sizer->SetSizeHints (this); - - /// TRANSLATORS: the user will be asked to type this phrase into a text entry to confirm that they have read - /// the warning about using the disk writer. - auto const confirmation = _("I am sure"); - - text->SetLabelMarkup(wxString::Format( - _("The <b>%s</b> is\n\n<span weight=\"bold\" size=\"20480\" foreground=\"red\">BETA-GRADE TEST SOFTWARE</span>\n\n" - "and may\n\n<span weight=\"bold\" size=\"20480\" foreground=\"red\">DESTROY DATA!</span>\n\n" - "If you are sure you want to continue please type\n\n<tt>%s</tt>\n\ninto the box below, then click OK."), - variant::wx::dcpomatic_disk_writer(), confirmation)); -} - -bool -DiskWarningDialog::confirmed () const -{ - return _yes->GetValue() == _("I am sure"); -} diff --git a/src/wx/disk_warning_dialog.h b/src/wx/disk_warning_dialog.h deleted file mode 100644 index d59f334ac..000000000 --- a/src/wx/disk_warning_dialog.h +++ /dev/null @@ -1,37 +0,0 @@ -/* - Copyright (C) 2020 Carl Hetherington <cth@carlh.net> - - 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 <http://www.gnu.org/licenses/>. - -*/ - - -#include <dcp/warnings.h> -LIBDCP_DISABLE_WARNINGS -#include <wx/wx.h> -LIBDCP_ENABLE_WARNINGS - - -class DiskWarningDialog : public wxDialog -{ -public: - DiskWarningDialog (); - - bool confirmed () const; - -private: - wxTextCtrl* _yes; -}; diff --git a/src/wx/wscript b/src/wx/wscript index fce9e08dd..5a19c0df3 100644 --- a/src/wx/wscript +++ b/src/wx/wscript @@ -72,7 +72,6 @@ sources = """ dcpomatic_spin_ctrl.cc dir_dialog.cc dir_picker_ctrl.cc - disk_warning_dialog.cc dkdm_dialog.cc dkdm_output_panel.cc dolby_doremi_certificate_panel.cc |
