From da9ae7e0a9347dd0d6335645943b7802d9e5d03d Mon Sep 17 00:00:00 2001
From: App Developer Purview <appdeveloperpurview@Apps-Mac.local>
Date: Sun, 20 Dec 2020 22:20:54 -0300
Subject: [PATCH] [HOTFIX] BigSur glitch with toolbar

---
 Horos.xcodeproj/project.pbxproj           | 28 +++++++++++++++--------
 Horos/Info.plist                          |  4 ++--
 Horos/Resources/en.lproj/ToolbarPanel.xib | 14 ++++++------
 3 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/Horos.xcodeproj/project.pbxproj b/Horos.xcodeproj/project.pbxproj
index cc0c29900c..6bda31ffda 100644
--- a/Horos.xcodeproj/project.pbxproj
+++ b/Horos.xcodeproj/project.pbxproj
@@ -13289,6 +13289,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = x86_64;
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
 				CLANG_CXX_LIBRARY = "libc++";
@@ -13333,11 +13334,12 @@
 		43E98D1A1A32BF6A001B9E51 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				ARCHS = x86_64;
 				CODE_SIGN_ENTITLEMENTS = Horos/Horos.entitlements;
-				CODE_SIGN_IDENTITY = "Developer ID Application";
+				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 20191211;
-				DEVELOPMENT_TEAM = "";
+				CURRENT_PROJECT_VERSION = 20201201;
+				DEVELOPMENT_TEAM = TPT6TVH8UY;
 				ENABLE_HARDENED_RUNTIME = YES;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -13388,6 +13390,8 @@
 		43E98D1C1A32BF6A001B9E51 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				CODE_SIGN_IDENTITY = "Apple Development";
+				DEVELOPMENT_TEAM = TPT6TVH8UY;
 				DYLIB_COMPATIBILITY_VERSION = 1.0.0;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "DCM Framework/prefix.pch";
@@ -13433,7 +13437,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CODE_SIGN_ENTITLEMENTS = Decompress/Decompress.entitlements;
-				CODE_SIGN_IDENTITY = "Developer ID Application";
+				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Manual;
 				DEVELOPMENT_TEAM = TPT6TVH8UY;
 				ENABLE_HARDENED_RUNTIME = YES;
@@ -13465,7 +13469,7 @@
 		43E98D231A32BF6A001B9E51 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				CODE_SIGN_IDENTITY = "Developer ID Application";
+				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Manual;
 				DEVELOPMENT_TEAM = TPT6TVH8UY;
 				DYLIB_COMPATIBILITY_VERSION = 1.0.0;
@@ -13594,6 +13598,8 @@
 		7E76BEC1085757B60073649A /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				CODE_SIGN_IDENTITY = "Apple Development";
+				DEVELOPMENT_TEAM = TPT6TVH8UY;
 				DYLIB_COMPATIBILITY_VERSION = 1.0.0;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "DCM Framework/prefix.pch";
@@ -13624,11 +13630,12 @@
 		7E76BEC7085757B70073649A /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				ARCHS = x86_64;
 				CODE_SIGN_ENTITLEMENTS = Horos/Horos.entitlements;
-				CODE_SIGN_IDENTITY = "Developer ID Application";
+				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 20191211;
-				DEVELOPMENT_TEAM = "";
+				CURRENT_PROJECT_VERSION = 20201201;
+				DEVELOPMENT_TEAM = TPT6TVH8UY;
 				ENABLE_HARDENED_RUNTIME = YES;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -13685,6 +13692,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = x86_64;
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
 				CLANG_CXX_LIBRARY = "libc++";
@@ -13749,7 +13757,7 @@
 		AB0F3A2E1046BD2D004129DD /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				CODE_SIGN_IDENTITY = "Developer ID Application";
+				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Manual;
 				DEVELOPMENT_TEAM = TPT6TVH8UY;
 				DYLIB_COMPATIBILITY_VERSION = 1.0.0;
@@ -13767,7 +13775,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CODE_SIGN_ENTITLEMENTS = Decompress/Decompress.entitlements;
-				CODE_SIGN_IDENTITY = "Developer ID Application";
+				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Manual;
 				DEVELOPMENT_TEAM = TPT6TVH8UY;
 				ENABLE_HARDENED_RUNTIME = YES;
diff --git a/Horos/Info.plist b/Horos/Info.plist
index 3c8303e24e..4f748c1a49 100644
--- a/Horos/Info.plist
+++ b/Horos/Info.plist
@@ -191,7 +191,7 @@
 	<key>CFBundleExecutable</key>
 	<string>Horos</string>
 	<key>CFBundleGetInfoString</key>
-	<string>Horos v4.0.0 RC4</string>
+	<string>Horos v4.0.0 RC5</string>
 	<key>CFBundleIconFile</key>
 	<string>Horos.icns</string>
 	<key>CFBundleIdentifier</key>
@@ -238,7 +238,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>20200331</string>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>GitHash</key>
 	<string></string>
 	<key>GitState</key>
diff --git a/Horos/Resources/en.lproj/ToolbarPanel.xib b/Horos/Resources/en.lproj/ToolbarPanel.xib
index dde3c98d9a..cf34226e3a 100644
--- a/Horos/Resources/en.lproj/ToolbarPanel.xib
+++ b/Horos/Resources/en.lproj/ToolbarPanel.xib
@@ -1,8 +1,7 @@
 <?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">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="15705" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
-        <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14313.18"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="15705"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -12,16 +11,17 @@
             </connections>
         </customObject>
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
-        <customObject id="-3" userLabel="Application"/>
-        <window title="Toolbar" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" deferred="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="none" id="188" userLabel="Panel" customClass="ToolBarNSWindow">
-            <windowStyleMask key="styleMask" titled="YES" utility="YES" nonactivatingPanel="YES" texturedBackground="YES"/>
+        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
+        <window allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" deferred="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="none" id="188" userLabel="Panel" customClass="ToolBarNSWindow">
+            <windowStyleMask key="styleMask" titled="YES" nonactivatingPanel="YES" texturedBackground="YES"/>
             <rect key="contentRect" x="0.0" y="0.0" width="1280" height="5"/>
-            <rect key="screenRect" x="0.0" y="0.0" width="1600" height="978"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="1920" height="1057"/>
             <value key="minSize" type="size" width="200" height="5"/>
             <view key="contentView" id="187">
                 <rect key="frame" x="0.0" y="0.0" width="1280" height="5"/>
                 <autoresizingMask key="autoresizingMask"/>
             </view>
+            <point key="canvasLocation" x="139" y="151"/>
         </window>
     </objects>
 </document>