X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic.cc;h=cd21d8080a05ae255e180f4d0d8409c3662644e9;hb=183b5597f73b85c0d6d29db8f6ed519386d07aa9;hp=af48c6bbfa1167041a91424a55700fde00cbb084;hpb=735348835742771e33e547d2f3d0a16ce81db32a;p=dcpomatic.git

diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc
index af48c6bbf..cd21d8080 100644
--- a/src/tools/dcpomatic.cc
+++ b/src/tools/dcpomatic.cc
@@ -46,10 +46,12 @@
 #include "wx/export_dialog.h"
 #include "wx/paste_dialog.h"
 #include "wx/focus_manager.h"
+#include "wx/html_dialog.h"
 #include "wx/initial_setup_dialog.h"
 #include "wx/send_i18n_dialog.h"
 #include "wx/i18n_hook.h"
 #include "lib/film.h"
+#include "lib/analytics.h"
 #include "lib/emailer.h"
 #include "lib/config.h"
 #include "lib/util.h"
@@ -87,6 +89,7 @@
 #include <wx/cmdline.h>
 #include <wx/preferences.h>
 #include <wx/splash.h>
+#include <wx/wxhtml.h>
 #ifdef __WXMSW__
 #include <shellapi.h>
 #endif
@@ -290,6 +293,8 @@ public:
 		_config_changed_connection = Config::instance()->Changed.connect (boost::bind (&DOMFrame::config_changed, this, _1));
 		config_changed (Config::OTHER);
 
+		_analytics_message_connection = Analytics::instance()->Message.connect(boost::bind(&DOMFrame::analytics_message, this, _1, _2));
+
 		Bind (wxEVT_MENU, boost::bind (&DOMFrame::file_new, this),                ID_file_new);
 		Bind (wxEVT_MENU, boost::bind (&DOMFrame::file_open, this),               ID_file_open);
 		Bind (wxEVT_MENU, boost::bind (&DOMFrame::file_save, this),               ID_file_save);
@@ -427,8 +432,8 @@ public:
 				);
 		}
 
-		for (list<string>::const_iterator i = notes.begin(); i != notes.end(); ++i) {
-			error_dialog (0, std_to_wx (*i));
+		BOOST_FOREACH (string i, notes) {
+			error_dialog (0, std_to_wx(i));
 		}
 
 		set_film (film);
@@ -1022,14 +1027,16 @@ private:
 			string body;
 			body += d->name() + "\n";
 			body += d->language() + "\n";
+			body += string(dcpomatic_version) + " " + string(dcpomatic_git_commit) + "\n";
+			body += "--\n";
 			map<string, string> translations = I18NHook::translations ();
 			for (map<string, string>::const_iterator i = translations.begin(); i != translations.end(); ++i) {
-				body += i->first + "\n" + i->second + "\n";
+				body += i->first + "\n" + i->second + "\n\n";
 			}
 			list<string> to;
 			to.push_back ("carl@dcpomatic.com");
 			Emailer emailer (d->email(), to, "DCP-o-matic translations", body);
-			emailer.send ("main.carlh.net", 2525);
+			emailer.send ("main.carlh.net", 2525, EMAIL_PROTOCOL_STARTTLS);
 		}
 
 		d->Destroy ();
@@ -1103,6 +1110,9 @@ private:
 		*/
 		_config_changed_connection.disconnect ();
 
+		/* Also stop hearing about analytics-related stuff */
+		_analytics_message_connection.disconnect ();
+
 		ev.Skip ();
 	}
 
@@ -1326,6 +1336,8 @@ private:
 
 		int pos = _history_position;
 
+		/* Clear out non-existant history items before we re-build the menu */
+		Config::instance()->clean_history ();
 		vector<boost::filesystem::path> history = Config::instance()->history ();
 
 		if (!history.empty ()) {
@@ -1343,6 +1355,8 @@ private:
 		}
 
 		_history_items = history.size ();
+
+		dcpomatic_log->set_types (Config::instance()->log_types());
 	}
 
 	void update_checker_state_changed ()
@@ -1397,6 +1411,13 @@ private:
 		_film_viewer->seek_by (_film_viewer->one_video_frame(), true);
 	}
 
+	void analytics_message (string title, string html)
+	{
+		HTMLDialog* d = new HTMLDialog(this, std_to_wx(title), std_to_wx(html));
+		d->ShowModal();
+		d->Destroy();
+	}
+
 	FilmEditor* _film_editor;
 	boost::shared_ptr<FilmViewer> _film_viewer;
 	StandardControls* _controls;
@@ -1412,6 +1433,7 @@ private:
 	int _history_position;
 	wxMenuItem* _history_separator;
 	boost::signals2::scoped_connection _config_changed_connection;
+	boost::signals2::scoped_connection _analytics_message_connection;
 	bool _update_news_requested;
 	shared_ptr<Content> _clipboard;
 };