From 11835d1e0bf15dd16a0f5fe3844fafb924f0a927 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 22 Jun 2014 22:13:36 +0100 Subject: [PATCH] Reset-to-default button for KDM email text. Suggested-by: Carsten Kurz --- ChangeLog | 2 ++ src/lib/config.cc | 16 +++++++++++++--- src/lib/config.h | 2 ++ src/wx/config_dialog.cc | 15 +++++++++++++-- 4 files changed, 30 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index e9c2f7166..0c04645cd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2014-06-22 Carl Hetherington + * Reset-to-default button for KDM email text. + * Version 1.69.35 released. 2014-06-22 Carl Hetherington diff --git a/src/lib/config.cc b/src/lib/config.cc index 0c3dd023d..901a6b19e 100644 --- a/src/lib/config.cc +++ b/src/lib/config.cc @@ -67,9 +67,6 @@ Config::Config () , _default_dcp_content_type (DCPContentType::from_isdcf_name ("TST")) , _default_j2k_bandwidth (100000000) , _default_audio_delay (0) - , _kdm_email ( - _("Dear Projectionist\n\nPlease find attached KDMs for $CPL_NAME.\n\nThe KDMs are valid from $START_TIME until $END_TIME.\n\nBest regards,\nDCP-o-matic") - ) , _check_for_updates (false) , _check_for_test_updates (false) , _maximum_j2k_bandwidth (250000000) @@ -85,6 +82,8 @@ Config::Config () _colour_conversions.push_back (PresetColourConversion (_("sRGB"), 2.4, true, libdcp::colour_matrix::srgb_to_xyz, 2.6)); _colour_conversions.push_back (PresetColourConversion (_("sRGB non-linearised"), 2.4, false, libdcp::colour_matrix::srgb_to_xyz, 2.6)); _colour_conversions.push_back (PresetColourConversion (_("Rec. 709"), 2.2, false, libdcp::colour_matrix::rec709_to_xyz, 2.6)); + + reset_kdm_email (); } void @@ -408,3 +407,14 @@ Config::changed () write (); Changed (); } + +void +Config::reset_kdm_email () +{ + _kdm_email = _( + "Dear Projectionist\n\n" + "Please find attached KDMs for $CPL_NAME.\n\n" + "The KDMs are valid from $START_TIME until $END_TIME.\n\n" + "Best regards,\nDCP-o-matic" + ); +} diff --git a/src/lib/config.h b/src/lib/config.h index 671f53ef3..c359901a4 100644 --- a/src/lib/config.h +++ b/src/lib/config.h @@ -329,6 +329,8 @@ public: changed (); } + void reset_kdm_email (); + void set_check_for_updates (bool c) { _check_for_updates = c; changed (); diff --git a/src/wx/config_dialog.cc b/src/wx/config_dialog.cc index 19ab877c2..9cd8170b4 100644 --- a/src/wx/config_dialog.cc +++ b/src/wx/config_dialog.cc @@ -649,7 +649,7 @@ public: wxFlexGridSizer* table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP); table->AddGrowableCol (1, 1); - s->Add (table, 1, wxTOP | wxLEFT | wxRIGHT | wxEXPAND, _border); + s->Add (table, 1, wxEXPAND | wxALL, _border); add_label_to_sizer (table, panel, _("Outgoing mail server"), true); _mail_server = new wxTextCtrl (panel, wxID_ANY); @@ -675,7 +675,10 @@ public: table->Add (_kdm_from, 1, wxEXPAND | wxALL); _kdm_email = new wxTextCtrl (panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (480, 128), wxTE_MULTILINE); - s->Add (_kdm_email, 1.5, wxEXPAND | wxBOTTOM | wxLEFT | wxRIGHT, _border); + s->Add (_kdm_email, 1.5, wxEXPAND | wxALL, _border); + + _reset_kdm_email = new wxButton (panel, wxID_ANY, _("Reset to default text")); + s->Add (_reset_kdm_email, 0, wxEXPAND | wxALL, _border); Config* config = Config::instance (); _mail_server->SetValue (std_to_wx (config->mail_server ())); @@ -688,6 +691,7 @@ public: _kdm_from->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&KDMEmailPage::kdm_from_changed, this)); _kdm_email->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&KDMEmailPage::kdm_email_changed, this)); _kdm_email->SetValue (wx_to_std (Config::instance()->kdm_email ())); + _reset_kdm_email->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&KDMEmailPage::reset_kdm_email, this)); return panel; } @@ -718,11 +722,18 @@ private: Config::instance()->set_kdm_email (wx_to_std (_kdm_email->GetValue ())); } + void reset_kdm_email () + { + Config::instance()->reset_kdm_email (); + _kdm_email->SetValue (wx_to_std (Config::instance()->kdm_email ())); + } + wxTextCtrl* _mail_server; wxTextCtrl* _mail_user; wxTextCtrl* _mail_password; wxTextCtrl* _kdm_from; wxTextCtrl* _kdm_email; + wxButton* _reset_kdm_email; }; class AdvancedPage : public wxStockPreferencesPage, public Page -- 2.30.2