Merge remote-tracking branch 'refs/remotes/origin/master'

update changelog

72 files changed, 153 insertions, 127 deletions

diff --git a/README.md b/README.md
index 01ebae6..546a8a0 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # ScudCloud - Linux Client for Slack
 
-![ScudCloud Logo](/scudcloud-1.0/resources/scudcloud.png?raw=true "Scud clouds are low, ragged and wind-torn cloud fragments, usually not attached to the thunderstorm base. With the 'mother' cloud, the form of them together is like a chat balloon")
+![ScudCloud Logo](/scudcloud-1.1/resources/scudcloud.png?raw=true "Scud clouds are low, ragged and wind-torn cloud fragments, usually not attached to the thunderstorm base. With the 'mother' cloud, the form of them together is like a chat balloon")
 
 ScudCloud is a **non official** open-source Linux (Debian, Ubuntu, Kubuntu, Mint, Arch, Fedora) desktop client for [Slack](http://slack.com).
 
@@ -25,7 +25,7 @@ sudo apt-get update && sudo apt-get upgrade
 
 If not, ScudCloud will crash with some old components or will not be installed.
 
-Then, to install it under **Ubuntu/Kubuntu** (14.04, 14.10, 15.04), **Mint** and **Debian**, open a Terminal (Ctrl+Alt+T) and run:
+Then, to install it under **Ubuntu/Kubuntu** (14.04, 14.10, 15.04, 15.10), **Mint** and **Debian**, open a Terminal (Ctrl+Alt+T) and run:
 
 ```term
 sudo apt-add-repository -y ppa:rael-gc/scudcloud
@@ -95,10 +95,10 @@ First, you'll need to install at least packages for `python3`, `python-qt4` (`qt
 Then run the below script: it'll download the code and install it:
 
 ```bash
-wget https://github.com/raelgc/scudcloud/archive/v1.0.89.tar.gz
-tar -xvf v1.0.89.tar.gz
-cd scudcloud-1.0.89
-SOURCE="scudcloud-1.0"
+wget https://github.com/raelgc/scudcloud/archive/v1.1.0.tar.gz
+tar -xvf v1.1.0.tar.gz
+cd scudcloud-1.1.0
+SOURCE="scudcloud-1.1"
 INSTALL="/opt/scudcloud"
 sudo mkdir -p $INSTALL/lib
 sudo mkdir -p $INSTALL/resources
diff --git a/scudcloud-1.0/VERSION b/scudcloud-1.0/VERSION
deleted file mode 100644
index 9d25b39..0000000
--- a/scudcloud-1.0/VERSION
+++ /dev/null
@@ -1 +0,0 @@
-1.0.89
diff --git a/scudcloud-1.0/resources/scudcloud.js b/scudcloud-1.0/resources/scudcloud.js
deleted file mode 100644
index 5e121c6..0000000
--- a/scudcloud-1.0/resources/scudcloud.js
+++ /dev/null
@@ -1 +0,0 @@
-var ScudCloud={overrideNotifications:function(){TS.ui.growls.no_notifications=!1,TS.ui.growls.checkPermission=function(){return!0},TS.ui.growls.getPermissionLevel=function(){return"granted"},TS.ui.growls.show=function(n,e){desktop.sendMessage(n,e)},TS.ui.banner.close()},overrideConnect:function(){TS.ms.connected_sig.add(function(){ScudCloud.connect(!0)}),TS.ms.disconnected_sig.add(function(){ScudCloud.connect(!1)})},overrideBanner:function(){ScudCloud.showBanner=TS.ui.banner.show,TS.ui.banner.show=function(){ScudCloud.showBanner(),ScudCloud.overrideNotifications()}},connect:function(n){desktop.enableMenus(n),n&&(ScudCloud.overrideNotifications(),desktop.populate(JSON.stringify({channels:ScudCloud.listChannels(),teams:ScudCloud.listTeams(),icon:TS.model.team.icon.image_44})))},count:function(){var n=0;return $("span.unread_highlight").not(".hidden").each(function(){n+=new Number($(this).text().replace("+",""))}),n},createSnippet:function(){return TS.ui.snippet_dialog.start()},listChannels:function(){return TS.channels.getUnarchivedChannelsForUser()},listTeams:function(){var n=TS.getAllTeams();return n[0].team_icon={image_44:TS.model.team.icon.image_44},n},quicklist:function(){desktop.quicklist(ScudCloud.listChannels())},join:function(n){return TS.channels.join(n)},setClipboard:function(n){TS.client.ui.file_pasted_sig.dispatch(n,TS.model.shift_key_pressed)},preferences:function(){return TS.ui.prefs_dialog.start()},addTeam:function(){document.location=TS.boot_data.signin_url},getCurrentTeam:function(){var n=TS.getAllTeams();if(null!=n)for(var e=0;n.length;e++)if(n[e].team_url==TS.boot_data.team_url)return n[e].id;return""},logout:function(){document.location=TS.boot_data.logout_url},help:function(){return TS.help_dialog.start()},isConnected:function(){return"undefined"!=typeof TS&&"undefined"!=typeof TS.model&&TS.model.ms_connected}};"undefined"!=typeof TS&&(document.onpaste=function(){desktop.pasted(!1)},ScudCloud.overrideNotifications(),ScudCloud.overrideConnect(),ScudCloud.overrideBanner());
diff --git a/scudcloud-1.0/scudcloud-src.js b/scudcloud-1.0/scudcloud-src.js
deleted file mode 100644
index c16a0b9..0000000
--- a/scudcloud-1.0/scudcloud-src.js
+++ /dev/null
@@ -1,82 +0,0 @@
-var ScudCloud = {
-	overrideNotifications: function(){
-		TS.ui.growls.no_notifications = false;
-		TS.ui.growls.checkPermission = function() { return true; };
-		TS.ui.growls.getPermissionLevel = function() { return 'granted'; };
-		TS.ui.growls.show = function(j,f,o,p){ desktop.sendMessage(j,f); };
-		TS.ui.banner.close();
-	},
-	overrideConnect: function(){
-		TS.ms.connected_sig.add(function(){ScudCloud.connect(true);});
-		TS.ms.disconnected_sig.add(function(){ScudCloud.connect(false);});
-	},
-	overrideBanner: function(){
-		ScudCloud.showBanner = TS.ui.banner.show;
-		TS.ui.banner.show = function(){ ScudCloud.showBanner(); ScudCloud.overrideNotifications(); };
-	},
-	connect: function(b){
-		desktop.enableMenus(b);
-		if(b){
-			ScudCloud.overrideNotifications();
-			desktop.populate(JSON.stringify({'channels': ScudCloud.listChannels(), 'teams': ScudCloud.listTeams(), 'icon': TS.model.team.icon.image_44}));
-		}
-	},
-    count: function(){
-		var total=0;
-		$('span.unread_highlight').not('.hidden').each(function(i){ 
-			total+= new Number($(this).text().replace('+','')); }
-		);
-		return total;
-    },
-	createSnippet: function(){
-		return TS.ui.snippet_dialog.start();		
-	},
-    listChannels: function(){
-		return TS.channels.getUnarchivedChannelsForUser();
-	},
-    listTeams: function(){
-		var list = TS.getAllTeams();
-		// Fix for current team displaying no icon
-		list[0].team_icon = {"image_44":TS.model.team.icon.image_44};
-		return list;
-	},
-    quicklist: function(){
-		desktop.quicklist(ScudCloud.listChannels());
-	},
-	join: function(c){
-		return TS.channels.join(c);
-	},
-	setClipboard: function(data){
-		TS.client.ui.file_pasted_sig.dispatch(data, TS.model.shift_key_pressed);
-	},
-    preferences: function(){
-		return TS.ui.prefs_dialog.start();
-	},
-    addTeam: function(){
-		document.location = TS.boot_data.signin_url;
-	},
-	getCurrentTeam: function(){
-		var list = TS.getAllTeams();
-		if(list!=null) for(var i=0;list.length;i++){
-			if(list[i].team_url==TS.boot_data.team_url){
-				return list[i].id;
-			}
-		}
-		return "";
-	},
-    logout: function(){
-		document.location = TS.boot_data.logout_url;
-	},
-    help: function(){
-		return TS.help_dialog.start();
-	},
-    isConnected: function(){
-        return "undefined" != typeof TS && "undefined" != typeof TS.model && TS.model.ms_connected;
-    }
-};
-if("undefined" != typeof TS){
-	document.onpaste = function(e){desktop.pasted(false);};
-    ScudCloud.overrideNotifications();
-	ScudCloud.overrideConnect();
-	ScudCloud.overrideBanner();
-}
diff --git a/scudcloud-1.0/LICENSE b/scudcloud-1.1/LICENSE
index 23fc66f..23fc66f 100644
--- a/scudcloud-1.0/LICENSE
+++ b/scudcloud-1.1/LICENSE
diff --git a/scudcloud-1.1/VERSION b/scudcloud-1.1/VERSION
new file mode 100644
index 0000000..9084fa2
--- /dev/null
+++ b/scudcloud-1.1/VERSION
@@ -0,0 +1 @@
+1.1.0
diff --git a/scudcloud-1.0/debian/changelog b/scudcloud-1.1/debian/changelog
index cdbb697..09d6c1f 100644
--- a/scudcloud-1.0/debian/changelog
+++ b/scudcloud-1.1/debian/changelog
@@ -1,6 +1,14 @@
+scudcloud (1.1-0) trusty; urgency=medium
+
+  * Fixing stuck in loading screen (#294)
+  * Implementing a proper Slack JS client (#292)
+
+ -- Rael Gugelmin Cunha <rael.gc@gmail.com>  Thu, 19 Nov 2015 09:43:01 -0200
+
 scudcloud (1.0-89~bpo80+1) jessie-add; urgency=medium
 
   * Build for jessie-add.
+  * Remove ttf-mscorefonts-installer dependency
 
  -- Wolfgang Wiedmeyer <debian@fossencdi.org>  Sat, 14 Nov 2015 15:05:54 +0100
 
diff --git a/scudcloud-1.0/debian/compat b/scudcloud-1.1/debian/compat
index ec63514..ec63514 100644
--- a/scudcloud-1.0/debian/compat
+++ b/scudcloud-1.1/debian/compat
diff --git a/scudcloud-1.0/debian/control b/scudcloud-1.1/debian/control
index 42d013c..42d013c 100644
--- a/scudcloud-1.0/debian/control
+++ b/scudcloud-1.1/debian/control
diff --git a/scudcloud-1.0/debian/copyright b/scudcloud-1.1/debian/copyright
index e7d7564..e7d7564 100644
--- a/scudcloud-1.0/debian/copyright
+++ b/scudcloud-1.1/debian/copyright
diff --git a/scudcloud-1.0/debian/install b/scudcloud-1.1/debian/install
index aa6e8be..aa6e8be 100644
--- a/scudcloud-1.0/debian/install
+++ b/scudcloud-1.1/debian/install
diff --git a/scudcloud-1.0/debian/postinst b/scudcloud-1.1/debian/postinst
index 6a8ffa7..6a8ffa7 100755
--- a/scudcloud-1.0/debian/postinst
+++ b/scudcloud-1.1/debian/postinst
diff --git a/scudcloud-1.0/debian/postrm b/scudcloud-1.1/debian/postrm
index 1ad8f31..1ad8f31 100644
--- a/scudcloud-1.0/debian/postrm
+++ b/scudcloud-1.1/debian/postrm
diff --git a/scudcloud-1.0/debian/prerm b/scudcloud-1.1/debian/prerm
index ff915b2..ff915b2 100644
--- a/scudcloud-1.0/debian/prerm
+++ b/scudcloud-1.1/debian/prerm
diff --git a/scudcloud-1.0/debian/rules b/scudcloud-1.1/debian/rules
index 79fd842..79fd842 100755
--- a/scudcloud-1.0/debian/rules
+++ b/scudcloud-1.1/debian/rules
diff --git a/scudcloud-1.0/debian/scudcloud.links b/scudcloud-1.1/debian/scudcloud.links
index f8078d1..f8078d1 100644
--- a/scudcloud-1.0/debian/scudcloud.links
+++ b/scudcloud-1.1/debian/scudcloud.links
diff --git a/scudcloud-1.0/leftpane-src.js b/scudcloud-1.1/leftpane-src.js
index 5e735a6..5e735a6 100644
--- a/scudcloud-1.0/leftpane-src.js
+++ b/scudcloud-1.1/leftpane-src.js
diff --git a/scudcloud-1.0/lib/cookiejar.py b/scudcloud-1.1/lib/cookiejar.py
index bd355f2..bd355f2 100644
--- a/scudcloud-1.0/lib/cookiejar.py
+++ b/scudcloud-1.1/lib/cookiejar.py
diff --git a/scudcloud-1.0/lib/launcher.py b/scudcloud-1.1/lib/launcher.py
index 8ab23cf..8ab23cf 100644
--- a/scudcloud-1.0/lib/launcher.py
+++ b/scudcloud-1.1/lib/launcher.py
diff --git a/scudcloud-1.0/lib/leftpane.py b/scudcloud-1.1/lib/leftpane.py
index b2986c8..b2986c8 100644
--- a/scudcloud-1.0/lib/leftpane.py
+++ b/scudcloud-1.1/lib/leftpane.py
diff --git a/scudcloud-1.0/lib/notifier.py b/scudcloud-1.1/lib/notifier.py
index a67ef5c..a67ef5c 100644
--- a/scudcloud-1.0/lib/notifier.py
+++ b/scudcloud-1.1/lib/notifier.py
diff --git a/scudcloud-1.0/lib/notify2.py b/scudcloud-1.1/lib/notify2.py
index 1b40269..1b40269 100644
--- a/scudcloud-1.0/lib/notify2.py
+++ b/scudcloud-1.1/lib/notify2.py
diff --git a/scudcloud-1.0/lib/resources.py b/scudcloud-1.1/lib/resources.py
index f9835d8..f9835d8 100644
--- a/scudcloud-1.0/lib/resources.py
+++ b/scudcloud-1.1/lib/resources.py
diff --git a/scudcloud-1.0/lib/scudcloud.py b/scudcloud-1.1/lib/scudcloud.py
index 3fb3b2c..d53e04f 100755
--- a/scudcloud-1.0/lib/scudcloud.py
+++ b/scudcloud-1.1/lib/scudcloud.py
@@ -61,8 +61,6 @@ class ScudCloud(QtGui.QMainWindow):
         self.systray(ScudCloud.minimized)
         self.installEventFilter(self)
         self.statusBar().showMessage('Loading Slack...')
-        # Starting unread msgs counter
-        self.setupTimer()
 
     def addWrapper(self, url):
         webView = Wrapper(self)
@@ -73,12 +71,6 @@ class ScudCloud(QtGui.QMainWindow):
         self.stackedWidget.addWidget(webView)
         self.stackedWidget.setCurrentWidget(webView)
 
-    def setupTimer(self):
-        self.timer = QTimer(self)
-        self.timer.timeout.connect(self.count)
-        self.timer.setInterval(2000)
-        self.timer.start()
-
     def webSettings(self):
         self.cookiesjar = PersistentCookieJar(self)
         self.zoom = self.readZoom()
@@ -88,6 +80,8 @@ class ScudCloud(QtGui.QMainWindow):
         QWebSettings.globalSettings().setAttribute(QWebSettings.JavaEnabled, False)
         # We don't need History
         QWebSettings.globalSettings().setAttribute(QWebSettings.PrivateBrowsingEnabled, True)
+        # Enabling Local Storage (now required by Slack)
+        QWebSettings.globalSettings().setAttribute(QWebSettings.LocalStorageEnabled, True)
         # Enabling Cache
         self.diskCache = QNetworkDiskCache(self)
         self.diskCache.setCacheDirectory(self.settings_path)
@@ -281,7 +275,6 @@ class ScudCloud(QtGui.QMainWindow):
                 break
         if not exists:
             self.addWrapper(url)
-        self.enableMenus(self.current().isConnected())
         self.updateEditMenu()
 
     def eventFilter(self, obj, event):
@@ -367,7 +360,7 @@ class ScudCloud(QtGui.QMainWindow):
         total = 0
         for i in range(0, self.stackedWidget.count()):
             widget = self.stackedWidget.widget(i)
-            messages = widget.count()
+            messages = widget.highlights
             if messages == 0:
                 self.leftPane.stopAlert(widget.team())
             else:
diff --git a/scudcloud-1.0/lib/speller.py b/scudcloud-1.1/lib/speller.py
index e60967c..e60967c 100644
--- a/scudcloud-1.0/lib/speller.py
+++ b/scudcloud-1.1/lib/speller.py
diff --git a/scudcloud-1.0/lib/systray.py b/scudcloud-1.1/lib/systray.py
index 567a249..567a249 100644
--- a/scudcloud-1.0/lib/systray.py
+++ b/scudcloud-1.1/lib/systray.py
diff --git a/scudcloud-1.0/lib/wrapper.py b/scudcloud-1.1/lib/wrapper.py
index 084c631..9d1c348 100644
--- a/scudcloud-1.0/lib/wrapper.py
+++ b/scudcloud-1.1/lib/wrapper.py
@@ -10,7 +10,9 @@ from PyQt4.QtNetwork import QNetworkProxy
 
 class Wrapper(QWebView):
 
+    highlights = 0
     icon = None
+    name = ''
 
     def __init__(self, window):
         self.configure_proxy()
@@ -26,18 +28,6 @@ class Wrapper(QWebView):
         self.linkClicked.connect(self._linkClicked)
         self.page().featurePermissionRequested.connect(self.permissionRequested)
         self.addActions()
-        self.setupTimer()
-
-    # Starting a timer that will check by server side reloads (which drops ScudCloud notification)
-    def setupTimer(self):
-        timer = QTimer(self)
-        timer.timeout.connect(self.overrideNotifications)
-        # Hope each 10 minutes will not be produce high CPU usage
-        timer.setInterval(600000)
-        timer.start()
-
-    def overrideNotifications(self):
-        self.call("overrideNotifications")
 
     def permissionRequested(self, frame, feature):
         self.page().setFeaturePermission(frame, feature, QWebPage.PermissionGrantedByUser)
@@ -102,9 +92,10 @@ class Wrapper(QWebView):
             self.load(QUrl("https://"+qUrl.host()+"/messages/general"))
 
     def _loadFinished(self, ok=True):
+        # Starting the webkit-JS bridge
         self.page().currentFrame().addToJavaScriptWindowObject("desktop", self)
+        # Loading ScudCloud JS client
         self.page().currentFrame().evaluateJavaScript(self.js)
-        self.window.enableMenus(self.isConnected())
         self.window.statusBar().hide()
 
     def systemOpen(self, url):
@@ -127,9 +118,6 @@ class Wrapper(QWebView):
         self.window.show()
         self.call("preferences")
 
-    def isConnected(self):
-        return self.call("isConnected")
-
     def createSnippet(self):
         self.call("createSnippet")
 
@@ -148,9 +136,6 @@ class Wrapper(QWebView):
     def about(self):
         subprocess.call(('xdg-open', "https://github.com/raelgc/scudcloud"))
 
-    def isConnected(self):
-        return self.call("isConnected")
-
     def listChannels(self):
         return self.call("listChannels")
 
@@ -158,11 +143,10 @@ class Wrapper(QWebView):
         self.call("join", menuitem.property_get("id"))
         self.window.show()
 
-    def count(self):
-        try:
-            return self.call("count")
-        except:
-            return 0
+    @QtCore.pyqtSlot(int, int) 
+    def count(self, highlight, unread):
+        self.highlights = highlight
+        self.window.count()
 
     @QtCore.pyqtSlot(str) 
     def populate(self, serialized):
@@ -170,8 +154,8 @@ class Wrapper(QWebView):
         self.window.teams(data['teams'])
         if self.window.current() == self:
             self.window.quicklist(data['channels'])
-        iconFile = data['teams'][0]['team_name']+'.png'
-        filename, headers = request.urlretrieve(data['icon'], tempfile.gettempdir()+'/'+iconFile)
+        self.name = data['teams'][0]['team_name']
+        filename, headers = request.urlretrieve(data['icon'], tempfile.gettempdir()+'/'+self.name+'.png')
         self.icon = filename
 
     @QtCore.pyqtSlot(bool) 
@@ -191,6 +175,9 @@ class Wrapper(QWebView):
 
     @QtCore.pyqtSlot(str, str) 
     def sendMessage(self, title, message):
-        self.window.notify(str(title).replace("New message from ", "").replace("New message in ", ""), str(message), self.icon)
+        erase = ['['+self.name.lower()+'] in ', '['+self.name.lower()+'] from ']
+        for s in erase:
+            title = str(title).replace(s, '', 1)
+        self.window.notify(title, str(message), self.icon)
 
 
diff --git a/scudcloud-1.0/resources/leftpane.html b/scudcloud-1.1/resources/leftpane.html
index a845ef3..a845ef3 100644
--- a/scudcloud-1.0/resources/leftpane.html
+++ b/scudcloud-1.1/resources/leftpane.html
diff --git a/scudcloud-1.0/resources/leftpane.js b/scudcloud-1.1/resources/leftpane.js
index 005a43e..005a43e 100644
--- a/scudcloud-1.0/resources/leftpane.js
+++ b/scudcloud-1.1/resources/leftpane.js
diff --git a/scudcloud-1.0/resources/resources.css b/scudcloud-1.1/resources/resources.css
index bc30435..bc30435 100644
--- a/scudcloud-1.0/resources/resources.css
+++ b/scudcloud-1.1/resources/resources.css
diff --git a/scudcloud-1.1/resources/scudcloud.js b/scudcloud-1.1/resources/scudcloud.js
new file mode 100644
index 0000000..82a7621
--- /dev/null
+++ b/scudcloud-1.1/resources/scudcloud.js
@@ -0,0 +1 @@
+ScudCloud={unloaded:!0,hasPreference:function(n){return!1},getPreference:function(n){return!1},setPreference:function(n,e){return!1},canShowHtmlNotifications:function(){return!1},call:function(n,e){switch(ScudCloud.log(n),n){case"reload":return ScudCloud.reload();case"didStartLoading":return ScudCloud.didStartLoading();case"didFinishLoading":return ScudCloud.didFinishLoading();case"setConnectionStatus":return ScudCloud.setConnectionStatus(e);case"notify":return ScudCloud.notify(e);case"setBadgeCount":return ScudCloud.setBadgeCount(e);case"displayTeam":return ScudCloud.displayTeam(e)}return!1},reload:function(){window.location.reload()},didStartLoading:function(){},didFinishLoading:function(){TS.ui.banner.close(),ScudCloud.populate(),ScudCloud.unloaded=!1},setConnectionStatus:function(n){switch(n){case"online":desktop.enableMenus(!0);break;default:desktop.enableMenus(!1)}},notify:function(n){desktop.sendMessage(n.title,n.content)},setBadgeCount:function(n){desktop.count(n.all_unread_highlights_cnt,n.all_unread_cnt)},displayTeam:function(n){},log:function(n){console.log("ScudCloud."+n)},populate:function(){desktop.populate(JSON.stringify({channels:ScudCloud.listChannels(),teams:ScudCloud.listTeams(),icon:TS.model.team.icon.image_44}))},createSnippet:function(){return TS.ui.snippet_dialog.start()},listChannels:function(){return TS.channels.getUnarchivedChannelsForUser()},listTeams:function(){var n=TS.getAllTeams();return n[0].team_icon={image_44:TS.model.team.icon.image_44},n},quicklist:function(){desktop.quicklist(ScudCloud.listChannels())},join:function(n){return TS.channels.join(n)},setClipboard:function(n){TS.client.ui.file_pasted_sig.dispatch(n,TS.model.shift_key_pressed)},preferences:function(){return TS.ui.prefs_dialog.start()},addTeam:function(){document.location=TS.boot_data.signin_url},getCurrentTeam:function(){var n=TS.getAllTeams();if(null!=n)for(var e=0;n.length;e++)if(n[e].team_url==TS.boot_data.team_url)return n[e].id;return""},logout:function(){document.location=TS.boot_data.logout_url},help:function(){return TS.help_dialog.start()}},document.onpaste=function(n){desktop.pasted(!1)},window.winssb=TSSSB=ScudCloud,ScudCloud.unloaded&&ScudCloud.didFinishLoading();
diff --git a/scudcloud-1.0/resources/scudcloud.png b/scudcloud-1.1/resources/scudcloud.png
index ee08336..ee08336 100644
--- a/scudcloud-1.0/resources/scudcloud.png
+++ b/scudcloud-1.1/resources/scudcloud.png
diff --git a/scudcloud-1.0/scudcloud b/scudcloud-1.1/scudcloud
index 734350c..734350c 100755
--- a/scudcloud-1.0/scudcloud
+++ b/scudcloud-1.1/scudcloud
diff --git a/scudcloud-1.1/scudcloud-src.js b/scudcloud-1.1/scudcloud-src.js
new file mode 100644
index 0000000..3bb9beb
--- /dev/null
+++ b/scudcloud-1.1/scudcloud-src.js
@@ -0,0 +1,120 @@
+
+ScudCloud = {
+	unloaded: true,
+	// App functions
+    hasPreference: function(name){
+		return false;
+	},
+	getPreference: function(name){
+		return false;
+	},
+	setPreference: function(name, value){
+		return false;
+	},
+	canShowHtmlNotifications: function(){
+		// Ubuntu cannot display HTML notifications
+		return false;
+	},
+	// TSSSB.call
+	call: function(name, args){
+		ScudCloud.log(name);
+		switch(name){
+			case "reload":
+				return ScudCloud.reload();
+			case "didStartLoading":
+				return ScudCloud.didStartLoading();
+			case "didFinishLoading":
+				return ScudCloud.didFinishLoading();
+			case "setConnectionStatus":
+				return ScudCloud.setConnectionStatus(args);
+			case "notify":
+				return ScudCloud.notify(args);
+			case "setBadgeCount":
+				return ScudCloud.setBadgeCount(args);
+			case "displayTeam":
+				return ScudCloud.displayTeam(args);
+		}
+		return false;
+	},
+	// TSSSB.call implementations
+	reload: function(){
+		window.location.reload();
+	},
+	didStartLoading: function(){
+	},
+	didFinishLoading: function(){
+		TS.ui.banner.close();
+		ScudCloud.populate();
+		ScudCloud.unloaded = false;
+	},
+	setConnectionStatus: function(status){
+		// "online", "connecting", "offline"
+		switch(status){
+			case "online": desktop.enableMenus(true); break;
+			default: desktop.enableMenus(false);
+		}
+	},
+	notify: function(args){
+		desktop.sendMessage(args.title, args.content);
+	},
+	setBadgeCount: function(args){
+		desktop.count(args.all_unread_highlights_cnt, args.all_unread_cnt);
+	},
+	displayTeam: function(id){
+	},
+	// ScudCloud internal functions
+	log: function(name){
+		console.log("ScudCloud."+name);
+	},
+	populate: function(){
+		desktop.populate(JSON.stringify({'channels': ScudCloud.listChannels(), 'teams': ScudCloud.listTeams(), 'icon': TS.model.team.icon.image_44}));
+	},
+	createSnippet: function(){
+		return TS.ui.snippet_dialog.start();		
+	},
+    listChannels: function(){
+		return TS.channels.getUnarchivedChannelsForUser();
+	},
+    listTeams: function(){
+		var list = TS.getAllTeams();
+		// Fix for current team displaying no icon
+		list[0].team_icon = {"image_44":TS.model.team.icon.image_44};
+		return list;
+	},
+    quicklist: function(){
+		desktop.quicklist(ScudCloud.listChannels());
+	},
+	join: function(c){
+		return TS.channels.join(c);
+	},
+	setClipboard: function(data){
+		TS.client.ui.file_pasted_sig.dispatch(data, TS.model.shift_key_pressed);
+	},
+    preferences: function(){
+		return TS.ui.prefs_dialog.start();
+	},
+    addTeam: function(){
+		document.location = TS.boot_data.signin_url;
+	},
+	getCurrentTeam: function(){
+		var list = TS.getAllTeams();
+		if(list!=null) for(var i=0;list.length;i++){
+			if(list[i].team_url==TS.boot_data.team_url){
+				return list[i].id;
+			}
+		}
+		return "";
+	},
+    logout: function(){
+		document.location = TS.boot_data.logout_url;
+	},
+    help: function(){
+		return TS.help_dialog.start();
+	}
+};
+document.onpaste = function(e){desktop.pasted(false);};
+window.winssb = TSSSB = ScudCloud;
+// Sometimes didFinishLoading is not loaded
+if(ScudCloud.unloaded){
+	ScudCloud.didFinishLoading();
+}
diff --git a/scudcloud-1.0/scudcloud.desktop b/scudcloud-1.1/scudcloud.desktop
index d21cbe6..d21cbe6 100644
--- a/scudcloud-1.0/scudcloud.desktop
+++ b/scudcloud-1.1/scudcloud.desktop
diff --git a/scudcloud-1.0/scudcloud.spec b/scudcloud-1.1/scudcloud.spec
index a7a5f1f..a7a5f1f 100644
--- a/scudcloud-1.0/scudcloud.spec
+++ b/scudcloud-1.1/scudcloud.spec
diff --git a/scudcloud-1.0/systray/hicolor/scudcloud-attention-1.svg b/scudcloud-1.1/systray/hicolor/scudcloud-attention-1.svg
index 646bf31..646bf31 100644
--- a/scudcloud-1.0/systray/hicolor/scudcloud-attention-1.svg
+++ b/scudcloud-1.1/systray/hicolor/scudcloud-attention-1.svg
diff --git a/scudcloud-1.0/systray/hicolor/scudcloud-attention-2.svg b/scudcloud-1.1/systray/hicolor/scudcloud-attention-2.svg
index fa43211..fa43211 100644
--- a/scudcloud-1.0/systray/hicolor/scudcloud-attention-2.svg
+++ b/scudcloud-1.1/systray/hicolor/scudcloud-attention-2.svg
diff --git a/scudcloud-1.0/systray/hicolor/scudcloud-attention-3.svg b/scudcloud-1.1/systray/hicolor/scudcloud-attention-3.svg
index b15cfb5..b15cfb5 100644
--- a/scudcloud-1.0/systray/hicolor/scudcloud-attention-3.svg
+++ b/scudcloud-1.1/systray/hicolor/scudcloud-attention-3.svg
diff --git a/scudcloud-1.0/systray/hicolor/scudcloud-attention-4.svg b/scudcloud-1.1/systray/hicolor/scudcloud-attention-4.svg
index d046544..d046544 100644
--- a/scudcloud-1.0/systray/hicolor/scudcloud-attention-4.svg
+++ b/scudcloud-1.1/systray/hicolor/scudcloud-attention-4.svg
diff --git a/scudcloud-1.0/systray/hicolor/scudcloud-attention-5.svg b/scudcloud-1.1/systray/hicolor/scudcloud-attention-5.svg
index d260e59..d260e59 100644
--- a/scudcloud-1.0/systray/hicolor/scudcloud-attention-5.svg
+++ b/scudcloud-1.1/systray/hicolor/scudcloud-attention-5.svg
diff --git a/scudcloud-1.0/systray/hicolor/scudcloud-attention-6.svg b/scudcloud-1.1/systray/hicolor/scudcloud-attention-6.svg
index 896507f..896507f 100644
--- a/scudcloud-1.0/systray/hicolor/scudcloud-attention-6.svg
+++ b/scudcloud-1.1/systray/hicolor/scudcloud-attention-6.svg
diff --git a/scudcloud-1.0/systray/hicolor/scudcloud-attention-7.svg b/scudcloud-1.1/systray/hicolor/scudcloud-attention-7.svg
index 7424c32..7424c32 100644
--- a/scudcloud-1.0/systray/hicolor/scudcloud-attention-7.svg
+++ b/scudcloud-1.1/systray/hicolor/scudcloud-attention-7.svg
diff --git a/scudcloud-1.0/systray/hicolor/scudcloud-attention-8.svg b/scudcloud-1.1/systray/hicolor/scudcloud-attention-8.svg
index ee41c9d..ee41c9d 100644
--- a/scudcloud-1.0/systray/hicolor/scudcloud-attention-8.svg
+++ b/scudcloud-1.1/systray/hicolor/scudcloud-attention-8.svg
diff --git a/scudcloud-1.0/systray/hicolor/scudcloud-attention-9-plus.svg b/scudcloud-1.1/systray/hicolor/scudcloud-attention-9-plus.svg
index 6e36967..6e36967 100644
--- a/scudcloud-1.0/systray/hicolor/scudcloud-attention-9-plus.svg
+++ b/scudcloud-1.1/systray/hicolor/scudcloud-attention-9-plus.svg
diff --git a/scudcloud-1.0/systray/hicolor/scudcloud-attention-9.svg b/scudcloud-1.1/systray/hicolor/scudcloud-attention-9.svg
index 6a8259c..6a8259c 100644
--- a/scudcloud-1.0/systray/hicolor/scudcloud-attention-9.svg
+++ b/scudcloud-1.1/systray/hicolor/scudcloud-attention-9.svg
diff --git a/scudcloud-1.0/systray/hicolor/scudcloud-attention.svg b/scudcloud-1.1/systray/hicolor/scudcloud-attention.svg
index 7e48289..7e48289 100644
--- a/scudcloud-1.0/systray/hicolor/scudcloud-attention.svg
+++ b/scudcloud-1.1/systray/hicolor/scudcloud-attention.svg
diff --git a/scudcloud-1.0/systray/hicolor/scudcloud.svg b/scudcloud-1.1/systray/hicolor/scudcloud.svg
index e982393..e982393 100644
--- a/scudcloud-1.0/systray/hicolor/scudcloud.svg
+++ b/scudcloud-1.1/systray/hicolor/scudcloud.svg
diff --git a/scudcloud-1.0/systray/mono-dark/scudcloud-attention-1.svg b/scudcloud-1.1/systray/mono-dark/scudcloud-attention-1.svg
index 646bf31..646bf31 100644
--- a/scudcloud-1.0/systray/mono-dark/scudcloud-attention-1.svg
+++ b/scudcloud-1.1/systray/mono-dark/scudcloud-attention-1.svg
diff --git a/scudcloud-1.0/systray/mono-dark/scudcloud-attention-2.svg b/scudcloud-1.1/systray/mono-dark/scudcloud-attention-2.svg
index fa43211..fa43211 100644
--- a/scudcloud-1.0/systray/mono-dark/scudcloud-attention-2.svg
+++ b/scudcloud-1.1/systray/mono-dark/scudcloud-attention-2.svg
diff --git a/scudcloud-1.0/systray/mono-dark/scudcloud-attention-3.svg b/scudcloud-1.1/systray/mono-dark/scudcloud-attention-3.svg
index b15cfb5..b15cfb5 100644
--- a/scudcloud-1.0/systray/mono-dark/scudcloud-attention-3.svg
+++ b/scudcloud-1.1/systray/mono-dark/scudcloud-attention-3.svg
diff --git a/scudcloud-1.0/systray/mono-dark/scudcloud-attention-4.svg b/scudcloud-1.1/systray/mono-dark/scudcloud-attention-4.svg
index d046544..d046544 100644
--- a/scudcloud-1.0/systray/mono-dark/scudcloud-attention-4.svg
+++ b/scudcloud-1.1/systray/mono-dark/scudcloud-attention-4.svg
diff --git a/scudcloud-1.0/systray/mono-dark/scudcloud-attention-5.svg b/scudcloud-1.1/systray/mono-dark/scudcloud-attention-5.svg
index d260e59..d260e59 100644
--- a/scudcloud-1.0/systray/mono-dark/scudcloud-attention-5.svg
+++ b/scudcloud-1.1/systray/mono-dark/scudcloud-attention-5.svg
diff --git a/scudcloud-1.0/systray/mono-dark/scudcloud-attention-6.svg b/scudcloud-1.1/systray/mono-dark/scudcloud-attention-6.svg
index 896507f..896507f 100644
--- a/scudcloud-1.0/systray/mono-dark/scudcloud-attention-6.svg
+++ b/scudcloud-1.1/systray/mono-dark/scudcloud-attention-6.svg
diff --git a/scudcloud-1.0/systray/mono-dark/scudcloud-attention-7.svg b/scudcloud-1.1/systray/mono-dark/scudcloud-attention-7.svg
index 7424c32..7424c32 100644
--- a/scudcloud-1.0/systray/mono-dark/scudcloud-attention-7.svg
+++ b/scudcloud-1.1/systray/mono-dark/scudcloud-attention-7.svg
diff --git a/scudcloud-1.0/systray/mono-dark/scudcloud-attention-8.svg b/scudcloud-1.1/systray/mono-dark/scudcloud-attention-8.svg
index ee41c9d..ee41c9d 100644
--- a/scudcloud-1.0/systray/mono-dark/scudcloud-attention-8.svg
+++ b/scudcloud-1.1/systray/mono-dark/scudcloud-attention-8.svg
diff --git a/scudcloud-1.0/systray/mono-dark/scudcloud-attention-9-plus.svg b/scudcloud-1.1/systray/mono-dark/scudcloud-attention-9-plus.svg
index 6e36967..6e36967 100644
--- a/scudcloud-1.0/systray/mono-dark/scudcloud-attention-9-plus.svg
+++ b/scudcloud-1.1/systray/mono-dark/scudcloud-attention-9-plus.svg
diff --git a/scudcloud-1.0/systray/mono-dark/scudcloud-attention-9.svg b/scudcloud-1.1/systray/mono-dark/scudcloud-attention-9.svg
index 6a8259c..6a8259c 100644
--- a/scudcloud-1.0/systray/mono-dark/scudcloud-attention-9.svg
+++ b/scudcloud-1.1/systray/mono-dark/scudcloud-attention-9.svg
diff --git a/scudcloud-1.0/systray/mono-dark/scudcloud-attention.svg b/scudcloud-1.1/systray/mono-dark/scudcloud-attention.svg
index 7e48289..7e48289 100644
--- a/scudcloud-1.0/systray/mono-dark/scudcloud-attention.svg
+++ b/scudcloud-1.1/systray/mono-dark/scudcloud-attention.svg
diff --git a/scudcloud-1.0/systray/mono-dark/scudcloud.svg b/scudcloud-1.1/systray/mono-dark/scudcloud.svg
index e982393..e982393 100644
--- a/scudcloud-1.0/systray/mono-dark/scudcloud.svg
+++ b/scudcloud-1.1/systray/mono-dark/scudcloud.svg
diff --git a/scudcloud-1.0/systray/mono-light/scudcloud-attention-1.svg b/scudcloud-1.1/systray/mono-light/scudcloud-attention-1.svg
index 646bf31..646bf31 100644
--- a/scudcloud-1.0/systray/mono-light/scudcloud-attention-1.svg
+++ b/scudcloud-1.1/systray/mono-light/scudcloud-attention-1.svg
diff --git a/scudcloud-1.0/systray/mono-light/scudcloud-attention-2.svg b/scudcloud-1.1/systray/mono-light/scudcloud-attention-2.svg
index fa43211..fa43211 100644
--- a/scudcloud-1.0/systray/mono-light/scudcloud-attention-2.svg
+++ b/scudcloud-1.1/systray/mono-light/scudcloud-attention-2.svg
diff --git a/scudcloud-1.0/systray/mono-light/scudcloud-attention-3.svg b/scudcloud-1.1/systray/mono-light/scudcloud-attention-3.svg
index b15cfb5..b15cfb5 100644
--- a/scudcloud-1.0/systray/mono-light/scudcloud-attention-3.svg
+++ b/scudcloud-1.1/systray/mono-light/scudcloud-attention-3.svg
diff --git a/scudcloud-1.0/systray/mono-light/scudcloud-attention-4.svg b/scudcloud-1.1/systray/mono-light/scudcloud-attention-4.svg
index d046544..d046544 100644
--- a/scudcloud-1.0/systray/mono-light/scudcloud-attention-4.svg
+++ b/scudcloud-1.1/systray/mono-light/scudcloud-attention-4.svg
diff --git a/scudcloud-1.0/systray/mono-light/scudcloud-attention-5.svg b/scudcloud-1.1/systray/mono-light/scudcloud-attention-5.svg
index d260e59..d260e59 100644
--- a/scudcloud-1.0/systray/mono-light/scudcloud-attention-5.svg
+++ b/scudcloud-1.1/systray/mono-light/scudcloud-attention-5.svg
diff --git a/scudcloud-1.0/systray/mono-light/scudcloud-attention-6.svg b/scudcloud-1.1/systray/mono-light/scudcloud-attention-6.svg
index 896507f..896507f 100644
--- a/scudcloud-1.0/systray/mono-light/scudcloud-attention-6.svg
+++ b/scudcloud-1.1/systray/mono-light/scudcloud-attention-6.svg
diff --git a/scudcloud-1.0/systray/mono-light/scudcloud-attention-7.svg b/scudcloud-1.1/systray/mono-light/scudcloud-attention-7.svg
index 7424c32..7424c32 100644
--- a/scudcloud-1.0/systray/mono-light/scudcloud-attention-7.svg
+++ b/scudcloud-1.1/systray/mono-light/scudcloud-attention-7.svg
diff --git a/scudcloud-1.0/systray/mono-light/scudcloud-attention-8.svg b/scudcloud-1.1/systray/mono-light/scudcloud-attention-8.svg
index ee41c9d..ee41c9d 100644
--- a/scudcloud-1.0/systray/mono-light/scudcloud-attention-8.svg
+++ b/scudcloud-1.1/systray/mono-light/scudcloud-attention-8.svg
diff --git a/scudcloud-1.0/systray/mono-light/scudcloud-attention-9-plus.svg b/scudcloud-1.1/systray/mono-light/scudcloud-attention-9-plus.svg
index 6e36967..6e36967 100644
--- a/scudcloud-1.0/systray/mono-light/scudcloud-attention-9-plus.svg
+++ b/scudcloud-1.1/systray/mono-light/scudcloud-attention-9-plus.svg
diff --git a/scudcloud-1.0/systray/mono-light/scudcloud-attention-9.svg b/scudcloud-1.1/systray/mono-light/scudcloud-attention-9.svg
index 6a8259c..6a8259c 100644
--- a/scudcloud-1.0/systray/mono-light/scudcloud-attention-9.svg
+++ b/scudcloud-1.1/systray/mono-light/scudcloud-attention-9.svg
diff --git a/scudcloud-1.0/systray/mono-light/scudcloud-attention.svg b/scudcloud-1.1/systray/mono-light/scudcloud-attention.svg
index 7e48289..7e48289 100644
--- a/scudcloud-1.0/systray/mono-light/scudcloud-attention.svg
+++ b/scudcloud-1.1/systray/mono-light/scudcloud-attention.svg
diff --git a/scudcloud-1.0/systray/mono-light/scudcloud.svg b/scudcloud-1.1/systray/mono-light/scudcloud.svg
index 82eb22d..82eb22d 100644
--- a/scudcloud-1.0/systray/mono-light/scudcloud.svg
+++ b/scudcloud-1.1/systray/mono-light/scudcloud.svg