Make Mojave dark mode work correctly by removing custom background colors.
PiperOrigin-RevId: 223590005
diff --git a/src/Tulsi/AppDelegate.swift b/src/Tulsi/AppDelegate.swift
index d1644dc..fc442a2 100644
--- a/src/Tulsi/AppDelegate.swift
+++ b/src/Tulsi/AppDelegate.swift
@@ -36,7 +36,6 @@
func applicationDidFinishLaunching(_ notification: Notification) {
splashScreenWindowController = SplashScreenWindowController()
- splashScreenWindowController.window?.contentView?.layer?.backgroundColor = NSColor.white.cgColor
splashScreenWindowController.showWindow(self)
}
diff --git a/src/Tulsi/Base.lproj/BazelOpenSheetAccessoryView.xib b/src/Tulsi/Base.lproj/BazelOpenSheetAccessoryView.xib
index 2adbf39..e61d02e 100644
--- a/src/Tulsi/Base.lproj/BazelOpenSheetAccessoryView.xib
+++ b/src/Tulsi/Base.lproj/BazelOpenSheetAccessoryView.xib
@@ -1,7 +1,8 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="9532" systemVersion="15D21" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14313.18" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
<dependencies>
- <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="9532"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14313.18"/>
+ <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
<customObject id="-2" userLabel="File's Owner" customClass="BazelSelectionPanel" customModule="Tulsi" customModuleProvider="target">
@@ -17,6 +18,7 @@
<subviews>
<button fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="atU-NU-IiP">
<rect key="frame" x="18" y="19" width="241" height="18"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<buttonCell key="cell" type="check" title="Use as the default for other projects" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="ZsK-jX-81p">
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
<font key="font" metaFont="system"/>
diff --git a/src/Tulsi/Base.lproj/Main.storyboard b/src/Tulsi/Base.lproj/Main.storyboard
index caf7f14..2539937 100644
--- a/src/Tulsi/Base.lproj/Main.storyboard
+++ b/src/Tulsi/Base.lproj/Main.storyboard
@@ -1,9 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="14113" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="14313.18" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<dependencies>
- <deployment identifier="macosx"/>
- <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14113"/>
- <capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14313.18"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<scenes>
@@ -199,7 +197,7 @@
<scene sceneID="R2V-B0-nI4">
<objects>
<windowController storyboardIdentifier="TulsiProjectDocumentWindow" id="B8D-0N-5wS" userLabel="TulsiProjectDocumentWindow" sceneMemberID="viewController">
- <window key="window" title="Tulsi" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" oneShot="NO" releasedWhenClosed="NO" showsToolbarButton="NO" visibleAtLaunch="NO" frameAutosaveName="TulsiDocument" animationBehavior="default" id="IQv-IB-iLA">
+ <window key="window" title="Tulsi" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" frameAutosaveName="TulsiDocument" animationBehavior="default" id="IQv-IB-iLA">
<windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
<rect key="contentRect" x="106" y="237" width="650" height="550"/>
<rect key="screenRect" x="0.0" y="0.0" width="1680" height="1027"/>
@@ -220,7 +218,7 @@
<scene sceneID="P1Q-W5-Aqp">
<objects>
<windowController storyboardIdentifier="TulsiGeneratorConfigDocumentWindow" id="vPd-EE-EjR" userLabel="TulsiGeneratorConfigDocumentWindow" sceneMemberID="viewController">
- <window key="window" title="Config" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" oneShot="NO" releasedWhenClosed="NO" showsToolbarButton="NO" visibleAtLaunch="NO" frameAutosaveName="ConfigWindow" animationBehavior="default" id="Mya-7D-NzU">
+ <window key="window" title="Config" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" frameAutosaveName="ConfigWindow" animationBehavior="default" id="Mya-7D-NzU">
<windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
<rect key="contentRect" x="231" y="469" width="650" height="550"/>
<rect key="screenRect" x="0.0" y="0.0" width="2560" height="1417"/>
@@ -310,7 +308,7 @@
<color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
<color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
<tableColumns>
- <tableColumn identifier="" width="653.70808661635556" minWidth="40" maxWidth="1000" id="SW9-IY-hCd">
+ <tableColumn width="653.70808661635556" minWidth="40" maxWidth="1000" id="SW9-IY-hCd">
<tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" title="Config">
<font key="font" metaFont="smallSystem"/>
<color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
@@ -351,7 +349,7 @@
</tableCellView>
</prototypeCellViews>
</tableColumn>
- <tableColumn identifier="" width="47.5" minWidth="10" maxWidth="3.4028234663852886e+38" id="q9E-rj-iS2">
+ <tableColumn width="47.5" minWidth="10" maxWidth="3.4028234663852886e+38" id="q9E-rj-iS2">
<tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Shared">
<font key="font" metaFont="smallSystem"/>
<color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
@@ -365,11 +363,11 @@
<tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
<prototypeCellViews>
<tableCellView id="UA8-cJ-thj">
- <rect key="frame" x="658" y="1" width="48" height="17"/>
+ <rect key="frame" x="657.5" y="1" width="47" height="17"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<button translatesAutoresizingMaskIntoConstraints="NO" id="FJ0-ep-4iH">
- <rect key="frame" x="13" y="-1" width="22" height="18"/>
+ <rect key="frame" x="13" y="0.0" width="22" height="18"/>
<buttonCell key="cell" type="check" bezelStyle="regularSquare" imagePosition="left" alignment="center" enabled="NO" state="on" inset="2" id="Xrb-4F-vpt">
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
<font key="font" metaFont="system"/>
@@ -405,11 +403,11 @@
<constraints>
<constraint firstAttribute="height" relation="greaterThanOrEqual" constant="160" id="djX-rJ-ZSo"/>
</constraints>
- <scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="YES" id="mBy-O0-9UA">
+ <scroller key="horizontalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="YES" id="mBy-O0-9UA">
<rect key="frame" x="1" y="202" width="708" height="16"/>
<autoresizingMask key="autoresizingMask"/>
</scroller>
- <scroller key="verticalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="NO" id="dtD-7P-WHR">
+ <scroller key="verticalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="NO" id="dtD-7P-WHR">
<rect key="frame" x="224" y="17" width="15" height="102"/>
<autoresizingMask key="autoresizingMask"/>
</scroller>
@@ -665,11 +663,11 @@
<constraints>
<constraint firstAttribute="height" relation="greaterThanOrEqual" constant="40" id="2me-bz-ws8"/>
</constraints>
- <scroller key="horizontalScroller" verticalHuggingPriority="750" horizontal="YES" id="pKG-bA-SCT">
+ <scroller key="horizontalScroller" wantsLayer="YES" verticalHuggingPriority="750" horizontal="YES" id="pKG-bA-SCT">
<rect key="frame" x="1" y="103" width="622" height="16"/>
<autoresizingMask key="autoresizingMask"/>
</scroller>
- <scroller key="verticalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="NO" id="Zbt-Ys-3so">
+ <scroller key="verticalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="NO" id="Zbt-Ys-3so">
<rect key="frame" x="224" y="17" width="15" height="102"/>
<autoresizingMask key="autoresizingMask"/>
</scroller>
@@ -756,7 +754,7 @@
<color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
<color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
<tableColumns>
- <tableColumn identifier="" width="704.34381455623918" minWidth="40" maxWidth="1000" id="euq-bW-icW" userLabel="BUILD file">
+ <tableColumn width="704.34381455623918" minWidth="40" maxWidth="1000" id="euq-bW-icW" userLabel="BUILD file">
<tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" title="Bazel package">
<font key="font" metaFont="smallSystem"/>
<color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
@@ -814,11 +812,11 @@
<constraints>
<constraint firstAttribute="height" relation="greaterThanOrEqual" constant="160" id="R2s-sg-d9M"/>
</constraints>
- <scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="YES" id="aJK-ci-9Wf">
+ <scroller key="horizontalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="YES" id="aJK-ci-9Wf">
<rect key="frame" x="1" y="215" width="709" height="15"/>
<autoresizingMask key="autoresizingMask"/>
</scroller>
- <scroller key="verticalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="NO" id="hTo-NF-cvU">
+ <scroller key="verticalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="NO" id="hTo-NF-cvU">
<rect key="frame" x="224" y="17" width="15" height="102"/>
<autoresizingMask key="autoresizingMask"/>
</scroller>
@@ -1028,11 +1026,11 @@
<constraints>
<constraint firstAttribute="height" relation="greaterThanOrEqual" constant="60" id="Wis-qF-tm6"/>
</constraints>
- <scroller key="horizontalScroller" verticalHuggingPriority="750" horizontal="YES" id="P2M-ky-6Ll">
+ <scroller key="horizontalScroller" wantsLayer="YES" verticalHuggingPriority="750" horizontal="YES" id="P2M-ky-6Ll">
<rect key="frame" x="1" y="327" width="578" height="16"/>
<autoresizingMask key="autoresizingMask"/>
</scroller>
- <scroller key="verticalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="NO" id="yD9-VN-bwr">
+ <scroller key="verticalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="NO" id="yD9-VN-bwr">
<rect key="frame" x="-14" y="17" width="15" height="15"/>
<autoresizingMask key="autoresizingMask"/>
</scroller>
@@ -1190,7 +1188,7 @@
</tableCellView>
</prototypeCellViews>
</tableColumn>
- <tableColumn identifier="" width="58" minWidth="10" maxWidth="3.4028234663852886e+38" id="rj1-Fy-uGX">
+ <tableColumn width="58" minWidth="10" maxWidth="3.4028234663852886e+38" id="rj1-Fy-uGX">
<tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Recursive">
<font key="font" metaFont="smallSystem"/>
<color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
@@ -1240,11 +1238,11 @@
</outlineView>
</subviews>
</clipView>
- <scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="YES" id="AYg-bA-SSY">
+ <scroller key="horizontalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="YES" id="AYg-bA-SSY">
<rect key="frame" x="1" y="348" width="639" height="15"/>
<autoresizingMask key="autoresizingMask"/>
</scroller>
- <scroller key="verticalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="NO" id="oMg-MC-8Yg">
+ <scroller key="verticalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="NO" id="oMg-MC-8Yg">
<rect key="frame" x="-14" y="9" width="15" height="0.0"/>
<autoresizingMask key="autoresizingMask"/>
</scroller>
@@ -1308,7 +1306,7 @@
</constraints>
<textFieldCell key="cell" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" drawsBackground="YES" id="Myg-kg-WLN">
<font key="font" metaFont="system"/>
- <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
<connections>
@@ -1355,7 +1353,7 @@
<color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
<color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
<tableColumns>
- <tableColumn identifier="" width="152" minWidth="40" maxWidth="1000" id="tnI-CS-8hc">
+ <tableColumn width="152" minWidth="40" maxWidth="1000" id="tnI-CS-8hc">
<tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border">
<font key="font" metaFont="smallSystem"/>
<color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
@@ -1415,11 +1413,11 @@
</outlineView>
</subviews>
</clipView>
- <scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="YES" id="JkT-Y5-i6n">
+ <scroller key="horizontalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="YES" id="JkT-Y5-i6n">
<rect key="frame" x="0.0" y="347" width="157" height="15"/>
<autoresizingMask key="autoresizingMask"/>
</scroller>
- <scroller key="verticalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="NO" id="0dZ-cx-gkq">
+ <scroller key="verticalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="NO" id="0dZ-cx-gkq">
<rect key="frame" x="224" y="17" width="15" height="102"/>
<autoresizingMask key="autoresizingMask"/>
</scroller>
@@ -1502,7 +1500,7 @@
<tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
<prototypeCellViews>
<tableCellView identifier="TableCellView" id="YMp-DA-LoX" userLabel="TableCellView" customClass="TextTableCellView" customModule="Tulsi" customModuleProvider="target">
- <rect key="frame" x="133" y="1" width="153" height="17"/>
+ <rect key="frame" x="133.5" y="1" width="153" height="17"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="dNR-lb-Qb0" customClass="OptionsEditorTextField" customModule="Tulsi" customModuleProvider="target">
@@ -1523,17 +1521,14 @@
<constraint firstItem="dNR-lb-Qb0" firstAttribute="top" secondItem="YMp-DA-LoX" secondAttribute="top" constant="2" id="hLx-wt-Qfg"/>
</constraints>
<userDefinedRuntimeAttributes>
- <userDefinedRuntimeAttribute type="color" keyPath="backgroundColor">
- <color key="value" red="0.94117647059999998" green="0.97647058819999999" blue="0.94509803920000002" alpha="1" colorSpace="calibratedRGB"/>
- </userDefinedRuntimeAttribute>
- <userDefinedRuntimeAttribute type="boolean" keyPath="drawsBackground" value="YES"/>
+ <userDefinedRuntimeAttribute type="boolean" keyPath="drawsBackground" value="NO"/>
</userDefinedRuntimeAttributes>
<connections>
<outlet property="textField" destination="dNR-lb-Qb0" id="KiX-ca-6Rm"/>
</connections>
</tableCellView>
<tableCellView identifier="PopUpButtonCell" id="oYh-zc-ZM8" userLabel="PopUpButtonCell" customClass="PopUpButtonTableCellView" customModule="Tulsi" customModuleProvider="target">
- <rect key="frame" x="133" y="20" width="153" height="17"/>
+ <rect key="frame" x="133.5" y="20" width="153" height="17"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<popUpButton translatesAutoresizingMaskIntoConstraints="NO" id="R15-06-ru9">
@@ -1563,17 +1558,14 @@
<constraint firstItem="R15-06-ru9" firstAttribute="leading" secondItem="oYh-zc-ZM8" secondAttribute="leading" constant="2" id="rr1-ZZ-jCZ"/>
</constraints>
<userDefinedRuntimeAttributes>
- <userDefinedRuntimeAttribute type="boolean" keyPath="drawsBackground" value="YES"/>
- <userDefinedRuntimeAttribute type="color" keyPath="backgroundColor">
- <color key="value" red="0.94117647059999998" green="0.97647058819999999" blue="0.94509803920000002" alpha="1" colorSpace="calibratedRGB"/>
- </userDefinedRuntimeAttribute>
+ <userDefinedRuntimeAttribute type="boolean" keyPath="drawsBackground" value="NO"/>
</userDefinedRuntimeAttributes>
<connections>
<outlet property="popUpButton" destination="R15-06-ru9" id="rzQ-xC-UvF"/>
</connections>
</tableCellView>
<tableCellView identifier="BoldPopUpButtonCell" id="kO7-54-VYI" userLabel="PopUpButtonCell" customClass="PopUpButtonTableCellView" customModule="Tulsi" customModuleProvider="target">
- <rect key="frame" x="133" y="39" width="153" height="17"/>
+ <rect key="frame" x="133.5" y="39" width="153" height="17"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<popUpButton translatesAutoresizingMaskIntoConstraints="NO" id="dWe-x5-135">
@@ -1602,12 +1594,6 @@
<constraint firstItem="dWe-x5-135" firstAttribute="centerY" secondItem="kO7-54-VYI" secondAttribute="centerY" id="Jzh-8M-t9m"/>
<constraint firstAttribute="trailing" secondItem="dWe-x5-135" secondAttribute="trailing" constant="2" id="f0L-Ji-c6g"/>
</constraints>
- <userDefinedRuntimeAttributes>
- <userDefinedRuntimeAttribute type="boolean" keyPath="drawsBackground" value="YES"/>
- <userDefinedRuntimeAttribute type="color" keyPath="backgroundColor">
- <color key="value" red="0.94117647059999998" green="0.97647058819999999" blue="0.94509803920000002" alpha="1" colorSpace="calibratedRGB"/>
- </userDefinedRuntimeAttribute>
- </userDefinedRuntimeAttributes>
<connections>
<outlet property="popUpButton" destination="dWe-x5-135" id="r42-vI-JCj"/>
</connections>
@@ -1628,7 +1614,7 @@
<tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
<prototypeCellViews>
<tableCellView id="NSK-dd-w7F">
- <rect key="frame" x="289" y="1" width="148" height="17"/>
+ <rect key="frame" x="289.5" y="1" width="148" height="17"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
</tableCellView>
</prototypeCellViews>
@@ -1647,7 +1633,7 @@
<tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
<prototypeCellViews>
<tableCellView id="zKg-DP-uTh">
- <rect key="frame" x="440" y="1" width="147" height="17"/>
+ <rect key="frame" x="440.5" y="1" width="147" height="17"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="TGM-OR-kqV">
@@ -1682,11 +1668,11 @@
</outlineView>
</subviews>
</clipView>
- <scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" doubleValue="0.81162232486347241" horizontal="YES" id="YBR-09-mtm">
+ <scroller key="horizontalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" doubleValue="0.81162232486347241" horizontal="YES" id="YBR-09-mtm">
<rect key="frame" x="0.0" y="347" width="592" height="15"/>
<autoresizingMask key="autoresizingMask"/>
</scroller>
- <scroller key="verticalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="NO" id="hef-GI-gn5">
+ <scroller key="verticalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="NO" id="hef-GI-gn5">
<rect key="frame" x="224" y="17" width="15" height="102"/>
<autoresizingMask key="autoresizingMask"/>
</scroller>
diff --git a/src/Tulsi/Base.lproj/NewGeneratorConfigViewController.xib b/src/Tulsi/Base.lproj/NewGeneratorConfigViewController.xib
index 44d5e43..44e9527 100644
--- a/src/Tulsi/Base.lproj/NewGeneratorConfigViewController.xib
+++ b/src/Tulsi/Base.lproj/NewGeneratorConfigViewController.xib
@@ -1,8 +1,9 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="9532" systemVersion="15D21" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14313.18" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<dependencies>
- <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="9532"/>
- <capability name="box content view" minToolsVersion="7.0"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14313.18"/>
+ <capability name="System colors introduced in macOS 10.14" minToolsVersion="10.0"/>
+ <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
<customObject id="-2" userLabel="File's Owner" customClass="NewGeneratorConfigViewController" customModule="Tulsi" customModuleProvider="target">
@@ -38,7 +39,7 @@
</constraints>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" drawsBackground="YES" id="0Ix-Et-fCj">
<font key="font" metaFont="system"/>
- <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
<connections>
@@ -61,7 +62,7 @@
<constraint firstItem="e9u-qS-sod" firstAttribute="leading" secondItem="Yww-Kf-W8t" secondAttribute="leading" constant="20" id="YQw-Md-01i"/>
</constraints>
</view>
- <color key="borderColor" name="textColor" catalog="System" colorSpace="catalog"/>
+ <color key="borderColor" name="separatorColor" catalog="System" colorSpace="catalog"/>
</box>
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Mev-zr-1M1">
<rect key="frame" x="246" y="13" width="70" height="32"/>
diff --git a/src/Tulsi/Base.lproj/NewProjectViewController.xib b/src/Tulsi/Base.lproj/NewProjectViewController.xib
index 36e1935..0d09c68 100644
--- a/src/Tulsi/Base.lproj/NewProjectViewController.xib
+++ b/src/Tulsi/Base.lproj/NewProjectViewController.xib
@@ -1,8 +1,9 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="10117" systemVersion="15E65" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14313.18" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<dependencies>
- <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="10117"/>
- <capability name="box content view" minToolsVersion="7.0"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14313.18"/>
+ <capability name="System colors introduced in macOS 10.14" minToolsVersion="10.0"/>
+ <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
<customObject id="-2" userLabel="File's Owner" customClass="NewProjectViewController" customModule="Tulsi" customModuleProvider="target">
@@ -13,13 +14,13 @@
<customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
<customObject id="-3" userLabel="Application" customClass="NSObject"/>
<customView id="Hz6-mo-xeY">
- <rect key="frame" x="0.0" y="0.0" width="513" height="230"/>
+ <rect key="frame" x="0.0" y="0.0" width="514" height="230"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<subviews>
<box boxType="custom" borderType="line" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="x6S-jF-Hz7">
- <rect key="frame" x="20" y="61" width="479" height="124"/>
+ <rect key="frame" x="20" y="61" width="480" height="124"/>
<view key="contentView" id="Il9-Jg-Hvh">
- <rect key="frame" x="1" y="1" width="477" height="122"/>
+ <rect key="frame" x="1" y="1" width="478" height="122"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="MZz-Hp-qch">
@@ -39,7 +40,7 @@
</textFieldCell>
</textField>
<pathControl verticalHuggingPriority="750" allowsExpansionToolTips="YES" translatesAutoresizingMaskIntoConstraints="NO" id="ZFg-B8-Vl5">
- <rect key="frame" x="171" y="39" width="266" height="17"/>
+ <rect key="frame" x="171" y="39" width="267" height="17"/>
<pathCell key="cell" selectable="YES" editable="YES" alignment="left" placeholderString="Workspace location (default via bindings)" id="yIZ-N5-Zok">
<font key="font" metaFont="system"/>
</pathCell>
@@ -56,14 +57,14 @@
</connections>
</pathControl>
<textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="SXg-pS-B9K">
- <rect key="frame" x="171" y="62" width="266" height="22"/>
+ <rect key="frame" x="171" y="62" width="267" height="22"/>
<constraints>
<constraint firstAttribute="width" relation="lessThanOrEqual" constant="350" id="mQ6-H8-SiS"/>
<constraint firstAttribute="width" relation="greaterThanOrEqual" constant="120" id="tyK-kg-dAn"/>
</constraints>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" drawsBackground="YES" id="4jb-dh-fvC">
<font key="font" metaFont="system"/>
- <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
<connections>
@@ -92,7 +93,7 @@
<constraint firstItem="SXg-pS-B9K" firstAttribute="baseline" secondItem="MZz-Hp-qch" secondAttribute="baseline" id="vMZ-cW-Vf3"/>
</constraints>
</view>
- <color key="borderColor" name="textColor" catalog="System" colorSpace="catalog"/>
+ <color key="borderColor" name="separatorColor" catalog="System" colorSpace="catalog"/>
</box>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="8cI-FN-Vac">
<rect key="frame" x="18" y="193" width="228" height="17"/>
@@ -103,7 +104,7 @@
</textFieldCell>
</textField>
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="PFy-b8-mmS">
- <rect key="frame" x="430" y="13" width="69" height="32"/>
+ <rect key="frame" x="431" y="13" width="69" height="32"/>
<buttonCell key="cell" type="push" title="Next" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="IZq-Nh-BOv">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>
diff --git a/src/Tulsi/Base.lproj/SplashScreenWindowController.xib b/src/Tulsi/Base.lproj/SplashScreenWindowController.xib
index 0c24620..6dfb8c0 100644
--- a/src/Tulsi/Base.lproj/SplashScreenWindowController.xib
+++ b/src/Tulsi/Base.lproj/SplashScreenWindowController.xib
@@ -1,10 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14113" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14313.18" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
<dependencies>
- <deployment identifier="macosx"/>
- <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14113"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14313.18"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
- <capability name="system font weights other than Regular or Bold" minToolsVersion="7.0"/>
</dependencies>
<objects>
<customObject id="-2" userLabel="File's Owner" customClass="SplashScreenWindowController" customModule="Tulsi" customModuleProvider="target">
@@ -15,10 +13,10 @@
</customObject>
<customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
<customObject id="-3" userLabel="Application" customClass="NSObject"/>
- <window title="Tulsi" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" restorable="NO" oneShot="NO" releasedWhenClosed="NO" showsToolbarButton="NO" visibleAtLaunch="NO" frameAutosaveName="TulsiSplashScreen" animationBehavior="default" id="F0z-JX-Cv5">
+ <window title="Tulsi" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" restorable="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" frameAutosaveName="TulsiSplashScreen" animationBehavior="default" id="F0z-JX-Cv5">
<windowStyleMask key="styleMask" titled="YES" closable="YES" resizable="YES"/>
<rect key="contentRect" x="196" y="240" width="618" height="380"/>
- <rect key="screenRect" x="0.0" y="0.0" width="3840" height="2137"/>
+ <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1417"/>
<value key="minSize" type="size" width="618" height="380"/>
<value key="minFullScreenContentSize" type="size" width="618" height="380"/>
<view key="contentView" wantsLayer="YES" id="se5-gp-TjO">
@@ -38,7 +36,7 @@
<color key="backgroundColor" name="windowBackgroundColor" catalog="System" colorSpace="catalog"/>
<color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
<tableColumns>
- <tableColumn identifier="" width="315" minWidth="40" maxWidth="1000" id="E0b-oY-vBl">
+ <tableColumn width="315" minWidth="40" maxWidth="1000" id="E0b-oY-vBl">
<tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border">
<font key="font" metaFont="smallSystem"/>
<color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
@@ -86,16 +84,16 @@
</subviews>
<color key="backgroundColor" name="windowBackgroundColor" catalog="System" colorSpace="catalog"/>
</clipView>
- <scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="YES" id="Qfd-kq-9Pw">
+ <scroller key="horizontalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="YES" id="Qfd-kq-9Pw">
<rect key="frame" x="0.0" y="-15" width="0.0" height="15"/>
<autoresizingMask key="autoresizingMask"/>
</scroller>
- <scroller key="verticalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="NO" id="xu3-vZ-2zq">
+ <scroller key="verticalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="NO" id="xu3-vZ-2zq">
<rect key="frame" x="224" y="17" width="15" height="102"/>
<autoresizingMask key="autoresizingMask"/>
</scroller>
</scrollView>
- <customView translatesAutoresizingMaskIntoConstraints="NO" id="v8z-7p-JK9">
+ <customView translatesAutoresizingMaskIntoConstraints="NO" id="v8z-7p-JK9" customClass="NSVisualEffectView">
<rect key="frame" x="0.0" y="0.0" width="300" height="380"/>
<subviews>
<imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="Cr0-BZ-yKF">
@@ -107,7 +105,7 @@
<imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" id="Wew-p3-Ia8"/>
</imageView>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="gTk-1P-U8m">
- <rect key="frame" x="38" y="155" width="223" height="39"/>
+ <rect key="frame" x="39" y="155" width="223" height="39"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Welcome to Tulsi" id="4GE-zf-x1i">
<font key="font" metaFont="systemThin" size="32"/>
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -124,8 +122,8 @@
<rect key="frame" x="72" y="130" width="156" height="17"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" allowsUndo="NO" sendsActionOnEndEditing="YES" alignment="center" title="Tulsi version information" usesSingleLineMode="YES" id="3kf-8j-4Yc">
<font key="font" metaFont="system"/>
- <color key="textColor" name="windowFrameColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ <color key="textColor" name="secondaryLabelColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
<connections>
<binding destination="-2" name="displayPatternValue1" keyPath="self.applicationVersion" id="YTJ-Ip-o9v">
diff --git a/src/Tulsi/Info.plist b/src/Tulsi/Info.plist
index dcd5ddd..22eea4c 100644
--- a/src/Tulsi/Info.plist
+++ b/src/Tulsi/Info.plist
@@ -85,8 +85,6 @@
<string>Main</string>
<key>NSPrincipalClass</key>
<string>NSApplication</string>
- <key>NSRequiresAquaSystemAppearance</key>
- <true/>
<key>UTExportedTypeDeclarations</key>
<array>
<dict>
