X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic.cc;h=dcf6d7f4909d0f826b369654935197e5170c4f88;hb=eac0a05d568486b503a3e37f89a6f5cf38cfeeeb;hp=7b5696a1c1581b8007a4a69a8160d68b38fe1065;hpb=123854f87845e030f7b72c7edddb6b5e48242d41;p=dcpomatic.git

diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc
index 7b5696a1c..dcf6d7f49 100644
--- a/src/tools/dcpomatic.cc
+++ b/src/tools/dcpomatic.cc
@@ -457,6 +457,7 @@ public:
 		}
 		if (_film) {
 			_film->Change.connect (boost::bind (&DOMFrame::film_change, this, _1));
+			_film->Message.connect (boost::bind(&DOMFrame::film_message, this, _1));
 		}
 	}
 
@@ -466,6 +467,11 @@ public:
 
 private:
 
+	void film_message (string m)
+	{
+		message_dialog (this, std_to_wx(m));
+	}
+
 	void film_change (ChangeType type)
 	{
 		if (type == CHANGE_TYPE_DONE) {
@@ -699,9 +705,9 @@ private:
 		if (!_film->should_be_enough_disk_space (required, available, can_hard_link)) {
 			wxString message;
 			if (can_hard_link) {
-				message = wxString::Format (_("The DCP for this film will take up about %.1f Gb, and the disk that you are using only has %.1f Gb available.  Do you want to continue anyway?"), required, available);
+				message = wxString::Format (_("The DCP for this film will take up about %.1f GB, and the disk that you are using only has %.1f GB available.  Do you want to continue anyway?"), required, available);
 			} else {
-				message = wxString::Format (_("The DCP and intermediate files for this film will take up about %.1f Gb, and the disk that you are using only has %.1f Gb available.  You would need half as much space if the filesystem supported hard links, but it does not.  Do you want to continue anyway?"), required, available);
+				message = wxString::Format (_("The DCP and intermediate files for this film will take up about %.1f GB, and the disk that you are using only has %.1f GB available.  You would need half as much space if the filesystem supported hard links, but it does not.  Do you want to continue anyway?"), required, available);
 			}
 			if (!confirm_dialog (this, message)) {
 				return;
@@ -1016,9 +1022,11 @@ 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");
@@ -1210,7 +1218,7 @@ private:
 		_history_position = _file_menu->GetMenuItems().GetCount();
 
 		_file_menu->AppendSeparator ();
-		add_item (_file_menu, _("&Close"), ID_file_close, NEEDS_FILM);
+		add_item (_file_menu, _("&Close\tCtrl-W"), ID_file_close, NEEDS_FILM);
 
 #ifndef __WXOSX__
 		_file_menu->AppendSeparator ();
@@ -1320,6 +1328,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 ()) {
@@ -1337,6 +1347,8 @@ private:
 		}
 
 		_history_items = history.size ();
+
+		dcpomatic_log->set_types (Config::instance()->log_types());
 	}
 
 	void update_checker_state_changed ()