Skip to content
This repository was archived by the owner on Feb 8, 2023. It is now read-only.

Commit 91bb63e

Browse files
damien-rivetdamien-rivet
authored
Merge pull request #102 from Shufflepuck/feature/add-macos-mojave-support
Add macOS 10.14 (aka Dark Mode) support
2 parents 177f337 + afaa37d commit 91bb63e

File tree

2 files changed

+17
-21
lines changed

2 files changed

+17
-21
lines changed

‎SplashBuddy/Views/Main/Base.lproj/SplashBuddy.storyboard‎

Lines changed: 17 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,17 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="13196" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="UoU-0S-EqW">
2+
<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="14313.18" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="UoU-0S-EqW">
33
<dependencies>
44
<deployment identifier="macosx"/>
5-
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="13196"/>
6-
<plugIn identifier="com.apple.WebKit2IBPlugin" version="13196"/>
7-
<capability name="Aspect ratio constraints" minToolsVersion="5.1"/>
5+
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14313.18"/>
6+
<plugIn identifier="com.apple.WebKit2IBPlugin" version="14313.18"/>
87
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
9-
<capability name="stacking Non-gravity area distributions on NSStackView" minToolsVersion="7.0" minSystemVersion="10.11"/>
10-
<capability name="system font weights other than Regular or Bold" minToolsVersion="7.0"/>
118
</dependencies>
129
<scenes>
1310
<!--Window Controller-->
1411
<scene sceneID="zkc-0l-Upw">
1512
<objects>
1613
<windowController storyboardIdentifier="mainWindow" id="UoU-0S-EqW" customClass="MainWindowController" customModule="SplashBuddy" customModuleProvider="target" sceneMemberID="viewController">
17-
<window key="window" title="Window" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" oneShot="NO" releasedWhenClosed="NO" showsToolbarButton="NO" visibleAtLaunch="NO" frameAutosaveName="" animationBehavior="default" id="eOE-dw-mkn" customClass="MainWindow" customModule="SplashBuddy" customModuleProvider="target">
14+
<window key="window" title="Window" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" frameAutosaveName="" animationBehavior="default" id="eOE-dw-mkn" customClass="MainWindow" customModule="SplashBuddy" customModuleProvider="target">
1815
<rect key="contentRect" x="294" y="313" width="800" height="600"/>
1916
<rect key="screenRect" x="0.0" y="0.0" width="1920" height="1057"/>
2017
<connections>
@@ -73,7 +70,7 @@
7370
<color key="backgroundColor" name="_sourceListBackgroundColor" catalog="System" colorSpace="catalog"/>
7471
<color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
7572
<tableColumns>
76-
<tableColumn identifier="" width="221" minWidth="40" maxWidth="1000" id="fqj-gr-Q3i">
73+
<tableColumn width="221" minWidth="40" maxWidth="1000" id="fqj-gr-Q3i">
7774
<tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border">
7875
<font key="font" metaFont="smallSystem"/>
7976
<color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
@@ -86,12 +83,12 @@
8683
</textFieldCell>
8784
<tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
8885
<prototypeCellViews>
89-
<tableCellView id="hta-JT-VTJ">
86+
<tableCellView misplaced="YES" id="hta-JT-VTJ">
9087
<rect key="frame" x="1" y="3" width="221" height="42"/>
9188
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
9289
<subviews>
9390
<imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="jKX-pD-fCY">
94-
<rect key="frame" x="0.0" y="0.0" width="15" height="42"/>
91+
<rect key="frame" x="0.0" y="0.0" width="15" height="138"/>
9592
<constraints>
9693
<constraint firstAttribute="width" constant="15" id="Ce4-AS-Z55"/>
9794
</constraints>
@@ -113,7 +110,7 @@
113110
</connections>
114111
</imageView>
115112
<imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="BWi-7D-6z9">
116-
<rect key="frame" x="184" y="5" width="32" height="32"/>
113+
<rect key="frame" x="91" y="5" width="128" height="128"/>
117114
<constraints>
118115
<constraint firstAttribute="width" secondItem="BWi-7D-6z9" secondAttribute="height" multiplier="1:1" id="D7s-XB-4lM"/>
119116
</constraints>
@@ -123,7 +120,7 @@
123120
</connections>
124121
</imageView>
125122
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="U9D-nO-L12">
126-
<rect key="frame" x="21" y="2" width="165" height="17"/>
123+
<rect key="frame" x="21" y="2" width="72" height="17"/>
127124
<textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="description" id="lnB-mt-lsP">
128125
<font key="font" metaFont="systemLight" size="13"/>
129126
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -134,7 +131,7 @@
134131
</connections>
135132
</textField>
136133
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="drd-hV-059">
137-
<rect key="frame" x="21" y="23" width="165" height="17"/>
134+
<rect key="frame" x="21" y="119" width="72" height="17"/>
138135
<textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="displayName" id="IV9-h3-DQ0">
139136
<font key="font" metaFont="systemMedium" size="13"/>
140137
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -171,11 +168,11 @@
171168
<nil key="backgroundColor"/>
172169
</clipView>
173170
<edgeInsets key="contentInsets" left="5" right="0.0" top="10" bottom="60"/>
174-
<scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="YES" id="6y1-ZO-fX2" customClass="TransparentScroller" customModule="SplashBuddy" customModuleProvider="target">
171+
<scroller key="horizontalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="YES" id="6y1-ZO-fX2" customClass="TransparentScroller" customModule="SplashBuddy" customModuleProvider="target">
175172
<rect key="frame" x="5" y="524" width="224" height="16"/>
176173
<autoresizingMask key="autoresizingMask"/>
177174
</scroller>
178-
<scroller key="verticalScroller" hidden="YES" verticalHuggingPriority="750" doubleValue="0.13235294117647059" horizontal="NO" id="oUS-tj-Dbn" customClass="TransparentScroller" customModule="SplashBuddy" customModuleProvider="target">
175+
<scroller key="verticalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" doubleValue="0.13235294117647059" horizontal="NO" id="oUS-tj-Dbn" customClass="TransparentScroller" customModule="SplashBuddy" customModuleProvider="target">
179176
<rect key="frame" x="224" y="17" width="15" height="102"/>
180177
<autoresizingMask key="autoresizingMask"/>
181178
</scroller>
@@ -221,18 +218,18 @@
221218
<customView translatesAutoresizingMaskIntoConstraints="NO" id="9z5-8K-Bsy">
222219
<rect key="frame" x="0.0" y="0.0" width="800" height="60"/>
223220
<subviews>
224-
<visualEffectView wantsLayer="YES" blendingMode="withinWindow" material="mediumLight" state="followsWindowActiveState" translatesAutoresizingMaskIntoConstraints="NO" id="VIc-9A-62o">
221+
<visualEffectView wantsLayer="YES" blendingMode="withinWindow" material="titlebar" state="followsWindowActiveState" translatesAutoresizingMaskIntoConstraints="NO" id="VIc-9A-62o">
225222
<rect key="frame" x="0.0" y="0.0" width="800" height="60"/>
226223
</visualEffectView>
227224
<stackView distribution="fill" orientation="vertical" alignment="centerX" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="qF2-Zf-dqr">
228-
<rect key="frame" x="119" y="8" width="562" height="43"/>
225+
<rect key="frame" x="119" y="9" width="562" height="43"/>
229226
<subviews>
230227
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="huH-bF-pmn">
231228
<rect key="frame" x="-2" y="26" width="566" height="17"/>
232229
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" title="Label" id="gAE-fA-iyd">
233230
<font key="font" metaFont="system"/>
234231
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
235-
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
232+
<color key="backgroundColor" name="labelColor" catalog="System" colorSpace="catalog"/>
236233
</textFieldCell>
237234
</textField>
238235
<progressIndicator wantsLayer="YES" maxValue="100" indeterminate="YES" style="bar" translatesAutoresizingMaskIntoConstraints="NO" id="Are-bh-n7c">
@@ -257,7 +254,7 @@
257254
</customSpacing>
258255
</stackView>
259256
<button horizontalHuggingPriority="750" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="k7a-CL-x2G">
260-
<rect key="frame" x="691" y="12" width="95" height="32"/>
257+
<rect key="frame" x="691" y="13" width="95" height="32"/>
261258
<buttonCell key="cell" type="push" title="Continue" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="jcN-QC-epo">
262259
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
263260
<font key="font" metaFont="system"/>
@@ -373,7 +370,7 @@
373370
</scene>
374371
</scenes>
375372
<resources>
376-
<image name="NSAdvanced" width="32" height="32"/>
373+
<image name="NSAdvanced" width="128" height="128"/>
377374
<image name="NSStatusAvailable" width="16" height="16"/>
378375
</resources>
379376
</document>

‎SplashBuddy/Views/Main/MainViewController_Actions.swift‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ extension MainViewController {
3131
/// reset the status label to "We are preparing your Mac…"
3232
@objc func resetStatusLabel() {
3333
statusLabel.stringValue = NSLocalizedString("actions.preparing_your_mac")
34-
statusLabel.textColor = .black
3534
}
3635

3736
/// sets the status label to display an error

0 commit comments

Comments
 (0)