Changeset 111


Ignore:
Timestamp:
07/11/10 11:59:28 (11 years ago)
Author:
sc
Message:
  • PySide? import attempted before PyQt4 where available
  • problem specifying port when calling socket.listen on QTcpServer
Location:
remote_control
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • remote_control/puzzlebox_brainstorms_client_interface.py

    r109 r111  
    2121import os, sys 
    2222 
    23 #try: 
    24         #from PySide import QtCore, QtGui, QtNetwork 
    25 #except: 
    26         #print "Using PyQt4 module" 
    27         #from PyQt4 import QtCore, QtGui, QtNetwork 
    28 #else: 
    29         #print "Using PySide module" 
    30  
    31 from PyQt4 import QtCore, QtGui, QtNetwork 
     23try: 
     24        import PySide as PyQt4 
     25        from PySide import QtCore, QtGui, QtNetwork 
     26except: 
     27        print "Using PyQt4 module" 
     28        from PyQt4 import QtCore, QtGui, QtNetwork 
     29else: 
     30        print "Using PySide module" 
     31 
     32#from PyQt4 import QtCore, QtGui, QtNetwork 
    3233#from PySide import QtCore, QtGui, QtNetwork 
    3334 
  • remote_control/puzzlebox_brainstorms_client_interface_design.py

    r109 r111  
    88# WARNING! All changes made in this file will be lost! 
    99 
    10 from PyQt4 import QtCore, QtGui 
     10try: 
     11        import PySide as PyQt4 
     12        from PySide import QtCore, QtGui 
     13except: 
     14        print "Using PyQt4 module" 
     15        from PyQt4 import QtCore, QtGui 
     16else: 
     17        print "Using PySide module" 
     18 
     19#from PyQt4 import QtCore, QtGui 
    1120 
    1221class Ui_Form(object): 
  • remote_control/puzzlebox_brainstorms_client_interface_local.py

    r109 r111  
    99# For more information please refer to http://www.gnu.org/copyleft/gpl.html 
    1010# 
    11 # Last Update: 2010.07.09 
     11# Last Update: 2010.07.10 
    1212# 
    1313##################################################################### 
     
    1616import signal 
    1717 
    18 #try: 
    19         #from PySide import QtCore, QtGui, QtNetwork 
    20 #except: 
    21         #print "Using PyQt4 module" 
    22         #from PyQt4 import QtCore, QtGui, QtNetwork 
    23 #else: 
    24         #print "Using PySide module" 
     18try: 
     19        import PySide as PyQt4 
     20        from PySide import QtCore, QtGui, QtNetwork 
     21except: 
     22        print "Using PyQt4 module" 
     23        from PyQt4 import QtCore, QtGui, QtNetwork 
     24else: 
     25        print "Using PySide module" 
    2526 
    26 from PyQt4 import QtCore, QtGui, QtNetwork 
     27#from PyQt4 import QtCore, QtGui, QtNetwork 
    2728#from PySide import QtCore, QtGui, QtNetwork 
    2829 
  • remote_control/puzzlebox_brainstorms_client_interface_network.py

    r109 r111  
    1515import os, sys 
    1616 
    17 #try: 
    18         #from PySide import QtGui 
    19 #except: 
    20         #print "Using PyQt4 module" 
    21         #from PyQt4 import QtGui 
    22 #else: 
    23         #print "Using PySide module" 
     17try: 
     18        import PySide as PyQt4 
     19        from PySide import QtGui 
     20except: 
     21        print "Using PyQt4 module" 
     22        from PyQt4 import QtGui 
     23else: 
     24        print "Using PySide module" 
    2425 
    25 from PyQt4 import QtGui 
     26#from PyQt4 import QtGui 
    2627#from PySide import QtGui 
    2728 
  • remote_control/puzzlebox_brainstorms_network_client.py

    r109 r111  
    1616import signal 
    1717 
    18 from PyQt4 import QtCore, QtGui, QtNetwork 
     18try: 
     19        import PySide as PyQt4 
     20        from PySide import QtCore, QtGui, QtNetwork 
     21except: 
     22        print "Using PyQt4 module" 
     23        from PyQt4 import QtCore, QtGui, QtNetwork 
     24else: 
     25        print "Using PySide module" 
     26 
     27#from PyQt4 import QtCore, QtGui, QtNetwork 
    1928 
    2029import simplejson as json 
  • remote_control/puzzlebox_brainstorms_network_client_thinkgear.py

    r87 r111  
    99# For more information please refer to http://www.gnu.org/copyleft/gpl.html 
    1010# 
    11 # Last Update: 2010.07.06 
     11# Last Update: 2010.07.10 
    1212# 
    1313##################################################################### 
     
    1616import signal 
    1717 
    18 from PyQt4 import QtCore, QtNetwork 
     18try: 
     19        import PySide as PyQt4 
     20        from PySide import QtCore, QtNetwork 
     21except: 
     22        print "Using PyQt4 module" 
     23        from PyQt4 import QtCore, QtNetwork 
     24else: 
     25        print "Using PySide module" 
     26 
     27#from PyQt4 import QtCore, QtNetwork 
    1928 
    2029import simplejson as json 
  • remote_control/puzzlebox_brainstorms_network_server.py

    r109 r111  
    1818import simplejson as json 
    1919 
    20 from PyQt4 import QtCore, QtNetwork 
     20try: 
     21        import PySide as PyQt4 
     22        from PySide import QtCore, QtNetwork 
     23except: 
     24        print "Using PyQt4 module" 
     25        from PyQt4 import QtCore, QtNetwork 
     26else: 
     27        print "Using PySide module" 
     28 
     29#from PyQt4 import QtCore, QtNetwork 
    2130 
    2231import puzzlebox_brainstorms_configuration as configuration 
Note: See TracChangeset for help on using the changeset viewer.