diff options
Diffstat (limited to 'src/wx/config_dialog.cc')
| -rw-r--r-- | src/wx/config_dialog.cc | 27 |
1 files changed, 25 insertions, 2 deletions
diff --git a/src/wx/config_dialog.cc b/src/wx/config_dialog.cc index 94ab0597b..b25b470c1 100644 --- a/src/wx/config_dialog.cc +++ b/src/wx/config_dialog.cc @@ -650,7 +650,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); @@ -674,9 +674,16 @@ public: add_label_to_sizer (table, panel, _("From address"), true); _kdm_from = new wxTextCtrl (panel, wxID_ANY); table->Add (_kdm_from, 1, wxEXPAND | wxALL); + + add_label_to_sizer (table, panel, _("CC address"), true); + _kdm_cc = new wxTextCtrl (panel, wxID_ANY); + table->Add (_kdm_cc, 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 ())); @@ -687,8 +694,11 @@ public: _mail_password->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&KDMEmailPage::mail_password_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 ())); + _kdm_cc->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&KDMEmailPage::kdm_cc_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; } @@ -714,16 +724,29 @@ private: Config::instance()->set_kdm_from (wx_to_std (_kdm_from->GetValue ())); } + void kdm_cc_changed () + { + Config::instance()->set_kdm_cc (wx_to_std (_kdm_cc->GetValue ())); + } + void kdm_email_changed () { 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_cc; wxTextCtrl* _kdm_email; + wxButton* _reset_kdm_email; }; class AdvancedPage : public wxStockPreferencesPage, public Page |