Merge branch 'master' into NewMAS

* master: Use newer APIs to launch applications to fix issue #38 feat: v1.5.6 release feat: v1.5.6 fix #29 #34 #35 feat: v1.5.5 fix: some apps that icons in the Assets.car file cannot be added. fix: icon size fix: tableview width not right fix: tableview width not right feat: v1.5.4 feat: update version feat: new icon feat: 1.5.3 release close #25, close #27 feat: update version feat: hide Thor icon in the menu bar feat: hide Thor icon in the menu bar refactor: settings feat: reorder apps by drag and drop Minor fix on paragraph 07 feat: v1.5.2 release # Conflicts: # Thor.xcodeproj/project.pbxproj # Thor/AppModel.swift # Thor/Base.lproj/Main.storyboard # Thor/SettingsViewController.swift # Thor/Thor.entitlements # Thor/zh-Hans.lproj/Main.strings
gbammc · Jul 4, 2021 · f78a618 · f78a618
2 parents c5dc86f + a6773a5
commit f78a618
Show file tree

Hide file tree

Showing 48 changed files with 231 additions and 143 deletions.
diff --git a/Design/Icon.sketch b/Design/Icon.sketch
diff --git a/LauncherApplication/Info.plist b/LauncherApplication/Info.plist
@@ -2,8 +2,6 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>LSBackgroundOnly</key>
-	<true/>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>$(DEVELOPMENT_LANGUAGE)</string>
 	<key>CFBundleExecutable</key>
@@ -22,6 +20,10 @@
 	<string>1.0</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
+	<key>LSApplicationCategoryType</key>
+	<string>public.app-category.utilities</string>
+	<key>LSBackgroundOnly</key>
+	<true/>
 	<key>LSMinimumSystemVersion</key>
 	<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
 	<key>NSHumanReadableCopyright</key>

diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@ Open the right application ASAP.
 
 ![Screenshots](./screenshot_list.png)
 
-Thor is an OS X application that allows you to open other application immediately just by a shortcut. And it's avaliable in [Mac App Store](https://apps.apple.com/cn/app/thor/id1120999687?l=en&mt=12)! Feel free to enjoy the increased efficiency.
+Thor is an OS X application that allows you to open other application immediately just by a shortcut. And it's available in [Mac App Store](https://apps.apple.com/cn/app/thor/id1120999687?l=en&mt=12)! Feel free to enjoy the increased efficiency.
 
 ![Screenshots](./screenshot_settings.png)
 

diff --git a/Releases/Thor20-16.delta b/Releases/Thor20-16.delta
diff --git a/Releases/Thor20-17.delta b/Releases/Thor20-17.delta
diff --git a/Releases/Thor20-19.delta b/Releases/Thor20-19.delta
diff --git a/Releases/Thor21-16.delta b/Releases/Thor21-16.delta
diff --git a/Releases/Thor21-17.delta b/Releases/Thor21-17.delta
diff --git a/Releases/Thor21-19.delta b/Releases/Thor21-19.delta
diff --git a/Releases/Thor21-20.delta b/Releases/Thor21-20.delta
diff --git a/Releases/Thor22-16.delta b/Releases/Thor22-16.delta
diff --git a/Releases/Thor22-17.delta b/Releases/Thor22-17.delta
diff --git a/Releases/Thor22-19.delta b/Releases/Thor22-19.delta
diff --git a/Releases/Thor22-20.delta b/Releases/Thor22-20.delta
diff --git a/Releases/Thor23-16.delta b/Releases/Thor23-16.delta
diff --git a/Releases/Thor23-17.delta b/Releases/Thor23-17.delta
diff --git a/Releases/Thor23-19.delta b/Releases/Thor23-19.delta
diff --git a/Releases/Thor23-20.delta b/Releases/Thor23-20.delta
diff --git a/Releases/Thor23-22.delta b/Releases/Thor23-22.delta
diff --git a/Releases/Thor24-16.delta b/Releases/Thor24-16.delta
diff --git a/Releases/Thor24-17.delta b/Releases/Thor24-17.delta
diff --git a/Releases/Thor24-19.delta b/Releases/Thor24-19.delta
diff --git a/Releases/Thor24-20.delta b/Releases/Thor24-20.delta
diff --git a/Releases/Thor24-22.delta b/Releases/Thor24-22.delta
diff --git a/Releases/Thor24-23.delta b/Releases/Thor24-23.delta
diff --git a/Releases/Thor_1.5.3.zip b/Releases/Thor_1.5.3.zip
diff --git a/Releases/Thor_1.5.4.zip b/Releases/Thor_1.5.4.zip
diff --git a/Releases/Thor_1.5.5.zip b/Releases/Thor_1.5.5.zip
diff --git a/Releases/Thor_1.5.6.zip b/Releases/Thor_1.5.6.zip
diff --git a/Releases/appcast.xml b/Releases/appcast.xml
@@ -3,40 +3,79 @@
     <channel>
         <title>Thor</title>
         <item>
-            <title>1.2.1</title>
-            <pubDate>Wed, 22 Aug 2018 00:47:27 +0800</pubDate>
+            <title>1.5.4</title>
+            <pubDate>Sat, 21 Nov 2020 16:27:46 +0800</pubDate>
             <sparkle:minimumSystemVersion>10.10</sparkle:minimumSystemVersion>
-            <enclosure url="https://github.com/gbammc/Thor/raw/master/Releases/Thor_1.2.1.zip" sparkle:version="7" sparkle:shortVersionString="1.2.1" length="9108205" type="application/octet-stream"/>
+            <enclosure url="https://github.com/gbammc/Thor/raw/master/Releases/Thor_1.5.4.zip" sparkle:version="21" sparkle:shortVersionString="1.5.4" length="11319789" type="application/octet-stream" sparkle:edSignature="so2vxjh915QBD2oK+0AO/BE9bpCSAbv8w7iCA5EEIrUHvqBbJouMtlW+Po3GpyepfRorQF63hK/eeEq2/VxdDg=="/>
+            <sparkle:deltas>
+                <enclosure url="https://github.com/gbammc/Thor/raw/master/Releases/Thor21-20.delta" sparkle:version="21" sparkle:shortVersionString="1.5.4" sparkle:deltaFrom="20" length="4467975" type="application/octet-stream" sparkle:edSignature="mnjP9sNQQftuAsqD63caPtHs/d+ZCjsH7BUbpJkl/18AUTnFDTNDviNd9x4gv+RmW7aTP2mr00oqI9NsI8SMBg=="/>
+                <enclosure url="https://github.com/gbammc/Thor/raw/master/Releases/Thor21-19.delta" sparkle:version="21" sparkle:shortVersionString="1.5.4" sparkle:deltaFrom="19" length="4661223" type="application/octet-stream" sparkle:edSignature="WjaSW9FRDRc7miULRXKHGKuNglDYZnvwe7ffjEAL3ZSmJJUbNd9hERNk2PtuPSUAHYOSt+Fh2UjfnFzF4RbiCQ=="/>
+                <enclosure url="https://github.com/gbammc/Thor/raw/master/Releases/Thor21-17.delta" sparkle:version="21" sparkle:shortVersionString="1.5.4" sparkle:deltaFrom="17" length="4810973" type="application/octet-stream" sparkle:edSignature="DKNW4Mf5nkdTNFz60zuwYEFdHx3eBRQbsUJyVajB2Iz8B1nWwvodnKzXtfCQEsAKq1wVA0U6OIQEZFlD8Mm6DQ=="/>
+                <enclosure url="https://github.com/gbammc/Thor/raw/master/Releases/Thor21-16.delta" sparkle:version="21" sparkle:shortVersionString="1.5.4" sparkle:deltaFrom="16" length="4813962" type="application/octet-stream" sparkle:edSignature="LJumbIWgd/VnzPAbm2+SAiH6aFXxIgKTbgXDPyTE8paTE4kkakFZgspM3Ug7Adc24Y7NWTtZOKY5XpLGwVdcAg=="/>
+            </sparkle:deltas>
         </item>
         <item>
-            <title>1.3.0</title>
-            <pubDate>Mon, 01 Oct 2018 18:03:38 +0800</pubDate>
+            <title>1.5.3</title>
+            <pubDate>Sat, 21 Nov 2020 15:13:51 +0800</pubDate>
             <sparkle:minimumSystemVersion>10.10</sparkle:minimumSystemVersion>
-            <enclosure url="https://github.com/gbammc/Thor/raw/master/Releases/Thor_1.3.0.zip" sparkle:version="8" sparkle:shortVersionString="1.3.0" length="9390136" type="application/octet-stream"/>
+            <enclosure url="https://github.com/gbammc/Thor/raw/master/Releases/Thor_1.5.3.zip" sparkle:version="20" sparkle:shortVersionString="1.5.3" length="9712629" type="application/octet-stream" sparkle:edSignature="59H5R9Evmn7aaerC/fdGq7yFZ3UD5zbM0ziDnOwc4/9gE/+XpgS7ms5row5ytyLwWEjWBLLeXXALKpmjwH2iDg=="/>
         </item>
         <item>
-            <title>1.3.0</title>
-            <pubDate>Mon, 01 Oct 2018 18:12:14 +0800</pubDate>
+            <title>1.5.2</title>
+            <pubDate>Sat, 21 Nov 2020 12:34:36 +0800</pubDate>
             <sparkle:minimumSystemVersion>10.10</sparkle:minimumSystemVersion>
-            <enclosure url="https://github.com/gbammc/Thor/raw/master/Releases/Thor_1.3.0.zip" sparkle:version="11" sparkle:shortVersionString="1.3.0" length="9386551" type="application/octet-stream"/>
+            <enclosure url="https://github.com/gbammc/Thor/raw/master/Releases/Thor_1.5.2.zip" sparkle:version="19" sparkle:shortVersionString="1.5.2" length="9573102" type="application/octet-stream" sparkle:edSignature="GoS35lyE8j0QMnJsWjBkZ7bG3DJ350lDmgr8IqyeCk/gRMA1dEMujGwDU9w/ZiKHkLtkTtoMwqW2sw9QaMxsAA=="/>
         </item>
         <item>
-            <title>1.3.1</title>
-            <pubDate>Wed, 10 Oct 2018 22:04:56 +0800</pubDate>
+            <title>1.5.0</title>
+            <pubDate>Sat, 23 May 2020 17:44:50 +0800</pubDate>
             <sparkle:minimumSystemVersion>10.10</sparkle:minimumSystemVersion>
-            <enclosure url="https://github.com/gbammc/Thor/raw/master/Releases/Thor_1.3.1.zip" sparkle:version="15" sparkle:shortVersionString="1.3.1" length="9387226" type="application/octet-stream"/>
+            <enclosure url="https://github.com/gbammc/Thor/raw/master/Releases/Thor_1.5.0.zip" sparkle:version="17" sparkle:shortVersionString="1.5.0" length="9585974" type="application/octet-stream" sparkle:edSignature="efncVOMVswfF/Qu4IAGrmaSl28oq0lNY2pL86tmAWj+VmsFFRONsRK5aznWDT7WSl04mKVxSv5Rj0TCdLwtWCQ=="/>
         </item>
         <item>
             <title>1.4.0</title>
-            <pubDate>周六, 18 4月 2020 11:20:44 +0800</pubDate>
+            <pubDate>Sat, 23 May 2020 17:44:50 +0800</pubDate>
             <sparkle:minimumSystemVersion>10.10</sparkle:minimumSystemVersion>
-            <enclosure url="https://github.com/gbammc/Thor/raw/master/Releases/Thor_1.4.0.zip" sparkle:version="16" sparkle:shortVersionString="1.4.0" length="9583085" type="application/octet-stream"/>
+            <enclosure url="https://github.com/gbammc/Thor/raw/master/Releases/Thor_1.4.0.zip" sparkle:version="16" sparkle:shortVersionString="1.4.0" length="9583085" type="application/octet-stream" sparkle:edSignature="5F122wECe1rdzpTtVZO5sWJ1P2LEvumQISkXz+HercHl1/KmH4CqvZwAkU8hEge0z27celIKs/DqAJECTTbpAw=="/>
         </item>
         <item>
-            <title>1.5.0</title>
-            <pubDate>Mon, 04 May 2020 10:40:36 +0800</pubDate>
+            <title>1.5.4</title>
+            <pubDate>Sat, 21 Nov 2020 20:03:29 +0800</pubDate>
             <sparkle:minimumSystemVersion>10.10</sparkle:minimumSystemVersion>
-            <enclosure url="https://github.com/gbammc/Thor/raw/master/Releases/Thor_1.5.0.zip" sparkle:version="17" sparkle:shortVersionString="1.5.0" length="9585974" type="application/octet-stream" sparkle:edSignature="efncVOMVswfF/Qu4IAGrmaSl28oq0lNY2pL86tmAWj+VmsFFRONsRK5aznWDT7WSl04mKVxSv5Rj0TCdLwtWCQ=="/>
+            <enclosure url="https://github.com/gbammc/Thor/raw/master/Releases/Thor_1.5.4.zip" sparkle:version="22" sparkle:shortVersionString="1.5.4" length="11319762" type="application/octet-stream" sparkle:edSignature="1SJHcP9Riz+2rFzbxL9V6Am0ZXjI3rG8NOlhN9EYT89c+L69wp0BWWUvvh6het2twywoFBDJg1+4d8e/Q/HqCQ=="/>
+            <sparkle:deltas>
+                <enclosure url="https://github.com/gbammc/Thor/raw/master/Releases/Thor22-20.delta" sparkle:version="22" sparkle:shortVersionString="1.5.4" sparkle:deltaFrom="20" length="4485935" type="application/octet-stream" sparkle:edSignature="fPItBEFZ04on1Ic6OrpcbuJal5OUa6jybBXIDnjXJk33YtVG/b8mXsdWiwzuMlM0d38RkEn5v3zuEQmag24yAg=="/>
+                <enclosure url="https://github.com/gbammc/Thor/raw/master/Releases/Thor22-19.delta" sparkle:version="22" sparkle:shortVersionString="1.5.4" sparkle:deltaFrom="19" length="4660690" type="application/octet-stream" sparkle:edSignature="Z5xkpm7aXFWASZvnUFJUIP+LMmOEKOyPQx0TsFDImGHp6q58AffunnywJ1sHF/i1ZAFOsWDsojvUUxS0kPU3BA=="/>
+                <enclosure url="https://github.com/gbammc/Thor/raw/master/Releases/Thor22-17.delta" sparkle:version="22" sparkle:shortVersionString="1.5.4" sparkle:deltaFrom="17" length="4789497" type="application/octet-stream" sparkle:edSignature="XBojQEaVj2Fm9Glno4oOwnUwTEa2DKzBCAmBSh1OXYknXlI9CcOqDyEQz2bWQH6UV331/EwcZ1TgJQxO2kkFBg=="/>
+                <enclosure url="https://github.com/gbammc/Thor/raw/master/Releases/Thor22-16.delta" sparkle:version="22" sparkle:shortVersionString="1.5.4" sparkle:deltaFrom="16" length="4792054" type="application/octet-stream" sparkle:edSignature="o4GkiwFZsnU0uqXMdRNWM9Uh5m/x99MnkHLMyOf8thNTQettZe5YVieXFV6c0EJA/H6X9iWAkJCeOPjTnoOYDQ=="/>
+            </sparkle:deltas>
+        </item>
+        <item>
+            <title>1.5.5</title>
+            <pubDate>Sun, 13 Dec 2020 19:13:30 +0800</pubDate>
+            <sparkle:minimumSystemVersion>10.10</sparkle:minimumSystemVersion>
+            <enclosure url="https://github.com/gbammc/Thor/raw/master/Releases/Thor_1.5.5.zip" sparkle:version="23" sparkle:shortVersionString="1.5.5" length="11245726" type="application/octet-stream" sparkle:edSignature="l2juQ1tCIeu6o+9M9HxKa5GdqdT+OKqHh4oSh/Bik/A9VMHye6IKEXzCz2n23nKydRL1MUnU1dgn2mGXWNI9Aw=="/>
+            <sparkle:deltas>
+                <enclosure url="https://github.com/gbammc/Thor/raw/master/Releases/Thor23-22.delta" sparkle:version="23" sparkle:shortVersionString="1.5.5" sparkle:deltaFrom="22" length="1010057" type="application/octet-stream" sparkle:edSignature="ucukBgoxAflUjnC6Bf52nNMij+cfwoglCbE+DVvFDnZER1ufAQ4LrLSoXQ+6GySj03NxIFFQx9KkwGtP7c7HCQ=="/>
+                <enclosure url="https://github.com/gbammc/Thor/raw/master/Releases/Thor23-20.delta" sparkle:version="23" sparkle:shortVersionString="1.5.5" sparkle:deltaFrom="20" length="4499264" type="application/octet-stream" sparkle:edSignature="5DNrS/SgeGveFp2+OpSn7cWg0dIY1dcS+5slxxZN3ZrTfS5+NsDL3tN8JwjI3lnmPUkBOqFu+BAexxZm0b0uAA=="/>
+                <enclosure url="https://github.com/gbammc/Thor/raw/master/Releases/Thor23-19.delta" sparkle:version="23" sparkle:shortVersionString="1.5.5" sparkle:deltaFrom="19" length="4666358" type="application/octet-stream" sparkle:edSignature="CpfBcC4Hx6I9O3MwE5e5nK+559oHQGY1G00XCBGM1oiUHFCSMjr+xFYHkuc+qDjec4JSdjl5fmA2KbRHZZiYAA=="/>
+                <enclosure url="https://github.com/gbammc/Thor/raw/master/Releases/Thor23-17.delta" sparkle:version="23" sparkle:shortVersionString="1.5.5" sparkle:deltaFrom="17" length="4628435" type="application/octet-stream" sparkle:edSignature="Zj1QvKSw3Eg7m+NVI9Qtdcrw8GBhHV7Jf8bFhKsmaRlpCOlP9k8xn6kIIoSGoFi+RNkob0theLx3vOfKeo7TDQ=="/>
+                <enclosure url="https://github.com/gbammc/Thor/raw/master/Releases/Thor23-16.delta" sparkle:version="23" sparkle:shortVersionString="1.5.5" sparkle:deltaFrom="16" length="4631289" type="application/octet-stream" sparkle:edSignature="7An5Rc6K+ab4Xo646y6TcUv/t27FId7M6altRJXw86VhAAQWIstblL0wO+1b3YgvncljhKTZ+WQd1FxuoyQZAg=="/>
+            </sparkle:deltas>
+        </item>
+        <item>
+            <title>1.5.6</title>
+            <pubDate>周六, 19 12月 2020 22:13:41 +0800</pubDate>
+            <sparkle:minimumSystemVersion>10.10</sparkle:minimumSystemVersion>
+            <enclosure url="https://github.com/gbammc/Thor/raw/master/Releases/Thor_1.5.6.zip" sparkle:version="24" sparkle:shortVersionString="1.5.6" length="11248608" type="application/octet-stream" sparkle:edSignature="wUr2H1YQylwdhOvV/cKvvgd5St+J3aze7MAbpWLXihDI+2XQVUwWVQL3NySizDN6/driLJaNbowTR7Vn6L/6CQ=="/>
+            <sparkle:deltas>
+                <enclosure url="https://github.com/gbammc/Thor/raw/master/Releases/Thor24-23.delta" sparkle:version="24" sparkle:shortVersionString="1.5.6" sparkle:deltaFrom="23" length="139869" type="application/octet-stream" sparkle:edSignature="A9z80ArXj5ikl3FgyYlf/DeT7wTaRE3QG6/2L1hQvs7R1uMKLVy1GMC4oNoQzqkEYQ/Ka/XrtfVHMPmzJp5tBQ=="/>
+                <enclosure url="https://github.com/gbammc/Thor/raw/master/Releases/Thor24-22.delta" sparkle:version="24" sparkle:shortVersionString="1.5.6" sparkle:deltaFrom="22" length="1055409" type="application/octet-stream" sparkle:edSignature="aQehFbIA87dbLRq3AgSTmwjA5Y7/GkckykPXWPUXKusJPkK4poJhdhMeig4C3n6/XljWu+XN1BGxsV8E042aDg=="/>
+                <enclosure url="https://github.com/gbammc/Thor/raw/master/Releases/Thor24-20.delta" sparkle:version="24" sparkle:shortVersionString="1.5.6" sparkle:deltaFrom="20" length="4520678" type="application/octet-stream" sparkle:edSignature="xhLzY3gOm8V8mo5tmd+FHr5nac0xia+rJ5r+hCb2kKNwNez4ye8KYw8oveietTq1Pfntcw4dR5YO0XoNRSMoBA=="/>
+                <enclosure url="https://github.com/gbammc/Thor/raw/master/Releases/Thor24-19.delta" sparkle:version="24" sparkle:shortVersionString="1.5.6" sparkle:deltaFrom="19" length="4683429" type="application/octet-stream" sparkle:edSignature="7MgrabfdMwRODEi5gyPVGUHdG+jxhI5tEhSo3yA28DYCOcyvZzjC4VbhLGckrQT54xh1Ispj3yqgT7Zg5vobAw=="/>
+                <enclosure url="https://github.com/gbammc/Thor/raw/master/Releases/Thor24-17.delta" sparkle:version="24" sparkle:shortVersionString="1.5.6" sparkle:deltaFrom="17" length="4632888" type="application/octet-stream" sparkle:edSignature="5iJCXJBr7SqUbnvkxw04EjMwYO3yHbillYysTGIoePYUaFz1iEcmsf0Kgl7MshWaniZdwRDrM2dlr+EddkvIBA=="/>
+                <enclosure url="https://github.com/gbammc/Thor/raw/master/Releases/Thor24-16.delta" sparkle:version="24" sparkle:shortVersionString="1.5.6" sparkle:deltaFrom="16" length="4635468" type="application/octet-stream" sparkle:edSignature="UyZjfr4eU/Fl9JmXgfPy/okfvGRNJ1Zb5F64D5Neaj0jHYVOK6Hf3IjVy2ndXWhxDVjG2bu5RLeD0RY4idpyBA=="/>
+            </sparkle:deltas>
         </item>
         <item>
             <title>1.5.2</title>

diff --git a/Thor/AppDelegate.swift b/Thor/AppDelegate.swift
@@ -44,6 +44,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {
 
         shortcutEnableMonitor()
         handleLaunchAtLogin()
+        registerMenubarIconShortcut()
 
         MASShortcutValidator.shared().allowAnyShortcutWithOptionModifier = true
         ShortcutMonitor.register()
@@ -145,4 +146,23 @@ class AppDelegate: NSObject, NSApplicationDelegate {
         }
     }
 
+    func registerMenubarIconShortcut() {
+        let modifierFlags = NSEvent.ModifierFlags.shift.rawValue
+            & NSEvent.ModifierFlags.control.rawValue
+            & NSEvent.ModifierFlags.option.rawValue
+            & NSEvent.ModifierFlags.command.rawValue
+        let shortcut = MASShortcut(keyCode: UInt(kVK_ANSI_T), modifierFlags: modifierFlags)
+        MASShortcutMonitor.shared().register(shortcut, withAction: {
+            defaults[.enableMenuBarIcon] = !defaults[.enableMenuBarIcon]
+
+            if defaults[.enableMenuBarIcon] {
+                sharedAppDelegate?.statusItemController.showInMenuBar()
+            } else {
+                sharedAppDelegate?.statusItemController.hideInMenuBar()
+            }
+
+            NotificationCenter.default.post(name: .updateMenuBarToggleState, object: nil)
+        })
+    }
+
 }