[Csp-commits] svn:csp r2220 - in trunk/csp/tools/layout2: cpp scripts/ui scripts/ui/controls

[<sv...@ww...>]

Author: nsmoooose
Date: 2008-02-20 10:26:56 -0800 (Wed, 20 Feb 2008)
New Revision: 2220

Modified:
   trunk/csp/tools/layout2/cpp/OsgGraphicsWindow.h
   trunk/csp/tools/layout2/scripts/ui/SelectDataDirectoryDialog.py
   trunk/csp/tools/layout2/scripts/ui/controls/ProjectTree.py
Log:
Some small fixes related to layout tool.
 * fixed compiler warning in OsgGraphicsWindow
 * files and folders in the project tree is now sorted.
 * bitmap used in SelectDataDirectory.py is now aligned at center.

Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=2220

Modified: trunk/csp/tools/layout2/cpp/OsgGraphicsWindow.h
===================================================================
--- trunk/csp/tools/layout2/cpp/OsgGraphicsWindow.h	2008-02-19 20:53:02 UTC (rev 2219)
+++ trunk/csp/tools/layout2/cpp/OsgGraphicsWindow.h	2008-02-20 18:26:56 UTC (rev 2220)
@@ -48,7 +48,7 @@
 	VoidSignal SwapBuffers;
 
 	OsgGraphicsWindow();
-	~OsgGraphicsWindow();
+	virtual ~OsgGraphicsWindow();
 	
 	/* Render a new frame. This method is used from the OnIdle
 	event in wxPython. */

Modified: trunk/csp/tools/layout2/scripts/ui/SelectDataDirectoryDialog.py
===================================================================
--- trunk/csp/tools/layout2/scripts/ui/SelectDataDirectoryDialog.py	2008-02-19 20:53:02 UTC (rev 2219)
+++ trunk/csp/tools/layout2/scripts/ui/SelectDataDirectoryDialog.py	2008-02-20 18:26:56 UTC (rev 2220)
@@ -16,7 +16,7 @@
 
 		bitmap = wx.Bitmap(os.path.join('images', 'splash.png'))
 		bitmapControl = wx.StaticBitmap(self, wx.ID_ANY, bitmap)
-		horizontalSizer.Add(bitmapControl, flag=wx.RIGHT, border=10)
+		horizontalSizer.Add(bitmapControl, flag=wx.RIGHT|wx.ALIGN_CENTER, border=10)
 
 		rightPanel = wx.Panel(self, wx.ID_ANY)
 		horizontalSizer.Add(rightPanel, flag=wx.TOP|wx.BOTTOM|wx.RIGHT|wx.EXPAND, border=10, proportion=1)

Modified: trunk/csp/tools/layout2/scripts/ui/controls/ProjectTree.py
===================================================================
--- trunk/csp/tools/layout2/scripts/ui/controls/ProjectTree.py	2008-02-19 20:53:02 UTC (rev 2219)
+++ trunk/csp/tools/layout2/scripts/ui/controls/ProjectTree.py	2008-02-20 18:26:56 UTC (rev 2220)
@@ -29,12 +29,14 @@
 		self.nodeDictionary[self.baseDirectory] = self.AddRoot('CSP')
 
 		for root, dirs, files in os.walk(directory):
-			# print(root)
 			parentNode = self.nodeDictionary[root]
 			if '.svn' in dirs:
 				dirs.remove('.svn')
 			if '_svn' in dirs:
 				dirs.remove('_svn')
+				
+			dirs.sort()
+			files.sort()
 			for subDirectory in dirs:
 				newNode = self.AppendItem(parentNode, subDirectory)
 				self.nodeDictionary[os.path.join(root, subDirectory)] = newNode