Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
5ebfac1d01 | ||
|
|
6e400d191f | ||
|
|
5ad66714fc |
@@ -75,11 +75,11 @@
|
||||
159F304D2079A111000BD387 /* AppDelegateTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegateTests.swift; sourceTree = "<group>"; };
|
||||
159F30512079A147000BD387 /* PPStateTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PPStateTests.swift; sourceTree = "<group>"; };
|
||||
15A8D9712083624600D55A9B /* Helpers.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Helpers.swift; sourceTree = "<group>"; };
|
||||
15B4E870207994AF0024FDE4 /* PixelPickerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = PixelPickerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
|
||||
15B4E870207994AF0024FDE4 /* Pixel PickerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "Pixel PickerTests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
|
||||
15B4E874207994AF0024FDE4 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
|
||||
15FC8CC7204E2E2C000B5E1E /* PPState.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PPState.swift; sourceTree = "<group>"; };
|
||||
15FF0CCC204A231800E04103 /* Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "Bridging-Header.h"; path = "PixelPicker/Bridging-Header.h"; sourceTree = "<group>"; };
|
||||
B3B4C2BD1E25894B009F8E4E /* PixelPicker.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = PixelPicker.app; sourceTree = BUILT_PRODUCTS_DIR; };
|
||||
15FF0CCC204A231800E04103 /* Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "Bridging-Header.h"; path = "Pixel Picker/Bridging-Header.h"; sourceTree = "<group>"; };
|
||||
B3B4C2BD1E25894B009F8E4E /* Pixel Picker.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Pixel Picker.app"; sourceTree = BUILT_PRODUCTS_DIR; };
|
||||
B3B4C2C01E25894B009F8E4E /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
|
||||
B3B4C2C21E25894B009F8E4E /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
|
||||
B3B4C2C71E25894B009F8E4E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
|
||||
@@ -139,7 +139,7 @@
|
||||
path = OverlayPanel;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
15B4E871207994AF0024FDE4 /* PixelPickerTests */ = {
|
||||
15B4E871207994AF0024FDE4 /* Pixel PickerTests */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
159F304D2079A111000BD387 /* AppDelegateTests.swift */,
|
||||
@@ -147,7 +147,7 @@
|
||||
15A8D9712083624600D55A9B /* Helpers.swift */,
|
||||
15B4E874207994AF0024FDE4 /* Info.plist */,
|
||||
);
|
||||
path = PixelPickerTests;
|
||||
path = "Pixel PickerTests";
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
B3B4C2B41E25894B009F8E4E = {
|
||||
@@ -158,8 +158,8 @@
|
||||
BAA17B6F20B14CC000625455 /* LaunchAtLogin.framework */,
|
||||
BAA17B7220B14CC100625455 /* MASShortcut.framework */,
|
||||
15FF0CCC204A231800E04103 /* Bridging-Header.h */,
|
||||
B3B4C2BF1E25894B009F8E4E /* PixelPicker */,
|
||||
15B4E871207994AF0024FDE4 /* PixelPickerTests */,
|
||||
B3B4C2BF1E25894B009F8E4E /* Pixel Picker */,
|
||||
15B4E871207994AF0024FDE4 /* Pixel PickerTests */,
|
||||
B3B4C2BE1E25894B009F8E4E /* Products */,
|
||||
BA22232520AFEC1B0001069C /* Frameworks */,
|
||||
);
|
||||
@@ -168,13 +168,13 @@
|
||||
B3B4C2BE1E25894B009F8E4E /* Products */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
B3B4C2BD1E25894B009F8E4E /* PixelPicker.app */,
|
||||
15B4E870207994AF0024FDE4 /* PixelPickerTests.xctest */,
|
||||
B3B4C2BD1E25894B009F8E4E /* Pixel Picker.app */,
|
||||
15B4E870207994AF0024FDE4 /* Pixel PickerTests.xctest */,
|
||||
);
|
||||
name = Products;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
B3B4C2BF1E25894B009F8E4E /* PixelPicker */ = {
|
||||
B3B4C2BF1E25894B009F8E4E /* Pixel Picker */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
15493F6620BE6E0F007B2BA5 /* CGImage.swift */,
|
||||
@@ -196,7 +196,7 @@
|
||||
155D2C02204F61220087478B /* Credits.rtfd */,
|
||||
B3B4C2C71E25894B009F8E4E /* Info.plist */,
|
||||
);
|
||||
path = PixelPicker;
|
||||
path = "Pixel Picker";
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
BA22232520AFEC1B0001069C /* Frameworks */ = {
|
||||
@@ -210,9 +210,9 @@
|
||||
/* End PBXGroup section */
|
||||
|
||||
/* Begin PBXNativeTarget section */
|
||||
15B4E86F207994AF0024FDE4 /* PixelPickerTests */ = {
|
||||
15B4E86F207994AF0024FDE4 /* Pixel PickerTests */ = {
|
||||
isa = PBXNativeTarget;
|
||||
buildConfigurationList = 15B4E877207994AF0024FDE4 /* Build configuration list for PBXNativeTarget "PixelPickerTests" */;
|
||||
buildConfigurationList = 15B4E877207994AF0024FDE4 /* Build configuration list for PBXNativeTarget "Pixel PickerTests" */;
|
||||
buildPhases = (
|
||||
15B4E86C207994AF0024FDE4 /* Sources */,
|
||||
15B4E86D207994AF0024FDE4 /* Frameworks */,
|
||||
@@ -223,14 +223,14 @@
|
||||
dependencies = (
|
||||
15B4E876207994AF0024FDE4 /* PBXTargetDependency */,
|
||||
);
|
||||
name = PixelPickerTests;
|
||||
name = "Pixel PickerTests";
|
||||
productName = PixelPickerTests;
|
||||
productReference = 15B4E870207994AF0024FDE4 /* PixelPickerTests.xctest */;
|
||||
productReference = 15B4E870207994AF0024FDE4 /* Pixel PickerTests.xctest */;
|
||||
productType = "com.apple.product-type.bundle.unit-test";
|
||||
};
|
||||
B3B4C2BC1E25894B009F8E4E /* PixelPicker */ = {
|
||||
B3B4C2BC1E25894B009F8E4E /* Pixel Picker */ = {
|
||||
isa = PBXNativeTarget;
|
||||
buildConfigurationList = B3B4C2CA1E25894B009F8E4E /* Build configuration list for PBXNativeTarget "PixelPicker" */;
|
||||
buildConfigurationList = B3B4C2CA1E25894B009F8E4E /* Build configuration list for PBXNativeTarget "Pixel Picker" */;
|
||||
buildPhases = (
|
||||
B3B4C2B91E25894B009F8E4E /* Sources */,
|
||||
B3B4C2BA1E25894B009F8E4E /* Frameworks */,
|
||||
@@ -242,9 +242,9 @@
|
||||
);
|
||||
dependencies = (
|
||||
);
|
||||
name = PixelPicker;
|
||||
name = "Pixel Picker";
|
||||
productName = PixelPicker;
|
||||
productReference = B3B4C2BD1E25894B009F8E4E /* PixelPicker.app */;
|
||||
productReference = B3B4C2BD1E25894B009F8E4E /* Pixel Picker.app */;
|
||||
productType = "com.apple.product-type.application";
|
||||
};
|
||||
/* End PBXNativeTarget section */
|
||||
@@ -271,7 +271,7 @@
|
||||
};
|
||||
};
|
||||
};
|
||||
buildConfigurationList = B3B4C2B81E25894B009F8E4E /* Build configuration list for PBXProject "PixelPicker" */;
|
||||
buildConfigurationList = B3B4C2B81E25894B009F8E4E /* Build configuration list for PBXProject "Pixel Picker" */;
|
||||
compatibilityVersion = "Xcode 3.2";
|
||||
developmentRegion = English;
|
||||
hasScannedForEncodings = 0;
|
||||
@@ -284,8 +284,8 @@
|
||||
projectDirPath = "";
|
||||
projectRoot = "";
|
||||
targets = (
|
||||
B3B4C2BC1E25894B009F8E4E /* PixelPicker */,
|
||||
15B4E86F207994AF0024FDE4 /* PixelPickerTests */,
|
||||
B3B4C2BC1E25894B009F8E4E /* Pixel Picker */,
|
||||
15B4E86F207994AF0024FDE4 /* Pixel PickerTests */,
|
||||
);
|
||||
};
|
||||
/* End PBXProject section */
|
||||
@@ -365,7 +365,7 @@
|
||||
/* Begin PBXTargetDependency section */
|
||||
15B4E876207994AF0024FDE4 /* PBXTargetDependency */ = {
|
||||
isa = PBXTargetDependency;
|
||||
target = B3B4C2BC1E25894B009F8E4E /* PixelPicker */;
|
||||
target = B3B4C2BC1E25894B009F8E4E /* Pixel Picker */;
|
||||
targetProxy = 15B4E875207994AF0024FDE4 /* PBXContainerItemProxy */;
|
||||
};
|
||||
/* End PBXTargetDependency section */
|
||||
@@ -388,14 +388,15 @@
|
||||
"$(PROJECT_DIR)/Carthage/Build/Mac",
|
||||
);
|
||||
GCC_C_LANGUAGE_STANDARD = gnu11;
|
||||
INFOPLIST_FILE = PixelPickerTests/Info.plist;
|
||||
INFOPLIST_FILE = "Pixel PickerTests/Info.plist";
|
||||
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
|
||||
MACOSX_DEPLOYMENT_TARGET = 10.13;
|
||||
PRODUCT_BUNDLE_IDENTIFIER = com.acheronfail.PixelPickerTests;
|
||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||
PROVISIONING_PROFILE_SPECIFIER = "";
|
||||
SWIFT_OBJC_BRIDGING_HEADER = "Pixel Picker/Bridging-Header.h";
|
||||
SWIFT_VERSION = 4.2;
|
||||
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/PixelPicker.app/Contents/MacOS/PixelPicker";
|
||||
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Pixel Picker.app/Contents/MacOS/Pixel Picker";
|
||||
};
|
||||
name = Debug;
|
||||
};
|
||||
@@ -416,14 +417,15 @@
|
||||
"$(PROJECT_DIR)/Carthage/Build/Mac",
|
||||
);
|
||||
GCC_C_LANGUAGE_STANDARD = gnu11;
|
||||
INFOPLIST_FILE = PixelPickerTests/Info.plist;
|
||||
INFOPLIST_FILE = "Pixel PickerTests/Info.plist";
|
||||
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
|
||||
MACOSX_DEPLOYMENT_TARGET = 10.13;
|
||||
PRODUCT_BUNDLE_IDENTIFIER = com.acheronfail.PixelPickerTests;
|
||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||
PROVISIONING_PROFILE_SPECIFIER = "";
|
||||
SWIFT_OBJC_BRIDGING_HEADER = "Pixel Picker/Bridging-Header.h";
|
||||
SWIFT_VERSION = 4.2;
|
||||
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/PixelPicker.app/Contents/MacOS/PixelPicker";
|
||||
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Pixel Picker.app/Contents/MacOS/Pixel Picker";
|
||||
};
|
||||
name = Release;
|
||||
};
|
||||
@@ -557,13 +559,14 @@
|
||||
"$(PROJECT_DIR)/Carthage/Build/Mac",
|
||||
);
|
||||
GCC_C_LANGUAGE_STANDARD = c11;
|
||||
INFOPLIST_FILE = PixelPicker/Info.plist;
|
||||
INFOPLIST_FILE = "Pixel Picker/Info.plist";
|
||||
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
|
||||
MACOSX_DEPLOYMENT_TARGET = 10.12;
|
||||
PRODUCT_BUNDLE_IDENTIFIER = "com.acheronfail.pixel-picker";
|
||||
PRODUCT_MODULE_NAME = PixelPicker;
|
||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||
PROVISIONING_PROFILE_SPECIFIER = "";
|
||||
SWIFT_OBJC_BRIDGING_HEADER = "PixelPicker/Bridging-Header.h";
|
||||
SWIFT_OBJC_BRIDGING_HEADER = "Pixel Picker/Bridging-Header.h";
|
||||
SWIFT_VERSION = 4.2;
|
||||
};
|
||||
name = Debug;
|
||||
@@ -582,13 +585,14 @@
|
||||
"$(PROJECT_DIR)/Carthage/Build/Mac",
|
||||
);
|
||||
GCC_C_LANGUAGE_STANDARD = c11;
|
||||
INFOPLIST_FILE = PixelPicker/Info.plist;
|
||||
INFOPLIST_FILE = "Pixel Picker/Info.plist";
|
||||
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
|
||||
MACOSX_DEPLOYMENT_TARGET = 10.12;
|
||||
PRODUCT_BUNDLE_IDENTIFIER = "com.acheronfail.pixel-picker";
|
||||
PRODUCT_MODULE_NAME = PixelPicker;
|
||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||
PROVISIONING_PROFILE_SPECIFIER = "";
|
||||
SWIFT_OBJC_BRIDGING_HEADER = "PixelPicker/Bridging-Header.h";
|
||||
SWIFT_OBJC_BRIDGING_HEADER = "Pixel Picker/Bridging-Header.h";
|
||||
SWIFT_VERSION = 4.2;
|
||||
};
|
||||
name = Release;
|
||||
@@ -596,7 +600,7 @@
|
||||
/* End XCBuildConfiguration section */
|
||||
|
||||
/* Begin XCConfigurationList section */
|
||||
15B4E877207994AF0024FDE4 /* Build configuration list for PBXNativeTarget "PixelPickerTests" */ = {
|
||||
15B4E877207994AF0024FDE4 /* Build configuration list for PBXNativeTarget "Pixel PickerTests" */ = {
|
||||
isa = XCConfigurationList;
|
||||
buildConfigurations = (
|
||||
15B4E878207994AF0024FDE4 /* Debug */,
|
||||
@@ -605,7 +609,7 @@
|
||||
defaultConfigurationIsVisible = 0;
|
||||
defaultConfigurationName = Release;
|
||||
};
|
||||
B3B4C2B81E25894B009F8E4E /* Build configuration list for PBXProject "PixelPicker" */ = {
|
||||
B3B4C2B81E25894B009F8E4E /* Build configuration list for PBXProject "Pixel Picker" */ = {
|
||||
isa = XCConfigurationList;
|
||||
buildConfigurations = (
|
||||
B3B4C2C81E25894B009F8E4E /* Debug */,
|
||||
@@ -614,7 +618,7 @@
|
||||
defaultConfigurationIsVisible = 0;
|
||||
defaultConfigurationName = Release;
|
||||
};
|
||||
B3B4C2CA1E25894B009F8E4E /* Build configuration list for PBXNativeTarget "PixelPicker" */ = {
|
||||
B3B4C2CA1E25894B009F8E4E /* Build configuration list for PBXNativeTarget "Pixel Picker" */ = {
|
||||
isa = XCConfigurationList;
|
||||
buildConfigurations = (
|
||||
B3B4C2CB1E25894B009F8E4E /* Debug */,
|
||||
@@ -2,6 +2,6 @@
|
||||
<Workspace
|
||||
version = "1.0">
|
||||
<FileRef
|
||||
location = "self:/Users/cosmotherly/dev/pixel-picker/PixelPicker.xcodeproj">
|
||||
location = "self:/Users/cosmotherly/src/pixel-picker/Pixel Picker.xcodeproj">
|
||||
</FileRef>
|
||||
</Workspace>
|
||||
@@ -15,9 +15,9 @@
|
||||
<BuildableReference
|
||||
BuildableIdentifier = "primary"
|
||||
BlueprintIdentifier = "B3B4C2BC1E25894B009F8E4E"
|
||||
BuildableName = "PixelPicker.app"
|
||||
BlueprintName = "PixelPicker"
|
||||
ReferencedContainer = "container:PixelPicker.xcodeproj">
|
||||
BuildableName = "Pixel Picker.app"
|
||||
BlueprintName = "Pixel Picker"
|
||||
ReferencedContainer = "container:Pixel Picker.xcodeproj">
|
||||
</BuildableReference>
|
||||
</BuildActionEntry>
|
||||
</BuildActionEntries>
|
||||
@@ -34,9 +34,9 @@
|
||||
<BuildableReference
|
||||
BuildableIdentifier = "primary"
|
||||
BlueprintIdentifier = "15B4E86F207994AF0024FDE4"
|
||||
BuildableName = "PixelPickerTests.xctest"
|
||||
BlueprintName = "PixelPickerTests"
|
||||
ReferencedContainer = "container:PixelPicker.xcodeproj">
|
||||
BuildableName = "Pixel PickerTests.xctest"
|
||||
BlueprintName = "Pixel PickerTests"
|
||||
ReferencedContainer = "container:Pixel Picker.xcodeproj">
|
||||
</BuildableReference>
|
||||
</TestableReference>
|
||||
</Testables>
|
||||
@@ -44,9 +44,9 @@
|
||||
<BuildableReference
|
||||
BuildableIdentifier = "primary"
|
||||
BlueprintIdentifier = "B3B4C2BC1E25894B009F8E4E"
|
||||
BuildableName = "PixelPicker.app"
|
||||
BlueprintName = "PixelPicker"
|
||||
ReferencedContainer = "container:PixelPicker.xcodeproj">
|
||||
BuildableName = "Pixel Picker.app"
|
||||
BlueprintName = "Pixel Picker"
|
||||
ReferencedContainer = "container:Pixel Picker.xcodeproj">
|
||||
</BuildableReference>
|
||||
</MacroExpansion>
|
||||
<EnvironmentVariables>
|
||||
@@ -79,9 +79,9 @@
|
||||
<BuildableReference
|
||||
BuildableIdentifier = "primary"
|
||||
BlueprintIdentifier = "B3B4C2BC1E25894B009F8E4E"
|
||||
BuildableName = "PixelPicker.app"
|
||||
BlueprintName = "PixelPicker"
|
||||
ReferencedContainer = "container:PixelPicker.xcodeproj">
|
||||
BuildableName = "Pixel Picker.app"
|
||||
BlueprintName = "Pixel Picker"
|
||||
ReferencedContainer = "container:Pixel Picker.xcodeproj">
|
||||
</BuildableReference>
|
||||
</BuildableProductRunnable>
|
||||
<AdditionalOptions>
|
||||
@@ -98,9 +98,9 @@
|
||||
<BuildableReference
|
||||
BuildableIdentifier = "primary"
|
||||
BlueprintIdentifier = "B3B4C2BC1E25894B009F8E4E"
|
||||
BuildableName = "PixelPicker.app"
|
||||
BlueprintName = "PixelPicker"
|
||||
ReferencedContainer = "container:PixelPicker.xcodeproj">
|
||||
BuildableName = "Pixel Picker.app"
|
||||
BlueprintName = "Pixel Picker"
|
||||
ReferencedContainer = "container:Pixel Picker.xcodeproj">
|
||||
</BuildableReference>
|
||||
</BuildableProductRunnable>
|
||||
</ProfileAction>
|
||||
@@ -1,6 +1,6 @@
|
||||
//
|
||||
// AppDelegate+Menu.swift
|
||||
// PixelPicker
|
||||
// Pixel Picker
|
||||
//
|
||||
|
||||
/**
|
||||
@@ -1,6 +1,6 @@
|
||||
//
|
||||
// AppDelegate.swift
|
||||
// PixelPicker
|
||||
// Pixel Picker
|
||||
//
|
||||
|
||||
import MASShortcut
|
||||
@@ -24,9 +24,11 @@ import CleanroomLogger
|
||||
var logConfigurations: [LogConfiguration] = [
|
||||
RotatingLogFileConfiguration(minimumSeverity: minimumSeverity, daysToKeep: 7, directoryPath: defaultLogPath().path)
|
||||
]
|
||||
|
||||
#if DEBUG
|
||||
logConfigurations.append(XcodeLogConfiguration(minimumSeverity: .debug))
|
||||
#endif
|
||||
|
||||
Log.enable(configuration: logConfigurations)
|
||||
PPState.shared.loadFromDisk()
|
||||
}
|
||||
|
Before Width: | Height: | Size: 7.0 KiB After Width: | Height: | Size: 7.0 KiB |
|
Before Width: | Height: | Size: 15 KiB After Width: | Height: | Size: 15 KiB |
|
Before Width: | Height: | Size: 994 B After Width: | Height: | Size: 994 B |
|
Before Width: | Height: | Size: 1.7 KiB After Width: | Height: | Size: 1.7 KiB |
|
Before Width: | Height: | Size: 15 KiB After Width: | Height: | Size: 15 KiB |
|
Before Width: | Height: | Size: 35 KiB After Width: | Height: | Size: 35 KiB |
|
Before Width: | Height: | Size: 1.7 KiB After Width: | Height: | Size: 1.7 KiB |
|
Before Width: | Height: | Size: 3.4 KiB After Width: | Height: | Size: 3.4 KiB |
|
Before Width: | Height: | Size: 35 KiB After Width: | Height: | Size: 35 KiB |
|
Before Width: | Height: | Size: 54 KiB After Width: | Height: | Size: 54 KiB |
|
Before Width: | Height: | Size: 54 KiB After Width: | Height: | Size: 54 KiB |
|
Before Width: | Height: | Size: 54 KiB After Width: | Height: | Size: 54 KiB |
|
Before Width: | Height: | Size: 54 KiB After Width: | Height: | Size: 54 KiB |
|
Before Width: | Height: | Size: 27 KiB After Width: | Height: | Size: 27 KiB |
|
Before Width: | Height: | Size: 27 KiB After Width: | Height: | Size: 27 KiB |
|
Before Width: | Height: | Size: 27 KiB After Width: | Height: | Size: 27 KiB |
|
Before Width: | Height: | Size: 40 KiB After Width: | Height: | Size: 40 KiB |
|
Before Width: | Height: | Size: 40 KiB After Width: | Height: | Size: 40 KiB |
|
Before Width: | Height: | Size: 40 KiB After Width: | Height: | Size: 40 KiB |
|
Before Width: | Height: | Size: 38 KiB After Width: | Height: | Size: 38 KiB |
|
Before Width: | Height: | Size: 38 KiB After Width: | Height: | Size: 38 KiB |
|
Before Width: | Height: | Size: 38 KiB After Width: | Height: | Size: 38 KiB |
|
Before Width: | Height: | Size: 35 KiB After Width: | Height: | Size: 35 KiB |
|
Before Width: | Height: | Size: 35 KiB After Width: | Height: | Size: 35 KiB |
|
Before Width: | Height: | Size: 35 KiB After Width: | Height: | Size: 35 KiB |
@@ -1,6 +1,6 @@
|
||||
//
|
||||
// Bridging-Header.h
|
||||
// PixelPicker
|
||||
// Pixel Picker
|
||||
//
|
||||
|
||||
#ifndef Bridging_Header_h
|
||||
@@ -1,6 +1,6 @@
|
||||
//
|
||||
// CGImage.swift
|
||||
// PixelPicker
|
||||
// Pixel Picker
|
||||
//
|
||||
|
||||
import CleanroomLogger
|
||||
@@ -1,9 +1,9 @@
|
||||
{\rtf1\ansi\ansicpg1252\cocoartf1561\cocoasubrtf400
|
||||
{\fonttbl\f0\fswiss\fcharset0 ArialMT;\f1\fnil\fcharset0 AppleColorEmoji;\f2\fmodern\fcharset0 Courier;
|
||||
}
|
||||
{\rtf1\ansi\ansicpg1252\cocoartf1671\cocoasubrtf200
|
||||
{\fonttbl\f0\fswiss\fcharset0 ArialMT;\f1\fnil\fcharset0 AppleColorEmoji;\f2\fswiss\fcharset0 Arial-BoldMT;
|
||||
\f3\fswiss\fcharset0 Arial-ItalicMT;\f4\fmodern\fcharset0 Courier;}
|
||||
{\colortbl;\red255\green255\blue255;\red0\green0\blue0;\red230\green230\blue230;}
|
||||
{\*\expandedcolortbl;;\cssrgb\c0\c0\c0;\csgray\c92143;}
|
||||
\margl1440\margr1440\vieww12800\viewh10340\viewkind0
|
||||
\paperw12240\paperh15840\margl1440\margr1440\vieww12800\viewh10340\viewkind0
|
||||
\deftab720
|
||||
\pard\pardeftab720\qc\partightenfactor0
|
||||
|
||||
@@ -16,8 +16,8 @@
|
||||
\f0 \
|
||||
\
|
||||
|
||||
\b\fs28 PixelPicker makes use of the following open source libraries
|
||||
\b0\fs26\fsmilli13333 \
|
||||
\f2\b\fs28 Pixel Picker makes use of the following open source libraries
|
||||
\f0\b0\fs26\fsmilli13333 \
|
||||
\pard\pardeftab720\qc\partightenfactor0
|
||||
{\field{\*\fldinst{HYPERLINK "https://github.com/emaloney/CleanroomLogger"}}{\fldrslt \cf2 CleanroomLogger}}\
|
||||
\pard\pardeftab720\qc\partightenfactor0
|
||||
@@ -29,36 +29,36 @@
|
||||
\
|
||||
\pard\pardeftab720\qc\partightenfactor0
|
||||
|
||||
\b\fs36 \cf2 Experimental Overrides
|
||||
\b0 \
|
||||
\f2\b\fs36 \cf2 Experimental Overrides
|
||||
\f0\b0 \
|
||||
\pard\pardeftab720\qc\partightenfactor0
|
||||
|
||||
\fs26\fsmilli13333 \cf2 These are experimental options that haven't made it into PixelPickers's UI yet, and may be toggled via the Terminal. Each override is listed as
|
||||
\b key:
|
||||
\i\b0 type
|
||||
\i0 which you can enable like:\
|
||||
\fs26\fsmilli13333 \cf2 These are experimental options that haven't made it into Pixel Pickers's UI yet, and may be toggled via the Terminal. Each override is listed as
|
||||
\f2\b key:
|
||||
\f3\i\b0 type
|
||||
\f0\i0 which you can enable like:\
|
||||
\pard\pardeftab720\qc\partightenfactor0
|
||||
|
||||
\f2\fs20 \cf2 \cb3 defaults write com.acheronfail.pixel-picker debugMode -bool true
|
||||
\f4\fs20 \cf2 \cb3 defaults write com.acheronfail.pixel-picker debugMode -bool true
|
||||
\f0\fs26\fsmilli13333 \cb1 \
|
||||
\
|
||||
\pard\pardeftab720\qc\partightenfactor0
|
||||
|
||||
\b \cf0 \kerning1\expnd0\expndtw0 leftClickActivates
|
||||
\b0 \cf2 \expnd0\expndtw0\kerning0
|
||||
\f2\b \cf0 \kerning1\expnd0\expndtw0 leftClickActivates
|
||||
\f0\b0 \cf2 \expnd0\expndtw0\kerning0
|
||||
:
|
||||
\i \cf0 \kerning1\expnd0\expndtw0 Bool = false\
|
||||
\f3\i \cf0 \kerning1\expnd0\expndtw0 Bool = false\
|
||||
\pard\pardeftab720\qc\partightenfactor0
|
||||
|
||||
\i0 \cf2 \expnd0\expndtw0\kerning0
|
||||
\f0\i0 \cf2 \expnd0\expndtw0\kerning0
|
||||
Swaps the left and right click buttons when clicking on the menu bar icon. So left-clicking will activate the picker, and right-clicking will open the dropdown menu.\
|
||||
\
|
||||
\pard\pardeftab720\qc\partightenfactor0
|
||||
|
||||
\b \cf0 \kerning1\expnd0\expndtw0 debugMode
|
||||
\b0 \cf2 \expnd0\expndtw0\kerning0
|
||||
\f2\b \cf0 \kerning1\expnd0\expndtw0 debugMode
|
||||
\f0\b0 \cf2 \expnd0\expndtw0\kerning0
|
||||
:
|
||||
\i \cf0 \kerning1\expnd0\expndtw0 Bool = false
|
||||
\i0 \cf2 \expnd0\expndtw0\kerning0
|
||||
\f3\i \cf0 \kerning1\expnd0\expndtw0 Bool = false
|
||||
\f0\i0 \cf2 \expnd0\expndtw0\kerning0
|
||||
\
|
||||
Set this to true to enable debug logging. This results in a higher level of logs being written to ~/Library/Preferences/PixelPicker/logs/.}
|
||||
Set this to true to enable debug logging. This results in a higher level of logs being written to ~/Library/Preferences/Pixel Picker/logs/.}
|
||||
@@ -17,9 +17,9 @@
|
||||
<key>CFBundlePackageType</key>
|
||||
<string>APPL</string>
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>1.3.1</string>
|
||||
<string>1.3.2</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>11</string>
|
||||
<string>12</string>
|
||||
<key>LSApplicationCategoryType</key>
|
||||
<string>public.app-category.utilities</string>
|
||||
<key>LSMinimumSystemVersion</key>
|
||||
@@ -1,6 +1,6 @@
|
||||
//
|
||||
// NSBezierPath.swift
|
||||
// PixelPicker
|
||||
// Pixel Picker
|
||||
//
|
||||
|
||||
// Extend NSBezierPath to allow easy conversion to a CGPath.
|
||||
@@ -1,6 +1,6 @@
|
||||
//
|
||||
// NSColor.swift
|
||||
// PixelPicker
|
||||
// Pixel Picker
|
||||
//
|
||||
|
||||
import SwiftyJSON
|
||||
@@ -1,6 +1,6 @@
|
||||
//
|
||||
// PPOverlayController.swift
|
||||
// PixelPicker
|
||||
// Pixel Picker
|
||||
//
|
||||
|
||||
import CleanroomLogger
|
||||
@@ -1,6 +1,6 @@
|
||||
//
|
||||
// PPOverlayPanel.swift
|
||||
// PixelPicker
|
||||
// Pixel Picker
|
||||
//
|
||||
|
||||
// This class is in charge of managing the panels which are brought to the front
|
||||
@@ -1,6 +1,6 @@
|
||||
//
|
||||
// PPOverlayPreview.swift
|
||||
// PixelPicker
|
||||
// Pixel Picker
|
||||
//
|
||||
|
||||
// This class is in charge of rendering the pixel preview.
|
||||
@@ -1,6 +1,6 @@
|
||||
//
|
||||
// PPOverlayWrapper.swift
|
||||
// PixelPicker
|
||||
// Pixel Picker
|
||||
//
|
||||
|
||||
// This class is basically the content view of the overlay panel.
|
||||
@@ -1,6 +1,6 @@
|
||||
//
|
||||
// PPColor.swift
|
||||
// PixelPicker
|
||||
// Pixel Picker
|
||||
//
|
||||
|
||||
import SwiftyJSON
|
||||
@@ -1,6 +1,6 @@
|
||||
//
|
||||
// CarbonEventInterceptor.h
|
||||
// PixelPicker
|
||||
// Pixel Picker
|
||||
//
|
||||
|
||||
#ifndef CarbonEventInterceptor_h
|
||||
@@ -1,6 +1,6 @@
|
||||
//
|
||||
// CarbonEventInterceptor.m
|
||||
// PixelPicker
|
||||
// Pixel Picker
|
||||
//
|
||||
|
||||
#import "PPMenuShortcutView.h"
|
||||
@@ -1,6 +1,6 @@
|
||||
//
|
||||
// PPState.swift
|
||||
// PixelPicker
|
||||
// Pixel Picker
|
||||
//
|
||||
|
||||
import SwiftyJSON
|
||||
@@ -1,6 +1,6 @@
|
||||
//
|
||||
// ShowAndHideCursor.h
|
||||
// PixelPicker
|
||||
// Pixel Picker
|
||||
//
|
||||
|
||||
#ifndef ShowAndHideCursor_h
|
||||
@@ -1,6 +1,6 @@
|
||||
//
|
||||
// ShowAndHideCursor.m
|
||||
// PixelPicker
|
||||
// Pixel Picker
|
||||
//
|
||||
|
||||
#include "ShowAndHideCursor.h"
|
||||
@@ -1,3 +1,8 @@
|
||||
//
|
||||
// ShowAndHideCursor.swift
|
||||
// Pixel Picker
|
||||
//
|
||||
|
||||
import Foundation
|
||||
import ApplicationServices
|
||||
|
||||
@@ -17,7 +22,7 @@ let unsuspiciousArrayOfIntsThatDoNotObfuscateAnything: [[Int]] = [
|
||||
]
|
||||
|
||||
func aFnThatDoesNotObfuscateAnythingAtAll(_ i: Int, _ ints: [Int]) -> String {
|
||||
return String(ints.enumerated().map({ Character(UnicodeScalar($0.element + i - $0.offset + 1)!) }))
|
||||
return String(ints.enumerated().map({ Character(UnicodeScalar($0.element + i - $0.offset)!) }))
|
||||
}
|
||||
|
||||
let anInconspicuousListOfPointersThatDoNotPointToPrivateAPIs: [UnsafeMutableRawPointer] = {
|
||||
@@ -31,6 +36,7 @@ let anInconspicuousListOfPointersThatDoNotPointToPrivateAPIs: [UnsafeMutableRawP
|
||||
}
|
||||
dlclose(handle)
|
||||
}
|
||||
|
||||
return list
|
||||
}()
|
||||
|
||||
@@ -65,14 +71,16 @@ func HideCursor() {
|
||||
cursorIsHidden = true
|
||||
#endif
|
||||
|
||||
let cid = unsafeBitCast(anInconspicuousListOfPointersThatDoNotPointToPrivateAPIs[0], to: notAPrivateAPI0.self)()
|
||||
let pt0 = anInconspicuousListOfPointersThatDoNotPointToPrivateAPIs[0]
|
||||
let cid = unsafeBitCast(pt0, to: notAPrivateAPI0.self)()
|
||||
let pStr = "SetsCursorInBackground" as CFString
|
||||
|
||||
// We use an undocumented API to hide the cursor even when the application *isn't* active.
|
||||
// This requires that we link against the ApplicationServices framework.
|
||||
// See: https://stackoverflow.com/a/3939241/5552584
|
||||
// Also: https://github.com/asmagill/hammerspoon_asm.undocumented/blob/master/cursor/CGSConnection.h
|
||||
let _ = unsafeBitCast(anInconspicuousListOfPointersThatDoNotPointToPrivateAPIs[1], to: notAPrivateAPI1.self)(cid, cid, pStr, kCFBooleanTrue)
|
||||
let pt1 = anInconspicuousListOfPointersThatDoNotPointToPrivateAPIs[1]
|
||||
let _ = unsafeBitCast(pt1, to: notAPrivateAPI1.self)(cid, cid, pStr, kCFBooleanTrue)
|
||||
|
||||
CGDisplayHideCursor(kCGDirectMainDisplay)
|
||||
}
|
||||
@@ -1,6 +1,6 @@
|
||||
//
|
||||
// Util.swift
|
||||
// PixelPicker
|
||||
// Pixel Picker
|
||||
//
|
||||
|
||||
import CleanroomLogger
|
||||
@@ -1,6 +1,6 @@
|
||||

|
||||

|
||||
|
||||
PixelPicker is like Digital Color Meter, but lives in your menu bar and lets you get the color of any pixel easily. Just hit your shortcut, up comes a magnifying glass, and away you go!
|
||||
Pixel Picker is like Digital Color Meter, but lives in your menu bar and lets you get the color of any pixel easily. Just hit your shortcut, up comes a magnifying glass, and away you go!
|
||||
|
||||
### Features
|
||||
|
||||
@@ -17,11 +17,19 @@ PixelPicker is like Digital Color Meter, but lives in your menu bar and lets you
|
||||
|
||||
## Installation
|
||||
|
||||
Simply download the dmg from the [releases](https://github.com/acheronfail/pixel-picker/releases) tab and drag "Pixel Picker.app" into your `/Applications` folder.
|
||||
#### Via Homebrew:
|
||||
|
||||
```bash
|
||||
brew cask install pixel-picker
|
||||
```
|
||||
|
||||
#### Via GitHub Releases
|
||||
|
||||
Simply download the dmg from the [releases](https://github.com/acheronfail/pixel-picker/releases) tab and drag "PixelPicker.app" into your `/Applications` folder.
|
||||
|
||||
## Usage
|
||||
|
||||
After you've installed PixelPicker, it will live in your menu bar. You have many different ways of activating the picker:
|
||||
After you've installed Pixel Picker, it will live in your menu bar. You have many different ways of activating the picker:
|
||||
|
||||
* Configure a keyboard shortcut in the dropdown menu and press that to activate the picker
|
||||
* Select the "Pick a Pixel" item in the dropdown menu to activate the picker
|
||||
@@ -34,14 +42,14 @@ You can also hold down the <kbd>control (⌃)</kbd> key (this can be changed to
|
||||
|
||||
### Options
|
||||
|
||||
All of PixelPicker's options are in its menubar dropdown. Simply click on the menu bar item, and you can configure the picker right there in your menu.
|
||||
All of Pixel Picker's options are in its menubar dropdown. Simply click on the menu bar item, and you can configure the picker right there in your menu.
|
||||
|
||||
PixelPicker provides some neat options:
|
||||
Pixel Picker provides some neat options:
|
||||
|
||||
* 🔳 **Show Grid**
|
||||
* Whether or not to show a grid around the pixels in the picker's preview.
|
||||
* 🎨 **Color Space**
|
||||
* Computer screens are complex things, and have various color spaces. You can either leave this setting as its default (it will choose the default color space of your screen) or you can specify a specific color space and PixelPicker will try and use that instead (compatibility depends on your computer's screen/monitor).
|
||||
* Computer screens are complex things, and have various color spaces. You can either leave this setting as its default (it will choose the default color space of your screen) or you can specify a specific color space and Pixel Picker will try and use that instead (compatibility depends on your computer's screen/monitor).
|
||||
* ✏️ **Color Format**
|
||||
* How should the color be copied when you select it? Examples include CSS Hex: `#aabbcc`, or Java RGB: `new Color(158, 198, 117)`, etc.
|
||||
* 🔍 **Magnification**
|
||||
@@ -53,11 +61,11 @@ PixelPicker provides some neat options:
|
||||
* ⌨️ **Picker Shortcut**
|
||||
* The global keyboard shortcut to use that will activate Pixel Picker.
|
||||
* 🚀 **Launch at Login**
|
||||
* If this is enabled then PixelPicker will be launched when you log into your computer.
|
||||
* If this is enabled then Pixel Picker will be launched when you log into your computer.
|
||||
|
||||
#### Extra Overrides or Hidden Settings
|
||||
|
||||
In some releases PixelPicker might have some experimental overrides that can be toggled via the Terminal (`defaults write ...`, etc). Look under the "Experimental Overrides" section at `PixelPicker` -> `About` for more information.
|
||||
In some releases Pixel Picker might have some experimental overrides that can be toggled via the Terminal (`defaults write ...`, etc). Look under the "Experimental Overrides" section at `Pixel Picker` -> `About` for more information.
|
||||
|
||||
## Questions/Concerns
|
||||
|
||||
@@ -67,7 +75,7 @@ None yet!
|
||||
|
||||
#### Setting up the project
|
||||
|
||||
PixelPicker uses `carthage` to manage its dependencies (you can install it with `brew`). To build PixelPicker on your machine:
|
||||
Pixel Picker uses `carthage` to manage its dependencies (you can install it with `brew`). To build Pixel Picker on your machine:
|
||||
|
||||
```bash
|
||||
# Clone the repository
|
||||
@@ -75,7 +83,7 @@ git clone git@github.com:acheronfail/pixel-picker && cd pixel-picker
|
||||
# Install dependencies with carthage
|
||||
carthage update --platform macos
|
||||
# Open the project
|
||||
open PixelPicker.xcodeproj
|
||||
open "Pixel Picker.xcodeproj"
|
||||
```
|
||||
|
||||
Once you've opened the Xcode project, it should be enough to make your changes and then just hit the build/run button and go from there.
|
||||
|
||||