removed registration reminder

twocanoes · Oct 14, 2022 · 738dff1 · 738dff1
1 parent 663dfa9
commit 738dff1
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 33 deletions.
diff --git a/XCredsLoginPlugIn/LoginWindow/LoginWindowControls.xib b/XCredsLoginPlugIn/LoginWindow/LoginWindowControls.xib
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="20037" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="21225" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="20037"/>
+        <deployment identifier="macosx"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21225"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="LoginWindowControlsWindowController" customModule="XCredsLoginPlugin" customModuleProvider="target">
             <connections>
                 <outlet property="macLoginWindowGribColumn" destination="wvm-rM-lRK" id="bUx-fo-f3O"/>
-                <outlet property="registrationStatusTextField" destination="j8S-sz-JYh" id="3HS-7p-DeF"/>
                 <outlet property="versionTextField" destination="CZW-Aq-1af" id="4tX-3s-sXH"/>
                 <outlet property="wifiGridColumn" destination="1Cd-fS-KBP" id="nYv-8P-Xte"/>
                 <outlet property="window" destination="wkO-FS-5uW" id="ui3-ZB-mfw"/>
@@ -20,7 +20,7 @@
             <windowStyleMask key="styleMask" closable="YES" miniaturizable="YES" resizable="YES"/>
             <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
             <rect key="contentRect" x="25" y="25" width="872" height="117"/>
-            <rect key="screenRect" x="0.0" y="0.0" width="1536" height="935"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="2048" height="833"/>
             <view key="contentView" id="Tpj-ss-EMv">
                 <rect key="frame" x="0.0" y="0.0" width="872" height="117"/>
                 <autoresizingMask key="autoresizingMask"/>
@@ -56,7 +56,7 @@
                                     </gridCell>
                                     <gridCell row="XHx-7d-YkX" column="cUX-O2-zNV" xPlacement="center" id="2Gc-hy-IjQ">
                                         <button key="contentView" imageHugsTitle="YES" translatesAutoresizingMaskIntoConstraints="NO" id="6f9-0z-Xqg">
-                                            <rect key="frame" x="154" y="0.0" width="65" height="48"/>
+                                            <rect key="frame" x="153" y="0.0" width="66" height="48"/>
                                             <buttonCell key="cell" type="bevel" title="Shutdown" bezelStyle="rounded" image="ShutdownX" imagePosition="above" alignment="center" imageScaling="proportionallyDown" inset="2" id="WRj-LR-MaW">
                                                 <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                                 <font key="font" metaFont="system"/>
@@ -124,25 +124,14 @@
                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
                     </textField>
-                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="j8S-sz-JYh">
-                        <rect key="frame" x="0.0" y="100" width="872" height="19"/>
-                        <textFieldCell key="cell" lineBreakMode="clipping" alignment="center" title="Unsupported – Visit twocanoes.com/xcreds/support for support options." drawsBackground="YES" id="svS-FM-3Ap">
-                            <font key="font" metaFont="system" size="16"/>
-                            <color key="textColor" name="systemBlueColor" catalog="System" colorSpace="catalog"/>
-                            <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
-                        </textFieldCell>
-                    </textField>
                 </subviews>
                 <constraints>
                     <constraint firstItem="sxl-0U-ne5" firstAttribute="centerY" secondItem="Tpj-ss-EMv" secondAttribute="centerY" constant="0.5" id="2Wq-KM-ceX"/>
-                    <constraint firstAttribute="trailing" secondItem="j8S-sz-JYh" secondAttribute="trailing" id="G2y-HN-hus"/>
                     <constraint firstAttribute="bottom" secondItem="CZW-Aq-1af" secondAttribute="bottom" constant="2" id="GqF-H9-jma"/>
                     <constraint firstAttribute="trailing" secondItem="sxl-0U-ne5" secondAttribute="trailing" id="HvD-9w-Gp7"/>
                     <constraint firstItem="CZW-Aq-1af" firstAttribute="leading" secondItem="Tpj-ss-EMv" secondAttribute="leading" constant="12" id="LV2-Cx-B9c"/>
                     <constraint firstItem="sxl-0U-ne5" firstAttribute="leading" secondItem="Tpj-ss-EMv" secondAttribute="leading" id="P6t-00-a6e"/>
-                    <constraint firstItem="j8S-sz-JYh" firstAttribute="leading" secondItem="Tpj-ss-EMv" secondAttribute="leading" id="XMe-Pn-TXa"/>
                     <constraint firstItem="sxl-0U-ne5" firstAttribute="centerX" secondItem="Tpj-ss-EMv" secondAttribute="centerX" id="eIH-vl-2ht"/>
-                    <constraint firstItem="j8S-sz-JYh" firstAttribute="top" secondItem="Tpj-ss-EMv" secondAttribute="top" constant="-2" id="vFY-za-hwI"/>
                 </constraints>
             </view>
             <point key="canvasLocation" x="-622" y="724.5"/>
@@ -151,7 +140,7 @@
     <resources>
         <image name="RestartX" width="32" height="32"/>
         <image name="ShutdownX" width="32" height="32"/>
-        <image name="loginwindow" width="41" height="31.5"/>
+        <image name="loginwindow" width="41" height="32"/>
         <image name="refresh symbol" width="989" height="989"/>
         <image name="wifi" width="32" height="32"/>
     </resources>

diff --git a/XCredsLoginPlugIn/LoginWindow/LoginWindowControlsWindowController.swift b/XCredsLoginPlugIn/LoginWindow/LoginWindowControlsWindowController.swift
@@ -10,7 +10,6 @@ import Cocoa
 class LoginWindowControlsWindowController: NSWindowController {
     var delegate: XCredsMechanismProtocol?
 
-    @IBOutlet weak var registrationStatusTextField: NSTextField?
     @IBOutlet weak var macLoginWindowGribColumn: NSGridColumn?
     @IBOutlet weak var wifiGridColumn: NSGridColumn?
     let uiLog = "uiLog"
@@ -62,7 +61,6 @@ class LoginWindowControlsWindowController: NSWindowController {
 
             self.versionTextField?.isHidden = !UserDefaults.standard.bool(forKey: PrefKeys.shouldShowVersionInfo.rawValue)
 
-            self.registrationStatusTextField?.isHidden = !UserDefaults.standard.bool(forKey: PrefKeys.shouldShowSupportStatus.rawValue)
 
 
             self.window?.level = .screenSaver

diff --git a/build_resources/Packages/XCreds Uninstaller/XCreds Uninstaller.pkgproj b/build_resources/Packages/XCreds Uninstaller/XCreds Uninstaller.pkgproj
@@ -777,9 +777,9 @@
 				<key>POSTINSTALL_PATH</key>
 				<dict>
 					<key>PATH</key>
-					<string>/Users/tperfitt/Documents/Projects/xcreds/build_resources/Packages/XCreds Uninstaller/Scripts/postinstall.sh</string>
+					<string>Scripts/postinstall.sh</string>
 					<key>PATH_TYPE</key>
-					<integer>0</integer>
+					<integer>1</integer>
 				</dict>
 				<key>PREINSTALL_PATH</key>
 				<dict>

diff --git a/build_resources/Packages/XCreds/XCreds_template.pkgproj b/build_resources/Packages/XCreds/XCreds_template.pkgproj
@@ -773,16 +773,16 @@
 				<key>POSTINSTALL_PATH</key>
 				<dict>
 					<key>PATH</key>
-					<string>/Users/tperfitt/Documents/Projects/xcreds/build_resources/Packages/XCreds/scripts/postinstall.sh</string>
+					<string>scripts/postinstall.sh</string>
 					<key>PATH_TYPE</key>
-					<integer>0</integer>
+					<integer>1</integer>
 				</dict>
 				<key>PREINSTALL_PATH</key>
 				<dict>
 					<key>PATH</key>
-					<string>/Users/tperfitt/Documents/Projects/xcreds/build_resources/Packages/XCreds/scripts/preinstall.sh</string>
+					<string>scripts/preinstall.sh</string>
 					<key>PATH_TYPE</key>
-					<integer>0</integer>
+					<integer>1</integer>
 				</dict>
 				<key>RESOURCES</key>
 				<array/>
@@ -977,9 +977,9 @@
 						<key>VALUE</key>
 						<dict>
 							<key>PATH</key>
-							<string>/Users/tperfitt/Documents/Projects/SecureRemoteAccess/build_resources/Packages/Secure Remote Access/Success.rtfd</string>
+							<string>Success.rtfd</string>
 							<key>PATH_TYPE</key>
-							<integer>0</integer>
+							<integer>1</integer>
 						</dict>
 					</dict>
 				</array>

diff --git a/xCreds.xcodeproj/project.pbxproj b/xCreds.xcodeproj/project.pbxproj
@@ -893,7 +893,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 3295;
+				CURRENT_PROJECT_VERSION = 3300;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = UXP6YEHSPW;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -924,7 +924,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 3295;
+				CURRENT_PROJECT_VERSION = 3300;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = UXP6YEHSPW;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -983,7 +983,7 @@
 				CODE_SIGN_ENTITLEMENTS = "XCreds Login Overlay/XCreds_Login_Overlay.entitlements";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 3295;
+				CURRENT_PROJECT_VERSION = 3300;
 				DEVELOPMENT_TEAM = UXP6YEHSPW;
 				ENABLE_HARDENED_RUNTIME = YES;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -1013,7 +1013,7 @@
 				CODE_SIGN_ENTITLEMENTS = "XCreds Login Overlay/XCreds_Login_Overlay.entitlements";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 3295;
+				CURRENT_PROJECT_VERSION = 3300;
 				DEVELOPMENT_TEAM = UXP6YEHSPW;
 				ENABLE_HARDENED_RUNTIME = YES;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -1156,7 +1156,7 @@
 				CODE_SIGN_ENTITLEMENTS = XCreds/xCreds.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 3295;
+				CURRENT_PROJECT_VERSION = 3300;
 				DEVELOPMENT_TEAM = UXP6YEHSPW;
 				ENABLE_HARDENED_RUNTIME = YES;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -1185,7 +1185,7 @@
 				CODE_SIGN_ENTITLEMENTS = XCreds/xCreds.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 3295;
+				CURRENT_PROJECT_VERSION = 3300;
 				DEVELOPMENT_TEAM = UXP6YEHSPW;
 				ENABLE_HARDENED_RUNTIME = YES;
 				GENERATE_INFOPLIST_FILE = YES;

diff --git a/...deproj/project.xcworkspace/xcuserdata/tperfitt.xcuserdatad/UserInterfaceState.xcuserstate b/...deproj/project.xcworkspace/xcuserdata/tperfitt.xcuserdatad/UserInterfaceState.xcuserstate