Linux tray icon theme settings regression fix - #392
Merged
yuya-oc merged 2 commits intoDec 12, 2016
Conversation
Contributor
Contributor
|
That's my mistake, thanks for fixing and adding fallback! @jasonblais Sure, it correctly changes theme. But need git-rebase. |
yuya-oc
suggested changes
Dec 11, 2016
yuya-oc
left a comment
yuya-oc
left a comment
Contributor
There was a problem hiding this comment.
To add these changes into v3.5, please rebase to release-3.5 branch.
…p did not start up successfully before
…e icon as a checkbox
jnugh
force-pushed
the
linuxTrayIconThemeSettings
branch
from
December 11, 2016 17:01
5b4ff38 to
d4f3ca2
Compare
Contributor
Author
|
Here we go, just reapplied the commits on a fresh 3.5 branch, works for me 😄 |
Contributor
|
I tested again and it works well. Thanks! |
yuya-oc
approved these changes
Dec 12, 2016
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Before submitting, please confirm you've
npm run lint:jsfor proper code formattingPlease provide the following information:
Summary
This fixes a regression on the settings page that was introduced by upgrading react bootstrap (upgrading to the new form syntax).
On Linux the user can choose from a dark and a light theme for the tray icon. This setting was a select element which was transformed into a checkbox during react bootstrap upgrade.
The user was therefore not able to choose a different theme, when using the checkbox control a bool value was written to the config file which kept the app from opeining up on the next start.
This fix shows the dropdown again, allows to set sane values for the theme config and has a fallback when an invalid value has already been written to the config file - so that the application starts again.
Test Cases
Additional Notes