[Hdrflow-svn] SF.net SVN: hdrflow: [225] trunk

[<gl...@us...>]

Revision: 225
          http://hdrflow.svn.sourceforge.net/hdrflow/?rev=225&view=rev
Author:   glslang
Date:     2007-08-04 08:50:45 -0700 (Sat, 04 Aug 2007)

Log Message:
-----------
+ Multiple column PlugIns OutlineView

Modified Paths:
--------------
    trunk/app/HDRFlow/English.lproj/Preferences.nib/info.nib
    trunk/app/HDRFlow/English.lproj/Preferences.nib/keyedobjects.nib
    trunk/app/HDRFlow/PlugInsPreferencesController.mm
    trunk/app/HDRFlow/PlugInsPreferencesOutlineViewNode.h
    trunk/app/HDRFlow/PlugInsPreferencesOutlineViewNode.mm
    trunk/unity.sh

Modified: trunk/app/HDRFlow/English.lproj/Preferences.nib/info.nib
===================================================================
--- trunk/app/HDRFlow/English.lproj/Preferences.nib/info.nib	2007-08-04 14:22:14 UTC (rev 224)
+++ trunk/app/HDRFlow/English.lproj/Preferences.nib/info.nib	2007-08-04 15:50:45 UTC (rev 225)
@@ -9,7 +9,7 @@
 		<key>10</key>
 		<string>514 465 412 270 0 0 1440 878 </string>
 		<key>12</key>
-		<string>500 443 439 314 0 0 1440 878 </string>
+		<string>435 427 594 345 0 0 1440 878 </string>
 		<key>33</key>
 		<string>519 453 401 293 0 0 1440 878 </string>
 	</dict>
@@ -17,10 +17,10 @@
 	<string>446.1</string>
 	<key>IBOpenObjects</key>
 	<array>
+		<integer>33</integer>
+		<integer>12</integer>
 		<integer>10</integer>
 		<integer>5</integer>
-		<integer>33</integer>
-		<integer>12</integer>
 	</array>
 	<key>IBSystem Version</key>
 	<string>8R2218</string>

Modified: trunk/app/HDRFlow/English.lproj/Preferences.nib/keyedobjects.nib
===================================================================
(Binary files differ)

Modified: trunk/app/HDRFlow/PlugInsPreferencesController.mm
===================================================================
--- trunk/app/HDRFlow/PlugInsPreferencesController.mm	2007-08-04 14:22:14 UTC (rev 224)
+++ trunk/app/HDRFlow/PlugInsPreferencesController.mm	2007-08-04 15:50:45 UTC (rev 225)
@@ -81,6 +81,11 @@
 		{
 			PlugInsPreferencesOutlineViewNode* child = 
 				[ [ PlugInsPreferencesOutlineViewNode alloc ] initWithString: [ [ NSString alloc ] initWithUTF8String: opl::to_string( I->name( ) ).c_str( ) ] ];
+
+			[ child setType: [ [ NSString alloc ] initWithUTF8String: opl::to_string( I->type( ) ).c_str( ) ] ];
+			[ child setExtension: [ [ NSString alloc ] initWithUTF8String: opl::to_string( I->extension( ) ).c_str( ) ] ];
+			[ child setMerit: [ [ NSString alloc ] initWithFormat: @"%d", I->merit( ) ] ];
+
 			[ node addChildObject: child ];
 		}
 		

Modified: trunk/app/HDRFlow/PlugInsPreferencesOutlineViewNode.h
===================================================================
--- trunk/app/HDRFlow/PlugInsPreferencesOutlineViewNode.h	2007-08-04 14:22:14 UTC (rev 224)
+++ trunk/app/HDRFlow/PlugInsPreferencesOutlineViewNode.h	2007-08-04 15:50:45 UTC (rev 225)
@@ -10,13 +10,24 @@
 @interface PlugInsPreferencesOutlineViewNode : NSObject
 {
 	NSMutableArray* children;
+	
 	NSString* itemName;
+	NSString* type;
+	NSString* extension;
+	NSString* merit;
 }
 
 - ( id ) initWithString: ( NSString* ) name;
 
 - ( void ) addChildObject: ( id ) childObject;
+
 - ( NSString* ) itemName;
+- ( NSString* ) type;
+- ( void ) setType: ( NSString* ) plugInType;
+- ( NSString* ) extension;
+- ( void ) setExtension: ( NSString* ) extensionTypes;
+- ( NSString* ) merit;
+- ( void ) setMerit: ( NSString* ) meritValue;
 
 - ( int ) numberOfChildren;
 - ( NSArray* ) children;

Modified: trunk/app/HDRFlow/PlugInsPreferencesOutlineViewNode.mm
===================================================================
--- trunk/app/HDRFlow/PlugInsPreferencesOutlineViewNode.mm	2007-08-04 14:22:14 UTC (rev 224)
+++ trunk/app/HDRFlow/PlugInsPreferencesOutlineViewNode.mm	2007-08-04 15:50:45 UTC (rev 225)
@@ -22,7 +22,12 @@
 - ( void ) dealloc
 {
 	[ children release ];
+	
 	[ itemName release ];
+	[ type release ];
+	[ extension release ];
+	[ merit release ];
+	
 	[ super dealloc ];
 }
 
@@ -36,6 +41,36 @@
 	return itemName;
 }
 
+- ( NSString* ) type
+{
+	return type;
+}
+
+- ( void ) setType: ( NSString* ) plugInType
+{
+	type = plugInType;
+}
+
+- ( NSString* ) extension
+{
+	return extension;
+}
+
+- ( void ) setExtension: ( NSString* ) extensionTypes
+{
+	extension = extensionTypes;
+}
+
+- ( NSString* ) merit
+{
+	return merit;
+}
+
+- ( void ) setMerit: ( NSString* ) meritValue
+{
+	merit = meritValue;
+}
+
 #pragma mark ---- NSTreeController and Bindings ----
 
 - ( int ) numberOfChildren

Modified: trunk/unity.sh
===================================================================
--- trunk/unity.sh	2007-08-04 14:22:14 UTC (rev 224)
+++ trunk/unity.sh	2007-08-04 15:50:45 UTC (rev 225)
@@ -93,9 +93,29 @@
 		header_path_first=`cut -d '/' -f 5 header_temp.$$`
 		header_path_second=`cut -d '/' -f 6 header_temp.$$`
 		header_path="$header_path_first/$header_path_second"
-		sed -e "s|$header_path|$2|g" -e "s|GL/glew.h|HDRFlowPlugin/glew.h|g" -e "s|boost/|HDRFlowPlugin/boost/|" $1/$i > $2.framework/Versions/Current/Headers/$i  
+	
+		cp $1/$i current_header.$$
+	
+		deplist="openpluginlib/pl openimagelib/il openmedialib/ml"
+		for j in $deplist
+		do	case $j in
+			openpluginlib* ) 
+				sed -e "s|$j|HDRFlowPlugin|g" -i '' current_header.$$ > $2.framework/Versions/Current/Headers/$i
+				;;
+			openimagelib* ) 
+				sed -e "s|$j|HDRFlowImage|g" -i '' current_header.$$ > $2.framework/Versions/Current/Headers/$i
+				;;
+			openmedialib* ) 
+				sed -e "s|$j|HDRFlowMedia|g" -i '' current_header.$$ > $2.framework/Versions/Current/Headers/$i
+				;;
+			esac
+		done
+
+		sed -e "s|$header_path|$2|g" -e "s|GL/glew.h|HDRFlowPlugin/glew.h|g" -e "s|boost/|HDRFlowPlugin/boost/|" current_header.$$ > $2.framework/Versions/Current/Headers/$i
 	done
+	
 	rm header_temp.$$
+	rm current_header.$$
 }
 
 make_framework_libs( )
@@ -356,8 +376,9 @@
 		esac
 	done
 	
-	# Copy Boost headers
+	# Copy Boost and GLEW headers
 	cp -R /usr/local/include/boost-$boost_new_version/boost HDRFlow.framework/Versions/$framework_version/Frameworks/HDRFlowPlugin.framework/Headers
+	cp -R /usr/local/include/GL/glew.h HDRFlow.framework/Versions/$framework_version/Frameworks/HDRFlowPlugin.framework/Headers
 	header_prefix="HDRFlow.framework/Versions/$framework_version/Frameworks/HDRFlowPlugin.framework/Headers/boost"
     find $header_prefix -name '*.hpp' | xargs sed -e "s|boost/|HDRFlowPlugin/boost/|g" -i ''	
 }


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