0.0.15-beta1 (#93)

* Added menu items, fixed broken link * Tidied constants * Updated version
superhighfives · Jan 28, 2023 · da966b9 · da966b9
1 parent 784ee46
commit da966b9
Show file tree

Hide file tree

Showing 13 changed files with 50 additions and 10 deletions.
diff --git a/Pika.xcodeproj/project.pbxproj b/Pika.xcodeproj/project.pbxproj
@@ -637,7 +637,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 31;
+				CURRENT_PROJECT_VERSION = 32;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_ASSET_PATHS = "\"Pika/Preview Content\"";
 				DEVELOPMENT_TEAM = TGHU37N6EX;
@@ -651,7 +651,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.15;
-				MARKETING_VERSION = 0.0.14;
+				MARKETING_VERSION = "0.0.15-beta1";
 				PRODUCT_BUNDLE_IDENTIFIER = com.superhighfives.Pika;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
@@ -667,7 +667,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 31;
+				CURRENT_PROJECT_VERSION = 32;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_ASSET_PATHS = "\"Pika/Preview Content\"";
 				DEVELOPMENT_TEAM = TGHU37N6EX;
@@ -681,7 +681,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.15;
-				MARKETING_VERSION = 0.0.14;
+				MARKETING_VERSION = "0.0.15-beta1";
 				PRODUCT_BUNDLE_IDENTIFIER = com.superhighfives.Pika;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;

diff --git a/Pika.xcodeproj/xcshareddata/xcschemes/Pika.xcscheme b/Pika.xcodeproj/xcshareddata/xcschemes/Pika.xcscheme
@@ -34,7 +34,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = "fr"
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"

diff --git a/Pika/AppDelegate.swift b/Pika/AppDelegate.swift
@@ -305,6 +305,16 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSMenuDelegate {
         SUUpdater.shared()?.checkForUpdates(self)
     }
 
+    @IBAction func openWebsite(_: Any) {
+        let url = URL(string: PikaConstants.pikaWebsiteURL)!
+        NSWorkspace.shared.open(url)
+    }
+
+    @IBAction func openGitHubIssue(_: Any) {
+        let url = URL(string: PikaConstants.gitHubIssueURL)!
+        NSWorkspace.shared.open(url)
+    }
+
     @IBAction func terminatePika(_: Any) {
         NSApplication.shared.terminate(self)
     }

diff --git a/Pika/Assets/Base.lproj/Main.storyboard b/Pika/Assets/Base.lproj/Main.storyboard
@@ -139,9 +139,15 @@
                                 <modifierMask key="keyEquivalentModifierMask"/>
                                 <menu key="submenu" title="Help" systemMenu="help" id="F2S-fz-NVQ">
                                     <items>
-                                        <menuItem title="Pika Website" enabled="NO" keyEquivalent="?" id="FKE-Sm-Kum">
+                                        <menuItem title="Pika Website" keyEquivalent="?" id="FKE-Sm-Kum">
                                             <connections>
-                                                <action selector="openPreferencesWindow:" target="Voe-Tx-rLC" id="eot-8W-K41"/>
+                                                <action selector="openWebsite:" target="Voe-Tx-rLC" id="vQG-LA-1ix"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Report Bug or Feedback" id="hxD-2G-mEq">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <connections>
+                                                <action selector="openGitHubIssue:" target="Voe-Tx-rLC" id="7Ag-IO-qo8"/>
                                             </connections>
                                         </menuItem>
                                     </items>

diff --git a/Pika/Assets/de.lproj/Localizable.strings b/Pika/Assets/de.lproj/Localizable.strings
@@ -127,6 +127,12 @@
 /* Preferences */
 "menu.preferences" = "Einstellungen";
 
+/* Pika Website */
+"menu.website" = "Pika-Website";
+
+/* Report Bug or Feedback */
+"menu.issue" = "Fehler oder Feedback melden";
+
 /* Quit */
 "menu.quit" = "Beenden";
 

diff --git a/Pika/Assets/de.lproj/Main.strings b/Pika/Assets/de.lproj/Main.strings
@@ -82,3 +82,6 @@
 
 /* Class = "NSMenuItem"; title = "Copy foreground"; ObjectID = "x3v-GG-iWU"; */
 "x3v-GG-iWU.title" = "Vordergrund kopieren";
+
+/* Class = "NSMenuItem"; title = "Report Bug or Feedback"; ObjectID = "hxD-2G-mEq.title"; */
+"hxD-2G-mEq.title" = "Fehler oder Feedback melden";
diff --git a/Pika/Assets/en.lproj/Localizable.strings b/Pika/Assets/en.lproj/Localizable.strings
diff --git a/Pika/Assets/en.lproj/Main.strings b/Pika/Assets/en.lproj/Main.strings
@@ -82,3 +82,6 @@
 
 /* Class = "NSMenuItem"; title = "Copy foreground"; ObjectID = "x3v-GG-iWU"; */
 "x3v-GG-iWU.title" = "Copy foreground";
+
+/* Class = "NSMenuItem"; title = "Report Bug or Feedback"; ObjectID = "hxD-2G-mEq.title"; */
+"hxD-2G-mEq.title" = "Report Bug or Feedback";
diff --git a/Pika/Assets/fr.lproj/Localizable.strings b/Pika/Assets/fr.lproj/Localizable.strings
diff --git a/Pika/Assets/fr.lproj/Main.strings b/Pika/Assets/fr.lproj/Main.strings
@@ -82,3 +82,6 @@
 
 /* Class = "NSMenuItem"; title = "Copy foreground"; ObjectID = "x3v-GG-iWU"; */
 "x3v-GG-iWU.title" = "Copier le premier plan";
+
+/* Class = "NSMenuItem"; title = "Report Bug or Feedback"; ObjectID = "hxD-2G-mEq.title"; */
+"hxD-2G-mEq.title" = "Signaler un bogue ou un commentaire";
diff --git a/Pika/Constants/Constants.swift b/Pika/Constants/Constants.swift
@@ -16,6 +16,11 @@ enum PikaConstants {
             : "https://superhighfives.com/releases/pika"
     }
 
+    static let pikaWebsiteURL = "https://superhighfives.com/pika"
+    static let gitHubRepoURL = "https://github.com/superhighfives/pika"
+    static let gitHubIssueURL = "https://github.com/superhighfives/pika/issues/new/choose"
+    static let charlieGleasonWebsiteURL = "https://charliegleason.com"
+
     // Initial colors
     static let initialColors = [
         NSColor(r: 143.0, g: 15.0, b: 208.0),
@@ -73,6 +78,8 @@ enum PikaText {
     static let textMenuAbout = NSLocalizedString("menu.about", comment: "About")
     static let textMenuUpdates = NSLocalizedString("menu.updates", comment: "Check for updates")
     static let textMenuPreferences = NSLocalizedString("menu.preferences", comment: "Preferences")
+    static let textMenuWebsite = NSLocalizedString("menu.website", comment: "Pika Website")
+    static let textMenuGitHubIssue = NSLocalizedString("menu.issue", comment: "Report Bug or Feedback")
     static let textMenuQuit = NSLocalizedString("menu.quit", comment: "Quit Pika")
 
     // Navigation

diff --git a/Pika/Views/AboutView.swift b/Pika/Views/AboutView.swift
@@ -33,11 +33,11 @@ struct AboutView: View {
                 HStack(spacing: 20.0) {
                     LinkButton(
                         title: PikaText.textAboutWebsite,
-                        link: "https://superhighfives.com/pika"
+                        link: PikaConstants.pikaWebsiteURL
                     )
                     LinkButton(
                         title: PikaText.textAboutGitHub,
-                        link: "https://github.com/superhighfives/pika"
+                        link: PikaConstants.gitHubRepoURL
                     )
                 }
 
@@ -50,7 +50,7 @@ struct AboutView: View {
                 HStack(spacing: 5.0) {
                     IconImage(name: "hand.thumbsup.fill")
                     Text(PikaText.textAboutBy)
-                    LinkButton(title: "Charlie Gleason", link: "https://charliegleason.com")
+                    LinkButton(title: "Charlie Gleason", link: PikaConstants.charlieGleasonWebsiteURL)
                 }
             }
             .padding(.bottom, 20.0)

diff --git a/Pika/Views/NavigationMenuItems.swift b/Pika/Views/NavigationMenuItems.swift
@@ -143,6 +143,9 @@ struct NavigationMenuItems: View {
                         $0
                     }
                 }
+            Button(PikaText.textMenuGitHubIssue, action: {
+                NSApp.sendAction(#selector(AppDelegate.openGitHubIssue), to: nil, from: nil)
+            })
         }
 
         VStack {