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

3 files changed, 22 insertions, 3 deletions

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 {
     toggleAudio: PropTypes.func.isRequired,
     deleteService: PropTypes.func.isRequired,
     disableService: PropTypes.func.isRequired,
+    enableService: PropTypes.func.isRequired,
   }
 
   render() {
@@ -27,6 +28,7 @@ class TabBarSortableList extends Component {
       toggleAudio,
       deleteService,
       disableService,
+      enableService,
       openSettings,
     } = this.props;
 
@@ -46,6 +48,7 @@ class TabBarSortableList extends Component {
             toggleAudio={() => toggleAudio({ serviceId: service.id })}
             deleteService={() => deleteService({ serviceId: service.id })}
             disableService={() => disableService({ serviceId: service.id })}
+            enableService={() => enableService({ serviceId: service.id })}
             openSettings={openSettings}
           />
         ))}
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({
     id: 'tabs.item.disableService',
     defaultMessage: '!!!Disable Service',
   },
+  enableService: {
+    id: 'tabs.item.enableService',
+    defaultMessage: '!!!Enable Service',
+  },
   deleteService: {
     id: 'tabs.item.deleteService',
     defaultMessage: '!!!Delete Service',
@@ -58,6 +62,7 @@ class TabItem extends Component {
     openSettings: PropTypes.func.isRequired,
     deleteService: PropTypes.func.isRequired,
     disableService: PropTypes.func.isRequired,
+    enableService: PropTypes.func.isRequired,
   };
 
   static contextTypes = {
@@ -74,6 +79,7 @@ class TabItem extends Component {
       toggleAudio,
       deleteService,
       disableService,
+      enableService,
       openSettings,
     } = this.props;
     const { intl } = this.context;
@@ -121,6 +127,7 @@ class TabItem extends Component {
           'tab-item': true,
           'is-active': service.isActive,
           'has-custom-icon': service.hasCustomIcon,
+          'is-disabled': !service.isEnabled,
         })}
         onClick={clickHandler}
         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 {
     reorder({ oldIndex, newIndex });
   };
 
-  disableService = ({ serviceId }) => {
+  toggleService = ({ serviceId, isEnabled }) => {
     const { updateService } = this.props;
 
     if (serviceId) {
       updateService({
         serviceId,
         serviceData: {
-          isEnabled: false,
+          isEnabled,
         },
         redirect: false,
       });
     }
   }
 
+  disableService({ serviceId }) {
+    this.toggleService({ serviceId, isEnabled: false });
+  }
+
+  enableService({ serviceId }) {
+    this.toggleService({ serviceId, isEnabled: true });
+  }
+
   render() {
     const {
       services,
@@ -67,7 +75,8 @@ export default class TabBar extends Component {
           toggleNotifications={toggleNotifications}
           toggleAudio={toggleAudio}
           deleteService={deleteService}
-          disableService={this.disableService}
+          disableService={args => this.disableService(args)}
+          enableService={args => this.enableService(args)}
           openSettings={openSettings}
           distance={20}
           axis="y"