Change settings checkbox texts to positive phrasing, fixed merge conflicts #4574
Conversation
|
The clipboard test fails occasionally |
|
Is there anything left for me to do here? |
* Change settings checkboxes with negative phrasing (i.e. "don't do something") to positive phrasing, and reverse their effects accordingly. * Change internal names of affected settings to stay consistent with their effect.
* Add a test config file with all deprecated config settings, set to non-default values. * Load the config file and check the updated versions of the deprecated config settings. * Fail if the updated settings have different values than their deprecated equivalents.
Update old config files to use new versions of settings which had their checkboxes in the settins page reversed, while retaining the user's preferred behavior.
757ae0f to
616f779
Compare
|
OMG can anyone help with the new merge conflicts? @phoerious maybe? Seems like there have been substantial changes in the way options are handled. |
|
Yeah, basically everything. Use the new enum config interface instead of strings. |
|
We still want this PR though, it makes a lot of sense |
|
Seems like a re-write of the original changes is required, about which I don't know enough to be helpful here. Can you have a look, @ameyer0? |
|
Yeah, I'll give it a try, hopefully have something in the next day or two. |
|
It should be rather straight-forward. All settings have an equivalent enum key now. If they don't you have to define a new one in core/Config.h and map it in core/Config.cpp. The CLI test failure has been resolved on develop in the meantime. |
|
Merge conflicts are fixed in #4715. |
|
Awesome, thanks. |
|
PR closed, use #4715 instead. |
This PR fixes the merge conflicts in #4429, which in turn implements #3601. Credits for the actual work go to @ameyer0, I only merged develop into it and fixed the merge conflicts. Hopefully I didn't break anything; please have a good look at my changes, @ameyer0 and @droidmonkey!
I'm getting the following error in the unit tests:
but I'm not sure if it's related to the changes on this branch, could be something's wrong on my computer. Didn't check if the same error occurs on the original branch or on develop.