Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

General - Removed silent Options Menu dependencies (#9677)

Browse Source 
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
This commit is contained in:
johnb432 2023-12-11 18:05:22 +01:00 committed by GitHub
parent fdc145d0e7
commit 1b86f909e8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 133 additions and 147 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
addons/cargo/initSettings.inc.sqf
View File

@ -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)}

4
addons/common/initSettings.inc.sqf
View File

@ -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;

119
addons/common/stringtable.xml
View File

@ -1695,5 +1695,124 @@
<Chinesesimp>装载</Chinesesimp>
<Turkish>Yükle</Turkish>
</Key>
<Key ID="STR_ACE_Common_Hide">
<English>Hide</English>
<Polish>Ukryj</Polish>
<Spanish>Ocultar</Spanish>
<German>Verstecken</German>
<Czech>Skrýt</Czech>
<Portuguese>Ocultar</Portuguese>
<French>Cacher</French>
<Hungarian>Elrejtés</Hungarian>
<Russian>Скрыть</Russian>
<Italian>Nascondi</Italian>
<Japanese>非表示</Japanese>
<Korean>숨기기</Korean>
<Chinesesimp>隐藏</Chinesesimp>
<Chinese>隱藏</Chinese>
<Turkish>Gizle</Turkish>
</Key>
<Key ID="STR_ACE_Common_TopRightDown">
<English>Top right, downwards</English>
<Polish>Po prawej u góry, w dół</Polish>
<Spanish>Arriba a la derecha, hacia abajo</Spanish>
<German>Oben rechts, nach unten</German>
<Czech>Vpravo nahoře, dolů</Czech>
<Portuguese>Superior direito, para baixo</Portuguese>
<French>En haut à droite, vers le bas</French>
<Hungarian>Jobb felül, lefele</Hungarian>
<Russian>Справа — сверху вниз</Russian>
<Italian>In Alto a Destra, verso il Basso</Italian>
<Japanese>右上、下向</Japanese>
<Korean>오른쪽 위에서 아래로</Korean>
<Chinesesimp>右上角，向下</Chinesesimp>
<Chinese>右上角，向下</Chinese>
<Turkish>Sağ üst, aşağı</Turkish>
</Key>
<Key ID="STR_ACE_Common_TopRightLeft">
<English>Top right, to the left</English>
<Polish>Po prawej u góry, do lewej</Polish>
<Spanish>Arriba a la derecha, hacia la izquierda</Spanish>
<German>Von rechts nach links</German>
<Czech>Vpravo nahoře, do leva</Czech>
<Portuguese>Superior direito, à esquerda</Portuguese>
<French>En haut à droite, vers la gauche</French>
<Hungarian>Jobb felül, balra</Hungarian>
<Russian>Сверху — справа налево</Russian>
<Italian>In Alto a Destra, verso Sinistra</Italian>
<Japanese>右上、左向</Japanese>
<Korean>오른쪽 위에서 왼쪽으로</Korean>
<Chinesesimp>右上角，向左</Chinesesimp>
<Chinese>右上角，向左</Chinese>
<Turkish>Sağ üstte, solda</Turkish>
</Key>
<Key ID="STR_ACE_Common_TopLeftDown">
<English>Top left, downwards</English>
<Polish>Po lewej u góry, w dół</Polish>
<Spanish>Arriba a la izquierda, hacia abajo</Spanish>
<German>Von links, nach unten</German>
<Czech>Vlevo nahoře, dolů</Czech>
<Portuguese>Superior esquerdo, para baixo</Portuguese>
<French>En haut à gauche, vers le bas</French>
<Hungarian>Bal felül, lefele</Hungarian>
<Russian>Слева - сверху вниз</Russian>
<Italian>In Alto a Sinistra, verso il Basso</Italian>
<Japanese>左上、下向</Japanese>
<Korean>왼쪽 위에서 아래로</Korean>
<Chinesesimp>左上角，向下</Chinesesimp>
<Chinese>左上角，向下</Chinese>
<Turkish>Sol üst, aşağı</Turkish>
</Key>
<Key ID="STR_ACE_Common_TopLeftRight">
<English>Top left, to the right</English>
<Polish>Po lewej u góry, do prawej</Polish>
<Spanish>Arriba a la izquierda, hacia la derecha</Spanish>
<German>Oben links nach rechts</German>
<Czech>Vlevo nahoře, do prava</Czech>
<Portuguese>Superior esquerdo, para a direita</Portuguese>
<French>En haut à gauche, vers la droite</French>
<Hungarian>Bal felül, jobbra</Hungarian>
<Russian>Сверху — слева направо</Russian>
<Italian>In Alto a Sinistra, verso Destra</Italian>
<Japanese>右上、右向</Japanese>
<Korean>왼쪽 위에서 오른쪽으로</Korean>
<Chinesesimp>左上角，向右</Chinesesimp>
<Chinese>左上角，向右</Chinese>
<Turkish>Sol üst, sağa</Turkish>
</Key>
<Key ID="STR_ACE_Common_Top">
<English>Top</English>
<Polish>Góra</Polish>
<Spanish>Arriba</Spanish>
<German>Oben</German>
<Czech>Nahoře</Czech>
<Portuguese>Acima</Portuguese>
<French>En haut</French>
<Hungarian>Fent</Hungarian>
<Russian>Сверху</Russian>
<Italian>Alto</Italian>
<Japanese>上側</Japanese>
<Korean>상단</Korean>
<Chinesesimp>上方</Chinesesimp>
<Chinese>上方</Chinese>
<Turkish>Üst</Turkish>
</Key>
<Key ID="STR_ACE_Common_Bottom">
<English>Bottom</English>
<Polish>Dół</Polish>
<Spanish>Abajo</Spanish>
<German>Unten</German>
<Czech>Dole</Czech>
<Portuguese>Abaixo</Portuguese>
<French>En bas</French>
<Hungarian>Alul</Hungarian>
<Russian>Снизу</Russian>
<Italian>Basso</Italian>
<Japanese>下側</Japanese>
<Korean>하단</Korean>
<Chinesesimp>下方</Chinesesimp>
<Chinese>下方</Chinese>
<Turkish>Alt</Turkish>
</Key>
</Package>
</Project>

135
addons/optionsmenu/stringtable.xml
View File

@ -103,140 +103,5 @@
<Chinese>顯示新聞消息於主選單</Chinese>
<Turkish>Ana Menü de Haberleri Göster</Turkish>
</Key>
<Key ID="STR_ACE_OptionsMenu_CategoryLogistics">
<English>ACE Logistics</English>
<German>ACE Logistik</German>
<Polish>ACE Logistyka</Polish>
<Portuguese>ACE Logística</Portuguese>
<Russian>ACE Логистика</Russian>
<Czech>ACE Logistika</Czech>
<Spanish>ACE Logística</Spanish>
<Italian>ACE Logistica</Italian>
<French>ACE Logistique</French>
<Japanese>ACE ロジスティクス</Japanese>
<Korean>ACE 보급</Korean>
<Chinesesimp>ACE 后勤设定</Chinesesimp>
<Chinese>ACE 後勤設定</Chinese>
<Turkish>ACE Lojistik</Turkish>
</Key>
<Key ID="STR_ACE_OptionsMenu_Hide">
<English>Hide</English>
<Polish>Ukryj</Polish>
<Spanish>Ocultar</Spanish>
<German>Verstecken</German>
<Czech>Skrýt</Czech>
<Portuguese>Ocultar</Portuguese>
<French>Cacher</French>
<Hungarian>Elrejtés</Hungarian>
<Russian>Скрыть</Russian>
<Italian>Nascondi</Italian>
<Japanese>非表示</Japanese>
<Korean>숨기기</Korean>
<Chinesesimp>隐藏</Chinesesimp>
<Chinese>隱藏</Chinese>
<Turkish>Gizle</Turkish>
</Key>
<Key ID="STR_ACE_OptionsMenu_TopRightDown">
<English>Top right, downwards</English>
<Polish>Po prawej u góry, w dół</Polish>
<Spanish>Arriba a la derecha, hacia abajo</Spanish>
<German>Oben rechts, nach unten</German>
<Czech>Vpravo nahoře, dolů</Czech>
<Portuguese>Superior direito, para baixo</Portuguese>
<French>En haut à droite, vers le bas</French>
<Hungarian>Jobb felül, lefele</Hungarian>
<Russian>Справа — сверху вниз</Russian>
<Italian>In Alto a Destra, verso il Basso</Italian>
<Japanese>右上、下向</Japanese>
<Korean>오른쪽 위에서 아래로</Korean>
<Chinesesimp>右上角，向下</Chinesesimp>
<Chinese>右上角，向下</Chinese>
<Turkish>Sağ üst, aşağı</Turkish>
</Key>
<Key ID="STR_ACE_OptionsMenu_TopRightLeft">
<English>Top right, to the left</English>
<Polish>Po prawej u góry, do lewej</Polish>
<Spanish>Arriba a la derecha, hacia la izquierda</Spanish>
<German>Von rechts nach links</German>
<Czech>Vpravo nahoře, do leva</Czech>
<Portuguese>Superior direito, à esquerda</Portuguese>
<French>En haut à droite, vers la gauche</French>
<Hungarian>Jobb felül, balra</Hungarian>
<Russian>Сверху — справа налево</Russian>
<Italian>In Alto a Destra, verso Sinistra</Italian>
<Japanese>右上、左向</Japanese>
<Korean>오른쪽 위에서 왼쪽으로</Korean>
<Chinesesimp>右上角，向左</Chinesesimp>
<Chinese>右上角，向左</Chinese>
<Turkish>Sağ üstte, solda</Turkish>
</Key>
<Key ID="STR_ACE_OptionsMenu_TopLeftDown">
<English>Top left, downwards</English>
<Polish>Po lewej u góry, w dół</Polish>
<Spanish>Arriba a la izquierda, hacia abajo</Spanish>
<German>Von links, nach unten</German>
<Czech>Vlevo nahoře, dolů</Czech>
<Portuguese>Superior esquerdo, para baixo</Portuguese>
<French>En haut à gauche, vers le bas</French>
<Hungarian>Bal felül, lefele</Hungarian>
<Russian>Слева - сверху вниз</Russian>
<Italian>In Alto a Sinistra, verso il Basso</Italian>
<Japanese>左上、下向</Japanese>
<Korean>왼쪽 위에서 아래로</Korean>
<Chinesesimp>左上角，向下</Chinesesimp>
<Chinese>左上角，向下</Chinese>
<Turkish>Sol üst, aşağı</Turkish>
</Key>
<Key ID="STR_ACE_OptionsMenu_TopLeftRight">
<English>Top left, to the right</English>
<Polish>Po lewej u góry, do prawej</Polish>
<Spanish>Arriba a la izquierda, hacia la derecha</Spanish>
<German>Oben links nach rechts</German>
<Czech>Vlevo nahoře, do prava</Czech>
<Portuguese>Superior esquerdo, para a direita</Portuguese>
<French>En haut à gauche, vers la droite</French>
<Hungarian>Bal felül, jobbra</Hungarian>
<Russian>Сверху — слева направо</Russian>
<Italian>In Alto a Sinistra, verso Destra</Italian>
<Japanese>右上、右向</Japanese>
<Korean>왼쪽 위에서 오른쪽으로</Korean>
<Chinesesimp>左上角，向右</Chinesesimp>
<Chinese>左上角，向右</Chinese>
<Turkish>Sol üst, sağa</Turkish>
</Key>
<Key ID="STR_ACE_OptionsMenu_Top">
<English>Top</English>
<Polish>Góra</Polish>
<Spanish>Arriba</Spanish>
<German>Oben</German>
<Czech>Nahoře</Czech>
<Portuguese>Acima</Portuguese>
<French>En haut</French>
<Hungarian>Fent</Hungarian>
<Russian>Сверху</Russian>
<Italian>Alto</Italian>
<Japanese>上側</Japanese>
<Korean>상단</Korean>
<Chinesesimp>上方</Chinesesimp>
<Chinese>上方</Chinese>
<Turkish>Üst</Turkish>
</Key>
<Key ID="STR_ACE_OptionsMenu_Bottom">
<English>Bottom</English>
<Polish>Dół</Polish>
<Spanish>Abajo</Spanish>
<German>Unten</German>
<Czech>Dole</Czech>
<Portuguese>Abaixo</Portuguese>
<French>En bas</French>
<Hungarian>Alul</Hungarian>
<Russian>Снизу</Russian>
<Italian>Basso</Italian>
<Japanese>下側</Japanese>
<Korean>하단</Korean>
<Chinesesimp>下方</Chinesesimp>
<Chinese>下方</Chinese>
<Turkish>Alt</Turkish>
</Key>
</Package>
</Project>

2
addons/rearm/initSettings.inc.sqf
View File

@ -1,4 +1,4 @@
private _category = [ELSTRING(OptionsMenu,CategoryLogistics), LLSTRING(DisplayName)];
private _category = [ELSTRING(main,Category_Logistics), LLSTRING(DisplayName)];
[
QGVAR(enabled), "CHECKBOX",

2
addons/refuel/initSettings.inc.sqf
View File

@ -1,4 +1,4 @@
private _category = [ELSTRING(OptionsMenu,CategoryLogistics), "str_state_refuel"];
private _category = [ELSTRING(main,Category_Logistics), "str_state_refuel"];
[
QGVAR(rate), "SLIDER",

2
addons/towing/initSettings.inc.sqf
View File

@ -1,7 +1,7 @@
[
QGVAR(addRopeToVehicleInventory), "CHECKBOX",
LSTRING(Setting_addRopeToVehicleInventory_DisplayName),
ELSTRING(OptionsMenu,CategoryLogistics),
ELSTRING(main,Category_Logistics),
true,
true,
{

2
docs/wiki/development/modularity-and-pbo-structure.md
View File

@ -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