diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-07-16 14:30:02 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-07-16 14:30:02 +0100 |
| commit | 94201bd2a5a4cb391b7f2bdeba56b928fed7cfe1 (patch) | |
| tree | d915d31c0b13f7201e3bc62a66fec150baa9ddf8 /src/wx/config_dialog.cc | |
| parent | 2154e7c39166cfc4b128545d94a5698c7d70daea (diff) | |
| parent | 5d06efadc0cc88c38a3ab3a44ef676f89ae2e43c (diff) | |
Merge remote-tracking branch 'origin/master' into 2.0
Diffstat (limited to 'src/wx/config_dialog.cc')
| -rw-r--r-- | src/wx/config_dialog.cc | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/wx/config_dialog.cc b/src/wx/config_dialog.cc index fc77b42a2..360e80572 100644 --- a/src/wx/config_dialog.cc +++ b/src/wx/config_dialog.cc @@ -670,6 +670,10 @@ public: font.SetPointSize (font.GetPointSize() - 1); plain->SetFont (font); table->AddSpacer (0); + + add_label_to_sizer (table, panel, _("Subject"), true); + _kdm_subject = new wxTextCtrl (panel, wxID_ANY); + table->Add (_kdm_subject, 1, wxEXPAND | wxALL); add_label_to_sizer (table, panel, _("From address"), true); _kdm_from = new wxTextCtrl (panel, wxID_ANY); @@ -692,6 +696,8 @@ public: _mail_user->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&KDMEmailPage::mail_user_changed, this)); _mail_password->SetValue (std_to_wx (config->mail_password ())); _mail_password->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&KDMEmailPage::mail_password_changed, this)); + _kdm_subject->SetValue (std_to_wx (config->kdm_subject ())); + _kdm_subject->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&KDMEmailPage::kdm_subject_changed, this)); _kdm_from->SetValue (std_to_wx (config->kdm_from ())); _kdm_from->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&KDMEmailPage::kdm_from_changed, this)); _kdm_cc->SetValue (std_to_wx (config->kdm_cc ())); @@ -718,6 +724,11 @@ private: { Config::instance()->set_mail_password (wx_to_std (_mail_password->GetValue ())); } + + void kdm_subject_changed () + { + Config::instance()->set_kdm_subject (wx_to_std (_kdm_subject->GetValue ())); + } void kdm_from_changed () { @@ -743,6 +754,7 @@ private: wxTextCtrl* _mail_server; wxTextCtrl* _mail_user; wxTextCtrl* _mail_password; + wxTextCtrl* _kdm_subject; wxTextCtrl* _kdm_from; wxTextCtrl* _kdm_cc; wxTextCtrl* _kdm_email; |