Changeset 310

Timestamp:

12/06/11 04:14:07 (9 years ago)

Author:

sc

Message:

• Preparation for 0.5.1 Linux release
• Updated interface rebuilding scripts

Location:

trunk

Files:

• Puzzlebox/Synapse/Interface_Design.py (modified) (1 diff)
• scripts/update-interface-pyside.py (modified) (4 diffs)
• setup.cfg (modified) (1 diff)
• setup.py (modified) (3 diffs)

trunk/Puzzlebox/Synapse/Interface_Design.py

@@ -3 +3 @@
 # Form implementation generated from reading ui file 'interface/puzzlebox_synapse_interface_design.ui'
 #
-# Created: Mon Dec  5 01:28:43 2011
+# Created: Mon Dec  5 17:05:15 2011
 #      by: PyQt4 UI code generator 4.8.6
 #

trunk/scripts/update-interface-pyside.py

@@ -2 +2 @@
 # -*- coding: utf-8 -*-
 #
-# Puzzlebox - Jigsaw - Script - Update Interface Pyside
+# Puzzlebox - Synapse - Script - Update Interface Pyside
 #
 # Copyright Puzzlebox Productions, LLC (2011)
 
 __changelog__ = """\
-Last Update: 2011.09.27
+Last Update: 2011.12.05
 """
 
@@ -16 +16 @@
 #####################################################################
 
-DEFAULT_INPUT_FILE = 'Puzzlebox/Jigsaw/Interface_Design.py'
-DEFAULT_OUTPUT_FILE = 'Puzzlebox/Jigsaw/Interface_Design.py'
+DEFAULT_INPUT_FILE = 'Puzzlebox/Synapse/Interface_Design.py'
+DEFAULT_OUTPUT_FILE = 'Puzzlebox/Synapse/Interface_Design.py'
 
 REPLACE_STRINGS = { \
@@ -26 +26 @@
 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:",
@@ -33 +33 @@
                 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
+        print "INFO: [Synapse:Interface_Design] Using PyQt4 module"
+        from PyQt4 import QtCore, QtGui
 
-#try:
-  #from PySide import QtCore, QtGui, QtWebKit
-#except:
-  #from PyQt4 import QtCore, QtGui, QtWebKit
 """, \
 

trunk/setup.cfg

@@ -6 +6 @@
 # icon = puzzlebox.ico
 requires = python
-           PyQt4
+           python-pyside
            python-simplejson
            pybluez

trunk/setup.py

@@ -8 +8 @@
 # For more information please refer to http://www.gnu.org/copyleft/gpl.html
 #
-# Last Update: 2011.08.15
+# Last Update: 2011.12.05
 #
 #####################################################################
@@ -38 +38 @@
                     "includes": [ \
                        #"sip", #"PyQt4._qt", \
+                       "PySide", \
                        "numpy", "pylab", \
                        "matplotlib", \
@@ -96 +97 @@
 setup(
         name='puzzlebox_synapse',
-        version='0.5.0',
+        version='0.5.1',
         description='Puzzlebox Synapse provides a GUI and socket-server interface to commercially available EEG headsets',
         author='Steve Castellotti',