Skip to content

Commit

Permalink
Preps for Big Sur. All frameworks and Eloquent itself are prepared Ap…
Browse files Browse the repository at this point in the history 
…ple Silicon. Some UI fixes are in there as well. Fix for: #52 and #60.
  • Loading branch information
@mdbergmann
mdbergmann committed Nov 15, 2020
1 parent 890f61b commit 08f9045
Show file tree
Hide file tree
Showing 304 changed files with 9,880 additions and 512 deletions.
27 changes: 14 additions & 13 deletions English.lproj/About.xib → Base.lproj/About.xib
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="13771" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="17506" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="13771"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="17506"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
Expand All @@ -20,13 +20,13 @@
<windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES"/>
<windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
<rect key="contentRect" x="240" y="356" width="397" height="438"/>
<rect key="screenRect" x="0.0" y="0.0" width="2560" height="1418"/>
<rect key="screenRect" x="0.0" y="0.0" width="2560" height="1415"/>
<value key="minSize" type="size" width="213" height="107"/>
<view key="contentView" id="6">
<rect key="frame" x="0.0" y="0.0" width="397" height="438"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<textField verticalHuggingPriority="750" id="8">
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="8">
<rect key="frame" x="17" y="257" width="363" height="17"/>
<autoresizingMask key="autoresizingMask"/>
<textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="center" title="Eloquent" id="21">
Expand All @@ -35,7 +35,7 @@
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<textField verticalHuggingPriority="750" id="9">
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="9">
<rect key="frame" x="20" y="236" width="357" height="13"/>
<autoresizingMask key="autoresizingMask"/>
<textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="center" title="Version: 0.6.2" id="22">
Expand All @@ -44,23 +44,23 @@
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<scrollView autohidesScrollers="YES" horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" id="10">
<scrollView fixedFrame="YES" autohidesScrollers="YES" horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="10">
<rect key="frame" x="20" y="53" width="357" height="175"/>
<autoresizingMask key="autoresizingMask"/>
<clipView key="contentView" id="JmW-zx-e2c">
<clipView key="contentView" drawsBackground="NO" id="JmW-zx-e2c">
<rect key="frame" x="1" y="1" width="355" height="173"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<textView importsGraphics="NO" verticallyResizable="YES" spellingCorrection="YES" id="11">
<rect key="frame" x="0.0" y="0.0" width="355" height="173"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
<size key="minSize" width="355" height="173"/>
<size key="maxSize" width="712" height="10000000"/>
<color key="insertionPointColor" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
<color key="insertionPointColor" name="textColor" catalog="System" colorSpace="catalog"/>
</textView>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
</clipView>
<scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" doubleValue="1" controlSize="small" horizontal="YES" id="25">
<rect key="frame" x="-100" y="-100" width="87" height="18"/>
Expand All @@ -71,22 +71,23 @@
<autoresizingMask key="autoresizingMask"/>
</scroller>
</scrollView>
<textField verticalHuggingPriority="750" id="12">
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="12">
<rect key="frame" x="20" y="20" width="357" height="13"/>
<autoresizingMask key="autoresizingMask"/>
<textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="center" title="Copyright: Crosswire 2010-2018" id="23">
<textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="center" title="Copyright: Crosswire 2010-2020" id="23">
<font key="font" metaFont="label"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<imageView id="26">
<imageView fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="26">
<rect key="frame" x="134" y="290" width="128" height="128"/>
<autoresizingMask key="autoresizingMask"/>
<imageCell key="cell" refusesFirstResponder="YES" alignment="left" animates="YES" imageScaling="proportionallyDown" image="Eloquent" id="27"/>
</imageView>
</subviews>
</view>
<point key="canvasLocation" x="139" y="144"/>
</window>
</objects>
<resources>
Expand Down
23 changes: 12 additions & 11 deletions English.lproj/BibleCombiView.xib → Base.lproj/BibleCombiView.xib
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="13771" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="17506" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="13771"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="17506"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
Expand All @@ -26,14 +26,15 @@
<rect key="frame" x="0.0" y="0.0" width="679" height="446"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<customView id="35" customClass="ThickDividerSplitView">
<customView fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="35" customClass="ThickDividerSplitView">
<rect key="frame" x="0.0" y="0.0" width="679" height="446"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<connections>
<outlet property="delegate" destination="-2" id="87"/>
</connections>
</customView>
</subviews>
<point key="canvasLocation" x="271" y="111"/>
</customView>
<customView id="37" userLabel="ParallelBibleView" customClass="NSSplitView">
<rect key="frame" x="0.0" y="0.0" width="576" height="361"/>
Expand All @@ -53,11 +54,11 @@
<rect key="frame" x="0.0" y="0.0" width="656" height="24"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
<subviews>
<customView id="195">
<customView fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="195">
<rect key="frame" x="95" y="0.0" width="465" height="24"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES"/>
<subviews>
<popUpButton verticalHuggingPriority="750" id="113">
<popUpButton verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="113">
<rect key="frame" x="338" y="-2" width="107" height="25"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES"/>
<popUpButtonCell key="cell" type="recessed" title="Text Context" bezelStyle="recessed" alignment="center" controlSize="small" lineBreakMode="truncatingTail" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" pullsDown="YES" selectedItem="123" id="114">
Expand Down Expand Up @@ -93,7 +94,7 @@
</menu>
</popUpButtonCell>
</popUpButton>
<popUpButton verticalHuggingPriority="750" id="90">
<popUpButton verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="90">
<rect key="frame" x="252" y="-2" width="87" height="25"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES"/>
<popUpButtonCell key="cell" type="recessed" title="Font size" bezelStyle="recessed" alignment="center" controlSize="small" lineBreakMode="truncatingTail" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" pullsDown="YES" selectedItem="93" id="91">
Expand Down Expand Up @@ -132,7 +133,7 @@
</connections>
</popUpButtonCell>
</popUpButton>
<popUpButton verticalHuggingPriority="750" id="78">
<popUpButton verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="78">
<rect key="frame" x="129" y="-2" width="124" height="25"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES"/>
<popUpButtonCell key="cell" type="recessed" title="Display Options" bezelStyle="recessed" alignment="center" controlSize="small" lineBreakMode="truncatingTail" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" pullsDown="YES" selectedItem="81" id="79">
Expand All @@ -153,12 +154,12 @@
</menu>
</popUpButtonCell>
</popUpButton>
<popUpButton verticalHuggingPriority="750" id="46">
<popUpButton fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="46">
<rect key="frame" x="20" y="-2" width="110" height="25"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES"/>
<popUpButtonCell key="cell" type="recessed" title="Mod Options" bezelStyle="recessed" alignment="center" controlSize="small" lineBreakMode="truncatingTail" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" pullsDown="YES" selectedItem="49" id="47">
<popUpButtonCell key="cell" type="recessed" title="Mod Options" bezelStyle="recessed" alignment="center" controlSize="small" lineBreakMode="truncatingTail" imageScaling="proportionallyDown" inset="2" pullsDown="YES" selectedItem="49" id="47">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES" changeBackground="YES" changeGray="YES"/>
<font key="font" metaFont="cellTitle"/>
<font key="font" metaFont="system" size="12"/>
<menu key="menu" title="OtherViews" id="48">
<items>
<menuItem title="Mod Options" hidden="YES" id="49"/>
Expand Down Expand Up @@ -211,7 +212,7 @@
</subviews>
</customView>
</subviews>
<point key="canvasLocation" x="95" y="223"/>
<point key="canvasLocation" x="149" y="454"/>
</customView>
</objects>
</document>
Loading

0 comments on commit 08f9045

Please sign in to comment.