diff --git a/addons/common/functions/fnc_setSettingFromConfig.sqf b/addons/common/functions/fnc_setSettingFromConfig.sqf
index 9a95819996a..f45f6736bfa 100644
--- a/addons/common/functions/fnc_setSettingFromConfig.sqf
+++ b/addons/common/functions/fnc_setSettingFromConfig.sqf
@@ -65,7 +65,8 @@ if (isNil _name) then {
localizedDescription,
possibleValues,
isForced,
- defaultValue
+ defaultValue,
+ category
];*/
_settingData = [
_name,
@@ -75,7 +76,8 @@ if (isNil _name) then {
getText (_optionEntry >> "description"),
getArray (_optionEntry >> "values"),
getNumber (_optionEntry >> "force") > 0,
- _value
+ _value,
+ getText (_optionEntry >> "category")
];
//Strings in the values array won't be localized from the config, so just do that now:
diff --git a/addons/interact_menu/ACE_Settings.hpp b/addons/interact_menu/ACE_Settings.hpp
index ea4d4699ed2..48f32ed13b4 100644
--- a/addons/interact_menu/ACE_Settings.hpp
+++ b/addons/interact_menu/ACE_Settings.hpp
@@ -3,12 +3,14 @@ class ACE_Settings {
value = 0;
typeName = "BOOL";
isClientSettable = 1;
+ category = LSTRING(Category_InteractionMenu);
displayName = CSTRING(AlwaysUseCursorSelfInteraction);
};
class GVAR(cursorKeepCentered) {
value = 0;
typeName = "BOOL";
isClientSettable = 1;
+ category = LSTRING(Category_InteractionMenu);
displayName = CSTRING(cursorKeepCentered);
description = CSTRING(cursorKeepCenteredDescription);
};
@@ -16,42 +18,49 @@ class ACE_Settings {
value = 0;
typeName = "BOOL";
isClientSettable = 1;
+ category = LSTRING(Category_InteractionMenu);
displayName = CSTRING(AlwaysUseCursorInteraction);
};
class GVAR(UseListMenu) {
value = 0;
typeName = "BOOL";
isClientSettable = 1;
+ category = LSTRING(Category_InteractionMenu);
displayName = CSTRING(UseListMenu);
};
class GVAR(colorTextMax) {
value[] = {1, 1, 1, 1};
typeName = "COLOR";
isClientSettable = 1;
+ category = LSTRING(Category_InteractionMenu);
displayName = CSTRING(ColorTextMax);
};
class GVAR(colorTextMin) {
value[] = {1, 1, 1, 0.25};
typeName = "COLOR";
isClientSettable = 1;
+ category = LSTRING(Category_InteractionMenu);
displayName = CSTRING(ColorTextMin);
};
class GVAR(colorShadowMax) {
value[] = {0, 0, 0, 1};
typeName = "COLOR";
isClientSettable = 1;
+ category = LSTRING(Category_InteractionMenu);
displayName = CSTRING(ColorShadowMax);
};
class GVAR(colorShadowMin) {
value[] = {0, 0, 0, 0.25};
typeName = "COLOR";
isClientSettable = 1;
+ category = LSTRING(Category_InteractionMenu);
displayName = CSTRING(ColorShadowMin);
};
class GVAR(textSize) {
value = 2;
typeName = "SCALAR";
isClientSettable = 1;
+ category = LSTRING(Category_InteractionMenu);
displayName = CSTRING(textSize);
values[] = {"$str_very_small", "$str_small", "$str_medium", "$str_large", "$str_very_large"};
};
@@ -59,6 +68,7 @@ class ACE_Settings {
value = 2;
typeName = "SCALAR";
isClientSettable = 1;
+ category = LSTRING(Category_InteractionMenu);
displayName = CSTRING(shadowSetting);
description = CSTRING(shadowSettingDescription);
values[] = {"$STR_A3_OPTIONS_DISABLED", "$STR_A3_OPTIONS_ENABLED", CSTRING(shadowOutline)};
@@ -67,12 +77,14 @@ class ACE_Settings {
value = 1;
typeName = "BOOL";
isClientSettable = 1;
+ category = LSTRING(Category_InteractionMenu);
displayName = CSTRING(ActionOnKeyRelease);
};
class GVAR(menuBackground) {
value = 0;
typeName = "SCALAR";
isClientSettable = 1;
+ category = LSTRING(Category_InteractionMenu);
displayName = CSTRING(background);
values[] = {"$STR_A3_OPTIONS_DISABLED", CSTRING(backgroundBlur), CSTRING(backgroundBlack)};
};
@@ -80,6 +92,7 @@ class ACE_Settings {
value = 0;
typeName = "BOOL";
isClientSettable = 1;
+ category = LSTRING(Category_InteractionMenu);
displayName = CSTRING(addBuildingActions);
description = CSTRING(addBuildingActionsDescription);
};
diff --git a/addons/interact_menu/stringtable.xml b/addons/interact_menu/stringtable.xml
index b55e8483a1e..5bd8aefe210 100644
--- a/addons/interact_menu/stringtable.xml
+++ b/addons/interact_menu/stringtable.xml
@@ -267,5 +267,9 @@
<Czech>Přidá možnost interakce pro otevření dvěří a umistňovat žebříky na budovy. (Poznámka: Použití této možnosti snižuje výkon při otevírání pomocí interakčního menu, zejména ve velkých městech.) </Czech>
<Spanish>Añade las acciones de interacción para la apertura de puertas y montaje de escaleras en los edificios. (Nota: Hay un coste de rendimiento al abrir el menú de interacción, especialmente en las ciudades)</Spanish>
</Key>
+ <Key ID="STR_ACE_Interact_Menu_Category_InteractionMenu">
+ <English>Interaction Menu</English>
+ <Polish>Menu interakcji</Polish>
+ </Key>
</Package>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/addons/medical/ACE_Settings.hpp b/addons/medical/ACE_Settings.hpp
index fcaba03aa0d..23b7cf8a4ff 100644
--- a/addons/medical/ACE_Settings.hpp
+++ b/addons/medical/ACE_Settings.hpp
@@ -1,94 +1,116 @@
class ACE_Settings {
class GVAR(level) {
+ category = LSTRING(Category_Medical);
value = 1;
typeName = "SCALAR";
values[] = {"Disabled", "Basic", "Advanced"};
};
class GVAR(medicSetting) {
+ category = LSTRING(Category_Medical);
value = 1;
typeName = "SCALAR";
values[] = {"Disabled", "Normal", "Advanced"};
};
class GVAR(enableFor) {
+ category = LSTRING(Category_Medical);
value = 0;
typeName = "SCALAR";
values[] = {"Players only", "Players and AI"};
};
class GVAR(enableOverdosing) {
+ category = LSTRING(Category_Medical);
typeName = "BOOL";
value = 1;
};
class GVAR(bleedingCoefficient) {
+ category = LSTRING(Category_Medical);
typeName = "SCALAR";
value = 1;
};
class GVAR(painCoefficient) {
+ category = LSTRING(Category_Medical);
typeName = "SCALAR";
value = 1;
};
class GVAR(enableAirway) {
+ category = LSTRING(Category_Medical);
typeName = "BOOL";
value = false;
};
class GVAR(enableFractures) {
+ category = LSTRING(Category_Medical);
typeName = "BOOL";
value = false;
};
class GVAR(enableAdvancedWounds) {
+ category = LSTRING(Category_Medical);
typeName = "BOOL";
value = false;
};
class GVAR(enableVehicleCrashes) {
+ category = LSTRING(Category_Medical);
typeName = "BOOL";
value = 1;
};
class GVAR(enableScreams) {
+ category = LSTRING(Category_Medical);
typeName = "BOOL";
value = 1;
};
class GVAR(playerDamageThreshold) {
+ category = LSTRING(Category_Medical);
typeName = "SCALAR";
value = 1;
};
class GVAR(AIDamageThreshold) {
+ category = LSTRING(Category_Medical);
typeName = "SCALAR";
value = 1;
};
class GVAR(enableUnconsciousnessAI) {
+ category = LSTRING(Category_Medical);
value = 1;
typeName = "SCALAR";
values[] = {"Disabled", "50/50", "Enabled"};
};
class GVAR(remoteControlledAI) {
+ category = LSTRING(Category_Medical);
typeName = "BOOL";
value = 1;
};
class GVAR(preventInstaDeath) {
+ category = LSTRING(Category_Medical);
typeName = "BOOL";
value = 0;
};
class GVAR(enableRevive) {
+ category = LSTRING(Category_Medical);
typeName = "SCALAR";
value = 0;
values[] = {"Disabled", "Players only", "Players and AI"};
};
class GVAR(maxReviveTime) {
+ category = LSTRING(Category_Medical);
typeName = "SCALAR";
value = 120;
};
class GVAR(amountOfReviveLives) {
+ category = LSTRING(Category_Medical);
typeName = "SCALAR";
value = -1;
};
class GVAR(allowDeadBodyMovement) {
+ category = LSTRING(Category_Medical);
typeName = "BOOL";
value = 0;
};
class GVAR(allowLitterCreation) {
+ category = LSTRING(Category_Medical);
typeName = "BOOL";
value = 1;
};
class GVAR(litterSimulationDetail) {
+ category = LSTRING(Category_Medical);
displayName = CSTRING(litterSimulationDetail);
description = CSTRING(litterSimulationDetail_Desc);
typeName = "SCALAR";
@@ -100,40 +122,48 @@ class ACE_Settings {
isClientSettable = 1;
};
class GVAR(litterCleanUpDelay) {
+ category = LSTRING(Category_Medical);
typeName = "SCALAR";
value = 0;
};
class GVAR(medicSetting_PAK) {
+ category = LSTRING(Category_Medical);
typeName = "SCALAR";
value = 1;
values[] = {"Anyone", "Medics only", "Doctors only"};
};
class GVAR(medicSetting_SurgicalKit) {
+ category = LSTRING(Category_Medical);
typeName = "SCALAR";
value = 1;
values[] = {"Anyone", "Medics only", "Doctors only"};
};
class GVAR(consumeItem_PAK) {
+ category = LSTRING(Category_Medical);
typeName = "SCALAR";
value = 0;
values[] = {"No", "Yes"};
};
class GVAR(consumeItem_SurgicalKit) {
+ category = LSTRING(Category_Medical);
typeName = "SCALAR";
value = 0;
values[] = {"No", "Yes"};
};
class GVAR(useLocation_PAK) {
+ category = LSTRING(Category_Medical);
typeName = "SCALAR";
value = 3;
values[] = {"Anywhere", "Medical vehicles", "Medical facility", "vehicle & facility", "Disabled"};
};
class GVAR(useLocation_SurgicalKit) {
+ category = LSTRING(Category_Medical);
typeName = "SCALAR";
value = 2;
values[] = {"Anywhere", "Medical vehicles", "Medical facility", "vehicle & facility", "Disabled"};
};
class GVAR(useCondition_PAK) {
+ category = LSTRING(Category_Medical);
displayName = CSTRING(AdvancedMedicalSettings_useCondition_PAK_DisplayName);
description = CSTRING(AdvancedMedicalSettings_useCondition_PAK_Description);
typeName = "SCALAR";
@@ -141,6 +171,7 @@ class ACE_Settings {
values[] = {"Anytime", "Stable"};
};
class GVAR(useCondition_SurgicalKit) {
+ category = LSTRING(Category_Medical);
displayName = CSTRING(AdvancedMedicalSettings_useCondition_SurgicalKit_DisplayName);
description = CSTRING(AdvancedMedicalSettings_useCondition_SurgicalKit_Description);
typeName = "SCALAR";
@@ -148,20 +179,24 @@ class ACE_Settings {
values[] = {"Anytime", "Stable"};
};
class GVAR(keepLocalSettingsSynced) {
+ category = LSTRING(Category_Medical);
typeName = "BOOL";
value = 1;
};
class GVAR(healHitPointAfterAdvBandage) {
+ category = LSTRING(Category_Medical);
displayName = CSTRING(healHitPointAfterAdvBandage);
typeName = "BOOL";
value = 0;
};
class GVAR(painIsOnlySuppressed) {
+ category = LSTRING(Category_Medical);
displayName = CSTRING(painIsOnlySuppressed);
typeName = "BOOL";
value = 1;
};
class GVAR(painEffectType) {
+ category = LSTRING(Category_Medical);
displayName = CSTRING(painEffectType);
typeName = "SCALAR";
value = 0;
@@ -169,15 +204,18 @@ class ACE_Settings {
isClientSettable = 1;
};
class GVAR(allowUnconsciousAnimationOnTreatment) {
+ category = LSTRING(Category_Medical);
typeName = "BOOL";
value = 0;
};
class GVAR(moveUnitsFromGroupOnUnconscious) {
+ category = LSTRING(Category_Medical);
typeName = "BOOL";
value = 0;
};
class GVAR(menuTypeStyle) {
+ category = LSTRING(Category_Medical);
displayName = CSTRING(menuTypeDisplay);
description = CSTRING(menuTypeDescription);
typeName = "SCALAR";
diff --git a/addons/medical/stringtable.xml b/addons/medical/stringtable.xml
index f3575b4eda5..b852c27f964 100644
--- a/addons/medical/stringtable.xml
+++ b/addons/medical/stringtable.xml
@@ -3597,5 +3597,17 @@
<Spanish>Estable</Spanish>
<Polish>Po stabilizacji</Polish>
</Key>
+ <Key ID="STR_ACE_Medical_Category_Medical">
+ <English>Medical</English>
+ <Czech>Zdravotní</Czech>
+ <French>Médical</French>
+ <German>Sanitäter</German>
+ <Italian>Medico</Italian>
+ <Polish>Medyczne</Polish>
+ <Portuguese>Médico</Portuguese>
+ <Russian>Медик</Russian>
+ <Spanish>Médico</Spanish>
+ <Hungarian>Orvosi</Hungarian>
+ </Key>
</Package>
</Project>
diff --git a/addons/optionsmenu/CfgEventHandlers.hpp b/addons/optionsmenu/CfgEventHandlers.hpp
index b97829836ef..917a0acbd71 100644
--- a/addons/optionsmenu/CfgEventHandlers.hpp
+++ b/addons/optionsmenu/CfgEventHandlers.hpp
@@ -1,5 +1,10 @@
class Extended_PreInit_EventHandlers {
- class ADDON {
- init = QUOTE(call COMPILE_FILE(XEH_preInit));
- };
+ class ADDON {
+ init = QUOTE(call COMPILE_FILE(XEH_preInit));
+ };
+};
+class Extended_PostInit_EventHandlers {
+ class ADDON {
+ init = QUOTE(call COMPILE_FILE(XEH_postInit));
+ };
};
diff --git a/addons/optionsmenu/XEH_postInit.sqf b/addons/optionsmenu/XEH_postInit.sqf
new file mode 100644
index 00000000000..a981c34e0b5
--- /dev/null
+++ b/addons/optionsmenu/XEH_postInit.sqf
@@ -0,0 +1,11 @@
+
+#include "script_component.hpp"
+
+["SettingsInitialized", {
+ GVAR(categories) pushback ""; //Ensure All Catagories is at top
+ {
+ if !(_x select 8 in GVAR(categories)) then {
+ GVAR(categories) pushback (_x select 8);
+ };
+ }foreach EGVAR(common,settings);
+}] call EFUNC(common,addEventHandler);
diff --git a/addons/optionsmenu/XEH_preInit.sqf b/addons/optionsmenu/XEH_preInit.sqf
index e35784560aa..21f64c4f467 100644
--- a/addons/optionsmenu/XEH_preInit.sqf
+++ b/addons/optionsmenu/XEH_preInit.sqf
@@ -10,16 +10,19 @@ PREP(onSliderPosChanged);
PREP(onServerSaveInputField);
PREP(onServerSettingsMenuOpen);
PREP(onServerListBoxShowSelectionChanged);
+PREP(onCategorySelectChanged);
PREP(resetSettings);
PREP(serverResetSettings);
PREP(settingsMenuUpdateKeyView);
PREP(settingsMenuUpdateList);
PREP(serverSettingsMenuUpdateKeyView);
PREP(serverSettingsMenuUpdateList);
+PREP(onServerCategorySelectChanged);
PREP(updateSetting);
PREP(exportSettings);
PREP(toggleIncludeClientSettings);
PREP(moduleAllowConfigExport);
+PREP(stringEscape);
GVAR(clientSideOptions) = [];
GVAR(clientSideColors) = [];
@@ -29,5 +32,7 @@ GVAR(ClientSettingsExportIncluded) = false;
GVAR(serverSideOptions) = [];
GVAR(serverSideColors) = [];
GVAR(serverSideValues) = [];
+GVAR(categories) = [];
+GVAR(currentCategorySelection) = 0;
ADDON = true;
diff --git a/addons/optionsmenu/functions/fnc_exportSettings.sqf b/addons/optionsmenu/functions/fnc_exportSettings.sqf
index fa76b8752a3..9d6437495d2 100644
--- a/addons/optionsmenu/functions/fnc_exportSettings.sqf
+++ b/addons/optionsmenu/functions/fnc_exportSettings.sqf
@@ -40,7 +40,7 @@ private ["_compiledConfig", "_name", "_typeName", "_isClientSetable", "_localize
if (GVAR(ClientSettingsExportIncluded) || !_isClientSetable) then {
_value = missionNamespace getvariable [_name, _defaultValue];
- if (_typeName == "STRING") then { // I dont think we have string values, but just in case
+ if (_typeName == "STRING") then {
_value = format['"%1"', _value];
};
if (_typeName == "BOOL") then {
diff --git a/addons/optionsmenu/functions/fnc_onCategorySelectChanged.sqf b/addons/optionsmenu/functions/fnc_onCategorySelectChanged.sqf
new file mode 100644
index 00000000000..3b97892cdbd
--- /dev/null
+++ b/addons/optionsmenu/functions/fnc_onCategorySelectChanged.sqf
@@ -0,0 +1,27 @@
+/*
+ * Author: Glowbal
+ * Changes which category is selected
+ *
+ * Arguments:
+ * None
+ *
+ * Return Value:
+ * None
+ *
+ * Example:
+ * [] call ACE_optionsmenu_fnc_onCategorySelectChanged
+ *
+ * Public: No
+ */
+
+#include "script_component.hpp"
+
+private ["_settingsMenu"];
+
+disableSerialization;
+_settingsMenu = uiNamespace getVariable 'ACE_settingsMenu';
+
+_ctrlComboBox = (_settingsMenu displayCtrl 14);
+GVAR(currentCategorySelection) = lbCurSel _ctrlComboBox;
+
+[false] call FUNC(settingsMenuUpdateList);
diff --git a/addons/optionsmenu/functions/fnc_onServerCategorySelectChanged.sqf b/addons/optionsmenu/functions/fnc_onServerCategorySelectChanged.sqf
new file mode 100644
index 00000000000..f294e27a5e4
--- /dev/null
+++ b/addons/optionsmenu/functions/fnc_onServerCategorySelectChanged.sqf
@@ -0,0 +1,26 @@
+/*
+ * Author: Glowbal
+ * Changes which category is selected
+ *
+ * Arguments:
+ * None
+ *
+ * Return Value:
+ * None
+ *
+ * Example:
+ * [] call ACE_optionsmenu_fnc_onCategorySelectChanged
+ *
+ * Public: No
+ */
+
+#include "script_component.hpp"
+
+private ["_settingsMenu", "_ctrlComboBox"];
+disableSerialization;
+_settingsMenu = uiNamespace getVariable 'ACE_serverSettingsMenu';
+
+_ctrlComboBox = (_settingsMenu displayCtrl 14);
+GVAR(currentCategorySelection) = lbCurSel _ctrlComboBox;
+
+[false] call FUNC(serverSettingsMenuUpdateList);
diff --git a/addons/optionsmenu/functions/fnc_onServerSaveInputField.sqf b/addons/optionsmenu/functions/fnc_onServerSaveInputField.sqf
index b8eb630f852..11aadc76e41 100644
--- a/addons/optionsmenu/functions/fnc_onServerSaveInputField.sqf
+++ b/addons/optionsmenu/functions/fnc_onServerSaveInputField.sqf
@@ -29,7 +29,10 @@ switch (GVAR(optionMenu_openTab)) do {
_settingName = _setting select 0;
_convertedValue = switch (toUpper (_setting select 1)) do {
- case "STRING": {format ['"%1"', _inputText]};
+ case "STRING": {
+ ctrlSetText [414, _inputText call FUNC(stringEscape)];
+ format ['%1', _inputText call FUNC(stringEscape)];
+ };
case "ARRAY": {format [call compile "[%1]", _inputText]};
case "SCALAR": {parseNumber _inputText;};
default {throw "Error"};
diff --git a/addons/optionsmenu/functions/fnc_onServerSettingsMenuOpen.sqf b/addons/optionsmenu/functions/fnc_onServerSettingsMenuOpen.sqf
index 4f96438042e..73a6653dd2a 100644
--- a/addons/optionsmenu/functions/fnc_onServerSettingsMenuOpen.sqf
+++ b/addons/optionsmenu/functions/fnc_onServerSettingsMenuOpen.sqf
@@ -61,7 +61,19 @@ _menu = uiNamespace getvariable "ACE_serverSettingsMenu";
(_menu displayCtrl 1003) ctrlEnable false;
if (GVAR(ClientSettingsExportIncluded)) then {
- (_settingsMenu displayCtrl 1102) ctrlSetText localize (LSTRING(exClientSettings));
+ (_settingsMenu displayCtrl 1102) ctrlSetText localize (CSTRING(exClientSettings));
} else {
- (_settingsMenu displayCtrl 1102) ctrlSetText localize (LSTRING(inClientSettings));
+ (_settingsMenu displayCtrl 1102) ctrlSetText localize (CSTRING(inClientSettings));
};
+
+
+lbClear (_menu displayCtrl 14);
+{
+ if (_x == "") then {
+ _x = localize "STR_ACE_OptionsMenu_category_all";
+ };
+ if (isLocalized _x) then {_x = localize _x};
+ (_menu displayCtrl 14) lbAdd _x;
+} forEach GVAR(categories);
+
+(_menu displayCtrl 14) lbSetCurSel GVAR(currentCategorySelection); //All Catagoies
diff --git a/addons/optionsmenu/functions/fnc_onSettingsMenuOpen.sqf b/addons/optionsmenu/functions/fnc_onSettingsMenuOpen.sqf
index 050abcf295e..af3e2232f35 100644
--- a/addons/optionsmenu/functions/fnc_onSettingsMenuOpen.sqf
+++ b/addons/optionsmenu/functions/fnc_onSettingsMenuOpen.sqf
@@ -52,3 +52,16 @@ if (GVAR(serverConfigGeneration) == 0) then {
(_menu displayCtrl 1102) ctrlEnable false;
(_menu displayCtrl 1102) ctrlShow false;
};
+
+lbClear (_menu displayCtrl 14);
+{
+ if (_x == "") then {
+ _x = localize "STR_ACE_OptionsMenu_category_all";
+ };
+ if (isLocalized _x) then {_x = localize _x};
+ (_menu displayCtrl 14) lbAdd _x;
+} forEach GVAR(categories);
+
+(_menu displayCtrl 14) lbSetCurSel GVAR(currentCategorySelection); //All Catagoies
+
+
diff --git a/addons/optionsmenu/functions/fnc_serverSettingsMenuUpdateKeyView.sqf b/addons/optionsmenu/functions/fnc_serverSettingsMenuUpdateKeyView.sqf
index 67a2fe64152..ac25d719e13 100644
--- a/addons/optionsmenu/functions/fnc_serverSettingsMenuUpdateKeyView.sqf
+++ b/addons/optionsmenu/functions/fnc_serverSettingsMenuUpdateKeyView.sqf
@@ -16,7 +16,7 @@
#include "script_component.hpp"
-private ["_settingsMenu", "_ctrlList", "_collection", "_settingIndex", "_setting", "_entryName", "_localizedName", "_localizedDescription", "_possibleValues", "_settingsValue", "_currentColor", "_expectedType"];
+private ["_settingsMenu", "_ctrlList", "_collection", "_settingIndex", "_setting", "_entryName", "_localizedName", "_localizedDescription", "_possibleValues", "_settingsValue", "_currentColor", "_expectedType", "_filteredCollection", "_selectedCategory"];
disableSerialization;
_settingsMenu = uiNamespace getVariable 'ACE_serverSettingsMenu';
@@ -29,16 +29,24 @@ _collection = switch (GVAR(optionMenu_openTab)) do {
default {[]};
};
-if (count _collection > 0) then {
+_selectedCategory = GVAR(categories) select GVAR(currentCategorySelection);
+_filteredCollection = [];
+{
+ if (_selectedCategory == "" || {_selectedCategory == (_x select 8)}) then {
+ _filteredCollection pushBack _x;
+ };
+} forEach _collection;
+
+if (count _filteredCollection > 0) then {
_settingIndex = (lbCurSel _ctrlList);
- if (_settingIndex > (count _collection)) then {
- _settingIndex = count _collection - 1;
+ if (_settingIndex > (count _filteredCollection)) then {
+ _settingIndex = count _filteredCollection - 1;
};
if (_settingIndex < 0) then {
_settingIndex = 0;
};
- _setting = _collection select _settingIndex;
+ _setting = _filteredCollection select _settingIndex;
_entryName = _setting select 0;
_localizedName = _setting select 3;
@@ -52,7 +60,7 @@ if (count _collection > 0) then {
switch (GVAR(optionMenu_openTab)) do {
case (MENU_TAB_SERVER_OPTIONS): {
_possibleValues = _setting select 5;
- _settingsValue = _setting select 8;
+ _settingsValue = _setting select 9;
// Created disable/enable options for bools
if ((_setting select 1) == "BOOL") then {
lbClear 400;
@@ -66,14 +74,14 @@ if (count _collection > 0) then {
(_settingsMenu displayCtrl 400) lbSetCurSel _settingsValue;
};
case (MENU_TAB_SERVER_COLORS): {
- _currentColor = _setting select 8;
+ _currentColor = _setting select 9;
{
sliderSetPosition [_x, (255 * (_currentColor select _forEachIndex))];
} forEach [410, 411, 412, 413];
};
case (MENU_TAB_SERVER_VALUES): {
// TODO implement
- _settingsValue = _setting select 8;
+ _settingsValue = _setting select 9;
// Created disable/enable options for bools
_expectedType = switch (_setting select 1) do {
diff --git a/addons/optionsmenu/functions/fnc_serverSettingsMenuUpdateList.sqf b/addons/optionsmenu/functions/fnc_serverSettingsMenuUpdateList.sqf
index a8400580dd0..4a6648878ac 100644
--- a/addons/optionsmenu/functions/fnc_serverSettingsMenuUpdateList.sqf
+++ b/addons/optionsmenu/functions/fnc_serverSettingsMenuUpdateList.sqf
@@ -16,7 +16,7 @@
#include "script_component.hpp"
-private ["_settingsMenu", "_ctrlList", "_settingsText", "_color", "_settingsColor", "_updateKeyView", "_settingsValue"];
+private ["_settingsMenu", "_ctrlList", "_settingsText", "_color", "_settingsColor", "_updateKeyView", "_settingsValue", "_selectedCategory"];
DEFAULT_PARAM(0,_updateKeyView,true);
disableSerialization;
@@ -24,55 +24,65 @@ _settingsMenu = uiNamespace getVariable 'ACE_serverSettingsMenu';
_ctrlList = _settingsMenu displayCtrl 200;
lbclear _ctrlList;
+
+_selectedCategory = GVAR(categories) select GVAR(currentCategorySelection);
+
+
switch (GVAR(optionMenu_openTab)) do {
case (MENU_TAB_SERVER_OPTIONS): {
{
- if ((_x select 3) != "") then {
- _ctrlList lbadd (_x select 3);
- } else {
- _ctrlList lbadd (_x select 0);
- };
+ if (_selectedCategory == "" || _selectedCategory == (_X select 8)) then {
+ if ((_x select 3) != "") then {
+ _ctrlList lbadd (_x select 3);
+ } else {
+ _ctrlList lbadd (_x select 0);
+ };
- _settingsValue = _x select 8;
+ _settingsValue = _x select 9;
- // Created disable/enable options for bools
- _settingsText = if ((_x select 1) == "BOOL") then {
- [(localize ELSTRING(common,No)), (localize ELSTRING(common,Yes))] select _settingsValue;
- } else {
- (_x select 5) select _settingsValue;
- };
+ // Created disable/enable options for bools
+ _settingsText = if ((_x select 1) == "BOOL") then {
+ [(localize ELSTRING(common,No)), (localize ELSTRING(common,Yes))] select _settingsValue;
+ } else {
+ (_x select 5) select _settingsValue;
+ };
- _ctrlList lbadd (_settingsText);
+ _ctrlList lbadd (_settingsText);
+ };
}foreach GVAR(serverSideOptions);
};
case (MENU_TAB_SERVER_COLORS): {
{
- _color = +(_x select 8);
- {
- _color set [_forEachIndex, ((round (_x * 100))/100)];
- } forEach _color;
- _settingsColor = str _color;
- if ((_x select 3) != "") then {
- _ctrlList lbadd (_x select 3);
- } else {
- _ctrlList lbadd (_x select 0);
+ if (_selectedCategory == "" || _selectedCategory == (_X select 8)) then {
+ _color = +(_x select 9);
+ {
+ _color set [_forEachIndex, ((round (_x * 100))/100)];
+ } forEach _color;
+ _settingsColor = str _color;
+ if ((_x select 3) != "") then {
+ _ctrlList lbadd (_x select 3);
+ } else {
+ _ctrlList lbadd (_x select 0);
+ };
+ _ctrlList lbadd (_settingsColor);
+ _ctrlList lnbSetColor [[_forEachIndex, 1], (_x select 9)];
};
- _ctrlList lbadd (_settingsColor);
- _ctrlList lnbSetColor [[_forEachIndex, 1], (_x select 8)];
}foreach GVAR(serverSideColors);
};
case (MENU_TAB_SERVER_VALUES): {
{
- if ((_x select 3) != "") then {
- _ctrlList lbadd (_x select 3);
- } else {
- _ctrlList lbadd (_x select 0);
- };
- _settingsValue = _x select 8;
- if (typeName _settingsValue != "STRINg") then {
- _settingsValue = format["%1", _settingsValue];
+ if (_selectedCategory == "" || _selectedCategory == (_X select 8)) then {
+ if ((_x select 3) != "") then {
+ _ctrlList lbadd (_x select 3);
+ } else {
+ _ctrlList lbadd (_x select 0);
+ };
+ _settingsValue = _x select 9;
+ if (typeName _settingsValue != "STRINg") then {
+ _settingsValue = format["%1", _settingsValue];
+ };
+ _ctrlList lbadd (_settingsValue);
};
- _ctrlList lbadd (_settingsValue);
}foreach GVAR(serverSideValues);
};
};
diff --git a/addons/optionsmenu/functions/fnc_settingsMenuUpdateKeyView.sqf b/addons/optionsmenu/functions/fnc_settingsMenuUpdateKeyView.sqf
index 8c4b1735a1e..442a1ceb50a 100644
--- a/addons/optionsmenu/functions/fnc_settingsMenuUpdateKeyView.sqf
+++ b/addons/optionsmenu/functions/fnc_settingsMenuUpdateKeyView.sqf
@@ -28,16 +28,24 @@ _collection = switch (GVAR(optionMenu_openTab)) do {
default {[]};
};
-if (count _collection > 0) then {
+_selectedCategory = GVAR(categories) select GVAR(currentCategorySelection);
+_filteredCollection = [];
+{
+ if (_selectedCategory == "" || {_selectedCategory == (_x select 8)}) then {
+ _filteredCollection pushBack _x;
+ };
+} forEach _collection;
+
+if (count _filteredCollection > 0) then {
_settingIndex = (lbCurSel _ctrlList);
- if (_settingIndex > (count _collection)) then {
- _settingIndex = count _collection - 1;
+ if (_settingIndex > (count _filteredCollection)) then {
+ _settingIndex = count _filteredCollection - 1;
};
if (_settingIndex < 0) then {
_settingIndex = 0;
};
- _setting = _collection select _settingIndex;
+ _setting = _filteredCollection select _settingIndex;
_entryName = _setting select 0;
_localizedName = _setting select 3;
@@ -51,7 +59,7 @@ if (count _collection > 0) then {
switch (GVAR(optionMenu_openTab)) do {
case (MENU_TAB_OPTIONS): {
_possibleValues = _setting select 5;
- _settingsValue = _setting select 8;
+ _settingsValue = _setting select 9;
// Created disable/enable options for bools
if ((_setting select 1) == "BOOL") then {
@@ -66,7 +74,7 @@ if (count _collection > 0) then {
(_settingsMenu displayCtrl 400) lbSetCurSel _settingsValue;
};
case (MENU_TAB_COLORS): {
- _currentColor = _setting select 8;
+ _currentColor = _setting select 9;
{
sliderSetPosition [_x, (255 * (_currentColor select _forEachIndex))];
} forEach [410, 411, 412, 413];
diff --git a/addons/optionsmenu/functions/fnc_settingsMenuUpdateList.sqf b/addons/optionsmenu/functions/fnc_settingsMenuUpdateList.sqf
index 0b456924999..18075a18444 100644
--- a/addons/optionsmenu/functions/fnc_settingsMenuUpdateList.sqf
+++ b/addons/optionsmenu/functions/fnc_settingsMenuUpdateList.sqf
@@ -16,7 +16,7 @@
#include "script_component.hpp"
-private ["_settingsMenu", "_ctrlList", "_settingsText", "_color", "_settingsColor", "_updateKeyView", "_settingsValue"];
+private ["_settingsMenu", "_ctrlList", "_settingsText", "_color", "_settingsColor", "_updateKeyView", "_settingsValue", "_selectedCategory"];
DEFAULT_PARAM(0,_updateKeyView,true);
disableSerialization;
@@ -25,33 +25,37 @@ _ctrlList = _settingsMenu displayCtrl 200;
lbclear _ctrlList;
+_selectedCategory = GVAR(categories) select GVAR(currentCategorySelection);
+
switch (GVAR(optionMenu_openTab)) do {
case (MENU_TAB_OPTIONS): {
{
- _ctrlList lbadd (_x select 3);
-
- _settingsValue = _x select 8;
+ if (_selectedCategory == "" || _selectedCategory == (_X select 8)) then {
+ _ctrlList lbadd (_x select 3);
+ _settingsValue = _x select 9;
- // Created disable/enable options for bools
- _settingsText = if ((_x select 1) == "BOOL") then {
- [(localize ELSTRING(common,No)), (localize ELSTRING(common,Yes))] select _settingsValue;
- } else {
- (_x select 5) select _settingsValue;
+ // Created disable/enable options for bools
+ _settingsText = if ((_x select 1) == "BOOL") then {
+ [(localize ELSTRING(common,No)), (localize ELSTRING(common,Yes))] select _settingsValue;
+ } else {
+ (_x select 5) select _settingsValue;
+ };
+ _ctrlList lbadd (_settingsText);
};
-
- _ctrlList lbadd (_settingsText);
}foreach GVAR(clientSideOptions);
};
case (MENU_TAB_COLORS): {
- {
- _color = +(_x select 8);
- {
- _color set [_forEachIndex, ((round (_x * 100))/100)];
- } forEach _color;
- _settingsColor = str _color;
- _ctrlList lbadd (_x select 3);
- _ctrlList lbadd (_settingsColor);
- _ctrlList lnbSetColor [[_forEachIndex, 1], (_x select 8)];
+ {
+ if (_selectedCategory == "" || _selectedCategory == (_X select 8)) then {
+ _color = +(_x select 9);
+ {
+ _color set [_forEachIndex, ((round (_x * 100))/100)];
+ } forEach _color;
+ _settingsColor = str _color;
+ _ctrlList lbadd (_x select 3);
+ _ctrlList lbadd (_settingsColor);
+ _ctrlList lnbSetColor [[_forEachIndex, 1], (_x select 9)];
+ };
}foreach GVAR(clientSideColors);
};
};
diff --git a/addons/optionsmenu/functions/fnc_stringEscape.sqf b/addons/optionsmenu/functions/fnc_stringEscape.sqf
new file mode 100644
index 00000000000..fe3930f68cb
--- /dev/null
+++ b/addons/optionsmenu/functions/fnc_stringEscape.sqf
@@ -0,0 +1,59 @@
+/*
+ * Author: Glowbal
+ * Parse the string for quotation marks, so it can be used for config export.
+ *
+ * Arguments:
+ * 0: string <STRING>
+ *
+ * Return Value:
+ * parsed string <STRING>
+ *
+ * Example:
+ * [] call ACE_optionsmenu_fnc_stringEscape
+ *
+ * Public: No
+ */
+
+private ["_str", "_array", "_maxIndex"];
+_str = _this;
+
+_isEven = {
+ params ["_array", "_index"];
+ private [ "_count"];
+ _count = 0;
+ {
+ if (_forEachIndex <= _index && {_x == 39}) then {
+ _count = _count + 1;
+ };
+ }foreach _array;
+
+ _count %2 == 0;
+};
+
+// reg: 34
+// single: 39
+_array = toArray _str;
+{
+ if (_x == 34) then {
+ _array set [_foreachIndex, 39];
+ };
+}foreach _array;
+
+_maxIndex = count _array;
+for "_i" from 0 to _maxIndex /* step +1 */ do {
+ if (((_i + 1) < _maxIndex - 1) && {_array select _i == 39 && (_array select (_i + 1)) == 39}) then {
+ if ([_array, _i] call _isEven) then {
+ _array deleteAt _i;
+ _i = _i - 1;
+ _maxIndex = _maxIndex - 1;
+ };
+ };
+};
+
+{
+ if (_x == 34) then {
+ _array set [_foreachIndex, 39];
+ };
+}foreach _array;
+
+toString _array;
diff --git a/addons/optionsmenu/functions/fnc_updateSetting.sqf b/addons/optionsmenu/functions/fnc_updateSetting.sqf
index 3fe16826145..25fa06c604b 100644
--- a/addons/optionsmenu/functions/fnc_updateSetting.sqf
+++ b/addons/optionsmenu/functions/fnc_updateSetting.sqf
@@ -32,9 +32,9 @@ switch (_type) do {
_newValue = [false, true] select _newValue;
};
- if !((_x select 8) isEqualTo _newValue) then {
+ if !((_x select 9) isEqualTo _newValue) then {
_changed = true;
- _x set [8, _newValue];
+ _x set [9, _newValue];
} ;
};
@@ -42,9 +42,9 @@ switch (_type) do {
};
case (MENU_TAB_COLORS): {
{
- if (((_x select 0) == _name) && {!((_x select 8) isEqualTo _newValue)}) then {
+ if (((_x select 0) == _name) && {!((_x select 9) isEqualTo _newValue)}) then {
_changed = true;
- _x set [8, _newValue];
+ _x set [9, _newValue];
};
} foreach GVAR(clientSideColors);
};
@@ -56,9 +56,9 @@ switch (_type) do {
_newValue = [false, true] select _newValue;
};
- if !((_x select 8) isEqualTo _newValue) then {
+ if !((_x select 9) isEqualTo _newValue) then {
_changed = true;
- _x set [8, _newValue];
+ _x set [9, _newValue];
} ;
};
@@ -66,17 +66,17 @@ switch (_type) do {
};
case (MENU_TAB_SERVER_COLORS): {
{
- if (((_x select 0) == _name) && {!((_x select 8) isEqualTo _newValue)}) then {
+ if (((_x select 0) == _name) && {!((_x select 9) isEqualTo _newValue)}) then {
_changed = true;
- _x set [8, _newValue];
+ _x set [9, _newValue];
};
} foreach GVAR(serverSideColors);
};
case (MENU_TAB_SERVER_VALUES): {
{
- if (((_x select 0) == _name) && {!((_x select 8) isEqualTo _newValue)}) then {
+ if (((_x select 0) == _name) && {!((_x select 9) isEqualTo _newValue)}) then {
_changed = true;
- _x set [8, _newValue];
+ _x set [9, _newValue];
};
} foreach GVAR(serverSideValues);
};
diff --git a/addons/optionsmenu/gui/settingsMenu.hpp b/addons/optionsmenu/gui/settingsMenu.hpp
index 665db1f17ab..2c79bdab1d3 100644
--- a/addons/optionsmenu/gui/settingsMenu.hpp
+++ b/addons/optionsmenu/gui/settingsMenu.hpp
@@ -1,9 +1,3 @@
-class ACE_settingsMenu {
- idd = 145246;
- movingEnable = false;
- onLoad = QUOTE(uiNamespace setVariable [ARR_2('ACE_settingsMenu', _this select 0)]; [] call FUNC(onSettingsMenuOpen););
- onUnload = QUOTE(uiNamespace setVariable [ARR_2('ACE_settingsMenu', nil)]; saveProfileNamespace;);
-
#define SIZEX (((safezoneW / safezoneH) min 1.2))
#define SIZEY (SIZEX / 1.2)
#define X_ORIGINAL(num) (num * (SIZEX / 40) + (safezoneX + (safezoneW - SIZEX)/2))
@@ -21,6 +15,12 @@ class ACE_settingsMenu {
#define W_PART(num) QUOTE(linearConversion [ARR_5(0, 2, (missionNamespace getVariable [ARR_2(QUOTE(QGVAR(optionMenuDisplaySize)), 0)]), W_ORIGINAL(num), W_MAKEITBIGGA(num))])
#define H_PART(num) QUOTE(linearConversion [ARR_5(0, 2, (missionNamespace getVariable [ARR_2(QUOTE(QGVAR(optionMenuDisplaySize)), 0)]), H_ORIGINAL(num), H_MAKEITBIGGA(num))])
+class ACE_settingsMenu {
+ idd = 145246;
+ movingEnable = false;
+ onLoad = QUOTE(uiNamespace setVariable [ARR_2('ACE_settingsMenu', _this select 0)]; [] call FUNC(onSettingsMenuOpen););
+ onUnload = QUOTE(uiNamespace setVariable [ARR_2('ACE_settingsMenu', nil)]; saveProfileNamespace;);
+
class controlsBackground {
class HeaderBackground: ACE_gui_backgroundBase {
idc = -1;
@@ -77,9 +77,19 @@ class ACE_settingsMenu {
idc = 13;
x = X_PART(2);
y = Y_PART(3.4);
- w = W_PART(30);
+ w = W_PART(15);
+ h = H_PART(1);
+ text = "";
+ };
+ class categorySelection: ACE_gui_comboBoxBase {
+ idc = 14;
+ x = X_PART(14);
+ y = Y_PART(3.4);
+ w = W_PART(9);
h = H_PART(1);
text = "";
+ onLBSelChanged = QUOTE( call FUNC(onCategorySelectChanged));
+ SizeEx = H_PART(0.9);
};
class selectionAction_1: ACE_gui_buttonBase {
idc = 1000;
@@ -291,6 +301,16 @@ class ACE_serverSettingsMenu: ACE_settingsMenu {
h = H_PART(1);
text = "";
};
+ class categorySelection: ACE_gui_comboBoxBase {
+ idc = 14;
+ x = X_PART(14);
+ y = Y_PART(3.4);
+ w = W_PART(9);
+ h = H_PART(1);
+ text = "";
+ onLBSelChanged = QUOTE( call FUNC(onServerCategorySelectChanged));
+ SizeEx = H_PART(0.9);
+ };
class selectionAction_1: ACE_gui_buttonBase {
idc = 1000;
text = CSTRING(TabOptions);
diff --git a/addons/optionsmenu/stringtable.xml b/addons/optionsmenu/stringtable.xml
index 6d4cde543e3..bde7803e5af 100644
--- a/addons/optionsmenu/stringtable.xml
+++ b/addons/optionsmenu/stringtable.xml
@@ -321,10 +321,10 @@
<German>Protokolliert Debug-Informationen im RPT und speichert sie in der Zwischenablage.</German>
<Portuguese>Envia informação de depuração para RPT e área de transferência.</Portuguese>
</Key>
- <Key ID="STR_ACE_OptionsMenu_headBugFix">
+ <Key ID="STR_ACE_OptionsMenu_headBugFix">
<English>Headbug Fix</English>
</Key>
- <Key ID="STR_ACE_OptionsMenu_headBugFixTooltip">
+ <Key ID="STR_ACE_OptionsMenu_headBugFixTooltip">
<English>Resets your animation state.</English>
</Key>
<Key ID="STR_ACE_OptionsMenu_aceNews">
@@ -343,5 +343,9 @@
<Polish>Pokazuj wiadomości ACE w menu głównym</Polish>
<Czech>Zobrazit novinky v hlavním menu</Czech>
</Key>
+ <Key ID="STR_ACE_OptionsMenu_category_all">
+ <English>All Categories</English>
+ <Polish>Wszystkie kategorie</Polish>
+ </Key>
</Package>
</Project>