[Hdrflow-svn] SF.net SVN: hdrflow: [177] trunk/app/HDRFlow
Status: Pre-Alpha
Brought to you by:
glslang
Menu
▾
▴
[Hdrflow-svn] SF.net SVN: hdrflow: [177] trunk/app/HDRFlow
|
From: <gl...@us...> - 2007-07-08 19:58:16
|
Revision: 177
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=177&view=rev
Author: glslang
Date: 2007-07-08 12:58:09 -0700 (Sun, 08 Jul 2007)
Log Message:
-----------
+ Script Editor and interface layout changes
Modified Paths:
--------------
trunk/app/HDRFlow/English.lproj/MainMenu.nib/classes.nib
trunk/app/HDRFlow/English.lproj/MainMenu.nib/info.nib
trunk/app/HDRFlow/English.lproj/MainMenu.nib/keyedobjects.nib
trunk/app/HDRFlow/English.lproj/ScriptEditor.nib/classes.nib
trunk/app/HDRFlow/English.lproj/ScriptEditor.nib/info.nib
trunk/app/HDRFlow/English.lproj/ScriptEditor.nib/keyedobjects.nib
trunk/app/HDRFlow/HDRFlow.xcodeproj/project.pbxproj
trunk/app/HDRFlow/HDRFlowController.h
trunk/app/HDRFlow/HDRFlowController.m
Added Paths:
-----------
trunk/app/HDRFlow/ScriptEditorController.h
trunk/app/HDRFlow/ScriptEditorController.mm
Modified: trunk/app/HDRFlow/English.lproj/MainMenu.nib/classes.nib
===================================================================
--- trunk/app/HDRFlow/English.lproj/MainMenu.nib/classes.nib 2007-07-07 08:29:49 UTC (rev 176)
+++ trunk/app/HDRFlow/English.lproj/MainMenu.nib/classes.nib 2007-07-08 19:58:09 UTC (rev 177)
@@ -2,7 +2,7 @@
IBClasses = (
{CLASS = CustomOpenGLView; LANGUAGE = ObjC; SUPERCLASS = NSView; },
{
- ACTIONS = {fileOpen = id; };
+ ACTIONS = {fileOpen = id; scriptEditor = id; };
CLASS = HDRFlowController;
LANGUAGE = ObjC;
SUPERCLASS = NSObject;
Modified: trunk/app/HDRFlow/English.lproj/MainMenu.nib/info.nib
===================================================================
--- trunk/app/HDRFlow/English.lproj/MainMenu.nib/info.nib 2007-07-07 08:29:49 UTC (rev 176)
+++ trunk/app/HDRFlow/English.lproj/MainMenu.nib/info.nib 2007-07-08 19:58:09 UTC (rev 177)
@@ -14,6 +14,7 @@
<key>IBOpenObjects</key>
<array>
<integer>29</integer>
+ <integer>21</integer>
</array>
<key>IBSystem Version</key>
<string>8R2218</string>
Modified: trunk/app/HDRFlow/English.lproj/MainMenu.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/app/HDRFlow/English.lproj/ScriptEditor.nib/classes.nib
===================================================================
--- trunk/app/HDRFlow/English.lproj/ScriptEditor.nib/classes.nib 2007-07-07 08:29:49 UTC (rev 176)
+++ trunk/app/HDRFlow/English.lproj/ScriptEditor.nib/classes.nib 2007-07-08 19:58:09 UTC (rev 177)
@@ -1,4 +1,11 @@
{
- IBClasses = ({CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; });
+ IBClasses = (
+ {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; },
+ {
+ CLASS = ScriptEditorController;
+ LANGUAGE = ObjC;
+ SUPERCLASS = NSWindowController;
+ }
+ );
IBVersion = 1;
}
\ No newline at end of file
Modified: trunk/app/HDRFlow/English.lproj/ScriptEditor.nib/info.nib
===================================================================
--- trunk/app/HDRFlow/English.lproj/ScriptEditor.nib/info.nib 2007-07-07 08:29:49 UTC (rev 176)
+++ trunk/app/HDRFlow/English.lproj/ScriptEditor.nib/info.nib 2007-07-08 19:58:09 UTC (rev 177)
@@ -3,7 +3,7 @@
<plist version="1.0">
<dict>
<key>IBDocumentLocation</key>
- <string>69 49 356 240 0 0 1280 778 </string>
+ <string>81 58 356 240 0 0 1440 878 </string>
<key>IBFramework Version</key>
<string>446.1</string>
<key>IBOpenObjects</key>
Modified: trunk/app/HDRFlow/English.lproj/ScriptEditor.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/app/HDRFlow/HDRFlow.xcodeproj/project.pbxproj
===================================================================
--- trunk/app/HDRFlow/HDRFlow.xcodeproj/project.pbxproj 2007-07-07 08:29:49 UTC (rev 176)
+++ trunk/app/HDRFlow/HDRFlow.xcodeproj/project.pbxproj 2007-07-08 19:58:09 UTC (rev 177)
@@ -7,6 +7,7 @@
objects = {
/* Begin PBXBuildFile section */
+ 671E22A30C4166E400CA1860 /* ScriptEditorController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 671E22A20C4166E400CA1860 /* ScriptEditorController.mm */; };
674E44640C3F854A0036A908 /* ScriptEditor.nib in Resources */ = {isa = PBXBuildFile; fileRef = 674E44620C3F854A0036A908 /* ScriptEditor.nib */; };
678A4AA70C2B18B50011E9F7 /* CustomOpenGLView.m in Sources */ = {isa = PBXBuildFile; fileRef = 678A4AA60C2B18B50011E9F7 /* CustomOpenGLView.m */; };
67BD59C90C36BE3700F0F7DF /* HDRFlowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 67BD59C80C36BE3700F0F7DF /* HDRFlowController.m */; };
@@ -27,6 +28,8 @@
29B97324FDCFA39411CA2CEA /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = "<absolute>"; };
29B97325FDCFA39411CA2CEA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = "<absolute>"; };
32CA4F630368D1EE00C91783 /* HDRFlow_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HDRFlow_Prefix.pch; sourceTree = "<group>"; };
+ 671E22910C41652E00CA1860 /* ScriptEditorController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ScriptEditorController.h; sourceTree = "<group>"; };
+ 671E22A20C4166E400CA1860 /* ScriptEditorController.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = ScriptEditorController.mm; sourceTree = "<group>"; };
674E44630C3F854A0036A908 /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/ScriptEditor.nib; sourceTree = "<group>"; };
678A4AA60C2B18B50011E9F7 /* CustomOpenGLView.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = CustomOpenGLView.m; sourceTree = "<group>"; };
67BD59C70C36BE3600F0F7DF /* HDRFlowController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = HDRFlowController.h; sourceTree = "<group>"; };
@@ -61,6 +64,8 @@
67DC61B80C2EAC94005CFE6E /* ViewportOpenGLView.m */,
67BD59C70C36BE3600F0F7DF /* HDRFlowController.h */,
67BD59C80C36BE3700F0F7DF /* HDRFlowController.m */,
+ 671E22910C41652E00CA1860 /* ScriptEditorController.h */,
+ 671E22A20C4166E400CA1860 /* ScriptEditorController.mm */,
);
name = Classes;
sourceTree = "<group>";
@@ -191,6 +196,7 @@
678A4AA70C2B18B50011E9F7 /* CustomOpenGLView.m in Sources */,
67DC61B90C2EAC94005CFE6E /* ViewportOpenGLView.m in Sources */,
67BD59C90C36BE3700F0F7DF /* HDRFlowController.m in Sources */,
+ 671E22A30C4166E400CA1860 /* ScriptEditorController.mm in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Modified: trunk/app/HDRFlow/HDRFlowController.h
===================================================================
--- trunk/app/HDRFlow/HDRFlowController.h 2007-07-07 08:29:49 UTC (rev 176)
+++ trunk/app/HDRFlow/HDRFlowController.h 2007-07-08 19:58:09 UTC (rev 177)
@@ -7,8 +7,12 @@
#import <Cocoa/Cocoa.h>
+// forward declarations
+@class ScriptEditorController;
+
@interface HDRFlowController : NSObject
{
+ ScriptEditorController* scriptEditor;
}
- ( BOOL ) acceptsFirstResponder;
@@ -16,5 +20,6 @@
- ( BOOL ) resignFirstResponder;
- ( IBAction ) fileOpen: ( id ) sender;
+- ( IBAction ) scriptEditor: ( id ) sender;
@end
Modified: trunk/app/HDRFlow/HDRFlowController.m
===================================================================
--- trunk/app/HDRFlow/HDRFlowController.m 2007-07-07 08:29:49 UTC (rev 176)
+++ trunk/app/HDRFlow/HDRFlowController.m 2007-07-08 19:58:09 UTC (rev 177)
@@ -37,6 +37,14 @@
}
}
+- ( IBAction ) scriptEditor: ( id ) sender
+{
+ if( scriptEditor == nil )
+ scriptEditor = [ [ ScriptEditorController alloc ] initWithWindowNibName:@"ScriptEditor" ];
+
+ [ scriptEditor showWindow: self ];
+}
+
- ( BOOL ) acceptsFirstResponder
{
return YES;
@@ -52,4 +60,10 @@
return YES;
}
+- ( void ) dealloc
+{
+ [ scriptEditor dealloc ];
+ [ super dealloc ];
+}
+
@end
Added: trunk/app/HDRFlow/ScriptEditorController.h
===================================================================
--- trunk/app/HDRFlow/ScriptEditorController.h (rev 0)
+++ trunk/app/HDRFlow/ScriptEditorController.h 2007-07-08 19:58:09 UTC (rev 177)
@@ -0,0 +1,14 @@
+
+// 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 ScriptEditorController : NSWindowController
+{
+}
+
+@end
Added: trunk/app/HDRFlow/ScriptEditorController.mm
===================================================================
--- trunk/app/HDRFlow/ScriptEditorController.mm (rev 0)
+++ trunk/app/HDRFlow/ScriptEditorController.mm 2007-07-08 19:58:09 UTC (rev 177)
@@ -0,0 +1,12 @@
+
+// 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 "ScriptEditorController.h"
+
+@implementation ScriptEditorController
+
+@end
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
