[sc-dev] SF.net SVN: supercollider:[8224] trunk

[danstowell@xxxxxxxxxxxxxxxxxxxxx]

Revision: 8224
          http://supercollider.svn.sourceforge.net/supercollider/?rev=8224&view=rev
Author:   danstowell
Date:     2008-12-20 18:14:40 +0000 (Sat, 20 Dec 2008)

Log Message:
-----------
Some windows improvements, to installer, to path splitting

Modified Paths:
--------------
    trunk/Headers/common/SC_StringParser.h
    trunk/Psycollider/Psycollider/Psycollider.py
    trunk/Source/server/SC_Lib_Cintf.cpp

Modified: trunk/Headers/common/SC_StringParser.h
===================================================================
--- trunk/Headers/common/SC_StringParser.h	2008-12-20 18:04:22 UTC (rev 8223)
+++ trunk/Headers/common/SC_StringParser.h	2008-12-20 18:14:40 UTC (rev 8224)
@@ -23,6 +23,12 @@
 
 #define SC_MAX_TOKEN_LENGTH 256
 
+#ifdef SC_WIN32
+	#define SC_STRPARSE_PATHDELIMITER ';'
+#else
+	#define SC_STRPARSE_PATHDELIMITER ':'
+#endif
+
 class SC_StringParser
 {
 	const char	*mSpec, *mStart, *mEnd;

Modified: trunk/Psycollider/Psycollider/Psycollider.py
===================================================================
--- trunk/Psycollider/Psycollider/Psycollider.py	2008-12-20 18:04:22 UTC (rev 8223)
+++ trunk/Psycollider/Psycollider/Psycollider.py	2008-12-20 18:14:40 UTC (rev 8224)
@@ -204,7 +204,7 @@
     def CanCloseWindow(self):
         if self.isModified:
             if self.filePath == "":
-                dlg = wx.MessageDialog(self,"Do you want to save %s ? " % self.title,"Psycollider",wx.CANCEL | wx.YES_NO)
+                dlg = wx.MessageDialog(self,"Do you want to save %s ? " % self.title,"SuperCollider",wx.CANCEL | wx.YES_NO)
                 reply = dlg.ShowModal()
                 if reply == wx.ID_YES:
                     self.SaveFileAs()
@@ -214,7 +214,7 @@
                 elif reply == wx.ID_CANCEL:
                     return False
             else:
-                dlg = wx.MessageDialog(self,"Do you want to save %s ?" % self.filePath,"Psycollider",wx.CANCEL | wx.YES_NO)
+                dlg = wx.MessageDialog(self,"Do you want to save %s ?" % self.filePath,"SuperCollider",wx.CANCEL | wx.YES_NO)
                 reply = dlg.ShowModal()
                 if reply == wx.ID_YES:
                     self.SaveFile()
@@ -827,7 +827,7 @@
         self.Show(True)
             
     def OnCloseWindow(self, event):
-        dlg = wx.MessageDialog(self, "This will shutdown PsyCollider, stop all servers and close all code windows.\n Do you want to quit?")
+        dlg = wx.MessageDialog(self, "This will shut down SuperCollider, stop all servers and close all code windows.\n Do you want to quit?")
         reply = dlg.ShowModal()
         dlg.Destroy()
         if reply == wx.ID_OK:
@@ -842,7 +842,7 @@
 
             wx.GetApp().Shutdown()
 	else:
-		wx.MessageBox("Canceled");
+		# No need?  wx.MessageBox("Canceled");
 		pass
         
     def SaveFile(self):
@@ -966,13 +966,13 @@
         while continueLookingForFolder:
             dlg = wx.DirDialog(None, "Please locate the SCClassLibrary")
             if dlg.ShowModal() == wx.ID_CANCEL:
-                wx.MessageBox("Sorry. No class library available. Psycollider will not work correctly","Error", wx.OK | wx.ICON_ERROR)
+                wx.MessageBox("Sorry. No class library available. SuperCollider will not work correctly","Error", wx.OK | wx.ICON_ERROR)
                 continueLookingForFolder = False
             else:
                 classLibPath = dlg.GetPath()
                 leafName = (os.path.split(classLibPath))[1]
                 if leafName != 'SCClassLibrary':
-                    wx.MessageBox("The folder needs to be called SCClassLibrary for Psycollider to work correctly", "Error", wx.OK | wx.ICON_ERROR)
+                    wx.MessageBox("The folder needs to be called SCClassLibrary for SuperCollider to work correctly", "Error", wx.OK | wx.ICON_ERROR)
                 else:
                     continueLookingForFolder = False
                     classLibFolderFound = True

Modified: trunk/Source/server/SC_Lib_Cintf.cpp
===================================================================
--- trunk/Source/server/SC_Lib_Cintf.cpp	2008-12-20 18:04:22 UTC (rev 8223)
+++ trunk/Source/server/SC_Lib_Cintf.cpp	2008-12-20 18:14:40 UTC (rev 8224)
@@ -120,7 +120,7 @@
 	bool loadUGensExtDirs = true;
 	if(uGensPluginPath){
 		loadUGensExtDirs = false;
-		SC_StringParser sp(uGensPluginPath, ':');
+		SC_StringParser sp(uGensPluginPath, SC_STRPARSE_PATHDELIMITER);
 		while (!sp.AtEnd()) {
 			PlugIn_LoadDir(const_cast<char *>(sp.NextToken()), true);
 		}
@@ -156,7 +156,7 @@
 		PlugIn_LoadDir(extensionDir, false);
 
 		// load user plugin directories
-		SC_StringParser sp(getenv("SC_PLUGIN_PATH"), ':');
+		SC_StringParser sp(getenv("SC_PLUGIN_PATH"), SC_STRPARSE_PATHDELIMITER);
 		while (!sp.AtEnd()) {
 			PlugIn_LoadDir(const_cast<char *>(sp.NextToken()), true);
 		}


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

_______________________________________________
sc-dev mailing list

info (subscription, etc.): http://www.beast.bham.ac.uk/research/sc_mailing_lists.shtml
archive: https://listarc.bham.ac.uk/marchives/sc-dev/
search: https://listarc.bham.ac.uk/lists/sc-dev/search/