diff --git a/addons/optionsmenu/ACE_Settings.hpp b/addons/optionsmenu/ACE_Settings.hpp index 9ebaf65095..0badbad660 100644 --- a/addons/optionsmenu/ACE_Settings.hpp +++ b/addons/optionsmenu/ACE_Settings.hpp @@ -6,4 +6,10 @@ class ACE_Settings { displayName = CSTRING(uiScaing); values[] = {"$str_medium", "$str_large", "$str_very_large"}; }; + class GVAR(showNewsOnMainMenu) { + value = 1; + typeName = "BOOL"; + isClientSettable = 1; + displayName = CSTRING(showNewsOnMainMenu_name); + }; }; diff --git a/addons/optionsmenu/gui/pauseMenu.hpp b/addons/optionsmenu/gui/pauseMenu.hpp index faa6104ece..14edaec598 100644 --- a/addons/optionsmenu/gui/pauseMenu.hpp +++ b/addons/optionsmenu/gui/pauseMenu.hpp @@ -108,15 +108,14 @@ class RscDisplayMain: RscStandardDisplay { }; class ACE_news: RscControlsGroupNoScrollbars { - idc = -1; + idc = 80086; x = "safezoneX + safezoneW - (31 * (((safezoneW / safezoneH) min 1.2) / 40))"; y = "safezoneY + (1 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25))"; w = "15 * (((safezoneW / safezoneH) min 1.2) / 40)"; - h = "16.5 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25)"; - class controls - { + h = "8.25 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25)"; + class controls { class ACE_NewsTitle: RscText { - text = "ACE News"; + text = CSTRING(aceNews); colorBackground[] = {(162/255),(28/255),(28/255),0.8}; idc = -1; x = "0 * ( ((safezoneW / safezoneH) min 1.2) / 40)"; @@ -124,29 +123,28 @@ class RscDisplayMain: RscStandardDisplay { w = "15 * ( ((safezoneW / safezoneH) min 1.2) / 40)"; h = "1 * ( ( ((safezoneW / safezoneH) min 1.2) / 1.2) / 25)"; }; - class ACE_VersionInfo: RscText - { + class ACE_VersionInfo: RscText { idc = 68; x = "0 * ( ((safezoneW / safezoneH) min 1.2) / 40)"; y = "1.1 * ( ( ((safezoneW / safezoneH) min 1.2) / 1.2) / 25)"; w = "15 * ( ((safezoneW / safezoneH) min 1.2) / 40)"; h = "1 * ( ( ((safezoneW / safezoneH) min 1.2) / 1.2) / 25)"; - colorBackground[] = {0,0,0,0.4}; + colorBackground[] = {0,0,0,0.666}; }; class ACE_NewsBackground: RscText { idc = -1; x = "0 * ( ((safezoneW / safezoneH) min 1.2) / 40)"; y = "2.2 * ( ( ((safezoneW / safezoneH) min 1.2) / 1.2) / 25)"; w = "15 * ( ((safezoneW / safezoneH) min 1.2) / 40)"; - h = "14 * ( ( ((safezoneW / safezoneH) min 1.2) / 1.2) / 25)"; - colorBackground[] = {0,0,0,0.4}; + h = "5.75 * ( ( ((safezoneW / safezoneH) min 1.2) / 1.2) / 25)"; + colorBackground[] = {0,0,0,0.666}; }; class ACE_NewsText: RscHTML { idc = 69; x = "0 * ( ((safezoneW / safezoneH) min 1.2) / 40)"; y = "2.1 * ( ( ((safezoneW / safezoneH) min 1.2) / 1.2) / 25)"; w = "15 * ( ((safezoneW / safezoneH) min 1.2) / 40)"; - h = "14.2 * ( ( ((safezoneW / safezoneH) min 1.2) / 1.2) / 25)"; + h = "5.95 * ( ( ((safezoneW / safezoneH) min 1.2) / 1.2) / 25)"; shadow = 0; class H1 { diff --git a/addons/optionsmenu/script_loadMainMenuBox.sqf b/addons/optionsmenu/script_loadMainMenuBox.sqf index d631d6b04b..9c556e5128 100644 --- a/addons/optionsmenu/script_loadMainMenuBox.sqf +++ b/addons/optionsmenu/script_loadMainMenuBox.sqf @@ -18,8 +18,14 @@ if (missionNamespace getVariable [QGVAR(newsLoaded), false]) exitWith {}; GVAR(newsLoaded) = true; -private ["_version"]; -_version = getText (configFile >> "CfgPatches" >> "ace_main" >> "versionStr"); +//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 80086) ctrlShow true; -((_this select 0) displayCtrl 68) ctrlSetText format ["Installed Version: %1", _version]; -((_this select 0) displayCtrl 69) htmlLoad "http://ace3mod.com/version.html"; + private ["_version"]; + _version = getText (configFile >> "CfgPatches" >> "ace_main" >> "versionStr"); + ((_this select 0) displayCtrl 68) ctrlSetText format ["Installed Version: %1", _version]; + ((_this select 0) displayCtrl 69) htmlLoad "http://ace3mod.com/version.html"; +} else { + ((_this select 0) displayCtrl 80086) ctrlShow false; +}; diff --git a/addons/optionsmenu/stringtable.xml b/addons/optionsmenu/stringtable.xml index 9bdb914216..d8e51c8b64 100644 --- a/addons/optionsmenu/stringtable.xml +++ b/addons/optionsmenu/stringtable.xml @@ -315,5 +315,11 @@ Sends debug information to RPT and clipboard. WysyƂa informacje o debugowaniu do RPT oraz schowka. + + ACE News + + + Show News on Main Menu +