Changeset 309

Timestamp:

12/06/11 04:02:16 (9 years ago)

Author:

sc

Message:

Interface:

• comboBoxEEGHeadsetModel disabled when connected

Interface_Design.py:

• fix for loading PySide? modules

Location:

trunk/Puzzlebox/Synapse

Files:

• Interface.py (modified) (2 diffs)
• Interface_Design.py (modified) (2 diffs)

trunk/Puzzlebox/Synapse/Interface.py

@@ -290 +290 @@
                 
                 self.comboBoxDeviceSelect.setEnabled(False)
+                self.comboBoxEEGHeadsetModel.setEnabled(False)
         
         
@@ -312 +313 @@
                 
                 self.comboBoxDeviceSelect.setEnabled(True)
+                self.comboBoxEEGHeadsetModel.setEnabled(True)
                 
                 

trunk/Puzzlebox/Synapse/Interface_Design.py

@@ -13 +13 @@
 if configuration.ENABLE_PYSIDE:
         try:
-                import PySide as PyQt4
-                from PySide import QtCore, QtGui, QtNetwork, QtWebKit
+                #import PySide as PyQt4
+                from PySide import QtCore, QtGui
         except Exception, e:
                 print "ERROR: Excetion importing PySide:",
@@ -20 +20 @@
                 configuration.ENABLE_PYSIDE = False
         else:
-                print "INFO: [Jigsaw:Interface_Design] Using PySide module"
+                print "INFO: [Synapse:Interface_Design] Using PySide module"
 
 if not configuration.ENABLE_PYSIDE:
-        print "INFO: [Jigsaw:Interface_Design] Using PyQt4 module"
-        from PyQt4 import QtCore, QtGui, QtNetwork, QtWebKit
-
-#try:
-  #from PySide import QtCore, QtGui, QtWebKit
-#except:
-  #from PyQt4 import QtCore, QtGui, QtWebKit
+        print "INFO: [Synapse:Interface_Design] Using PyQt4 module"
+        from PyQt4 import QtCore, QtGui
+
 
 try: