summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2018-12-19 11:33:30 -0200
committerJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2018-12-20 15:03:55 -0200
commit448f1cc02705a1ee59d52b97c03c6c993ccb4816 (patch)
tree7cae7446d0151584a25517fb2f4ea59de0232847
parentd68a7223f12679e7c4ae8755959decb511e3c4f1 (diff)
downloadmullvadvpn-448f1cc02705a1ee59d52b97c03c6c993ccb4816.tar.xz
mullvadvpn-448f1cc02705a1ee59d52b97c03c6c993ccb4816.zip
Add GUI setting for monochromatic tray icon
-rw-r--r--gui/packages/desktop/src/main/gui-settings.js6
-rw-r--r--gui/packages/desktop/src/renderer/redux/settings/reducers.js1
-rw-r--r--gui/packages/desktop/src/shared/gui-settings-state.js1
3 files changed, 8 insertions, 0 deletions
diff --git a/gui/packages/desktop/src/main/gui-settings.js b/gui/packages/desktop/src/main/gui-settings.js
index 2fe3b0178e..1c11b32aec 100644
--- a/gui/packages/desktop/src/main/gui-settings.js
+++ b/gui/packages/desktop/src/main/gui-settings.js
@@ -10,6 +10,7 @@ import type { GuiSettingsState } from '../shared/gui-settings-state';
export default class GuiSettings {
_state: GuiSettingsState = {
+ monochromaticIcon: false,
startMinimized: false,
};
@@ -21,6 +22,7 @@ export default class GuiSettings {
const contents = fs.readFileSync(settingsFile, 'utf8');
const settings = JSON.parse(contents);
+ this._state.monochromaticIcon = settings.monochromaticIcon || false;
this._state.startMinimized = settings.startMinimized || false;
} catch (error) {
log.error(`Failed to read GUI settings file: ${error}`);
@@ -41,6 +43,10 @@ export default class GuiSettings {
return this._state;
}
+ get monochromaticIcon(): boolean {
+ return this._state.monochromaticIcon;
+ }
+
get startMinimized(): boolean {
return this._state.startMinimized;
}
diff --git a/gui/packages/desktop/src/renderer/redux/settings/reducers.js b/gui/packages/desktop/src/renderer/redux/settings/reducers.js
index eb10ed91a0..99795c41ba 100644
--- a/gui/packages/desktop/src/renderer/redux/settings/reducers.js
+++ b/gui/packages/desktop/src/renderer/redux/settings/reducers.js
@@ -59,6 +59,7 @@ export type SettingsReduxState = {
const initialState: SettingsReduxState = {
guiSettings: {
+ monochromaticIcon: false,
startMinimized: false,
},
relaySettings: {
diff --git a/gui/packages/desktop/src/shared/gui-settings-state.js b/gui/packages/desktop/src/shared/gui-settings-state.js
index 5e70295723..4a7ccb572e 100644
--- a/gui/packages/desktop/src/shared/gui-settings-state.js
+++ b/gui/packages/desktop/src/shared/gui-settings-state.js
@@ -1,5 +1,6 @@
// @flow
export type GuiSettingsState = {
+ monochromaticIcon: boolean,
startMinimized: boolean,
};