Skip to content

Commit

Permalink
Add shortcuts to copy functions, see issue #1
Browse files Browse the repository at this point in the history 
Edit build phases to automatically install the color picker when
building.
  • Loading branch information
@viktorstrate
viktorstrate committed Jun 24, 2018
1 parent 6588030 commit 8bf2217
Show file tree
Hide file tree
Showing 4 changed files with 45 additions and 26 deletions.
15 changes: 15 additions & 0 deletions Color Picker Plus.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
objects = {

/* Begin PBXBuildFile section */
344AA57720DFEBEA0045C7B2 /* Color Picker Plus.colorPicker in CopyFiles */ = {isa = PBXBuildFile; fileRef = 3491077020D13DDC0058E50D /* Color Picker Plus.colorPicker */; };
34509CE420D328C400CF78C0 /* RGB.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34509CE320D328C400CF78C0 /* RGB.swift */; };
34509CE620D3293500CF78C0 /* HSV.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34509CE520D3293500CF78C0 /* HSV.swift */; };
34509CEA20D3ADDF00CF78C0 /* Logger.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34509CE920D3ADDF00CF78C0 /* Logger.swift */; };
Expand All @@ -18,6 +19,19 @@
34BC620F20D27DA90093CCFC /* CurrentColorView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34BC620E20D27DA90093CCFC /* CurrentColorView.swift */; };
/* End PBXBuildFile section */

/* Begin PBXCopyFilesBuildPhase section */
344AA57620DFEBB00045C7B2 /* CopyFiles */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
dstPath = "~/Library/ColorPickers";
dstSubfolderSpec = 0;
files = (
344AA57720DFEBEA0045C7B2 /* Color Picker Plus.colorPicker in CopyFiles */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXCopyFilesBuildPhase section */

/* Begin PBXFileReference section */
34509CE320D328C400CF78C0 /* RGB.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RGB.swift; sourceTree = "<group>"; };
34509CE520D3293500CF78C0 /* HSV.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HSV.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -94,6 +108,7 @@
3491076C20D13DDC0058E50D /* Sources */,
3491076D20D13DDC0058E50D /* Frameworks */,
3491076E20D13DDC0058E50D /* Resources */,
344AA57620DFEBB00045C7B2 /* CopyFiles */,
);
buildRules = (
);
Expand Down
Binary file modified ...oj/project.xcworkspace/xcuserdata/viktorstrate.xcuserdatad/UserInterfaceState.xcuserstate
View file
Binary file not shown.
44 changes: 24 additions & 20 deletions Color Picker Plus/ColorPickerPlus.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,10 @@ public class ColorPickerPlus: NSColorPicker, NSColorPickingCustom {
Logger.error(message: "Could not find nib named \(pickerNibName)")
fatalError()
}

radioHue.state = NSControl.StateValue.on

colorGraphicsView.delegate = self

colorGraphicsView.delegate = self
}

return pickerView
Expand Down Expand Up @@ -330,26 +329,31 @@ extension ColorPickerPlus: ChangeColorDelegate {
let copyMenu = copyPopUp.menu!

copyMenu.addItem(withTitle: "Copy", action: nil, keyEquivalent: "")
copyMenu.addItem(withTitle: "HEX - #\(rgb.toHEX())", action: nil, keyEquivalent: "")
copyMenu.addItem(withTitle: "RGB - \(txtRed.stringValue), \(txtGreen.stringValue), \(txtBlue.stringValue)", action: nil, keyEquivalent: "")
copyMenu.addItem(withTitle: "Float RGB - \(floatR), \(floatG), \(floatB)", action: nil, keyEquivalent: "")
copyMenu.addItem(withTitle: "HSV - \(txtHue.stringValue), \(txtSaturation.stringValue), \(txtBrightness.stringValue)", action: nil, keyEquivalent: "")

copyMenu.addItem(withTitle: "HEX - #\(rgb.toHEX())", action: nil, keyEquivalent: "c")

copyMenu.addItem(withTitle: "RGB - \(txtRed.stringValue), \(txtGreen.stringValue), \(txtBlue.stringValue)", action: nil, keyEquivalent: "r")

copyMenu.addItem(withTitle: "Float RGB - \(floatR), \(floatG), \(floatB)", action: nil, keyEquivalent: "R")

copyMenu.addItem(withTitle: "HSV - \(txtHue.stringValue), \(txtSaturation.stringValue), \(txtBrightness.stringValue)", action: nil, keyEquivalent: "H")

copyMenu.addItem(NSMenuItem.separator())

copyMenu.addItem(withTitle: "Web RGB - rgb(\(txtRed.stringValue), \(txtGreen.stringValue), \(txtBlue.stringValue))",
action: nil, keyEquivalent: "")
copyMenu.addItem(withTitle: "Web RGBa - rgba(\(txtRed.stringValue), \(txtGreen.stringValue), \(txtBlue.stringValue), \(txtAlpha.stringValue))", action: nil, keyEquivalent: "")
copyMenu.addItem(withTitle: "Web HSL - hsl(\(txtHue.stringValue), \(txtSaturation.stringValue)%, \(txtBrightness.stringValue)%)", action: nil, keyEquivalent: "")

/*copyPopUp.addItems(withTitles: [
,
,
,
,
,

])*/
let webRGBItem = NSMenuItem(title: "Web RGB - rgb(\(txtRed.stringValue), \(txtGreen.stringValue), \(txtBlue.stringValue))", action: nil, keyEquivalent: "w")
webRGBItem.keyEquivalentModifierMask = [.command, .option]

copyMenu.addItem(webRGBItem)

let webRGBaItem = NSMenuItem(title: "Web RGBa - rgba(\(txtRed.stringValue), \(txtGreen.stringValue), \(txtBlue.stringValue), \(txtAlpha.stringValue))", action: nil, keyEquivalent: "w")
webRGBaItem.keyEquivalentModifierMask = [.command, .shift]

copyMenu.addItem(webRGBaItem)

let webHSLItem = NSMenuItem(title: "Web HSL - hsl(\(txtHue.stringValue), \(txtSaturation.stringValue)%, \(txtBrightness.stringValue)%)", action: nil, keyEquivalent: "w")
webHSLItem.keyEquivalentModifierMask = [.command, .option, .shift]

copyMenu.addItem(webHSLItem)

}

Expand Down
12 changes: 6 additions & 6 deletions Color Picker Plus/ColorPickerPlus.xib
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,14 +81,14 @@
</customSpacing>
</stackView>
<stackView distribution="fill" orientation="horizontal" alignment="top" spacing="6" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="2Bu-Yz-R04">
<rect key="frame" x="8" y="160" width="159" height="86"/>
<rect key="frame" x="0.0" y="160" width="159" height="86"/>
<subviews>
<stackView distribution="fill" orientation="vertical" alignment="leading" spacing="18" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="lfX-l0-tI2" userLabel="Radio Buttons">
<rect key="frame" x="0.0" y="2" width="88" height="84"/>
<subviews>
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="qXH-1l-JWm">
<rect key="frame" x="-1" y="67" width="51" height="18"/>
<buttonCell key="cell" type="radio" title="Hue:" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="YuF-Ui-Z5v">
<buttonCell key="cell" type="radio" title="Hue:" bezelStyle="regularSquare" imagePosition="left" alignment="left" state="on" inset="2" id="YuF-Ui-Z5v">
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
<font key="font" metaFont="system"/>
</buttonCell>
Expand Down Expand Up @@ -234,7 +234,7 @@
</customSpacing>
</stackView>
<stackView distribution="fill" orientation="horizontal" alignment="top" spacing="6" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="lxn-OB-rvi">
<rect key="frame" x="8" y="48" width="95" height="86"/>
<rect key="frame" x="0.0" y="48" width="95" height="86"/>
<subviews>
<stackView distribution="fill" orientation="vertical" alignment="leading" spacing="15" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="muO-Dc-Hpg">
<rect key="frame" x="0.0" y="2" width="41" height="81"/>
Expand Down Expand Up @@ -398,7 +398,7 @@
</customSpacing>
</stackView>
<stackView distribution="fill" orientation="horizontal" alignment="top" spacing="5" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="kdX-rc-sbV">
<rect key="frame" x="111" y="48" width="108" height="22"/>
<rect key="frame" x="103" y="48" width="108" height="22"/>
<subviews>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="N0j-Qs-4Ja">
<rect key="frame" x="-2" y="3" width="43" height="17"/>
Expand Down Expand Up @@ -453,12 +453,12 @@
<constraint firstItem="kdX-rc-sbV" firstAttribute="leading" secondItem="lxn-OB-rvi" secondAttribute="trailing" constant="8" id="7xR-eX-zcD"/>
<constraint firstItem="kdX-rc-sbV" firstAttribute="bottom" secondItem="lxn-OB-rvi" secondAttribute="bottom" id="9gw-bb-qIK"/>
<constraint firstItem="2Bu-Yz-R04" firstAttribute="top" secondItem="620-J9-FsS" secondAttribute="bottom" constant="26" id="F2W-u4-dO9"/>
<constraint firstItem="lxn-OB-rvi" firstAttribute="leading" secondItem="q7Y-uj-GJr" secondAttribute="leading" constant="8" id="J9p-vk-a0p"/>
<constraint firstItem="lxn-OB-rvi" firstAttribute="leading" secondItem="q7Y-uj-GJr" secondAttribute="leading" id="J9p-vk-a0p"/>
<constraint firstAttribute="width" constant="250" id="LUe-tZ-DyW"/>
<constraint firstAttribute="trailing" secondItem="Wsc-u6-09p" secondAttribute="trailing" id="V29-bb-QVz"/>
<constraint firstAttribute="trailing" secondItem="JiC-in-bay" secondAttribute="trailing" id="WVi-ws-ecE"/>
<constraint firstItem="620-J9-FsS" firstAttribute="top" secondItem="q7Y-uj-GJr" secondAttribute="top" id="amo-B4-O7y"/>
<constraint firstItem="2Bu-Yz-R04" firstAttribute="leading" secondItem="q7Y-uj-GJr" secondAttribute="leading" constant="8" id="dHz-V6-XK3"/>
<constraint firstItem="2Bu-Yz-R04" firstAttribute="leading" secondItem="q7Y-uj-GJr" secondAttribute="leading" id="dHz-V6-XK3"/>
<constraint firstAttribute="bottom" secondItem="JiC-in-bay" secondAttribute="bottom" id="e4P-bQ-coz"/>
<constraint firstItem="Wsc-u6-09p" firstAttribute="leading" secondItem="620-J9-FsS" secondAttribute="trailing" constant="8" id="f7T-dE-gel"/>
<constraint firstItem="lxn-OB-rvi" firstAttribute="top" secondItem="2Bu-Yz-R04" secondAttribute="bottom" constant="26" id="fdf-Oa-r0U"/>
Expand Down

0 comments on commit 8bf2217

Please sign in to comment.