summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2015-11-02 23:12:25 +0000
committerCarl Hetherington <cth@carlh.net>2015-11-02 23:12:25 +0000
commit6375630ffda16b52498ee43fe682ee4c3185ab82 (patch)
treea92c05b0b2383ef602cdf7da9cd125c4a5be9e14 /src
parent5cf688df60ee98e78010a407a18d5e9cf9fdcab3 (diff)
Reset KDM email subject as well as body; fix erroneous initial subject.
Diffstat (limited to 'src')
-rw-r--r--src/lib/config.cc3
-rw-r--r--src/wx/config_dialog.cc2
2 files changed, 3 insertions, 2 deletions
diff --git a/src/lib/config.cc b/src/lib/config.cc
index 07c9b9c89..43a3e63c9 100644
--- 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 ff0120ea8..1b96a1aad 100644
--- 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));