【综合】Main Menu，App Menu(已修复)

PDF Office/PDF Master/AppDelegate.swift

@@ -481,6 +481,48 @@ class AppDelegate: NSObject, NSApplicationDelegate {
 #endif
     }
     
+    @IBAction func volumeDiscount(_ sender: NSMenuItem) {
+        let tStrHttpUrl = "https://www.pdfreaderpro.com/vpp-purchase-program"
+        guard let url = URL(string: tStrHttpUrl) else {
+            return
+        }
+        let tWorkSpace = NSWorkspace.shared
+        if tWorkSpace.open(url) == false {
+            tWorkSpace.open(url)
+        }
+    }
+    
+    @IBAction func crossPlatformAction(_ sender: NSMenuItem) {
+        let tStrHttpUrl = "https://www.pdfreaderpro.com/store/pdf-pro-permanent-cross-platform-package?utm_source=pdf_pro_dmgs&utm_medium=toptbr_help&utm_campaign=cross_platform"
+//        if ([SKInspectPublicTool currentisLanguageHans]) {
+//            tStrHttpUrl = @"https://www.pdfreaderpro.com/zh-cn/store/pdf-pro-permanent-cross-platform-package?utm_source=pdf_pro_dmg&utm_medium=toptbr_help_cn&utm_campaign=cross_platform";
+//        }
+        guard let url = URL(string: tStrHttpUrl) else {
+            return
+        }
+        let tWorkSpace = NSWorkspace.shared
+        if tWorkSpace.open(url) == false {
+            tWorkSpace.open(url)
+        }
+//    #if VERSION_DMG
+//        [[FMTrackEventManager manager] trackEvent:@"Menubar" withProperties:@{@"Menubar_Btn":@"Menubar_Btn_Help_CrossPlatform"}];
+//    #endif
+    }
+    
+    @IBAction func EducationDiscountAction(_ sender: NSMenuItem) {
+        let tStrHttpUrl = KMLocalizedString("https://www.pdfreaderpro.com/store?mode=edu#utm_source=mac_app&utm_medium=pdf_pro_dmg&utm_content=menu_bar_click", nil)
+        guard let url = URL(string: tStrHttpUrl) else {
+            return
+        }
+        let tWorkSpace = NSWorkspace.shared
+        if tWorkSpace.open(url) == false {
+            tWorkSpace.open(url)
+        }
+//    #if VERSION_DMG
+//        [[FMTrackEventManager manager] trackEvent:@"Menubar" withProperties:@{@"Menubar_Btn":@"Menubar_Btn_Help_EduDiscount"}];
+//    #endif
+    }
+        
     @IBAction func orderFrontLineInspector(_ sender: NSMenuItem) -> Void {
         KMPrint("orderFrontLineInspector ...")
     }

PDF Office/PDF Master/Base.lproj/Main.storyboard

@@ -23,7 +23,7 @@
                                             </connections>
                                         </menuItem>
                                         <menuItem isSeparatorItem="YES" id="VOq-y0-SEH"/>
-                                        <menuItem title="Preference Settings" keyEquivalent="," id="BOF-NM-1cW">
+                                        <menuItem title="Settings..." keyEquivalent="," id="BOF-NM-1cW" userLabel="Settings...">
                                             <connections>
                                                 <action selector="openPreferenceWindow:" target="Voe-Tx-rLC" id="WVx-P6-4Ew"/>
                                             </connections>
@@ -60,6 +60,25 @@
                                             </connections>
                                         </menuItem>
                                         <menuItem isSeparatorItem="YES" id="wFC-TO-SCJ"/>
+                                        <menuItem title="Volume Discount" id="jkZ-BK-4CW">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <connections>
+                                                <action selector="volumeDiscount:" target="Voe-Tx-rLC" id="jg1-OD-3fx"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="One License for Mac and Windows" id="q57-EY-4x7">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <connections>
+                                                <action selector="crossPlatformAction:" target="Voe-Tx-rLC" id="uZH-TE-fAS"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Education Discount" id="b9h-QD-HtE">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <connections>
+                                                <action selector="EducationDiscountAction:" target="Voe-Tx-rLC" id="IOr-41-ei0"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem isSeparatorItem="YES" id="JqN-3n-jQA"/>
                                         <menuItem title="Services" id="NMo-om-nkz">
                                             <modifierMask key="keyEquivalentModifierMask"/>
                                             <menu key="submenu" title="Services" systemMenu="services" id="hz9-B4-Xy5"/>
@@ -960,18 +979,18 @@ CA
                                                 <action selector="toggleFullScreen:" target="Ady-hI-5gd" id="dU3-MA-1Rq"/>
                                             </connections>
                                         </menuItem>
-                                        <menuItem title="Presentation Options…" keyEquivalent="t" id="Ida-V6-skV">
-                                            <modifierMask key="keyEquivalentModifierMask" control="YES" command="YES"/>
-                                            <connections>
-                                                <action selector="chooseTransition:" target="Ady-hI-5gd" id="GA9-Sc-ahx"/>
-                                            </connections>
-                                        </menuItem>
                                         <menuItem title="Presentation" keyEquivalent="p" id="Y5Q-6u-tbZ">
                                             <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
                                             <connections>
                                                 <action selector="togglePresentation:" target="Ady-hI-5gd" id="9sn-am-eET"/>
                                             </connections>
                                         </menuItem>
+                                        <menuItem title="Presentation Options…" keyEquivalent="t" id="Ida-V6-skV">
+                                            <modifierMask key="keyEquivalentModifierMask" control="YES" command="YES"/>
+                                            <connections>
+                                                <action selector="chooseTransition:" target="Ady-hI-5gd" id="GA9-Sc-ahx"/>
+                                            </connections>
+                                        </menuItem>
                                         <menuItem isSeparatorItem="YES" id="1ai-sZ-AYo">
                                             <modifierMask key="keyEquivalentModifierMask" command="YES"/>
                                         </menuItem>
@@ -1140,7 +1159,7 @@ CA
                                                 <action selector="menuItemAction_outline:" target="Ady-hI-5gd" id="lKS-e2-iq9"/>
                                             </connections>
                                         </menuItem>
-                                        <menuItem title="Bookmarks" id="cEK-0C-WTt">
+                                        <menuItem title="Notes" id="cEK-0C-WTt" userLabel="Notes">
                                             <modifierMask key="keyEquivalentModifierMask"/>
                                             <connections>
                                                 <action selector="menuItemAction_bookmark:" target="Ady-hI-5gd" id="QsI-Cs-kJe"/>
@@ -1163,7 +1182,7 @@ CA
                                                 <action selector="changeLeftSidePaneState:" target="Ady-hI-5gd" id="Kq2-YB-TJw"/>
                                             </connections>
                                         </menuItem>
-                                        <menuItem isSeparatorItem="YES" hidden="YES" id="t8Z-Zy-agE"/>
+                                        <menuItem isSeparatorItem="YES" id="t8Z-Zy-agE"/>
                                         <menuItem title="Split View" id="WI4-3q-UfG">
                                             <modifierMask key="keyEquivalentModifierMask"/>
                                             <menu key="submenu" title="Split View" id="Z39-K7-Ton">