pykafe-commits

[Pykafe-commits] SF.net SVN: pykafe: [68] trunk/pykafe/client/clientmain.py

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

Revision: 68
          http://pykafe.svn.sourceforge.net/pykafe/?rev=68&view=rev
Author:   jnmbk
Date:     2007-06-02 07:03:44 -0700 (Sat, 02 Jun 2007)

Log Message:
-----------
sync with new system

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

Modified: trunk/pykafe/client/clientmain.py
===================================================================
--- trunk/pykafe/client/clientmain.py	2007-06-02 13:44:46 UTC (rev 67)
+++ trunk/pykafe/client/clientmain.py	2007-06-02 14:03:44 UTC (rev 68)
@@ -18,11 +18,7 @@
 locale.setlocale(locale.LC_ALL, "C")
 _ = gettext.translation("pyKafe_client", fallback=True).ugettext
 
-class CurrencyConfig:
-    prefix = ""
-    suffix = " YTL"
-    fixedPrice = 0.50
-    tenMinutePrice = 0.15
+config = PykafeConfiguration()
 
 class SenderThread(QtCore.QThread):
     def __init__(self, parent, data):
@@ -30,8 +26,8 @@
         self.data = data
     def run(self):
         tcpSocket = QtNetwork.QTcpSocket()
-        tcpSocket.connectToHost(QtNetwork.QHostAddress(QtNetwork.QHostAddress.LocalHost), PykafeConfiguration().network.port)
-        print "connecting to:", QtNetwork.QHostAddress(QtNetwork.QHostAddress.LocalHost).toString(), PykafeConfiguration().network.port
+        tcpSocket.connectToHost(QtNetwork.QHostAddress(QtNetwork.QHostAddress.LocalHost), config.network_port)
+        print "connecting to:", QtNetwork.QHostAddress(QtNetwork.QHostAddress.LocalHost).toString(), config.network_port
         tcpSocket.waitForConnected(-1)
         tcpSocket.write(base64.encodestring(self.data))
         tcpSocket.waitForBytesWritten()
@@ -70,7 +66,7 @@
     def __init__(self, parent, ui):
         QtNetwork.QTcpServer.__init__(self, parent)
         self.ui = ui
-        self.listen(QtNetwork.QHostAddress(QtNetwork.QHostAddress.LocalHost), PykafeConfiguration().network.localPort)
+        self.listen(QtNetwork.QHostAddress(QtNetwork.QHostAddress.LocalHost), config.network_localPort)
         self.threads = []
     def incomingConnection(self, socketDescriptor):
         thread = ListenerThread(self.parent(), socketDescriptor)
@@ -100,26 +96,15 @@
             self.do()
             time.sleep(60)
     def do(self):
-        currentTime = QtCore.QDateTime.currentDateTime()
-        usedTime = self.startTime.secsTo(currentTime)
-        price = usedTime/600*self.currencyConfig.tenMinutePrice
-        remainingTime = QtCore.QDateTime()
-        if self.endTime.isValid():
-            remainingTime.setTime_t(currentTime.secsTo(self.endTime))
-        else:
-            remainingTime.setTime_t(0)
-        temp = usedTime
-        usedTime = QtCore.QDateTime()
-        usedTime.setTime_t(temp)
-        text = self.startTime.time().toString("hh.mm") + "\n" +\
-               remainingTime.toUTC().time().toString("hh.mm") + "\n" +\
-               usedTime.toUTC().time().toString("hh.mm")
-        self.emit(QtCore.SIGNAL("changeTimeLabel"), text)
-        if self.currencyConfig.fixedPrice < price:
-            text = self.currencyConfig.prefix + str(price) + self.currencyConfig.suffix
-        else:
-            text = self.currencyConfig.prefix + str(self.currencyConfig.fixedPrice) + self.currencyConfig.suffix
-        self.emit(QtCore.SIGNAL("changeMoneyLabel"), text)
+        tcpSocket = QtNetwork.QTcpSocket()
+        tcpSocket.connectToHost(QtNetwork.QHostAddress(QtNetwork.QHostAddress.LocalHost), config.network_port)
+        tcpSocket.waitForConnected()
+        tcpSocket.write("017")
+        tcpSocket.waitForReadyRead()
+        text = tcpSocket.readAll()
+        text1, text2 = text.rsplit('|', 1)
+        self.emit(QtCore.SIGNAL("changeTimeLabel"), text1)
+        self.emit(QtCore.SIGNAL("changeMoneyLabel"), text2)
 
 class Ui_MainWindow(object):
     def setupUi(self, MainWindow):
@@ -202,7 +187,7 @@
         self.trayIcon.show()
         self.ui = MainWindow
         QtCore.QObject.connect(self.trayIcon, QtCore.SIGNAL("activated(QSystemTrayIcon::ActivationReason)"), self.iconActivated)
-        thread = TimerThread(MainWindow, QtCore.QDateTime.currentDateTime(), QtCore.QDateTime(), CurrencyConfig())
+        thread = TimerThread(MainWindow, QtCore.QDateTime.currentDateTime(), QtCore.QDateTime())
         QtCore.QObject.connect(thread,QtCore.SIGNAL("changeTimeLabel"),self.timeLabel.setText)
         QtCore.QObject.connect(thread,QtCore.SIGNAL("changeMoneyLabel"),self.moneyLabel.setText)
         thread.start()


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

[Pykafe-commits] SF.net SVN: pykafe: [87] trunk/pykafe/client/clientmain.py

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

Revision: 87
          http://pykafe.svn.sourceforge.net/pykafe/?rev=87&view=rev
Author:   jnmbk
Date:     2007-06-03 09:48:43 -0700 (Sun, 03 Jun 2007)

Log Message:
-----------
I'll try this at home

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

Modified: trunk/pykafe/client/clientmain.py
===================================================================
--- trunk/pykafe/client/clientmain.py	2007-06-03 16:26:55 UTC (rev 86)
+++ trunk/pykafe/client/clientmain.py	2007-06-03 16:48:43 UTC (rev 87)
@@ -86,26 +86,20 @@
             self.sendMessage("008")
 
 class TimerThread(QtCore.QThread):
-    def __init__(self, parent, startTime, endTime):
-        QtCore.QThread.__init__(self, parent)
-        self.startTime = startTime
-        self.endTime = endTime
     def run(self):
         while True:
-            self.do()
+            tcpSocket = QtNetwork.QTcpSocket()
+            tcpSocket.connectToHost(QtNetwork.QHostAddress(QtNetwork.QHostAddress.LocalHost), config.network_port)
+            tcpSocket.waitForConnected()
+            tcpSocket.write(base64.encodestring("017"))
+            tcpSocket.waitForReadyRead()
+            text = base64.decodestring(tcpSocket.readAll())
+            text1, text2 = text.rsplit('|', 1)
+            #there's a big problem here, somehow time returns "1" and money returns ""
+            #TODO: fix it
+            self.emit(QtCore.SIGNAL("changeTimeLabel"), text1)
+            self.emit(QtCore.SIGNAL("changeMoneyLabel"), text2)
             time.sleep(60)
-    def do(self):
-        tcpSocket = QtNetwork.QTcpSocket()
-        tcpSocket.connectToHost(QtNetwork.QHostAddress(QtNetwork.QHostAddress.LocalHost), config.network_port)
-        tcpSocket.waitForConnected()
-        tcpSocket.write(base64.encodestring("017"))
-        tcpSocket.waitForReadyRead()
-        text = base64.decodestring(tcpSocket.readAll())
-        text1, text2 = text.rsplit('|', 1)
-        #there's a big problem here, somehow time returns "1" and money returns ""
-        #TODO: fix it
-        self.emit(QtCore.SIGNAL("changeTimeLabel"), text1)
-        self.emit(QtCore.SIGNAL("changeMoneyLabel"), text2)
 
 class Ui_MainWindow(object):
     def setupUi(self, MainWindow):
@@ -188,10 +182,10 @@
         self.trayIcon.show()
         self.ui = MainWindow
         QtCore.QObject.connect(self.trayIcon, QtCore.SIGNAL("activated(QSystemTrayIcon::ActivationReason)"), self.iconActivated)
-        thread = TimerThread(MainWindow, QtCore.QDateTime.currentDateTime(), QtCore.QDateTime())
-        QtCore.QObject.connect(thread,QtCore.SIGNAL("changeTimeLabel"),self.timeLabel.setText)
-        QtCore.QObject.connect(thread,QtCore.SIGNAL("changeMoneyLabel"),self.moneyLabel.setText)
-        thread.start()
+        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()
     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.

[Pykafe-commits] SF.net SVN: pykafe: [91] trunk/pykafe/client/clientmain.py

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

Revision: 91
          http://pykafe.svn.sourceforge.net/pykafe/?rev=91&view=rev
Author:   jnmbk
Date:     2007-06-03 13:20:15 -0700 (Sun, 03 Jun 2007)

Log Message:
-----------
we know what the problem is, but don't know why :P

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

Modified: trunk/pykafe/client/clientmain.py
===================================================================
--- trunk/pykafe/client/clientmain.py	2007-06-03 19:52:34 UTC (rev 90)
+++ trunk/pykafe/client/clientmain.py	2007-06-03 20:20:15 UTC (rev 91)
@@ -80,7 +80,7 @@
             tcpSocket.waitForReadyRead()
             text = base64.decodestring(tcpSocket.readAll())
             text1, text2 = text.rsplit('|', 1)
-            #there's a big problem here, somehow time returns "1" and money returns ""
+            #there's a big problem here, somehow time returns the first letter of time and money returns ""
             #TODO: fix it
             self.emit(QtCore.SIGNAL("changeTimeLabel"), text1)
             self.emit(QtCore.SIGNAL("changeMoneyLabel"), text2)


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

[Pykafe-commits] SF.net SVN: pykafe: [102] trunk/pykafe/client/clientmain.py

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

Revision: 102
          http://pykafe.svn.sourceforge.net/pykafe/?rev=102&view=rev
Author:   jnmbk
Date:     2007-06-09 10:52:27 -0700 (Sat, 09 Jun 2007)

Log Message:
-----------
I'll try this tomorrow

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

Modified: trunk/pykafe/client/clientmain.py
===================================================================
--- trunk/pykafe/client/clientmain.py	2007-06-09 12:14:23 UTC (rev 101)
+++ trunk/pykafe/client/clientmain.py	2007-06-09 17:52:27 UTC (rev 102)
@@ -44,21 +44,18 @@
         self.tcpSocket.setSocketDescriptor(self.socketDescriptor)
         print "connection request from:", self.tcpSocket.peerAddress().toString()
         QtCore.QObject.connect(self.tcpSocket, QtCore.SIGNAL("readyRead()"), self.readRoot)
-        self.tcpSocket.waitForDisconnected()
         self.exec_()
     def readRoot(self):
         data = base64.decodestring(self.tcpSocket.readAll())
         print "received:", data
         if data[:3] == "017":
             text = data[3:]
-            if not text:
-                print "couldn't read"
-            else:
-                text1, text2 = text.split('|',1)
-                self.emit(QtCore.SIGNAL("updateLabels"), str(text1), str(text2))
+            text1, text2 = text.split('|',1)
+            self.emit(QtCore.SIGNAL("updateLabels"), str(text1), str(text2))
         if data[:3] == "021":
             wallpaper = os.popen("dcop kdesktop KBackgroundIface currentWallpaper 1").read().strip()
             self.sendMessage("022" + wallpaper)
+        self.tcpSocket.disconnectFromHost()
 
 class PykafeClientMain(QtNetwork.QTcpServer):
     def __init__(self, parent, ui):


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

[Pykafe-commits] SF.net SVN: pykafe: [101] trunk/pykafe/client/clientmain.py

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

Revision: 101
          http://pykafe.svn.sourceforge.net/pykafe/?rev=101&view=rev
Author:   jnmbk
Date:     2007-06-09 05:14:23 -0700 (Sat, 09 Jun 2007)

Log Message:
-----------
hopefully fix time

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

Modified: trunk/pykafe/client/clientmain.py
===================================================================
--- trunk/pykafe/client/clientmain.py	2007-06-07 14:56:17 UTC (rev 100)
+++ trunk/pykafe/client/clientmain.py	2007-06-09 12:14:23 UTC (rev 101)
@@ -10,7 +10,7 @@
 # Please read the COPYING file.
 #
 
-import os, sys, base64, socket
+import os, sys, base64
 from PyQt4 import QtCore, QtGui, QtNetwork
 from config import PykafeConfiguration
 import cafeteria
@@ -115,11 +115,11 @@
 class TimerThread(QtCore.QThread):
     def run(self):
         while True:
-            #self.emit(QtCore.SIGNAL("updateLabels"), "sadasf","retr")
-            tcpSocket = socket.socket()
-            tcpSocket.connect(("",config.network_port))
-            tcpSocket.send(base64.encodestring("017"))
-            tcpSocket.close()
+            tcpSocket = QtNetwork.QTcpSocket()
+            tcpSocket.connectToHost(QtNetwork.QHostAddress(QtNetwork.QHostAddress.LocalHost), config.network_localPort)
+            tcpSocket.write(base64.encodestring("017"))
+            tcpSocket.waitForBytesWritten()
+            tcpSocket.disconnectFromHost()
             self.sleep(60)
 
 class Ui_MainWindow(object):


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

[Pykafe-commits] SF.net SVN: pykafe: [104] trunk/pykafe/client/clientmain.py

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

Revision: 104
          http://pykafe.svn.sourceforge.net/pykafe/?rev=104&view=rev
Author:   jnmbk
Date:     2007-06-09 21:32:58 -0700 (Sat, 09 Jun 2007)

Log Message:
-----------
fix the nasty bug

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

Modified: trunk/pykafe/client/clientmain.py
===================================================================
--- trunk/pykafe/client/clientmain.py	2007-06-09 18:31:50 UTC (rev 103)
+++ trunk/pykafe/client/clientmain.py	2007-06-10 04:32:58 UTC (rev 104)
@@ -113,7 +113,7 @@
     def run(self):
         while True:
             tcpSocket = QtNetwork.QTcpSocket()
-            tcpSocket.connectToHost(QtNetwork.QHostAddress(QtNetwork.QHostAddress.LocalHost), config.network_localPort)
+            tcpSocket.connectToHost(QtNetwork.QHostAddress(QtNetwork.QHostAddress.LocalHost), config.network_port)
             tcpSocket.write(base64.encodestring("017"))
             tcpSocket.waitForBytesWritten()
             tcpSocket.disconnectFromHost()


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

[Pykafe-commits] SF.net SVN: pykafe: [108] trunk/pykafe/client/clientmain.py

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

Revision: 108
          http://pykafe.svn.sourceforge.net/pykafe/?rev=108&view=rev
Author:   jnmbk
Date:     2007-06-09 23:07:36 -0700 (Sat, 09 Jun 2007)

Log Message:
-----------
done

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

Modified: trunk/pykafe/client/clientmain.py
===================================================================
--- trunk/pykafe/client/clientmain.py	2007-06-10 05:33:31 UTC (rev 107)
+++ trunk/pykafe/client/clientmain.py	2007-06-10 06:07:36 UTC (rev 108)
@@ -52,12 +52,11 @@
             text = data[3:]
             text1, text2 = text.split('|',1)
             self.emit(QtCore.SIGNAL("updateLabels"), str(text1), str(text2))
-            #TODO: Show a baloon when we're close to the end time
         if data[:3] == "021":
             wallpaper = os.popen("dcop kdesktop KBackgroundIface currentWallpaper 1").read().strip()
             self.sendMessage("022" + wallpaper)
         if data[:3] == "024":
-            self.emit(QtCore.SIGNAL("showMessage"), _("Warning"), _("You have %s seconds remaining!") % data[3:], QtGui.QSystemTrayIcon.Warning, 60000)
+            self.emit(QtCore.SIGNAL("showMessage"), _("Warning"), _("You have %s seconds remaining!") % data[3:], QtGui.QSystemTrayIcon.Warning, 30000)
         self.tcpSocket.disconnectFromHost()
 
 class PykafeClientMain(QtNetwork.QTcpServer):


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

[Pykafe-commits] SF.net SVN: pykafe: [134] trunk/pykafe/client/clientmain.py

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

Revision: 134
          http://pykafe.svn.sourceforge.net/pykafe/?rev=134&view=rev
Author:   jnmbk
Date:     2007-06-10 23:09:42 -0700 (Sun, 10 Jun 2007)

Log Message:
-----------
try to fix

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

Modified: trunk/pykafe/client/clientmain.py
===================================================================
--- trunk/pykafe/client/clientmain.py	2007-06-11 04:41:29 UTC (rev 133)
+++ trunk/pykafe/client/clientmain.py	2007-06-11 06:09:42 UTC (rev 134)
@@ -97,6 +97,7 @@
         dialog = cafeteria.Ui_Dialog()
         dialog.setupUi(self.cafeteriaWindow, self)
         self.cafeteriaWindow.setModal(True)
+        self.temporders=[]
         self.cafeteriaWindow.show()
     def logout(self):
         answer = QtGui.QMessageBox.question(self.parent(), _("Are you sure?"), _("Do you really want to logout?"), QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Yes).__or__(QtGui.QMessageBox.No), QtGui.QMessageBox.No)


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