[Pykafe-commits] SF.net SVN: pykafe: [155] trunk/pykafe/server

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

Revision: 155
          http://pykafe.svn.sourceforge.net/pykafe/?rev=155&view=rev
Author:   jnmbk
Date:     2008-01-27 03:20:14 -0800 (Sun, 27 Jan 2008)

Log Message:
-----------
this is better

Modified Paths:
--------------
    trunk/pykafe/server/main.py
    trunk/pykafe/server/mainwindow_server.py
    trunk/pykafe/server/tcpserver.py

Modified: trunk/pykafe/server/main.py
===================================================================
--- trunk/pykafe/server/main.py	2008-01-27 10:45:55 UTC (rev 154)
+++ trunk/pykafe/server/main.py	2008-01-27 11:20:14 UTC (rev 155)
@@ -39,7 +39,6 @@
 
     import mainwindow_server
     mainWindow = mainwindow_server.MainWindow()
-    mainWindow.show()
 
     return app.exec_()
 

Modified: trunk/pykafe/server/mainwindow_server.py
===================================================================
--- trunk/pykafe/server/mainwindow_server.py	2008-01-27 10:45:55 UTC (rev 154)
+++ trunk/pykafe/server/mainwindow_server.py	2008-01-27 11:20:14 UTC (rev 155)
@@ -24,6 +24,13 @@
 
         self.tcpServer = tcpserver.TcpServer(self)
 
+        self.show()
+        if not self.tcpServer.isListening():
+            QtGui.QMessageBox.critical(self,
+                QtGui.QApplication.translate("MainWindow", "Connection Error"),
+                QtGui.QApplication.translate("MainWindow",
+                "Unable to start server: %1").arg(self.tcpServer.errorString()))
+
     @QtCore.pyqtSignature("on_main_startButton_clicked()")
     def on_main_startButton_clicked(self):
         print "started"

Modified: trunk/pykafe/server/tcpserver.py
===================================================================
--- trunk/pykafe/server/tcpserver.py	2008-01-27 10:45:55 UTC (rev 154)
+++ trunk/pykafe/server/tcpserver.py	2008-01-27 11:20:14 UTC (rev 155)
@@ -23,15 +23,13 @@
 class TcpServer(QtNetwork.QTcpServer):
     def __init__(self, parent = None):
         QtNetwork.QTcpServer.__init__(self, parent)
-        self.mainWindow = parent
 
         settings = QtCore.QSettings()
 
-        if not self.listen(QtNetwork.QHostAddress(QtNetwork.QHostAddress.Any),
-        settings.value("server/port", defaultsettings["server/port"]).toInt()[0]):
-            QtGui.QMessageBox.critical(self.parent(),
-                    QtGui.QApplication.translate("TcpServer", "Connection Error"),
-                    QtGui.QApplication.translate("TcpServer", "Unable to start server: %1").arg(self.errorString()))
+        # We just assume everything is going fine, gui should do the check here like this:
+        # if tcpServer.isListening():
+        self.listen(QtNetwork.QHostAddress(QtNetwork.QHostAddress.Any),
+            settings.value("server/port", defaultsettings["server/port"]).toInt()[0])
 
     def incomingConnection(self, socketDescriptor):
         # this is called when someone tries to connect


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