tweak ACE main menu info box

addons/optionsmenu/config.cpp

@@ -22,7 +22,6 @@ class CfgAddons {
     };
 };
 
-
 #include "CfgEventHandlers.hpp"
 #include "gui\define.hpp"
 #include "gui\settingsMenu.hpp"
@@ -35,7 +34,6 @@ class ACE_Extensions {
     extensions[] += {"ace_clipboard"};
 };
 
-
 class CfgCommands {
     allowedHTMLLoadURIs[] += {
         "http://ace3mod.com/version.html"

addons/optionsmenu/gui/pauseMenu.hpp

@@ -45,7 +45,7 @@ class ACE_Open_SettingsMenu_BtnBase : ACE_gui_buttonBase {
     colorDisabled[] = {1,1,1,0.25};
     colorFocused[] = {0,0,0,1};
     colorText[] = {1,1,1,1};
-    default = 0;
+    //default = 0;
     font = "RobotoCondensed";
     idc = -1;
     period = 1.2;
@@ -80,66 +80,60 @@ class RscDisplayMPInterrupt: RscStandardDisplay {
         class ACE_Open_settingsMenu_Btn: ACE_Open_SettingsMenu_BtnBase {};
     };
 };
+
 class RscDisplayInterruptEditorPreview: RscStandardDisplay {
     class controls {
         class ACE_Open_settingsMenu_Btn: ACE_Open_SettingsMenu_BtnBase {};
     };
 };
+
 class RscDisplayInterrupt: RscStandardDisplay {
     class controls {
         class ACE_Open_settingsMenu_Btn: ACE_Open_SettingsMenu_BtnBase {};
     };
 };
+
 class RscDisplayInterruptEditor3D: RscStandardDisplay {
     class controls {
         class ACE_Open_settingsMenu_Btn: ACE_Open_SettingsMenu_BtnBase {};
     };
 };
+
 class RscDisplayMovieInterrupt: RscStandardDisplay {
     class controls {
         class ACE_Open_settingsMenu_Btn: ACE_Open_SettingsMenu_BtnBase {};
     };
 };
+
 class RscDisplayMain: RscStandardDisplay {
     class controls {
-        class ACE_news_apex: RscControlsGroupNoHScrollbars {
+        class InfoMods: RscControlsGroupNoHScrollbars {
-            idc = 80090;
+            class Controls;
-            x = "safezoneX + safezoneW - 10 * (pixelW * pixelGrid * 2) - (4 * pixelH)";
-            y = "safezoneY + safezoneH - (3 * 2 + 1) * (pixelH * pixelGrid * 2) - 3 * (4 * pixelH)";
-            w = "10 * (pixelW * pixelGrid * 2)";
-            h = "2 * (pixelH * pixelGrid * 2)";
-            class Controls {
-                class Background: RscPicture {
-                    idc = 80091;
-                    text = "\a3\Ui_f\data\GUI\Rsc\RscDisplayMain\gradientMods_ca.paa";
-                    colorText[] = {0,0,0,0.75};
-                    x = "(10 - 4 * 2) * (pixelW * pixelGrid * 2)";
-                    y = 0;
-                    w = "4 * 2 * (pixelW * pixelGrid * 2)";
-                    h = "2 * (pixelH * pixelGrid * 2)";
-                    angle = 180;
         };
-                class BackgroundIcon: RscPicture {
+
-                    idc = 80092;
+        class InfoNews: InfoMods {
-                    text = "\a3\Ui_f\data\GUI\Rsc\RscDisplayMain\backgroundModsIcon_ca.paa";
+            class Controls: Controls {
-                    colorText[] = {0,0,0,0.75};
+                class Background;
-                    x = "(10 - 2 * 2) * (pixelW * pixelGrid * 2)";
+                class BackgroundIcon;
-                    y = 0;
+                class Icon;
-                    w = "2 * 2 * (pixelW * pixelGrid * 2)";
+                class News;
-                    h = "2 * (pixelH * pixelGrid * 2)";
+                class Notification;
-                    angle = 180;
+                class Button;
             };
-                class Icon: RscPicture {
+        };
-                    idc = 80093;
+
+        class ACE_news_apex: InfoNews {
+            idc = IDC_MAIN_INFO;
+            y = "safezoneY + safezoneH - (3 * 2 + 1) * (pixelH * pixelGrid * 2) - 4 * (4 * pixelH)";
+
+            class Controls: Controls {
+                class Background: Background {};
+                class BackgroundIcon: BackgroundIcon {};
+                class Icon: Icon {
                     text = QPATHTOF(gui\aceMenuIcon_ca.paa);
-                    colorText[] = {1,1,1,0.5};
-                    x = "(10 - 2) * (pixelW * pixelGrid * 2)";
-                    y = 0;
-                    w = "2 * (pixelW * pixelGrid * 2)";
-                    h = "2 * (pixelH * pixelGrid * 2)";
                 };
                 class CurrentVersionInfo: RscText {
-                    idc = 80094;
+                    idc = IDC_MAIN_INFO_CURRENT_VERSION_INFO;
                     style = 1;
                     text = "";
                     sizeEx = "(pixelH * pixelGrid * 1.5)";
@@ -149,12 +143,13 @@ class RscDisplayMain: RscStandardDisplay {
                     x = 0;
                     y = 0;
                     w = "(10 - 1.25 * 2) * (pixelW * pixelGrid * 2)";
-                    h = "2 * (pixelH * pixelGrid * 1)";
+                    h = "1 * (pixelH * pixelGrid * 2)";
                     onLoad = "(_this select 0) ctrlenable false;";
                 };
                 class HTTPVersionInfo: RscHTML {
-                    idc = 80095;
+                    idc = IDC_MAIN_INFO_NEWEST_VERSION_INFO;
                     shadow = 0;
+
                     class H1 {
                         sizeEx = "(pixelH * pixelGrid * 1.5)";
                         font = "RobotoCondensedLight";
@@ -167,24 +162,16 @@ class RscDisplayMain: RscStandardDisplay {
                     class P: H1 {
                         sizeEx = "(pixelH * pixelGrid * 1.5)";
                     };
+
                     x = 0;
-                    y = "2 * (pixelH * pixelGrid * 1)";
+                    y = "1 * (pixelH * pixelGrid * 2)";
                     w = "(10 - 1.25 * 2) * (pixelW * pixelGrid * 2)";
-                    h = "2 * (pixelH * pixelGrid * 1)";
+                    h = "1 * (pixelH * pixelGrid * 2)";
                     onLoad = "(_this select 0) ctrlenable false;";
                 };
-                class Button: RscButtonMenu {
+                class Button: Button {
-                    idc = 80096;
-                    colorBackground[] = {0,0,0,0};
-                    colorBackgroundFocused[] = {0,0,0,0};
-                    colorBackground2[] = {0,0,0,0};
-                    x = 0;
-                    y = 0;
-                    w = "10 * (pixelW * pixelGrid * 2)";
-                    h = "2 * (pixelH * pixelGrid * 2)";
-
                     tooltip = "Download latest and report issues:";
-                    url = "https://github.com/acemod/ACE3";
+                    url = "https://github.com/acemod/ACE3/releases";
                 };
             };
         };

addons/optionsmenu/init_loadMainMenuBox.sqf

@@ -13,17 +13,47 @@
  *
  * Public: No
  */
+#include "\a3\ui_f\hpp\defineResinclDesign.inc"
 #include "script_component.hpp"
 
+params ["_display"];
+private _controlsGroup = _display displayCtrl IDC_MAIN_INFO;
+
 //Need to load from profileNamespace because ace_settings might not be init if world = empty
 if (profileNamespace getVariable [QGVAR(showNewsOnMainMenu), true]) then {
-    ((_this select 0) displayCtrl 80090) ctrlShow true;
+    _controlsGroup ctrlShow true;
 
-    private _ace3VersionStr = (getText (configFile >> "CfgPatches" >> "ace_main" >> "versionStr")) select [0,5];
+    private _fnc_onSetFocus = {
-    ((_this select 0) displayCtrl 80094) ctrlSetText format ["Version: %1", _ace3VersionStr];
+        params ["_control"];
-    ((_this select 0) displayCtrl 80095) htmlLoad "http://ace3mod.com/version.html";
+        private _controlsGroup = ctrlParentControlsGroup _control;
+
+        (_controlsGroup controlsGroupCtrl IDC_MAIN_INFO_BACKGROUND) ctrlSetTextColor [1,1,1,0.75];
+        (_controlsGroup controlsGroupCtrl IDC_MAIN_INFO_BACKGROUND_ICON) ctrlSetTextColor [1,1,1,0.75];
+        (_controlsGroup controlsGroupCtrl IDC_MAIN_INFO_ICON) ctrlSetTextColor [0,0,0,1];
+    };
+
+    private _fnc_onKillFocus = {
+        params ["_control"];
+        private _controlsGroup = ctrlParentControlsGroup _control;
+
+        (_controlsGroup controlsGroupCtrl IDC_MAIN_INFO_BACKGROUND) ctrlSetTextColor [0,0,0,0.75];
+        (_controlsGroup controlsGroupCtrl IDC_MAIN_INFO_BACKGROUND_ICON) ctrlSetTextColor [0,0,0,0.75];
+        (_controlsGroup controlsGroupCtrl IDC_MAIN_INFO_ICON) ctrlSetTextColor [1,1,1,0.5];
+    };
+
+    (_controlsGroup controlsGroupCtrl IDC_MAIN_INFO_BUTTON) ctrlAddEventHandler ["MouseEnter", _fnc_onSetFocus];
+    (_controlsGroup controlsGroupCtrl IDC_MAIN_INFO_BUTTON) ctrlAddEventHandler ["SetFocus", _fnc_onSetFocus];
+    (_controlsGroup controlsGroupCtrl IDC_MAIN_INFO_BUTTON) ctrlAddEventHandler ["MouseExit", _fnc_onKillFocus];
+    (_controlsGroup controlsGroupCtrl IDC_MAIN_INFO_BUTTON) ctrlAddEventHandler ["KillFocus", _fnc_onKillFocus];
+
+    private _versionStr = getText (configFile >> "CfgPatches" >> "ace_main" >> "versionStr") splitString ".";
+    _versionStr resize 3; // MAJOR, MINOR, PATCH
+    _versionStr = _versionStr joinString ".";
+
+    (_display displayCtrl IDC_MAIN_INFO_CURRENT_VERSION_INFO) ctrlSetText format ["Version: %1", _versionStr];
+    (_display displayCtrl IDC_MAIN_INFO_NEWEST_VERSION_INFO) htmlLoad "http://ace3mod.com/version.html";
 } else {
-    ((_this select 0) displayCtrl 80090) ctrlShow false;
+    _controlsGroup ctrlShow false;
 };
 
 /*

addons/optionsmenu/script_component.hpp

@@ -17,6 +17,10 @@
 
 #include "\z\ace\addons\main\script_macros.hpp"
 
+#define IDC_MAIN_INFO 80090
+#define IDC_MAIN_INFO_CURRENT_VERSION_INFO 80091
+#define IDC_MAIN_INFO_NEWEST_VERSION_INFO 80092
+
 #define MENU_TAB_OPTIONS 0
 #define MENU_TAB_COLORS 1