[Pykafe-commits] SF.net SVN: pykafe: [90] trunk/pykafe/client

[<jn...@us...>]

Revision: 90
          http://pykafe.svn.sourceforge.net/pykafe/?rev=90&view=rev
Author:   jnmbk
Date:     2007-06-03 12:52:34 -0700 (Sun, 03 Jun 2007)

Log Message:
-----------
trying to make it right

Modified Paths:
--------------
    trunk/pykafe/client/client.py
    trunk/pykafe/client/clientmain.py

Modified: trunk/pykafe/client/client.py
===================================================================
--- trunk/pykafe/client/client.py	2007-06-03 18:32:33 UTC (rev 89)
+++ trunk/pykafe/client/client.py	2007-06-03 19:52:34 UTC (rev 90)
@@ -131,20 +131,13 @@
             sendDataToUi("014")
             return
         if data[:3] == "000":
-            if self.client.session.state == ClientSession.ready:
-                sendDataToServer("000")
-                self.client.session.setState(ClientSession.requestedOpening)
-            else:
-                sys.stderr.write(_("Client tried to send opening request, state was: %s") % self.client.session.toString())
+            sendDataToServer("000")
+            self.client.session.setState(ClientSession.requestedOpening)
         elif data[:3] == "002":
-            if self.client.session.state == ClientSession.ready:
-                sendDataToServer(data)
+            sendDataToServer(data)
         elif data[:3] == "004":
-            if self.client.session.state == ClientSession.notReady:
-                sendDataToServer("004")
-                self.client.session.state = ClientSession.ready
-            else:
-                sys.stderr.write(_("Client tried to say I'm here, state was: %s") % self.client.session.toString())
+            sendDataToServer("004")
+            self.client.session.state = ClientSession.ready
         elif data[:3] == "008":
             sendDataToServer(data)
             os.system("restartkde&")
@@ -163,6 +156,7 @@
                    remainingTime.toUTC().time().toString("hh.mm") + "\n" +\
                    usedTime.toUTC().time().toString("hh.mm") + "|"
             text += currency(self.client.session.calculatePrice(config))
+            print "sending:", text
             self.tcpSocket.write(base64.encodestring(text))
             self.tcpSocket.waitForBytesWritten()
         self.exit()

Modified: trunk/pykafe/client/clientmain.py
===================================================================
--- trunk/pykafe/client/clientmain.py	2007-06-03 18:32:33 UTC (rev 89)
+++ trunk/pykafe/client/clientmain.py	2007-06-03 19:52:34 UTC (rev 90)
@@ -44,21 +44,6 @@
         self.tcpSocket.waitForReadyRead()
         data = base64.decodestring(self.tcpSocket.readAll())
         print "received:", data
-        """if data[:3] == "001":
-            if data[3] == "1":
-                os.system("pyKafeclient&")
-                self.emit(QtCore.SIGNAL("close"))
-            elif data[3] == "0":
-                self.emit(QtCore.SIGNAL("message"), _("Server didn't give acknowledge"))
-        elif data[:3] == "003":
-            if data[3] == 1:
-                os.system("pyKafeclient&")
-                self.emit(QtCore.SIGNAL("close"))
-            else:
-                self.emit(QtCore.SIGNAL("message"), _("Wrong username or password"))
-        elif data[:3] == "005":
-            os.system("pyKafeclient&")
-            self.emit(QtCore.SIGNAL("close"))"""
         self.tcpSocket.disconnectFromHost()
         self.exec_()
 
@@ -182,10 +167,10 @@
         self.trayIcon.show()
         self.ui = MainWindow
         QtCore.QObject.connect(self.trayIcon, QtCore.SIGNAL("activated(QSystemTrayIcon::ActivationReason)"), self.iconActivated)
-        self.thread = TimerThread(MainWindow)
-        QtCore.QObject.connect(self.thread,QtCore.SIGNAL("changeTimeLabel"),self.timeLabel.setText)
-        QtCore.QObject.connect(self.thread,QtCore.SIGNAL("changeMoneyLabel"),self.moneyLabel.setText)
-        self.thread.start()
+        thread = TimerThread()
+        QtCore.QObject.connect(thread,QtCore.SIGNAL("changeTimeLabel"),self.timeLabel.setText)
+        QtCore.QObject.connect(thread,QtCore.SIGNAL("changeMoneyLabel"),self.moneyLabel.setText)
+        thread.start()
     def iconActivated(self, reason):
         if reason == QtGui.QSystemTrayIcon.Trigger:
             if self.ui.isVisible():


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.