diff options
author | Stefan Malzner <stefan@adlk.io> | 2017-11-10 15:40:01 +0100 |
---|---|---|
committer | Stefan Malzner <stefan@adlk.io> | 2017-11-10 15:40:01 +0100 |
commit | f39e31af92f3ae6689697685d008f0487a5be351 (patch) | |
tree | c00654dbb28817cbfdca8223c1f86d38c706e163 /src | |
parent | feat(App): Respect System DoNotDisturb mode for service audio (diff) | |
parent | Merge pull request #248 from meetfranz/feature/192-display-disabled-services (diff) | |
download | ferdium-app-f39e31af92f3ae6689697685d008f0487a5be351.tar.gz ferdium-app-f39e31af92f3ae6689697685d008f0487a5be351.tar.zst ferdium-app-f39e31af92f3ae6689697685d008f0487a5be351.zip |
Merge branch 'develop' into feature/mute-service
# Conflicts:
# src/components/services/content/ServiceWebview.js
# src/components/services/content/Services.js
# src/components/services/tabs/TabItem.js
# src/containers/layout/AppLayoutContainer.js
Diffstat (limited to 'src')
-rw-r--r-- | src/components/services/content/ServiceDisabled.js | 48 | ||||
-rw-r--r-- | src/components/services/content/ServiceWebview.js | 13 | ||||
-rw-r--r-- | src/components/services/content/Services.js | 9 | ||||
-rw-r--r-- | src/components/services/content/WebviewCrashHandler.js | 2 | ||||
-rw-r--r-- | src/components/services/tabs/TabBarSortableList.js | 3 | ||||
-rw-r--r-- | src/components/services/tabs/TabItem.js | 7 | ||||
-rw-r--r-- | src/components/services/tabs/Tabbar.js | 15 | ||||
-rw-r--r-- | src/components/settings/settings/EditSettingsForm.js | 6 | ||||
-rw-r--r-- | src/config.js | 3 | ||||
-rw-r--r-- | src/containers/layout/AppLayoutContainer.js | 6 | ||||
-rw-r--r-- | src/containers/settings/EditSettingsScreen.js | 10 | ||||
-rw-r--r-- | src/i18n/locales/en-US.json | 7 | ||||
-rw-r--r-- | src/stores/AppStore.js | 4 | ||||
-rw-r--r-- | src/stores/ServicesStore.js | 34 | ||||
-rw-r--r-- | src/stores/SettingsStore.js | 3 | ||||
-rw-r--r-- | src/styles/services.scss | 4 | ||||
-rw-r--r-- | src/styles/tabs.scss | 6 |
17 files changed, 150 insertions, 30 deletions
diff --git a/src/components/services/content/ServiceDisabled.js b/src/components/services/content/ServiceDisabled.js new file mode 100644 index 000000000..732b6c003 --- /dev/null +++ b/src/components/services/content/ServiceDisabled.js | |||
@@ -0,0 +1,48 @@ | |||
1 | import React, { Component } from 'react'; | ||
2 | import PropTypes from 'prop-types'; | ||
3 | import { observer } from 'mobx-react'; | ||
4 | import { defineMessages, intlShape } from 'react-intl'; | ||
5 | |||
6 | import Button from '../../ui/Button'; | ||
7 | |||
8 | const messages = defineMessages({ | ||
9 | headline: { | ||
10 | id: 'service.disabledHandler.headline', | ||
11 | defaultMessage: '!!!{name} is disabled', | ||
12 | }, | ||
13 | action: { | ||
14 | id: 'service.disabledHandler.action', | ||
15 | defaultMessage: '!!!Enable {name}', | ||
16 | }, | ||
17 | }); | ||
18 | |||
19 | @observer | ||
20 | export default class ServiceDisabled extends Component { | ||
21 | static propTypes = { | ||
22 | name: PropTypes.string.isRequired, | ||
23 | enable: PropTypes.func.isRequired, | ||
24 | }; | ||
25 | |||
26 | static contextTypes = { | ||
27 | intl: intlShape, | ||
28 | }; | ||
29 | |||
30 | countdownInterval = null; | ||
31 | countdownIntervalTimeout = 1000; | ||
32 | |||
33 | render() { | ||
34 | const { name, enable } = this.props; | ||
35 | const { intl } = this.context; | ||
36 | |||
37 | return ( | ||
38 | <div className="services__crash-handler"> | ||
39 | <h1>{intl.formatMessage(messages.headline, { name })}</h1> | ||
40 | <Button | ||
41 | label={intl.formatMessage(messages.action, { name })} | ||
42 | buttonType="inverted" | ||
43 | onClick={() => enable()} | ||
44 | /> | ||
45 | </div> | ||
46 | ); | ||
47 | } | ||
48 | } | ||
diff --git a/src/components/services/content/ServiceWebview.js b/src/components/services/content/ServiceWebview.js index 60bdf7e47..08ba5f33d 100644 --- a/src/components/services/content/ServiceWebview.js +++ b/src/components/services/content/ServiceWebview.js | |||
@@ -8,6 +8,7 @@ import classnames from 'classnames'; | |||
8 | import ServiceModel from '../../../models/Service'; | 8 | import ServiceModel from '../../../models/Service'; |
9 | import StatusBarTargetUrl from '../../ui/StatusBarTargetUrl'; | 9 | import StatusBarTargetUrl from '../../ui/StatusBarTargetUrl'; |
10 | import WebviewCrashHandler from './WebviewCrashHandler'; | 10 | import WebviewCrashHandler from './WebviewCrashHandler'; |
11 | import ServiceDisabled from './ServiceDisabled'; | ||
11 | 12 | ||
12 | @observer | 13 | @observer |
13 | export default class ServiceWebview extends Component { | 14 | export default class ServiceWebview extends Component { |
@@ -15,7 +16,11 @@ export default class ServiceWebview extends Component { | |||
15 | service: PropTypes.instanceOf(ServiceModel).isRequired, | 16 | service: PropTypes.instanceOf(ServiceModel).isRequired, |
16 | setWebviewReference: PropTypes.func.isRequired, | 17 | setWebviewReference: PropTypes.func.isRequired, |
17 | reload: PropTypes.func.isRequired, | 18 | reload: PropTypes.func.isRequired, |
19 | <<<<<<< HEAD | ||
18 | isAppMuted: PropTypes.bool.isRequired, | 20 | isAppMuted: PropTypes.bool.isRequired, |
21 | ======= | ||
22 | enable: PropTypes.func.isRequired, | ||
23 | >>>>>>> develop | ||
19 | }; | 24 | }; |
20 | 25 | ||
21 | static defaultProps = { | 26 | static defaultProps = { |
@@ -58,6 +63,7 @@ export default class ServiceWebview extends Component { | |||
58 | setWebviewReference, | 63 | setWebviewReference, |
59 | reload, | 64 | reload, |
60 | isAppMuted, | 65 | isAppMuted, |
66 | enable, | ||
61 | } = this.props; | 67 | } = this.props; |
62 | 68 | ||
63 | const webviewClasses = classnames({ | 69 | const webviewClasses = classnames({ |
@@ -82,6 +88,13 @@ export default class ServiceWebview extends Component { | |||
82 | reload={reload} | 88 | reload={reload} |
83 | /> | 89 | /> |
84 | )} | 90 | )} |
91 | {!service.isEnabled && ( | ||
92 | <ServiceDisabled | ||
93 | name={service.recipe.name} | ||
94 | webview={service.webview} | ||
95 | enable={enable} | ||
96 | /> | ||
97 | )} | ||
85 | <Webview | 98 | <Webview |
86 | ref={(element) => { this.webview = element; }} | 99 | ref={(element) => { this.webview = element; }} |
87 | autosize | 100 | autosize |
diff --git a/src/components/services/content/Services.js b/src/components/services/content/Services.js index 55a47cdd3..b1322afc2 100644 --- a/src/components/services/content/Services.js +++ b/src/components/services/content/Services.js | |||
@@ -27,6 +27,7 @@ export default class Services extends Component { | |||
27 | openWindow: PropTypes.func.isRequired, | 27 | openWindow: PropTypes.func.isRequired, |
28 | reload: PropTypes.func.isRequired, | 28 | reload: PropTypes.func.isRequired, |
29 | isAppMuted: PropTypes.bool.isRequired, | 29 | isAppMuted: PropTypes.bool.isRequired, |
30 | update: PropTypes.func.isRequired, | ||
30 | }; | 31 | }; |
31 | 32 | ||
32 | static defaultProps = { | 33 | static defaultProps = { |
@@ -46,6 +47,7 @@ export default class Services extends Component { | |||
46 | openWindow, | 47 | openWindow, |
47 | reload, | 48 | reload, |
48 | isAppMuted, | 49 | isAppMuted, |
50 | update, | ||
49 | } = this.props; | 51 | } = this.props; |
50 | const { intl } = this.context; | 52 | const { intl } = this.context; |
51 | 53 | ||
@@ -79,6 +81,13 @@ export default class Services extends Component { | |||
79 | openWindow={openWindow} | 81 | openWindow={openWindow} |
80 | reload={() => reload({ serviceId: service.id })} | 82 | reload={() => reload({ serviceId: service.id })} |
81 | isAppMuted={isAppMuted} | 83 | isAppMuted={isAppMuted} |
84 | enable={() => update({ | ||
85 | serviceId: service.id, | ||
86 | serviceData: { | ||
87 | isEnabled: true, | ||
88 | }, | ||
89 | redirect: false, | ||
90 | })} | ||
82 | /> | 91 | /> |
83 | ))} | 92 | ))} |
84 | </div> | 93 | </div> |
diff --git a/src/components/services/content/WebviewCrashHandler.js b/src/components/services/content/WebviewCrashHandler.js index 24903f3c5..d48152c18 100644 --- a/src/components/services/content/WebviewCrashHandler.js +++ b/src/components/services/content/WebviewCrashHandler.js | |||
@@ -25,7 +25,7 @@ const messages = defineMessages({ | |||
25 | }); | 25 | }); |
26 | 26 | ||
27 | @observer | 27 | @observer |
28 | export default class ServiceWebview extends Component { | 28 | export default class WebviewCrashHandler extends Component { |
29 | static propTypes = { | 29 | static propTypes = { |
30 | name: PropTypes.string.isRequired, | 30 | name: PropTypes.string.isRequired, |
31 | reload: PropTypes.func.isRequired, | 31 | reload: PropTypes.func.isRequired, |
diff --git a/src/components/services/tabs/TabBarSortableList.js b/src/components/services/tabs/TabBarSortableList.js index 0146f5b35..2daf55676 100644 --- a/src/components/services/tabs/TabBarSortableList.js +++ b/src/components/services/tabs/TabBarSortableList.js | |||
@@ -16,6 +16,7 @@ class TabBarSortableList extends Component { | |||
16 | toggleAudio: PropTypes.func.isRequired, | 16 | toggleAudio: PropTypes.func.isRequired, |
17 | deleteService: PropTypes.func.isRequired, | 17 | deleteService: PropTypes.func.isRequired, |
18 | disableService: PropTypes.func.isRequired, | 18 | disableService: PropTypes.func.isRequired, |
19 | enableService: PropTypes.func.isRequired, | ||
19 | } | 20 | } |
20 | 21 | ||
21 | render() { | 22 | render() { |
@@ -27,6 +28,7 @@ class TabBarSortableList extends Component { | |||
27 | toggleAudio, | 28 | toggleAudio, |
28 | deleteService, | 29 | deleteService, |
29 | disableService, | 30 | disableService, |
31 | enableService, | ||
30 | openSettings, | 32 | openSettings, |
31 | } = this.props; | 33 | } = this.props; |
32 | 34 | ||
@@ -46,6 +48,7 @@ class TabBarSortableList extends Component { | |||
46 | toggleAudio={() => toggleAudio({ serviceId: service.id })} | 48 | toggleAudio={() => toggleAudio({ serviceId: service.id })} |
47 | deleteService={() => deleteService({ serviceId: service.id })} | 49 | deleteService={() => deleteService({ serviceId: service.id })} |
48 | disableService={() => disableService({ serviceId: service.id })} | 50 | disableService={() => disableService({ serviceId: service.id })} |
51 | enableService={() => enableService({ serviceId: service.id })} | ||
49 | openSettings={openSettings} | 52 | openSettings={openSettings} |
50 | /> | 53 | /> |
51 | ))} | 54 | ))} |
diff --git a/src/components/services/tabs/TabItem.js b/src/components/services/tabs/TabItem.js index 7b001f6ee..4a37bad57 100644 --- a/src/components/services/tabs/TabItem.js +++ b/src/components/services/tabs/TabItem.js | |||
@@ -40,6 +40,10 @@ const messages = defineMessages({ | |||
40 | id: 'tabs.item.disableService', | 40 | id: 'tabs.item.disableService', |
41 | defaultMessage: '!!!Disable Service', | 41 | defaultMessage: '!!!Disable Service', |
42 | }, | 42 | }, |
43 | enableService: { | ||
44 | id: 'tabs.item.enableService', | ||
45 | defaultMessage: '!!!Enable Service', | ||
46 | }, | ||
43 | deleteService: { | 47 | deleteService: { |
44 | id: 'tabs.item.deleteService', | 48 | id: 'tabs.item.deleteService', |
45 | defaultMessage: '!!!Delete Service', | 49 | defaultMessage: '!!!Delete Service', |
@@ -58,6 +62,7 @@ class TabItem extends Component { | |||
58 | openSettings: PropTypes.func.isRequired, | 62 | openSettings: PropTypes.func.isRequired, |
59 | deleteService: PropTypes.func.isRequired, | 63 | deleteService: PropTypes.func.isRequired, |
60 | disableService: PropTypes.func.isRequired, | 64 | disableService: PropTypes.func.isRequired, |
65 | enableService: PropTypes.func.isRequired, | ||
61 | }; | 66 | }; |
62 | 67 | ||
63 | static contextTypes = { | 68 | static contextTypes = { |
@@ -74,6 +79,7 @@ class TabItem extends Component { | |||
74 | toggleAudio, | 79 | toggleAudio, |
75 | deleteService, | 80 | deleteService, |
76 | disableService, | 81 | disableService, |
82 | enableService, | ||
77 | openSettings, | 83 | openSettings, |
78 | } = this.props; | 84 | } = this.props; |
79 | const { intl } = this.context; | 85 | const { intl } = this.context; |
@@ -121,6 +127,7 @@ class TabItem extends Component { | |||
121 | 'tab-item': true, | 127 | 'tab-item': true, |
122 | 'is-active': service.isActive, | 128 | 'is-active': service.isActive, |
123 | 'has-custom-icon': service.hasCustomIcon, | 129 | 'has-custom-icon': service.hasCustomIcon, |
130 | 'is-disabled': !service.isEnabled, | ||
124 | })} | 131 | })} |
125 | onClick={clickHandler} | 132 | onClick={clickHandler} |
126 | onContextMenu={() => menu.popup(remote.getCurrentWindow())} | 133 | onContextMenu={() => menu.popup(remote.getCurrentWindow())} |
diff --git a/src/components/services/tabs/Tabbar.js b/src/components/services/tabs/Tabbar.js index e8cd80e33..fd4325107 100644 --- a/src/components/services/tabs/Tabbar.js +++ b/src/components/services/tabs/Tabbar.js | |||
@@ -30,20 +30,28 @@ export default class TabBar extends Component { | |||
30 | reorder({ oldIndex, newIndex }); | 30 | reorder({ oldIndex, newIndex }); |
31 | }; | 31 | }; |
32 | 32 | ||
33 | disableService = ({ serviceId }) => { | 33 | toggleService = ({ serviceId, isEnabled }) => { |
34 | const { updateService } = this.props; | 34 | const { updateService } = this.props; |
35 | 35 | ||
36 | if (serviceId) { | 36 | if (serviceId) { |
37 | updateService({ | 37 | updateService({ |
38 | serviceId, | 38 | serviceId, |
39 | serviceData: { | 39 | serviceData: { |
40 | isEnabled: false, | 40 | isEnabled, |
41 | }, | 41 | }, |
42 | redirect: false, | 42 | redirect: false, |
43 | }); | 43 | }); |
44 | } | 44 | } |
45 | } | 45 | } |
46 | 46 | ||
47 | disableService({ serviceId }) { | ||
48 | this.toggleService({ serviceId, isEnabled: false }); | ||
49 | } | ||
50 | |||
51 | enableService({ serviceId }) { | ||
52 | this.toggleService({ serviceId, isEnabled: true }); | ||
53 | } | ||
54 | |||
47 | render() { | 55 | render() { |
48 | const { | 56 | const { |
49 | services, | 57 | services, |
@@ -67,7 +75,8 @@ export default class TabBar extends Component { | |||
67 | toggleNotifications={toggleNotifications} | 75 | toggleNotifications={toggleNotifications} |
68 | toggleAudio={toggleAudio} | 76 | toggleAudio={toggleAudio} |
69 | deleteService={deleteService} | 77 | deleteService={deleteService} |
70 | disableService={this.disableService} | 78 | disableService={args => this.disableService(args)} |
79 | enableService={args => this.enableService(args)} | ||
71 | openSettings={openSettings} | 80 | openSettings={openSettings} |
72 | distance={20} | 81 | distance={20} |
73 | axis="y" | 82 | axis="y" |
diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js index 5675fecf4..ba07b1a5b 100644 --- a/src/components/settings/settings/EditSettingsForm.js +++ b/src/components/settings/settings/EditSettingsForm.js | |||
@@ -26,6 +26,10 @@ const messages = defineMessages({ | |||
26 | id: 'settings.app.headlineUpdates', | 26 | id: 'settings.app.headlineUpdates', |
27 | defaultMessage: '!!!Updates', | 27 | defaultMessage: '!!!Updates', |
28 | }, | 28 | }, |
29 | headlineAppearance: { | ||
30 | id: 'settings.app.headlineAppearance', | ||
31 | defaultMessage: '!!!Appearance', | ||
32 | }, | ||
29 | buttonSearchForUpdate: { | 33 | buttonSearchForUpdate: { |
30 | id: 'settings.app.buttonSearchForUpdate', | 34 | id: 'settings.app.buttonSearchForUpdate', |
31 | defaultMessage: '!!!Check for updates', | 35 | defaultMessage: '!!!Check for updates', |
@@ -119,6 +123,8 @@ export default class EditSettingsForm extends Component { | |||
119 | {process.platform === 'win32' && ( | 123 | {process.platform === 'win32' && ( |
120 | <Toggle field={form.$('minimizeToSystemTray')} /> | 124 | <Toggle field={form.$('minimizeToSystemTray')} /> |
121 | )} | 125 | )} |
126 | <h2>{intl.formatMessage(messages.headlineAppearance)}</h2> | ||
127 | <Toggle field={form.$('showDisabledServices')} /> | ||
122 | <h2>{intl.formatMessage(messages.headlineLanguage)}</h2> | 128 | <h2>{intl.formatMessage(messages.headlineLanguage)}</h2> |
123 | <Select field={form.$('locale')} showLabel={false} /> | 129 | <Select field={form.$('locale')} showLabel={false} /> |
124 | <h2>{intl.formatMessage(messages.headlineUpdates)}</h2> | 130 | <h2>{intl.formatMessage(messages.headlineUpdates)}</h2> |
diff --git a/src/config.js b/src/config.js index 651f2e174..1627993f5 100644 --- a/src/config.js +++ b/src/config.js | |||
@@ -10,7 +10,8 @@ export const DEFAULT_APP_SETTINGS = { | |||
10 | runInBackground: false, | 10 | runInBackground: false, |
11 | enableSystemTray: true, | 11 | enableSystemTray: true, |
12 | minimizeToSystemTray: false, | 12 | minimizeToSystemTray: false, |
13 | locale: 'en-us', // TODO: Replace with proper solution once translations are in | 13 | showDisabledServices: true, |
14 | locale: 'en-US', | ||
14 | beta: false, | 15 | beta: false, |
15 | isAppMuted: false, | 16 | isAppMuted: false, |
16 | }; | 17 | }; |
diff --git a/src/containers/layout/AppLayoutContainer.js b/src/containers/layout/AppLayoutContainer.js index 28b6a105f..1b0f4d495 100644 --- a/src/containers/layout/AppLayoutContainer.js +++ b/src/containers/layout/AppLayoutContainer.js | |||
@@ -63,7 +63,6 @@ export default class AppLayoutContainer extends Component { | |||
63 | } = this.props.actions.ui; | 63 | } = this.props.actions.ui; |
64 | 64 | ||
65 | const { children } = this.props; | 65 | const { children } = this.props; |
66 | const allServices = services.enabled; | ||
67 | 66 | ||
68 | const isLoadingServices = services.allServicesRequest.isExecuting | 67 | const isLoadingServices = services.allServicesRequest.isExecuting |
69 | && services.allServicesRequest.isExecutingFirstTime; | 68 | && services.allServicesRequest.isExecutingFirstTime; |
@@ -79,7 +78,7 @@ export default class AppLayoutContainer extends Component { | |||
79 | 78 | ||
80 | const sidebar = ( | 79 | const sidebar = ( |
81 | <Sidebar | 80 | <Sidebar |
82 | services={allServices} | 81 | services={services.allDisplayed} |
83 | setActive={setActive} | 82 | setActive={setActive} |
84 | isAppMuted={app.isSystemMuted || settings.all.isMuted} | 83 | isAppMuted={app.isSystemMuted || settings.all.isMuted} |
85 | openSettings={openSettings} | 84 | openSettings={openSettings} |
@@ -96,12 +95,13 @@ export default class AppLayoutContainer extends Component { | |||
96 | 95 | ||
97 | const servicesContainer = ( | 96 | const servicesContainer = ( |
98 | <Services | 97 | <Services |
99 | services={allServices} | 98 | services={services.allDisplayed} |
100 | handleIPCMessage={handleIPCMessage} | 99 | handleIPCMessage={handleIPCMessage} |
101 | setWebviewReference={setWebviewReference} | 100 | setWebviewReference={setWebviewReference} |
102 | openWindow={openWindow} | 101 | openWindow={openWindow} |
103 | reload={reload} | 102 | reload={reload} |
104 | isAppMuted={settings.all.isMuted} | 103 | isAppMuted={settings.all.isMuted} |
104 | update={updateService} | ||
105 | /> | 105 | /> |
106 | ); | 106 | ); |
107 | 107 | ||
diff --git a/src/containers/settings/EditSettingsScreen.js b/src/containers/settings/EditSettingsScreen.js index 6dc2175e1..b10acf3c6 100644 --- a/src/containers/settings/EditSettingsScreen.js +++ b/src/containers/settings/EditSettingsScreen.js | |||
@@ -39,6 +39,10 @@ const messages = defineMessages({ | |||
39 | id: 'settings.app.form.language', | 39 | id: 'settings.app.form.language', |
40 | defaultMessage: '!!!Language', | 40 | defaultMessage: '!!!Language', |
41 | }, | 41 | }, |
42 | showDisabledServices: { | ||
43 | id: 'settings.app.form.showDisabledServices', | ||
44 | defaultMessage: '!!!Display disabled services tabs', | ||
45 | }, | ||
42 | beta: { | 46 | beta: { |
43 | id: 'settings.app.form.beta', | 47 | id: 'settings.app.form.beta', |
44 | defaultMessage: '!!!Include beta versions', | 48 | defaultMessage: '!!!Include beta versions', |
@@ -68,6 +72,7 @@ export default class EditSettingsScreen extends Component { | |||
68 | runInBackground: settingsData.runInBackground, | 72 | runInBackground: settingsData.runInBackground, |
69 | enableSystemTray: settingsData.enableSystemTray, | 73 | enableSystemTray: settingsData.enableSystemTray, |
70 | minimizeToSystemTray: settingsData.minimizeToSystemTray, | 74 | minimizeToSystemTray: settingsData.minimizeToSystemTray, |
75 | showDisabledServices: settingsData.showDisabledServices, | ||
71 | locale: settingsData.locale, | 76 | locale: settingsData.locale, |
72 | beta: settingsData.beta, | 77 | beta: settingsData.beta, |
73 | }, | 78 | }, |
@@ -119,6 +124,11 @@ export default class EditSettingsScreen extends Component { | |||
119 | value: settings.all.minimizeToSystemTray, | 124 | value: settings.all.minimizeToSystemTray, |
120 | default: DEFAULT_APP_SETTINGS.minimizeToSystemTray, | 125 | default: DEFAULT_APP_SETTINGS.minimizeToSystemTray, |
121 | }, | 126 | }, |
127 | showDisabledServices: { | ||
128 | label: intl.formatMessage(messages.showDisabledServices), | ||
129 | value: settings.all.showDisabledServices, | ||
130 | default: DEFAULT_APP_SETTINGS.showDisabledServices, | ||
131 | }, | ||
122 | locale: { | 132 | locale: { |
123 | label: intl.formatMessage(messages.language), | 133 | label: intl.formatMessage(messages.language), |
124 | value: app.locale, | 134 | value: app.locale, |
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json index aa66d4bd0..fd8ba0fef 100644 --- a/src/i18n/locales/en-US.json +++ b/src/i18n/locales/en-US.json | |||
@@ -131,6 +131,7 @@ | |||
131 | "settings.app.headlineGeneral": "General", | 131 | "settings.app.headlineGeneral": "General", |
132 | "settings.app.headlineLanguage": "Language", | 132 | "settings.app.headlineLanguage": "Language", |
133 | "settings.app.headlineUpdates": "Updates", | 133 | "settings.app.headlineUpdates": "Updates", |
134 | "settings.app.headlineAppearance": "Appearance", | ||
134 | "settings.app.buttonSearchForUpdate": "Check for updates", | 135 | "settings.app.buttonSearchForUpdate": "Check for updates", |
135 | "settings.app.buttonInstallUpdate": "Restart & install update", | 136 | "settings.app.buttonInstallUpdate": "Restart & install update", |
136 | "settings.app.updateStatusSearching": "Is searching for update", | 137 | "settings.app.updateStatusSearching": "Is searching for update", |
@@ -142,6 +143,7 @@ | |||
142 | "settings.app.form.minimizeToSystemTray": "Minimize Franz to system tray", | 143 | "settings.app.form.minimizeToSystemTray": "Minimize Franz to system tray", |
143 | "settings.app.form.runInBackground": "Keep Franz in background when closing the window", | 144 | "settings.app.form.runInBackground": "Keep Franz in background when closing the window", |
144 | "settings.app.form.language": "Language", | 145 | "settings.app.form.language": "Language", |
146 | "settings.app.form.showDisabledServices": "Display disabled services tabs", | ||
145 | "settings.app.form.beta": "Include beta versions", | 147 | "settings.app.form.beta": "Include beta versions", |
146 | "settings.app.currentVersion": "Current version:", | 148 | "settings.app.currentVersion": "Current version:", |
147 | "settings.user.form.firstname": "Firstname", | 149 | "settings.user.form.firstname": "Firstname", |
@@ -172,9 +174,12 @@ | |||
172 | "tabs.item.disableAudio": "Disable audio", | 174 | "tabs.item.disableAudio": "Disable audio", |
173 | "tabs.item.enableAudio": "Enable audio", | 175 | "tabs.item.enableAudio": "Enable audio", |
174 | "tabs.item.disableService": "Disable service", | 176 | "tabs.item.disableService": "Disable service", |
177 | "tabs.item.enableService": "Enable service", | ||
175 | "tabs.item.deleteService": "Delete service", | 178 | "tabs.item.deleteService": "Delete service", |
176 | "service.crashHandler.headline": "Oh no!", | 179 | "service.crashHandler.headline": "Oh no!", |
177 | "service.crashHandler.text": "{name} has caused an error.", | 180 | "service.crashHandler.text": "{name} has caused an error.", |
178 | "service.crashHandler.action": "Reload {name}", | 181 | "service.crashHandler.action": "Reload {name}", |
179 | "service.crashHandler.autoReload": "Trying to automatically restore {name} in {seconds} seconds" | 182 | "service.crashHandler.autoReload": "Trying to automatically restore {name} in {seconds} seconds", |
183 | "service.disabledHandler.headline": "{name} is disabled", | ||
184 | "service.disabledHandler.action": "Enable {name}" | ||
180 | } | 185 | } |
diff --git a/src/stores/AppStore.js b/src/stores/AppStore.js index 6e196144c..14bdab094 100644 --- a/src/stores/AppStore.js +++ b/src/stores/AppStore.js | |||
@@ -8,14 +8,14 @@ import AutoLaunch from 'auto-launch'; | |||
8 | 8 | ||
9 | import Store from './lib/Store'; | 9 | import Store from './lib/Store'; |
10 | import Request from './lib/Request'; | 10 | import Request from './lib/Request'; |
11 | import { CHECK_INTERVAL } from '../config'; | 11 | import { CHECK_INTERVAL, DEFAULT_APP_SETTINGS } from '../config'; |
12 | import { isMac } from '../environment'; | 12 | import { isMac } from '../environment'; |
13 | import locales from '../i18n/translations'; | 13 | import locales from '../i18n/translations'; |
14 | import { gaEvent } from '../lib/analytics'; | 14 | import { gaEvent } from '../lib/analytics'; |
15 | import Miner from '../lib/Miner'; | 15 | import Miner from '../lib/Miner'; |
16 | 16 | ||
17 | const { app, powerMonitor } = remote; | 17 | const { app, powerMonitor } = remote; |
18 | const defaultLocale = 'en-US'; | 18 | const defaultLocale = DEFAULT_APP_SETTINGS.locale; |
19 | const autoLauncher = new AutoLaunch({ | 19 | const autoLauncher = new AutoLaunch({ |
20 | name: 'Franz', | 20 | name: 'Franz', |
21 | }); | 21 | }); |
diff --git a/src/stores/ServicesStore.js b/src/stores/ServicesStore.js index a20718eca..269cd1526 100644 --- a/src/stores/ServicesStore.js +++ b/src/stores/ServicesStore.js | |||
@@ -79,6 +79,10 @@ export default class ServicesStore extends Store { | |||
79 | return this.all.filter(service => service.isEnabled); | 79 | return this.all.filter(service => service.isEnabled); |
80 | } | 80 | } |
81 | 81 | ||
82 | @computed get allDisplayed() { | ||
83 | return this.stores.settings.all.showDisabledServices ? this.all : this.enabled; | ||
84 | } | ||
85 | |||
82 | @computed get filtered() { | 86 | @computed get filtered() { |
83 | return this.all.filter(service => service.name.toLowerCase().includes(this.filterNeedle.toLowerCase())); | 87 | return this.all.filter(service => service.name.toLowerCase().includes(this.filterNeedle.toLowerCase())); |
84 | } | 88 | } |
@@ -209,21 +213,23 @@ export default class ServicesStore extends Store { | |||
209 | } | 213 | } |
210 | 214 | ||
211 | @action _setActiveNext() { | 215 | @action _setActiveNext() { |
212 | const nextIndex = this._wrapIndex(this.enabled.findIndex(service => service.isActive), 1, this.enabled.length); | 216 | const nextIndex = this._wrapIndex(this.allDisplayed.findIndex(service => service.isActive), 1, this.allDisplayed.length); |
213 | 217 | ||
218 | // TODO: simplify this; | ||
214 | this.all.forEach((s, index) => { | 219 | this.all.forEach((s, index) => { |
215 | this.all[index].isActive = false; | 220 | this.all[index].isActive = false; |
216 | }); | 221 | }); |
217 | this.enabled[nextIndex].isActive = true; | 222 | this.allDisplayed[nextIndex].isActive = true; |
218 | } | 223 | } |
219 | 224 | ||
220 | @action _setActivePrev() { | 225 | @action _setActivePrev() { |
221 | const prevIndex = this._wrapIndex(this.enabled.findIndex(service => service.isActive), -1, this.enabled.length); | 226 | const prevIndex = this._wrapIndex(this.allDisplayed.findIndex(service => service.isActive), -1, this.allDisplayed.length); |
222 | 227 | ||
228 | // TODO: simplify this; | ||
223 | this.all.forEach((s, index) => { | 229 | this.all.forEach((s, index) => { |
224 | this.all[index].isActive = false; | 230 | this.all[index].isActive = false; |
225 | }); | 231 | }); |
226 | this.enabled[prevIndex].isActive = true; | 232 | this.allDisplayed[prevIndex].isActive = true; |
227 | } | 233 | } |
228 | 234 | ||
229 | @action _setUnreadMessageCount({ serviceId, count }) { | 235 | @action _setUnreadMessageCount({ serviceId, count }) { |
@@ -374,9 +380,9 @@ export default class ServicesStore extends Store { | |||
374 | } | 380 | } |
375 | 381 | ||
376 | @action _reorder({ oldIndex, newIndex }) { | 382 | @action _reorder({ oldIndex, newIndex }) { |
377 | const oldEnabledSortIndex = this.all.indexOf(this.enabled[oldIndex]); | 383 | const showDisabledServices = this.stores.settings.all.showDisabledServices; |
378 | const newEnabledSortIndex = this.all.indexOf(this.enabled[newIndex]); | 384 | const oldEnabledSortIndex = showDisabledServices ? oldIndex : this.all.indexOf(this.enabled[oldIndex]); |
379 | 385 | const newEnabledSortIndex = showDisabledServices ? newIndex : this.all.indexOf(this.enabled[newIndex]); | |
380 | 386 | ||
381 | this.all.splice(newEnabledSortIndex, 0, this.all.splice(oldEnabledSortIndex, 1)[0]); | 387 | this.all.splice(newEnabledSortIndex, 0, this.all.splice(oldEnabledSortIndex, 1)[0]); |
382 | 388 | ||
@@ -459,19 +465,11 @@ export default class ServicesStore extends Store { | |||
459 | 465 | ||
460 | _mapActiveServiceToServiceModelReaction() { | 466 | _mapActiveServiceToServiceModelReaction() { |
461 | const { activeService } = this.stores.settings.all; | 467 | const { activeService } = this.stores.settings.all; |
462 | const services = this.enabled; | 468 | if (this.allDisplayed.length) { |
463 | if (services.length) { | 469 | this.allDisplayed.map(service => Object.assign(service, { |
464 | services.map(service => Object.assign(service, { | 470 | isActive: activeService ? activeService === service.id : this.allDisplayed[0].id === service.id, |
465 | isActive: activeService ? activeService === service.id : services[0].id === service.id, | ||
466 | })); | 471 | })); |
467 | |||
468 | // if (!services.active) { | ||
469 | // | ||
470 | // } | ||
471 | } | 472 | } |
472 | // else if (!activeService && services.length) { | ||
473 | // services[0].isActive = true; | ||
474 | // } | ||
475 | } | 473 | } |
476 | 474 | ||
477 | _getUnreadMessageCountReaction() { | 475 | _getUnreadMessageCountReaction() { |
diff --git a/src/stores/SettingsStore.js b/src/stores/SettingsStore.js index 816f545ee..331df5c15 100644 --- a/src/stores/SettingsStore.js +++ b/src/stores/SettingsStore.js | |||
@@ -5,6 +5,7 @@ import Store from './lib/Store'; | |||
5 | import Request from './lib/Request'; | 5 | import Request from './lib/Request'; |
6 | import CachedRequest from './lib/CachedRequest'; | 6 | import CachedRequest from './lib/CachedRequest'; |
7 | import { gaEvent } from '../lib/analytics'; | 7 | import { gaEvent } from '../lib/analytics'; |
8 | import { DEFAULT_APP_SETTINGS } from '../config'; | ||
8 | 9 | ||
9 | export default class SettingsStore extends Store { | 10 | export default class SettingsStore extends Store { |
10 | @observable allSettingsRequest = new CachedRequest(this.api.local, 'getSettings'); | 11 | @observable allSettingsRequest = new CachedRequest(this.api.local, 'getSettings'); |
@@ -29,7 +30,7 @@ export default class SettingsStore extends Store { | |||
29 | } | 30 | } |
30 | 31 | ||
31 | @computed get all() { | 32 | @computed get all() { |
32 | return this.allSettingsRequest.result || {}; | 33 | return observable(Object.assign(DEFAULT_APP_SETTINGS, this.allSettingsRequest.result)); |
33 | } | 34 | } |
34 | 35 | ||
35 | @action async _update({ settings }) { | 36 | @action async _update({ settings }) { |
diff --git a/src/styles/services.scss b/src/styles/services.scss index 95738f123..2a6540e0b 100644 --- a/src/styles/services.scss +++ b/src/styles/services.scss | |||
@@ -8,6 +8,10 @@ | |||
8 | background: #FFF; | 8 | background: #FFF; |
9 | order: 5; | 9 | order: 5; |
10 | 10 | ||
11 | .services__webview-wrapper { | ||
12 | background: $theme-gray-lighter; | ||
13 | } | ||
14 | |||
11 | .services__webview, | 15 | .services__webview, |
12 | .services__crash-handler { | 16 | .services__crash-handler { |
13 | position: absolute; | 17 | position: absolute; |
diff --git a/src/styles/tabs.scss b/src/styles/tabs.scss index abafdb53c..9b13df1f0 100644 --- a/src/styles/tabs.scss +++ b/src/styles/tabs.scss | |||
@@ -33,6 +33,12 @@ | |||
33 | } | 33 | } |
34 | } | 34 | } |
35 | 35 | ||
36 | &.is-disabled { | ||
37 | .tab-item__icon { | ||
38 | filter: grayscale(100%) opacity(0.2); | ||
39 | } | ||
40 | } | ||
41 | |||
36 | &.has-custom-icon { | 42 | &.has-custom-icon { |
37 | .tab-item__icon { | 43 | .tab-item__icon { |
38 | border-radius: $theme-border-radius; | 44 | border-radius: $theme-border-radius; |