From 1b04c90f159463d0cd75279fcebffc0bfecf53cf Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 17 Sep 2020 00:05:09 +0200 Subject: Use sensitivity to disallow empty template names, rather than giving an error after the fact. --- src/wx/save_template_dialog.cc | 24 ++++++++++++++++++------ src/wx/save_template_dialog.h | 3 ++- 2 files changed, 20 insertions(+), 7 deletions(-) (limited to 'src') diff --git a/src/wx/save_template_dialog.cc b/src/wx/save_template_dialog.cc index 044006350..d1f60b8d1 100644 --- a/src/wx/save_template_dialog.cc +++ b/src/wx/save_template_dialog.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2016 Carl Hetherington + Copyright (C) 2016-2020 Carl Hetherington This file is part of DCP-o-matic. @@ -37,9 +37,24 @@ SaveTemplateDialog::SaveTemplateDialog (wxWindow* parent) layout (); wxButton* ok = dynamic_cast (FindWindowById (wxID_OK, this)); - ok->Bind (wxEVT_BUTTON, bind (&SaveTemplateDialog::check, this, _1)); + ok->Bind (wxEVT_BUTTON, boost::bind(&SaveTemplateDialog::check, this, _1)); + + _name->Bind (wxEVT_TEXT, boost::bind(&SaveTemplateDialog::setup_sensitivity, this)); + + setup_sensitivity (); +} + + +void +SaveTemplateDialog::setup_sensitivity () +{ + wxButton* ok = dynamic_cast(FindWindowById(wxID_OK, this)); + if (ok) { + ok->Enable (!_name->GetValue().IsEmpty()); + } } + string SaveTemplateDialog::name () const { @@ -51,10 +66,7 @@ SaveTemplateDialog::check (wxCommandEvent& ev) { bool ok = true; - if (_name->GetValue().IsEmpty()) { - error_dialog (this, _("Template names must not be empty.")); - ok = false; - } else if (Config::instance()->existing_template (wx_to_std (_name->GetValue ()))) { + if (Config::instance()->existing_template (wx_to_std (_name->GetValue ()))) { ok = confirm_dialog (this, _("There is already a template with this name. Do you want to overwrite it?")); } diff --git a/src/wx/save_template_dialog.h b/src/wx/save_template_dialog.h index 3ccf17ed0..7e4808ca2 100644 --- a/src/wx/save_template_dialog.h +++ b/src/wx/save_template_dialog.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2016 Carl Hetherington + Copyright (C) 2016-2020 Carl Hetherington This file is part of DCP-o-matic. @@ -28,6 +28,7 @@ public: std::string name () const; private: + void setup_sensitivity (); void check (wxCommandEvent& ev); wxTextCtrl* _name; -- cgit v1.2.3