Skip to content
Permalink
Browse files

PreferenceViewController 안정적으로 불러오도록 ObjC 이름 지정

  • Loading branch information
youknowone committed Nov 18, 2019
1 parent 9b27817 commit 307a31f9a693299a2f86c7e8fa6be2b6812e0981
Showing with 17 additions and 15 deletions.
  1. +3 −2 OSX/ConfigurationWindow.swift
  2. +1 −0 OSXTestApp/TestViewController.swift
  3. +1 −1 Podfile.lock
  4. +12 −12 Preferences/Base.lproj/Preferences.xib
@@ -9,9 +9,10 @@
import Cocoa
import Foundation

class ConfiguraionWindowController: NSWindowController {}
final class ConfiguraionWindowController: NSWindowController {}

class PreferenceViewController: NSViewController {
@objc(PreferenceViewController)
final class PreferenceViewController: NSViewController {
private let _isAtLeast10_15 = ProcessInfo().isOperatingSystemAtLeast(OperatingSystemVersion(majorVersion: 10, minorVersion: 15, patchVersion: 0))

override func loadView() {
@@ -9,6 +9,7 @@
import Cocoa
@testable import GureumCore

@objc(PreferenceViewController)
class PreferenceViewController: NSViewController {
private let _isAtLeast10_15 = ProcessInfo().isOperatingSystemAtLeast(OperatingSystemVersion(majorVersion: 10, minorVersion: 15, patchVersion: 0))

@@ -57,6 +57,6 @@ SPEC CHECKSUMS:
SwiftCoreServices: e4aebffc7143ff3e06920ecb89654f7c81f9768a
SwiftIOKit: 58e9b718109ba7c6681fc45c5888838627df28f1

PODFILE CHECKSUM: fdcc244dc13f0ce1b714f8b69bed2efdb7fabb60
PODFILE CHECKSUM: 13f0d70a7f8250df0097bd371d33bec58437a674

COCOAPODS: 1.8.4
@@ -127,10 +127,10 @@
</customSpacing>
</stackView>
<stackView distribution="fill" orientation="horizontal" alignment="centerY" spacing="80" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Vwy-Ul-fDb">
<rect key="frame" x="0.0" y="150" width="352" height="20"/>
<rect key="frame" x="0.0" y="150" width="353" height="20"/>
<subviews>
<textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="TKK-is-ROX">
<rect key="frame" x="-2" y="2" width="116" height="17"/>
<rect key="frame" x="-2" y="2" width="117" height="16"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="기본 키보드 레이아웃:" id="fcn-6t-Jdv">
<font key="font" metaFont="system"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -164,7 +164,7 @@
</customSpacing>
</stackView>
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="JYx-Sc-lao">
<rect key="frame" x="-2" y="123" width="281" height="18"/>
<rect key="frame" x="-2" y="123" width="284" height="18"/>
<buttonCell key="cell" type="check" title="한글 입력기일 때 역따옴표(`)로 원화 기호(₩) 입력" bezelStyle="regularSquare" imagePosition="left" inset="2" id="2iT-lY-Scx" userLabel="한글 입력기일 때 역따옴표(`)로 원화 기호(₩) 입력">
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
<font key="font" metaFont="system"/>
@@ -174,7 +174,7 @@
</connections>
</button>
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="DXg-Ha-7zY">
<rect key="frame" x="-2" y="98" width="228" height="18"/>
<rect key="frame" x="-2" y="98" width="230" height="18"/>
<buttonCell key="cell" type="check" title="완성되지 않은 낱자 자동 교정 (모아치기)" bezelStyle="regularSquare" imagePosition="left" inset="2" id="HZu-6J-gbz">
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
<font key="font" metaFont="system"/>
@@ -184,7 +184,7 @@
</connections>
</button>
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="AHr-Ou-hBi">
<rect key="frame" x="-2" y="73" width="300" height="18"/>
<rect key="frame" x="-2" y="73" width="305" height="18"/>
<buttonCell key="cell" type="check" title="두벌식 초성 조합 중에도 종성 결합 허용 (MS윈도 호환)" bezelStyle="regularSquare" imagePosition="left" inset="2" id="Phf-eg-t0A">
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
<font key="font" metaFont="system"/>
@@ -252,10 +252,10 @@
</customSpacing>
</stackView>
<stackView distribution="fill" orientation="vertical" alignment="leading" spacing="11" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="g8D-VJ-ONL">
<rect key="frame" x="0.0" y="0.0" width="360" height="146"/>
<rect key="frame" x="0.0" y="0.0" width="353" height="145"/>
<subviews>
<textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="a8y-l9-yXh">
<rect key="frame" x="-2" y="129" width="90" height="17"/>
<rect key="frame" x="-2" y="129" width="90" height="16"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" enabled="NO" sendsActionOnEndEditing="YES" title="내부 단축키 설정" id="F6j-tJ-jrU">
<font key="font" metaFont="system"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -269,7 +269,7 @@
<rect key="frame" x="0.0" y="96" width="343" height="22"/>
<subviews>
<textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="0Hf-Gu-mlf">
<rect key="frame" x="-2" y="3" width="157" height="17"/>
<rect key="frame" x="-2" y="3" width="157" height="16"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" enabled="NO" sendsActionOnEndEditing="YES" title="입력기 바꾸기 단축키:" id="Ahu-pQ-daK">
<font key="font" metaFont="system"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -297,7 +297,7 @@
<rect key="frame" x="0.0" y="64" width="343" height="22"/>
<subviews>
<textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Whp-xY-Myz">
<rect key="frame" x="-2" y="3" width="120" height="17"/>
<rect key="frame" x="-2" y="3" width="120" height="16"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" enabled="NO" sendsActionOnEndEditing="YES" title="한자 및 이모지 단축키:" id="xOE-ud-vbw">
<font key="font" metaFont="system"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -325,7 +325,7 @@
<rect key="frame" x="0.0" y="32" width="343" height="22"/>
<subviews>
<textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="BnJ-87-FKK">
<rect key="frame" x="-2" y="1" width="168" height="20"/>
<rect key="frame" x="-2" y="3" width="168" height="16"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" enabled="NO" sendsActionOnEndEditing="YES" title="로마자로 바꾸기 단축키:" id="Lqo-2U-8gt">
<font key="font" size="13" name="AppleSDGothicNeo-Regular"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -353,7 +353,7 @@
<rect key="frame" x="0.0" y="0.0" width="343" height="22"/>
<subviews>
<textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="BHm-Gy-NR7" userLabel="한글로 바꾸기 단축키:">
<rect key="frame" x="-2" y="1" width="179" height="20"/>
<rect key="frame" x="-2" y="3" width="179" height="16"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" enabled="NO" sendsActionOnEndEditing="YES" title="한글로 바꾸기 단축키:" id="TQ3-aV-8d6" userLabel="한글로 바꾸기 단축키:">
<font key="font" size="13" name="AppleSDGothicNeo-Regular"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -468,7 +468,7 @@
</view>
<point key="canvasLocation" x="-214" y="68"/>
</window>
<customObject id="DMm-2g-KCR" customClass="PreferenceViewController" customModule="GureumPreferences" customModuleProvider="target">
<customObject id="DMm-2g-KCR" customClass="PreferenceViewController" customModule="GureumPreferences">
<connections>
<outlet property="hangulAutoReorderButton" destination="DXg-Ha-7zY" id="3qx-dc-nRf"/>
<outlet property="hangulForceStrictCombinationRuleButton" destination="JOz-3z-VAl" id="9Gi-l9-DbM"/>

0 comments on commit 307a31f

Please sign in to comment.
You can’t perform that action at this time.