Merge 'remotes/trunk'

binaries/data/config/default.cfg

@@ -433,6 +433,14 @@ delay = 200                          ; Duration in milliseconds that is waited b
 [mod]
 enabledmods = "mod public"
 
+[modio]
+public_key = "RWQBhIRg+dOifTWlwgYHe8RfD8bqoDh1cCvygboAl3GOUKiCo0NlF4fw" ; Public key corresponding to the private key valid mods are signed with
+
+[modio.v1]
+baseurl = "https://api.mod.io/v1"
+api_key = "23df258a71711ea6e4b50893acc1ba55"
+name_id = "0ad"
+
 [network]
 duplicateplayernames = false      ; Rename joining player to "User (2)" if "User" is already connected, otherwise prohibit join.
 lateobservers = everyone          ; Allow observers to join the game after it started. Possible values: everyone, buddies, disabled.

binaries/data/mods/mod/gui/common/functions_msgbox.js

@@ -0,0 +1,48 @@
+// We want to pass callback functions for the different buttons in a convenient way.
+// Because passing functions accross compartment boundaries is a pain, we just store them here together with some optional arguments.
+// The messageBox page will return the code of the pressed button and the according function will be called.
+var g_MessageBoxBtnFunctions = [];
+var g_MessageBoxCallbackArgs = [];
+
+function messageBoxCallbackFunction(btnCode)
+{
+	if (btnCode !== undefined && g_MessageBoxBtnFunctions[btnCode])
+	{
+		// Cache the variables to make it possible to call a messageBox from a callback function.
+		let callbackFunction = g_MessageBoxBtnFunctions[btnCode];
+		let callbackArgs = g_MessageBoxCallbackArgs[btnCode];
+
+		g_MessageBoxBtnFunctions = [];
+		g_MessageBoxCallbackArgs = [];
+
+		if (callbackArgs !== undefined)
+			callbackFunction(callbackArgs);
+		else
+			callbackFunction();
+		return;
+	}
+
+	g_MessageBoxBtnFunctions = [];
+	g_MessageBoxCallbackArgs = [];
+};
+
+function messageBox(mbWidth, mbHeight, mbMessage, mbTitle, mbButtonCaptions, mbBtnCode, mbCallbackArgs)
+{
+	if (g_MessageBoxBtnFunctions && g_MessageBoxBtnFunctions.length)
+	{
+		warn("A messagebox was called when a previous callback function is still set, aborting!");
+		return;
+	}
+
+	g_MessageBoxBtnFunctions = mbBtnCode;
+	g_MessageBoxCallbackArgs = mbCallbackArgs || g_MessageBoxCallbackArgs;
+
+	Engine.PushGuiPage("page_msgbox.xml", {
+		"width": mbWidth,
+		"height": mbHeight,
+		"message": mbMessage,
+		"title": mbTitle,
+		"buttonCaptions": mbButtonCaptions,
+		"callback": mbBtnCode && "messageBoxCallbackFunction"
+	});
+}

binaries/data/mods/mod/gui/common/l10n.js

@@ -1,3 +1,51 @@
+/**
+ * @param filesize - In bytes.
+ * @return Object with quantized filesize and suitable unit of size.
+ */
+function filesizeToObj(filesize)
+{
+	// We are unlikely to download files measured in units greater than GiB.
+	let units = [
+		translateWithContext("filesize unit", "B"),
+		translateWithContext("filesize unit", "KiB"),
+		translateWithContext("filesize unit", "MiB"),
+		translateWithContext("filesize unit", "GiB")
+	];
+
+	let i = 0;
+	while (i < units.length - 1)
+	{
+		if (filesize < 1024)
+			break;
+		filesize /= 1024;
+		++i;
+	}
+
+	return {
+		"filesize": filesize.toFixed(i == 0 ? 0 : 1),
+		"unit": units[i]
+	};
+}
+
+function filesizeToString(filesize)
+{
+	// Translation: For example: 123.4 KiB
+	return sprintf(translate("%(filesize)s %(unit)s"), filesizeToObj(filesize));
+}
+
+/**
+ * Convert time in milliseconds to [HH:]mm:ss string representation.
+ *
+ * @param time Time period in milliseconds (integer)
+ * @return String representing time period
+ */
+function timeToString(time)
+{
+	return Engine.FormatMillisecondsIntoDateStringGMT(time, time < 1000 * 60 * 60 ?
+		// Translation: Time-format string. See http://userguide.icu-project.org/formatparse/datetime for a guide to the meaning of the letters.
+		translate("mm:ss") : translate("HH:mm:ss"));
+}
+
 /**
  * These functions rely on the JS cache where possible and
  * should be prefered over the Engine.Translate ones to optimize the performance.
@@ -44,7 +92,7 @@ function translatePlural(singularMessage, pluralMessage, number)
 function translateWithContext(context, message)
 {
 	if (!g_TranslationsWithContext[context])
-		g_TranslationsWithContext[context] = {}
+		g_TranslationsWithContext[context] = {};
 
 	if (!g_TranslationsWithContext[context][message])
 		g_TranslationsWithContext[context][message] = Engine.TranslateWithContext(context, message);