From 1b86f909e862329bd54c4390d898af4fe8d09405 Mon Sep 17 00:00:00 2001 From: johnb432 <58661205+johnb432@users.noreply.github.com> Date: Mon, 11 Dec 2023 18:05:22 +0100 Subject: [PATCH] General - Removed silent Options Menu dependencies (#9677) Co-authored-by: PabstMirror --- addons/cargo/initSettings.inc.sqf | 14 +- addons/common/initSettings.inc.sqf | 4 +- addons/common/stringtable.xml | 119 +++++++++++++++ addons/optionsmenu/stringtable.xml | 135 ------------------ addons/rearm/initSettings.inc.sqf | 2 +- addons/refuel/initSettings.inc.sqf | 2 +- addons/towing/initSettings.inc.sqf | 2 +- .../modularity-and-pbo-structure.md | 2 +- 8 files changed, 133 insertions(+), 147 deletions(-) diff --git a/addons/cargo/initSettings.inc.sqf b/addons/cargo/initSettings.inc.sqf index 495d11db35..2f9fd94024 100644 --- a/addons/cargo/initSettings.inc.sqf +++ b/addons/cargo/initSettings.inc.sqf @@ -1,8 +1,10 @@ +private _category = [ELSTRING(main,Category_Logistics), LSTRING(openMenu)]; + [ QGVAR(enable), "CHECKBOX", [LSTRING(ModuleSettings_enable), LSTRING(ModuleSettings_enable_Description)], - [ELSTRING(OptionsMenu,CategoryLogistics), LSTRING(openMenu)], + _category, true, true, {[QGVAR(enable), _this] call EFUNC(common,cbaSettings_settingChanged)} @@ -12,7 +14,7 @@ QGVAR(loadTimeCoefficient), "SLIDER", [LSTRING(loadTimeCoefficient), LSTRING(loadTimeCoefficient_description)], - [ELSTRING(OptionsMenu,CategoryLogistics), LSTRING(openMenu)], + _category, [0, 10, 5, 1], true, {[QGVAR(loadTimeCoefficient), _this, true] call EFUNC(common,cbaSettings_settingChanged)} @@ -22,7 +24,7 @@ QGVAR(paradropTimeCoefficent), "SLIDER", [LSTRING(paradropTimeCoefficent), LSTRING(paradropTimeCoefficent_description)], - [ELSTRING(OptionsMenu,CategoryLogistics), LSTRING(openMenu)], + _category, [0, 10, 2.5, 1], true, {[QGVAR(paradropTimeCoefficent), _this, true] call EFUNC(common,cbaSettings_settingChanged)} @@ -32,7 +34,7 @@ QGVAR(openAfterUnload), "LIST", [LSTRING(openAfterUnload), LSTRING(openAfterUnload_description)], - [ELSTRING(OptionsMenu,CategoryLogistics), LSTRING(openMenu)], + _category, [[0, 1, 2, 3], [ELSTRING(common,never), LSTRING(unloadObject), LSTRING(paradropButton), ELSTRING(common,both)], 0], false, {[QGVAR(openAfterUnload), _this, true] call EFUNC(common,cbaSettings_settingChanged)} @@ -42,7 +44,7 @@ QGVAR(enableRename), "CHECKBOX", [LSTRING(ModuleSettings_enableRename), LSTRING(ModuleSettings_enableRename_Description)], - [ELSTRING(OptionsMenu,CategoryLogistics), LSTRING(openMenu)], + _category, true, false, {[QGVAR(enableRename), _this, true] call EFUNC(common,cbaSettings_settingChanged)} @@ -52,7 +54,7 @@ QGVAR(carryAfterUnload), "CHECKBOX", [LSTRING(carryAfterUnload), LSTRING(carryAfterUnload_description)], - [ELSTRING(OptionsMenu,CategoryLogistics), LSTRING(openMenu)], + _category, true, false, {[QGVAR(carryAfterUnload), _this] call EFUNC(common,cbaSettings_settingChanged)} diff --git a/addons/common/initSettings.inc.sqf b/addons/common/initSettings.inc.sqf index e6b8b73248..41fcdafecd 100644 --- a/addons/common/initSettings.inc.sqf +++ b/addons/common/initSettings.inc.sqf @@ -33,7 +33,7 @@ private _categoryColors = [_category, format ["| %1 |", LLSTRING(subcategory_col "LIST", [LSTRING(SettingFeedbackIconsName), LSTRING(SettingFeedbackIconsDesc)], _category, - [[0, 1, 2, 3, 4], [ELSTRING(optionsmenu,Hide), ELSTRING(optionsmenu,TopRightDown), ELSTRING(optionsmenu,TopRightLeft), ELSTRING(optionsmenu,TopLeftDown), ELSTRING(optionsmenu,TopLeftRight)], 1], + [[0, 1, 2, 3, 4], [LSTRING(Hide), LSTRING(TopRightDown), LSTRING(TopRightLeft), LSTRING(TopLeftDown), LSTRING(TopLeftRight)], 1], 0 ] call CBA_fnc_addSetting; @@ -42,7 +42,7 @@ private _categoryColors = [_category, format ["| %1 |", LLSTRING(subcategory_col "LIST", [LSTRING(SettingProgressBarLocationName), LSTRING(SettingProgressBarLocationDesc)], _category, - [[0, 1], [ELSTRING(optionsmenu,Top), ELSTRING(optionsmenu,Bottom)], 0], + [[0, 1], [LSTRING(Top), LSTRING(Bottom)], 0], 0 ] call CBA_fnc_addSetting; diff --git a/addons/common/stringtable.xml b/addons/common/stringtable.xml index 775ce1fe13..80e23bd069 100644 --- a/addons/common/stringtable.xml +++ b/addons/common/stringtable.xml @@ -1695,5 +1695,124 @@ 装载 Yükle + + Hide + Ukryj + Ocultar + Verstecken + Skrýt + Ocultar + Cacher + Elrejtés + Скрыть + Nascondi + 非表示 + 숨기기 + 隐藏 + 隱藏 + Gizle + + + Top right, downwards + Po prawej u góry, w dół + Arriba a la derecha, hacia abajo + Oben rechts, nach unten + Vpravo nahoře, dolů + Superior direito, para baixo + En haut à droite, vers le bas + Jobb felül, lefele + Справа — сверху вниз + In Alto a Destra, verso il Basso + 右上、下向 + 오른쪽 위에서 아래로 + 右上角，向下 + 右上角，向下 + Sağ üst, aşağı + + + Top right, to the left + Po prawej u góry, do lewej + Arriba a la derecha, hacia la izquierda + Von rechts nach links + Vpravo nahoře, do leva + Superior direito, à esquerda + En haut à droite, vers la gauche + Jobb felül, balra + Сверху — справа налево + In Alto a Destra, verso Sinistra + 右上、左向 + 오른쪽 위에서 왼쪽으로 + 右上角，向左 + 右上角，向左 + Sağ üstte, solda + + + Top left, downwards + Po lewej u góry, w dół + Arriba a la izquierda, hacia abajo + Von links, nach unten + Vlevo nahoře, dolů + Superior esquerdo, para baixo + En haut à gauche, vers le bas + Bal felül, lefele + Слева - сверху вниз + In Alto a Sinistra, verso il Basso + 左上、下向 + 왼쪽 위에서 아래로 + 左上角，向下 + 左上角，向下 + Sol üst, aşağı + + + Top left, to the right + Po lewej u góry, do prawej + Arriba a la izquierda, hacia la derecha + Oben links nach rechts + Vlevo nahoře, do prava + Superior esquerdo, para a direita + En haut à gauche, vers la droite + Bal felül, jobbra + Сверху — слева направо + In Alto a Sinistra, verso Destra + 右上、右向 + 왼쪽 위에서 오른쪽으로 + 左上角，向右 + 左上角，向右 + Sol üst, sağa + + + Top + Góra + Arriba + Oben + Nahoře + Acima + En haut + Fent + Сверху + Alto + 上側 + 상단 + 上方 + 上方 + Üst + + + Bottom + Dół + Abajo + Unten + Dole + Abaixo + En bas + Alul + Снизу + Basso + 下側 + 하단 + 下方 + 下方 + Alt + diff --git a/addons/optionsmenu/stringtable.xml b/addons/optionsmenu/stringtable.xml index beb7e206d8..d86fd0741a 100644 --- a/addons/optionsmenu/stringtable.xml +++ b/addons/optionsmenu/stringtable.xml @@ -103,140 +103,5 @@ 顯示新聞消息於主選單 Ana Menü de Haberleri Göster - - ACE Logistics - ACE Logistik - ACE Logistyka - ACE Logística - ACE Логистика - ACE Logistika - ACE Logística - ACE Logistica - ACE Logistique - ACE ロジスティクス - ACE 보급 - ACE 后勤设定 - ACE 後勤設定 - ACE Lojistik - - - Hide - Ukryj - Ocultar - Verstecken - Skrýt - Ocultar - Cacher - Elrejtés - Скрыть - Nascondi - 非表示 - 숨기기 - 隐藏 - 隱藏 - Gizle - - - Top right, downwards - Po prawej u góry, w dół - Arriba a la derecha, hacia abajo - Oben rechts, nach unten - Vpravo nahoře, dolů - Superior direito, para baixo - En haut à droite, vers le bas - Jobb felül, lefele - Справа — сверху вниз - In Alto a Destra, verso il Basso - 右上、下向 - 오른쪽 위에서 아래로 - 右上角，向下 - 右上角，向下 - Sağ üst, aşağı - - - Top right, to the left - Po prawej u góry, do lewej - Arriba a la derecha, hacia la izquierda - Von rechts nach links - Vpravo nahoře, do leva - Superior direito, à esquerda - En haut à droite, vers la gauche - Jobb felül, balra - Сверху — справа налево - In Alto a Destra, verso Sinistra - 右上、左向 - 오른쪽 위에서 왼쪽으로 - 右上角，向左 - 右上角，向左 - Sağ üstte, solda - - - Top left, downwards - Po lewej u góry, w dół - Arriba a la izquierda, hacia abajo - Von links, nach unten - Vlevo nahoře, dolů - Superior esquerdo, para baixo - En haut à gauche, vers le bas - Bal felül, lefele - Слева - сверху вниз - In Alto a Sinistra, verso il Basso - 左上、下向 - 왼쪽 위에서 아래로 - 左上角，向下 - 左上角，向下 - Sol üst, aşağı - - - Top left, to the right - Po lewej u góry, do prawej - Arriba a la izquierda, hacia la derecha - Oben links nach rechts - Vlevo nahoře, do prava - Superior esquerdo, para a direita - En haut à gauche, vers la droite - Bal felül, jobbra - Сверху — слева направо - In Alto a Sinistra, verso Destra - 右上、右向 - 왼쪽 위에서 오른쪽으로 - 左上角，向右 - 左上角，向右 - Sol üst, sağa - - - Top - Góra - Arriba - Oben - Nahoře - Acima - En haut - Fent - Сверху - Alto - 上側 - 상단 - 上方 - 上方 - Üst - - - Bottom - Dół - Abajo - Unten - Dole - Abaixo - En bas - Alul - Снизу - Basso - 下側 - 하단 - 下方 - 下方 - Alt - diff --git a/addons/rearm/initSettings.inc.sqf b/addons/rearm/initSettings.inc.sqf index fc4e85be62..37535d8d90 100644 --- a/addons/rearm/initSettings.inc.sqf +++ b/addons/rearm/initSettings.inc.sqf @@ -1,4 +1,4 @@ -private _category = [ELSTRING(OptionsMenu,CategoryLogistics), LLSTRING(DisplayName)]; +private _category = [ELSTRING(main,Category_Logistics), LLSTRING(DisplayName)]; [ QGVAR(enabled), "CHECKBOX", diff --git a/addons/refuel/initSettings.inc.sqf b/addons/refuel/initSettings.inc.sqf index 8650a5b3db..f3744697a4 100644 --- a/addons/refuel/initSettings.inc.sqf +++ b/addons/refuel/initSettings.inc.sqf @@ -1,4 +1,4 @@ -private _category = [ELSTRING(OptionsMenu,CategoryLogistics), "str_state_refuel"]; +private _category = [ELSTRING(main,Category_Logistics), "str_state_refuel"]; [ QGVAR(rate), "SLIDER", diff --git a/addons/towing/initSettings.inc.sqf b/addons/towing/initSettings.inc.sqf index aecc9113fe..03d20781cb 100644 --- a/addons/towing/initSettings.inc.sqf +++ b/addons/towing/initSettings.inc.sqf @@ -1,7 +1,7 @@ [ QGVAR(addRopeToVehicleInventory), "CHECKBOX", LSTRING(Setting_addRopeToVehicleInventory_DisplayName), - ELSTRING(OptionsMenu,CategoryLogistics), + ELSTRING(main,Category_Logistics), true, true, { diff --git a/docs/wiki/development/modularity-and-pbo-structure.md b/docs/wiki/development/modularity-and-pbo-structure.md index 6f8ab50ef4..c0632036c1 100644 --- a/docs/wiki/development/modularity-and-pbo-structure.md +++ b/docs/wiki/development/modularity-and-pbo-structure.md @@ -23,7 +23,7 @@ Main principles: - Anything that is 100% config should require Common and not Interaction. ``` -Main -> Common -> OptionsMenu -> Interaction -> Most things +Main -> Common -> Interaction -> Most things Main -> Common -> Config things