Skip to content

Commit 914cbe7

Browse files
macmademacmade
committed
1.0.3
1 parent 5f67562 commit 914cbe7

File tree

3 files changed

+32
-6
lines changed

3 files changed

+32
-6
lines changed

‎ColorSet/Classes/MainWindowController.swift

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,8 @@ class MainWindowController: NSWindowController, NSTableViewDelegate, NSTableView
5252

5353
override func windowDidLoad()
5454
{
55+
self.window?.title = ( self.url == nil ) ? "Untitled.colorset" : ( self.url!.path as NSString ).lastPathComponent
56+
5557
guard let colorView = self.window?.contentView?.subviewWithIdentifier( "Color" ) as? ColorView else
5658
{
5759
return
@@ -177,7 +179,8 @@ class MainWindowController: NSWindowController, NSTableViewDelegate, NSTableView
177179

178180
self.save( to: url )
179181

180-
self.url = url
182+
self.url = url
183+
self.window?.title = ( self.url == nil ) ? "Untitled.colorset" : ( self.url!.path as NSString ).lastPathComponent
181184
}
182185
}
183186

‎ColorSet/Info.plist

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@
3838
<key>CFBundlePackageType</key>
3939
<string>APPL</string>
4040
<key>CFBundleShortVersionString</key>
41-
<string>1.0.2</string>
41+
<string>1.0.3</string>
4242
<key>CFBundleVersion</key>
43-
<string>31</string>
43+
<string>33</string>
4444
<key>LSMinimumSystemVersion</key>
4545
<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
4646
<key>NSHumanReadableCopyright</key>

‎ColorSet/Interface/Base.lproj/ColorSet.MainWindowController.xib

Lines changed: 26 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,11 +72,11 @@
7272
</constraints>
7373
</customView>
7474
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="Lvh-iu-dXF">
75-
<rect key="frame" x="31" y="7" width="168" height="17"/>
76-
<textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Table View Cell" id="ksN-hR-I69">
75+
<rect key="frame" x="33" y="7" width="164" height="17"/>
76+
<textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Table View Cell" drawsBackground="YES" id="ksN-hR-I69">
7777
<font key="font" metaFont="system"/>
7878
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
79-
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
79+
<color key="backgroundColor" white="1" alpha="0.0" colorSpace="deviceWhite"/>
8080
</textFieldCell>
8181
<connections>
8282
<binding destination="HWU-jy-aYp" name="value" keyPath="objectValue.name" id="R62-Td-oib"/>
@@ -194,6 +194,25 @@
194194
</binding>
195195
</connections>
196196
</imageView>
197+
<textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="WxH-Cw-E69">
198+
<rect key="frame" x="18" y="116" width="561" height="36"/>
199+
<textFieldCell key="cell" lineBreakMode="truncatingMiddle" selectable="YES" editable="YES" continuous="YES" sendsActionOnEndEditing="YES" focusRingType="none" alignment="center" title="Label" id="Ft1-4f-AVs">
200+
<font key="font" metaFont="systemThin" size="30"/>
201+
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
202+
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
203+
<allowedInputSourceLocales>
204+
<string>NSAllRomanInputSourcesLocaleIdentifier</string>
205+
</allowedInputSourceLocales>
206+
</textFieldCell>
207+
<connections>
208+
<binding destination="-2" name="hidden" keyPath="selectedColor" id="xCI-Bo-QRm">
209+
<dictionary key="options">
210+
<string key="NSValueTransformerName">NSIsNotNil</string>
211+
</dictionary>
212+
</binding>
213+
<binding destination="-2" name="value" keyPath="window.title" id="9YV-S0-QSh"/>
214+
</connections>
215+
</textField>
197216
<customView translatesAutoresizingMaskIntoConstraints="NO" id="htQ-RR-Cub">
198217
<rect key="frame" x="0.0" y="311" width="597" height="225"/>
199218
<subviews>
@@ -870,17 +889,21 @@
870889
<constraints>
871890
<constraint firstItem="yMG-Op-8D1" firstAttribute="centerX" secondItem="bH4-hY-KH6" secondAttribute="centerX" id="1d5-5J-vYE"/>
872891
<constraint firstItem="JBA-E9-cei" firstAttribute="top" secondItem="htQ-RR-Cub" secondAttribute="bottom" constant="8" id="2Bb-e3-C81"/>
892+
<constraint firstItem="WxH-Cw-E69" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="bH4-hY-KH6" secondAttribute="leading" id="2OL-rN-2fg"/>
873893
<constraint firstItem="p4I-Zg-0zJ" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="JBA-E9-cei" secondAttribute="trailing" constant="8" symbolic="YES" id="4W9-il-yhc"/>
874894
<constraint firstItem="p4I-Zg-0zJ" firstAttribute="centerX" secondItem="bH4-hY-KH6" secondAttribute="centerX" id="6dg-qn-rMt"/>
875895
<constraint firstItem="yMG-Op-8D1" firstAttribute="top" secondItem="bH4-hY-KH6" secondAttribute="top" constant="20" id="9TS-mu-uJI"/>
876896
<constraint firstItem="LNB-i1-V76" firstAttribute="width" secondItem="nRN-KA-cl8" secondAttribute="width" id="Cya-LG-mMd"/>
877897
<constraint firstItem="JBA-E9-cei" firstAttribute="leading" secondItem="bH4-hY-KH6" secondAttribute="leading" constant="20" id="DW1-4g-29U"/>
898+
<constraint firstAttribute="trailing" secondItem="WxH-Cw-E69" secondAttribute="trailing" constant="20" id="Htr-MK-RV5"/>
899+
<constraint firstItem="WxH-Cw-E69" firstAttribute="centerX" secondItem="p4I-Zg-0zJ" secondAttribute="centerX" id="J3u-u9-9H2"/>
878900
<constraint firstItem="htQ-RR-Cub" firstAttribute="centerX" secondItem="bH4-hY-KH6" secondAttribute="centerX" id="KBQ-WJ-Fy0"/>
879901
<constraint firstItem="htQ-RR-Cub" firstAttribute="width" secondItem="bH4-hY-KH6" secondAttribute="width" id="MG4-GE-iZD"/>
880902
<constraint firstItem="O9O-h1-xXA" firstAttribute="width" secondItem="bH4-hY-KH6" secondAttribute="width" id="V9U-da-d4l"/>
881903
<constraint firstItem="O9O-h1-xXA" firstAttribute="top" secondItem="JBA-E9-cei" secondAttribute="bottom" constant="8" id="W1n-5J-4Iy"/>
882904
<constraint firstItem="O9O-h1-xXA" firstAttribute="centerX" secondItem="bH4-hY-KH6" secondAttribute="centerX" id="aJX-K9-afJ"/>
883905
<constraint firstItem="htQ-RR-Cub" firstAttribute="top" secondItem="yMG-Op-8D1" secondAttribute="bottom" constant="8" id="ktc-Sf-IwO"/>
906+
<constraint firstItem="WxH-Cw-E69" firstAttribute="top" secondItem="p4I-Zg-0zJ" secondAttribute="bottom" constant="20" id="m2e-4l-HMb"/>
884907
<constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="yMG-Op-8D1" secondAttribute="trailing" id="n8h-jc-Rep"/>
885908
<constraint firstItem="p4I-Zg-0zJ" firstAttribute="centerY" secondItem="bH4-hY-KH6" secondAttribute="centerY" id="p4x-iP-b5x"/>
886909
<constraint firstItem="yMG-Op-8D1" firstAttribute="leading" secondItem="bH4-hY-KH6" secondAttribute="leading" constant="20" id="r7B-Ew-prX"/>

0 commit comments

Comments
 (0)