hdrflow-svn Mailing List for HDRFlow (Page 11)
Status: Pre-Alpha
Brought to you by:
glslang
Menu
▾
▴
hdrflow-svn — HDRFlow SVN notifications
You can subscribe to this list here.
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
(30) |
May
(38) |
Jun
(22) |
Jul
(53) |
Aug
(66) |
Sep
(56) |
Oct
(29) |
Nov
(13) |
Dec
(6) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2008 |
Jan
(16) |
Feb
(22) |
Mar
(12) |
Apr
(4) |
May
|
Jun
|
Jul
|
Aug
|
Sep
(6) |
Oct
|
Nov
|
Dec
|
| 2009 |
Jan
|
Feb
|
Mar
|
Apr
(12) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <gl...@us...> - 2007-07-28 15:57:42
|
Revision: 212
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=212&view=rev
Author: glslang
Date: 2007-07-28 08:57:40 -0700 (Sat, 28 Jul 2007)
Log Message:
-----------
+ Script editor execution and display improvements
Modified Paths:
--------------
trunk/app/HDRFlow/ScriptEditorController.mm
trunk/app/HDRFlow/ScriptEngine.cpp
Modified: trunk/app/HDRFlow/ScriptEditorController.mm
===================================================================
--- trunk/app/HDRFlow/ScriptEditorController.mm 2007-07-28 14:32:36 UTC (rev 211)
+++ trunk/app/HDRFlow/ScriptEditorController.mm 2007-07-28 15:57:40 UTC (rev 212)
@@ -38,25 +38,16 @@
- ( void ) executeScript
{
NSString* script = [ scriptEdit_ string ];
- NSString* output = [ [ [ NSString alloc ] initWithString: @"" ] autorelease ];
if( engine_->eval( [ script UTF8String ] ) )
- {
- output = [ output stringByAppendingString: script ];
- output = [ output stringByAppendingString: @"\n" ];
[ scriptStatus_ setStringValue: @"Script successful." ];
- }
else
- {
- output = [ output stringByAppendingString: @"Error in script:\n\t" ];
[ scriptStatus_ setStringValue: @"Script failed." ];
- }
NSString* out = [ [ [ NSString alloc ] initWithUTF8String: engine_->result( ).c_str( ) ] autorelease ];
- output = [ output stringByAppendingString: out ];
- output = [ output stringByAppendingString: @"\n" ];
-
- [ scriptOutput_ setString: output ];
+ [ scriptOutput_ setEditable: YES ];
+ [ scriptOutput_ insertText: out ];
+ [ scriptOutput_ setEditable: NO ];
[ scriptOutput_ setNeedsDisplay: YES ];
[ self clearScript ];
Modified: trunk/app/HDRFlow/ScriptEngine.cpp
===================================================================
--- trunk/app/HDRFlow/ScriptEngine.cpp 2007-07-28 14:32:36 UTC (rev 211)
+++ trunk/app/HDRFlow/ScriptEngine.cpp 2007-07-28 15:57:40 UTC (rev 212)
@@ -46,22 +46,33 @@
py::object main_namespace = main_module.attr( "__dict__" );
result_.clear( );
+
+ std::string trim_str( str.c_str( ) );
+ boost::trim( trim_str );
+ typedef std::vector<std::string> split_vector_type;
+ split_vector_type split_vec;
+ boost::split( split_vec, trim_str, boost::is_any_of( "\n" ) );
+
+ typedef split_vector_type::const_iterator const_iterator;
+ for( const_iterator I = split_vec.begin( ); I != split_vec.end( ); ++I )
+ result_ += "# " + *I + "\n";
+
+ int start = split_vec.size( ) == 1 &&
+ split_vec[ 0 ].find( "import" ) == std::string::npos && split_vec[ 0 ].find( "def" ) == std::string::npos ? Py_eval_input : Py_file_input;
+
try
{
- py::handle<> handle( py::allow_null( PyRun_String( str.c_str( ), Py_eval_input, main_namespace.ptr( ), main_namespace.ptr( ) ) ) );
- if( !handle )
- {
- // clear all errors so the call below has a chance to succeed.
- PyErr_Clear( );
- handle = py::handle<>( PyRun_String( str.c_str( ), Py_file_input, main_namespace.ptr( ), main_namespace.ptr( ) ) );
- }
+ pl::string eval_result;
+ py::handle<> handle( PyRun_String( str.c_str( ), start, main_namespace.ptr( ), main_namespace.ptr( ) ) );
+
py::object strobj( py::handle<>( PyObject_Str( py::object( handle ).ptr( ) ) ) );
if( strobj )
{
- result_ = PyString_AsString( strobj.ptr( ) );
- if( result_ == "None" ) result_.clear( );
+ eval_result = PyString_AsString( strobj.ptr( ) );
+ if( eval_result != "None" )
+ result_ += eval_result + "\n";
}
}
catch( py::error_already_set )
@@ -71,6 +82,7 @@
PyObject* error_traceback;
PyErr_Fetch( &error_type, &error_data, &error_traceback );
+ PyErr_NormalizeException( &error_type, &error_data, &error_traceback );
result_ += error_to_result( error_type );
result_ += error_to_result( error_data );
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-07-28 14:32:42
|
Revision: 211
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=211&view=rev
Author: glslang
Date: 2007-07-28 07:32:36 -0700 (Sat, 28 Jul 2007)
Log Message:
-----------
+OpenGL fullscreen with context sharing
Modified Paths:
--------------
trunk/app/HDRFlow/CustomOpenGLView.m
trunk/app/HDRFlow/English.lproj/Preferences.nib/info.nib
trunk/app/HDRFlow/English.lproj/Preferences.nib/keyedobjects.nib
trunk/app/HDRFlow/ViewportOpenGLView.h
trunk/app/HDRFlow/ViewportOpenGLView.m
Modified: trunk/app/HDRFlow/CustomOpenGLView.m
===================================================================
--- trunk/app/HDRFlow/CustomOpenGLView.m 2007-07-28 13:44:32 UTC (rev 210)
+++ trunk/app/HDRFlow/CustomOpenGLView.m 2007-07-28 14:32:36 UTC (rev 211)
@@ -44,7 +44,7 @@
- ( NSOpenGLContext* ) openGLContext
{
- if( context_ == NULL )
+ if( context_ == nil )
{
context_ = [ [ NSOpenGLContext alloc ] initWithFormat: pixelFormat_ != nil ? pixelFormat_ : [ [ self class ] defaultPixelFormat ] shareContext: nil ];
[ context_ makeCurrentContext ];
Modified: trunk/app/HDRFlow/English.lproj/Preferences.nib/info.nib
===================================================================
--- trunk/app/HDRFlow/English.lproj/Preferences.nib/info.nib 2007-07-28 13:44:32 UTC (rev 210)
+++ trunk/app/HDRFlow/English.lproj/Preferences.nib/info.nib 2007-07-28 14:32:36 UTC (rev 211)
@@ -17,10 +17,10 @@
<string>446.1</string>
<key>IBOpenObjects</key>
<array>
- <integer>33</integer>
<integer>12</integer>
<integer>5</integer>
<integer>10</integer>
+ <integer>33</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/ViewportOpenGLView.h
===================================================================
--- trunk/app/HDRFlow/ViewportOpenGLView.h 2007-07-28 13:44:32 UTC (rev 210)
+++ trunk/app/HDRFlow/ViewportOpenGLView.h 2007-07-28 14:32:36 UTC (rev 211)
@@ -11,7 +11,7 @@
{
}
-+ ( NSOpenGLPixelFormat* ) pixelFormat;
++ ( NSOpenGLPixelFormat* ) viewportPixelFormat;
- ( id ) initWithFrame: ( NSRect ) theFrame;
- ( void ) awakeFromNib;
Modified: trunk/app/HDRFlow/ViewportOpenGLView.m
===================================================================
--- trunk/app/HDRFlow/ViewportOpenGLView.m 2007-07-28 13:44:32 UTC (rev 210)
+++ trunk/app/HDRFlow/ViewportOpenGLView.m 2007-07-28 14:32:36 UTC (rev 211)
@@ -12,13 +12,15 @@
@implementation ViewportOpenGLView
-+ ( NSOpenGLPixelFormat* ) pixelFormat
++ ( NSOpenGLPixelFormat* ) viewportPixelFormat
{
NSOpenGLPixelFormatAttribute attribs[ ] =
{
+ NSOpenGLPFANoRecovery,
NSOpenGLPFADoubleBuffer,
- NSOpenGLPFADepthSize, 24,
- NSOpenGLPFAStencilSize, 8,
+ NSOpenGLPFAAccelerated,
+ NSOpenGLPFAColorSize, 24,
+ NSOpenGLPFADepthSize, 16,
0
};
@@ -27,7 +29,7 @@
- ( id ) initWithFrame: ( NSRect ) theFrame
{
- [ super initWithFrame: theFrame pixelFormat: [ self pixelFormat ] ];
+ [ super initWithFrame: theFrame pixelFormat: [ ViewportOpenGLView viewportPixelFormat ] ];
[ [ super openGLContext ] makeCurrentContext ];
return self;
@@ -59,7 +61,10 @@
glViewport( 0, 0, NSWidth( bounds ), NSHeight( bounds ) );
glClear( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT );
- glFlush( );
+ if( [ self inLiveResize ] )
+ glFlush( );
+ else
+ [ [ self openGLContext ] flushBuffer ];
}
- ( void ) prepareOpenGL
@@ -83,16 +88,17 @@
NSOpenGLPixelFormatAttribute attribs[ ] =
{
NSOpenGLPFAFullScreen,
+ NSOpenGLPFAAccelerated,
NSOpenGLPFAScreenMask,
CGDisplayIDToOpenGLDisplayMask( kCGDirectMainDisplay ),
NSOpenGLPFADoubleBuffer,
- NSOpenGLPFADepthSize, 24,
- NSOpenGLPFAStencilSize, 8,
+ NSOpenGLPFAColorSize, 24,
+ NSOpenGLPFADepthSize, 16,
0
};
NSOpenGLPixelFormat* pixelFormat = [ [ [ NSOpenGLPixelFormat alloc ] initWithAttributes: attribs ] autorelease ];
- NSOpenGLContext* fullScreenContext = [ [ NSOpenGLContext alloc ] initWithFormat: pixelFormat shareContext: nil ];
+ NSOpenGLContext* fullScreenContext = [ [ NSOpenGLContext alloc ] initWithFormat: pixelFormat shareContext: [ self openGLContext ] ];
if( fullScreenContext == nil ) return;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-07-28 13:44:36
|
Revision: 210
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=210&view=rev
Author: glslang
Date: 2007-07-28 06:44:32 -0700 (Sat, 28 Jul 2007)
Log Message:
-----------
+Viewport Drawer size improvements
Modified Paths:
--------------
trunk/app/HDRFlow/English.lproj/MainMenu.nib/keyedobjects.nib
Modified: trunk/app/HDRFlow/English.lproj/MainMenu.nib/keyedobjects.nib
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-07-28 13:25:07
|
Revision: 209
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=209&view=rev
Author: glslang
Date: 2007-07-28 06:25:04 -0700 (Sat, 28 Jul 2007)
Log Message:
-----------
+Build updates: Better HDRFlow.framework
Modified Paths:
--------------
trunk/app/HDRFlow/HDRFlow.xcodeproj/project.pbxproj
trunk/app/HDRFlow/ViewportOpenGLView.h
trunk/app/HDRFlow/ViewportOpenGLView.m
Added Paths:
-----------
trunk/app/HDRFlow/Viewer.cpp
trunk/app/HDRFlow/Viewer.hpp
Modified: trunk/app/HDRFlow/HDRFlow.xcodeproj/project.pbxproj
===================================================================
--- trunk/app/HDRFlow/HDRFlow.xcodeproj/project.pbxproj 2007-07-27 22:34:36 UTC (rev 208)
+++ trunk/app/HDRFlow/HDRFlow.xcodeproj/project.pbxproj 2007-07-28 13:25:04 UTC (rev 209)
@@ -16,6 +16,7 @@
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 */; };
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 */; };
@@ -51,6 +52,8 @@
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>"; };
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>"; };
@@ -95,6 +98,8 @@
671E22A20C4166E400CA1860 /* ScriptEditorController.mm */,
67C3D3170C5361C600136EE8 /* ToolbarHolder.h */,
67C3D3210C53A71000136EE8 /* ToolbarHolder.m */,
+ 67C0BA220C5B69AF00E0E258 /* Viewer.hpp */,
+ 67C0BA2A0C5B69C600E0E258 /* Viewer.cpp */,
);
name = Classes;
sourceTree = "<group>";
@@ -259,6 +264,7 @@
67A8A73E0C4183C500DB3F1B /* ScriptEngine.cpp in Sources */,
673D04500C522C980096513A /* PreferencesController.m in Sources */,
67C3D3220C53A71000136EE8 /* ToolbarHolder.m in Sources */,
+ 67C0BA2B0C5B69C600E0E258 /* Viewer.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -335,6 +341,10 @@
C01FCF4F08A954540054247B /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ ARCHS = (
+ ppc,
+ i386,
+ );
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = (
@@ -349,6 +359,10 @@
C01FCF5008A954540054247B /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ ARCHS = (
+ ppc,
+ i386,
+ );
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = (
Added: trunk/app/HDRFlow/Viewer.cpp
===================================================================
--- trunk/app/HDRFlow/Viewer.cpp (rev 0)
+++ trunk/app/HDRFlow/Viewer.cpp 2007-07-28 13:25:04 UTC (rev 209)
@@ -0,0 +1,9 @@
+
+// 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.
+
+#include <HDRFlow/openlibraries.hpp>
+
Added: trunk/app/HDRFlow/Viewer.hpp
===================================================================
--- trunk/app/HDRFlow/Viewer.hpp (rev 0)
+++ trunk/app/HDRFlow/Viewer.hpp 2007-07-28 13:25:04 UTC (rev 209)
@@ -0,0 +1,11 @@
+
+// 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.
+
+#ifndef VIEWER_INC_
+#define VIEWER_INC_
+
+#endif
Modified: trunk/app/HDRFlow/ViewportOpenGLView.h
===================================================================
--- trunk/app/HDRFlow/ViewportOpenGLView.h 2007-07-27 22:34:36 UTC (rev 208)
+++ trunk/app/HDRFlow/ViewportOpenGLView.h 2007-07-28 13:25:04 UTC (rev 209)
@@ -14,10 +14,13 @@
+ ( NSOpenGLPixelFormat* ) pixelFormat;
- ( id ) initWithFrame: ( NSRect ) theFrame;
+- ( void ) awakeFromNib;
- ( void ) dealloc;
+
- ( void ) drawRect: ( NSRect ) theRect;
+
+- ( void ) prepareOpenGL;
- ( void ) update;
-
- ( void ) fullscreen;
@end
Modified: trunk/app/HDRFlow/ViewportOpenGLView.m
===================================================================
--- trunk/app/HDRFlow/ViewportOpenGLView.m 2007-07-27 22:34:36 UTC (rev 208)
+++ trunk/app/HDRFlow/ViewportOpenGLView.m 2007-07-28 13:25:04 UTC (rev 209)
@@ -16,7 +16,6 @@
{
NSOpenGLPixelFormatAttribute attribs[ ] =
{
- NSOpenGLPFAWindow,
NSOpenGLPFADoubleBuffer,
NSOpenGLPFADepthSize, 24,
NSOpenGLPFAStencilSize, 8,
@@ -34,6 +33,10 @@
return self;
}
+- ( void ) awakeFromNib
+{
+}
+
- ( void ) dealloc
{
[ super dealloc ];
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-07-27 22:34:38
|
Revision: 208
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=208&view=rev
Author: glslang
Date: 2007-07-27 15:34:36 -0700 (Fri, 27 Jul 2007)
Log Message:
-----------
+build updates
Modified Paths:
--------------
trunk/lib/openlibraries/configure.ac
trunk/unity.sh
Modified: trunk/lib/openlibraries/configure.ac
===================================================================
--- trunk/lib/openlibraries/configure.ac 2007-07-26 21:36:16 UTC (rev 207)
+++ trunk/lib/openlibraries/configure.ac 2007-07-27 22:34:36 UTC (rev 208)
@@ -179,7 +179,7 @@
OLIB_LDFLAGS='-Wl,-export-dynamic'
;;
*-apple-darwin*)
- OLIB_LDFLAGS=''
+ OLIB_LDFLAGS='-Wl,-headerpad_max_install_names'
;;
esac
Modified: trunk/unity.sh
===================================================================
--- trunk/unity.sh 2007-07-26 21:36:16 UTC (rev 207)
+++ trunk/unity.sh 2007-07-27 22:34:36 UTC (rev 208)
@@ -26,8 +26,8 @@
PLATFORM=`uname -s`
update_boost_version=0
-boost_old_version=1_33_1
-boost_new_version=1_34
+boost_old_version=1_34
+boost_new_version=1_34_1
build_frameworks=0
build_umbrella=0
@@ -136,8 +136,8 @@
then libname="/usr/local/lib/$depdir/$j"
fi
base=`basename $j`
- cp $libname $1.framework/Versions/$framework_version/Libraries
- install_name_tool -id $install_name_prefix/$1.framework/Versions/$framework_version/$base $1.framework/Versions/$framework_version/Libraries/$base
+ cp $libname $1.framework/Versions/$framework_version/Libraries &&
+ install_name_tool -id $install_name_prefix/$1.framework/Versions/$framework_version/$base $1.framework/Versions/$framework_version/Libraries/$base &&
install_name_tool -change $j $install_name_prefix/$1.framework/Versions/$framework_version/Libraries/$base $1.framework/$1
done
done
@@ -234,7 +234,7 @@
{
deplist="openpluginlib_pl openimagelib_il openmedialib_ml"
for i in $deplist
- do plugins=`ls $1.framework/PlugIns/*.dylib 2> /dev/null`
+ do plugins=`ls $1.framework/PlugIns/*.* 2> /dev/null`
for j in $plugins
do depname=`otool -L $j | grep $i | cut -d ' ' -f 1`
if [ ! -z $depname ]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-07-26 21:36:18
|
Revision: 207
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=207&view=rev
Author: glslang
Date: 2007-07-26 14:36:16 -0700 (Thu, 26 Jul 2007)
Log Message:
-----------
+ Viewport drawer adjustments and headers added to umbrella framework
Modified Paths:
--------------
trunk/app/HDRFlow/English.lproj/MainMenu.nib/info.nib
trunk/app/HDRFlow/English.lproj/MainMenu.nib/keyedobjects.nib
trunk/app/HDRFlow/English.lproj/Preferences.nib/info.nib
trunk/app/HDRFlow/English.lproj/Preferences.nib/keyedobjects.nib
trunk/app/HDRFlow/ScriptEngine.cpp
trunk/lib/openlibraries/src/umbrella_framework/openlibraries.hpp
Modified: trunk/app/HDRFlow/English.lproj/MainMenu.nib/info.nib
===================================================================
--- trunk/app/HDRFlow/English.lproj/MainMenu.nib/info.nib 2007-07-26 20:07:02 UTC (rev 206)
+++ trunk/app/HDRFlow/English.lproj/MainMenu.nib/info.nib 2007-07-26 21:36:16 UTC (rev 207)
@@ -16,8 +16,8 @@
<key>IBOpenObjects</key>
<array>
<integer>266</integer>
+ <integer>21</integer>
<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/Preferences.nib/info.nib
===================================================================
--- trunk/app/HDRFlow/English.lproj/Preferences.nib/info.nib 2007-07-26 20:07:02 UTC (rev 206)
+++ trunk/app/HDRFlow/English.lproj/Preferences.nib/info.nib 2007-07-26 21:36:16 UTC (rev 207)
@@ -11,15 +11,15 @@
<key>12</key>
<string>395 379 650 442 0 0 1440 878 </string>
<key>33</key>
- <string>642 360 401 293 0 0 1440 878 </string>
+ <string>519 453 401 293 0 0 1440 878 </string>
</dict>
<key>IBFramework Version</key>
<string>446.1</string>
<key>IBOpenObjects</key>
<array>
<integer>33</integer>
+ <integer>12</integer>
<integer>5</integer>
- <integer>12</integer>
<integer>10</integer>
</array>
<key>IBSystem Version</key>
Modified: trunk/app/HDRFlow/English.lproj/Preferences.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/app/HDRFlow/ScriptEngine.cpp
===================================================================
--- trunk/app/HDRFlow/ScriptEngine.cpp 2007-07-26 20:07:02 UTC (rev 206)
+++ trunk/app/HDRFlow/ScriptEngine.cpp 2007-07-26 21:36:16 UTC (rev 207)
@@ -5,6 +5,8 @@
// Released under the GPL.
// For more information, see http://www.cryogenicgraphics.com/hdrflow.
+#include <HDRFlow/openlibraries.hpp>
+
#include "ScriptEngine.hpp"
namespace py = boost::python;
Modified: trunk/lib/openlibraries/src/umbrella_framework/openlibraries.hpp
===================================================================
--- trunk/lib/openlibraries/src/umbrella_framework/openlibraries.hpp 2007-07-26 20:07:02 UTC (rev 206)
+++ trunk/lib/openlibraries/src/umbrella_framework/openlibraries.hpp 2007-07-26 21:36:16 UTC (rev 207)
@@ -12,6 +12,17 @@
#include <boost/python.hpp>
#endif
+#include <GL/glew.h>
+
+#include <boost/algorithm/string.hpp>
+#include <boost/shared_ptr.hpp>
+#include <boost/tokenizer.hpp>
+
#include <openpluginlib/pl/openpluginlib.hpp>
+#include <openpluginlib/pl/utf8_utils.hpp>
+#include <openimagelib/il/il.hpp>
+#include <openimagelib/il/openimagelib_plugin.hpp>
+#include <openmedialib/ml/ml.hpp>
+#include <openmedialib/ml/openmedialib_plugin.hpp>
#endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-07-26 20:07:05
|
Revision: 206
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=206&view=rev
Author: glslang
Date: 2007-07-26 13:07:02 -0700 (Thu, 26 Jul 2007)
Log Message:
-----------
+ Drawer improvements
Modified Paths:
--------------
trunk/app/HDRFlow/English.lproj/MainMenu.nib/info.nib
trunk/app/HDRFlow/English.lproj/MainMenu.nib/keyedobjects.nib
Modified: trunk/app/HDRFlow/English.lproj/MainMenu.nib/info.nib
===================================================================
--- trunk/app/HDRFlow/English.lproj/MainMenu.nib/info.nib 2007-07-25 22:21:52 UTC (rev 205)
+++ trunk/app/HDRFlow/English.lproj/MainMenu.nib/info.nib 2007-07-26 20:07:02 UTC (rev 206)
@@ -15,8 +15,8 @@
<string>446.1</string>
<key>IBOpenObjects</key>
<array>
+ <integer>266</integer>
<integer>29</integer>
- <integer>266</integer>
<integer>21</integer>
</array>
<key>IBSystem Version</key>
Modified: trunk/app/HDRFlow/English.lproj/MainMenu.nib/keyedobjects.nib
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-07-25 22:21:53
|
Revision: 205
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=205&view=rev
Author: glslang
Date: 2007-07-25 15:21:52 -0700 (Wed, 25 Jul 2007)
Log Message:
-----------
+ Viewport settings changed to NSTabView
Modified Paths:
--------------
trunk/app/HDRFlow/English.lproj/MainMenu.nib/info.nib
trunk/app/HDRFlow/English.lproj/MainMenu.nib/keyedobjects.nib
Modified: trunk/app/HDRFlow/English.lproj/MainMenu.nib/info.nib
===================================================================
--- trunk/app/HDRFlow/English.lproj/MainMenu.nib/info.nib 2007-07-24 21:52:31 UTC (rev 204)
+++ trunk/app/HDRFlow/English.lproj/MainMenu.nib/info.nib 2007-07-25 22:21:52 UTC (rev 205)
@@ -6,8 +6,8 @@
<string>37 172 382 268 0 0 1440 878 </string>
<key>IBEditorPositions</key>
<dict>
- <key>232</key>
- <string>555 391 330 418 0 0 1440 878 </string>
+ <key>266</key>
+ <string>567 402 306 396 0 0 1440 878 </string>
<key>29</key>
<string>2 829 338 44 0 0 1440 878 </string>
</dict>
@@ -15,9 +15,9 @@
<string>446.1</string>
<key>IBOpenObjects</key>
<array>
+ <integer>29</integer>
+ <integer>266</integer>
<integer>21</integer>
- <integer>29</integer>
- <integer>232</integer>
</array>
<key>IBSystem Version</key>
<string>8R2218</string>
Modified: trunk/app/HDRFlow/English.lproj/MainMenu.nib/keyedobjects.nib
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-07-24 21:52:32
|
Revision: 204
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=204&view=rev
Author: glslang
Date: 2007-07-24 14:52:31 -0700 (Tue, 24 Jul 2007)
Log Message:
-----------
+ Drawer View - connections tidy-up
Modified Paths:
--------------
trunk/app/HDRFlow/English.lproj/MainMenu.nib/info.nib
trunk/app/HDRFlow/English.lproj/MainMenu.nib/keyedobjects.nib
Modified: trunk/app/HDRFlow/English.lproj/MainMenu.nib/info.nib
===================================================================
--- trunk/app/HDRFlow/English.lproj/MainMenu.nib/info.nib 2007-07-24 21:43:41 UTC (rev 203)
+++ trunk/app/HDRFlow/English.lproj/MainMenu.nib/info.nib 2007-07-24 21:52:31 UTC (rev 204)
@@ -15,9 +15,9 @@
<string>446.1</string>
<key>IBOpenObjects</key>
<array>
- <integer>232</integer>
<integer>21</integer>
<integer>29</integer>
+ <integer>232</integer>
</array>
<key>IBSystem Version</key>
<string>8R2218</string>
Modified: trunk/app/HDRFlow/English.lproj/MainMenu.nib/keyedobjects.nib
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-07-24 21:43:54
|
Revision: 203
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=203&view=rev
Author: glslang
Date: 2007-07-24 14:43:41 -0700 (Tue, 24 Jul 2007)
Log Message:
-----------
+ Drawer View
Modified Paths:
--------------
trunk/app/HDRFlow/English.lproj/MainMenu.nib/info.nib
trunk/app/HDRFlow/English.lproj/MainMenu.nib/keyedobjects.nib
trunk/app/HDRFlow/English.lproj/Preferences.nib/info.nib
trunk/app/HDRFlow/English.lproj/Preferences.nib/keyedobjects.nib
Modified: trunk/app/HDRFlow/English.lproj/MainMenu.nib/info.nib
===================================================================
--- trunk/app/HDRFlow/English.lproj/MainMenu.nib/info.nib 2007-07-22 21:56:33 UTC (rev 202)
+++ trunk/app/HDRFlow/English.lproj/MainMenu.nib/info.nib 2007-07-24 21:43:41 UTC (rev 203)
@@ -3,9 +3,11 @@
<plist version="1.0">
<dict>
<key>IBDocumentLocation</key>
- <string>36 72 356 240 0 0 1440 878 </string>
+ <string>37 172 382 268 0 0 1440 878 </string>
<key>IBEditorPositions</key>
<dict>
+ <key>232</key>
+ <string>555 391 330 418 0 0 1440 878 </string>
<key>29</key>
<string>2 829 338 44 0 0 1440 878 </string>
</dict>
@@ -13,8 +15,9 @@
<string>446.1</string>
<key>IBOpenObjects</key>
<array>
+ <integer>232</integer>
+ <integer>21</integer>
<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/Preferences.nib/info.nib
===================================================================
--- trunk/app/HDRFlow/English.lproj/Preferences.nib/info.nib 2007-07-22 21:56:33 UTC (rev 202)
+++ trunk/app/HDRFlow/English.lproj/Preferences.nib/info.nib 2007-07-24 21:43:41 UTC (rev 203)
@@ -9,14 +9,17 @@
<key>10</key>
<string>514 465 412 270 0 0 1440 878 </string>
<key>12</key>
- <string>322 332 650 442 0 0 1440 878 </string>
+ <string>395 379 650 442 0 0 1440 878 </string>
+ <key>33</key>
+ <string>642 360 401 293 0 0 1440 878 </string>
</dict>
<key>IBFramework Version</key>
<string>446.1</string>
<key>IBOpenObjects</key>
<array>
+ <integer>33</integer>
+ <integer>5</integer>
<integer>12</integer>
- <integer>5</integer>
<integer>10</integer>
</array>
<key>IBSystem Version</key>
Modified: trunk/app/HDRFlow/English.lproj/Preferences.nib/keyedobjects.nib
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-07-22 21:56:34
|
Revision: 202
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=202&view=rev
Author: glslang
Date: 2007-07-22 14:56:33 -0700 (Sun, 22 Jul 2007)
Log Message:
-----------
+ Preferences Window - initial PlugIns view
Modified Paths:
--------------
trunk/app/HDRFlow/English.lproj/Preferences.nib/info.nib
trunk/app/HDRFlow/English.lproj/Preferences.nib/keyedobjects.nib
Modified: trunk/app/HDRFlow/English.lproj/Preferences.nib/info.nib
===================================================================
--- trunk/app/HDRFlow/English.lproj/Preferences.nib/info.nib 2007-07-22 20:37:22 UTC (rev 201)
+++ trunk/app/HDRFlow/English.lproj/Preferences.nib/info.nib 2007-07-22 21:56:33 UTC (rev 202)
@@ -8,11 +8,14 @@
<dict>
<key>10</key>
<string>514 465 412 270 0 0 1440 878 </string>
+ <key>12</key>
+ <string>322 332 650 442 0 0 1440 878 </string>
</dict>
<key>IBFramework Version</key>
<string>446.1</string>
<key>IBOpenObjects</key>
<array>
+ <integer>12</integer>
<integer>5</integer>
<integer>10</integer>
</array>
Modified: trunk/app/HDRFlow/English.lproj/Preferences.nib/keyedobjects.nib
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-07-22 20:37:24
|
Revision: 201
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=201&view=rev
Author: glslang
Date: 2007-07-22 13:37:22 -0700 (Sun, 22 Jul 2007)
Log Message:
-----------
+ Toolbar abstraction and Preferences
Modified Paths:
--------------
trunk/app/HDRFlow/English.lproj/MainMenu.nib/info.nib
trunk/app/HDRFlow/English.lproj/MainMenu.nib/keyedobjects.nib
trunk/app/HDRFlow/English.lproj/Preferences.nib/keyedobjects.nib
trunk/app/HDRFlow/HDRFlow.xcodeproj/project.pbxproj
trunk/app/HDRFlow/PreferencesController.m
trunk/app/HDRFlow/ToolbarHolder.h
trunk/app/HDRFlow/ToolbarHolder.m
Added Paths:
-----------
trunk/app/HDRFlow/Images/AdvancedPreferences.tiff
trunk/app/HDRFlow/Images/PlugInsPreferences.tiff
Modified: trunk/app/HDRFlow/English.lproj/MainMenu.nib/info.nib
===================================================================
--- trunk/app/HDRFlow/English.lproj/MainMenu.nib/info.nib 2007-07-22 16:50:48 UTC (rev 200)
+++ trunk/app/HDRFlow/English.lproj/MainMenu.nib/info.nib 2007-07-22 20:37:22 UTC (rev 201)
@@ -13,8 +13,8 @@
<string>446.1</string>
<key>IBOpenObjects</key>
<array>
+ <integer>29</integer>
<integer>21</integer>
- <integer>29</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/Preferences.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/app/HDRFlow/HDRFlow.xcodeproj/project.pbxproj
===================================================================
--- trunk/app/HDRFlow/HDRFlow.xcodeproj/project.pbxproj 2007-07-22 16:50:48 UTC (rev 200)
+++ trunk/app/HDRFlow/HDRFlow.xcodeproj/project.pbxproj 2007-07-22 20:37:22 UTC (rev 201)
@@ -18,6 +18,8 @@
67C064EE0C52231A00E9ED8E /* Preferences.nib in Resources */ = {isa = PBXBuildFile; fileRef = 67C064EC0C52231A00E9ED8E /* Preferences.nib */; };
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 */; };
+ 67CF88AC0C53EFB8005B6662 /* PlugInsPreferences.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 67CF88AB0C53EFB8005B6662 /* PlugInsPreferences.tiff */; };
67DC61B90C2EAC94005CFE6E /* ViewportOpenGLView.m in Sources */ = {isa = PBXBuildFile; fileRef = 67DC61B80C2EAC94005CFE6E /* ViewportOpenGLView.m */; };
67DC62180C2EC0D9005CFE6E /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 67DC62170C2EC0D9005CFE6E /* OpenGL.framework */; };
67F7A3EE0C52A21600172987 /* GeneralPreferences.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 67F7A3ED0C52A21600172987 /* GeneralPreferences.tiff */; };
@@ -52,6 +54,8 @@
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>"; };
+ 67CF88A90C53D62E005B6662 /* AdvancedPreferences.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = AdvancedPreferences.tiff; path = Images/AdvancedPreferences.tiff; sourceTree = "<group>"; };
+ 67CF88AB0C53EFB8005B6662 /* PlugInsPreferences.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = PlugInsPreferences.tiff; path = Images/PlugInsPreferences.tiff; 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>"; };
67DC62170C2EC0D9005CFE6E /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = /System/Library/Frameworks/OpenGL.framework; sourceTree = "<absolute>"; };
@@ -181,7 +185,9 @@
67F7A3EC0C52A1F900172987 /* Images */ = {
isa = PBXGroup;
children = (
+ 67CF88A90C53D62E005B6662 /* AdvancedPreferences.tiff */,
67F7A3ED0C52A21600172987 /* GeneralPreferences.tiff */,
+ 67CF88AB0C53EFB8005B6662 /* PlugInsPreferences.tiff */,
);
name = Images;
sourceTree = "<group>";
@@ -233,6 +239,8 @@
67C8D8B80C4AD8340006B871 /* bootstrap.py in Resources */,
67C064EE0C52231A00E9ED8E /* Preferences.nib in Resources */,
67F7A3EE0C52A21600172987 /* GeneralPreferences.tiff in Resources */,
+ 67CF88AA0C53D62E005B6662 /* AdvancedPreferences.tiff in Resources */,
+ 67CF88AC0C53EFB8005B6662 /* PlugInsPreferences.tiff in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Added: trunk/app/HDRFlow/Images/AdvancedPreferences.tiff
===================================================================
(Binary files differ)
Property changes on: trunk/app/HDRFlow/Images/AdvancedPreferences.tiff
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/app/HDRFlow/Images/PlugInsPreferences.tiff
===================================================================
(Binary files differ)
Property changes on: trunk/app/HDRFlow/Images/PlugInsPreferences.tiff
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/app/HDRFlow/PreferencesController.m
===================================================================
--- trunk/app/HDRFlow/PreferencesController.m 2007-07-22 16:50:48 UTC (rev 200)
+++ trunk/app/HDRFlow/PreferencesController.m 2007-07-22 20:37:22 UTC (rev 201)
@@ -20,6 +20,8 @@
toolbarHolder = [ [ ToolbarHolder alloc ] init: @"HDRFlowPreferencesToolbar" ];
[ toolbarHolder addToolbarItem: @"General" label: @"General" paletteLabel: @"General" tooltip: @"Generic application configuration parameters" target: self settingSelector: @selector( setImage: ) itemContent: [ NSImage imageNamed: @"GeneralPreferences" ] action: @selector( toolbarItem: ) ];
+ [ toolbarHolder addToolbarItem: @"PlugIns" label: @"PlugIns" paletteLabel: @"PlugIns" tooltip: @"PlugIns availability" target: self settingSelector: @selector( setImage: ) itemContent: [ NSImage imageNamed: @"PlugInsPreferences" ] action: @selector( toolbarItem: ) ];
+ [ toolbarHolder addToolbarItem: @"Advanced" label: @"Advanced" paletteLabel: @"Advanced" tooltip: @"Advanced application parameters" target: self settingSelector: @selector( setImage: ) itemContent: [ NSImage imageNamed: @"AdvancedPreferences" ] action: @selector( toolbarItem: ) ];
[ [ self window ] setToolbar: [ toolbarHolder toolbar ] ];
}
Modified: trunk/app/HDRFlow/ToolbarHolder.h
===================================================================
--- trunk/app/HDRFlow/ToolbarHolder.h 2007-07-22 16:50:48 UTC (rev 200)
+++ trunk/app/HDRFlow/ToolbarHolder.h 2007-07-22 20:37:22 UTC (rev 201)
@@ -10,6 +10,7 @@
@interface ToolbarHolder : NSObject
{
NSMutableDictionary* items;
+ NSMutableArray* itemIdentifiers;
NSToolbar* toolbar;
}
Modified: trunk/app/HDRFlow/ToolbarHolder.m
===================================================================
--- trunk/app/HDRFlow/ToolbarHolder.m 2007-07-22 16:50:48 UTC (rev 200)
+++ trunk/app/HDRFlow/ToolbarHolder.m 2007-07-22 20:37:22 UTC (rev 201)
@@ -14,6 +14,7 @@
[ super init ];
items = [ [ NSMutableDictionary dictionary ] retain ];
+ itemIdentifiers = [ [ [ NSMutableArray alloc ] init ] retain ];
toolbar = [ [ [ NSToolbar alloc ] initWithIdentifier: identifier ] retain ];
[ toolbar setAllowsUserCustomization: YES ];
@@ -28,6 +29,7 @@
- ( void ) dealloc
{
[ items release ];
+ [ itemIdentifiers release ];
[ toolbar release ];
[ super dealloc ];
}
@@ -43,6 +45,7 @@
[ item setAction: action ];
[ items setObject: item forKey: identifier ];
+ [ itemIdentifiers addObject: identifier ];
}
- ( NSToolbar* ) toolbar
@@ -83,12 +86,12 @@
- ( NSArray* ) toolbarDefaultItemIdentifiers: ( NSToolbar* ) toolbar
{
- return [ NSArray arrayWithObjects: @"General", nil ];
+ return itemIdentifiers;
}
- ( NSArray* ) toolbarAllowedItemIdentifiers: ( NSToolbar* ) toolbar
{
- return [ NSArray arrayWithObjects: @"General", nil ];
+ return itemIdentifiers;
}
@end
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-07-22 16:50:50
|
Revision: 200
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=200&view=rev
Author: glslang
Date: 2007-07-22 09:50:48 -0700 (Sun, 22 Jul 2007)
Log Message:
-----------
+ eol-style to native
Property Changed:
----------------
trunk/app/HDRFlow/ToolbarHolder.h
trunk/app/HDRFlow/ToolbarHolder.m
Property changes on: trunk/app/HDRFlow/ToolbarHolder.h
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/app/HDRFlow/ToolbarHolder.m
___________________________________________________________________
Name: svn:eol-style
+ native
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-07-22 16:48:53
|
Revision: 199
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=199&view=rev
Author: glslang
Date: 2007-07-22 09:48:49 -0700 (Sun, 22 Jul 2007)
Log Message:
-----------
+ Toolbar abstraction code
Modified Paths:
--------------
trunk/app/HDRFlow/English.lproj/MainMenu.nib/info.nib
trunk/app/HDRFlow/English.lproj/MainMenu.nib/keyedobjects.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/HDRFlow.xcodeproj/project.pbxproj
trunk/app/HDRFlow/PreferencesController.h
trunk/app/HDRFlow/PreferencesController.m
Added Paths:
-----------
trunk/app/HDRFlow/ToolbarHolder.h
trunk/app/HDRFlow/ToolbarHolder.m
Modified: trunk/app/HDRFlow/English.lproj/MainMenu.nib/info.nib
===================================================================
--- trunk/app/HDRFlow/English.lproj/MainMenu.nib/info.nib 2007-07-21 22:42:43 UTC (rev 198)
+++ trunk/app/HDRFlow/English.lproj/MainMenu.nib/info.nib 2007-07-22 16:48:49 UTC (rev 199)
@@ -13,8 +13,8 @@
<string>446.1</string>
<key>IBOpenObjects</key>
<array>
+ <integer>21</integer>
<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/Preferences.nib/classes.nib
===================================================================
--- trunk/app/HDRFlow/English.lproj/Preferences.nib/classes.nib 2007-07-21 22:42:43 UTC (rev 198)
+++ trunk/app/HDRFlow/English.lproj/Preferences.nib/classes.nib 2007-07-22 16:48:49 UTC (rev 199)
@@ -2,6 +2,7 @@
IBClasses = (
{CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; },
{
+ ACTIONS = {toolbarItem = id; };
CLASS = PreferencesController;
LANGUAGE = ObjC;
OUTLETS = {generalView = NSView; };
Modified: trunk/app/HDRFlow/English.lproj/Preferences.nib/info.nib
===================================================================
--- trunk/app/HDRFlow/English.lproj/Preferences.nib/info.nib 2007-07-21 22:42:43 UTC (rev 198)
+++ trunk/app/HDRFlow/English.lproj/Preferences.nib/info.nib 2007-07-22 16:48:49 UTC (rev 199)
@@ -7,7 +7,7 @@
<key>IBEditorPositions</key>
<dict>
<key>10</key>
- <string>361 341 412 270 0 0 1440 878 </string>
+ <string>514 465 412 270 0 0 1440 878 </string>
</dict>
<key>IBFramework Version</key>
<string>446.1</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-21 22:42:43 UTC (rev 198)
+++ trunk/app/HDRFlow/HDRFlow.xcodeproj/project.pbxproj 2007-07-22 16:48:49 UTC (rev 199)
@@ -16,6 +16,7 @@
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 */; };
+ 67C3D3220C53A71000136EE8 /* ToolbarHolder.m in Sources */ = {isa = PBXBuildFile; fileRef = 67C3D3210C53A71000136EE8 /* ToolbarHolder.m */; };
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 */; };
@@ -48,6 +49,8 @@
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>"; };
+ 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>"; };
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>"; };
@@ -86,6 +89,8 @@
673D044F0C522C980096513A /* PreferencesController.m */,
671E22910C41652E00CA1860 /* ScriptEditorController.h */,
671E22A20C4166E400CA1860 /* ScriptEditorController.mm */,
+ 67C3D3170C5361C600136EE8 /* ToolbarHolder.h */,
+ 67C3D3210C53A71000136EE8 /* ToolbarHolder.m */,
);
name = Classes;
sourceTree = "<group>";
@@ -245,6 +250,7 @@
671E22A30C4166E400CA1860 /* ScriptEditorController.mm in Sources */,
67A8A73E0C4183C500DB3F1B /* ScriptEngine.cpp in Sources */,
673D04500C522C980096513A /* PreferencesController.m in Sources */,
+ 67C3D3220C53A71000136EE8 /* ToolbarHolder.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Modified: trunk/app/HDRFlow/PreferencesController.h
===================================================================
--- trunk/app/HDRFlow/PreferencesController.h 2007-07-21 22:42:43 UTC (rev 198)
+++ trunk/app/HDRFlow/PreferencesController.h 2007-07-22 16:48:49 UTC (rev 199)
@@ -7,19 +7,17 @@
#import <Cocoa/Cocoa.h>
+// forward declarations
+@class ToolbarHolder;
+
@interface PreferencesController : NSWindowController
{
- NSMutableDictionary* items;
+ ToolbarHolder* toolbarHolder;
IBOutlet NSView* generalView;
}
-- ( NSToolbarItem* ) toolbar: ( NSToolbar* ) toolbar itemForItemIdentifier: ( NSString* ) itemIdentifier willBeInsertedIntoToolbar: ( BOOL ) flag;
-- ( NSArray* ) toolbarDefaultItemIdentifiers: ( NSToolbar* ) toolbar;
-- ( NSArray* ) toolbarAllowedItemIdentifiers: ( NSToolbar* ) toolbar;
-
-- ( void ) addToolbarItem: ( NSString* ) identifier label: ( NSString* ) label paletteLabel: ( NSString* ) paletteLabel tooltip: ( NSString* ) tooltip target: ( id ) target settingSelector: ( SEL ) settingSelector itemContent: ( id ) itemContent action: ( SEL ) action;
-- ( void ) toolbarItemAction: ( id ) sender;
+- ( IBAction ) toolbarItem: ( id ) sender;
- ( void ) setActiveView: ( NSView* ) view;
@end
Modified: trunk/app/HDRFlow/PreferencesController.m
===================================================================
--- trunk/app/HDRFlow/PreferencesController.m 2007-07-21 22:42:43 UTC (rev 198)
+++ trunk/app/HDRFlow/PreferencesController.m 2007-07-22 16:48:49 UTC (rev 199)
@@ -6,6 +6,7 @@
// For more information, see http://www.cryogenicgraphics.com/hdrflow.
#import "PreferencesController.h"
+#import "ToolbarHolder.h"
@implementation PreferencesController
@@ -16,81 +17,25 @@
- ( void ) awakeFromNib
{
- items = [ [ NSMutableDictionary dictionary ] retain ];
-
- NSToolbar* toolbar = [ [ [ NSToolbar alloc ] initWithIdentifier: @"HDRFlowPreferencesToolbar" ] autorelease ];
- [ toolbar setAllowsUserCustomization: YES ];
- [ toolbar setAutosavesConfiguration: YES ];
- [ toolbar setSizeMode: NSToolbarSizeModeDefault ];
- [ toolbar setDisplayMode: NSToolbarDisplayModeIconAndLabel ];
- [ toolbar setDelegate: self ];
+ toolbarHolder = [ [ ToolbarHolder alloc ] init: @"HDRFlowPreferencesToolbar" ];
- [ self addToolbarItem: @"General" label: @"General" paletteLabel: @"General" tooltip: @"Generic application configuration parameters" target: self settingSelector: @selector( setImage: ) itemContent: [ NSImage imageNamed: @"GeneralPreferences" ] action: @selector( toolbarItemAction: ) ];
+ [ toolbarHolder addToolbarItem: @"General" label: @"General" paletteLabel: @"General" tooltip: @"Generic application configuration parameters" target: self settingSelector: @selector( setImage: ) itemContent: [ NSImage imageNamed: @"GeneralPreferences" ] action: @selector( toolbarItem: ) ];
- [ [ self window ] setToolbar: toolbar ];
+ [ [ self window ] setToolbar: [ toolbarHolder toolbar ] ];
}
- ( void ) dealloc
{
- [ items release ];
+ [ toolbarHolder release ];
[ super dealloc ];
}
-#pragma mark ---- NSToolbar required delegate methods ----
-
-- ( NSToolbarItem* ) toolbar: ( NSToolbar* ) toolbar itemForItemIdentifier: ( NSString* ) itemIdentifier willBeInsertedIntoToolbar: ( BOOL ) flag
-{
- NSToolbarItem* cloneItem = [ [ [ NSToolbarItem alloc ] initWithItemIdentifier: itemIdentifier ] autorelease ];
- NSToolbarItem* originalItem = [ items objectForKey: itemIdentifier ];
-
- [ cloneItem setLabel: [ originalItem label ] ];
- [ cloneItem setPaletteLabel: [ originalItem paletteLabel ] ];
- [ cloneItem setToolTip: [ originalItem toolTip ] ];
- [ cloneItem setTarget: [ originalItem target ] ];
- [ cloneItem setAction: [ originalItem action ] ];
- if( [ originalItem view ] != nil )
- {
- [ cloneItem setView: [ originalItem view ] ];
- [ cloneItem setMinSize: [ [ originalItem view ] bounds ].size ];
- [ cloneItem setMaxSize: [ [ originalItem view ] bounds ].size ];
- }
- else
- {
- [ cloneItem setImage: [ originalItem image ] ];
- }
-
- return cloneItem;
-}
-
-- ( NSArray* ) toolbarDefaultItemIdentifiers: ( NSToolbar* ) toolbar
-{
- return [ NSArray arrayWithObjects: @"General", nil ];
-}
-
-- ( NSArray* ) toolbarAllowedItemIdentifiers: ( NSToolbar* ) toolbar
-{
- return [ NSArray arrayWithObjects: @"General", nil ];
-}
-
#pragma mark ---- Toolbar items ----
-- ( void ) addToolbarItem: ( NSString* ) identifier label: ( NSString* ) label paletteLabel: ( NSString* ) paletteLabel tooltip: ( NSString* ) tooltip target: ( id ) target settingSelector: ( SEL ) settingSelector itemContent: ( id ) itemContent action: ( SEL ) action
+- ( IBAction ) toolbarItem: ( id ) sender
{
- NSToolbarItem* item = [ [ [ NSToolbarItem alloc ] initWithItemIdentifier: identifier ] autorelease ];
- [ item setLabel: label ];
- [ item setPaletteLabel: paletteLabel ];
- [ item setToolTip: tooltip ];
- [ item setTarget: target ];
- [ item performSelector: settingSelector withObject: itemContent ];
- [ item setAction: action ];
-
- [ items setObject: item forKey: identifier ];
}
-- ( void ) toolbarItemAction: ( id ) sender
-{
-}
-
- ( void ) setActiveView: ( NSView* ) view
{
[ [ self window ] setContentView: view ];
Added: trunk/app/HDRFlow/ToolbarHolder.h
===================================================================
--- trunk/app/HDRFlow/ToolbarHolder.h (rev 0)
+++ trunk/app/HDRFlow/ToolbarHolder.h 2007-07-22 16:48:49 UTC (rev 199)
@@ -0,0 +1,25 @@
+
+// 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 ToolbarHolder : NSObject
+{
+ NSMutableDictionary* items;
+ NSToolbar* toolbar;
+}
+
+- ( ToolbarHolder* ) init: ( NSString* ) identifier;
+- ( void ) addToolbarItem: ( NSString* ) identifier label: ( NSString* ) label paletteLabel: ( NSString* ) paletteLabel tooltip: ( NSString* ) tooltip target: ( id ) target settingSelector: ( SEL ) settingSelector itemContent: ( id ) itemContent action: ( SEL ) action;
+- ( NSToolbar* ) toolbar;
+- ( NSToolbarItem* ) itemForKey: ( NSString* ) itemIdentifier;
+
+- ( NSToolbarItem* ) toolbar: ( NSToolbar* ) toolbar itemForItemIdentifier: ( NSString* ) itemIdentifier willBeInsertedIntoToolbar: ( BOOL ) flag;
+- ( NSArray* ) toolbarDefaultItemIdentifiers: ( NSToolbar* ) toolbar;
+- ( NSArray* ) toolbarAllowedItemIdentifiers: ( NSToolbar* ) toolbar;
+
+@end
Added: trunk/app/HDRFlow/ToolbarHolder.m
===================================================================
--- trunk/app/HDRFlow/ToolbarHolder.m (rev 0)
+++ trunk/app/HDRFlow/ToolbarHolder.m 2007-07-22 16:48:49 UTC (rev 199)
@@ -0,0 +1,94 @@
+
+// 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 "ToolbarHolder.h"
+
+@implementation ToolbarHolder
+
+- ( ToolbarHolder* ) init: ( NSString* ) identifier
+{
+ [ super init ];
+
+ items = [ [ NSMutableDictionary dictionary ] retain ];
+
+ toolbar = [ [ [ NSToolbar alloc ] initWithIdentifier: identifier ] retain ];
+ [ toolbar setAllowsUserCustomization: YES ];
+ [ toolbar setAutosavesConfiguration: YES ];
+ [ toolbar setSizeMode: NSToolbarSizeModeDefault ];
+ [ toolbar setDisplayMode: NSToolbarDisplayModeIconAndLabel ];
+ [ toolbar setDelegate: self ];
+
+ return self;
+}
+
+- ( void ) dealloc
+{
+ [ items release ];
+ [ toolbar release ];
+ [ super dealloc ];
+}
+
+- ( void ) addToolbarItem: ( NSString* ) identifier label: ( NSString* ) label paletteLabel: ( NSString* ) paletteLabel tooltip: ( NSString* ) tooltip target: ( id ) target settingSelector: ( SEL ) settingSelector itemContent: ( id ) itemContent action: ( SEL ) action
+{
+ NSToolbarItem* item = [ [ [ NSToolbarItem alloc ] initWithItemIdentifier: identifier ] autorelease ];
+ [ item setLabel: label ];
+ [ item setPaletteLabel: paletteLabel ];
+ [ item setToolTip: tooltip ];
+ [ item setTarget: target ];
+ [ item performSelector: settingSelector withObject: itemContent ];
+ [ item setAction: action ];
+
+ [ items setObject: item forKey: identifier ];
+}
+
+- ( NSToolbar* ) toolbar
+{
+ return toolbar;
+}
+
+- ( NSToolbarItem* ) itemForKey: ( NSString* ) itemIdentifier
+{
+ return [ items objectForKey: itemIdentifier ];
+}
+
+#pragma mark ---- NSToolbar required delegate methods ----
+
+- ( NSToolbarItem* ) toolbar: ( NSToolbar* ) toolbar itemForItemIdentifier: ( NSString* ) itemIdentifier willBeInsertedIntoToolbar: ( BOOL ) flag
+{
+ NSToolbarItem* cloneItem = [ [ [ NSToolbarItem alloc ] initWithItemIdentifier: itemIdentifier ] autorelease ];
+ NSToolbarItem* originalItem = [ items objectForKey: itemIdentifier ];
+
+ [ cloneItem setLabel: [ originalItem label ] ];
+ [ cloneItem setPaletteLabel: [ originalItem paletteLabel ] ];
+ [ cloneItem setToolTip: [ originalItem toolTip ] ];
+ [ cloneItem setTarget: [ originalItem target ] ];
+ [ cloneItem setAction: [ originalItem action ] ];
+ if( [ originalItem view ] != nil )
+ {
+ [ cloneItem setView: [ originalItem view ] ];
+ [ cloneItem setMinSize: [ [ originalItem view ] bounds ].size ];
+ [ cloneItem setMaxSize: [ [ originalItem view ] bounds ].size ];
+ }
+ else
+ {
+ [ cloneItem setImage: [ originalItem image ] ];
+ }
+
+ return cloneItem;
+}
+
+- ( NSArray* ) toolbarDefaultItemIdentifiers: ( NSToolbar* ) toolbar
+{
+ return [ NSArray arrayWithObjects: @"General", nil ];
+}
+
+- ( NSArray* ) toolbarAllowedItemIdentifiers: ( NSToolbar* ) toolbar
+{
+ return [ NSArray arrayWithObjects: @"General", nil ];
+}
+
+@end
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-07-21 22:42:45
|
Revision: 198
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=198&view=rev
Author: glslang
Date: 2007-07-21 15:42:43 -0700 (Sat, 21 Jul 2007)
Log Message:
-----------
+Brushed metal look
Modified Paths:
--------------
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/keyedobjects.nib
Modified: trunk/app/HDRFlow/English.lproj/MainMenu.nib/info.nib
===================================================================
--- trunk/app/HDRFlow/English.lproj/MainMenu.nib/info.nib 2007-07-21 22:31:30 UTC (rev 197)
+++ trunk/app/HDRFlow/English.lproj/MainMenu.nib/info.nib 2007-07-21 22:42:43 UTC (rev 198)
@@ -13,8 +13,8 @@
<string>446.1</string>
<key>IBOpenObjects</key>
<array>
+ <integer>29</integer>
<integer>21</integer>
- <integer>29</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/keyedobjects.nib
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-07-21 22:31:33
|
Revision: 197
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=197&view=rev
Author: glslang
Date: 2007-07-21 15:31:30 -0700 (Sat, 21 Jul 2007)
Log Message:
-----------
+ Preferences Window initial toolbar code
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
trunk/app/HDRFlow/PreferencesController.h
trunk/app/HDRFlow/PreferencesController.m
Added Paths:
-----------
trunk/app/HDRFlow/Images/
trunk/app/HDRFlow/Images/GeneralPreferences.tiff
Modified: trunk/app/HDRFlow/English.lproj/Preferences.nib/classes.nib
===================================================================
--- trunk/app/HDRFlow/English.lproj/Preferences.nib/classes.nib 2007-07-21 16:00:50 UTC (rev 196)
+++ trunk/app/HDRFlow/English.lproj/Preferences.nib/classes.nib 2007-07-21 22:31:30 UTC (rev 197)
@@ -4,6 +4,7 @@
{
CLASS = PreferencesController;
LANGUAGE = ObjC;
+ OUTLETS = {generalView = NSView; };
SUPERCLASS = NSWindowController;
}
);
Modified: trunk/app/HDRFlow/English.lproj/Preferences.nib/info.nib
===================================================================
--- trunk/app/HDRFlow/English.lproj/Preferences.nib/info.nib 2007-07-21 16:00:50 UTC (rev 196)
+++ trunk/app/HDRFlow/English.lproj/Preferences.nib/info.nib 2007-07-21 22:31:30 UTC (rev 197)
@@ -4,11 +4,17 @@
<dict>
<key>IBDocumentLocation</key>
<string>69 54 356 240 0 0 1440 878 </string>
+ <key>IBEditorPositions</key>
+ <dict>
+ <key>10</key>
+ <string>361 341 412 270 0 0 1440 878 </string>
+ </dict>
<key>IBFramework Version</key>
<string>446.1</string>
<key>IBOpenObjects</key>
<array>
<integer>5</integer>
+ <integer>10</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-21 16:00:50 UTC (rev 196)
+++ trunk/app/HDRFlow/HDRFlow.xcodeproj/project.pbxproj 2007-07-21 22:31:30 UTC (rev 197)
@@ -19,6 +19,7 @@
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 */; };
+ 67F7A3EE0C52A21600172987 /* GeneralPreferences.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 67F7A3ED0C52A21600172987 /* GeneralPreferences.tiff */; };
8D11072A0486CEB800E47090 /* MainMenu.nib in Resources */ = {isa = PBXBuildFile; fileRef = 29B97318FDCFA39411CA2CEA /* MainMenu.nib */; };
8D11072B0486CEB800E47090 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */; };
8D11072D0486CEB800E47090 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* main.m */; settings = {ATTRIBUTES = (); }; };
@@ -52,6 +53,7 @@
67DC61B80C2EAC94005CFE6E /* ViewportOpenGLView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ViewportOpenGLView.m; sourceTree = "<group>"; };
67DC62170C2EC0D9005CFE6E /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = /System/Library/Frameworks/OpenGL.framework; sourceTree = "<absolute>"; };
67F6CCF70C285D6C00098F90 /* CustomOpenGLView.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CustomOpenGLView.h; sourceTree = "<group>"; };
+ 67F7A3ED0C52A21600172987 /* GeneralPreferences.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = GeneralPreferences.tiff; path = Images/GeneralPreferences.tiff; sourceTree = "<group>"; };
8D1107310486CEB800E47090 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; };
8D1107320486CEB800E47090 /* HDRFlow.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = HDRFlow.app; sourceTree = BUILT_PRODUCTS_DIR; };
/* End PBXFileReference section */
@@ -123,7 +125,6 @@
080E96DDFE201D6D7F000001 /* Classes */,
29B97315FDCFA39411CA2CEA /* Other Sources */,
29B97317FDCFA39411CA2CEA /* Resources */,
- 67C8D8B10C4AD7350006B871 /* Scripts */,
29B97323FDCFA39411CA2CEA /* Frameworks */,
19C28FACFE9D520D11CA2CBB /* Products */,
);
@@ -144,6 +145,8 @@
29B97317FDCFA39411CA2CEA /* Resources */ = {
isa = PBXGroup;
children = (
+ 67C8D8B10C4AD7350006B871 /* Scripts */,
+ 67F7A3EC0C52A1F900172987 /* Images */,
8D1107310486CEB800E47090 /* Info.plist */,
089C165CFE840E0CC02AAC07 /* InfoPlist.strings */,
29B97318FDCFA39411CA2CEA /* MainMenu.nib */,
@@ -170,6 +173,14 @@
name = Scripts;
sourceTree = "<group>";
};
+ 67F7A3EC0C52A1F900172987 /* Images */ = {
+ isa = PBXGroup;
+ children = (
+ 67F7A3ED0C52A21600172987 /* GeneralPreferences.tiff */,
+ );
+ name = Images;
+ sourceTree = "<group>";
+ };
/* End PBXGroup section */
/* Begin PBXNativeTarget section */
@@ -216,6 +227,7 @@
674E44640C3F854A0036A908 /* ScriptEditor.nib in Resources */,
67C8D8B80C4AD8340006B871 /* bootstrap.py in Resources */,
67C064EE0C52231A00E9ED8E /* Preferences.nib in Resources */,
+ 67F7A3EE0C52A21600172987 /* GeneralPreferences.tiff in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Added: trunk/app/HDRFlow/Images/GeneralPreferences.tiff
===================================================================
(Binary files differ)
Property changes on: trunk/app/HDRFlow/Images/GeneralPreferences.tiff
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/app/HDRFlow/PreferencesController.h
===================================================================
--- trunk/app/HDRFlow/PreferencesController.h 2007-07-21 16:00:50 UTC (rev 196)
+++ trunk/app/HDRFlow/PreferencesController.h 2007-07-21 22:31:30 UTC (rev 197)
@@ -9,6 +9,17 @@
@interface PreferencesController : NSWindowController
{
+ NSMutableDictionary* items;
+
+ IBOutlet NSView* generalView;
}
+- ( NSToolbarItem* ) toolbar: ( NSToolbar* ) toolbar itemForItemIdentifier: ( NSString* ) itemIdentifier willBeInsertedIntoToolbar: ( BOOL ) flag;
+- ( NSArray* ) toolbarDefaultItemIdentifiers: ( NSToolbar* ) toolbar;
+- ( NSArray* ) toolbarAllowedItemIdentifiers: ( NSToolbar* ) toolbar;
+
+- ( void ) addToolbarItem: ( NSString* ) identifier label: ( NSString* ) label paletteLabel: ( NSString* ) paletteLabel tooltip: ( NSString* ) tooltip target: ( id ) target settingSelector: ( SEL ) settingSelector itemContent: ( id ) itemContent action: ( SEL ) action;
+- ( void ) toolbarItemAction: ( id ) sender;
+- ( void ) setActiveView: ( NSView* ) view;
+
@end
Modified: trunk/app/HDRFlow/PreferencesController.m
===================================================================
--- trunk/app/HDRFlow/PreferencesController.m 2007-07-21 16:00:50 UTC (rev 196)
+++ trunk/app/HDRFlow/PreferencesController.m 2007-07-21 22:31:30 UTC (rev 197)
@@ -14,4 +14,86 @@
return [ super initWithWindowNibName: windowNibName ];
}
+- ( void ) awakeFromNib
+{
+ items = [ [ NSMutableDictionary dictionary ] retain ];
+
+ NSToolbar* toolbar = [ [ [ NSToolbar alloc ] initWithIdentifier: @"HDRFlowPreferencesToolbar" ] autorelease ];
+ [ toolbar setAllowsUserCustomization: YES ];
+ [ toolbar setAutosavesConfiguration: YES ];
+ [ toolbar setSizeMode: NSToolbarSizeModeDefault ];
+ [ toolbar setDisplayMode: NSToolbarDisplayModeIconAndLabel ];
+ [ toolbar setDelegate: self ];
+
+ [ self addToolbarItem: @"General" label: @"General" paletteLabel: @"General" tooltip: @"Generic application configuration parameters" target: self settingSelector: @selector( setImage: ) itemContent: [ NSImage imageNamed: @"GeneralPreferences" ] action: @selector( toolbarItemAction: ) ];
+
+ [ [ self window ] setToolbar: toolbar ];
+}
+
+- ( void ) dealloc
+{
+ [ items release ];
+ [ super dealloc ];
+}
+
+#pragma mark ---- NSToolbar required delegate methods ----
+
+- ( NSToolbarItem* ) toolbar: ( NSToolbar* ) toolbar itemForItemIdentifier: ( NSString* ) itemIdentifier willBeInsertedIntoToolbar: ( BOOL ) flag
+{
+ NSToolbarItem* cloneItem = [ [ [ NSToolbarItem alloc ] initWithItemIdentifier: itemIdentifier ] autorelease ];
+ NSToolbarItem* originalItem = [ items objectForKey: itemIdentifier ];
+
+ [ cloneItem setLabel: [ originalItem label ] ];
+ [ cloneItem setPaletteLabel: [ originalItem paletteLabel ] ];
+ [ cloneItem setToolTip: [ originalItem toolTip ] ];
+ [ cloneItem setTarget: [ originalItem target ] ];
+ [ cloneItem setAction: [ originalItem action ] ];
+ if( [ originalItem view ] != nil )
+ {
+ [ cloneItem setView: [ originalItem view ] ];
+ [ cloneItem setMinSize: [ [ originalItem view ] bounds ].size ];
+ [ cloneItem setMaxSize: [ [ originalItem view ] bounds ].size ];
+ }
+ else
+ {
+ [ cloneItem setImage: [ originalItem image ] ];
+ }
+
+ return cloneItem;
+}
+
+- ( NSArray* ) toolbarDefaultItemIdentifiers: ( NSToolbar* ) toolbar
+{
+ return [ NSArray arrayWithObjects: @"General", nil ];
+}
+
+- ( NSArray* ) toolbarAllowedItemIdentifiers: ( NSToolbar* ) toolbar
+{
+ return [ NSArray arrayWithObjects: @"General", nil ];
+}
+
+#pragma mark ---- Toolbar items ----
+
+- ( void ) addToolbarItem: ( NSString* ) identifier label: ( NSString* ) label paletteLabel: ( NSString* ) paletteLabel tooltip: ( NSString* ) tooltip target: ( id ) target settingSelector: ( SEL ) settingSelector itemContent: ( id ) itemContent action: ( SEL ) action
+{
+ NSToolbarItem* item = [ [ [ NSToolbarItem alloc ] initWithItemIdentifier: identifier ] autorelease ];
+ [ item setLabel: label ];
+ [ item setPaletteLabel: paletteLabel ];
+ [ item setToolTip: tooltip ];
+ [ item setTarget: target ];
+ [ item performSelector: settingSelector withObject: itemContent ];
+ [ item setAction: action ];
+
+ [ items setObject: item forKey: identifier ];
+}
+
+- ( void ) toolbarItemAction: ( id ) sender
+{
+}
+
+- ( void ) setActiveView: ( NSView* ) view
+{
+ [ [ self window ] setContentView: view ];
+}
+
@end
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-07-21 16:00:54
|
Revision: 196
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=196&view=rev
Author: glslang
Date: 2007-07-21 09:00:50 -0700 (Sat, 21 Jul 2007)
Log Message:
-----------
+ eol-style to native
Property Changed:
----------------
trunk/app/HDRFlow/English.lproj/Preferences.nib/classes.nib
trunk/app/HDRFlow/English.lproj/Preferences.nib/info.nib
trunk/app/HDRFlow/PreferencesController.h
trunk/app/HDRFlow/PreferencesController.m
Property changes on: trunk/app/HDRFlow/English.lproj/Preferences.nib/classes.nib
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/app/HDRFlow/English.lproj/Preferences.nib/info.nib
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/app/HDRFlow/PreferencesController.h
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/app/HDRFlow/PreferencesController.m
___________________________________________________________________
Name: svn:eol-style
+ native
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
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.
|
|
From: <gl...@us...> - 2007-07-21 11:21:20
|
Revision: 194
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=194&view=rev
Author: glslang
Date: 2007-07-21 04:21:18 -0700 (Sat, 21 Jul 2007)
Log Message:
-----------
+ eol-style to native
Property Changed:
----------------
trunk/app/HDRFlow/English.lproj/MainMenu.nib/classes.nib
trunk/app/HDRFlow/English.lproj/MainMenu.nib/info.nib
trunk/app/HDRFlow/English.lproj/ScriptEditor.nib/classes.nib
trunk/app/HDRFlow/English.lproj/ScriptEditor.nib/info.nib
trunk/app/HDRFlow/HDRFlow.xcodeproj/project.pbxproj
trunk/app/HDRFlow/Scripts/bootstrap.py
Property changes on: trunk/app/HDRFlow/English.lproj/MainMenu.nib/classes.nib
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/app/HDRFlow/English.lproj/MainMenu.nib/info.nib
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/app/HDRFlow/English.lproj/ScriptEditor.nib/classes.nib
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/app/HDRFlow/English.lproj/ScriptEditor.nib/info.nib
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/app/HDRFlow/HDRFlow.xcodeproj/project.pbxproj
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/app/HDRFlow/Scripts/bootstrap.py
___________________________________________________________________
Name: svn:eol-style
+ native
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-07-19 22:24:37
|
Revision: 193
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=193&view=rev
Author: glslang
Date: 2007-07-19 15:24:34 -0700 (Thu, 19 Jul 2007)
Log Message:
-----------
+initial fullscreen code
Modified Paths:
--------------
trunk/app/HDRFlow/English.lproj/MainMenu.nib/classes.nib
trunk/app/HDRFlow/English.lproj/MainMenu.nib/keyedobjects.nib
trunk/app/HDRFlow/HDRFlowController.h
trunk/app/HDRFlow/HDRFlowController.m
trunk/app/HDRFlow/ViewportOpenGLView.h
trunk/app/HDRFlow/ViewportOpenGLView.m
Modified: trunk/app/HDRFlow/English.lproj/MainMenu.nib/classes.nib
===================================================================
--- trunk/app/HDRFlow/English.lproj/MainMenu.nib/classes.nib 2007-07-18 21:42:24 UTC (rev 192)
+++ trunk/app/HDRFlow/English.lproj/MainMenu.nib/classes.nib 2007-07-19 22:24:34 UTC (rev 193)
@@ -5,7 +5,7 @@
ACTIONS = {fileOpen = id; scriptEditor = id; viewFullscreen = id; };
CLASS = HDRFlowController;
LANGUAGE = ObjC;
- OUTLETS = {OpenGLView = ViewportOpenGLView; scriptEditor = ScriptEditorController; };
+ OUTLETS = {openGLView = ViewportOpenGLView; };
SUPERCLASS = NSObject;
},
{CLASS = ViewportOpenGLView; LANGUAGE = ObjC; SUPERCLASS = CustomOpenGLView; }
Modified: trunk/app/HDRFlow/English.lproj/MainMenu.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/app/HDRFlow/HDRFlowController.h
===================================================================
--- trunk/app/HDRFlow/HDRFlowController.h 2007-07-18 21:42:24 UTC (rev 192)
+++ trunk/app/HDRFlow/HDRFlowController.h 2007-07-19 22:24:34 UTC (rev 193)
@@ -14,7 +14,7 @@
@interface HDRFlowController : NSObject
{
ScriptEditorController* scriptEditor;
- IBOutlet ViewportOpenGLView* OpenGLView;
+ IBOutlet ViewportOpenGLView* openGLView;
}
- ( BOOL ) acceptsFirstResponder;
Modified: trunk/app/HDRFlow/HDRFlowController.m
===================================================================
--- trunk/app/HDRFlow/HDRFlowController.m 2007-07-18 21:42:24 UTC (rev 192)
+++ trunk/app/HDRFlow/HDRFlowController.m 2007-07-19 22:24:34 UTC (rev 193)
@@ -6,6 +6,7 @@
// For more information, see http://www.cryogenicgraphics.com/hdrflow.
#import "HDRFlowController.h"
+#import "ViewportOpenGLView.h"
@implementation HDRFlowController
@@ -47,6 +48,7 @@
- ( IBAction ) viewFullscreen: ( id ) sender
{
+ [ openGLView fullscreen ];
}
- ( BOOL ) acceptsFirstResponder
Modified: trunk/app/HDRFlow/ViewportOpenGLView.h
===================================================================
--- trunk/app/HDRFlow/ViewportOpenGLView.h 2007-07-18 21:42:24 UTC (rev 192)
+++ trunk/app/HDRFlow/ViewportOpenGLView.h 2007-07-19 22:24:34 UTC (rev 193)
@@ -18,6 +18,6 @@
- ( void ) drawRect: ( NSRect ) theRect;
- ( void ) update;
-- ( BOOL ) fullscreen;
+- ( void ) fullscreen;
@end
Modified: trunk/app/HDRFlow/ViewportOpenGLView.m
===================================================================
--- trunk/app/HDRFlow/ViewportOpenGLView.m 2007-07-18 21:42:24 UTC (rev 192)
+++ trunk/app/HDRFlow/ViewportOpenGLView.m 2007-07-19 22:24:34 UTC (rev 193)
@@ -75,9 +75,65 @@
;
}
-- ( BOOL ) fullscreen
+- ( void ) fullscreen
{
- return NO;
+ NSOpenGLPixelFormatAttribute attribs[ ] =
+ {
+ NSOpenGLPFAFullScreen,
+ NSOpenGLPFAScreenMask,
+ CGDisplayIDToOpenGLDisplayMask( kCGDirectMainDisplay ),
+ NSOpenGLPFADoubleBuffer,
+ NSOpenGLPFADepthSize, 24,
+ NSOpenGLPFAStencilSize, 8,
+ 0
+ };
+
+ NSOpenGLPixelFormat* pixelFormat = [ [ [ NSOpenGLPixelFormat alloc ] initWithAttributes: attribs ] autorelease ];
+ NSOpenGLContext* fullScreenContext = [ [ NSOpenGLContext alloc ] initWithFormat: pixelFormat shareContext: nil ];
+
+ if( fullScreenContext == nil ) return;
+
+ CGDisplayErr err = CGCaptureAllDisplays( );
+ if( err != CGDisplayNoErr ) return;
+
+ [ fullScreenContext setFullScreen ];
+ [ fullScreenContext makeCurrentContext ];
+
+ glViewport( 0, 0, CGDisplayPixelsWide( kCGDirectMainDisplay ), CGDisplayPixelsHigh( kCGDirectMainDisplay ) );
+
+ BOOL stayInFullScreenMode = YES;
+ while( stayInFullScreenMode )
+ {
+ NSEvent* event;
+ while( event = [ NSApp nextEventMatchingMask: NSAnyEventMask untilDate: [ NSDate distantPast ] inMode: NSDefaultRunLoopMode dequeue: YES ] )
+ {
+ switch( [ event type ] )
+ {
+ case NSKeyDown:
+ stayInFullScreenMode = NO;
+ break;
+
+ default:
+ break;
+ }
+ }
+
+ [ fullScreenContext flushBuffer ];
+ }
+
+ glClearColor( 0.0, 0.0, 0.0, 0.0 );
+ glClear( GL_COLOR_BUFFER_BIT );
+ [ fullScreenContext flushBuffer ];
+ glClear( GL_COLOR_BUFFER_BIT );
+ [ fullScreenContext flushBuffer ];
+
+ [ NSOpenGLContext clearCurrentContext ];
+ [ fullScreenContext clearDrawable ];
+ [ fullScreenContext release ];
+
+ CGReleaseAllDisplays( );
+
+ [ self setNeedsDisplay: YES ];
}
@end
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-07-18 21:42:26
|
Revision: 192
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=192&view=rev
Author: glslang
Date: 2007-07-18 14:42:24 -0700 (Wed, 18 Jul 2007)
Log Message:
-----------
+ small UI hook-ups
Modified Paths:
--------------
trunk/app/HDRFlow/English.lproj/MainMenu.nib/classes.nib
trunk/app/HDRFlow/English.lproj/MainMenu.nib/keyedobjects.nib
Modified: trunk/app/HDRFlow/English.lproj/MainMenu.nib/classes.nib
===================================================================
--- trunk/app/HDRFlow/English.lproj/MainMenu.nib/classes.nib 2007-07-17 21:32:29 UTC (rev 191)
+++ trunk/app/HDRFlow/English.lproj/MainMenu.nib/classes.nib 2007-07-18 21:42:24 UTC (rev 192)
@@ -5,7 +5,7 @@
ACTIONS = {fileOpen = id; scriptEditor = id; viewFullscreen = id; };
CLASS = HDRFlowController;
LANGUAGE = ObjC;
- OUTLETS = {OpenGLView = ViewportOpenGLView; };
+ OUTLETS = {OpenGLView = ViewportOpenGLView; scriptEditor = ScriptEditorController; };
SUPERCLASS = NSObject;
},
{CLASS = ViewportOpenGLView; LANGUAGE = ObjC; SUPERCLASS = CustomOpenGLView; }
Modified: trunk/app/HDRFlow/English.lproj/MainMenu.nib/keyedobjects.nib
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-07-17 21:37:10
|
Revision: 191
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=191&view=rev
Author: glslang
Date: 2007-07-17 14:32:29 -0700 (Tue, 17 Jul 2007)
Log Message:
-----------
+beauty fixes
Modified Paths:
--------------
trunk/app/HDRFlow/ScriptEngine.cpp
trunk/app/HDRFlow/Scripts/bootstrap.py
trunk/app/HDRFlow/ViewportOpenGLView.h
trunk/app/HDRFlow/ViewportOpenGLView.m
Modified: trunk/app/HDRFlow/ScriptEngine.cpp
===================================================================
--- trunk/app/HDRFlow/ScriptEngine.cpp 2007-07-16 21:47:28 UTC (rev 190)
+++ trunk/app/HDRFlow/ScriptEngine.cpp 2007-07-17 21:32:29 UTC (rev 191)
@@ -47,9 +47,8 @@
try
{
- py::handle<> handle;
- if( !( handle =
- py::handle<>( py::allow_null( PyRun_String( str.c_str( ), Py_eval_input, main_namespace.ptr( ), main_namespace.ptr( ) ) ) ) ) )
+ py::handle<> handle( py::allow_null( PyRun_String( str.c_str( ), Py_eval_input, main_namespace.ptr( ), main_namespace.ptr( ) ) ) );
+ if( !handle )
{
// clear all errors so the call below has a chance to succeed.
PyErr_Clear( );
Modified: trunk/app/HDRFlow/Scripts/bootstrap.py
===================================================================
--- trunk/app/HDRFlow/Scripts/bootstrap.py 2007-07-16 21:47:28 UTC (rev 190)
+++ trunk/app/HDRFlow/Scripts/bootstrap.py 2007-07-17 21:32:29 UTC (rev 191)
@@ -5,7 +5,9 @@
# Released under the GPL.
# For more information, see http://www.cryogenicgraphics.com/hdrflow.
+import platform
import sys
+import os.path
sys.path.append( "/Library/Frameworks/HDRFlow.framework/Frameworks/HDRFlowPlugin.framework/PlugIns" )
sys.path.append( "/Library/Frameworks/HDRFlow.framework/Frameworks/HDRFlowImage.framework/PlugIns" )
@@ -15,3 +17,15 @@
import HDRFlowImage
import HDRFlowMedia
+if platform.system( ) == "Linux":
+ try:
+ import dl
+ sys.setdlopenflags( dl.RTLD_NOW | dl.RTLD_GLOBAL )
+ except:
+ sys.setdlopenflags( 257 )
+
+if platform.system( ) == "Darwin":
+ HDRFlowPlugin.init( "/Library/Frameworks/HDRFlow.framework/Frameworks/HDRFlowImage.framework/PlugIns" )
+ HDRFlowPlugin.init( "/Library/Frameworks/HDRFlow.framework/Frameworks/HDRFlowMedia.framework/PlugIns" )
+else:
+ HDRFlowPlugin.init( )
Modified: trunk/app/HDRFlow/ViewportOpenGLView.h
===================================================================
--- trunk/app/HDRFlow/ViewportOpenGLView.h 2007-07-16 21:47:28 UTC (rev 190)
+++ trunk/app/HDRFlow/ViewportOpenGLView.h 2007-07-17 21:32:29 UTC (rev 191)
@@ -18,4 +18,6 @@
- ( void ) drawRect: ( NSRect ) theRect;
- ( void ) update;
+- ( BOOL ) fullscreen;
+
@end
Modified: trunk/app/HDRFlow/ViewportOpenGLView.m
===================================================================
--- trunk/app/HDRFlow/ViewportOpenGLView.m 2007-07-16 21:47:28 UTC (rev 190)
+++ trunk/app/HDRFlow/ViewportOpenGLView.m 2007-07-17 21:32:29 UTC (rev 191)
@@ -75,4 +75,9 @@
;
}
+- ( BOOL ) fullscreen
+{
+ return NO;
+}
+
@end
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-07-16 21:47:54
|
Revision: 190
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=190&view=rev
Author: glslang
Date: 2007-07-16 14:47:28 -0700 (Mon, 16 Jul 2007)
Log Message:
-----------
+ initial fullscreen code
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/HDRFlowController.h
trunk/app/HDRFlow/HDRFlowController.m
Modified: trunk/app/HDRFlow/English.lproj/MainMenu.nib/classes.nib
===================================================================
--- trunk/app/HDRFlow/English.lproj/MainMenu.nib/classes.nib 2007-07-16 20:59:23 UTC (rev 189)
+++ trunk/app/HDRFlow/English.lproj/MainMenu.nib/classes.nib 2007-07-16 21:47:28 UTC (rev 190)
@@ -2,9 +2,10 @@
IBClasses = (
{CLASS = CustomOpenGLView; LANGUAGE = ObjC; SUPERCLASS = NSView; },
{
- ACTIONS = {fileOpen = id; scriptEditor = id; };
+ ACTIONS = {fileOpen = id; scriptEditor = id; viewFullscreen = id; };
CLASS = HDRFlowController;
LANGUAGE = ObjC;
+ OUTLETS = {OpenGLView = ViewportOpenGLView; };
SUPERCLASS = NSObject;
},
{CLASS = ViewportOpenGLView; LANGUAGE = ObjC; SUPERCLASS = CustomOpenGLView; }
Modified: trunk/app/HDRFlow/English.lproj/MainMenu.nib/info.nib
===================================================================
--- trunk/app/HDRFlow/English.lproj/MainMenu.nib/info.nib 2007-07-16 20:59:23 UTC (rev 189)
+++ trunk/app/HDRFlow/English.lproj/MainMenu.nib/info.nib 2007-07-16 21:47:28 UTC (rev 190)
@@ -3,11 +3,11 @@
<plist version="1.0">
<dict>
<key>IBDocumentLocation</key>
- <string>66 363 356 240 0 0 1440 878 </string>
+ <string>36 72 356 240 0 0 1440 878 </string>
<key>IBEditorPositions</key>
<dict>
<key>29</key>
- <string>2 829 290 44 0 0 1440 878 </string>
+ <string>2 829 338 44 0 0 1440 878 </string>
</dict>
<key>IBFramework Version</key>
<string>446.1</string>
Modified: trunk/app/HDRFlow/English.lproj/MainMenu.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/app/HDRFlow/HDRFlowController.h
===================================================================
--- trunk/app/HDRFlow/HDRFlowController.h 2007-07-16 20:59:23 UTC (rev 189)
+++ trunk/app/HDRFlow/HDRFlowController.h 2007-07-16 21:47:28 UTC (rev 190)
@@ -9,10 +9,12 @@
// forward declarations
@class ScriptEditorController;
+@class ViewportOpenGLView;
@interface HDRFlowController : NSObject
{
ScriptEditorController* scriptEditor;
+ IBOutlet ViewportOpenGLView* OpenGLView;
}
- ( BOOL ) acceptsFirstResponder;
@@ -21,5 +23,6 @@
- ( IBAction ) fileOpen: ( id ) sender;
- ( IBAction ) scriptEditor: ( id ) sender;
+- ( IBAction ) viewFullscreen: ( id ) sender;
@end
Modified: trunk/app/HDRFlow/HDRFlowController.m
===================================================================
--- trunk/app/HDRFlow/HDRFlowController.m 2007-07-16 20:59:23 UTC (rev 189)
+++ trunk/app/HDRFlow/HDRFlowController.m 2007-07-16 21:47:28 UTC (rev 190)
@@ -45,6 +45,10 @@
[ scriptEditor showWindow: self ];
}
+- ( IBAction ) viewFullscreen: ( id ) sender
+{
+}
+
- ( BOOL ) acceptsFirstResponder
{
return YES;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-07-16 20:59:24
|
Revision: 189
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=189&view=rev
Author: glslang
Date: 2007-07-16 13:59:23 -0700 (Mon, 16 Jul 2007)
Log Message:
-----------
+ add View menu
Modified Paths:
--------------
trunk/app/HDRFlow/English.lproj/MainMenu.nib/keyedobjects.nib
Modified: trunk/app/HDRFlow/English.lproj/MainMenu.nib/keyedobjects.nib
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-07-15 22:39:22
|
Revision: 188
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=188&view=rev
Author: glslang
Date: 2007-07-15 15:39:16 -0700 (Sun, 15 Jul 2007)
Log Message:
-----------
+initial bootsrap script
Modified Paths:
--------------
trunk/app/HDRFlow/HDRFlow.xcodeproj/project.pbxproj
Added Paths:
-----------
trunk/app/HDRFlow/Scripts/
trunk/app/HDRFlow/Scripts/bootstrap.py
Modified: trunk/app/HDRFlow/HDRFlow.xcodeproj/project.pbxproj
===================================================================
--- trunk/app/HDRFlow/HDRFlow.xcodeproj/project.pbxproj 2007-07-15 18:44:50 UTC (rev 187)
+++ trunk/app/HDRFlow/HDRFlow.xcodeproj/project.pbxproj 2007-07-15 22:39:16 UTC (rev 188)
@@ -14,6 +14,7 @@
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 */; };
+ 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 */; };
8D11072A0486CEB800E47090 /* MainMenu.nib in Resources */ = {isa = PBXBuildFile; fileRef = 29B97318FDCFA39411CA2CEA /* MainMenu.nib */; };
@@ -41,6 +42,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>"; };
+ 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>"; };
67DC62170C2EC0D9005CFE6E /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = /System/Library/Frameworks/OpenGL.framework; sourceTree = "<absolute>"; };
@@ -114,6 +116,7 @@
080E96DDFE201D6D7F000001 /* Classes */,
29B97315FDCFA39411CA2CEA /* Other Sources */,
29B97317FDCFA39411CA2CEA /* Resources */,
+ 67C8D8B10C4AD7350006B871 /* Scripts */,
29B97323FDCFA39411CA2CEA /* Frameworks */,
19C28FACFE9D520D11CA2CBB /* Products */,
);
@@ -151,6 +154,14 @@
name = Frameworks;
sourceTree = "<group>";
};
+ 67C8D8B10C4AD7350006B871 /* Scripts */ = {
+ isa = PBXGroup;
+ children = (
+ 67C8D8B70C4AD8340006B871 /* bootstrap.py */,
+ );
+ name = Scripts;
+ sourceTree = "<group>";
+ };
/* End PBXGroup section */
/* Begin PBXNativeTarget section */
@@ -195,6 +206,7 @@
8D11072A0486CEB800E47090 /* MainMenu.nib in Resources */,
8D11072B0486CEB800E47090 /* InfoPlist.strings in Resources */,
674E44640C3F854A0036A908 /* ScriptEditor.nib in Resources */,
+ 67C8D8B80C4AD8340006B871 /* bootstrap.py in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Added: trunk/app/HDRFlow/Scripts/bootstrap.py
===================================================================
--- trunk/app/HDRFlow/Scripts/bootstrap.py (rev 0)
+++ trunk/app/HDRFlow/Scripts/bootstrap.py 2007-07-15 22:39:16 UTC (rev 188)
@@ -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 sys
+
+sys.path.append( "/Library/Frameworks/HDRFlow.framework/Frameworks/HDRFlowPlugin.framework/PlugIns" )
+sys.path.append( "/Library/Frameworks/HDRFlow.framework/Frameworks/HDRFlowImage.framework/PlugIns" )
+sys.path.append( "/Library/Frameworks/HDRFlow.framework/Frameworks/HDRFlowMedia.framework/PlugIns" )
+
+import HDRFlowPlugin
+import HDRFlowImage
+import HDRFlowMedia
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
