Skip to content

Commit 4701cac

Browse files
committed
Minor changes. Close #23 and #24.
1 parent d99b450 commit 4701cac

File tree

6 files changed

+19
-17
lines changed

6 files changed

+19
-17
lines changed

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ SwitchKey can automatically activate your choice for you.
99

1010
### Download & Install (Manaual)
1111

12-
[Version 1.1.1](https://github.com/itsuhane/SwitchKey/releases/download/v1.1.1/SwitchKey.zip) (macOS)
12+
[Version 1.1.2](https://github.com/itsuhane/SwitchKey/releases/download/v1.1.2/SwitchKey.zip) (macOS)
1313
Uncompress, then drag & drop into your Applications folder.
1414

1515
### Install With Homebrew

SwitchKey.xcodeproj/project.pbxproj

+7-1
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@
100100
isa = PBXProject;
101101
attributes = {
102102
LastSwiftUpdateCheck = 1020;
103-
LastUpgradeCheck = 1020;
103+
LastUpgradeCheck = 1130;
104104
ORGANIZATIONNAME = "Jinyu Li";
105105
TargetAttributes = {
106106
71FECF2922610BE600C51FD7 = {
@@ -290,15 +290,18 @@
290290
buildSettings = {
291291
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
292292
CLANG_ENABLE_MODULES = YES;
293+
CODE_SIGN_IDENTITY = "-";
293294
CODE_SIGN_STYLE = Automatic;
294295
COMBINE_HIDPI_IMAGES = YES;
296+
CURRENT_PROJECT_VERSION = 8;
295297
DEVELOPMENT_TEAM = C474VU6M6N;
296298
INFOPLIST_FILE = "$(SRCROOT)/SwitchKey/Info.plist";
297299
LD_RUNPATH_SEARCH_PATHS = (
298300
"$(inherited)",
299301
"@executable_path/../Frameworks",
300302
);
301303
MACOSX_DEPLOYMENT_TARGET = 10.11;
304+
MARKETING_VERSION = 1.1.2;
302305
PRODUCT_BUNDLE_IDENTIFIER = itsuhane.tools.SwitchKey;
303306
PRODUCT_NAME = "$(TARGET_NAME)";
304307
SWIFT_OBJC_BRIDGING_HEADER = "SwitchKey/SwitchKey-Bridging-Header.h";
@@ -312,15 +315,18 @@
312315
buildSettings = {
313316
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
314317
CLANG_ENABLE_MODULES = YES;
318+
CODE_SIGN_IDENTITY = "-";
315319
CODE_SIGN_STYLE = Automatic;
316320
COMBINE_HIDPI_IMAGES = YES;
321+
CURRENT_PROJECT_VERSION = 8;
317322
DEVELOPMENT_TEAM = C474VU6M6N;
318323
INFOPLIST_FILE = "$(SRCROOT)/SwitchKey/Info.plist";
319324
LD_RUNPATH_SEARCH_PATHS = (
320325
"$(inherited)",
321326
"@executable_path/../Frameworks",
322327
);
323328
MACOSX_DEPLOYMENT_TARGET = 10.11;
329+
MARKETING_VERSION = 1.1.2;
324330
PRODUCT_BUNDLE_IDENTIFIER = itsuhane.tools.SwitchKey;
325331
PRODUCT_NAME = "$(TARGET_NAME)";
326332
SWIFT_OBJC_BRIDGING_HEADER = "SwitchKey/SwitchKey-Bridging-Header.h";

SwitchKey.xcodeproj/xcshareddata/xcschemes/SwitchKey.xcscheme

+3-7
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1020"
3+
LastUpgradeVersion = "1130"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -27,8 +27,6 @@
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
2929
shouldUseLaunchSchemeArgsEnv = "YES">
30-
<Testables>
31-
</Testables>
3230
<MacroExpansion>
3331
<BuildableReference
3432
BuildableIdentifier = "primary"
@@ -38,8 +36,8 @@
3836
ReferencedContainer = "container:SwitchKey.xcodeproj">
3937
</BuildableReference>
4038
</MacroExpansion>
41-
<AdditionalOptions>
42-
</AdditionalOptions>
39+
<Testables>
40+
</Testables>
4341
</TestAction>
4442
<LaunchAction
4543
buildConfiguration = "Release"
@@ -61,8 +59,6 @@
6159
ReferencedContainer = "container:SwitchKey.xcodeproj">
6260
</BuildableReference>
6361
</BuildableProductRunnable>
64-
<AdditionalOptions>
65-
</AdditionalOptions>
6662
</LaunchAction>
6763
<ProfileAction
6864
buildConfiguration = "Release"

SwitchKey/AppDelegate.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSTableViewDataSource, NSTab
296296
if row > 0 {
297297
return 64
298298
} else {
299-
return 40
299+
return 24
300300
}
301301
}
302302

SwitchKey/Base.lproj/SwitchKey.xib

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="15702" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
2+
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="15705" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
33
<dependencies>
44
<deployment identifier="macosx"/>
5-
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="15702"/>
5+
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="15705"/>
66
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
77
</dependencies>
88
<objects>
@@ -28,7 +28,7 @@
2828
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
2929
<clipView key="contentView" id="gGO-yu-YCr">
3030
<rect key="frame" x="1" y="1" width="360" height="0.0"/>
31-
<autoresizingMask key="autoresizingMask"/>
31+
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
3232
<subviews>
3333
<tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnReordering="NO" columnResizing="NO" multipleSelection="NO" autosaveColumns="NO" typeSelect="NO" rowSizeStyle="automatic" viewBased="YES" id="wpb-1K-Xeg" customClass="TableView" customModule="SwitchKey" customModuleProvider="target">
3434
<rect key="frame" x="0.0" y="0.0" width="360" height="0.0"/>
@@ -138,9 +138,9 @@
138138
<constraints>
139139
<constraint firstAttribute="height" constant="20" id="IDr-fh-azF"/>
140140
</constraints>
141-
<buttonCell key="cell" type="roundTextured" title="Add Current" bezelStyle="texturedRounded" alignment="center" lineBreakMode="truncatingTail" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="XiT-Jr-Qlg">
141+
<buttonCell key="cell" type="roundRect" title="Add Current" bezelStyle="roundedRect" alignment="center" lineBreakMode="truncatingTail" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="XiT-Jr-Qlg">
142142
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
143-
<font key="font" metaFont="systemBold"/>
143+
<font key="font" metaFont="label" size="12"/>
144144
<connections>
145145
<action selector="addItemClicked:" target="tGE-D6-w3H" id="1xs-Ii-GnG"/>
146146
</connections>

SwitchKey/Info.plist

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
<key>CFBundlePackageType</key>
1818
<string>APPL</string>
1919
<key>CFBundleShortVersionString</key>
20-
<string>1.1.1</string>
20+
<string>$(MARKETING_VERSION)</string>
2121
<key>CFBundleVersion</key>
22-
<string>7</string>
22+
<string>$(CURRENT_PROJECT_VERSION)</string>
2323
<key>LSApplicationCategoryType</key>
2424
<string>public.app-category.utilities</string>
2525
<key>LSMinimumSystemVersion</key>

0 commit comments

Comments
 (0)