This commit fixes some bugs in StyleAttributesEditor and AnimationPat…

…hsPopoverViewController. The README.md file is updated for release 1.1.7.
dsward2 · May 12, 2020 · b723a86 · b723a86
1 parent 5f00dd1
commit b723a86
Show file tree

Hide file tree

Showing 10 changed files with 323 additions and 38 deletions.
diff --git a/LICENSE b/LICENSE
@@ -1,7 +1,7 @@
 
 macSVG 1.1
 
-Copyright ©2011-2019 ArkPhone LLC
+Copyright ©2011-2020 ArkPhone LLC
 
 Designed in Arkansas, USA.
 

diff --git a/...PathElementShapeAnimationEditor/PathElementShapeAnimationEditor.xcodeproj/project.pbxproj b/...PathElementShapeAnimationEditor/PathElementShapeAnimationEditor.xcodeproj/project.pbxproj
@@ -8,6 +8,7 @@
 
 /* Begin PBXBuildFile section */
 		0E3F0F491E446023001FDDD7 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0EEE3AEB17BC03740040846F /* Cocoa.framework */; };
+		0EC200A4246A65E3003E6E1E /* PathSegment.m in Sources */ = {isa = PBXBuildFile; fileRef = 0EC200A3246A65E3003E6E1E /* PathSegment.m */; };
 		0EEE3AF617BC03740040846F /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 0EEE3AF417BC03740040846F /* InfoPlist.strings */; };
 		0EEE3AFF17BC041A0040846F /* PathElementShapeAnimationEditor.m in Sources */ = {isa = PBXBuildFile; fileRef = 0EEE3AFE17BC041A0040846F /* PathElementShapeAnimationEditor.m */; };
 		0EEE3B0817BC34F20040846F /* PathElementShapeAnimationEditor.xib in Resources */ = {isa = PBXBuildFile; fileRef = 0EEE3B0017BC04840040846F /* PathElementShapeAnimationEditor.xib */; };
@@ -18,6 +19,8 @@
 
 /* Begin PBXFileReference section */
 		0E43C7082331F07000F55196 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/PathElementShapeAnimationEditor.xib; sourceTree = "<group>"; };
+		0EC200A2246A65E3003E6E1E /* PathSegment.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PathSegment.h; path = "../../../../macSVG/SVGDocument Classes/PathSegment.h"; sourceTree = "<group>"; };
+		0EC200A3246A65E3003E6E1E /* PathSegment.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = PathSegment.m; path = "../../../../macSVG/SVGDocument Classes/PathSegment.m"; sourceTree = "<group>"; };
 		0ECCB00F1DB4AA86001A6085 /* macSVGPluginConfig.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = macSVGPluginConfig.xcconfig; path = "../../../macSVGPlugin Framework/macSVGPluginConfig.xcconfig"; sourceTree = "<group>"; };
 		0EEE3AE817BC03740040846F /* PathElementShapeAnimationEditor.plugin */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = PathElementShapeAnimationEditor.plugin; sourceTree = BUILT_PRODUCTS_DIR; };
 		0EEE3AEB17BC03740040846F /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
@@ -81,6 +84,8 @@
 				0EEE3B0A17BD46BB0040846F /* AnimatePopoverViewController.m */,
 				0EEE3B0C17BD46DE0040846F /* AnimationPathsPopoverViewController.h */,
 				0EEE3B0D17BD46DE0040846F /* AnimationPathsPopoverViewController.m */,
+				0EC200A2246A65E3003E6E1E /* PathSegment.h */,
+				0EC200A3246A65E3003E6E1E /* PathSegment.m */,
 				0EEE3AF217BC03740040846F /* Supporting Files */,
 			);
 			path = PathElementShapeAnimationEditor;
@@ -168,6 +173,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				0EC200A4246A65E3003E6E1E /* PathSegment.m in Sources */,
 				0EEE3AFF17BC041A0040846F /* PathElementShapeAnimationEditor.m in Sources */,
 				0EEE3B0B17BD46BB0040846F /* AnimatePopoverViewController.m in Sources */,
 				0EEE3B0E17BD46DE0040846F /* AnimationPathsPopoverViewController.m in Sources */,

diff --git a/...hapeAnimationEditor/PathElementShapeAnimationEditor/AnimationPathsPopoverViewController.m b/...hapeAnimationEditor/PathElementShapeAnimationEditor/AnimationPathsPopoverViewController.m
@@ -9,6 +9,7 @@
 #import "AnimationPathsPopoverViewController.h"
 #import "PathElementShapeAnimationEditor.h"
 #import "MacSVGPlugin/MacSVGPluginCallbacks.h"
+#import "PathSegment.h"
 
 @interface AnimationPathsPopoverViewController ()
 
@@ -879,13 +880,10 @@ - (BOOL)pathArray:(NSArray *)pathArray1 matchesPathArray:(NSArray *)pathArray2
     {
         for (NSInteger i = 0; i < pathArray1Count; i++)
         {
-            NSDictionary * pathArray1Dictionary = pathArray1[i];
-            NSDictionary * pathArray2Dictionary = pathArray2[i];
+            PathSegment * pathSegment1 = pathArray1[i];
+            PathSegment * pathSegment2 = pathArray2[i];
 
-            NSString * path1Command = pathArray1Dictionary[@"command"];
-            NSString * path2Command = pathArray2Dictionary[@"command"];
-
-            if ([path1Command isEqualToString:path2Command] == NO)
+            if (pathSegment1.pathCommand != pathSegment2.pathCommand)
             {
                 result = NO;
                 break;

diff --git a/...nimationEditor/PathElementShapeAnimationEditor/PathElementShapeAnimationEditor-Info.plist b/...nimationEditor/PathElementShapeAnimationEditor/PathElementShapeAnimationEditor-Info.plist
@@ -25,6 +25,6 @@
 	<key>NSHumanReadableCopyright</key>
 	<string>Copyright © 2013 ArkPhone LLC. All rights reserved.</string>
 	<key>NSPrincipalClass</key>
-	<string></string>
+	<string>PathElementShapeAnimationEditor</string>
 </dict>
 </plist>
diff --git a/... Projects/macSVG Plugins/StyleAttributeEditor/StyleAttributeEditor/StyleAttributeEditor.h b/... Projects/macSVG Plugins/StyleAttributeEditor/StyleAttributeEditor/StyleAttributeEditor.h
@@ -23,6 +23,8 @@
 @property (strong) NSArray * styleNamesComboArray;
 @property (strong) NSArray * styleValuesComboArray;
 
+@property (strong) NSMutableArray * webColorsArray;
+
 - (IBAction)cancelButtonAction:(id)sender;
 - (IBAction)applyChangesButtonAction:(id)sender;