v1.5.1 fixes #6

hrbrmstr · Sep 21, 2019 · a29dcb8 · a29dcb8
1 parent 2fbb985
commit a29dcb8
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 5 deletions.
diff --git a/RSwitch.xcodeproj/project.pbxproj b/RSwitch.xcodeproj/project.pbxproj
@@ -558,7 +558,7 @@
 					"$(PROJECT_DIR)/RSwitch/ObjC/ProcInfo",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.14;
-				MARKETING_VERSION = 1.5.0;
+				MARKETING_VERSION = 1.5.1;
 				PRODUCT_BUNDLE_IDENTIFIER = is.rud.bob.RSwitch;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "rswitch-1+";
@@ -591,7 +591,7 @@
 					"$(PROJECT_DIR)/RSwitch/ObjC/ProcInfo",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.14;
-				MARKETING_VERSION = 1.5.0;
+				MARKETING_VERSION = 1.5.1;
 				PRODUCT_BUNDLE_IDENTIFIER = is.rud.bob.RSwitch;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "rswitch-1+";

diff --git a/RSwitch/Base.lproj/Main.storyboard b/RSwitch/Base.lproj/Main.storyboard
@@ -846,7 +846,7 @@ DQ
                                             <attributedString key="textStorage">
                                                 <fragment>
                                                     <string key="content">
-RSwitch v1.5.0
+RSwitch v1.5.1
 
 Copyright © 2019 Bob Rudis
 

diff --git a/RSwitch/Swift/HandleRSwitch.swift b/RSwitch/Swift/HandleRSwitch.swift
@@ -15,10 +15,11 @@ extension AppDelegate {
   // then removes the current alias and creates the new one.
   @objc func handleRSwitch(_ sender: NSMenuItem?) {
 
-    let fm = FileManager.default;
+    let item = sender?.representedObject as! String
+    let fm = FileManager.default
     let title = sender?.title
     let rm_link = (RVersions.macos_r_framework as NSString).appendingPathComponent("Current")
-    let title_link = (RVersions.macos_r_framework as NSString).appendingPathComponent(title!)
+    let title_link = (RVersions.macos_r_framework as NSString).appendingPathComponent(item)
 
     do {
       try fm.removeItem(atPath: rm_link)

diff --git a/RSwitch/Swift/Menu.swift b/RSwitch/Swift/Menu.swift
@@ -35,6 +35,10 @@ extension AppDelegate: NSMenuDelegate {
 
   }
 
+  @objc func subscribeToMailingList(_ sender: NSMenuItem) {
+    NSWorkspace.shared.open(URL(string: "https://lists.sr.ht/~hrbrmstr/rswitch")!)
+  }
+
   func menuWillOpen(_ menu: NSMenu) {
 
     if (menu != self.statusMenu) { return }
@@ -112,6 +116,7 @@ extension AppDelegate: NSMenuDelegate {
     prefSub.addItem(rstudioCheckItem)
 
     menu.addItem(NSMenuItem(title: "Check for update…", action: #selector(checkForUpdate), keyEquivalent: ""))
+    menu.addItem(NSMenuItem(title: "Subscribe to mailing list…", action: #selector(subscribeToMailingList), keyEquivalent: ""))
     menu.addItem(NSMenuItem(title: "About RSwitch…", action: #selector(showAbout), keyEquivalent: ""))
     menu.addItem(NSMenuItem(title: "RSwitch Help…", action: #selector(rswitch_help), keyEquivalent: ""))
 

diff --git a/RSwitch/Swift/MenuActions/BrowseMenuAction.swift b/RSwitch/Swift/MenuActions/BrowseMenuAction.swift
@@ -41,6 +41,7 @@ class BrowseMenuAction {
 
   private static let webItemsExt = [
     BrowseMenuAction(title: "R Package Documentation (rdrr.io)…", url: "https://rdrr.io/"),
+    BrowseMenuAction(title: "R Compiler Tools for RCpp on macOS…", url: "https://thecoatlessprofessor.com/programming/cpp/r-compiler-tools-for-rcpp-on-macos/"),
     BrowseMenuAction(title: "Rseek…", url: "https://rseek.org"),
     BrowseMenuAction(title: "R StackOverflow…", url: "https://stackoverflow.com/questions/tagged/r"),
     BrowseMenuAction(title: "ROpenSci Discuss…", url: "https://discuss.ropensci.org/"),

diff --git a/releases/RSwitch-1.5.1.app.zip b/releases/RSwitch-1.5.1.app.zip