From 8b2510a1cc16e19eb4fb21e5e1000794353ea28b Mon Sep 17 00:00:00 2001 From: Zakk Date: Sat, 21 Mar 2015 09:05:30 -0400 Subject: [PATCH] Added controls for animation of the live feed. Added 'revert' buttons for both live and staging animation controls. --- CocoaSplit.xcodeproj/project.pbxproj | 4 - .../CSAnimationRunner/CSAnimationBase.py | 4 - CocoaSplit/en.lproj/MainMenu.xib | 381 +++++++++++++----- 3 files changed, 281 insertions(+), 108 deletions(-) delete mode 100644 CocoaSplit/CSAnimationRunner/CSAnimationBase.py diff --git a/CocoaSplit.xcodeproj/project.pbxproj b/CocoaSplit.xcodeproj/project.pbxproj index b036593e..687df418 100644 --- a/CocoaSplit.xcodeproj/project.pbxproj +++ b/CocoaSplit.xcodeproj/project.pbxproj @@ -121,7 +121,6 @@ 349461451AAD73BC00F28883 /* TestView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 349461441AAD73BC00F28883 /* TestView.xib */; }; 3494615A1AB4213B00F28883 /* CSAnimationRunner.py in Resources */ = {isa = PBXBuildFile; fileRef = 349461591AB4213B00F28883 /* CSAnimationRunner.py */; }; 3494615C1AB4279300F28883 /* setup.py in Resources */ = {isa = PBXBuildFile; fileRef = 3494615B1AB4279300F28883 /* setup.py */; }; - 349461651AB65BE800F28883 /* CSAnimationBase.py in Resources */ = {isa = PBXBuildFile; fileRef = 349461641AB65BE800F28883 /* CSAnimationBase.py */; }; 349461681ABC57C100F28883 /* CSAnimationItem.m in Sources */ = {isa = PBXBuildFile; fileRef = 349461671ABC57C100F28883 /* CSAnimationItem.m */; }; 349461691ABC73CF00F28883 /* CSAnimationItem.m in Sources */ = {isa = PBXBuildFile; fileRef = 349461671ABC57C100F28883 /* CSAnimationItem.m */; }; 3494616B1ABD1B5900F28883 /* CSAnimationBlock.py in Resources */ = {isa = PBXBuildFile; fileRef = 3494616A1ABD1B5900F28883 /* CSAnimationBlock.py */; }; @@ -535,7 +534,6 @@ 349461571AB41DA000F28883 /* CSAnimationRunnerObj.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CSAnimationRunnerObj.h; sourceTree = ""; }; 349461591AB4213B00F28883 /* CSAnimationRunner.py */ = {isa = PBXFileReference; explicitFileType = text.script.python; fileEncoding = 4; path = CSAnimationRunner.py; sourceTree = ""; }; 3494615B1AB4279300F28883 /* setup.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = setup.py; sourceTree = ""; }; - 349461641AB65BE800F28883 /* CSAnimationBase.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = CSAnimationBase.py; sourceTree = ""; }; 349461661ABC57C100F28883 /* CSAnimationItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CSAnimationItem.h; sourceTree = ""; }; 349461671ABC57C100F28883 /* CSAnimationItem.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CSAnimationItem.m; sourceTree = ""; }; 3494616A1ABD1B5900F28883 /* CSAnimationBlock.py */ = {isa = PBXFileReference; explicitFileType = text.script.python; fileEncoding = 4; path = CSAnimationBlock.py; sourceTree = ""; }; @@ -978,7 +976,6 @@ isa = PBXGroup; children = ( 349461591AB4213B00F28883 /* CSAnimationRunner.py */, - 349461641AB65BE800F28883 /* CSAnimationBase.py */, 3494615B1AB4279300F28883 /* setup.py */, 3494616A1ABD1B5900F28883 /* CSAnimationBlock.py */, 3494616C1ABD399B00F28883 /* CSAnimation.py */, @@ -1529,7 +1526,6 @@ 340FE4B815F3417E00E4CE4E /* MainMenu.xib in Resources */, 3494615C1AB4279300F28883 /* setup.py in Resources */, 34D4351B198BE3B700266169 /* NewLayoutPanel.xib in Resources */, - 349461651AB65BE800F28883 /* CSAnimationBase.py in Resources */, 342B33B61980771200492CB7 /* line.vtsh in Resources */, 3435E39B188B93150015CC01 /* passthrough.vtsh in Resources */, 34B5FCE119BF1C3F00F67D19 /* CreateLayoutViewController.xib in Resources */, diff --git a/CocoaSplit/CSAnimationRunner/CSAnimationBase.py b/CocoaSplit/CSAnimationRunner/CSAnimationBase.py deleted file mode 100644 index 43a5cdf4..00000000 --- a/CocoaSplit/CSAnimationRunner/CSAnimationBase.py +++ /dev/null @@ -1,4 +0,0 @@ -from Quartz import * -from Foundation import * - - diff --git a/CocoaSplit/en.lproj/MainMenu.xib b/CocoaSplit/en.lproj/MainMenu.xib index 742f8db3..d9202e0e 100644 --- a/CocoaSplit/en.lproj/MainMenu.xib +++ b/CocoaSplit/en.lproj/MainMenu.xib @@ -264,18 +264,18 @@ - - - - + + + + - - - - + + + + @@ -285,7 +285,7 @@ - + @@ -299,7 +299,7 @@ - + - - - - - - - - - - @@ -786,7 +776,7 @@ - + @@ -808,7 +798,7 @@ - + @@ -826,7 +816,7 @@ - + @@ -837,7 +827,7 @@ - + @@ -845,7 +835,7 @@ - + @@ -853,7 +843,7 @@ - + @@ -861,7 +851,7 @@ - + @@ -869,7 +859,7 @@ - + @@ -1501,9 +1491,216 @@ - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1568,68 +1765,41 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + @@ -1823,14 +1993,14 @@ - - - - - - - - + + + + + + + + @@ -1841,10 +2011,10 @@ - - - - + + + + @@ -1854,6 +2024,12 @@ + + + + + + @@ -1898,6 +2074,11 @@ + + + + +