diff options
| -rw-r--r-- | README.md | 6 | ||||
| -rw-r--r-- | scudcloud-1.0/debian/changelog | 8 | ||||
| -rwxr-xr-x | scudcloud-1.0/lib/scudcloud.py | 9 | ||||
| -rw-r--r-- | scudcloud-1.0/lib/wrapper.py | 7 | ||||
| -rwxr-xr-x | scudcloud-1.0/scudcloud | 2 |
5 files changed, 20 insertions, 12 deletions
@@ -76,9 +76,9 @@ 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.62.tar.gz -tar -xvf v1.0.62.tar.gz -cd scudcloud-1.0.62 +wget https://github.com/raelgc/scudcloud/archive/v1.0.63.tar.gz +tar -xvf v1.0.63.tar.gz +cd scudcloud-1.0.63 SOURCE="scudcloud-1.0" INSTALL="/opt/scudcloud" sudo mkdir -p $INSTALL/lib diff --git a/scudcloud-1.0/debian/changelog b/scudcloud-1.0/debian/changelog index 30cf3cd..b7734eb 100644 --- a/scudcloud-1.0/debian/changelog +++ b/scudcloud-1.0/debian/changelog @@ -1,3 +1,11 @@ +scudcloud (1.0-63) trusty; urgency=medium + + * Improving JS ScudCloud + * Small improvement in message counting + * Adding initial loading message in status bar (#158) + + -- Rael Gugelmin Cunha <rael.gc@gmail.com> Tue, 08 Sep 2015 10:50:20 -0300 + scudcloud (1.0-62) trusty; urgency=medium * Forgot to bump constant version before build package diff --git a/scudcloud-1.0/lib/scudcloud.py b/scudcloud-1.0/lib/scudcloud.py index 8555867..451fd04 100755 --- a/scudcloud-1.0/lib/scudcloud.py +++ b/scudcloud-1.0/lib/scudcloud.py @@ -64,6 +64,7 @@ class ScudCloud(QtGui.QMainWindow): webView.show() # Starting unread msgs counter self.setupTimer() + self.statusBar().showMessage('Connecting to Slack...') def setupTimer(self): timer = QTimer(self) @@ -338,13 +339,13 @@ class ScudCloud(QtGui.QMainWindow): total = 0 for i in range(0, self.stackedWidget.count()): widget = self.stackedWidget.widget(i) - widget.count() - if widget.messages == 0: + messages = widget.count() + if messages == 0: self.leftPane.stopAlert(widget.team()) else: self.leftPane.alert(widget.team()) - if widget.messages is not None: - total+=widget.messages + if messages is not None: + total+=messages if total > self.messages: self.alert() if 0 == total: diff --git a/scudcloud-1.0/lib/wrapper.py b/scudcloud-1.0/lib/wrapper.py index 2d5629b..ea48b05 100644 --- a/scudcloud-1.0/lib/wrapper.py +++ b/scudcloud-1.0/lib/wrapper.py @@ -10,8 +10,6 @@ from resources import Resources class Wrapper(QWebView): - messages = 0 - def __init__(self, window): self.configure_proxy() QWebView.__init__(self) @@ -71,6 +69,7 @@ class Wrapper(QWebView): self.page().currentFrame().addToJavaScriptWindowObject("desktop", self) self.page().currentFrame().evaluateJavaScript(self.js) self.window.enableMenus(self.isConnected()) + self.window.statusBar().hide() def systemOpen(self, url): subprocess.call(('xdg-open', url)) @@ -128,9 +127,9 @@ class Wrapper(QWebView): def count(self): try: - self.messages = self.call("count") + return self.call("count") except: - self.messages = 0 + return 0 @QtCore.pyqtSlot(str) def populate(self, serialized): diff --git a/scudcloud-1.0/scudcloud b/scudcloud-1.0/scudcloud index 11e776e..bb2d57e 100755 --- a/scudcloud-1.0/scudcloud +++ b/scudcloud-1.0/scudcloud @@ -14,7 +14,7 @@ from qsingleapplication import QSingleApplication # The ScudCloud QMainWindow win = None -VERSION = '1.0.62' +VERSION = '1.0.63' def main(): global win; |