X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fconfig_dialog.cc;h=306e1f208ca7874ae883d4a24e3dce9af11548e5;hb=1f82930e73679d6aec5223caa255f564339a1a2a;hp=94ab0597b4239b463ce4f79bfb1925a7ebc3c939;hpb=f0edd6ab35c3c2b7800a26ec8206adab75e5f633;p=dcpomatic.git

diff --git a/src/wx/config_dialog.cc b/src/wx/config_dialog.cc
index 94ab0597b..306e1f208 100644
--- a/src/wx/config_dialog.cc
+++ b/src/wx/config_dialog.cc
@@ -267,6 +267,10 @@ public:
 		add_label_to_sizer (table, panel, _("Default ISDCF name details"), true);
 		_isdcf_metadata_button = new wxButton (panel, wxID_ANY, _("Edit..."));
 		table->Add (_isdcf_metadata_button);
+
+		add_label_to_sizer (table, panel, _("Default scale to"), true);
+		_scale = new wxChoice (panel, wxID_ANY);
+		table->Add (_scale);
 		
 		add_label_to_sizer (table, panel, _("Default container"), true);
 		_container = new wxChoice (panel, wxID_ANY);
@@ -316,6 +320,10 @@ public:
 		vector<Ratio const *> ratio = Ratio::all ();
 		int n = 0;
 		for (vector<Ratio const *>::iterator i = ratio.begin(); i != ratio.end(); ++i) {
+			_scale->Append (std_to_wx ((*i)->nickname ()));
+			if (*i == config->default_scale ()) {
+				_scale->SetSelection (n);
+			}
 			_container->Append (std_to_wx ((*i)->nickname ()));
 			if (*i == config->default_container ()) {
 				_container->SetSelection (n);
@@ -323,6 +331,7 @@ public:
 			++n;
 		}
 		
+		_scale->Bind (wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&DefaultsPage::scale_changed, this));
 		_container->Bind (wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&DefaultsPage::container_changed, this));
 		
 		vector<DCPContentType const *> const ct = DCPContentType::all ();
@@ -381,6 +390,12 @@ private:
 	{
 		Config::instance()->set_default_still_length (_still_length->GetValue ());
 	}
+
+	void scale_changed ()
+	{
+		vector<Ratio const *> ratio = Ratio::all ();
+		Config::instance()->set_default_scale (ratio[_scale->GetSelection()]);
+	}
 	
 	void container_changed ()
 	{
@@ -417,6 +432,7 @@ private:
 #else
 	wxDirPickerCtrl* _directory;
 #endif
+	wxChoice* _scale;
 	wxChoice* _container;
 	wxChoice* _dcp_content_type;
 	wxTextCtrl* _issuer;
@@ -650,7 +666,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);
@@ -670,13 +686,24 @@ 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);
 		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 ()));
@@ -685,10 +712,15 @@ 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 ()));
+		_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 ()));
+		_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));
 
 		return panel;
 	}
@@ -708,22 +740,41 @@ 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 ()
 	{
 		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_subject;
 	wxTextCtrl* _kdm_from;
+	wxTextCtrl* _kdm_cc;
 	wxTextCtrl* _kdm_email;
+	wxButton* _reset_kdm_email;
 };
 
 class AdvancedPage : public wxStockPreferencesPage, public Page