diff options
author | 2017-11-10 15:05:52 +0100 | |
---|---|---|
committer | 2017-11-10 15:05:52 +0100 | |
commit | 4f5dd248e23477a5a2ae55c63918b7308ffce99d (patch) | |
tree | 9606844c390deb0ba6647d70fb60e09318a6a900 /src/containers | |
parent | Merge branch 'develop' of github.com:meetfranz/franz into develop (diff) | |
parent | get default local from default app config (diff) | |
download | ferdium-app-4f5dd248e23477a5a2ae55c63918b7308ffce99d.tar.gz ferdium-app-4f5dd248e23477a5a2ae55c63918b7308ffce99d.tar.zst ferdium-app-4f5dd248e23477a5a2ae55c63918b7308ffce99d.zip |
Merge pull request #248 from meetfranz/feature/192-display-disabled-services
Add option to show disabled services in tab bar
Diffstat (limited to 'src/containers')
-rw-r--r-- | src/containers/layout/AppLayoutContainer.js | 6 | ||||
-rw-r--r-- | src/containers/settings/EditSettingsScreen.js | 10 |
2 files changed, 13 insertions, 3 deletions
diff --git a/src/containers/layout/AppLayoutContainer.js b/src/containers/layout/AppLayoutContainer.js index 68ad1039e..cd3251082 100644 --- a/src/containers/layout/AppLayoutContainer.js +++ b/src/containers/layout/AppLayoutContainer.js | |||
@@ -61,7 +61,6 @@ export default class AppLayoutContainer extends Component { | |||
61 | } = this.props.actions.ui; | 61 | } = this.props.actions.ui; |
62 | 62 | ||
63 | const { children } = this.props; | 63 | const { children } = this.props; |
64 | const allServices = services.enabled; | ||
65 | 64 | ||
66 | const isLoadingServices = services.allServicesRequest.isExecuting | 65 | const isLoadingServices = services.allServicesRequest.isExecuting |
67 | && services.allServicesRequest.isExecutingFirstTime; | 66 | && services.allServicesRequest.isExecutingFirstTime; |
@@ -77,7 +76,7 @@ export default class AppLayoutContainer extends Component { | |||
77 | 76 | ||
78 | const sidebar = ( | 77 | const sidebar = ( |
79 | <Sidebar | 78 | <Sidebar |
80 | services={allServices} | 79 | services={services.allDisplayed} |
81 | setActive={setActive} | 80 | setActive={setActive} |
82 | openSettings={openSettings} | 81 | openSettings={openSettings} |
83 | closeSettings={closeSettings} | 82 | closeSettings={closeSettings} |
@@ -92,11 +91,12 @@ export default class AppLayoutContainer extends Component { | |||
92 | 91 | ||
93 | const servicesContainer = ( | 92 | const servicesContainer = ( |
94 | <Services | 93 | <Services |
95 | services={allServices} | 94 | services={services.allDisplayed} |
96 | handleIPCMessage={handleIPCMessage} | 95 | handleIPCMessage={handleIPCMessage} |
97 | setWebviewReference={setWebviewReference} | 96 | setWebviewReference={setWebviewReference} |
98 | openWindow={openWindow} | 97 | openWindow={openWindow} |
99 | reload={reload} | 98 | reload={reload} |
99 | update={updateService} | ||
100 | /> | 100 | /> |
101 | ); | 101 | ); |
102 | 102 | ||
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, |