Reset KDM email subject as well as body; fix erroneous initial subject.

diff --git a/src/lib/config.cc b/src/lib/config.cc
index 07c9b9c89bbea19047657e4eb48ecde503be4597..43a3e63c924d170517267c0b8f371b6aa6798235 100644 (file)
--- a/src/lib/config.cc
+++ b/src/lib/config.cc
@@ -91,7 +91,6 @@ Config::set_defaults ()
        _mail_port = 25;
        _mail_user = "";
        _mail_password = "";
-       _kdm_subject = _("KDM delivery");
        _kdm_from = "";
        _kdm_cc = "";
        _kdm_bcc = "";
@@ -458,6 +457,8 @@ Config::changed (Property what)
 void
 Config::set_kdm_email_to_default ()
 {
+       _kdm_subject = _("KDM delivery: $CPL_NAME");
+
        _kdm_email = _(
                "Dear Projectionist\n\n"
                "Please find attached KDMs for $CPL_NAME.\n\n"

diff --git a/src/wx/config_dialog.cc b/src/wx/config_dialog.cc
index ff0120ea83d5853a2e38d5590b6e85bbee3b24c6..1b96a1aaddb77f7a2a41e105262eab15a83f223d 100644 (file)
--- a/src/wx/config_dialog.cc
+++ b/src/wx/config_dialog.cc
@@ -1198,7 +1198,7 @@ private:
                _kdm_email = new wxTextCtrl (_panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (480, 128), wxTE_MULTILINE);
                _panel->GetSizer()->Add (_kdm_email, 1, wxEXPAND | wxALL, _border);
 
-               _reset_kdm_email = new wxButton (_panel, wxID_ANY, _("Reset to default text"));
+               _reset_kdm_email = new wxButton (_panel, wxID_ANY, _("Reset to default subject and text"));
                _panel->GetSizer()->Add (_reset_kdm_email, 0, wxEXPAND | wxALL, _border);
 
                _mail_server->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&KDMEmailPage::mail_server_changed, this));