[Hdrflow-svn] SF.net SVN: hdrflow: [195] trunk/app/HDRFlow
Status: Pre-Alpha
Brought to you by:
glslang
Menu
▾
▴
[Hdrflow-svn] SF.net SVN: hdrflow: [195] trunk/app/HDRFlow
|
From: <gl...@us...> - 2007-07-21 15:58:34
|
Revision: 195
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=195&view=rev
Author: glslang
Date: 2007-07-21 08:58:27 -0700 (Sat, 21 Jul 2007)
Log Message:
-----------
+ initial Preferences window and UI hookups
Modified Paths:
--------------
trunk/app/HDRFlow/English.lproj/MainMenu.nib/classes.nib
trunk/app/HDRFlow/English.lproj/MainMenu.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/English.lproj/Preferences.nib/
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/PreferencesController.h
trunk/app/HDRFlow/PreferencesController.m
Modified: trunk/app/HDRFlow/English.lproj/MainMenu.nib/classes.nib
===================================================================
--- trunk/app/HDRFlow/English.lproj/MainMenu.nib/classes.nib 2007-07-21 11:21:18 UTC (rev 194)
+++ trunk/app/HDRFlow/English.lproj/MainMenu.nib/classes.nib 2007-07-21 15:58:27 UTC (rev 195)
@@ -2,7 +2,7 @@
IBClasses = (
{CLASS = CustomOpenGLView; LANGUAGE = ObjC; SUPERCLASS = NSView; },
{
- ACTIONS = {fileOpen = id; scriptEditor = id; viewFullscreen = id; };
+ ACTIONS = {fileOpen = id; preferences = id; scriptEditor = id; viewFullscreen = id; };
CLASS = HDRFlowController;
LANGUAGE = ObjC;
OUTLETS = {openGLView = ViewportOpenGLView; };
Modified: trunk/app/HDRFlow/English.lproj/MainMenu.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Added: trunk/app/HDRFlow/English.lproj/Preferences.nib/classes.nib
===================================================================
--- trunk/app/HDRFlow/English.lproj/Preferences.nib/classes.nib (rev 0)
+++ trunk/app/HDRFlow/English.lproj/Preferences.nib/classes.nib 2007-07-21 15:58:27 UTC (rev 195)
@@ -0,0 +1,11 @@
+{
+ IBClasses = (
+ {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; },
+ {
+ CLASS = PreferencesController;
+ LANGUAGE = ObjC;
+ SUPERCLASS = NSWindowController;
+ }
+ );
+ IBVersion = 1;
+}
\ No newline at end of file
Added: trunk/app/HDRFlow/English.lproj/Preferences.nib/info.nib
===================================================================
--- trunk/app/HDRFlow/English.lproj/Preferences.nib/info.nib (rev 0)
+++ trunk/app/HDRFlow/English.lproj/Preferences.nib/info.nib 2007-07-21 15:58:27 UTC (rev 195)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>IBDocumentLocation</key>
+ <string>69 54 356 240 0 0 1440 878 </string>
+ <key>IBFramework Version</key>
+ <string>446.1</string>
+ <key>IBOpenObjects</key>
+ <array>
+ <integer>5</integer>
+ </array>
+ <key>IBSystem Version</key>
+ <string>8R2218</string>
+</dict>
+</plist>
Added: trunk/app/HDRFlow/English.lproj/Preferences.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Property changes on: trunk/app/HDRFlow/English.lproj/Preferences.nib/keyedobjects.nib
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/app/HDRFlow/HDRFlow.xcodeproj/project.pbxproj
===================================================================
--- trunk/app/HDRFlow/HDRFlow.xcodeproj/project.pbxproj 2007-07-21 11:21:18 UTC (rev 194)
+++ trunk/app/HDRFlow/HDRFlow.xcodeproj/project.pbxproj 2007-07-21 15:58:27 UTC (rev 195)
@@ -9,11 +9,13 @@
/* Begin PBXBuildFile section */
67032E9E0C46DB9C00FA55E2 /* HDRFlow.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 67032E9D0C46DB9C00FA55E2 /* HDRFlow.framework */; };
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 */; };
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 */; };
67C8D8B80C4AD8340006B871 /* bootstrap.py in Resources */ = {isa = PBXBuildFile; fileRef = 67C8D8B70C4AD8340006B871 /* bootstrap.py */; };
67DC61B90C2EAC94005CFE6E /* ViewportOpenGLView.m in Sources */ = {isa = PBXBuildFile; fileRef = 67DC61B80C2EAC94005CFE6E /* ViewportOpenGLView.m */; };
67DC62180C2EC0D9005CFE6E /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 67DC62170C2EC0D9005CFE6E /* OpenGL.framework */; };
@@ -35,6 +37,8 @@
67032E9D0C46DB9C00FA55E2 /* HDRFlow.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = HDRFlow.framework; path = /Library/Frameworks/HDRFlow.framework; sourceTree = "<absolute>"; };
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>"; };
+ 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>"; };
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>"; };
@@ -42,6 +46,7 @@
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>"; };
67C8D8B70C4AD8340006B871 /* bootstrap.py */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.script.python; name = bootstrap.py; path = Scripts/bootstrap.py; sourceTree = "<group>"; };
67DC61B10C2EAB5E005CFE6E /* ViewportOpenGLView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ViewportOpenGLView.h; sourceTree = "<group>"; };
67DC61B80C2EAC94005CFE6E /* ViewportOpenGLView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ViewportOpenGLView.m; sourceTree = "<group>"; };
@@ -75,6 +80,8 @@
67DC61B80C2EAC94005CFE6E /* ViewportOpenGLView.m */,
67BD59C70C36BE3600F0F7DF /* HDRFlowController.h */,
67BD59C80C36BE3700F0F7DF /* HDRFlowController.m */,
+ 673D04450C522A610096513A /* PreferencesController.h */,
+ 673D044F0C522C980096513A /* PreferencesController.m */,
671E22910C41652E00CA1860 /* ScriptEditorController.h */,
671E22A20C4166E400CA1860 /* ScriptEditorController.mm */,
);
@@ -141,6 +148,7 @@
089C165CFE840E0CC02AAC07 /* InfoPlist.strings */,
29B97318FDCFA39411CA2CEA /* MainMenu.nib */,
674E44620C3F854A0036A908 /* ScriptEditor.nib */,
+ 67C064EC0C52231A00E9ED8E /* Preferences.nib */,
);
name = Resources;
sourceTree = "<group>";
@@ -207,6 +215,7 @@
8D11072B0486CEB800E47090 /* InfoPlist.strings in Resources */,
674E44640C3F854A0036A908 /* ScriptEditor.nib in Resources */,
67C8D8B80C4AD8340006B871 /* bootstrap.py in Resources */,
+ 67C064EE0C52231A00E9ED8E /* Preferences.nib in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -223,6 +232,7 @@
67BD59C90C36BE3700F0F7DF /* HDRFlowController.m in Sources */,
671E22A30C4166E400CA1860 /* ScriptEditorController.mm in Sources */,
67A8A73E0C4183C500DB3F1B /* ScriptEngine.cpp in Sources */,
+ 673D04500C522C980096513A /* PreferencesController.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -253,6 +263,14 @@
name = ScriptEditor.nib;
sourceTree = "<group>";
};
+ 67C064EC0C52231A00E9ED8E /* Preferences.nib */ = {
+ isa = PBXVariantGroup;
+ children = (
+ 67C064ED0C52231A00E9ED8E /* English */,
+ );
+ name = Preferences.nib;
+ sourceTree = "<group>";
+ };
/* End PBXVariantGroup section */
/* Begin XCBuildConfiguration section */
Modified: trunk/app/HDRFlow/HDRFlowController.h
===================================================================
--- trunk/app/HDRFlow/HDRFlowController.h 2007-07-21 11:21:18 UTC (rev 194)
+++ trunk/app/HDRFlow/HDRFlowController.h 2007-07-21 15:58:27 UTC (rev 195)
@@ -10,11 +10,13 @@
// forward declarations
@class ScriptEditorController;
@class ViewportOpenGLView;
+@class PreferencesController;
@interface HDRFlowController : NSObject
{
ScriptEditorController* scriptEditor;
IBOutlet ViewportOpenGLView* openGLView;
+ PreferencesController* preferences;
}
- ( BOOL ) acceptsFirstResponder;
@@ -24,5 +26,6 @@
- ( IBAction ) fileOpen: ( id ) sender;
- ( IBAction ) scriptEditor: ( id ) sender;
- ( IBAction ) viewFullscreen: ( id ) sender;
+- ( IBAction ) preferences: ( id ) sender;
@end
Modified: trunk/app/HDRFlow/HDRFlowController.m
===================================================================
--- trunk/app/HDRFlow/HDRFlowController.m 2007-07-21 11:21:18 UTC (rev 194)
+++ trunk/app/HDRFlow/HDRFlowController.m 2007-07-21 15:58:27 UTC (rev 195)
@@ -7,6 +7,7 @@
#import "HDRFlowController.h"
#import "ViewportOpenGLView.h"
+#import "PreferencesController.h"
@implementation HDRFlowController
@@ -41,7 +42,7 @@
- ( IBAction ) scriptEditor: ( id ) sender
{
if( scriptEditor == nil )
- scriptEditor = [ [ ScriptEditorController alloc ] initWithWindowNibName:@"ScriptEditor" ];
+ scriptEditor = [ [ ScriptEditorController alloc ] initWithWindowNibName: @"ScriptEditor" ];
[ scriptEditor showWindow: self ];
}
@@ -51,6 +52,14 @@
[ openGLView fullscreen ];
}
+- ( IBAction ) preferences: ( id ) sender
+{
+ if( preferences == nil )
+ preferences = [ [ PreferencesController alloc ] initWithWindowNibName: @"Preferences" ];
+
+ [ preferences showWindow: self ];
+}
+
- ( BOOL ) acceptsFirstResponder
{
return YES;
Added: trunk/app/HDRFlow/PreferencesController.h
===================================================================
--- trunk/app/HDRFlow/PreferencesController.h (rev 0)
+++ trunk/app/HDRFlow/PreferencesController.h 2007-07-21 15:58:27 UTC (rev 195)
@@ -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 PreferencesController : NSWindowController
+{
+}
+
+@end
Added: trunk/app/HDRFlow/PreferencesController.m
===================================================================
--- trunk/app/HDRFlow/PreferencesController.m (rev 0)
+++ trunk/app/HDRFlow/PreferencesController.m 2007-07-21 15:58:27 UTC (rev 195)
@@ -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 "PreferencesController.h"
+
+@implementation PreferencesController
+
+- ( id ) initWindowWithNibName: ( NSString* ) windowNibName
+{
+ return [ super initWithWindowNibName: windowNibName ];
+}
+
+@end
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
