From 39238307f5a75eadd4b6e1212415ef007df20755 Mon Sep 17 00:00:00 2001 From: Claire Date: Sat, 24 Sep 2022 20:33:31 -0700 Subject: [PATCH] Reconfigured to use xib instead of storyboard --- LunaMac.xcodeproj/project.pbxproj | 26 +- LunaMac/AppDelegate.swift | 10 +- LunaMac/Base.lproj/Main.storyboard | 739 ----------------------------- LunaMac/Base.lproj/MainMenu.xib | 17 + LunaMac/Info.plist | 16 +- LunaMac/LunaMac.entitlements | 7 +- LunaMac/changelog.txt | 1 - 7 files changed, 47 insertions(+), 769 deletions(-) delete mode 100644 LunaMac/Base.lproj/Main.storyboard create mode 100644 LunaMac/Base.lproj/MainMenu.xib diff --git a/LunaMac.xcodeproj/project.pbxproj b/LunaMac.xcodeproj/project.pbxproj index 8f14717..06c6c2e 100644 --- a/LunaMac.xcodeproj/project.pbxproj +++ b/LunaMac.xcodeproj/project.pbxproj @@ -9,12 +9,11 @@ /* Begin PBXBuildFile section */ 7E0CBEA428DEB998009967CD /* Changelog.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7E0CBEA328DEB998009967CD /* Changelog.xib */; }; 7E0CBEA628DEBA80009967CD /* changelog.txt in Resources */ = {isa = PBXBuildFile; fileRef = 7E0CBEA528DEBA80009967CD /* changelog.txt */; }; - 7E7D006A28DFFAD800CD5D80 /* Main.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7E7D006928DFFAD800CD5D80 /* Main.xib */; }; 7E8188BB28DD423B0080C707 /* InfoBox.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7E8188BA28DD423B0080C707 /* InfoBox.xib */; }; 7E96D61628DD75BE00999EAE /* LunaMac.icns in Resources */ = {isa = PBXBuildFile; fileRef = 7E96D61528DD75BE00999EAE /* LunaMac.icns */; }; 7ECD0D7C28DD2A4100B90958 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7ECD0D7B28DD2A4100B90958 /* AppDelegate.swift */; }; 7ECD0D7E28DD2A4100B90958 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7ECD0D7D28DD2A4100B90958 /* ViewController.swift */; }; - 7ECD0D8328DD2A4200B90958 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 7ECD0D8128DD2A4200B90958 /* Main.storyboard */; }; + 7ECD26CC28E002A9000D5E2C /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7ECD26CA28E002A9000D5E2C /* MainMenu.xib */; }; 7EF79B3328DE1E4D00FF1F49 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 7EF79B3228DE1E4D00FF1F49 /* Assets.xcassets */; }; 7EF79BAE28DE395C00FF1F49 /* firstq-dark.png in Resources */ = {isa = PBXBuildFile; fileRef = 7EF79B9E28DE395C00FF1F49 /* firstq-dark.png */; }; 7EF79BAF28DE395C00FF1F49 /* firstq.png in Resources */ = {isa = PBXBuildFile; fileRef = 7EF79B9F28DE395C00FF1F49 /* firstq.png */; }; @@ -39,15 +38,14 @@ /* Begin PBXFileReference section */ 7E0CBEA328DEB998009967CD /* Changelog.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = Changelog.xib; sourceTree = ""; }; 7E0CBEA528DEBA80009967CD /* changelog.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = changelog.txt; sourceTree = ""; }; - 7E7D006928DFFAD800CD5D80 /* Main.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = Main.xib; sourceTree = ""; }; 7E8188BA28DD423B0080C707 /* InfoBox.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = InfoBox.xib; sourceTree = ""; }; 7E96D61528DD75BE00999EAE /* LunaMac.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = LunaMac.icns; sourceTree = ""; }; 7ECD0D7828DD2A4100B90958 /* LunaMac.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = LunaMac.app; sourceTree = BUILT_PRODUCTS_DIR; }; 7ECD0D7B28DD2A4100B90958 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 7ECD0D7D28DD2A4100B90958 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = ""; }; - 7ECD0D8228DD2A4200B90958 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; 7ECD0D8428DD2A4200B90958 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 7ECD0D8528DD2A4200B90958 /* LunaMac.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = LunaMac.entitlements; sourceTree = ""; }; + 7ECD26CB28E002A9000D5E2C /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/MainMenu.xib; sourceTree = ""; }; 7EF79B3228DE1E4D00FF1F49 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 7EF79B9E28DE395C00FF1F49 /* firstq-dark.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "firstq-dark.png"; sourceTree = ""; }; 7EF79B9F28DE395C00FF1F49 /* firstq.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = firstq.png; sourceTree = ""; }; @@ -99,18 +97,17 @@ 7ECD0D7A28DD2A4100B90958 /* LunaMac */ = { isa = PBXGroup; children = ( + 7EF79B3228DE1E4D00FF1F49 /* Assets.xcassets */, 7EF79B9D28DE395C00FF1F49 /* png */, + 7ECD0D8428DD2A4200B90958 /* Info.plist */, 7ECD0D7B28DD2A4100B90958 /* AppDelegate.swift */, 7ECD0D7D28DD2A4100B90958 /* ViewController.swift */, - 7EF79B3228DE1E4D00FF1F49 /* Assets.xcassets */, - 7E96D61528DD75BE00999EAE /* LunaMac.icns */, - 7ECD0D8428DD2A4200B90958 /* Info.plist */, - 7ECD0D8528DD2A4200B90958 /* LunaMac.entitlements */, - 7ECD0D8128DD2A4200B90958 /* Main.storyboard */, - 7E7D006928DFFAD800CD5D80 /* Main.xib */, + 7ECD26CA28E002A9000D5E2C /* MainMenu.xib */, 7E8188BA28DD423B0080C707 /* InfoBox.xib */, 7E0CBEA328DEB998009967CD /* Changelog.xib */, + 7E96D61528DD75BE00999EAE /* LunaMac.icns */, 7E0CBEA528DEBA80009967CD /* changelog.txt */, + 7ECD0D8528DD2A4200B90958 /* LunaMac.entitlements */, ); path = LunaMac; sourceTree = ""; @@ -214,10 +211,8 @@ 7EF79BB628DE395C00FF1F49 /* wanc-dark.png in Resources */, 7EF79BBB28DE395C00FF1F49 /* waxc.png in Resources */, 7EF79BB528DE395C00FF1F49 /* new.png in Resources */, - 7E7D006A28DFFAD800CD5D80 /* Main.xib in Resources */, 7EF79BB228DE395C00FF1F49 /* lastq-dark.png in Resources */, 7EF79BB328DE395C00FF1F49 /* lastq.png in Resources */, - 7ECD0D8328DD2A4200B90958 /* Main.storyboard in Resources */, 7E0CBEA428DEB998009967CD /* Changelog.xib in Resources */, 7EF79BB028DE395C00FF1F49 /* full-dark.png in Resources */, 7EF79BB128DE395C00FF1F49 /* full.png in Resources */, @@ -228,6 +223,7 @@ 7E96D61628DD75BE00999EAE /* LunaMac.icns in Resources */, 7EF79BB728DE395C00FF1F49 /* wanc.png in Resources */, 7EF79BBA28DE395C00FF1F49 /* waxc-dark.png in Resources */, + 7ECD26CC28E002A9000D5E2C /* MainMenu.xib in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -246,12 +242,12 @@ /* End PBXSourcesBuildPhase section */ /* Begin PBXVariantGroup section */ - 7ECD0D8128DD2A4200B90958 /* Main.storyboard */ = { + 7ECD26CA28E002A9000D5E2C /* MainMenu.xib */ = { isa = PBXVariantGroup; children = ( - 7ECD0D8228DD2A4200B90958 /* Base */, + 7ECD26CB28E002A9000D5E2C /* Base */, ); - name = Main.storyboard; + name = MainMenu.xib; sourceTree = ""; }; /* End PBXVariantGroup section */ diff --git a/LunaMac/AppDelegate.swift b/LunaMac/AppDelegate.swift index 107505e..4c16f7e 100644 --- a/LunaMac/AppDelegate.swift +++ b/LunaMac/AppDelegate.swift @@ -6,11 +6,11 @@ // Copyright © 2022 A Better Geek. All rights reserved. // /* -====== TO DO ======= - * auto-update at a set interval - * make help menu item work (show the window) - * fix alignment of status bar icon (it's too high) -*/ + ====== TO DO ======= + * auto-update at a set interval + * make help menu item work (show the window) + * fix alignment of status bar icon (it's too high) + */ import Cocoa import Foundation diff --git a/LunaMac/Base.lproj/Main.storyboard b/LunaMac/Base.lproj/Main.storyboard deleted file mode 100644 index 23633f3..0000000 --- a/LunaMac/Base.lproj/Main.storyboard +++ /dev/null @@ -1,739 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/LunaMac/Base.lproj/MainMenu.xib b/LunaMac/Base.lproj/MainMenu.xib new file mode 100644 index 0000000..8970279 --- /dev/null +++ b/LunaMac/Base.lproj/MainMenu.xib @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/LunaMac/Info.plist b/LunaMac/Info.plist index 47e190b..37d4baa 100644 --- a/LunaMac/Info.plist +++ b/LunaMac/Info.plist @@ -2,10 +2,8 @@ - NSMainStoryboardFile - Main - NSMainNibFile - Main + LSUIElement + CFBundleDevelopmentRegion $(DEVELOPMENT_LANGUAGE) CFBundleExecutable @@ -21,15 +19,17 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.2 + 1.3 CFBundleVersion - 1.2 + 1.3 + LSApplicationCategoryType + LSMinimumSystemVersion $(MACOSX_DEPLOYMENT_TARGET) - LSUIElement - NSHumanReadableCopyright Copyright © 2022 A Better Geek. All rights reserved. + NSMainNibFile + MainMenu NSPrincipalClass NSApplication diff --git a/LunaMac/LunaMac.entitlements b/LunaMac/LunaMac.entitlements index 0c67376..f2ef3ae 100644 --- a/LunaMac/LunaMac.entitlements +++ b/LunaMac/LunaMac.entitlements @@ -1,5 +1,10 @@ - + + com.apple.security.app-sandbox + + com.apple.security.files.user-selected.read-only + + diff --git a/LunaMac/changelog.txt b/LunaMac/changelog.txt index 5cb8b3d..7f1ddbf 100644 --- a/LunaMac/changelog.txt +++ b/LunaMac/changelog.txt @@ -3,7 +3,6 @@ v1.2 - Added automatic icon update as phase changes - Added changelog - - Fixed window duplication problem v1.1 - Updated icons to use images instead of emoji