diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-08-06 15:37:57 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-08-06 15:37:57 +0100 |
| commit | 04eebe07e2f64bd15f6887a10ab51fb92c52901a (patch) | |
| tree | 2004680de019a5871dd1c2bb5858ed9451232537 /src/wx | |
| parent | d8bce8328bd6e069cb9a69e7316100381eac0545 (diff) | |
| parent | 97a1a713078f151d1b68b6f256a5b885e7733a92 (diff) | |
Merge master.
Diffstat (limited to 'src/wx')
| -rw-r--r-- | src/wx/about_dialog.cc | 2 | ||||
| -rw-r--r-- | src/wx/config_dialog.cc | 12 |
2 files changed, 14 insertions, 0 deletions
diff --git a/src/wx/about_dialog.cc b/src/wx/about_dialog.cc index 9c7857c1e..1d9b03899 100644 --- a/src/wx/about_dialog.cc +++ b/src/wx/about_dialog.cc @@ -124,6 +124,7 @@ AboutDialog::AboutDialog (wxWindow* parent) supported_by.Add (wxT ("Cinema Clarici")); supported_by.Add (wxT ("Adam Colt")); supported_by.Add (wxT ("Matthias Damm")); + supported_by.Add (wxT ("Alexey Derevyanko")); supported_by.Add (wxT ("Andres Fink")); supported_by.Add (wxT ("Evan Freeze")); supported_by.Add (wxT ("Silvio Giuliano")); @@ -151,6 +152,7 @@ AboutDialog::AboutDialog (wxWindow* parent) supported_by.Add (wxT ("Lasse Salling")); supported_by.Add (wxT ("Mike Stiebing")); supported_by.Add (wxT ("Randy Stankey")); + supported_by.Add (wxT ("Bruce Taylor")); supported_by.Add (wxT ("Wolfgang Woehl")); supported_by.Add (wxT ("Wolfram Weber")); supported_by.Add (wxT ("Frank de Wulf")); diff --git a/src/wx/config_dialog.cc b/src/wx/config_dialog.cc index 8e27dc540..175ed94ad 100644 --- a/src/wx/config_dialog.cc +++ b/src/wx/config_dialog.cc @@ -1006,6 +1006,10 @@ public: add_label_to_sizer (table, panel, _("CC address"), true); _kdm_cc = new wxTextCtrl (panel, wxID_ANY); table->Add (_kdm_cc, 1, wxEXPAND | wxALL); + + add_label_to_sizer (table, panel, _("BCC address"), true); + _kdm_bcc = new wxTextCtrl (panel, wxID_ANY); + table->Add (_kdm_bcc, 1, wxEXPAND | wxALL); _kdm_email = new wxTextCtrl (panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (480, 128), wxTE_MULTILINE); s->Add (_kdm_email, 1, wxEXPAND | wxALL, _border); @@ -1026,6 +1030,8 @@ public: _kdm_from->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&KDMEmailPage::kdm_from_changed, this)); _kdm_cc->SetValue (std_to_wx (config->kdm_cc ())); _kdm_cc->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&KDMEmailPage::kdm_cc_changed, this)); + _kdm_bcc->SetValue (std_to_wx (config->kdm_bcc ())); + _kdm_bcc->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&KDMEmailPage::kdm_bcc_changed, this)); _kdm_email->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&KDMEmailPage::kdm_email_changed, this)); _kdm_email->SetValue (std_to_wx (Config::instance()->kdm_email ())); _reset_kdm_email->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&KDMEmailPage::reset_kdm_email, this)); @@ -1063,6 +1069,11 @@ private: { Config::instance()->set_kdm_cc (wx_to_std (_kdm_cc->GetValue ())); } + + void kdm_bcc_changed () + { + Config::instance()->set_kdm_bcc (wx_to_std (_kdm_bcc->GetValue ())); + } void kdm_email_changed () { @@ -1081,6 +1092,7 @@ private: wxTextCtrl* _kdm_subject; wxTextCtrl* _kdm_from; wxTextCtrl* _kdm_cc; + wxTextCtrl* _kdm_bcc; wxTextCtrl* _kdm_email; wxButton* _reset_kdm_email; }; |