diff options
| author | Carl Hetherington <cth@carlh.net> | 2025-02-22 01:53:39 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2025-02-23 01:47:38 +0100 |
| commit | 91c171b65e7329b90ac77442fd35b165bde70b26 (patch) | |
| tree | c7dac9f4a660bce834db2810710a8e74fc4513f8 /src | |
| parent | 0690032e5c176bb6a9db41c76a167fa4fbd4cb8d (diff) | |
Rename VerifyDCPProgressDialog -> VerifyDCPDialog.
Diffstat (limited to 'src')
| -rw-r--r-- | src/tools/dcpomatic_player.cc | 6 | ||||
| -rw-r--r-- | src/wx/verify_dcp_dialog.cc (renamed from src/wx/verify_dcp_progress_dialog.cc) | 12 | ||||
| -rw-r--r-- | src/wx/verify_dcp_dialog.h (renamed from src/wx/verify_dcp_progress_dialog.h) | 4 | ||||
| -rw-r--r-- | src/wx/wscript | 4 |
4 files changed, 13 insertions, 13 deletions
diff --git a/src/tools/dcpomatic_player.cc b/src/tools/dcpomatic_player.cc index dc570653f..b0a791633 100644 --- a/src/tools/dcpomatic_player.cc +++ b/src/tools/dcpomatic_player.cc @@ -32,7 +32,7 @@ #include "wx/system_information_dialog.h" #include "wx/timer_display.h" #include "wx/update_dialog.h" -#include "wx/verify_dcp_progress_dialog.h" +#include "wx/verify_dcp_dialog.h" #include "wx/wx_signal_manager.h" #include "wx/wx_util.h" #include "wx/wx_variant.h" @@ -995,8 +995,8 @@ private: DCPOMATIC_ASSERT (dcp); auto job = make_shared<VerifyDCPJob>(dcp->directories(), _kdms, dcp::VerificationOptions{}); - VerifyDCPProgressDialog progress(this, _("Verify DCP"), job); - progress.ShowModal(); + VerifyDCPDialog dialog(this, _("Verify DCP"), job); + dialog.ShowModal(); } void tools_check_for_updates () diff --git a/src/wx/verify_dcp_progress_dialog.cc b/src/wx/verify_dcp_dialog.cc index 1b7bb975d..ec33534ea 100644 --- a/src/wx/verify_dcp_progress_dialog.cc +++ b/src/wx/verify_dcp_dialog.cc @@ -21,7 +21,7 @@ #include "check_box.h" #include "dcpomatic_button.h" -#include "verify_dcp_progress_dialog.h" +#include "verify_dcp_dialog.h" #include "verify_dcp_progress_panel.h" #include "verify_dcp_result_panel.h" #include "wx_util.h" @@ -40,7 +40,7 @@ using std::string; using boost::optional; -VerifyDCPProgressDialog::VerifyDCPProgressDialog (wxWindow* parent, wxString title, shared_ptr<VerifyDCPJob> job) +VerifyDCPDialog::VerifyDCPDialog(wxWindow* parent, wxString title, shared_ptr<VerifyDCPJob> job) : wxDialog (parent, wxID_ANY, title) , _progress_panel(new VerifyDCPProgressPanel(this)) , _result_panel(new VerifyDCPResultPanel(this)) @@ -71,22 +71,22 @@ VerifyDCPProgressDialog::VerifyDCPProgressDialog (wxWindow* parent, wxString tit SetSizerAndFit (overall_sizer); - _verify->bind(&VerifyDCPProgressDialog::verify_clicked, this); - _cancel->bind(&VerifyDCPProgressDialog::cancel_clicked, this); + _verify->bind(&VerifyDCPDialog::verify_clicked, this); + _cancel->bind(&VerifyDCPDialog::cancel_clicked, this); _cancel->Enable(false); } void -VerifyDCPProgressDialog::cancel_clicked() +VerifyDCPDialog::cancel_clicked() { _cancel_pending = true; } void -VerifyDCPProgressDialog::verify_clicked() +VerifyDCPDialog::verify_clicked() { _cancel->Enable(true); _verify->Enable(false); diff --git a/src/wx/verify_dcp_progress_dialog.h b/src/wx/verify_dcp_dialog.h index c15c9f47a..436d15332 100644 --- a/src/wx/verify_dcp_progress_dialog.h +++ b/src/wx/verify_dcp_dialog.h @@ -33,10 +33,10 @@ class VerifyDCPProgressPanel; class VerifyDCPResultPanel; -class VerifyDCPProgressDialog : public wxDialog +class VerifyDCPDialog : public wxDialog { public: - VerifyDCPProgressDialog(wxWindow* parent, wxString title, std::shared_ptr<VerifyDCPJob> job); + VerifyDCPDialog(wxWindow* parent, wxString title, std::shared_ptr<VerifyDCPJob> job); private: void verify_clicked(); diff --git a/src/wx/wscript b/src/wx/wscript index 2da80b376..091e3c4e1 100644 --- a/src/wx/wscript +++ b/src/wx/wscript @@ -178,9 +178,9 @@ sources = """ timing_panel.cc try_unmount_dialog.cc update_dialog.cc - verify_dcp_result_panel.cc - verify_dcp_progress_dialog.cc + verify_dcp_dialog.cc verify_dcp_progress_panel.cc + verify_dcp_result_panel.cc video_panel.cc video_view.cc video_waveform_dialog.cc |