Merge pull request #444 from CBATeam/settingDynamicDefaultButton

Disable default settings button if setting is already default
CBATeam · Jul 26, 2016 · e8c7529 · e8c7529
2 parents 13227f9 + 1242e74
commit e8c7529
Show file tree

Hide file tree

Showing 9 changed files with 88 additions and 48 deletions.
diff --git a/addons/settings/fnc_gui_refresh.sqf b/addons/settings/fnc_gui_refresh.sqf
@@ -2,7 +2,7 @@
 
 private _display = uiNamespace getVariable [QGVAR(display), displayNull];
 private _ctrlOptionsGroup = ((_display getVariable [QGVAR(controls), []]) select {ctrlShown _x}) param [0, controlNull];
-private _contols = _ctrlOptionsGroup getVariable [QGVAR(controls), []];
+private _controls = _ctrlOptionsGroup getVariable [QGVAR(controls), []];
 
 {
     private _linkedControls = _x getVariable QGVAR(linkedControls);
@@ -15,25 +15,31 @@ private _contols = _ctrlOptionsGroup getVariable [QGVAR(controls), []];
     if (!isNil "_value") then {
         switch (toUpper _settingType) do {
             case ("CHECKBOX"): {
-                _linkedControls params ["_ctrlSetting"];
+                _linkedControls params ["_ctrlSetting", "_defaultControl"];
 
                 _ctrlSetting cbSetChecked _value;
+
+                _defaultControl ctrlEnable !(_value isEqualTo _defaultValue);
             };
             case ("LIST"): {
                 _settingData params ["_values"];
-                _linkedControls params ["_ctrlSetting"];
+                _linkedControls params ["_ctrlSetting", "_defaultControl"];
 
                 _ctrlSetting lbSetCurSel (_values find _value);
+
+                _defaultControl ctrlEnable !(_value isEqualTo _defaultValue);
             };
             case ("SLIDER"): {
                 _settingData params ["", "", "_trailingDecimals"];
-                _linkedControls params ["_ctrlSetting", "_ctrlSettingEdit"];
+                _linkedControls params ["_ctrlSetting", "_ctrlSettingEdit", "_defaultControl"];
 
                 _ctrlSetting sliderSetPosition _value;
                 _ctrlSettingEdit ctrlSetText ([_value, 1, _trailingDecimals] call CBA_fnc_formatNumber);
+
+                _defaultControl ctrlEnable !(_value isEqualTo _defaultValue);
             };
             case ("COLOR"): {
-                _linkedControls params ["_ctrlSettingPreview", "_settingControls"];
+                _linkedControls params ["_ctrlSettingPreview", "_settingControls", "_defaultControl"];
 
                 _value params [
                     ["_r", 0, [0]],
@@ -51,6 +57,8 @@ private _contols = _ctrlOptionsGroup getVariable [QGVAR(controls), []];
                     _ctrlSetting sliderSetPosition _valueX;
                     _ctrlSettingEdit ctrlSetText ([_valueX, 1, 2] call CBA_fnc_formatNumber);
                 } forEach _settingControls;
+
+                _defaultControl ctrlEnable !(_value isEqualTo _defaultValue);
             };
             default {};
         };
@@ -74,4 +82,4 @@ private _contols = _ctrlOptionsGroup getVariable [QGVAR(controls), []];
             default {};
         };
     };
-} forEach _contols;
+} forEach _controls;
diff --git a/addons/settings/gui_createMenu.sqf b/addons/settings/gui_createMenu.sqf
@@ -77,7 +77,7 @@ _display setVariable [QGVAR(controls), []];
         private _isOverwritten = [_setting, _source] call FUNC(isOverwritten);
 
         // ----- create setting changer control
-        private _contols = _ctrlOptionsGroup getVariable QGVAR(controls);
+        private _controls = _ctrlOptionsGroup getVariable QGVAR(controls);
         private _linkedControls = [];
 
         switch (toUpper _settingType) do {

diff --git a/addons/settings/gui_createMenu_checkbox.sqf b/addons/settings/gui_createMenu_checkbox.sqf
@@ -1,7 +1,7 @@
 // inline function, don't include script_component.hpp
 
-private _ctrlSetting = _display ctrlCreate ["RscCheckBox", count _contols + IDC_OFFSET_SETTING, _ctrlOptionsGroup];
-_contols pushBack _ctrlSetting;
+private _ctrlSetting = _display ctrlCreate ["RscCheckBox", count _controls + IDC_OFFSET_SETTING, _ctrlOptionsGroup];
+_controls pushBack _ctrlSetting;
 
 _ctrlSetting ctrlSetPosition [
     POS_W(16),
@@ -24,6 +24,11 @@ _ctrlSetting ctrlAddEventHandler ["CheckedChanged", {
 
     private _value = _state == 1;
     SET_TEMP_NAMESPACE_VALUE(_setting,_value,_source);
+
+    //If new setting is same as default value, grey out the default button
+    (_control getVariable QGVAR(linkedControls)) params ["", "_defaultControl"];
+    (_defaultControl getVariable QGVAR(data)) params ["", "", "_defaultValue"];
+    _defaultControl ctrlEnable (!(_value isEqualTo _defaultValue));
 }];
 
 _linkedControls pushBack _ctrlSetting;

diff --git a/addons/settings/gui_createMenu_color.sqf b/addons/settings/gui_createMenu_color.sqf
@@ -1,7 +1,7 @@
 // inline function, don't include script_component.hpp
 
-private _ctrlSettingPreview = _display ctrlCreate ["RscText", count _contols + IDC_OFFSET_SETTING, _ctrlOptionsGroup];
-_contols pushBack _ctrlSettingPreview;
+private _ctrlSettingPreview = _display ctrlCreate ["RscText", count _controls + IDC_OFFSET_SETTING, _ctrlOptionsGroup];
+_controls pushBack _ctrlSettingPreview;
 
 _ctrlSettingPreview ctrlSetPosition [
     POS_W(9.5),
@@ -28,8 +28,8 @@ _ctrlSettingPreview setVariable [QGVAR(data), _data];
 _linkedControls append [_ctrlSettingPreview, []];
 
 for "_index" from 0 to (((count _defaultValue max 3) min 4) - 1) do {
-    private _ctrlSetting = _display ctrlCreate [SLIDER_TYPES param [_index, "RscXSliderH"], count _contols + IDC_OFFSET_SETTING, _ctrlOptionsGroup];
-    _contols pushBack _ctrlSetting;
+    private _ctrlSetting = _display ctrlCreate [SLIDER_TYPES param [_index, "RscXSliderH"], count _controls + IDC_OFFSET_SETTING, _ctrlOptionsGroup];
+    _controls pushBack _ctrlSetting;
 
     _ctrlSetting ctrlSetPosition [
         POS_W(16),
@@ -52,18 +52,22 @@ for "_index" from 0 to (((count _defaultValue max 3) min 4) - 1) do {
         (_control getVariable QGVAR(data)) params ["_setting", "_source", "_currentValue", "_color"];
         private _index = _control getVariable QGVAR(index);
 
-        (_control getVariable QGVAR(linkedControls)) params ["_ctrlSettingPreview", "_linkedControls"];
+        (_control getVariable QGVAR(linkedControls)) params ["_ctrlSettingPreview", "_linkedControls", "_defaultControl"];
         private _linkedControl = _linkedControls select _index select 1;
         _linkedControl ctrlSetText ([_value, 1, 2] call CBA_fnc_formatNumber);
 
         _currentValue set [_index, _value];
         _color set [_index, _value];
         _ctrlSettingPreview ctrlSetBackgroundColor _color;
         SET_TEMP_NAMESPACE_VALUE(_setting,_currentValue,_source);
+
+        //If new setting is same as default value, grey out the default button
+        (_defaultControl getVariable QGVAR(data)) params ["", "", "_defaultValue"];
+        _defaultControl ctrlEnable (!(_currentValue isEqualTo _defaultValue));
     }];
 
-    private _ctrlSettingEdit = _display ctrlCreate ["RscEdit", count _contols + IDC_OFFSET_SETTING, _ctrlOptionsGroup];
-    _contols pushBack _ctrlSettingEdit;
+    private _ctrlSettingEdit = _display ctrlCreate ["RscEdit", count _controls + IDC_OFFSET_SETTING, _ctrlOptionsGroup];
+    _controls pushBack _ctrlSettingEdit;
 
     _ctrlSettingEdit ctrlSetPosition [
         POS_W(24),
@@ -89,7 +93,7 @@ for "_index" from 0 to (((count _defaultValue max 3) min 4) - 1) do {
         (_control getVariable QGVAR(data)) params ["_setting", "_source", "_currentValue", "_color"];
         private _index = _control getVariable QGVAR(index);
 
-        (_control getVariable QGVAR(linkedControls)) params ["_ctrlSettingPreview", "_linkedControls"];
+        (_control getVariable QGVAR(linkedControls)) params ["_ctrlSettingPreview", "_linkedControls", "_defaultControl"];
 
         private _linkedControl = _linkedControls select _index select 0;
         _linkedControl sliderSetPosition _value;
@@ -98,6 +102,10 @@ for "_index" from 0 to (((count _defaultValue max 3) min 4) - 1) do {
         _color set [_index, _value];
         _ctrlSettingPreview ctrlSetBackgroundColor _color;
         SET_TEMP_NAMESPACE_VALUE(_setting,_currentValue,_source);
+
+        //If new setting is same as default value, grey out the default button
+        (_defaultControl getVariable QGVAR(data)) params ["", "", "_defaultValue"];
+        _defaultControl ctrlEnable (!(_currentValue isEqualTo _defaultValue));
     }];
 
     _ctrlSettingEdit ctrlAddEventHandler ["KillFocus", {

diff --git a/addons/settings/gui_createMenu_default.sqf b/addons/settings/gui_createMenu_default.sqf
@@ -1,7 +1,7 @@
 // inline function, don't include script_component.hpp
 
-private _ctrlSettingDefault = _display ctrlCreate ["RscButtonMenu", count _contols + IDC_OFFSET_SETTING, _ctrlOptionsGroup];
-_contols pushBack _ctrlSettingDefault;
+private _ctrlSettingDefault = _display ctrlCreate ["RscButtonMenu", count _controls + IDC_OFFSET_SETTING, _ctrlOptionsGroup];
+_controls pushBack _ctrlSettingDefault;
 
 _ctrlSettingDefault ctrlSetPosition [
     POS_W(27),
@@ -23,6 +23,9 @@ _ctrlSettingDefault ctrlAddEventHandler ["ButtonClick", {
     (_control getVariable QGVAR(data)) params ["_setting", "_source", "_defaultValue", "_settingType", "_settingData"];
     SET_TEMP_NAMESPACE_VALUE(_setting,_defaultValue,_source);
 
+    // Can disable button as the setting will now be the default
+    _control ctrlEnable false;
+
     private _linkedControls = _control getVariable QGVAR(linkedControls);
 
     // reset buttons to default state
@@ -71,6 +74,6 @@ _ctrlSettingDefault ctrlAddEventHandler ["ButtonClick", {
 
 _linkedControls pushBack _ctrlSettingDefault;
 
-if !(_enabled) then {
+if ((!_enabled) || {_currentValue isEqualTo _defaultValue}) then {
     _ctrlSettingDefault ctrlEnable false;
 };
diff --git a/addons/settings/gui_createMenu_force.sqf b/addons/settings/gui_createMenu_force.sqf
@@ -1,7 +1,7 @@
 // inline function, don't include script_component.hpp
 
-private _ctrlSettingForce = _display ctrlCreate ["RscCheckBox", count _contols + IDC_OFFSET_SETTING, _ctrlOptionsGroup];
-_contols pushBack _ctrlSettingForce;
+private _ctrlSettingForce = _display ctrlCreate ["RscCheckBox", count _controls + IDC_OFFSET_SETTING, _ctrlOptionsGroup];
+_controls pushBack _ctrlSettingForce;
 
 _ctrlSettingForce ctrlSetPosition [
     POS_W(33),

diff --git a/addons/settings/gui_createMenu_list.sqf b/addons/settings/gui_createMenu_list.sqf
@@ -1,7 +1,7 @@
 // inline function, don't include script_component.hpp
 
-private _ctrlSetting = _display ctrlCreate ["RscCombo", count _contols + IDC_OFFSET_SETTING, _ctrlOptionsGroup];
-_contols pushBack _ctrlSetting;
+private _ctrlSetting = _display ctrlCreate ["RscCombo", count _controls + IDC_OFFSET_SETTING, _ctrlOptionsGroup];
+_controls pushBack _ctrlSetting;
 
 _ctrlSetting ctrlSetPosition [
     POS_W(16),
@@ -39,6 +39,11 @@ _ctrlSetting ctrlAddEventHandler ["LBSelChanged", {
 
     private _value = _data select _index;
     SET_TEMP_NAMESPACE_VALUE(_setting,_value,_source);
+
+    //If new setting is same as default value, grey out the default button
+    (_control getVariable QGVAR(linkedControls)) params ["", "_defaultControl"];
+    (_defaultControl getVariable QGVAR(data)) params ["", "", "_defaultValue"];
+    _defaultControl ctrlEnable (!(_value isEqualTo _defaultValue));
 }];
 
 _linkedControls pushBack _ctrlSetting;

diff --git a/addons/settings/gui_createMenu_slider.sqf b/addons/settings/gui_createMenu_slider.sqf
@@ -1,7 +1,7 @@
 // inline function, don't include script_component.hpp
 
-private _ctrlSetting = _display ctrlCreate ["RscXSliderH", count _contols + IDC_OFFSET_SETTING, _ctrlOptionsGroup];
-_contols pushBack _ctrlSetting;
+private _ctrlSetting = _display ctrlCreate ["RscXSliderH", count _controls + IDC_OFFSET_SETTING, _ctrlOptionsGroup];
+_controls pushBack _ctrlSetting;
 
 _ctrlSetting ctrlSetPosition [
     POS_W(16),
@@ -26,14 +26,18 @@ _ctrlSetting ctrlAddEventHandler ["SliderPosChanged", {
 
     (_control getVariable QGVAR(data)) params ["_setting", "_source", "_trailingDecimals"];
 
-    private _linkedControl = _control getVariable QGVAR(linkedControls) select 1;
+    (_control getVariable QGVAR(linkedControls)) params ["", "_linkedControl", "_defaultControl"];
     _linkedControl ctrlSetText ([_value, 1, _trailingDecimals] call CBA_fnc_formatNumber);
 
     SET_TEMP_NAMESPACE_VALUE(_setting,_value,_source);
+
+    //If new setting is same as default value, grey out the default button
+    (_defaultControl getVariable QGVAR(data)) params ["", "", "_defaultValue"];
+    _defaultControl ctrlEnable (!(_value isEqualTo _defaultValue));
 }];
 
-private _ctrlSettingEdit = _display ctrlCreate ["RscEdit", count _contols + IDC_OFFSET_SETTING, _ctrlOptionsGroup];
-_contols pushBack _ctrlSettingEdit;
+private _ctrlSettingEdit = _display ctrlCreate ["RscEdit", count _controls + IDC_OFFSET_SETTING, _ctrlOptionsGroup];
+_controls pushBack _ctrlSettingEdit;
 
 _ctrlSettingEdit ctrlSetPosition [
     POS_W(24),
@@ -54,11 +58,15 @@ _ctrlSettingEdit ctrlAddEventHandler ["KeyUp", {
 
     private _value = parseNumber ctrlText _control;
 
-    private _linkedControl = _control getVariable QGVAR(linkedControls) select 0;
+    (_control getVariable QGVAR(linkedControls)) params ["_linkedControl", "", "_defaultControl"];
     _linkedControl sliderSetPosition _value;
 
     _value = sliderPosition _linkedControl;
     SET_TEMP_NAMESPACE_VALUE(_setting,_value,_source);
+
+    //If new setting is same as default value, grey out the default button
+    (_defaultControl getVariable QGVAR(data)) params ["", "", "_defaultValue"];
+    _defaultControl ctrlEnable (!(_value isEqualTo _defaultValue));
 }];
 
 _ctrlSettingEdit ctrlAddEventHandler ["KillFocus", {

diff --git a/addons/settings/gui_initDisplay.sqf b/addons/settings/gui_initDisplay.sqf
@@ -65,24 +65,27 @@ _ctrlButtonLoad ctrlEnable false;
 _ctrlButtonLoad ctrlShow false;
 _ctrlButtonLoad ctrlAddEventHandler ["ButtonClick", {[ctrlParent (_this select 0), "load"] call FUNC(gui_preset)}];
 
-// ----- create export and import buttons
-private _ctrlButtonImport = _display ctrlCreate ["RscButtonMenu", IDC_BTN_IMPORT];
-
-_ctrlButtonImport ctrlSetPosition [
-    POS_X(24.4),
-    POS_Y(20.5),
-    POS_W(6),
-    POS_H(1)
-];
-
-_ctrlButtonImport ctrlCommit 0;
-_ctrlButtonImport ctrlSetText localize LSTRING(ButtonImport);
-_ctrlButtonImport ctrlSetTooltip localize LSTRING(ButtonImport_tooltip);
-_ctrlButtonImport ctrlEnable false;
-_ctrlButtonImport ctrlShow false;
-_ctrlButtonImport ctrlAddEventHandler ["ButtonClick", {[copyFromClipboard, uiNamespace getVariable QGVAR(source)] call FUNC(import)}];
-
-uiNamespace setVariable [QGVAR(ctrlButtonImport), _ctrlButtonImport];
+// copyFromClipboard has no effect in MP, so only add button in SP
+if (!isMultiplayer) then {
+    // ----- create export and import buttons
+    private _ctrlButtonImport = _display ctrlCreate ["RscButtonMenu", IDC_BTN_IMPORT];
+
+    _ctrlButtonImport ctrlSetPosition [
+        POS_X(24.4),
+        POS_Y(20.5),
+        POS_W(6),
+        POS_H(1)
+    ];
+
+    _ctrlButtonImport ctrlCommit 0;
+    _ctrlButtonImport ctrlSetText localize LSTRING(ButtonImport);
+    _ctrlButtonImport ctrlSetTooltip localize LSTRING(ButtonImport_tooltip);
+    _ctrlButtonImport ctrlEnable false;
+    _ctrlButtonImport ctrlShow false;
+    _ctrlButtonImport ctrlAddEventHandler ["ButtonClick", {[copyFromClipboard, uiNamespace getVariable QGVAR(source)] call FUNC(import)}];
+
+    uiNamespace setVariable [QGVAR(ctrlButtonImport), _ctrlButtonImport];
+};
 
 private _ctrlButtonExport = _display ctrlCreate ["RscButtonMenu", IDC_BTN_EXPORT];