X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fwx%2Fconfig_dialog.cc;h=f35c9adc9fc8288eea5944176de7c9ef01dd5dfb;hb=c658aec3ffd5009cbe7fa2540da5a0579e2f2e8c;hp=5b02d71e358a4f0e016ce6be3ef8efec222381ea;hpb=78a95b32af03460182abccc62c784e696cf53e17;p=dcpomatic.git

diff --git a/src/wx/config_dialog.cc b/src/wx/config_dialog.cc
index 5b02d71e3..f35c9adc9 100644
--- a/src/wx/config_dialog.cc
+++ b/src/wx/config_dialog.cc
@@ -227,7 +227,7 @@ private:
 	{
 		Config* config = Config::instance ();
 
-		checked_set (_set_language, config->language ());
+		checked_set (_set_language, static_cast<bool>(config->language()));
 
 		if (config->language().get_value_or ("") == "fr") {
 			checked_set (_language, 3);
@@ -388,7 +388,7 @@ private:
 		}
 
 		add_label_to_sizer (table, _panel, _("Default directory for new films"), true);
-#ifdef DCPOMATIC_USE_OWN_DIR_PICKER
+#ifdef DCPOMATIC_USE_OWN_PICKER
 		_directory = new DirPickerCtrl (_panel);
 #else
 		_directory = new wxDirPickerCtrl (_panel, wxDD_DIR_MUST_EXIST);
@@ -536,7 +536,7 @@ private:
 	wxSpinCtrl* _audio_delay;
 	wxButton* _isdcf_metadata_button;
 	wxSpinCtrl* _still_length;
-#ifdef DCPOMATIC_USE_OWN_DIR_PICKER
+#ifdef DCPOMATIC_USE_OWN_PICKER
 	DirPickerCtrl* _directory;
 #else
 	wxDirPickerCtrl* _directory;
@@ -1278,6 +1278,7 @@ public:
 		, _log_timing (0)
 		, _log_debug_decode (0)
 		, _log_debug_encode (0)
+		, _log_debug_email (0)
 	{}
 
 private:
@@ -1326,6 +1327,8 @@ private:
 			t->Add (_log_debug_decode, 1, wxEXPAND | wxALL);
 			_log_debug_encode = new wxCheckBox (_panel, wxID_ANY, _("Debug: encode"));
 			t->Add (_log_debug_encode, 1, wxEXPAND | wxALL);
+			_log_debug_email = new wxCheckBox (_panel, wxID_ANY, _("Debug: email sending"));
+			t->Add (_log_debug_email, 1, wxEXPAND | wxALL);
 			table->Add (t, 0, wxALL, 6);
 		}
 
@@ -1345,6 +1348,7 @@ private:
 		_log_timing->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&AdvancedPage::log_changed, this));
 		_log_debug_decode->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&AdvancedPage::log_changed, this));
 		_log_debug_encode->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&AdvancedPage::log_changed, this));
+		_log_debug_email->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&AdvancedPage::log_changed, this));
 #ifdef DCPOMATIC_WINDOWS
 		_win32_console->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&AdvancedPage::win32_console_changed, this));
 #endif
@@ -1357,12 +1361,13 @@ private:
 		checked_set (_maximum_j2k_bandwidth, config->maximum_j2k_bandwidth() / 1000000);
 		checked_set (_allow_any_dcp_frame_rate, config->allow_any_dcp_frame_rate ());
 		checked_set (_only_servers_encode, config->only_servers_encode ());
-		checked_set (_log_general, config->log_types() & Log::TYPE_GENERAL);
-		checked_set (_log_warning, config->log_types() & Log::TYPE_WARNING);
-		checked_set (_log_error, config->log_types() & Log::TYPE_ERROR);
-		checked_set (_log_timing, config->log_types() & Log::TYPE_TIMING);
-		checked_set (_log_debug_decode, config->log_types() & Log::TYPE_DEBUG_DECODE);
-		checked_set (_log_debug_encode, config->log_types() & Log::TYPE_DEBUG_ENCODE);
+		checked_set (_log_general, config->log_types() & LogEntry::TYPE_GENERAL);
+		checked_set (_log_warning, config->log_types() & LogEntry::TYPE_WARNING);
+		checked_set (_log_error, config->log_types() & LogEntry::TYPE_ERROR);
+		checked_set (_log_timing, config->log_types() & LogEntry::TYPE_TIMING);
+		checked_set (_log_debug_decode, config->log_types() & LogEntry::TYPE_DEBUG_DECODE);
+		checked_set (_log_debug_encode, config->log_types() & LogEntry::TYPE_DEBUG_ENCODE);
+		checked_set (_log_debug_email, config->log_types() & LogEntry::TYPE_DEBUG_EMAIL);
 #ifdef DCPOMATIC_WINDOWS
 		checked_set (_win32_console, config->win32_console());
 #endif
@@ -1387,22 +1392,25 @@ private:
 	{
 		int types = 0;
 		if (_log_general->GetValue ()) {
-			types |= Log::TYPE_GENERAL;
+			types |= LogEntry::TYPE_GENERAL;
 		}
 		if (_log_warning->GetValue ()) {
-			types |= Log::TYPE_WARNING;
+			types |= LogEntry::TYPE_WARNING;
 		}
 		if (_log_error->GetValue ())  {
-			types |= Log::TYPE_ERROR;
+			types |= LogEntry::TYPE_ERROR;
 		}
 		if (_log_timing->GetValue ()) {
-			types |= Log::TYPE_TIMING;
+			types |= LogEntry::TYPE_TIMING;
 		}
 		if (_log_debug_decode->GetValue ()) {
-			types |= Log::TYPE_DEBUG_DECODE;
+			types |= LogEntry::TYPE_DEBUG_DECODE;
 		}
 		if (_log_debug_encode->GetValue ()) {
-			types |= Log::TYPE_DEBUG_ENCODE;
+			types |= LogEntry::TYPE_DEBUG_ENCODE;
+		}
+		if (_log_debug_email->GetValue ()) {
+			types |= LogEntry::TYPE_DEBUG_EMAIL;
 		}
 		Config::instance()->set_log_types (types);
 	}
@@ -1423,6 +1431,7 @@ private:
 	wxCheckBox* _log_timing;
 	wxCheckBox* _log_debug_decode;
 	wxCheckBox* _log_debug_encode;
+	wxCheckBox* _log_debug_email;
 #ifdef DCPOMATIC_WINDOWS
 	wxCheckBox* _win32_console;
 #endif