[Hdrflow-svn] SF.net SVN: hdrflow: [201] trunk/app/HDRFlow
Status: Pre-Alpha
Brought to you by:
glslang
Menu
▾
▴
[Hdrflow-svn] SF.net SVN: hdrflow: [201] trunk/app/HDRFlow
|
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.
|
