diff options
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 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, |