Ticket #4391: splashscreen.patch

binaries/data/mods/public/gui/options/options.json

@@ -28 +28 @@
         {
             "type": "boolean",
             "label": "Disable Welcome Screen",
-            "tooltip": "If you disable this screen completely, you may miss important announcements.\nYou can still launch it using the main menu.",
+            "tooltip": "If you disable this screen, you may miss important announcements. It will nonetheless be reenabled when a new version is available and you can always launch it from the main menu.",
             "parameters": { "config": "splashscreendisable" }
         },
         {

binaries/data/mods/public/gui/pregame/mainmenu.js

@@ -128 +128 @@
     {
         g_ShowSplashScreens = false;
 
-        if (Engine.ConfigDB_GetValue("user", "splashscreendisable") !== "true" &&
+        if (Engine.ConfigDB_GetValue("user", "splashscreendisable") !== "true" ||
             Engine.ConfigDB_GetValue("user", "splashscreenversion") < Engine.GetFileMTime("gui/splashscreen/splashscreen.txt"))
             Engine.PushGuiPage("page_splashscreen.xml", { "page": "splashscreen", callback : "SplashScreenClosedCallback" } );
         else

binaries/data/mods/public/gui/splashscreen/splashscreen.js

@@ -1 +1 @@
 function init(data)
 {
     Engine.GetGUIObjectByName("mainText").caption = Engine.TranslateLines(Engine.ReadFile("gui/splashscreen/" + data.page + ".txt"));
-    Engine.GetGUIObjectByName("displaySplashScreen").checked = (Engine.ConfigDB_GetValue("user", "splashscreenversion") < Engine.GetFileMTime("gui/splashscreen/splashscreen.txt"));
+    Engine.GetGUIObjectByName("displaySplashScreen").checked = Engine.ConfigDB_GetValue("user", "splashscreendisable") !== "true";
 }

binaries/data/mods/public/gui/splashscreen/splashscreen.xml

@@ -16 +16 @@
             <object name="displaySplashScreenText" size="30 100%-30 100% 100%-8" type="text" style="ModernLeftLabelText">
                 <translatableAttribute id="caption">Show this message in the future</translatableAttribute>
             </object>
-            <object name="displaySplashScreen" size="8 100%-30 22 100%-8" type="checkbox" style="ModernTickBox"/>
+            <object name="displaySplashScreen" size="8 100%-30 22 100%-8" type="checkbox" style="ModernTickBox">
+                <action on="Press">
+                    let disabled = "" + !this.checked;
+                    Engine.ConfigDB_CreateValue("user", "splashscreendisable", disabled);
+                    Engine.ConfigDB_WriteValueToFile("user", "splashscreendisable", disabled, "config/user.cfg");
+                </action>
+            </object>
         </object>
         <object type="button" style="ModernButtonRed" size="50%+5 100%-45 100%-18 100%-17">
             <translatableAttribute id="caption">Known Issues (web)</translatableAttribute>
@@ -27 +33 @@
         <object name="btnOK" type="button" style="ModernButtonRed" size="18 100%-45 50%-5 100%-17" hotkey="cancel">
             <translatableAttribute id="caption">OK</translatableAttribute>
             <action on="Press"><![CDATA[
-            let version = Engine.GetGUIObjectByName("displaySplashScreen").checked ? 0 : Engine.GetFileMTime("gui/splashscreen/splashscreen.txt");
+            let version = Engine.GetFileMTime("gui/splashscreen/splashscreen.txt");
             Engine.ConfigDB_CreateValue("user", "splashscreenversion", version);
             Engine.ConfigDB_WriteValueToFile("user", "splashscreenversion", version, "config/user.cfg");
             Engine.PopGuiPageCB();