[Hdrflow-svn] SF.net SVN: hdrflow: [221] trunk/app/HDRFlow

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

Revision: 221
          http://hdrflow.svn.sourceforge.net/hdrflow/?rev=221&view=rev
Author:   glslang
Date:     2007-08-03 14:29:44 -0700 (Fri, 03 Aug 2007)

Log Message:
-----------
+Plugins Preferences Popup button and Outline view synchronised update

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

Modified: trunk/app/HDRFlow/English.lproj/Preferences.nib/info.nib
===================================================================
--- trunk/app/HDRFlow/English.lproj/Preferences.nib/info.nib	2007-07-30 22:22:35 UTC (rev 220)
+++ trunk/app/HDRFlow/English.lproj/Preferences.nib/info.nib	2007-08-03 21:29:44 UTC (rev 221)
@@ -17,10 +17,10 @@
 	<string>446.1</string>
 	<key>IBOpenObjects</key>
 	<array>
-		<integer>5</integer>
 		<integer>12</integer>
+		<integer>10</integer>
 		<integer>33</integer>
-		<integer>10</integer>
+		<integer>5</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.h
===================================================================
--- trunk/app/HDRFlow/PlugInsPreferencesController.h	2007-07-30 22:22:35 UTC (rev 220)
+++ trunk/app/HDRFlow/PlugInsPreferencesController.h	2007-08-03 21:29:44 UTC (rev 221)
@@ -13,13 +13,6 @@
 	PlugInsPreferencesOutlineViewNode* selectedItem;
 }
 
-- ( int )  outlineView: ( NSOutlineView* ) outlineView numberOfChildrenOfItem: ( id ) item;
-- ( BOOL ) outlineView: ( NSOutlineView* ) outlineView isItemExpandable: ( id ) item;
-- ( id )   outlineView: ( NSOutlineView* ) outlineView child: ( int ) index ofItem: ( id ) item;
-- ( id )   outlineView: ( NSOutlineView* ) outlineView objectValueForTableColumn: ( NSTableColumn* ) tableColumn byItem: ( id ) item;
-- ( BOOL ) outlineView: ( NSOutlineView* ) outlineView shouldEditTableColumn: ( NSTableColumn* ) tableColumn item: ( id ) item;
-- ( BOOL ) outlineView: ( NSOutlineView* ) outlineView shouldSelectItem: ( id ) item;
-
 - ( void ) initRootItems;
 
 @end

Modified: trunk/app/HDRFlow/PlugInsPreferencesController.mm
===================================================================
--- trunk/app/HDRFlow/PlugInsPreferencesController.mm	2007-07-30 22:22:35 UTC (rev 220)
+++ trunk/app/HDRFlow/PlugInsPreferencesController.mm	2007-08-03 21:29:44 UTC (rev 221)
@@ -26,42 +26,6 @@
 	[ super dealloc ];
 }
 
-- ( int ) outlineView: ( NSOutlineView* ) outlineView numberOfChildrenOfItem: ( id ) item
-{
-	return item == nil ? 1 : [ item numberOfChildren ];
-}
-
-- ( BOOL ) outlineView: ( NSOutlineView* ) outlineView isItemExpandable: ( id ) item
-{
-	return [ selectedItem numberOfChildren ] != 0;
-}
-
-- ( id ) outlineView: ( NSOutlineView* ) outlineView child: ( int ) index ofItem: ( id ) item
-{
-	if( item == nil )
-		return selectedItem;
-	else
-		return [ item childAtIndex: index ];
-}
-
-- ( id ) outlineView: ( NSOutlineView* ) outlineView objectValueForTableColumn: ( NSTableColumn* ) tableColumn byItem: ( id ) item
-{
-	if( item == nil )
-		return [ selectedItem itemName ];
-	else
-		return [ item itemName ];
-}
-
-- ( BOOL ) outlineView: ( NSOutlineView* ) outlineView shouldEditTableColumn: ( NSTableColumn* ) tableColumn item: ( id ) item
-{
-	return NO;
-}
-
-- ( BOOL ) outlineView: ( NSOutlineView* ) outlineView shouldSelectItem: ( id ) item
-{
-	return YES;
-}
-
 - ( void ) initRootItems
 {
 	[ rootItems addObject: [ [ PlugInsPreferencesOutlineViewNode alloc ] initWithString: @"All" ] ];

Modified: trunk/app/HDRFlow/PlugInsPreferencesOutlineViewNode.h
===================================================================
--- trunk/app/HDRFlow/PlugInsPreferencesOutlineViewNode.h	2007-07-30 22:22:35 UTC (rev 220)
+++ trunk/app/HDRFlow/PlugInsPreferencesOutlineViewNode.h	2007-08-03 21:29:44 UTC (rev 221)
@@ -17,9 +17,8 @@
 
 - ( void ) addChildObject: ( id ) childObject;
 - ( int ) numberOfChildren;
-- ( id ) childAtIndex: ( int ) index;
 - ( NSString* ) itemName;
+- ( NSArray* ) children;
+- ( BOOL ) isLeaf;
 
-- ( void ) indexPath;
-
 @end

Modified: trunk/app/HDRFlow/PlugInsPreferencesOutlineViewNode.mm
===================================================================
--- trunk/app/HDRFlow/PlugInsPreferencesOutlineViewNode.mm	2007-07-30 22:22:35 UTC (rev 220)
+++ trunk/app/HDRFlow/PlugInsPreferencesOutlineViewNode.mm	2007-08-03 21:29:44 UTC (rev 221)
@@ -35,18 +35,19 @@
 	return [ children count ];
 }
 
-- ( id ) childAtIndex: ( int ) index
+- ( NSString* ) itemName
 {
-	return [ [ [ children objectAtIndex: index ] retain ] autorelease ];
+	return itemName;
 }
 
-- ( NSString* ) itemName
+- ( NSArray* ) children
 {
-	return itemName;
+	return children;
 }
 
-- ( void ) indexPath
+- ( BOOL ) isLeaf
 {
+	return [ self numberOfChildren ] == 0;
 }
 
 @end


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