Changeset 389

Timestamp:

04/14/07 17:19:19 (1 year ago)

Author:

mronge2

Message:

Added TimelineController, it is a controller in the nib

Files:

• trunk/LaserLine_2.0/English.lproj/MainMenu.nib/classes.nib (modified) (2 diffs)
• trunk/LaserLine_2.0/English.lproj/MainMenu.nib/info.nib (modified) (2 diffs)
• trunk/LaserLine_2.0/English.lproj/MainMenu.nib/keyedobjects.nib (modified) (previous)
• trunk/LaserLine_2.0/LaserLine_2.0.xcodeproj/project.pbxproj (modified) (5 diffs)
• trunk/LaserLine_2.0/Src/MainController.h (modified) (1 diff)
• trunk/LaserLine_2.0/Src/MainController.m (modified) (2 diffs)
• trunk/LaserLine_2.0/Src/TimelineController.h (added)
• trunk/LaserLine_2.0/Src/TimelineController.m (added)

trunk/LaserLine_2.0/English.lproj/MainMenu.nib/classes.nib

@@ -38 +38 @@
-                renderView = LZRenderedFrameView; 
-                splitViewBottom = LZSplitView; 
-
-
+
-            }; 
-            SUPERCLASS = NSObject; 
@@ -54 +53 @@
-            OUTLETS = {aSideMenu = TLSideMenu; }; 
-            SUPERCLASS = NSView; 
+        }, 
+        {
+            CLASS = TimelineController; 
+            LANGUAGE = ObjC; 
+            OUTLETS = {timelineView = TLView; }; 
+            SUPERCLASS = NSObject; 
-        }
-    ); 

trunk/LaserLine_2.0/English.lproj/MainMenu.nib/info.nib

@@ -8 +8 @@
-        <dict>
-                <key>29</key>
-197 692 355 44 0 0 1440 87
+241 816 355 44 0 0 1680 102
-        </dict>
-        <key>IBFramework Version</key>
@@ -18 +18 @@
-        <key>IBOpenObjects</key>
-        <array>
-1
+9
-                <integer>333</integer>
-                <integer>29</integer>
-                <integer>312</integer>
-        </array>

trunk/LaserLine_2.0/LaserLine_2.0.xcodeproj/project.pbxproj

@@ -83 +83 @@
-                F8A6D5830B78592500652C81 /* ILDAtypes.c in Sources */ = {isa = PBXBuildFile; fileRef = F8A6D5800B78592500652C81 /* ILDAtypes.c */; };
-                F8BCE3870BA175A10027E9F6 /* LZRenderedFrameView.m in Sources */ = {isa = PBXBuildFile; fileRef = F8BCE3850BA175A10027E9F6 /* LZRenderedFrameView.m */; };
+                FFFB32650BD1883F00A70269 /* TimelineController.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = FFFB32630BD1883F00A70269 /* TimelineController.h */; };
+                FFFB32660BD1883F00A70269 /* TimelineController.m in Sources */ = {isa = PBXBuildFile; fileRef = FFFB32640BD1883F00A70269 /* TimelineController.m */; };
-/* End PBXBuildFile section */
-
@@ -153 +155 @@
-                                A83D1CF20BAA1EA800E8271A /* LZFrameObject.h in CopyFiles */,
-                                A8B721770BD0C07B004603BE /* LZRect.h in CopyFiles */,
+                                FFFB32650BD1883F00A70269 /* TimelineController.h in CopyFiles */,
-                        );
-                        runOnlyForDeploymentPostprocessing = 0;
@@ -270 +273 @@
-                F8BCE3850BA175A10027E9F6 /* LZRenderedFrameView.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = LZRenderedFrameView.m; path = Src/Interface/LZRenderedFrameView.m; sourceTree = SOURCE_ROOT; };
-                F8ED936B0B913A6D00FB453A /* easylase.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = easylase.h; path = ../ILDAInspector/easylase.h; sourceTree = SOURCE_ROOT; };
+                FFFB32630BD1883F00A70269 /* TimelineController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TimelineController.h; sourceTree = "<group>"; };
+                FFFB32640BD1883F00A70269 /* TimelineController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TimelineController.m; sourceTree = "<group>"; };
-/* End PBXFileReference section */
-
@@ -293 +298 @@
-                        isa = PBXGroup;
-                        children = (
+                                FFFB32630BD1883F00A70269 /* TimelineController.h */,
+                                FFFB32640BD1883F00A70269 /* TimelineController.m */,
-                                F8A6D5790B784D9400652C81 /* MainController.h */,
-                                F8A6D57A0B784D9400652C81 /* MainController.m */,
@@ -697 +704 @@
-                                A83D1CF30BAA1EA800E8271A /* LZFrameObject.m in Sources */,
-                                A8B721760BD0C07B004603BE /* LZRect.m in Sources */,
+                                FFFB32660BD1883F00A70269 /* TimelineController.m in Sources */,
-                        );
-                        runOnlyForDeploymentPostprocessing = 0;

trunk/LaserLine_2.0/Src/MainController.h

@@ -4 +4 @@
-@class OutputController, TLView, LZTimeline, LZSplitView, LZControlView;
-@class LZRenderedFrameView, LZSequenceableElement, LZLayer;
+@class TimelineController;
-
-@interface MainController : NSObject {
-        IBOutlet TLView *timelineView;
-        IBOutlet LZSplitView *splitViewBottom;
-        IBOutlet LZSplitView *splitViewTop;
-        IBOutlet LZControlView *controlView;
-        
-        IBOutlet LZRenderedFrameView *renderView;
-        
-
+
+
-        LZLayer *layer;
-        OutputController *output;

trunk/LaserLine_2.0/Src/MainController.m

@@ -25 +25 @@
-        self = [super init];
-        if(self) {
-timeline = [[LZTimeline alloc] init
+LZTimeline *timeline = [timelineController timeline
-                layer = [[LZLayer alloc] init];
-
+
-                [timeline addTrack:[LZTrack track]];
-                [[[timeline tracks] objectAtIndex:0] addLayer:layer];
@@ -64 +64 @@
-- (void)dealloc {
-        [output release];
-        [timeline release];
-        [super dealloc];
-}