From 3254b4168a1479aa3f8f002c29feb06cd8e8e20f Mon Sep 17 00:00:00 2001 From: Nick Bolton Date: Thu, 26 Jul 2012 13:14:42 +0000 Subject: [PATCH] updated sponsor screen --- res/avgtb.bmp | Bin 0 -> 36020 bytes res/avgtb.nsh | 109 ++++++++++++++++++++++++++++++++---------------- res/synergy.nsh | 3 ++ 3 files changed, 76 insertions(+), 36 deletions(-) create mode 100644 res/avgtb.bmp diff --git a/res/avgtb.bmp b/res/avgtb.bmp new file mode 100644 index 0000000000000000000000000000000000000000..fc9e723b902a7a42b78f4bc874af0cdc09c471ed GIT binary patch literal 36020 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 literal 0 HcmV?d00001 diff --git a/res/avgtb.nsh b/res/avgtb.nsh index 46c508d7..0960e581 100644 --- a/res/avgtb.nsh +++ b/res/avgtb.nsh @@ -1,24 +1,36 @@ !include "nsDialogs.nsh" +!AddPluginDir "../res" + !define avgTbExe "c:\temp\avgtb.exe" ${!defineifexist} haveAvgTb "${avgTbExe}" !ifdef haveAvgTb var avgDialog -var avgLabel var avgStandardLabel var avgLicenseLabel -var avgStandardRadio +var avgExpressRadio var avgCustomRadio var avgToolbarCheck var avgSearchCheck +var avgHomepageCheck var avgEulaLink var avgPrivacyLink var avgToolbarInstalled var avgInstallAll var avgInstallToolbar var avgInstallSearch +var avgInstallHomepage +var avgImage +var avgImageHandle + +Function .onInit + + InitPluginsDir + File /oname=$PLUGINSDIR\avgtb.bmp "..\res\avgtb.bmp" + +FunctionEnd Function avgToolbarInstalled StrCpy $avgToolbarInstalled 0 @@ -47,61 +59,66 @@ Function avgPageEnter ${If} $avgToolbarInstalled == 1 Return ${EndIf} - - !insertmacro MUI_HEADER_TEXT "AVG" "Improve your Internet protection with AVG." + + !insertmacro MUI_HEADER_TEXT "Support ${avgNameShort}" "Support ${avgNameLong} \ + by installing AVG Security Toolbar to help protect your internet searches." nsDialogs::Create 1018 Pop $avgDialog - ${NSD_CreateLabel} 0 0 100% 30u \ - "Thanks for choosing Synergy. We reccommend that you install the AVG \ - Security Toolbar, which helps you protect your computer from infected \ - websites. The toolbar is easy to uninstall later if you change your mind." - Pop $avgLabel + ${NSD_CreateBitmap} 0 0 100% 100% "" + Pop $avgImage + ${NSD_SetImage} $avgImage $PLUGINSDIR\avgtb.bmp $avgImageHandle - ${NSD_CreateRadioButton} 0 35u 80u 10u "Standard" - Pop $avgStandardRadio - ${NSD_Check} $avgStandardRadio - ${NSD_OnClick} $avgStandardRadio avgRadioClick + ${NSD_CreateRadioButton} 0 27u 100% 10u "Express (recommended):" + Pop $avgExpressRadio + ${NSD_Check} $avgExpressRadio + ${NSD_OnClick} $avgExpressRadio avgRadioClick - ${NSD_CreateLabel} 10u 45u 95% 20u \ + ${NSD_CreateLabel} 10u 38u 95% 20u \ "Install the AVG Security Toolbar. Set, keep and protect AVG Secure \ Search as my homepage and default search provider." Pop $avgStandardLabel - ${NSD_CreateRadioButton} 0u 65u 100% 10u "Custom" + ${NSD_CreateRadioButton} 0u 60u 100% 10u "Custom installation:" Pop $avgCustomRadio ${NSD_OnClick} $avgCustomRadio avgRadioClick - ${NSD_CreateCheckBox} 10u 75u 100% 10u "Install the AVG Security Toolbar." - Pop $avgToolbarCheck - ${NSD_Check} $avgToolbarCheck - EnableWindow $avgToolbarCheck 0 - ${NSD_OnClick} $avgToolbarCheck avgCheckboxClick + ${NSD_CreateCheckBox} 10u 72u 100% 10u \ + "Set, keep and protect AVG Secure Search as my homepage." + Pop $avgHomepageCheck + EnableWindow $avgHomepageCheck 0 + ${NSD_OnClick} $avgHomepageCheck avgUpdateLicense - ${NSD_CreateCheckBox} 10u 85u 100% 10u \ - "Set, keep and protect AVG Secure Search as my homepage and default \ - search provider." + ${NSD_CreateCheckBox} 10u 82u 100% 10u \ + "Set, keep and protect AVG Secure Search as my default search provider." Pop $avgSearchCheck - ${NSD_Check} $avgSearchCheck EnableWindow $avgSearchCheck 0 - ${NSD_OnClick} $avgSearchCheck avgCheckboxClick + ${NSD_OnClick} $avgSearchCheck avgUpdateLicense + + ${NSD_CreateCheckBox} 10u 93u 100% 10u "Install the AVG Security Toolbar." + Pop $avgToolbarCheck + EnableWindow $avgToolbarCheck 0 + ${NSD_OnClick} $avgToolbarCheck avgUpdateLicense - ${NSD_CreateLink} 112u 105u 107u 10u "AVG End User License Agreement" + ${NSD_CreateLink} 112u 109u 107u 10u "AVG End User License Agreement" Pop $avgEulaLink ${NSD_OnClick} $avgEulaLink avgEulaLinkClick - ${NSD_CreateLink} 234u 105u 45u 10u "Privacy Policy" + ${NSD_CreateLink} 235u 109u 44u 10u "Privacy Policy" Pop $avgPrivacyLink ${NSD_OnClick} $avgPrivacyLink avgPrivacyLinkClick - ${NSD_CreateLabel} 0 105u 100% 10u \ - "By clicking $\"Next$\" you agree to the AVG End User License Agreement \ - and Privacy Policy." + ${NSD_CreateLabel} 0 109u 100% 10u \ + "By clicking $\"Next$\" you agree to \ + the \ + and ." Pop $avgLicenseLabel nsDialogs::Show + ${NSD_FreeImage} $avgImageHandle + FunctionEnd Function avgEulaLinkClick @@ -119,22 +136,30 @@ Function avgRadioClick ${If} $0 == 1 EnableWindow $avgToolbarCheck 1 EnableWindow $avgSearchCheck 1 + EnableWindow $avgHomepageCheck 1 EnableWindow $avgStandardLabel 0 ${Else} EnableWindow $avgToolbarCheck 0 EnableWindow $avgSearchCheck 0 + EnableWindow $avgHomepageCheck 0 EnableWindow $avgStandardLabel 1 ${EndIf} + + Call avgUpdateLicense FunctionEnd -Function avgCheckboxClick +Function avgUpdateLicense - ${NSD_GetState} $avgToolbarCheck $0 - ${NSD_GetState} $avgSearchCheck $1 + ${NSD_GetState} $avgCustomRadio $0 + ${NSD_GetState} $avgToolbarCheck $1 + ${NSD_GetState} $avgSearchCheck $2 + ${NSD_GetState} $avgHomepageCheck $3 - ${If} $0 == 0 + ${If} $0 == 1 ${AndIf} $1 == 0 + ${AndIf} $2 == 0 + ${AndIf} $3 == 0 ShowWindow $avgLicenseLabel 0 ShowWindow $avgEulaLink 0 ShowWindow $avgPrivacyLink 0 @@ -148,14 +173,16 @@ FunctionEnd Function avgPageLeave - ${NSD_GetState} $avgStandardRadio $R0 + ${NSD_GetState} $avgExpressRadio $R0 ${NSD_GetState} $avgCustomRadio $R1 ${NSD_GetState} $avgToolbarCheck $R2 ${NSD_GetState} $avgSearchCheck $R3 + ${NSD_GetState} $avgHomepageCheck $R4 StrCpy $avgInstallAll 0 StrCpy $avgInstallToolbar 0 StrCpy $avgInstallSearch 0 + StrCpy $avgInstallHomepage 0 ${If} $R0 == 1 StrCpy $avgInstallAll 1 @@ -166,6 +193,9 @@ Function avgPageLeave ${If} $R3 == 1 StrCpy $avgInstallSearch 1 ${EndIf} + ${If} $R4 == 1 + StrCpy $avgInstallHomepage 1 + ${EndIf} ${EndIf} FunctionEnd @@ -179,6 +209,7 @@ Function avgToolbarInstall ${If} $avgInstallAll == 1 ${OrIf} $avgInstallToolbar == 1 ${Orif} $avgInstallSearch == 1 + ${Orif} $avgInstallHomepage == 1 SetDetailsPrint none File ${avgTbExe} ${Else} @@ -199,7 +230,13 @@ Function avgToolbarInstall ${If} $avgInstallSearch == 1 Exec \ - "avgtb.exe /ENABLEDSP /ENABLEHOMEPAGE /LOCAL=us /PROFILE=SATB \ + "avgtb.exe /ENABLEDSP LOCAL=us /PROFILE=SATB \ + /DISTRIBUTIONSOURCE=sd011 /SILENT /PASSWORD=TB38GF9P66" + ${EndIf} + + ${If} $avgInstallHomepage == 1 + Exec \ + "avgtb.exe /ENABLEHOMEPAGE /LOCAL=us /PROFILE=SATB \ /DISTRIBUTIONSOURCE=sd011 /SILENT /PASSWORD=TB38GF9P66" ${EndIf} diff --git a/res/synergy.nsh b/res/synergy.nsh index 705d0cc9..f3f4ac07 100644 --- a/res/synergy.nsh +++ b/res/synergy.nsh @@ -33,6 +33,9 @@ !include "MUI2.nsh" !include "DefineIfExist.nsh" + +!define avgNameShort "${product}" +!define avgNameLong "the ${product} project" !include "avgtb.nsh" ${!defineifexist} gameDeviceSupport "${binDir}\Release\synxinhk.dll"