Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

indicate settings that need a mission restart #894

Merged
merged 6 commits into from
Jul 26, 2018

Conversation

commy2
Copy link
Contributor

@commy2 commy2 commented Feb 14, 2018

When merged this pull request will:

  • display new icons if the setting in the current tab applies or is overwritten, instead of only when overwritten
  • adds optional flag for settings that require a restart
  • display yellow icon if the setting is changed during the mission, but requires a restart
  • close (settings) Indicator for non live-editable settings #879

needs testing >.<

@commy2 commy2 added the WIP label Feb 14, 2018
@commy2 commy2 added this to the 3.7 milestone Feb 14, 2018
@commy2 commy2 self-assigned this Feb 14, 2018
@commy2 commy2 modified the milestones: 3.7, 3.8 Apr 14, 2018
@commy2 commy2 modified the milestones: 3.8, 3.9 Jun 25, 2018
@commy2 commy2 modified the milestones: 3.9, 3.8 Jul 3, 2018
@commy2 commy2 added Enhancement and removed WIP labels Jul 3, 2018
@commy2
Copy link
Contributor Author

commy2 commented Jul 4, 2018

Seems to work.

Copy link
Contributor

@dedmen dedmen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code style/syntax wise this looks good ¯_(ツ)_/¯

@commy2
Copy link
Contributor Author

commy2 commented Jul 23, 2018

Is that good enough? 😂 🔨

@@ -108,8 +115,9 @@
#define GET_TEMP_NAMESPACE_VALUE(setting,source) (GET_TEMP_NAMESPACE(source) getVariable [setting, [nil, nil]] select 0)
#define GET_TEMP_NAMESPACE_PRIORITY(setting,source) (GET_TEMP_NAMESPACE(source) getVariable [setting, [nil, nil]] select 1)

#define SET_TEMP_NAMESPACE_VALUE(setting,value,source) (GET_TEMP_NAMESPACE(source) setVariable [setting, [value, GET_TEMP_NAMESPACE_PRIORITY(setting,source)]])
#define SET_TEMP_NAMESPACE_PRIORITY(setting,priority,source) (GET_TEMP_NAMESPACE(source) setVariable [setting, [GET_TEMP_NAMESPACE_VALUE(setting,source), priority]])
#define SET_TEMP_NAMESPACE_AWAITING_RESTART(setting) if (toLower setting in GVAR(needRestart)) then {GVAR(awaitingRestartTemp) pushBackUnique toLower setting}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe we could skip showing in 3den

#define SET_TEMP_NAMESPACE_AWAITING_RESTART(setting) if ((toLower setting in GVAR(needRestart)) && {!is3den}) then {GVAR(awaitingRestartTemp) pushBackUnique toLower setting}

Copy link
Contributor

@PabstMirror PabstMirror left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Combination of this and #952 give some great color-based feedback as to what settings are doing

@commy2 commy2 merged commit 4fcb330 into master Jul 26, 2018
@commy2 commy2 deleted the indicate-need-restart-settings branch July 26, 2018 16:50
ViperMaul added a commit that referenced this pull request Jul 27, 2018
* origin/master:
  XEH - Compatiblity for Encore (1.84) (#953)
  indicate settings that need a mission restart (#894)
  don't skip next PFH if current one is removed while iterating through (#950)
  change color of name of temporarily changed settings (#952)
  handle input gracefully in keybinding editKey ui function (#951)
  Update fnc_deleteEntity.sqf (#949)
@PabstMirror
Copy link
Contributor

@commy2 - Should the icon also change when the setting is changed, not just override checkboxes?

@commy2
Copy link
Contributor Author

commy2 commented Aug 8, 2018

It should be shown when either the setting is changed, or the settings priority is changed, or both I'd say.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

(settings) Indicator for non live-editable settings
3 participants