diff --git a/installer/mac/SymphonySettingsPlugin.bundle/Contents/Info.plist b/installer/mac/SymphonySettingsPlugin.bundle/Contents/Info.plist index 0d8900ee..b7d00c41 100644 --- a/installer/mac/SymphonySettingsPlugin.bundle/Contents/Info.plist +++ b/installer/mac/SymphonySettingsPlugin.bundle/Contents/Info.plist @@ -3,7 +3,7 @@ BuildMachineOSBuild - 17G4015 + 18D109 CFBundleDevelopmentRegion en CFBundleExecutable @@ -17,7 +17,7 @@ CFBundlePackageType BNDL CFBundleShortVersionString - 2.0 + 4.0 CFBundleSupportedPlatforms MacOSX diff --git a/installer/mac/SymphonySettingsPlugin.bundle/Contents/MacOS/SymphonySettingsPlugin b/installer/mac/SymphonySettingsPlugin.bundle/Contents/MacOS/SymphonySettingsPlugin index 1252d09f..70c66f5b 100755 Binary files a/installer/mac/SymphonySettingsPlugin.bundle/Contents/MacOS/SymphonySettingsPlugin and b/installer/mac/SymphonySettingsPlugin.bundle/Contents/MacOS/SymphonySettingsPlugin differ diff --git a/installer/mac/SymphonySettingsPlugin.bundle/Contents/Resources/Base.lproj/MyInstallerPane.nib b/installer/mac/SymphonySettingsPlugin.bundle/Contents/Resources/Base.lproj/MyInstallerPane.nib index 16a53455..67912b3b 100644 Binary files a/installer/mac/SymphonySettingsPlugin.bundle/Contents/Resources/Base.lproj/MyInstallerPane.nib and b/installer/mac/SymphonySettingsPlugin.bundle/Contents/Resources/Base.lproj/MyInstallerPane.nib differ diff --git a/installer/mac/SymphonySettingsPlugin.bundle/Contents/_CodeSignature/CodeResources b/installer/mac/SymphonySettingsPlugin.bundle/Contents/_CodeSignature/CodeResources index d4ffce2d..77a25b61 100644 --- a/installer/mac/SymphonySettingsPlugin.bundle/Contents/_CodeSignature/CodeResources +++ b/installer/mac/SymphonySettingsPlugin.bundle/Contents/_CodeSignature/CodeResources @@ -6,7 +6,7 @@ Resources/Base.lproj/MyInstallerPane.nib - h6775LTCbH4GS52ODzPilHTzBos= + 0rfQ2R1TtL98oNUNRVtEU8xVL7E= Resources/InstallerSections.plist @@ -37,11 +37,11 @@ hash - h6775LTCbH4GS52ODzPilHTzBos= + 0rfQ2R1TtL98oNUNRVtEU8xVL7E= hash2 - GrfIStoQUspnp1KqGRB6bVYZOJWnYrjPoM5nNQFX8f0= + zkN0k8vMtcN/J36Zw9mvTd3iMIdVWrJgzvPr5xvwnb4= Resources/InstallerSections.plist diff --git a/installer/mac/SymphonySettingsPlugin/SymphonySettingsPlugin.xcodeproj/project.pbxproj b/installer/mac/SymphonySettingsPlugin/SymphonySettingsPlugin.xcodeproj/project.pbxproj index c2fe7bf4..824d6770 100644 --- a/installer/mac/SymphonySettingsPlugin/SymphonySettingsPlugin.xcodeproj/project.pbxproj +++ b/installer/mac/SymphonySettingsPlugin/SymphonySettingsPlugin.xcodeproj/project.pbxproj @@ -97,7 +97,7 @@ TargetAttributes = { 3A10EBCE1ED4336D0083702F = { CreatedOnToolsVersion = 8.3.2; - DevelopmentTeam = BUX8SV4LQA; + DevelopmentTeam = 7S74264P3V; ProvisioningStyle = Automatic; }; }; @@ -283,10 +283,10 @@ buildSettings = { CODE_SIGN_IDENTITY = "Mac Developer"; COMBINE_HIDPI_IMAGES = YES; - DEVELOPMENT_TEAM = BUX8SV4LQA; + DEVELOPMENT_TEAM = 7S74264P3V; INFOPLIST_FILE = SymphonySettingsPlugin/Info.plist; INSTALL_PATH = "$(HOME)/Library/Bundles"; - MACOSX_DEPLOYMENT_TARGET = 10.7; + MACOSX_DEPLOYMENT_TARGET = 10.10; PRODUCT_BUNDLE_IDENTIFIER = com.symphony.SymphonySettingsPlugin; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -299,10 +299,10 @@ buildSettings = { CODE_SIGN_IDENTITY = "Mac Developer"; COMBINE_HIDPI_IMAGES = YES; - DEVELOPMENT_TEAM = BUX8SV4LQA; + DEVELOPMENT_TEAM = 7S74264P3V; INFOPLIST_FILE = SymphonySettingsPlugin/Info.plist; INSTALL_PATH = "$(HOME)/Library/Bundles"; - MACOSX_DEPLOYMENT_TARGET = 10.7; + MACOSX_DEPLOYMENT_TARGET = 10.10; PRODUCT_BUNDLE_IDENTIFIER = com.symphony.SymphonySettingsPlugin; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; diff --git a/installer/mac/SymphonySettingsPlugin/SymphonySettingsPlugin/Base.lproj/MyInstallerPane.xib b/installer/mac/SymphonySettingsPlugin/SymphonySettingsPlugin/Base.lproj/MyInstallerPane.xib index 5edf4c14..fbe9d806 100644 --- a/installer/mac/SymphonySettingsPlugin/SymphonySettingsPlugin/Base.lproj/MyInstallerPane.xib +++ b/installer/mac/SymphonySettingsPlugin/SymphonySettingsPlugin/Base.lproj/MyInstallerPane.xib @@ -52,7 +52,7 @@ - + diff --git a/installer/mac/SymphonySettingsPlugin/SymphonySettingsPlugin/Info.plist b/installer/mac/SymphonySettingsPlugin/SymphonySettingsPlugin/Info.plist index 18ddc394..17a5f36f 100644 --- a/installer/mac/SymphonySettingsPlugin/SymphonySettingsPlugin/Info.plist +++ b/installer/mac/SymphonySettingsPlugin/SymphonySettingsPlugin/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType BNDL CFBundleShortVersionString - 2.0 + 4.0 CFBundleVersion 1 InstallerSectionTitle diff --git a/installer/mac/SymphonySettingsPlugin/SymphonySettingsPlugin/MyInstallerPane.m b/installer/mac/SymphonySettingsPlugin/SymphonySettingsPlugin/MyInstallerPane.m index 032d727e..7c694b00 100644 --- a/installer/mac/SymphonySettingsPlugin/SymphonySettingsPlugin/MyInstallerPane.m +++ b/installer/mac/SymphonySettingsPlugin/SymphonySettingsPlugin/MyInstallerPane.m @@ -16,7 +16,10 @@ - (void)willEnterPane:(InstallerSectionDirection)dir { // By default, set the value of the error message textbox to an empty string - [_podUrlAlertTextBox setTitleWithMnemonic:@""]; + _podUrlAlertTextBox.stringValue = @""; + [_podUrlTextBox setToolTip:@"Enter pod url in the format \"https://corporate.symphony.com\""]; + + [_ssoCheckBox setToolTip:@"Only check this option if your Symphony POD has been configured for SSO, in doubt do not check - contact your Symphony Admin"]; } - (BOOL)shouldExitPane:(InstallerSectionDirection)dir { @@ -29,17 +32,28 @@ NSPredicate *podUrlTest = [NSPredicate predicateWithFormat:@"SELF MATCHES %@", regex]; if (![podUrlTest evaluateWithObject:podUrl]) { - [_podUrlAlertTextBox setTitleWithMnemonic:@"Please enter a valid Pod url."]; + _podUrlAlertTextBox.stringValue = @"Please enter a valid Pod url."; + return NO; + } + + if ([podUrl rangeOfString:@"[POD]"].location != NSNotFound) { + _podUrlAlertTextBox.stringValue = @"Please enter a valid Pod url."; return NO; } // Double confirmation for disabling media if ([_mediaCheckBox state] == 0) { - NSAlert *alert = [NSAlert alertWithMessageText: @"Are you sure you wish to disable the camera, microphone, and speakers?" defaultButton:@"No" alternateButton:@"Yes" otherButton:nil informativeTextWithFormat:@""]; + + NSAlert *alert = [[NSAlert alloc] init]; + [alert setMessageText: @"Are you sure you wish to disable the camera, microphone, and speakers?"]; + [alert setInformativeText:@"Once disabled, users won't be able to participate in RTC calls effectively"]; + [alert addButtonWithTitle:@"No"]; + [alert addButtonWithTitle:@"Yes"]; + [alert setAlertStyle:NSWarningAlertStyle]; NSInteger button = [alert runModal]; - if (button == NSAlertDefaultReturn) { + if (button == NSAlertFirstButtonReturn) { return NO; } @@ -173,8 +187,7 @@ podUrl = [podUrl substringToIndex:podUrl.length - ssoUrl.length]; [_podUrlTextBox setStringValue:podUrl]; } - - [_ssoCheckBox setToolTip:@"Only check this option if your Symphony POD has been configured for SSO, in doubt do not check - contact your Symphony Admin"]; + } @end diff --git a/installer/win/Symphony-x64.aip b/installer/win/Symphony-x64.aip index 96a6dcbc..f653224b 100644 --- a/installer/win/Symphony-x64.aip +++ b/installer/win/Symphony-x64.aip @@ -43,7 +43,7 @@ - + @@ -366,11 +366,11 @@ - + - + @@ -613,7 +613,7 @@ - + diff --git a/installer/win/Symphony-x86.aip b/installer/win/Symphony-x86.aip index 329fc9f5..7e21f625 100644 --- a/installer/win/Symphony-x86.aip +++ b/installer/win/Symphony-x86.aip @@ -43,7 +43,7 @@ - + @@ -358,11 +358,11 @@ - + - + @@ -595,7 +595,7 @@ - +