Changeset 160 for synapse


Ignore:
Timestamp:
08/12/10 12:25:01 (11 years ago)
Author:
sc
Message:

Puzzlebox-Synapse.nsi:

  • 0.3.0 release

puzzlebox_synapse_client_thinkgear.py:

  • fixed localhost addressing issue

puzzlebox_synapse_interface.py:

  • fixed typo

setup_win32.py:

  • initial checkin
Location:
synapse
Files:
1 added
3 edited

Legend:

Unmodified
Added
Removed
  • synapse/Puzzlebox-Synapse.nsi

    r142 r160  
    1 ; Puzzlebox ThinkGear Emulator Windows Installer 
     1; Puzzlebox Synapse Windows Installer 
    22 
    33; NOTE: this .NSI script is designed for NSIS v1.8+ 
    44 
    5 Name "Puzzlebox ThinkGear Emulator" 
    6 OutFile "Puzzlebox-ThinkGearEmulator-0.2.4-setup.exe" 
     5Name "Puzzlebox Synapse" 
     6OutFile "Puzzlebox-Synapse-0.3.0-setup.exe" 
    77 
    88; Some default compiler settings (uncomment and change at will): 
     
    1515 
    1616LicenseText "You must agree to this license before installing." 
    17 LicenseData "license.txt" 
     17LicenseData "LICENSE.txt" 
    1818 
    19 InstallDir "$PROGRAMFILES\Puzzlebox ThinkGear Emulator" 
    20 InstallDirRegKey HKEY_LOCAL_MACHINE "SOFTWARE\Puzzlebox ThinkGear Emulator\Puzzlebox ThinkGear Emulator" "" 
     19InstallDir "$PROGRAMFILES\Puzzlebox Synapse" 
     20InstallDirRegKey HKEY_LOCAL_MACHINE "SOFTWARE\Puzzlebox Synapse\Puzzlebox Synapse" "" 
    2121;DirShow show ; (make this hide to not let the user change it) 
    22 DirText "Select the directory to install Puzzlebox ThinkGear Emulator into:" 
     22DirText "Select the directory to install Puzzlebox Synapse into:" 
    2323 
    2424InstallColors /windows 
     
    2727SetOutPath "$INSTDIR" 
    2828; add files / whatever that need to be installed here. 
    29 WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Puzzlebox ThinkGear Emulator\Puzzlebox ThinkGear Emulator" "" "$INSTDIR" 
    30 WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\Puzzlebox ThinkGear Emulator\Puzzlebox ThinkGear Emulator" "DisplayName" "Puzzlebox ThinkGear Emulator (remove only)" 
    31 WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\Puzzlebox ThinkGear Emulator\Puzzlebox ThinkGear Emulator" "UninstallString" '"$INSTDIR\Puzzlesbox-ThinkGearEmulator-Uninstall.exe"' 
     29WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Puzzlebox Synapse\Puzzlebox Synapse" "" "$INSTDIR" 
     30WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\Puzzlebox Synapse\Puzzlebox Synapse" "DisplayName" "Puzzlebox Synapse (remove only)" 
     31WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\Puzzlebox Synapse\Puzzlebox Synapse" "UninstallString" '"$INSTDIR\Puzzlesbox-Synapse-Uninstall.exe"' 
    3232       
    3333 File dist\_ctypes.pyd 
     
    3939 File dist\mingwm10.dll 
    4040; File dist\msvcr71.dll 
    41  File dist\puzzlebox_thinkgear_emulator_configuration.ini 
    42  File dist\puzzlebox_thinkgear_server.exe 
     41 File dist\puzzlebox_synapse_client_thinkgear.exe 
     42 File dist\puzzlebox_synapse_configuration.ini 
     43 File dist\puzzlebox_synapse_interface.exe 
     44 File dist\puzzlebox_synapse_server_thinkgear.exe 
    4345 File dist\PyQt4.QtCore.pyd 
     46 File dist\PyQt4.QtGui.pyd 
    4447 File dist\PyQt4.QtNetwork.pyd 
    4548 File dist\python25.dll 
    4649 File dist\QtCore4.dll 
     50 File dist\QtGui4.dll 
    4751 File dist\QtNetwork4.dll 
    4852 File dist\select.pyd 
     
    5559SetOutPath $INSTDIR\images 
    5660 File dist\images\puzzlebox.ico 
     61 File dist\images\puzzlebox_logo.png 
    5762 
    5863 
     
    6166 
    6267; write out uninstaller 
    63 WriteUninstaller "$INSTDIR\Puzzlebox-ThinkGearEmulator-Uninstall.exe" 
     68WriteUninstaller "$INSTDIR\Puzzlebox-Synapse-Uninstall.exe" 
    6469 
    6570SectionEnd ; end of default section 
     
    6772 
    6873Section "Start Menu + Desktop Icons" 
    69 ;  SetOutPath "$SMPROGRAMS\Puzzlebox ThinkGear Emulator" 
     74;  SetOutPath "$SMPROGRAMS\Puzzlebox Synapse" 
    7075  SetOutPath $INSTDIR 
    71   CreateDirectory "$SMPROGRAMS\Puzzlebox ThinkGear Emulator" 
    72 ;  CreateShortCut "$SMPROGRAMS\Puzzlebox ThinkGear Emulator\Puzzlebox ThinkGear Emulator Network Client.lnk" \ 
    73 ;                 "$INSTDIR\puzzlebox_thinkgear_client.exe" \ 
    74 ;                 ""  "$INSTDIR\images\puzzlebox.ico"  "0"  "SW_SHOWMINIMIZED" 
    75   CreateShortCut "$SMPROGRAMS\Puzzlebox ThinkGear Emulator\Puzzlebox ThinkGear Emulator Network Server.lnk" \ 
    76                  "$INSTDIR\puzzlebox_thinkgear_server.exe" \ 
    77                  ""  "$INSTDIR\images\puzzlebox.ico"  "0"  "SW_SHOWMINIMIZED" 
    78   CreateShortCut "$SMPROGRAMS\Puzzlebox ThinkGear Emulator\Edit Puzzlebox ThinkGear Emulator Configuration.lnk" \ 
    79                  "$INSTDIR\puzzlebox_thinkgear_emulator_configuration.ini" \ 
     76  CreateDirectory "$SMPROGRAMS\Puzzlebox Synapse" 
     77  CreateShortCut "$SMPROGRAMS\Puzzlebox Synapse\Puzzlebox Synapse ThinkGear Connect Client.lnk" \ 
     78                 "$INSTDIR\puzzlebox_synapse_client_thinkgear.exe" \ 
     79                 ""  "$INSTDIR\images\puzzlebox.ico"  "0"  "" 
     80  CreateShortCut "$SMPROGRAMS\Puzzlebox Synapse\Puzzlebox Synapse.lnk" \ 
     81                 "$INSTDIR\puzzlebox_synapse_interface.exe" \ 
     82                 ""  "$INSTDIR\images\puzzlebox.ico"  "0"  "" 
     83  CreateShortCut "$SMPROGRAMS\Puzzlebox Synapse\Edit Puzzlebox Synapse Configuration.lnk" \ 
     84                 "$INSTDIR\puzzlebox_synapse_configuration.ini" \ 
    8085                 ""  ""  "0"  "" 
    81   CreateShortCut "$SMPROGRAMS\Puzzlebox ThinkGear Emulator\Uninstall Puzzlebox ThinkGear Emulator.lnk" \ 
    82                  "$INSTDIR\Puzzlebox-ThinkGearEmulator-Uninstall.exe" 
     86  CreateShortCut "$SMPROGRAMS\Puzzlebox Synapse\Uninstall Puzzlebox Synapse.lnk" \ 
     87                 "$INSTDIR\Puzzlebox-Synapse-Uninstall.exe" 
     88  CreateShortCut "$DESKTOP\Puzzlebox Synapse.lnk" \ 
     89                 "$INSTDIR\puzzlebox_synapse_interface.exe" \ 
     90                 ""  "$INSTDIR\images\puzzlebox.ico"  "0"  "" 
    8391SectionEnd 
    8492 
    8593 
    8694; begin uninstall settings/section 
    87 UninstallText "This will uninstall Puzzlebox ThinkGear Emulator from your system" 
     95UninstallText "This will uninstall Puzzlebox Synapse from your system" 
    8896 
    8997Section Uninstall 
    9098; add delete commands to delete whatever files/registry keys/etc you installed here. 
    91 ; Delete "$SMPROGRAMS\Puzzlebox ThinkGear Emulator\Puzzlebox ThinkGear Emulator Network Client.lnk" 
    92  Delete "$SMPROGRAMS\Puzzlebox ThinkGear Emulator\Puzzlebox ThinkGear Emulator Network Server.lnk" 
    93  Delete "$SMPROGRAMS\Puzzlebox ThinkGear Emulator\Edit Puzzlebox ThinkGear Emulator Configuration.lnk"  
    94  Delete "$SMPROGRAMS\Puzzlebox ThinkGear Emulator\Uninstall Puzzlebox ThinkGear Emulator.lnk"  
    95    RMDir "$SMPROGRAMS\Puzzlebox ThinkGear Emulator" 
     99 Delete "$SMPROGRAMS\Puzzlebox Synapse\Puzzlebox Synapse ThinkGear Connect Client.lnk" 
     100 Delete "$SMPROGRAMS\Puzzlebox Synapse\Puzzlebox Synapse.lnk" 
     101 Delete "$SMPROGRAMS\Puzzlebox Synapse\Edit Puzzlebox Synapse Configuration.lnk"  
     102 Delete "$SMPROGRAMS\Puzzlebox Synapse\Uninstall Puzzlebox Synapse.lnk"  
     103   RMDir "$SMPROGRAMS\Puzzlebox Synapse" 
     104 Delete "$DESKTOP\Puzzlebox Synapse.lnk" 
    96105 
    97106 
     
    104113 Delete $INSTDIR\mingwm10.dll 
    105114 Delete $INSTDIR\msvcr71.dll 
    106  Delete $INSTDIR\puzzlebox_thinkgear_emulator_configuration.ini 
    107  Delete $INSTDIR\puzzlebox_thinkgear_server.exe 
     115 Delete $INSTDIR\puzzlebox_synapse_client_thinkgear.exe 
     116 Delete $INSTDIR\puzzlebox_synapse_configuration.ini 
     117 Delete $INSTDIR\puzzlebox_synapse_interface.exe 
     118 Delete $INSTDIR\puzzlebox_synapse_server_thinkgear.exe 
    108119 Delete $INSTDIR\PyQt4.QtCore.pyd 
     120 Delete $INSTDIR\PyQt4.QtGui.pyd 
    109121 Delete $INSTDIR\PyQt4.QtNetwork.pyd 
    110122 Delete $INSTDIR\python25.dll 
    111123 Delete $INSTDIR\QtCore4.dll 
     124 Delete $INSTDIR\QtGui4.dll 
    112125 Delete $INSTDIR\QtNetwork4.dll 
    113126 Delete $INSTDIR\select.pyd 
     
    119132 
    120133 Delete $INSTDIR\images\puzzlebox.ico 
     134 Delete $INSTDIR\images\puzzlebox_logo.png 
    121135 
    122136 RMDir $INSTDIR\images 
     
    124138 RMDIR $INSTDIR 
    125139 
    126 Delete "$INSTDIR\Puzzlebox-ThinkGearEmulator-Uninstall.exe" 
    127 DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\Puzzlebox ThinkGear Emulator\Puzzlebox ThinkGear Emulator" 
    128 DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Puzzlebox ThinkGear Emulator" 
     140Delete "$INSTDIR\Puzzlebox-Synapse-Uninstall.exe" 
     141DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\Puzzlebox Synapse\Puzzlebox Synapse" 
     142DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Puzzlebox Synapse" 
    129143RMDir "$INSTDIR" 
    130144 
     
    132146  IfFileExists $INSTDIR 0 Removed  
    133147    MessageBox MB_YESNO|MB_ICONQUESTION \ 
    134       "Remove all files in your Puzzlebox ThinkGear Emulator directory? (If you have anything \ 
     148      "Remove all files in your Puzzlebox Synapse directory? (If you have anything \ 
    135149you created that you want to keep, click No)" IDNO Removed 
    136150    Delete $INSTDIR\*.* ; this would be skipped if the user hits no 
  • synapse/puzzlebox_synapse_client_thinkgear.py

    r152 r160  
    8484                self.socket.name = 'ThinkGear Client' 
    8585                 
    86                 if ((self.server_host == '') or \ 
    87                          (self.server_host == '*')): 
    88                         self.server_host=QtNetwork.QHostAddress.Any 
     86                if self.server_host == '*': 
     87                        self.server_host = '127.0.0.1' 
     88 
     89                self.server_host=QtNetwork.QHostAddress(self.server_host) 
    8990                 
    9091                self.socket.readyRead.connect(self.printReply) 
  • synapse/puzzlebox_synapse_interface.py

    r159 r160  
    246246                self.progressBarEEGLowAlpha.setMaximum(self.maxEEGPower) 
    247247                self.progressBarEEGHighAlpha.setMaximum(self.maxEEGPower) 
    248                 self.progressBarEEGLowBeta.setMaximum(self.maxEEGPowerE) 
     248                self.progressBarEEGLowBeta.setMaximum(self.maxEEGPower) 
    249249                self.progressBarEEGHighBeta.setMaximum(self.maxEEGPower) 
    250250                self.progressBarEEGLowGamma.setMaximum(self.maxEEGPower) 
Note: See TracChangeset for help on using the changeset viewer.