Updated layout and text

superhighfives · Jan 28, 2023 · 7782242 · 7782242
1 parent da966b9
commit 7782242
Show file tree

Hide file tree

Showing 11 changed files with 35 additions and 26 deletions.
diff --git a/Pika/AppDelegate.swift b/Pika/AppDelegate.swift
@@ -143,12 +143,19 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSMenuDelegate {
             action: #selector(openAboutWindow(_:)),
             keyEquivalent: ""
         )
+
         statusBarMenu.addItem(
             withTitle: "\(PikaText.textMenuUpdates)...",
             action: #selector(checkForUpdates(_:)),
             keyEquivalent: ""
         )
 
+        statusBarMenu.addItem(
+            withTitle: PikaText.textMenuGitHubIssue,
+            action: #selector(openGitHubIssue(_:)),
+            keyEquivalent: ""
+        )
+
         let preferences = NSMenuItem(
             title: PikaText.textMenuPreferences,
             action: #selector(openPreferencesWindow(_:)),
@@ -306,13 +313,11 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSMenuDelegate {
     }
 
     @IBAction func openWebsite(_: Any) {
-        let url = URL(string: PikaConstants.pikaWebsiteURL)!
-        NSWorkspace.shared.open(url)
+        NSWorkspace.shared.open(URL(string: PikaConstants.pikaWebsiteURL)!)
     }
 
     @IBAction func openGitHubIssue(_: Any) {
-        let url = URL(string: PikaConstants.gitHubIssueURL)!
-        NSWorkspace.shared.open(url)
+        NSWorkspace.shared.open(URL(string: PikaConstants.gitHubIssueURL)!)
     }
 
     @IBAction func terminatePika(_: Any) {

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

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

diff --git a/Pika/Assets/de.lproj/Main.strings b/Pika/Assets/de.lproj/Main.strings
@@ -29,8 +29,8 @@
 /* Class = "NSMenu"; title = "Help"; ObjectID = "F2S-fz-NVQ"; */
 "F2S-fz-NVQ.title" = "Hilfe";
 
-/* Class = "NSMenuItem"; title = "Pika Website"; ObjectID = "FKE-Sm-Kum"; */
-"FKE-Sm-Kum.title" = "Website";
+/* Class = "NSMenuItem"; title = "Pika website"; ObjectID = "FKE-Sm-Kum"; */
+"FKE-Sm-Kum.title" = "Pika website";
 
 /* Class = "NSMenu"; title = "Eyedroppers"; ObjectID = "KHB-9b-hO2"; */
 "KHB-9b-hO2.title" = "Auswahl";
@@ -83,5 +83,5 @@
 /* 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";
+/* Class = "NSMenuItem"; title = "Report feedback"; ObjectID = "hxD-2G-mEq.title"; */
+"hxD-2G-mEq.title" = "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
@@ -29,8 +29,8 @@
 /* Class = "NSMenu"; title = "Help"; ObjectID = "F2S-fz-NVQ"; */
 "F2S-fz-NVQ.title" = "Help";
 
-/* Class = "NSMenuItem"; title = "Pika Website"; ObjectID = "FKE-Sm-Kum"; */
-"FKE-Sm-Kum.title" = "Pika Website";
+/* Class = "NSMenuItem"; title = "Pika website"; ObjectID = "FKE-Sm-Kum"; */
+"FKE-Sm-Kum.title" = "Pika website";
 
 /* Class = "NSMenu"; title = "Eyedroppers"; ObjectID = "KHB-9b-hO2"; */
 "KHB-9b-hO2.title" = "Eyedroppers";
@@ -83,5 +83,5 @@
 /* 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";
+/* Class = "NSMenuItem"; title = "Report feedback"; ObjectID = "hxD-2G-mEq.title"; */
+"hxD-2G-mEq.title" = "Report 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
@@ -29,7 +29,7 @@
 /* Class = "NSMenu"; title = "Help"; ObjectID = "F2S-fz-NVQ"; */
 "F2S-fz-NVQ.title" = "Aider";
 
-/* Class = "NSMenuItem"; title = "Pika Website"; ObjectID = "FKE-Sm-Kum"; */
+/* Class = "NSMenuItem"; title = "Pika website"; ObjectID = "FKE-Sm-Kum"; */
 "FKE-Sm-Kum.title" = "Site web";
 
 /* Class = "NSMenu"; title = "Eyedroppers"; ObjectID = "KHB-9b-hO2"; */
@@ -83,5 +83,5 @@
 /* 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";
+/* Class = "NSMenuItem"; title = "Report feedback"; ObjectID = "hxD-2G-mEq.title"; */
+"hxD-2G-mEq.title" = "Signaler des commentaires";
diff --git a/Pika/Constants/Constants.swift b/Pika/Constants/Constants.swift
@@ -78,8 +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 textMenuWebsite = NSLocalizedString("menu.website", comment: "Pika website")
+    static let textMenuGitHubIssue = NSLocalizedString("menu.issue", comment: "Report feedback")
     static let textMenuQuit = NSLocalizedString("menu.quit", comment: "Quit Pika")
 
     // Navigation

diff --git a/Pika/Views/AboutView.swift b/Pika/Views/AboutView.swift
@@ -39,6 +39,10 @@ struct AboutView: View {
                         title: PikaText.textAboutGitHub,
                         link: PikaConstants.gitHubRepoURL
                     )
+                    LinkButton(
+                        title: PikaText.textMenuGitHubIssue,
+                        link: PikaConstants.gitHubIssueURL
+                    )
                 }
 
                 VStack(spacing: 0) {

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