Skip to content

Commit 8fe24c2

Browse files
mdbergmannmdbergmann
committed
opting out of dark mode for now. requires a bit more time to get this done properly.
1 parent 9e9aa92 commit 8fe24c2

File tree

6 files changed

+46
-16
lines changed

6 files changed

+46
-16
lines changed

‎Eloquent-AppStore-Info.plist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
</dict>
4444
</array>
4545
<key>CFBundleVersion</key>
46-
<string>3058</string>
46+
<string>3066</string>
4747
<key>LSApplicationCategoryType</key>
4848
<string>public.app-category.education</string>
4949
<key>NSAppTransportSecurity</key>

‎Eloquent.xcodeproj/project.pbxproj‎

Lines changed: 31 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1511,7 +1511,7 @@
15111511
isa = PBXProject;
15121512
attributes = {
15131513
LastTestingUpgradeCheck = 0730;
1514-
LastUpgradeCheck = 0800;
1514+
LastUpgradeCheck = 1220;
15151515
ORGANIZATIONNAME = Crosswire;
15161516
TargetAttributes = {
15171517
8D1107260486CEB800E47090 = {
@@ -2316,6 +2316,7 @@
23162316
COMBINE_HIDPI_IMAGES = YES;
23172317
COPY_PHASE_STRIP = NO;
23182318
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
2319+
ENABLE_HARDENED_RUNTIME = YES;
23192320
FRAMEWORK_SEARCH_PATHS = (
23202321
"$(inherited)",
23212322
"$(PROJECT_DIR)/Resources",
@@ -2367,6 +2368,7 @@
23672368
CODE_SIGN_IDENTITY = "Mac Developer";
23682369
COMBINE_HIDPI_IMAGES = YES;
23692370
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
2371+
ENABLE_HARDENED_RUNTIME = YES;
23702372
FRAMEWORK_SEARCH_PATHS = (
23712373
"$(inherited)",
23722374
"$(PROJECT_DIR)/Resources",
@@ -2406,6 +2408,7 @@
24062408
A9CA81A112D0B912005346FD /* Debug */ = {
24072409
isa = XCBuildConfiguration;
24082410
buildSettings = {
2411+
CLANG_ENABLE_OBJC_WEAK = YES;
24092412
COMBINE_HIDPI_IMAGES = YES;
24102413
COPY_PHASE_STRIP = NO;
24112414
GCC_DYNAMIC_NO_PIC = NO;
@@ -2417,6 +2420,7 @@
24172420
A9CA81A212D0B912005346FD /* Release */ = {
24182421
isa = XCBuildConfiguration;
24192422
buildSettings = {
2423+
CLANG_ENABLE_OBJC_WEAK = YES;
24202424
COMBINE_HIDPI_IMAGES = YES;
24212425
COPY_PHASE_STRIP = YES;
24222426
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
@@ -2428,6 +2432,7 @@
24282432
A9CA81A612D0B946005346FD /* Debug */ = {
24292433
isa = XCBuildConfiguration;
24302434
buildSettings = {
2435+
CLANG_ENABLE_OBJC_WEAK = YES;
24312436
COMBINE_HIDPI_IMAGES = YES;
24322437
COPY_PHASE_STRIP = NO;
24332438
GCC_DYNAMIC_NO_PIC = NO;
@@ -2439,6 +2444,7 @@
24392444
A9CA81A712D0B946005346FD /* Release */ = {
24402445
isa = XCBuildConfiguration;
24412446
buildSettings = {
2447+
CLANG_ENABLE_OBJC_WEAK = YES;
24422448
COMBINE_HIDPI_IMAGES = YES;
24432449
COPY_PHASE_STRIP = YES;
24442450
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
@@ -2451,6 +2457,7 @@
24512457
isa = XCBuildConfiguration;
24522458
buildSettings = {
24532459
ALWAYS_SEARCH_USER_PATHS = NO;
2460+
CLANG_ENABLE_OBJC_WEAK = YES;
24542461
COMBINE_HIDPI_IMAGES = YES;
24552462
COPY_PHASE_STRIP = NO;
24562463
FRAMEWORK_SEARCH_PATHS = (
@@ -2494,6 +2501,7 @@
24942501
isa = XCBuildConfiguration;
24952502
buildSettings = {
24962503
ALWAYS_SEARCH_USER_PATHS = NO;
2504+
CLANG_ENABLE_OBJC_WEAK = YES;
24972505
COMBINE_HIDPI_IMAGES = YES;
24982506
COPY_PHASE_STRIP = YES;
24992507
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
@@ -2535,6 +2543,7 @@
25352543
COPY_PHASE_STRIP = NO;
25362544
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
25372545
DEVELOPMENT_TEAM = 27XS5W9C3J;
2546+
ENABLE_HARDENED_RUNTIME = YES;
25382547
FRAMEWORK_SEARCH_PATHS = (
25392548
"$(inherited)",
25402549
"$(PROJECT_DIR)/Resources",
@@ -2585,6 +2594,7 @@
25852594
COMBINE_HIDPI_IMAGES = YES;
25862595
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
25872596
DEVELOPMENT_TEAM = 27XS5W9C3J;
2597+
ENABLE_HARDENED_RUNTIME = YES;
25882598
FRAMEWORK_SEARCH_PATHS = (
25892599
"$(inherited)",
25902600
"$(PROJECT_DIR)/Resources",
@@ -2624,16 +2634,25 @@
26242634
isa = XCBuildConfiguration;
26252635
buildSettings = {
26262636
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
2637+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
26272638
CLANG_WARN_BOOL_CONVERSION = YES;
2639+
CLANG_WARN_COMMA = YES;
26282640
CLANG_WARN_CONSTANT_CONVERSION = YES;
2641+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
26292642
CLANG_WARN_EMPTY_BODY = YES;
26302643
CLANG_WARN_ENUM_CONVERSION = YES;
26312644
CLANG_WARN_INFINITE_RECURSION = YES;
26322645
CLANG_WARN_INT_CONVERSION = YES;
2646+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
2647+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
2648+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
2649+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
2650+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
2651+
CLANG_WARN_STRICT_PROTOTYPES = YES;
26332652
CLANG_WARN_SUSPICIOUS_MOVE = YES;
26342653
CLANG_WARN_UNREACHABLE_CODE = YES;
26352654
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
2636-
CODE_SIGN_IDENTITY = "Developer ID Application: Manfred Bergmann";
2655+
CODE_SIGN_IDENTITY = "Apple Development";
26372656
ENABLE_STRICT_OBJC_MSGSEND = YES;
26382657
ENABLE_TESTABILITY = YES;
26392658
GCC_C_LANGUAGE_STANDARD = c99;
@@ -2660,16 +2679,25 @@
26602679
isa = XCBuildConfiguration;
26612680
buildSettings = {
26622681
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
2682+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
26632683
CLANG_WARN_BOOL_CONVERSION = YES;
2684+
CLANG_WARN_COMMA = YES;
26642685
CLANG_WARN_CONSTANT_CONVERSION = YES;
2686+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
26652687
CLANG_WARN_EMPTY_BODY = YES;
26662688
CLANG_WARN_ENUM_CONVERSION = YES;
26672689
CLANG_WARN_INFINITE_RECURSION = YES;
26682690
CLANG_WARN_INT_CONVERSION = YES;
2691+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
2692+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
2693+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
2694+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
2695+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
2696+
CLANG_WARN_STRICT_PROTOTYPES = YES;
26692697
CLANG_WARN_SUSPICIOUS_MOVE = YES;
26702698
CLANG_WARN_UNREACHABLE_CODE = YES;
26712699
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
2672-
CODE_SIGN_IDENTITY = "Developer ID Application: Manfred Bergmann";
2700+
CODE_SIGN_IDENTITY = "Apple Development";
26732701
ENABLE_STRICT_OBJC_MSGSEND = YES;
26742702
GCC_C_LANGUAGE_STANDARD = c99;
26752703
GCC_NO_COMMON_BLOCKS = YES;

‎Info.plist‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
</dict>
4444
</array>
4545
<key>CFBundleVersion</key>
46-
<string>3058</string>
46+
<string>3066</string>
4747
<key>LSApplicationCategoryType</key>
4848
<string>public.app-category.education</string>
4949
<key>NSAppTransportSecurity</key>
@@ -55,6 +55,8 @@
5555
<string>MainMenu</string>
5656
<key>NSPrincipalClass</key>
5757
<string>NSApplication</string>
58+
<key>NSRequiresAquaSystemAppearance</key>
59+
<true/>
5860
<key>SUFeedURL</key>
5961
<string>http://www.eloquent-bible-study.eu/Eloquent_L2_Appcast.xml</string>
6062
<key>SUPublicDSAKeyFile</key>

‎buildnumber‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3058
1+
3066

‎en.lproj/WindowHostToolbar.xib‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="17506" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
2+
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="17701" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
33
<dependencies>
4-
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="17506"/>
4+
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="17701"/>
55
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
66
</dependencies>
77
<objects>
@@ -19,16 +19,14 @@
1919
</customObject>
2020
<customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
2121
<customObject id="-3" userLabel="Application" customClass="NSObject"/>
22-
<toolbar implicitIdentifier="09D11707-F4A3-4FD5-970E-AC5832E91C2B" displayMode="iconOnly" sizeMode="regular" id="1">
22+
<toolbar implicitIdentifier="09D11707-F4A3-4FD5-970E-AC5832E91C2B" centeredItem="123" displayMode="iconOnly" sizeMode="regular" id="1">
2323
<allowedToolbarItems>
2424
<toolbarItem implicitItemIdentifier="NSToolbarSpaceItem" id="142"/>
2525
<toolbarItem implicitItemIdentifier="NSToolbarFlexibleSpaceItem" id="129"/>
26-
<toolbarItem implicitItemIdentifier="32FF0C2B-7E19-43E3-93C7-1974A5B9EE7A" explicitItemIdentifier="ReferenceTextField" label="Reference text" paletteLabel="Reference text" id="123">
26+
<toolbarItem implicitItemIdentifier="32FF0C2B-7E19-43E3-93C7-1974A5B9EE7A" explicitItemIdentifier="ReferenceTextField" label="Reference text" paletteLabel="Reference text" sizingBehavior="auto" id="123">
2727
<nil key="toolTip"/>
28-
<size key="minSize" width="200" height="22"/>
29-
<size key="maxSize" width="2000" height="22"/>
30-
<searchField key="view" wantsLayer="YES" verticalHuggingPriority="750" id="109">
31-
<rect key="frame" x="0.0" y="14" width="728" height="22"/>
28+
<searchField key="view" wantsLayer="YES" verticalHuggingPriority="750" preferredMaxLayoutWidth="650" id="109">
29+
<rect key="frame" x="0.0" y="14" width="650" height="22"/>
3230
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
3331
<searchFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" borderStyle="bezel" bezelStyle="round" id="110">
3432
<font key="font" metaFont="system"/>
@@ -156,7 +154,7 @@
156154
<connections>
157155
<outlet property="delegate" destination="-2" id="62"/>
158156
</connections>
159-
<point key="canvasLocation" x="333" y="129"/>
157+
<point key="canvasLocation" x="447" y="152"/>
160158
</toolbar>
161159
</objects>
162160
<resources>

‎src/UserInterface/ToolbarController.m‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,11 @@ - (void)_loadNib {
2929

3030
- (void)awakeFromNib {
3131
[toolbar setAllowsUserCustomization:YES];
32+
/*
3233
[searchTextField setFrameSize:CGSizeMake(650.0, [searchTextField frame].size.height)];
3334
[searchTextFieldItem setMaxSize:CGSizeMake(650.0, [searchTextField frame].size.height)];
34-
[searchTextFieldItem setMinSize:CGSizeMake(15.0, [searchTextField frame].size.height)];
35+
[searchTextFieldItem setMinSize:CGSizeMake(50.0, [searchTextField frame].size.height)];
36+
*/
3537
}
3638

3739
- (NSToolbar *)toolbar {

0 commit comments

Comments
 (0)