From be168c0afbe945488dc4f8717bd470d6262a4ae6 Mon Sep 17 00:00:00 2001 From: Ramiro Saenz Date: Mon, 4 Jul 2016 19:07:07 -0300 Subject: [PATCH] Moved Custom Service button inside list of services --- app/store/ServicesList.js | 6 ++++++ app/view/main/Main.js | 5 ----- app/view/main/MainController.js | 3 ++- resources/icons/custom.png | Bin 0 -> 5270 bytes 4 files changed, 8 insertions(+), 6 deletions(-) create mode 100644 resources/icons/custom.png diff --git a/app/store/ServicesList.js b/app/store/ServicesList.js index f350f269..ab99652f 100644 --- a/app/store/ServicesList.js +++ b/app/store/ServicesList.js @@ -285,6 +285,12 @@ Ext.define('Rambox.store.ServicesList', { ,name: 'TweetDeck' ,url: 'https://tweetdeck.twitter.com/' ,type: 'messaging' + }, + { + id: 'custom' + ,logo: 'custom.png' + ,name: '_Custom Service' + ,type: 'custom' } ] }); diff --git a/app/view/main/Main.js b/app/view/main/Main.js index 4d4f986b..a9e34aba 100644 --- a/app/view/main/Main.js +++ b/app/view/main/Main.js @@ -101,11 +101,6 @@ Ext.define('Rambox.view.main.Main', { ,specialkey: 'onSearchEnter' } } - ,{ - type: 'plus' - ,tooltip: 'Add a custom service' - ,handler: 'addCustomService' - } ] ,items: [ { diff --git a/app/view/main/MainController.js b/app/view/main/MainController.js index bfbd61f1..8488f661 100644 --- a/app/view/main/MainController.js +++ b/app/view/main/MainController.js @@ -590,7 +590,7 @@ Ext.define('Rambox.view.main.MainController', { Ext.getStore('ServicesList').getFilters().replaceAll({ fn: function(record) { - return Ext.Array.contains(Ext.Object.getKeys(cg.getValue()), record.get('type')); + return Ext.Array.contains(Ext.Object.getKeys(cg.getValue()), record.get('type')) || record.get('type') === 'custom'; } }); } @@ -604,6 +604,7 @@ Ext.define('Rambox.view.main.MainController', { Ext.getStore('ServicesList').getFilters().replaceAll({ fn: function(record) { + if ( record.get('type') === 'custom' ) return true; if ( !Ext.Array.contains(Ext.Object.getKeys(cg.getValue()), record.get('type')) ) return false; return record.get('name').toLowerCase().indexOf(newValue.toLowerCase()) > -1 ? true : false; } diff --git a/resources/icons/custom.png b/resources/icons/custom.png new file mode 100644 index 0000000000000000000000000000000000000000..710acb6aa2f1abe3eea1cc19b8b33cf1ca513683 GIT binary patch literal 5270 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 literal 0 HcmV?d00001