Merge branch 'feature/mstsc' of github.com:tp4a/teleport into feature/mstsc

client/tp_assist_macos/TP-Assist.xcodeproj/project.pbxproj

@@ -381,7 +381,7 @@
 			};
 			buildConfigurationList = C149EBF315D5214600B1F558 /* Build configuration list for PBXProject "TP-Assist" */;
 			compatibilityVersion = "Xcode 10.0";
-			developmentRegion = English;
+			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				en,

client/tp_assist_macos/apple-scripts/scripts/iterm2.applescript

@@ -6,6 +6,7 @@ on scriptRun(argsCmd, argsProfile, argsTitle)
 end scriptRun
 
 on CommandRun(theCmd, theProfile, theTitle)
+	try
 		tell application "iTerm"
 			if it is not running then
 				tell application "iTerm"
@@ -77,4 +78,8 @@ on CommandRun(theCmd, theProfile, theTitle)
 				end try
 			end if
 		end tell
+	on error msg
+		display dialog "ERROR: " & msg
+	end try
+	
 end CommandRun

client/tp_assist_macos/apple-scripts/scripts/terminal.applescript

@@ -6,12 +6,13 @@ on scriptRun(argsCmd, argsProfile, argsTitle)
 end scriptRun
 
 on CommandRun(theCmd, theProfile, theTitle)
+	try
 		tell application "Terminal"
 			if it is not running then
 				--if this is the first time Terminal is running you have specify window 1
 				--if you dont do this you will get two windows and the title wont be set
 				activate
-            delay 1.0
+				delay 3.0
 				set newTerm to do script theCmd in window 1
 				set newTerm's current settings to settings set theProfile
 				set custom title of front window to theTitle
@@ -67,10 +68,16 @@ on CommandRun(theCmd, theProfile, theTitle)
 					
 				end if
 				
-#            set current settings of selected tab of front window to settings set theProfile
-#            set title displays custom title of front window to true
-#            set custom title of selected tab of front window to theTitle
+				--set current settings of selected tab of front window to settings set theProfile
+				--set title displays custom title of front window to true
+				--set custom title of selected tab of front window to theTitle
 			end if
 			
 		end tell
+		
+	on error msg
+		display dialog "ERROR: " & msg
+	end try
+	
+	
 end CommandRun

client/tp_assist_macos/src/Base.lproj/Localizable.strings

@@ -3,12 +3,12 @@
   TPAssist
 */
 
-"app_name" = "Teleport助手";
+"app_name" = "Teleport Assist";
 
 //=============================================
 // for About Window
 //=============================================
 "version" = "Version: ";
 "app_full_name" = "Teleport Assist for macOS";
-"copyright" = "Copyright © 2017~2018 TP4A. All rights reserved.";
+"copyright" = "Copyright © 2017~2019, tp4a.com. All rights reserved.";
 "visit_tp4a_website" = "Visit Teleport Website"

client/tp_assist_macos/src/TP-Assist-Info.plist

@@ -28,8 +28,10 @@
 	<string>${MACOSX_DEPLOYMENT_TARGET}</string>
 	<key>LSUIElement</key>
 	<true/>
+	<key>NSAppleEventsUsageDescription</key>
+	<string></string>
 	<key>NSHumanReadableCopyright</key>
-	<string>Copyright © 2017~2018 TP4A. All rights reserved.</string>
+	<string>Copyright © 2017~2019, tp4a.com. All rights reserved.</string>
 	<key>NSMainNibFile</key>
 	<string>MainMenu</string>
 	<key>NSPrincipalClass</key>

client/tp_assist_macos/src/zh-Hans.lproj/Localizable.strings

@@ -15,5 +15,5 @@
 "about " = "关于 ";
 "version" = "版本：";
 "app_full_name" = "Teleport助手 - macOS";
-"copyright" = "© 2017~2018 TP4A，保留所有权利。";
+"copyright" = "© 2017~2019，tp4a.com。保留所有权利。";
 "visit_tp4a_website" = "访问 Teleport 网站";