Merge pull request #63 from matt-curtis/development

1.7 Release
matt-curtis · Dec 3, 2015 · 58f1048 · 58f1048
2 parents 52fb6f2 + bda9c4a
commit 58f1048
Show file tree

Hide file tree

Showing 43 changed files with 320 additions and 49 deletions.
diff --git a/Constraint Demos.sketch b/Constraint Demos.sketch
diff --git a/Fluid.sketchplugin/Contents/Resources/MCSketchBundleLoaderFramework.framework/Headers b/Fluid.sketchplugin/Contents/Resources/MCSketchBundleLoaderFramework.framework/Headers
diff --git a/...Resources/MCSketchBundleLoaderFramework.framework/Headers/MCSketchBundleLoaderFramework.h b/...Resources/MCSketchBundleLoaderFramework.framework/Headers/MCSketchBundleLoaderFramework.h
@@ -0,0 +1,17 @@
+//
+//  MCSketchBundleLoaderFramework.h
+//  MCSketchBundleLoaderFramework
+//
+//  Created by Matt Curtis on 7/22/15.
+//  Copyright (c) 2015 Matt. All rights reserved.
+//
+
+#import <Cocoa/Cocoa.h>
+
+//! Project version number for MCSketchBundleLoaderFramework.
+FOUNDATION_EXPORT double MCSketchBundleLoaderFrameworkVersionNumber;
+
+//! Project version string for MCSketchBundleLoaderFramework.
+FOUNDATION_EXPORT const unsigned char MCSketchBundleLoaderFrameworkVersionString[];
+
+#import "MCSketchBundleLoader.h"
diff --git a/.../Contents/Resources/MCSketchBundleLoaderFramework.framework/MCSketchBundleLoaderFramework b/.../Contents/Resources/MCSketchBundleLoaderFramework.framework/MCSketchBundleLoaderFramework
diff --git a/.../Contents/Resources/MCSketchBundleLoaderFramework.framework/MCSketchBundleLoaderFramework b/.../Contents/Resources/MCSketchBundleLoaderFramework.framework/MCSketchBundleLoaderFramework
diff --git a/Fluid.sketchplugin/Contents/Resources/MCSketchBundleLoaderFramework.framework/Modules b/Fluid.sketchplugin/Contents/Resources/MCSketchBundleLoaderFramework.framework/Modules
diff --git a/...lugin/Contents/Resources/MCSketchBundleLoaderFramework.framework/Modules/module.modulemap b/...lugin/Contents/Resources/MCSketchBundleLoaderFramework.framework/Modules/module.modulemap
@@ -0,0 +1,6 @@
+framework module MCSketchBundleLoaderFramework {
+  umbrella header "MCSketchBundleLoaderFramework.h"
+
+  export *
+  module * { export * }
+}
diff --git a/Fluid.sketchplugin/Contents/Resources/MCSketchBundleLoaderFramework.framework/Resources b/Fluid.sketchplugin/Contents/Resources/MCSketchBundleLoaderFramework.framework/Resources
diff --git a/...tchplugin/Contents/Resources/MCSketchBundleLoaderFramework.framework/Resources/Info.plist b/...tchplugin/Contents/Resources/MCSketchBundleLoaderFramework.framework/Resources/Info.plist
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>BuildMachineOSBuild</key>
+	<string>14F27</string>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>en</string>
+	<key>CFBundleExecutable</key>
+	<string>MCSketchBundleLoaderFramework</string>
+	<key>CFBundleIdentifier</key>
+	<string>matt-curtis.MCSketchBundleLoaderFramework</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>MCSketchBundleLoaderFramework</string>
+	<key>CFBundlePackageType</key>
+	<string>FMWK</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleSupportedPlatforms</key>
+	<array>
+		<string>MacOSX</string>
+	</array>
+	<key>CFBundleVersion</key>
+	<string>1</string>
+	<key>DTCompiler</key>
+	<string>com.apple.compilers.llvm.clang.1_0</string>
+	<key>DTPlatformBuild</key>
+	<string>7A1001</string>
+	<key>DTPlatformVersion</key>
+	<string>GM</string>
+	<key>DTSDKBuild</key>
+	<string>15A278</string>
+	<key>DTSDKName</key>
+	<string>macosx10.11</string>
+	<key>DTXcode</key>
+	<string>0701</string>
+	<key>DTXcodeBuild</key>
+	<string>7A1001</string>
+	<key>NSHumanReadableCopyright</key>
+	<string>Copyright © 2015 Matt. All rights reserved.</string>
+</dict>
+</plist>
diff --git a/....sketchplugin/Contents/Resources/MCSketchBundleLoaderFramework.framework/Versions/Current b/....sketchplugin/Contents/Resources/MCSketchBundleLoaderFramework.framework/Versions/Current
diff --git a/...hBundleLoaderFramework.framework/Versions/Current/Headers/MCSketchBundleLoaderFramework.h b/...hBundleLoaderFramework.framework/Versions/Current/Headers/MCSketchBundleLoaderFramework.h
@@ -0,0 +1,17 @@
+//
+//  MCSketchBundleLoaderFramework.h
+//  MCSketchBundleLoaderFramework
+//
+//  Created by Matt Curtis on 7/22/15.
+//  Copyright (c) 2015 Matt. All rights reserved.
+//
+
+#import <Cocoa/Cocoa.h>
+
+//! Project version number for MCSketchBundleLoaderFramework.
+FOUNDATION_EXPORT double MCSketchBundleLoaderFrameworkVersionNumber;
+
+//! Project version string for MCSketchBundleLoaderFramework.
+FOUNDATION_EXPORT const unsigned char MCSketchBundleLoaderFrameworkVersionString[];
+
+#import "MCSketchBundleLoader.h"
diff --git a/...es/MCSketchBundleLoaderFramework.framework/Versions/Current/MCSketchBundleLoaderFramework b/...es/MCSketchBundleLoaderFramework.framework/Versions/Current/MCSketchBundleLoaderFramework
diff --git a/...sources/MCSketchBundleLoaderFramework.framework/Versions/Current/Modules/module.modulemap b/...sources/MCSketchBundleLoaderFramework.framework/Versions/Current/Modules/module.modulemap
@@ -0,0 +1,6 @@
+framework module MCSketchBundleLoaderFramework {
+  umbrella header "MCSketchBundleLoaderFramework.h"
+
+  export *
+  module * { export * }
+}
diff --git a/...s/Resources/MCSketchBundleLoaderFramework.framework/Versions/Current/Resources/Info.plist b/...s/Resources/MCSketchBundleLoaderFramework.framework/Versions/Current/Resources/Info.plist
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>BuildMachineOSBuild</key>
+	<string>14F27</string>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>en</string>
+	<key>CFBundleExecutable</key>
+	<string>MCSketchBundleLoaderFramework</string>
+	<key>CFBundleIdentifier</key>
+	<string>matt-curtis.MCSketchBundleLoaderFramework</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>MCSketchBundleLoaderFramework</string>
+	<key>CFBundlePackageType</key>
+	<string>FMWK</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleSupportedPlatforms</key>
+	<array>
+		<string>MacOSX</string>
+	</array>
+	<key>CFBundleVersion</key>
+	<string>1</string>
+	<key>DTCompiler</key>
+	<string>com.apple.compilers.llvm.clang.1_0</string>
+	<key>DTPlatformBuild</key>
+	<string>7A1001</string>
+	<key>DTPlatformVersion</key>
+	<string>GM</string>
+	<key>DTSDKBuild</key>
+	<string>15A278</string>
+	<key>DTSDKName</key>
+	<string>macosx10.11</string>
+	<key>DTXcode</key>
+	<string>0701</string>
+	<key>DTXcodeBuild</key>
+	<string>7A1001</string>
+	<key>NSHumanReadableCopyright</key>
+	<string>Copyright © 2015 Matt. All rights reserved.</string>
+</dict>
+</plist>
diff --git a/Fluid.sketchplugin/Contents/Resources/MCSketchConstraints.bundle/Contents/Info.plist b/Fluid.sketchplugin/Contents/Resources/MCSketchConstraints.bundle/Contents/Info.plist
@@ -29,17 +29,17 @@
 	<key>DTCompiler</key>
 	<string>com.apple.compilers.llvm.clang.1_0</string>
 	<key>DTPlatformBuild</key>
-	<string>7B91b</string>
+	<string>7B1005</string>
 	<key>DTPlatformVersion</key>
 	<string>GM</string>
 	<key>DTSDKBuild</key>
 	<string>15A278</string>
 	<key>DTSDKName</key>
 	<string>macosx10.11</string>
 	<key>DTXcode</key>
-	<string>0710</string>
+	<string>0711</string>
 	<key>DTXcodeBuild</key>
-	<string>7B91b</string>
+	<string>7B1005</string>
 	<key>NSHumanReadableCopyright</key>
 	<string>Copyright © 2015 Matt. All rights reserved.</string>
 </dict>

diff --git a/...chplugin/Contents/Resources/MCSketchConstraints.bundle/Contents/MacOS/MCSketchConstraints b/...chplugin/Contents/Resources/MCSketchConstraints.bundle/Contents/MacOS/MCSketchConstraints
diff --git a/....sketchplugin/Contents/Resources/MCSketchConstraints.bundle/Contents/Resources/Assets.car b/....sketchplugin/Contents/Resources/MCSketchConstraints.bundle/Contents/Resources/Assets.car
diff --git a/...urces/MCSketchConstraints.bundle/Contents/Resources/MCArtboardPreviewWindowController.nib b/...urces/MCSketchConstraints.bundle/Contents/Resources/MCArtboardPreviewWindowController.nib
diff --git a/...s/Resources/MCSketchConstraints.bundle/Contents/Resources/MCLayerConstraintsInspector.nib b/...s/Resources/MCSketchConstraints.bundle/Contents/Resources/MCLayerConstraintsInspector.nib
diff --git a/...hplugin/Contents/Resources/MCSketchConstraints.bundle/Contents/Resources/MCSActionBar.nib b/...hplugin/Contents/Resources/MCSketchConstraints.bundle/Contents/Resources/MCSActionBar.nib
diff --git a/...in/Contents/Resources/MCSketchConstraints.bundle/Contents/Resources/MCSSettingsWindow.nib b/...in/Contents/Resources/MCSketchConstraints.bundle/Contents/Resources/MCSSettingsWindow.nib
diff --git a/...ontents/Resources/MCSketchConstraints.bundle/Contents/Resources/MCSizePresetsListView.nib b/...ontents/Resources/MCSketchConstraints.bundle/Contents/Resources/MCSizePresetsListView.nib
diff --git a/...aints.bundle/Contents/Resources/MCSketchPluginFramework.framework/MCSketchPluginFramework b/...aints.bundle/Contents/Resources/MCSketchPluginFramework.framework/MCSketchPluginFramework
diff --git a/...aints.bundle/Contents/Resources/MCSketchPluginFramework.framework/MCSketchPluginFramework b/...aints.bundle/Contents/Resources/MCSketchPluginFramework.framework/MCSketchPluginFramework
diff --git a/...MCSketchConstraints.bundle/Contents/Resources/MCSketchPluginFramework.framework/Resources b/...MCSketchConstraints.bundle/Contents/Resources/MCSketchPluginFramework.framework/Resources
diff --git a/...straints.bundle/Contents/Resources/MCSketchPluginFramework.framework/Resources/Info.plist b/...straints.bundle/Contents/Resources/MCSketchPluginFramework.framework/Resources/Info.plist
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>BuildMachineOSBuild</key>
+	<string>14F27</string>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>en</string>
+	<key>CFBundleExecutable</key>
+	<string>MCSketchPluginFramework</string>
+	<key>CFBundleIdentifier</key>
+	<string>matt-curtis.MCSketchPluginFramework</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>MCSketchPluginFramework</string>
+	<key>CFBundlePackageType</key>
+	<string>FMWK</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleSupportedPlatforms</key>
+	<array>
+		<string>MacOSX</string>
+	</array>
+	<key>CFBundleVersion</key>
+	<string>1</string>
+	<key>DTCompiler</key>
+	<string>com.apple.compilers.llvm.clang.1_0</string>
+	<key>DTPlatformBuild</key>
+	<string>7B1005</string>
+	<key>DTPlatformVersion</key>
+	<string>GM</string>
+	<key>DTSDKBuild</key>
+	<string>15A278</string>
+	<key>DTSDKName</key>
+	<string>macosx10.11</string>
+	<key>DTXcode</key>
+	<string>0711</string>
+	<key>DTXcodeBuild</key>
+	<string>7B1005</string>
+	<key>NSHumanReadableCopyright</key>
+	<string>Copyright © 2015 Matt. All rights reserved.</string>
+</dict>
+</plist>
diff --git a/...nts/Resources/MCSketchPluginFramework.framework/Resources/MCSPluginUpdatePromptWindow.nib b/...nts/Resources/MCSketchPluginFramework.framework/Resources/MCSPluginUpdatePromptWindow.nib
diff --git a/...e/Contents/Resources/MCSketchPluginFramework.framework/Versions/A/MCSketchPluginFramework b/...e/Contents/Resources/MCSketchPluginFramework.framework/Versions/A/MCSketchPluginFramework
diff --git a/...ndle/Contents/Resources/MCSketchPluginFramework.framework/Versions/A/Resources/Info.plist b/...ndle/Contents/Resources/MCSketchPluginFramework.framework/Versions/A/Resources/Info.plist
@@ -29,17 +29,17 @@
 	<key>DTCompiler</key>
 	<string>com.apple.compilers.llvm.clang.1_0</string>
 	<key>DTPlatformBuild</key>
-	<string>7B91b</string>
+	<string>7B1005</string>
 	<key>DTPlatformVersion</key>
 	<string>GM</string>
 	<key>DTSDKBuild</key>
 	<string>15A278</string>
 	<key>DTSDKName</key>
 	<string>macosx10.11</string>
 	<key>DTXcode</key>
-	<string>0710</string>
+	<string>0711</string>
 	<key>DTXcodeBuild</key>
-	<string>7B91b</string>
+	<string>7B1005</string>
 	<key>NSHumanReadableCopyright</key>
 	<string>Copyright © 2015 Matt. All rights reserved.</string>
 </dict>

diff --git a/...es/MCSketchPluginFramework.framework/Versions/A/Resources/MCSPluginUpdatePromptWindow.nib b/...es/MCSketchPluginFramework.framework/Versions/A/Resources/MCSPluginUpdatePromptWindow.nib
diff --git a/...hConstraints.bundle/Contents/Resources/MCSketchPluginFramework.framework/Versions/Current b/...hConstraints.bundle/Contents/Resources/MCSketchPluginFramework.framework/Versions/Current
diff --git a/...ents/Resources/MCSketchPluginFramework.framework/Versions/Current/MCSketchPluginFramework b/...ents/Resources/MCSketchPluginFramework.framework/Versions/Current/MCSketchPluginFramework
diff --git a/...ontents/Resources/MCSketchPluginFramework.framework/Versions/Current/Resources/Info.plist b/...ontents/Resources/MCSketchPluginFramework.framework/Versions/Current/Resources/Info.plist
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>BuildMachineOSBuild</key>
+	<string>14F27</string>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>en</string>
+	<key>CFBundleExecutable</key>
+	<string>MCSketchPluginFramework</string>
+	<key>CFBundleIdentifier</key>
+	<string>matt-curtis.MCSketchPluginFramework</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>MCSketchPluginFramework</string>
+	<key>CFBundlePackageType</key>
+	<string>FMWK</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleSupportedPlatforms</key>
+	<array>
+		<string>MacOSX</string>
+	</array>
+	<key>CFBundleVersion</key>
+	<string>1</string>
+	<key>DTCompiler</key>
+	<string>com.apple.compilers.llvm.clang.1_0</string>
+	<key>DTPlatformBuild</key>
+	<string>7B1005</string>
+	<key>DTPlatformVersion</key>
+	<string>GM</string>
+	<key>DTSDKBuild</key>
+	<string>15A278</string>
+	<key>DTSDKName</key>
+	<string>macosx10.11</string>
+	<key>DTXcode</key>
+	<string>0711</string>
+	<key>DTXcodeBuild</key>
+	<string>7B1005</string>
+	<key>NSHumanReadableCopyright</key>
+	<string>Copyright © 2015 Matt. All rights reserved.</string>
+</dict>
+</plist>
diff --git a/...ketchPluginFramework.framework/Versions/Current/Resources/MCSPluginUpdatePromptWindow.nib b/...ketchPluginFramework.framework/Versions/Current/Resources/MCSPluginUpdatePromptWindow.nib
diff --git a/Fluid.sketchplugin/Contents/Sketch/SketchLibrary.js b/Fluid.sketchplugin/Contents/Sketch/SketchLibrary.js
@@ -43,6 +43,7 @@
 
 	//
 	//	CONTEXT
+	//	-------
 	//
 
 	var ctx;

diff --git a/Fluid.sketchplugin/Contents/Sketch/commands.js b/Fluid.sketchplugin/Contents/Sketch/commands.js
@@ -5,25 +5,37 @@
 //	--------
 
 $.commands.createCommand("toggleToolbarVisiblity", function(ctx){
-	var pluginController = MCSConstraintsPluginController.pluginController_(ctx.command);
+	var pluginController = [MCFluidPluginController pluginController:ctx.plugin pluginCommand:ctx.command];
 
 	pluginController.toggleToolbarVisiblity();
 });
 
 $.commands.createCommand("editConstraints", function(ctx){
-	var pluginController = MCSConstraintsPluginController.pluginController_(ctx.command);
+	var pluginController = [MCFluidPluginController pluginController:ctx.plugin pluginCommand:ctx.command];
 
-	pluginController.showConstriantInspectorUnderMouse();
+	pluginController.showConstraintInspector();
 });
 
 $.commands.createCommand("updateLayout", function(ctx){
-	var pluginController = MCSConstraintsPluginController.pluginController_(ctx.command);
+	var pluginController = [MCFluidPluginController pluginController:ctx.plugin pluginCommand:ctx.command];
 
 	pluginController.updateLayout();
 });
 
 $.commands.createCommand("preview", function(ctx){
-	var pluginController = MCSConstraintsPluginController.pluginController_(ctx.command);
+	var pluginController = [MCFluidPluginController pluginController:ctx.plugin pluginCommand:ctx.command];
 
 	pluginController.preview();
+});
+
+$.commands.createCommand("toggleArtboardSize", function(ctx){
+	var pluginController = [MCFluidPluginController pluginController:ctx.plugin pluginCommand:ctx.command];
+
+	pluginController.showArtboardSizePresetsPopover();
+});
+
+$.commands.createCommand("showSettingsWindow", function(ctx){
+	var pluginController = [MCFluidPluginController pluginController:ctx.plugin pluginCommand:ctx.command];
+
+	pluginController.showSettingsWindow();
 });
diff --git a/Fluid.sketchplugin/Contents/Sketch/main.js b/Fluid.sketchplugin/Contents/Sketch/main.js
@@ -1,11 +1,12 @@
-@import 'SketchLibrary.js'
+@import "SketchLibrary.js"
 
 //	Load Bundle
 
-if($.runtime.classExists("MCSConstraintsPluginController") == false){
+if($.runtime.classExists("MCFluidPluginController") == false){
 	$.runtime.loadBundle($.paths.resourcesPath+"/MCSketchConstraints.bundle");
-}
-
-//	Plugin Methods
-
-//	...
+
+	/*
+		Note to self and whoever else reads these (say hi on twitter :) special word: efficacy):
+		A more robust method for detecting/identifying the existing plugin in the runtime is needed...
+	*/
+}