[Hdrflow-svn] SF.net SVN: hdrflow: [215] trunk/app/HDRFlow
Status: Pre-Alpha
Brought to you by:
glslang
Menu
▾
▴
[Hdrflow-svn] SF.net SVN: hdrflow: [215] trunk/app/HDRFlow
|
From: <gl...@us...> - 2007-07-28 23:17:27
|
Revision: 215
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=215&view=rev
Author: glslang
Date: 2007-07-28 16:17:23 -0700 (Sat, 28 Jul 2007)
Log Message:
-----------
+initial Preferences plugins pane implementation
Modified Paths:
--------------
trunk/app/HDRFlow/English.lproj/Preferences.nib/classes.nib
trunk/app/HDRFlow/English.lproj/Preferences.nib/info.nib
trunk/app/HDRFlow/English.lproj/Preferences.nib/keyedobjects.nib
trunk/app/HDRFlow/HDRFlow.xcodeproj/project.pbxproj
Added Paths:
-----------
trunk/app/HDRFlow/HDRFlowController.mm
trunk/app/HDRFlow/PlugInsPreferencesController.h
trunk/app/HDRFlow/PlugInsPreferencesController.mm
trunk/app/HDRFlow/PlugInsPreferencesOutlineViewNode.h
trunk/app/HDRFlow/PlugInsPreferencesOutlineViewNode.mm
Removed Paths:
-------------
trunk/app/HDRFlow/HDRFlowController.m
Modified: trunk/app/HDRFlow/English.lproj/Preferences.nib/classes.nib
===================================================================
--- trunk/app/HDRFlow/English.lproj/Preferences.nib/classes.nib 2007-07-28 18:46:38 UTC (rev 214)
+++ trunk/app/HDRFlow/English.lproj/Preferences.nib/classes.nib 2007-07-28 23:17:23 UTC (rev 215)
@@ -2,6 +2,11 @@
IBClasses = (
{CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; },
{
+ CLASS = PlugInsPreferencesController;
+ LANGUAGE = ObjC;
+ SUPERCLASS = NSObject;
+ },
+ {
ACTIONS = {toolbarItem = id; };
CLASS = PreferencesController;
LANGUAGE = ObjC;
Modified: trunk/app/HDRFlow/English.lproj/Preferences.nib/info.nib
===================================================================
--- trunk/app/HDRFlow/English.lproj/Preferences.nib/info.nib 2007-07-28 18:46:38 UTC (rev 214)
+++ trunk/app/HDRFlow/English.lproj/Preferences.nib/info.nib 2007-07-28 23:17:23 UTC (rev 215)
@@ -3,13 +3,13 @@
<plist version="1.0">
<dict>
<key>IBDocumentLocation</key>
- <string>69 54 356 240 0 0 1440 878 </string>
+ <string>59 71 356 240 0 0 1440 878 </string>
<key>IBEditorPositions</key>
<dict>
<key>10</key>
<string>514 465 412 270 0 0 1440 878 </string>
<key>12</key>
- <string>500 476 439 314 0 0 1440 878 </string>
+ <string>500 443 439 314 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>12</integer>
<integer>33</integer>
<integer>5</integer>
<integer>10</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/HDRFlow.xcodeproj/project.pbxproj
===================================================================
--- trunk/app/HDRFlow/HDRFlow.xcodeproj/project.pbxproj 2007-07-28 18:46:38 UTC (rev 214)
+++ trunk/app/HDRFlow/HDRFlow.xcodeproj/project.pbxproj 2007-07-28 23:17:23 UTC (rev 215)
@@ -11,12 +11,14 @@
671E22A30C4166E400CA1860 /* ScriptEditorController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 671E22A20C4166E400CA1860 /* ScriptEditorController.mm */; };
673D04500C522C980096513A /* PreferencesController.m in Sources */ = {isa = PBXBuildFile; fileRef = 673D044F0C522C980096513A /* PreferencesController.m */; };
674E44640C3F854A0036A908 /* ScriptEditor.nib in Resources */ = {isa = PBXBuildFile; fileRef = 674E44620C3F854A0036A908 /* ScriptEditor.nib */; };
+ 677740360C5C0184005FF29D /* PlugInsPreferencesOutlineViewNode.mm in Sources */ = {isa = PBXBuildFile; fileRef = 677740350C5C0184005FF29D /* PlugInsPreferencesOutlineViewNode.mm */; };
678A4AA70C2B18B50011E9F7 /* CustomOpenGLView.m in Sources */ = {isa = PBXBuildFile; fileRef = 678A4AA60C2B18B50011E9F7 /* CustomOpenGLView.m */; };
67A8A6EA0C41836600DB3F1B /* Python.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 67A8A6E90C41836600DB3F1B /* Python.framework */; };
67A8A73E0C4183C500DB3F1B /* ScriptEngine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 67A8A73D0C4183C500DB3F1B /* ScriptEngine.cpp */; };
- 67BD59C90C36BE3700F0F7DF /* HDRFlowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 67BD59C80C36BE3700F0F7DF /* HDRFlowController.m */; };
67C064EE0C52231A00E9ED8E /* Preferences.nib in Resources */ = {isa = PBXBuildFile; fileRef = 67C064EC0C52231A00E9ED8E /* Preferences.nib */; };
67C0BA2B0C5B69C600E0E258 /* Viewer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 67C0BA2A0C5B69C600E0E258 /* Viewer.cpp */; };
+ 67C0BED90C5BCD4600E0E258 /* HDRFlowController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 67C0BED80C5BCD4600E0E258 /* HDRFlowController.mm */; };
+ 67C0BEFB0C5BED8500E0E258 /* PlugInsPreferencesController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 67C0BEFA0C5BED8500E0E258 /* PlugInsPreferencesController.mm */; };
67C3D3220C53A71000136EE8 /* ToolbarHolder.m in Sources */ = {isa = PBXBuildFile; fileRef = 67C3D3210C53A71000136EE8 /* ToolbarHolder.m */; };
67C8D8B80C4AD8340006B871 /* bootstrap.py in Resources */ = {isa = PBXBuildFile; fileRef = 67C8D8B70C4AD8340006B871 /* bootstrap.py */; };
67CF88AA0C53D62E005B6662 /* AdvancedPreferences.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 67CF88A90C53D62E005B6662 /* AdvancedPreferences.tiff */; };
@@ -45,15 +47,19 @@
673D04450C522A610096513A /* PreferencesController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PreferencesController.h; sourceTree = "<group>"; };
673D044F0C522C980096513A /* PreferencesController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = PreferencesController.m; sourceTree = "<group>"; };
674E44630C3F854A0036A908 /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/ScriptEditor.nib; sourceTree = "<group>"; };
+ 6777402D0C5C0022005FF29D /* PlugInsPreferencesOutlineViewNode.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PlugInsPreferencesOutlineViewNode.h; sourceTree = "<group>"; };
+ 677740350C5C0184005FF29D /* PlugInsPreferencesOutlineViewNode.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = PlugInsPreferencesOutlineViewNode.mm; sourceTree = "<group>"; };
678A4AA60C2B18B50011E9F7 /* CustomOpenGLView.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = CustomOpenGLView.m; sourceTree = "<group>"; };
67A8A6E40C4181C600DB3F1B /* ScriptEngine.hpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = ScriptEngine.hpp; sourceTree = "<group>"; };
67A8A6E90C41836600DB3F1B /* Python.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Python.framework; path = /System/Library/Frameworks/Python.framework; sourceTree = "<absolute>"; };
67A8A73D0C4183C500DB3F1B /* ScriptEngine.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = ScriptEngine.cpp; sourceTree = "<group>"; };
67BD59C70C36BE3600F0F7DF /* HDRFlowController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = HDRFlowController.h; sourceTree = "<group>"; };
- 67BD59C80C36BE3700F0F7DF /* HDRFlowController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = HDRFlowController.m; sourceTree = "<group>"; };
67C064ED0C52231A00E9ED8E /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/Preferences.nib; sourceTree = "<group>"; };
67C0BA220C5B69AF00E0E258 /* Viewer.hpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = Viewer.hpp; sourceTree = "<group>"; };
67C0BA2A0C5B69C600E0E258 /* Viewer.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = Viewer.cpp; sourceTree = "<group>"; };
+ 67C0BED80C5BCD4600E0E258 /* HDRFlowController.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = HDRFlowController.mm; sourceTree = "<group>"; };
+ 67C0BEF40C5BED2C00E0E258 /* PlugInsPreferencesController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PlugInsPreferencesController.h; sourceTree = "<group>"; };
+ 67C0BEFA0C5BED8500E0E258 /* PlugInsPreferencesController.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = PlugInsPreferencesController.mm; sourceTree = "<group>"; };
67C3D3170C5361C600136EE8 /* ToolbarHolder.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ToolbarHolder.h; sourceTree = "<group>"; };
67C3D3210C53A71000136EE8 /* ToolbarHolder.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = ToolbarHolder.m; sourceTree = "<group>"; };
67C8D8B70C4AD8340006B871 /* bootstrap.py */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.script.python; name = bootstrap.py; path = Scripts/bootstrap.py; sourceTree = "<group>"; };
@@ -91,7 +97,11 @@
67DC61B10C2EAB5E005CFE6E /* ViewportOpenGLView.h */,
67DC61B80C2EAC94005CFE6E /* ViewportOpenGLView.m */,
67BD59C70C36BE3600F0F7DF /* HDRFlowController.h */,
- 67BD59C80C36BE3700F0F7DF /* HDRFlowController.m */,
+ 67C0BED80C5BCD4600E0E258 /* HDRFlowController.mm */,
+ 67C0BEF40C5BED2C00E0E258 /* PlugInsPreferencesController.h */,
+ 67C0BEFA0C5BED8500E0E258 /* PlugInsPreferencesController.mm */,
+ 6777402D0C5C0022005FF29D /* PlugInsPreferencesOutlineViewNode.h */,
+ 677740350C5C0184005FF29D /* PlugInsPreferencesOutlineViewNode.mm */,
673D04450C522A610096513A /* PreferencesController.h */,
673D044F0C522C980096513A /* PreferencesController.m */,
671E22910C41652E00CA1860 /* ScriptEditorController.h */,
@@ -259,12 +269,14 @@
8D11072D0486CEB800E47090 /* main.m in Sources */,
678A4AA70C2B18B50011E9F7 /* CustomOpenGLView.m in Sources */,
67DC61B90C2EAC94005CFE6E /* ViewportOpenGLView.m in Sources */,
- 67BD59C90C36BE3700F0F7DF /* HDRFlowController.m in Sources */,
671E22A30C4166E400CA1860 /* ScriptEditorController.mm in Sources */,
67A8A73E0C4183C500DB3F1B /* ScriptEngine.cpp in Sources */,
673D04500C522C980096513A /* PreferencesController.m in Sources */,
67C3D3220C53A71000136EE8 /* ToolbarHolder.m in Sources */,
67C0BA2B0C5B69C600E0E258 /* Viewer.cpp in Sources */,
+ 67C0BED90C5BCD4600E0E258 /* HDRFlowController.mm in Sources */,
+ 67C0BEFB0C5BED8500E0E258 /* PlugInsPreferencesController.mm in Sources */,
+ 677740360C5C0184005FF29D /* PlugInsPreferencesOutlineViewNode.mm in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Deleted: trunk/app/HDRFlow/HDRFlowController.m
===================================================================
--- trunk/app/HDRFlow/HDRFlowController.m 2007-07-28 18:46:38 UTC (rev 214)
+++ trunk/app/HDRFlow/HDRFlowController.m 2007-07-28 23:17:23 UTC (rev 215)
@@ -1,84 +0,0 @@
-
-// HDRFlow - A image processing application
-
-// Copyright (c) 2007 Goncalo N. M. de Carvalho
-// Released under the GPL.
-// For more information, see http://www.cryogenicgraphics.com/hdrflow.
-
-#import "HDRFlowController.h"
-#import "ViewportOpenGLView.h"
-#import "PreferencesController.h"
-
-@implementation HDRFlowController
-
-#pragma mark ---- IB actions ----
-
-- ( void ) openPanelDidEnd: ( NSOpenPanel* ) panel returnCode: ( int ) rc contextInfo: ( void* ) ctx
-{
- if( rc == NSOKButton )
- {
- }
-}
-
-- ( IBAction ) fileOpen: ( id ) sender
-{
- NSOpenPanel* openPanel = [ NSOpenPanel openPanel ];
-
- [ openPanel setCanChooseDirectories: YES ];
- [ openPanel setCanChooseFiles: YES ];
- [ openPanel setAllowsMultipleSelection: YES ];
-
- NSArray* fileTypes = [ NSArray arrayWithObjects:@"exr", @"jpg", nil ];
-
- [ openPanel beginSheetForDirectory: nil
- file: nil
- types: fileTypes
- modalForWindow: [ NSApp mainWindow ]
- modalDelegate: self
- didEndSelector: @selector( openPanelDidEnd: returnCode: contextInfo: )
- contextInfo: nil ];
-}
-
-- ( IBAction ) scriptEditor: ( id ) sender
-{
- if( scriptEditor == nil )
- scriptEditor = [ [ ScriptEditorController alloc ] initWithWindowNibName: @"ScriptEditor" ];
-
- [ scriptEditor showWindow: self ];
-}
-
-- ( IBAction ) viewFullscreen: ( id ) sender
-{
- [ openGLView fullscreen ];
-}
-
-- ( IBAction ) preferences: ( id ) sender
-{
- if( preferences == nil )
- preferences = [ [ PreferencesController alloc ] initWithWindowNibName: @"Preferences" ];
-
- [ preferences showWindow: self ];
-}
-
-- ( BOOL ) acceptsFirstResponder
-{
- return YES;
-}
-
-- ( BOOL ) becomesFirstResponder
-{
- return YES;
-}
-
-- ( BOOL ) resignFirstResponder
-{
- return YES;
-}
-
-- ( void ) dealloc
-{
- [ scriptEditor dealloc ];
- [ super dealloc ];
-}
-
-@end
Added: trunk/app/HDRFlow/HDRFlowController.mm
===================================================================
--- trunk/app/HDRFlow/HDRFlowController.mm (rev 0)
+++ trunk/app/HDRFlow/HDRFlowController.mm 2007-07-28 23:17:23 UTC (rev 215)
@@ -0,0 +1,84 @@
+
+// HDRFlow - A image processing application
+
+// Copyright (c) 2007 Goncalo N. M. de Carvalho
+// Released under the GPL.
+// For more information, see http://www.cryogenicgraphics.com/hdrflow.
+
+#import "HDRFlowController.h"
+#import "ViewportOpenGLView.h"
+#import "PreferencesController.h"
+
+@implementation HDRFlowController
+
+#pragma mark ---- IB actions ----
+
+- ( void ) openPanelDidEnd: ( NSOpenPanel* ) panel returnCode: ( int ) rc contextInfo: ( void* ) ctx
+{
+ if( rc == NSOKButton )
+ {
+ }
+}
+
+- ( IBAction ) fileOpen: ( id ) sender
+{
+ NSOpenPanel* openPanel = [ NSOpenPanel openPanel ];
+
+ [ openPanel setCanChooseDirectories: YES ];
+ [ openPanel setCanChooseFiles: YES ];
+ [ openPanel setAllowsMultipleSelection: YES ];
+
+ NSArray* fileTypes = [ NSArray arrayWithObjects:@"exr", @"jpg", nil ];
+
+ [ openPanel beginSheetForDirectory: nil
+ file: nil
+ types: fileTypes
+ modalForWindow: [ NSApp mainWindow ]
+ modalDelegate: self
+ didEndSelector: @selector( openPanelDidEnd: returnCode: contextInfo: )
+ contextInfo: nil ];
+}
+
+- ( IBAction ) scriptEditor: ( id ) sender
+{
+ if( scriptEditor == nil )
+ scriptEditor = [ [ ScriptEditorController alloc ] initWithWindowNibName: @"ScriptEditor" ];
+
+ [ scriptEditor showWindow: self ];
+}
+
+- ( IBAction ) viewFullscreen: ( id ) sender
+{
+ [ openGLView fullscreen ];
+}
+
+- ( IBAction ) preferences: ( id ) sender
+{
+ if( preferences == nil )
+ preferences = [ [ PreferencesController alloc ] initWithWindowNibName: @"Preferences" ];
+
+ [ preferences showWindow: self ];
+}
+
+- ( BOOL ) acceptsFirstResponder
+{
+ return YES;
+}
+
+- ( BOOL ) becomesFirstResponder
+{
+ return YES;
+}
+
+- ( BOOL ) resignFirstResponder
+{
+ return YES;
+}
+
+- ( void ) dealloc
+{
+ [ scriptEditor dealloc ];
+ [ super dealloc ];
+}
+
+@end
Added: trunk/app/HDRFlow/PlugInsPreferencesController.h
===================================================================
--- trunk/app/HDRFlow/PlugInsPreferencesController.h (rev 0)
+++ trunk/app/HDRFlow/PlugInsPreferencesController.h 2007-07-28 23:17:23 UTC (rev 215)
@@ -0,0 +1,17 @@
+
+// HDRFlow - A image processing application
+
+// Copyright (c) 2007 Goncalo N. M. de Carvalho
+// Released under the GPL.
+// For more information, see http://www.cryogenicgraphics.com/hdrflow.
+
+#import "PlugInsPreferencesOutlineViewNode.h"
+
+@interface PlugInsPreferencesController : NSObject
+{
+}
+
+- ( int ) outlineView: ( NSOutlineView* ) outlineView numberOfChildrenOfItem: ( id ) item;
+- ( BOOL ) outlineView: ( NSOutlineView* ) outlineView isItemExpandable: ( id ) item;
+
+@end
Added: trunk/app/HDRFlow/PlugInsPreferencesController.mm
===================================================================
--- trunk/app/HDRFlow/PlugInsPreferencesController.mm (rev 0)
+++ trunk/app/HDRFlow/PlugInsPreferencesController.mm 2007-07-28 23:17:23 UTC (rev 215)
@@ -0,0 +1,22 @@
+
+// HDRFlow - A image processing application
+
+// Copyright (c) 2007 Goncalo N. M. de Carvalho
+// Released under the GPL.
+// For more information, see http://www.cryogenicgraphics.com/hdrflow.
+
+#import "PlugInsPreferencesController.h"
+
+@implementation PlugInsPreferencesController
+
+- ( int ) outlineView: ( NSOutlineView* ) outlineView numberOfChildrenOfItem: ( id ) item
+{
+ return item == nil ? 1 : [ item numberOfChildren ];
+}
+
+- ( BOOL ) outlineView: ( NSOutlineView* ) outlineView isItemExpandable: ( id ) item
+{
+ return item == nil ? YES : [ item numberOfChildren ] != 0;
+}
+
+@end
Added: trunk/app/HDRFlow/PlugInsPreferencesOutlineViewNode.h
===================================================================
--- trunk/app/HDRFlow/PlugInsPreferencesOutlineViewNode.h (rev 0)
+++ trunk/app/HDRFlow/PlugInsPreferencesOutlineViewNode.h 2007-07-28 23:17:23 UTC (rev 215)
@@ -0,0 +1,16 @@
+
+// HDRFlow - A image processing application
+
+// Copyright (c) 2007 Goncalo N. M. de Carvalho
+// Released under the GPL.
+// For more information, see http://www.cryogenicgraphics.com/hdrflow.
+
+#import <Cocoa/Cocoa.h>
+
+@interface PlugInsPreferencesOutlineViewNode : NSObject
+{
+}
+
+- ( int ) numberOfChildren;
+
+@end
Added: trunk/app/HDRFlow/PlugInsPreferencesOutlineViewNode.mm
===================================================================
--- trunk/app/HDRFlow/PlugInsPreferencesOutlineViewNode.mm (rev 0)
+++ trunk/app/HDRFlow/PlugInsPreferencesOutlineViewNode.mm 2007-07-28 23:17:23 UTC (rev 215)
@@ -0,0 +1,17 @@
+
+// HDRFlow - A image processing application
+
+// Copyright (c) 2007 Goncalo N. M. de Carvalho
+// Released under the GPL.
+// For more information, see http://www.cryogenicgraphics.com/hdrflow.
+
+#import "PlugInsPreferencesOutlineViewNode.h"
+
+@implementation PlugInsPreferencesOutlineViewNode
+
+- ( int ) numberOfChildren
+{
+ return 0;
+}
+
+@end
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
