diff options
| author | Oskar Nyberg <oskar@mullvad.net> | 2020-02-04 10:11:39 +0100 |
|---|---|---|
| committer | Oskar Nyberg <oskar@mullvad.net> | 2020-02-06 16:58:45 +0100 |
| commit | 9cb69a364bb0f840bf4997969c07e8b2118d5dcc (patch) | |
| tree | 6884860323530cc2481c36d50173b9d1d871b87b /gui/src/renderer | |
| parent | 662dcd175380e650bf7dfb06adf7f842a0e8cdce (diff) | |
| download | mullvadvpn-9cb69a364bb0f840bf4997969c07e8b2118d5dcc.tar.xz mullvadvpn-9cb69a364bb0f840bf4997969c07e8b2118d5dcc.zip | |
Enable monochrome icons setting for all platforms
Diffstat (limited to 'gui/src/renderer')
| -rw-r--r-- | gui/src/renderer/components/Preferences.tsx | 41 | ||||
| -rw-r--r-- | gui/src/renderer/containers/PreferencesPage.tsx | 1 |
2 files changed, 17 insertions, 25 deletions
diff --git a/gui/src/renderer/components/Preferences.tsx b/gui/src/renderer/components/Preferences.tsx index 715d51e40f..d2d1709abc 100644 --- a/gui/src/renderer/components/Preferences.tsx +++ b/gui/src/renderer/components/Preferences.tsx @@ -21,7 +21,6 @@ export interface IProps { enableSystemNotifications: boolean; monochromaticIcon: boolean; startMinimized: boolean; - enableMonochromaticIconToggle: boolean; enableStartMinimizedToggle: boolean; setAutoStart: (autoStart: boolean) => void; setEnableSystemNotifications: (flag: boolean) => void; @@ -120,29 +119,23 @@ export default class Preferences extends Component<IProps> { </Cell.FooterText> </Cell.Footer> - {this.props.enableMonochromaticIconToggle ? ( - <React.Fragment> - <Cell.Container> - <Cell.Label> - {messages.pgettext('preferences-view', 'Monochromatic tray icon')} - </Cell.Label> - <Cell.Switch - isOn={this.props.monochromaticIcon} - onChange={this.props.setMonochromaticIcon} - /> - </Cell.Container> - <Cell.Footer> - <Cell.FooterText> - {messages.pgettext( - 'preferences-view', - 'Use a monochromatic tray icon instead of a colored one.', - )} - </Cell.FooterText> - </Cell.Footer> - </React.Fragment> - ) : ( - undefined - )} + <Cell.Container> + <Cell.Label> + {messages.pgettext('preferences-view', 'Monochromatic tray icon')} + </Cell.Label> + <Cell.Switch + isOn={this.props.monochromaticIcon} + onChange={this.props.setMonochromaticIcon} + /> + </Cell.Container> + <Cell.Footer> + <Cell.FooterText> + {messages.pgettext( + 'preferences-view', + 'Use a monochromatic tray icon instead of a colored one.', + )} + </Cell.FooterText> + </Cell.Footer> {this.props.enableStartMinimizedToggle ? ( <React.Fragment> diff --git a/gui/src/renderer/containers/PreferencesPage.tsx b/gui/src/renderer/containers/PreferencesPage.tsx index 497da2166c..e1b674e0dd 100644 --- a/gui/src/renderer/containers/PreferencesPage.tsx +++ b/gui/src/renderer/containers/PreferencesPage.tsx @@ -44,7 +44,6 @@ const mapDispatchToProps = (dispatch: ReduxDispatch, props: IAppContext) => { setMonochromaticIcon: (monochromaticIcon: boolean) => { props.app.setMonochromaticIcon(monochromaticIcon); }, - enableMonochromaticIconToggle: process.platform === 'darwin', }; }; |