From 5b829937bbef50d93a549a0a6c4fab03d696ad74 Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Sat, 17 Feb 2018 06:36:04 -0500 Subject: Remove stub installer - Part 2: Basilisk --- browser/branding/official/bgintro.bmp | Bin 682144 -> 0 bytes browser/branding/official/clock.bmp | Bin 8982 -> 0 bytes browser/branding/official/moz.build | 5 - browser/branding/official/particles.bmp | Bin 8982 -> 0 bytes browser/branding/official/pencil-rtl.bmp | Bin 8982 -> 0 bytes browser/branding/official/pencil.bmp | Bin 8982 -> 0 bytes browser/installer/windows/Makefile.in | 7 - browser/installer/windows/app.tag | 2 +- browser/installer/windows/nsis/defines.nsi.in | 14 - browser/installer/windows/nsis/stub.nsi | 2093 ------------------------- browser/installer/windows/stub.tag | 4 - 11 files changed, 1 insertion(+), 2124 deletions(-) delete mode 100644 browser/branding/official/bgintro.bmp delete mode 100644 browser/branding/official/clock.bmp delete mode 100644 browser/branding/official/particles.bmp delete mode 100644 browser/branding/official/pencil-rtl.bmp delete mode 100644 browser/branding/official/pencil.bmp delete mode 100644 browser/installer/windows/nsis/stub.nsi delete mode 100644 browser/installer/windows/stub.tag (limited to 'browser') diff --git a/browser/branding/official/bgintro.bmp b/browser/branding/official/bgintro.bmp deleted file mode 100644 index 9c2fc80cf..000000000 Binary files a/browser/branding/official/bgintro.bmp and /dev/null differ diff --git a/browser/branding/official/clock.bmp b/browser/branding/official/clock.bmp deleted file mode 100644 index 7da034d3b..000000000 Binary files a/browser/branding/official/clock.bmp and /dev/null differ diff --git a/browser/branding/official/moz.build b/browser/branding/official/moz.build index f1a839c9d..7fda7496c 100644 --- a/browser/branding/official/moz.build +++ b/browser/branding/official/moz.build @@ -23,17 +23,12 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows': ] BRANDING_FILES += [ 'appname.bmp', - 'bgintro.bmp', 'branding.nsi', - 'clock.bmp', 'document.ico', 'firefox.ico', 'newtab.ico', 'newwindow.ico', - 'particles.bmp', 'pbmode.ico', - 'pencil-rtl.bmp', - 'pencil.bmp', 'wizHeader.bmp', 'wizHeaderRTL.bmp', 'wizWatermark.bmp', diff --git a/browser/branding/official/particles.bmp b/browser/branding/official/particles.bmp deleted file mode 100644 index d523606c2..000000000 Binary files a/browser/branding/official/particles.bmp and /dev/null differ diff --git a/browser/branding/official/pencil-rtl.bmp b/browser/branding/official/pencil-rtl.bmp deleted file mode 100644 index 67d2fe5d2..000000000 Binary files a/browser/branding/official/pencil-rtl.bmp and /dev/null differ diff --git a/browser/branding/official/pencil.bmp b/browser/branding/official/pencil.bmp deleted file mode 100644 index 7dd55741f..000000000 Binary files a/browser/branding/official/pencil.bmp and /dev/null differ diff --git a/browser/installer/windows/Makefile.in b/browser/installer/windows/Makefile.in index fa6fd5ba9..ee672e921 100644 --- a/browser/installer/windows/Makefile.in +++ b/browser/installer/windows/Makefile.in @@ -11,9 +11,7 @@ INSTALLER_FILES = \ app.tag \ nsis/installer.nsi \ nsis/uninstaller.nsi \ - nsis/stub.nsi \ nsis/shared.nsh \ - stub.tag \ $(NULL) ifdef MOZ_MAINTENANCE_SERVICE @@ -25,11 +23,6 @@ endif BRANDING_FILES = \ branding.nsi \ appname.bmp \ - bgintro.bmp \ - clock.bmp \ - particles.bmp \ - pencil.bmp \ - pencil-rtl.bmp \ wizHeader.bmp \ wizHeaderRTL.bmp \ wizWatermark.bmp \ diff --git a/browser/installer/windows/app.tag b/browser/installer/windows/app.tag index 479d9f714..7be6d2e42 100644 --- a/browser/installer/windows/app.tag +++ b/browser/installer/windows/app.tag @@ -1,4 +1,4 @@ ;!@Install@!UTF-8! -Title="Mozilla Firefox" +Title="Basilisk" RunProgram="setup.exe" ;!@InstallEnd@! \ No newline at end of file diff --git a/browser/installer/windows/nsis/defines.nsi.in b/browser/installer/windows/nsis/defines.nsi.in index ffb23ff1c..015ad6620 100644 --- a/browser/installer/windows/nsis/defines.nsi.in +++ b/browser/installer/windows/nsis/defines.nsi.in @@ -55,14 +55,6 @@ !define UpdateChannel "@MOZ_UPDATE_CHANNEL@" !endif -# Due to official and beta using the same branding this is needed to -# differentiante between the url used by the stub for downloading. -!if "@MOZ_UPDATE_CHANNEL@" == "beta" -!define BETA_UPDATE_CHANNEL -!endif - -!define BaseURLStubPing "http://download-stats.mozilla.org/stub" - # ARCH is used when it is necessary to differentiate the x64 registry keys from # the x86 registry keys (e.g. the uninstall registry key). #ifdef HAVE_64BIT_BUILD @@ -93,12 +85,6 @@ VIAddVersionKey "ProductVersion" "${AppVersion}" # Comments is not used but left below commented out for future reference # VIAddVersionKey "Comments" "Comments" -# It isn't possible to get the size of the installation prior to downloading -# so the stub installer uses an estimate. The size is derived from the size of -# the complete installer, the size of the extracted complete installer, and at -# least 15 MB additional for working room. -!define APPROXIMATE_REQUIRED_SPACE_MB "145" - # Control positions in Dialog Units so they are placed correctly with # non-default DPI settings !define OPTIONS_ITEM_EDGE_DU 90u diff --git a/browser/installer/windows/nsis/stub.nsi b/browser/installer/windows/nsis/stub.nsi deleted file mode 100644 index 5c19c10fe..000000000 --- a/browser/installer/windows/nsis/stub.nsi +++ /dev/null @@ -1,2093 +0,0 @@ -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - -# Required Plugins: -# AppAssocReg -# CertCheck -# InetBgDL -# ShellLink -# UAC - -; Set verbosity to 3 (e.g. no script) to lessen the noise in the build logs -!verbose 3 - -SetDatablockOptimize on -SetCompress off -CRCCheck on - -RequestExecutionLevel user - -; The commands inside this ifdef require NSIS 3.0a2 or greater so the ifdef can -; be removed after we require NSIS 3.0a2 or greater. -!ifdef NSIS_PACKEDVERSION - Unicode true - ManifestSupportedOS all - ManifestDPIAware true -!endif - -!addplugindir ./ - -Var Dialog -Var Progressbar -Var ProgressbarMarqueeIntervalMS -Var LabelDownloading -Var LabelInstalling -Var LabelFreeSpace -Var CheckboxSetAsDefault -Var CheckboxShortcutOnBar ; Used for Quicklaunch or Taskbar as appropriate -Var CheckboxShortcutInStartMenu -Var CheckboxShortcutOnDesktop -Var CheckboxSendPing -Var CheckboxInstallMaintSvc -Var DirRequest -Var ButtonBrowse -Var LabelBlurb1 -Var LabelBlurb2 -Var LabelBlurb3 -Var BitmapBlurb1 -Var BitmapBlurb2 -Var BitmapBlurb3 -Var HwndBitmapBlurb1 -Var HwndBitmapBlurb2 -Var HWndBitmapBlurb3 - -Var FontNormal -Var FontItalic -Var FontBlurb - -Var WasOptionsButtonClicked -Var CanWriteToInstallDir -Var HasRequiredSpaceAvailable -Var IsDownloadFinished -Var DownloadSizeBytes -Var HalfOfDownload -Var DownloadReset -Var ExistingTopDir -Var SpaceAvailableBytes -Var InitialInstallDir -Var HandleDownload -Var CanSetAsDefault -Var InstallCounterStep -Var InstallStepSize -Var InstallTotalSteps -Var ProgressCompleted -Var ProgressTotal -Var TmpVal - -Var ExitCode -Var BasiliskLaunchCode - -; The first three tick counts are for the start of a phase and equate equate to -; the display of individual installer pages. -Var StartIntroPhaseTickCount -Var StartOptionsPhaseTickCount -Var StartDownloadPhaseTickCount -; Since the Intro and Options pages can be displayed multiple times the total -; seconds spent on each of these pages is reported. -Var IntroPhaseSeconds -Var OptionsPhaseSeconds -; The tick count for the last download. -Var StartLastDownloadTickCount -; The number of seconds from the start of the download phase until the first -; bytes are received. This is only recorded for first request so it is possible -; to determine connection issues for the first request. -Var DownloadFirstTransferSeconds -; The last four tick counts are for the end of a phase in the installation page. -Var EndDownloadPhaseTickCount -Var EndPreInstallPhaseTickCount -Var EndInstallPhaseTickCount -Var EndFinishPhaseTickCount - -Var InitialInstallRequirementsCode -Var ExistingProfile -Var ExistingVersion -Var ExistingBuildID -Var DownloadedBytes -Var DownloadRetryCount -Var OpenedDownloadPage -Var DownloadServerIP -Var PostSigningData - -Var ControlHeightPX -Var ControlRightPX - -; Uncomment the following to prevent pinging the metrics server when testing -; the stub installer -;!define STUB_DEBUG - -!define StubURLVersion "v7" - -; Successful install exit code -!define ERR_SUCCESS 0 - -/** - * The following errors prefixed with ERR_DOWNLOAD apply to the download phase. - */ -; The download was cancelled by the user -!define ERR_DOWNLOAD_CANCEL 10 - -; Too many attempts to download. The maximum attempts is defined in -; DownloadMaxRetries. -!define ERR_DOWNLOAD_TOO_MANY_RETRIES 11 - -/** - * The following errors prefixed with ERR_PREINSTALL apply to the pre-install - * check phase. - */ -; Unable to acquire a file handle to the downloaded file -!define ERR_PREINSTALL_INVALID_HANDLE 20 - -; The downloaded file's certificate is not trusted by the certificate store. -!define ERR_PREINSTALL_CERT_UNTRUSTED 21 - -; The downloaded file's certificate attribute values were incorrect. -!define ERR_PREINSTALL_CERT_ATTRIBUTES 22 - -; The downloaded file's certificate is not trusted by the certificate store and -; certificate attribute values were incorrect. -!define ERR_PREINSTALL_CERT_UNTRUSTED_AND_ATTRIBUTES 23 - -/** - * The following errors prefixed with ERR_INSTALL apply to the install phase. - */ -; The installation timed out. The installation timeout is defined by the number -; of progress steps defined in InstallTotalSteps and the install timer -; interval defined in InstallIntervalMS -!define ERR_INSTALL_TIMEOUT 30 - -; Maximum times to retry the download before displaying an error -!define DownloadMaxRetries 9 - -; Minimum size expected to download in bytes -!define DownloadMinSizeBytes 15728640 ; 15 MB - -; Maximum size expected to download in bytes -!define DownloadMaxSizeBytes 73400320 ; 70 MB - -; Interval before retrying to download. 3 seconds is used along with 10 -; attempted downloads (the first attempt along with 9 retries) to give a -; minimum of 30 seconds or retrying before giving up. -!define DownloadRetryIntervalMS 3000 - -; Interval for the download timer -!define DownloadIntervalMS 200 - -; Interval for the install timer -!define InstallIntervalMS 100 - -; The first step for the install progress bar. By starting with a large step -; immediate feedback is given to the user. -!define InstallProgressFirstStep 20 - -; The finish step size to quickly increment the progress bar after the -; installation has finished. -!define InstallProgressFinishStep 40 - -; Number of steps for the install progress. -; This might not be enough when installing on a slow network drive so it will -; fallback to downloading the full installer if it reaches this number. The size -; of the install progress step is increased when the full installer finishes -; instead of waiting. - -; Approximately 150 seconds with a 100 millisecond timer and a first step of 20 -; as defined by InstallProgressFirstStep. -!define /math InstallCleanTotalSteps ${InstallProgressFirstStep} + 1500 - -; Approximately 165 seconds (minus 0.2 seconds for each file that is removed) -; with a 100 millisecond timer and a first step of 20 as defined by -; InstallProgressFirstStep . -!define /math InstallPaveOverTotalSteps ${InstallProgressFirstStep} + 1800 - -; On Vista and above attempt to elevate Standard Users in addition to users that -; are a member of the Administrators group. -!define NONADMIN_ELEVATE - -!define CONFIG_INI "config.ini" - -!ifndef FILE_SHARE_READ - !define FILE_SHARE_READ 1 -!endif -!ifndef GENERIC_READ - !define GENERIC_READ 0x80000000 -!endif -!ifndef OPEN_EXISTING - !define OPEN_EXISTING 3 -!endif -!ifndef INVALID_HANDLE_VALUE - !define INVALID_HANDLE_VALUE -1 -!endif - -!include "nsDialogs.nsh" -!include "LogicLib.nsh" -!include "FileFunc.nsh" -!include "TextFunc.nsh" -!include "WinVer.nsh" -!include "WordFunc.nsh" - -!insertmacro GetParameters -!insertmacro GetOptions -!insertmacro LineFind -!insertmacro StrFilter - -!include "locales.nsi" -!include "branding.nsi" - -!include "defines.nsi" - -; Must be included after defines.nsi -!include "locale-fonts.nsh" - -; The OFFICIAL define is a workaround to support different urls for Release and -; Beta since they share the same branding when building with other branches that -; set the update channel to beta. -!ifdef OFFICIAL -!ifdef BETA_UPDATE_CHANNEL -!undef URLStubDownload -!define URLStubDownload "http://download.mozilla.org/?os=win&lang=${AB_CD}&product=firefox-beta-latest" -!undef URLManualDownload -!define URLManualDownload "https://www.mozilla.org/${AB_CD}/firefox/installer-help/?channel=beta&installer_lang=${AB_CD}" -!undef Channel -!define Channel "beta" -!endif -!endif - -!include "common.nsh" - -!insertmacro ElevateUAC -!insertmacro GetLongPath -!insertmacro GetPathFromString -!insertmacro GetParent -!insertmacro GetSingleInstallPath -!insertmacro GetTextWidthHeight -!insertmacro IsUserAdmin -!insertmacro RemovePrecompleteEntries -!insertmacro SetBrandNameVars -!insertmacro ITBL3Create -!insertmacro UnloadUAC - -VIAddVersionKey "FileDescription" "${BrandShortName} Stub Installer" -VIAddVersionKey "OriginalFilename" "setup-stub.exe" - -Name "$BrandFullName" -OutFile "setup-stub.exe" -icon "setup.ico" -XPStyle on -BrandingText " " -ChangeUI all "nsisui.exe" -!ifdef HAVE_64BIT_BUILD - InstallDir "$PROGRAMFILES64\${BrandFullName}\" -!else - InstallDir "$PROGRAMFILES32\${BrandFullName}\" -!endif - -!ifdef ${AB_CD}_rtl - LoadLanguageFile "locale-rtl.nlf" -!else - LoadLanguageFile "locale.nlf" -!endif - -!include "nsisstrings.nlf" - -!if "${AB_CD}" == "en-US" - ; Custom strings for en-US. This is done here so they aren't translated. - !include oneoff_en-US.nsh -!else - !define INTRO_BLURB "$(INTRO_BLURB1)" - !define INSTALL_BLURB1 "$(INSTALL_BLURB1)" - !define INSTALL_BLURB2 "$(INSTALL_BLURB2)" - !define INSTALL_BLURB3 "$(INSTALL_BLURB3)" -!endif - -Caption "$(WIN_CAPTION)" - -Page custom createDummy ; Needed to enable the Intro page's back button -Page custom createIntro leaveIntro ; Introduction page -Page custom createOptions leaveOptions ; Options page -Page custom createInstall ; Download / Installation page - -Function .onInit - ; Remove the current exe directory from the search order. - ; This only effects LoadLibrary calls and not implicitly loaded DLLs. - System::Call 'kernel32::SetDllDirectoryW(w "")' - - StrCpy $LANGUAGE 0 - ; This macro is used to set the brand name variables but the ini file method - ; isn't supported for the stub installer. - ${SetBrandNameVars} "$PLUGINSDIR\ignored.ini" - - ; Don't install on systems that don't support SSE2. The parameter value of - ; 10 is for PF_XMMI64_INSTRUCTIONS_AVAILABLE which will check whether the - ; SSE2 instruction set is available. - System::Call "kernel32::IsProcessorFeaturePresent(i 10)i .R7" - -!ifdef HAVE_64BIT_BUILD - ; Restrict x64 builds from being installed on x86 and pre Win7 - ${Unless} ${RunningX64} - ${OrUnless} ${AtLeastWin7} - ${If} "$R7" == "0" - strCpy $R7 "$(WARN_MIN_SUPPORTED_OSVER_CPU_MSG)" - ${Else} - strCpy $R7 "$(WARN_MIN_SUPPORTED_OSVER_MSG)" - ${EndIf} - MessageBox MB_OKCANCEL|MB_ICONSTOP "$R7" IDCANCEL +2 - ExecShell "open" "${URLSystemRequirements}" - Quit - ${EndUnless} - - SetRegView 64 -!else - StrCpy $R8 "0" - ${If} ${AtMostWin2000} - StrCpy $R8 "1" - ${EndIf} - - ${If} ${IsWinXP} - ${AndIf} ${AtMostServicePack} 1 - StrCpy $R8 "1" - ${EndIf} - - ${If} $R8 == "1" - ; XXX-rstrong - some systems failed the AtLeastWin2000 test that we - ; used to use for an unknown reason and likely fail the AtMostWin2000 - ; and possibly the IsWinXP test as well. To work around this also - ; check if the Windows NT registry Key exists and if it does if the - ; first char in CurrentVersion is equal to 3 (Windows NT 3.5 and - ; 3.5.1), 4 (Windows NT 4), or 5 (Windows 2000 and Windows XP). - StrCpy $R8 "" - ClearErrors - ReadRegStr $R8 HKLM "SOFTWARE\Microsoft\Windows NT\CurrentVersion" "CurrentVersion" - StrCpy $R8 "$R8" 1 - ${If} ${Errors} - ${OrIf} "$R8" == "3" - ${OrIf} "$R8" == "4" - ${OrIf} "$R8" == "5" - ${If} "$R7" == "0" - strCpy $R7 "$(WARN_MIN_SUPPORTED_OSVER_CPU_MSG)" - ${Else} - strCpy $R7 "$(WARN_MIN_SUPPORTED_OSVER_MSG)" - ${EndIf} - MessageBox MB_OKCANCEL|MB_ICONSTOP "$R7" IDCANCEL +2 - ExecShell "open" "${URLSystemRequirements}" - Quit - ${EndIf} - ${EndUnless} -!endif - - ${If} "$R7" == "0" - MessageBox MB_OKCANCEL|MB_ICONSTOP "$(WARN_MIN_SUPPORTED_CPU_MSG)" IDCANCEL +2 - ExecShell "open" "${URLSystemRequirements}" - Quit - ${EndIf} - - ; Require elevation if the user can elevate - ${ElevateUAC} - -; The commands inside this ifndef are needed prior to NSIS 3.0a2 and can be -; removed after we require NSIS 3.0a2 or greater. -!ifndef NSIS_PACKEDVERSION - ${If} ${AtLeastWinVista} - System::Call 'user32::SetProcessDPIAware()' - ${EndIf} -!endif - - SetShellVarContext all ; Set SHCTX to HKLM - ${GetSingleInstallPath} "Software\Mozilla\${BrandFullNameInternal}" $R9 - - ${If} "$R9" == "false" - SetShellVarContext current ; Set SHCTX to HKCU - ${GetSingleInstallPath} "Software\Mozilla\${BrandFullNameInternal}" $R9 - - ${If} ${RunningX64} - ; In HKCU there is no WOW64 redirection, which means we may have gotten - ; the path to a 32-bit install even though we're 64-bit, or vice-versa. - ; In that case, just use the default path instead of offering an upgrade. - ; But only do that override if the existing install is in Program Files, - ; because that's the only place we can be sure is specific - ; to either 32 or 64 bit applications. - ; The WordFind syntax below searches for the first occurence of the - ; "delimiter" (the Program Files path) in the install path and returns - ; anything that appears before that. If nothing appears before that, - ; then the install is under Program Files (32 or 64). -!ifdef HAVE_64BIT_BUILD - ${WordFind} $R9 $PROGRAMFILES32 "+1{" $0 -!else - ${WordFind} $R9 $PROGRAMFILES64 "+1{" $0 -!endif - ${If} $0 == "" - StrCpy $R9 "false" - ${EndIf} - ${EndIf} - ${EndIf} - - ${If} "$R9" != "false" - StrCpy $INSTDIR "$R9" - ${EndIf} - - ; Used to determine if the default installation directory was used. - StrCpy $InitialInstallDir "$INSTDIR" - - ClearErrors - WriteRegStr HKLM "Software\Mozilla" "${BrandShortName}InstallerTest" \ - "Write Test" - - ; Only display set as default when there is write access to HKLM and on Win7 - ; and below. - ${If} ${Errors} - ${OrIf} ${AtLeastWin8} - StrCpy $CanSetAsDefault "false" - StrCpy $CheckboxSetAsDefault "0" - ${Else} - DeleteRegValue HKLM "Software\Mozilla" "${BrandShortName}InstallerTest" - StrCpy $CanSetAsDefault "true" - ${EndIf} - - ; The interval in MS used for the progress bars set as marquee. - ${If} ${AtLeastWinVista} - StrCpy $ProgressbarMarqueeIntervalMS "10" - ${Else} - StrCpy $ProgressbarMarqueeIntervalMS "50" - ${EndIf} - - ; Initialize the majority of variables except those that need to be reset - ; when a page is displayed. - StrCpy $IntroPhaseSeconds "0" - StrCpy $OptionsPhaseSeconds "0" - StrCpy $EndPreInstallPhaseTickCount "0" - StrCpy $EndInstallPhaseTickCount "0" - StrCpy $InitialInstallRequirementsCode "" - StrCpy $IsDownloadFinished "" - StrCpy $BasiliskLaunchCode "0" - StrCpy $CheckboxShortcutOnBar "1" - StrCpy $CheckboxShortcutInStartMenu "1" - StrCpy $CheckboxShortcutOnDesktop "1" - StrCpy $CheckboxSendPing "1" -!ifdef MOZ_MAINTENANCE_SERVICE - StrCpy $CheckboxInstallMaintSvc "1" -!else - StrCpy $CheckboxInstallMaintSvc "0" -!endif - StrCpy $WasOptionsButtonClicked "0" - - StrCpy $0 "" -!ifdef FONT_FILE1 - ${If} ${FileExists} "$FONTS\${FONT_FILE1}" - StrCpy $0 "${FONT_NAME1}" - ${EndIf} -!endif - -!ifdef FONT_FILE2 - ${If} $0 == "" - ${AndIf} ${FileExists} "$FONTS\${FONT_FILE2}" - StrCpy $0 "${FONT_NAME2}" - ${EndIf} -!endif - - ${If} $0 == "" - StrCpy $0 "$(^Font)" - ${EndIf} - - CreateFont $FontBlurb "$0" "12" "500" - CreateFont $FontNormal "$0" "11" "500" - CreateFont $FontItalic "$0" "11" "500" /ITALIC - - InitPluginsDir - File /oname=$PLUGINSDIR\bgintro.bmp "bgintro.bmp" - File /oname=$PLUGINSDIR\appname.bmp "appname.bmp" - File /oname=$PLUGINSDIR\clock.bmp "clock.bmp" - File /oname=$PLUGINSDIR\particles.bmp "particles.bmp" -!ifdef ${AB_CD}_rtl - ; The horizontally flipped pencil looks better in RTL - File /oname=$PLUGINSDIR\pencil.bmp "pencil-rtl.bmp" -!else - File /oname=$PLUGINSDIR\pencil.bmp "pencil.bmp" -!endif -FunctionEnd - -; .onGUIInit isn't needed except for RTL locales -!ifdef ${AB_CD}_rtl -Function .onGUIInit - ; Since NSIS RTL support doesn't mirror progress bars use Windows mirroring. - ${NSD_AddExStyle} $HWNDPARENT ${WS_EX_LAYOUTRTL} - ${RemoveExStyle} $HWNDPARENT ${WS_EX_RTLREADING} - ${RemoveExStyle} $HWNDPARENT ${WS_EX_RIGHT} - ${NSD_AddExStyle} $HWNDPARENT ${WS_EX_LEFT}|${WS_EX_LTRREADING} -FunctionEnd -!endif - -Function .onGUIEnd - Delete "$PLUGINSDIR\_temp" - Delete "$PLUGINSDIR\download.exe" - Delete "$PLUGINSDIR\${CONFIG_INI}" - - ${UnloadUAC} -FunctionEnd - -Function .onUserAbort - ${NSD_KillTimer} StartDownload - ${NSD_KillTimer} OnDownload - ${NSD_KillTimer} CheckInstall - ${NSD_KillTimer} FinishInstall - ${NSD_KillTimer} FinishProgressBar - ${NSD_KillTimer} DisplayDownloadError - - ${If} "$IsDownloadFinished" != "" - Call DisplayDownloadError - ; Aborting the abort will allow SendPing which is called by - ; DisplayDownloadError to hide the installer window and close the installer - ; after it sends the metrics ping. - Abort - ${EndIf} -FunctionEnd - -Function SendPing - HideWindow - ; Try to send a ping if a download was attempted - ${If} $CheckboxSendPing == 1 - ${AndIf} $IsDownloadFinished != "" - ; Get the tick count for the completion of all phases. - System::Call "kernel32::GetTickCount()l .s" - Pop $EndFinishPhaseTickCount - - ; When the value of $IsDownloadFinished is false the download was started - ; but didn't finish. In this case the tick count stored in - ; $EndFinishPhaseTickCount is used to determine how long the download was - ; in progress. - ${If} "$IsDownloadFinished" == "false" - ${OrIf} "$EndDownloadPhaseTickCount" == "" - StrCpy $EndDownloadPhaseTickCount "$EndFinishPhaseTickCount" - ; Cancel the download in progress - InetBgDL::Get /RESET /END - ${EndIf} - - - ; When $DownloadFirstTransferSeconds equals an empty string the download - ; never successfully started so set the value to 0. It will be possible to - ; determine that the download didn't successfully start from the seconds for - ; the last download. - ${If} "$DownloadFirstTransferSeconds" == "" - StrCpy $DownloadFirstTransferSeconds "0" - ${EndIf} - - ; When $StartLastDownloadTickCount equals an empty string the download never - ; successfully started so set the value to $EndDownloadPhaseTickCount to - ; compute the correct value. - ${If} $StartLastDownloadTickCount == "" - ; This could happen if the download never successfully starts - StrCpy $StartLastDownloadTickCount "$EndDownloadPhaseTickCount" - ${EndIf} - - ; When $EndPreInstallPhaseTickCount equals 0 the installation phase was - ; never completed so set its value to $EndFinishPhaseTickCount to compute - ; the correct value. - ${If} "$EndPreInstallPhaseTickCount" == "0" - StrCpy $EndPreInstallPhaseTickCount "$EndFinishPhaseTickCount" - ${EndIf} - - ; When $EndInstallPhaseTickCount equals 0 the installation phase was never - ; completed so set its value to $EndFinishPhaseTickCount to compute the - ; correct value. - ${If} "$EndInstallPhaseTickCount" == "0" - StrCpy $EndInstallPhaseTickCount "$EndFinishPhaseTickCount" - ${EndIf} - - ; Get the seconds elapsed from the start of the download phase to the end of - ; the download phase. - ${GetSecondsElapsed} "$StartDownloadPhaseTickCount" "$EndDownloadPhaseTickCount" $0 - - ; Get the seconds elapsed from the start of the last download to the end of - ; the last download. - ${GetSecondsElapsed} "$StartLastDownloadTickCount" "$EndDownloadPhaseTickCount" $1 - - ; Get the seconds elapsed from the end of the download phase to the - ; completion of the pre-installation check phase. - ${GetSecondsElapsed} "$EndDownloadPhaseTickCount" "$EndPreInstallPhaseTickCount" $2 - - ; Get the seconds elapsed from the end of the pre-installation check phase - ; to the completion of the installation phase. - ${GetSecondsElapsed} "$EndPreInstallPhaseTickCount" "$EndInstallPhaseTickCount" $3 - - ; Get the seconds elapsed from the end of the installation phase to the - ; completion of all phases. - ${GetSecondsElapsed} "$EndInstallPhaseTickCount" "$EndFinishPhaseTickCount" $4 - -!ifdef HAVE_64BIT_BUILD - StrCpy $R0 "1" -!else - StrCpy $R0 "0" -!endif - - ${If} ${RunningX64} - StrCpy $R1 "1" - ${Else} - StrCpy $R1 "0" - ${EndIf} - - ; Though these values are sometimes incorrect due to bug 444664 it happens - ; so rarely it isn't worth working around it by reading the registry values. - ${WinVerGetMajor} $5 - ${WinVerGetMinor} $6 - ${WinVerGetBuild} $7 - ${WinVerGetServicePackLevel} $8 - ${If} ${IsServerOS} - StrCpy $9 "1" - ${Else} - StrCpy $9 "0" - ${EndIf} - - ${If} "$ExitCode" == "${ERR_SUCCESS}" - ReadINIStr $R5 "$INSTDIR\application.ini" "App" "Version" - ReadINIStr $R6 "$INSTDIR\application.ini" "App" "BuildID" - ${Else} - StrCpy $R5 "0" - StrCpy $R6 "0" - ${EndIf} - - ; Whether installed into the default installation directory - ${GetLongPath} "$INSTDIR" $R7 - ${GetLongPath} "$InitialInstallDir" $R8 - ${If} "$R7" == "$R8" - StrCpy $R7 "1" - ${Else} - StrCpy $R7 "0" - ${EndIf} - - ClearErrors - WriteRegStr HKLM "Software\Mozilla" "${BrandShortName}InstallerTest" \ - "Write Test" - ${If} ${Errors} - StrCpy $R8 "0" - ${Else} - DeleteRegValue HKLM "Software\Mozilla" "${BrandShortName}InstallerTest" - StrCpy $R8 "1" - ${EndIf} - - ${If} "$DownloadServerIP" == "" - StrCpy $DownloadServerIP "Unknown" - ${EndIf} - - StrCpy $R2 "" - SetShellVarContext current ; Set SHCTX to the current user - ReadRegStr $R2 HKCU "Software\Classes\http\shell\open\command" "" - ${If} $R2 != "" - ${GetPathFromString} "$R2" $R2 - ${GetParent} "$R2" $R3 - ${GetLongPath} "$R3" $R3 - ${If} $R3 == $INSTDIR - StrCpy $R2 "1" ; This Basilisk install is set as default. - ${Else} - StrCpy $R2 "$R2" "" -11 # length of firefox.exe - ${If} "$R2" == "${FileMainEXE}" - StrCpy $R2 "2" ; Another Basilisk install is set as default. - ${Else} - StrCpy $R2 "0" - ${EndIf} - ${EndIf} - ${Else} - StrCpy $R2 "0" ; Basilisk is not set as default. - ${EndIf} - - ${If} "$R2" == "0" - ${AndIf} ${AtLeastWinVista} - ; Check to see if this install location is currently set as the default - ; browser by Default Programs which is only available on Vista and above. - ClearErrors - ReadRegStr $R3 HKLM "Software\RegisteredApplications" "${AppRegName}" - ${Unless} ${Errors} - AppAssocReg::QueryAppIsDefaultAll "${AppRegName}" "effective" - Pop $R3 - ${If} $R3 == "1" - StrCpy $R3 "" - ReadRegStr $R2 HKLM "Software\Classes\http\shell\open\command" "" - ${If} $R2 != "" - ${GetPathFromString} "$R2" $R2 - ${GetParent} "$R2" $R3 - ${GetLongPath} "$R3" $R3 - ${If} $R3 == $INSTDIR - StrCpy $R2 "1" ; This Basilisk install is set as default. - ${Else} - StrCpy $R2 "$R2" "" -11 # length of firefox.exe - ${If} "$R2" == "${FileMainEXE}" - StrCpy $R2 "2" ; Another Basilisk install is set as default. - ${Else} - StrCpy $R2 "0" - ${EndIf} - ${EndIf} - ${Else} - StrCpy $R2 "0" ; Basilisk is not set as default. - ${EndIf} - ${EndIf} - ${EndUnless} - ${EndIf} - - ${If} $CanSetAsDefault == "true" - ${If} $CheckboxSetAsDefault == "1" - StrCpy $R3 "2" - ${Else} - StrCpy $R3 "3" - ${EndIf} - ${Else} - ${If} ${AtLeastWin8} - StrCpy $R3 "1" - ${Else} - StrCpy $R3 "0" - ${EndIf} - ${EndIf} - -!ifdef STUB_DEBUG - MessageBox MB_OK "${BaseURLStubPing} \ - $\nStub URL Version = ${StubURLVersion}${StubURLVersionAppend} \ - $\nBuild Channel = ${Channel} \ - $\nUpdate Channel = ${UpdateChannel} \ - $\nLocale = ${AB_CD} \ - $\nBasilisk x64 = $R0 \ - $\nRunning x64 Windows = $R1 \ - $\nMajor = $5 \ - $\nMinor = $6 \ - $\nBuild = $7 \ - $\nServicePack = $8 \ - $\nIsServer = $9 \ - $\nExit Code = $ExitCode \ - $\nBasilisk Launch Code = $BasiliskLaunchCode \ - $\nDownload Retry Count = $DownloadRetryCount \ - $\nDownloaded Bytes = $DownloadedBytes \ - $\nDownload Size Bytes = $DownloadSizeBytes \ - $\nIntroduction Phase Seconds = $IntroPhaseSeconds \ - $\nOptions Phase Seconds = $OptionsPhaseSeconds \ - $\nDownload Phase Seconds = $0 \ - $\nLast Download Seconds = $1 \ - $\nDownload First Transfer Seconds = $DownloadFirstTransferSeconds \ - $\nPreinstall Phase Seconds = $2 \ - $\nInstall Phase Seconds = $3 \ - $\nFinish Phase Seconds = $4 \ - $\nInitial Install Requirements Code = $InitialInstallRequirementsCode \ - $\nOpened Download Page = $OpenedDownloadPage \ - $\nExisting Profile = $ExistingProfile \ - $\nExisting Version = $ExistingVersion \ - $\nExisting Build ID = $ExistingBuildID \ - $\nNew Version = $R5 \ - $\nNew Build ID = $R6 \ - $\nDefault Install Dir = $R7 \ - $\nHas Admin = $R8 \ - $\nDefault Status = $R2 \ - $\nSet As Sefault Status = $R3 \ - $\nDownload Server IP = $DownloadServerIP \ - $\nPost-Signing Data = $PostSigningData" - ; The following will exit the installer - SetAutoClose true - StrCpy $R9 "2" - Call RelativeGotoPage -!else - ${NSD_CreateTimer} OnPing ${DownloadIntervalMS} - InetBgDL::Get "${BaseURLStubPing}/${StubURLVersion}${StubURLVersionAppend}/${Channel}/${UpdateChannel}/${AB_CD}/$R0/$R1/$5/$6/$7/$8/$9/$ExitCode/$BasiliskLaunchCode/$DownloadRetryCount/$DownloadedBytes/$DownloadSizeBytes/$IntroPhaseSeconds/$OptionsPhaseSeconds/$0/$1/$DownloadFirstTransferSeconds/$2/$3/$4/$InitialInstallRequirementsCode/$OpenedDownloadPage/$ExistingProfile/$ExistingVersion/$ExistingBuildID/$R5/$R6/$R7/$R8/$R2/$R3/$DownloadServerIP/$PostSigningData" \ - "$PLUGINSDIR\_temp" /END -!endif - ${Else} - ${If} "$IsDownloadFinished" == "false" - ; Cancel the download in progress - InetBgDL::Get /RESET /END - ${EndIf} - ; The following will exit the installer - SetAutoClose true - StrCpy $R9 "2" - Call RelativeGotoPage - ${EndIf} -FunctionEnd - -Function createDummy -FunctionEnd - -Function createIntro - nsDialogs::Create /NOUNLOAD 1018 - Pop $Dialog - - GetFunctionAddress $0 OnBack - nsDialogs::OnBack /NOUNLOAD $0 - -!ifdef ${AB_CD}_rtl - ; For RTL align the text with the top of the F in the Basilisk bitmap - StrCpy $0 "${INTRO_BLURB_RTL_TOP_DU}" -!else - ; For LTR align the text with the top of the x in the Basilisk bitmap - StrCpy $0 "${INTRO_BLURB_LTR_TOP_DU}" -!endif - ${NSD_CreateLabel} ${INTRO_BLURB_EDGE_DU} $0 ${INTRO_BLURB_WIDTH_DU} 76u "${INTRO_BLURB}" - Pop $0 - SendMessage $0 ${WM_SETFONT} $FontBlurb 0 - SetCtlColors $0 ${INTRO_BLURB_TEXT_COLOR} transparent - - SetCtlColors $HWNDPARENT ${FOOTER_CONTROL_TEXT_COLOR_NORMAL} ${FOOTER_BKGRD_COLOR} - GetDlgItem $0 $HWNDPARENT 10 ; Default browser checkbox - ${If} "$CanSetAsDefault" == "true" - ; The uxtheme must be disabled on checkboxes in order to override the - ; system font color. - System::Call 'uxtheme::SetWindowTheme(i $0 , w " ", w " ")' - SendMessage $0 ${WM_SETFONT} $FontNormal 0 - SendMessage $0 ${WM_SETTEXT} 0 "STR:$(MAKE_DEFAULT)" - SendMessage $0 ${BM_SETCHECK} 1 0 - SetCtlColors $0 ${FOOTER_CONTROL_TEXT_COLOR_NORMAL} ${FOOTER_BKGRD_COLOR} - ${Else} - ShowWindow $0 ${SW_HIDE} - ${EndIf} - GetDlgItem $0 $HWNDPARENT 11 - ShowWindow $0 ${SW_HIDE} - - ${NSD_CreateBitmap} ${APPNAME_BMP_EDGE_DU} ${APPNAME_BMP_TOP_DU} \ - ${APPNAME_BMP_WIDTH_DU} ${APPNAME_BMP_HEIGHT_DU} "" - Pop $2 - ${SetStretchedTransparentImage} $2 $PLUGINSDIR\appname.bmp $0 - - ${NSD_CreateBitmap} 0 0 100% 100% "" - Pop $2 - ${NSD_SetStretchedImage} $2 $PLUGINSDIR\bgintro.bmp $1 - - GetDlgItem $0 $HWNDPARENT 1 ; Install button - ${If} ${FileExists} "$INSTDIR\${FileMainEXE}" - SendMessage $0 ${WM_SETTEXT} 0 "STR:$(UPGRADE_BUTTON)" - ${Else} - SendMessage $0 ${WM_SETTEXT} 0 "STR:$(INSTALL_BUTTON)" - ${EndIf} - ${NSD_SetFocus} $0 - - GetDlgItem $0 $HWNDPARENT 2 ; Cancel button - SendMessage $0 ${WM_SETTEXT} 0 "STR:$(CANCEL_BUTTON)" - - GetDlgItem $0 $HWNDPARENT 3 ; Back button used for Options - SendMessage $0 ${WM_SETTEXT} 0 "STR:$(OPTIONS_BUTTON)" - - System::Call "kernel32::GetTickCount()l .s" - Pop $StartIntroPhaseTickCount - - LockWindow off - nsDialogs::Show - - ${NSD_FreeImage} $0 - ${NSD_FreeImage} $1 -FunctionEnd - -Function leaveIntro - LockWindow on - - System::Call "kernel32::GetTickCount()l .s" - Pop $0 - ${GetSecondsElapsed} "$StartIntroPhaseTickCount" "$0" $IntroPhaseSeconds - ; It is possible for this value to be 0 if the user clicks fast enough so - ; increment the value by 1 if it is 0. - ${If} $IntroPhaseSeconds == 0 - IntOp $IntroPhaseSeconds $IntroPhaseSeconds + 1 - ${EndIf} - - SetShellVarContext all ; Set SHCTX to All Users - ; If the user doesn't have write access to the installation directory set - ; the installation directory to a subdirectory of the All Users application - ; directory and if the user can't write to that location set the installation - ; directory to a subdirectory of the users local application directory - ; (e.g. non-roaming). - Call CanWrite - ${If} "$CanWriteToInstallDir" == "false" - StrCpy $INSTDIR "$APPDATA\${BrandFullName}\" - Call CanWrite - ${If} "$CanWriteToInstallDir" == "false" - ; This should never happen but just in case. - StrCpy $CanWriteToInstallDir "false" - ${Else} - StrCpy $INSTDIR "$LOCALAPPDATA\${BrandFullName}\" - Call CanWrite - ${EndIf} - ${EndIf} - - Call CheckSpace - - ${If} ${FileExists} "$INSTDIR" - ; Always display the long path if the path exists. - ${GetLongPath} "$INSTDIR" $INSTDIR - ${EndIf} - -FunctionEnd - -Function createOptions - ; Check whether the install requirements are satisfied using the default - ; values for metrics. - ${If} "$InitialInstallRequirementsCode" == "" - ${If} "$CanWriteToInstallDir" != "true" - ${AndIf} "$HasRequiredSpaceAvailable" != "true" - StrCpy $InitialInstallRequirementsCode "1" - ${ElseIf} "$CanWriteToInstallDir" != "true" - StrCpy $InitialInstallRequirementsCode "2" - ${ElseIf} "$HasRequiredSpaceAvailable" != "true" - StrCpy $InitialInstallRequirementsCode "3" - ${Else} - StrCpy $InitialInstallRequirementsCode "0" - ${EndIf} - ${EndIf} - - ; Skip the options page unless the Options button was clicked as long as the - ; installation directory can be written to and there is the minimum required - ; space available. - ${If} "$WasOptionsButtonClicked" != "1" - ${If} "$CanWriteToInstallDir" == "true" - ${AndIf} "$HasRequiredSpaceAvailable" == "true" - Abort ; Skip the options page - ${EndIf} - ${EndIf} - - StrCpy $ExistingTopDir "" - - nsDialogs::Create /NOUNLOAD 1018 - Pop $Dialog - ; Since the text color for controls is set in this Dialog the foreground and - ; background colors of the Dialog must also be hardcoded. - SetCtlColors $Dialog ${COMMON_TEXT_COLOR_NORMAL} ${COMMON_BKGRD_COLOR} - - ${NSD_CreateLabel} ${OPTIONS_ITEM_EDGE_DU} 18u ${OPTIONS_ITEM_WIDTH_DU} \ - 12u "$(CREATE_SHORTCUTS)" - Pop $0 - SetCtlColors $0 ${COMMON_TEXT_COLOR_NORMAL} ${COMMON_BKGRD_COLOR} - SendMessage $0 ${WM_SETFONT} $FontNormal 0 - - ${If} ${AtLeastWin7} - StrCpy $0 "$(ADD_SC_TASKBAR)" - ${Else} - StrCpy $0 "$(ADD_SC_QUICKLAUNCHBAR)" - ${EndIf} - ${NSD_CreateCheckbox} ${OPTIONS_SUBITEM_EDGE_DU} 38u \ - ${OPTIONS_SUBITEM_WIDTH_DU} 12u "$0" - Pop $CheckboxShortcutOnBar - ; The uxtheme must be disabled on checkboxes in order to override the system - ; font color. - System::Call 'uxtheme::SetWindowTheme(i $CheckboxShortcutOnBar, w " ", w " ")' - SetCtlColors $CheckboxShortcutOnBar ${COMMON_TEXT_COLOR_NORMAL} ${COMMON_BKGRD_COLOR} - SendMessage $CheckboxShortcutOnBar ${WM_SETFONT} $FontNormal 0 - ${NSD_Check} $CheckboxShortcutOnBar - - ${NSD_CreateCheckbox} ${OPTIONS_SUBITEM_EDGE_DU} 54u ${OPTIONS_SUBITEM_WIDTH_DU} \ - 12u "$(ADD_CheckboxShortcutInStartMenu)" - Pop $CheckboxShortcutInStartMenu - ; The uxtheme must be disabled on checkboxes in order to override the system - ; font color. - System::Call 'uxtheme::SetWindowTheme(i $CheckboxShortcutInStartMenu, w " ", w " ")' - SetCtlColors $CheckboxShortcutInStartMenu ${COMMON_TEXT_COLOR_NORMAL} ${COMMON_BKGRD_COLOR} - SendMessage $CheckboxShortcutInStartMenu ${WM_SETFONT} $FontNormal 0 - ${NSD_Check} $CheckboxShortcutInStartMenu - - ${NSD_CreateCheckbox} ${OPTIONS_SUBITEM_EDGE_DU} 70u ${OPTIONS_SUBITEM_WIDTH_DU} \ - 12u "$(ADD_CheckboxShortcutOnDesktop)" - Pop $CheckboxShortcutOnDesktop - ; The uxtheme must be disabled on checkboxes in order to override the system - ; font color. - System::Call 'uxtheme::SetWindowTheme(i $CheckboxShortcutOnDesktop, w " ", w " ")' - SetCtlColors $CheckboxShortcutOnDesktop ${COMMON_TEXT_COLOR_NORMAL} ${COMMON_BKGRD_COLOR} - SendMessage $CheckboxShortcutOnDesktop ${WM_SETFONT} $FontNormal 0 - ${NSD_Check} $CheckboxShortcutOnDesktop - - ${NSD_CreateLabel} ${OPTIONS_ITEM_EDGE_DU} 100u ${OPTIONS_ITEM_WIDTH_DU} \ - 12u "$(DEST_FOLDER)" - Pop $0 - SetCtlColors $0 ${COMMON_TEXT_COLOR_NORMAL} ${COMMON_BKGRD_COLOR} - SendMessage $0 ${WM_SETFONT} $FontNormal 0 - - ${NSD_CreateDirRequest} ${OPTIONS_SUBITEM_EDGE_DU} 116u 159u 14u "$INSTDIR" - Pop $DirRequest - SetCtlColors $DirRequest ${COMMON_TEXT_COLOR_NORMAL} ${COMMON_BKGRD_COLOR} - SendMessage $DirRequest ${WM_SETFONT} $FontNormal 0 - System::Call shlwapi::SHAutoComplete(i $DirRequest, i ${SHACF_FILESYSTEM}) - ${NSD_OnChange} $DirRequest OnChange_DirRequest - -!ifdef ${AB_CD}_rtl - ; Remove the RTL styling from the directory request text box - ${RemoveStyle} $DirRequest ${SS_RIGHT} - ${RemoveExStyle} $DirRequest ${WS_EX_RIGHT} - ${RemoveExStyle} $DirRequest ${WS_EX_RTLREADING} - ${NSD_AddStyle} $DirRequest ${SS_LEFT} - ${NSD_AddExStyle} $DirRequest ${WS_EX_LTRREADING}|${WS_EX_LEFT} -!endif - - ${NSD_CreateBrowseButton} 280u 116u 50u 14u "$(BROWSE_BUTTON)" - Pop $ButtonBrowse - SetCtlColors $ButtonBrowse "" ${COMMON_BKGRD_COLOR} - ${NSD_OnClick} $ButtonBrowse OnClick_ButtonBrowse - - ; Get the number of pixels from the left of the Dialog to the right side of - ; the "Space Required:" and "Space Available:" labels prior to setting RTL so - ; the correct position of the controls can be set by NSIS for RTL locales. - - ; Get the width and height of both labels and use the tallest for the height - ; and the widest to calculate where to place the labels after these labels. - ${GetTextExtent} "$(SPACE_REQUIRED)" $FontItalic $0 $1 - ${GetTextExtent} "$(SPACE_AVAILABLE)" $FontItalic $2 $3 - ${If} $1 > $3 - StrCpy $ControlHeightPX "$1" - ${Else} - StrCpy $ControlHeightPX "$3" - ${EndIf} - - IntOp $0 $0 + 8 ; Add padding to the control's width - ; Make both controls the same width as the widest control - ${NSD_CreateLabelCenter} ${OPTIONS_SUBITEM_EDGE_DU} 134u $0 $ControlHeightPX "$(SPACE_REQUIRED)" - Pop $5 - SetCtlColors $5 ${COMMON_TEXT_COLOR_FADED} ${COMMON_BKGRD_COLOR} - SendMessage $5 ${WM_SETFONT} $FontItalic 0 - - IntOp $2 $2 + 8 ; Add padding to the control's width - ${NSD_CreateLabelCenter} ${OPTIONS_SUBITEM_EDGE_DU} 145u $2 $ControlHeightPX "$(SPACE_AVAILABLE)" - Pop $6 - SetCtlColors $6 ${COMMON_TEXT_COLOR_FADED} ${COMMON_BKGRD_COLOR} - SendMessage $6 ${WM_SETFONT} $FontItalic 0 - - ; Use the widest label for aligning the labels next to them - ${If} $0 > $2 - StrCpy $6 "$5" - ${EndIf} - FindWindow $1 "#32770" "" $HWNDPARENT - ${GetDlgItemEndPX} $6 $ControlRightPX - - IntOp $ControlRightPX $ControlRightPX + 6 - - ${NSD_CreateLabel} $ControlRightPX 134u 100% $ControlHeightPX \ - "${APPROXIMATE_REQUIRED_SPACE_MB} $(MEGA)$(BYTE)" - Pop $7 - SetCtlColors $7 ${COMMON_TEXT_COLOR_NORMAL} ${COMMON_BKGRD_COLOR} - SendMessage $7 ${WM_SETFONT} $FontNormal 0 - - ; Create the free space label with an empty string and update it by calling - ; UpdateFreeSpaceLabel - ${NSD_CreateLabel} $ControlRightPX 145u 100% $ControlHeightPX " " - Pop $LabelFreeSpace - SetCtlColors $LabelFreeSpace ${COMMON_TEXT_COLOR_NORMAL} ${COMMON_BKGRD_COLOR} - SendMessage $LabelFreeSpace ${WM_SETFONT} $FontNormal 0 - - Call UpdateFreeSpaceLabel - - ${NSD_CreateCheckbox} ${OPTIONS_ITEM_EDGE_DU} 168u ${OPTIONS_SUBITEM_WIDTH_DU} \ - 12u "$(SEND_PING)" - Pop $CheckboxSendPing - ; The uxtheme must be disabled on checkboxes in order to override the system - ; font color. - System::Call 'uxtheme::SetWindowTheme(i $CheckboxSendPing, w " ", w " ")' - SetCtlColors $CheckboxSendPing ${COMMON_TEXT_COLOR_NORMAL} ${COMMON_BKGRD_COLOR} - SendMessage $CheckboxSendPing ${WM_SETFONT} $FontNormal 0 - ${NSD_Check} $CheckboxSendPing - -!ifdef MOZ_MAINTENANCE_SERVICE - ; We can only install the maintenance service if the user is an admin. - Call IsUserAdmin - Pop $0 - - ; Only show the maintenance service checkbox if we're on XP SP3 or higher; - ; we don't ever want to install it on XP without at least SP3 installed. - ${If} $0 == "true" - ${AndIf} ${IsWinXP} - ${AndIf} ${AtMostServicePack} 2 - StrCpy $0 "false" - ${EndIf} - - ; Only show the maintenance service checkbox if we have write access to HKLM - ClearErrors - WriteRegStr HKLM "Software\Mozilla" "${BrandShortName}InstallerTest" \ - "Write Test" - ${If} ${Errors} - ${OrIf} $0 != "true" - StrCpy $CheckboxInstallMaintSvc "0" - ${Else} - DeleteRegValue HKLM "Software\Mozilla" "${BrandShortName}InstallerTest" - ; Read the registry instead of using ServicesHelper::IsInstalled so the - ; plugin isn't included in the stub installer to lessen its size. - ClearErrors - ReadRegStr $0 HKLM "SYSTEM\CurrentControlSet\services\MozillaMaintenance" "ImagePath" - ${If} ${Errors} - ${NSD_CreateCheckbox} ${OPTIONS_ITEM_EDGE_DU} 184u ${OPTIONS_ITEM_WIDTH_DU} \ - 12u "$(INSTALL_MAINT_SERVICE)" - Pop $CheckboxInstallMaintSvc - System::Call 'uxtheme::SetWindowTheme(i $CheckboxInstallMaintSvc, w " ", w " ")' - SetCtlColors $CheckboxInstallMaintSvc ${COMMON_TEXT_COLOR_NORMAL} ${COMMON_BKGRD_COLOR} - SendMessage $CheckboxInstallMaintSvc ${WM_SETFONT} $FontNormal 0 - ${NSD_Check} $CheckboxInstallMaintSvc - ${EndIf} - ${EndIf} -!endif - - GetDlgItem $0 $HWNDPARENT 1 ; Install button - ${If} ${FileExists} "$INSTDIR\${FileMainEXE}" - SendMessage $0 ${WM_SETTEXT} 0 "STR:$(UPGRADE_BUTTON)" - ${Else} - SendMessage $0 ${WM_SETTEXT} 0 "STR:$(INSTALL_BUTTON)" - ${EndIf} - ${NSD_SetFocus} $0 - - GetDlgItem $0 $HWNDPARENT 2 ; Cancel button - SendMessage $0 ${WM_SETTEXT} 0 "STR:$(CANCEL_BUTTON)" - - GetDlgItem $0 $HWNDPARENT 3 ; Back button used for Options - EnableWindow $0 0 - ShowWindow $0 ${SW_HIDE} - - ; If the option button was not clicked display the reason for what needs to be - ; resolved to continue the installation. - ${If} "$WasOptionsButtonClicked" != "1" - ${If} "$CanWriteToInstallDir" == "false" - MessageBox MB_OK|MB_ICONEXCLAMATION "$(WARN_WRITE_ACCESS)" - ${ElseIf} "$HasRequiredSpaceAvailable" == "false" - MessageBox MB_OK|MB_ICONEXCLAMATION "$(WARN_DISK_SPACE)" - ${EndIf} - ${EndIf} - - System::Call "kernel32::GetTickCount()l .s" - Pop $StartOptionsPhaseTickCount - - LockWindow off - nsDialogs::Show -FunctionEnd - -Function leaveOptions - LockWindow on - - ${GetRoot} "$INSTDIR" $0 - ${GetLongPath} "$INSTDIR" $INSTDIR - ${GetLongPath} "$0" $0 - ${If} "$INSTDIR" == "$0" - LockWindow off - MessageBox MB_OK|MB_ICONEXCLAMATION "$(WARN_ROOT_INSTALL)" - Abort ; Stay on the page - ${EndIf} - - Call CanWrite - ${If} "$CanWriteToInstallDir" == "false" - LockWindow off - MessageBox MB_OK|MB_ICONEXCLAMATION "$(WARN_WRITE_ACCESS)" - Abort ; Stay on the page - ${EndIf} - - Call CheckSpace - ${If} "$HasRequiredSpaceAvailable" == "false" - LockWindow off - MessageBox MB_OK|MB_ICONEXCLAMATION "$(WARN_DISK_SPACE)" - Abort ; Stay on the page - ${EndIf} - - System::Call "kernel32::GetTickCount()l .s" - Pop $0 - ${GetSecondsElapsed} "$StartOptionsPhaseTickCount" "$0" $OptionsPhaseSeconds - ; It is possible for this value to be 0 if the user clicks fast enough so - ; increment the value by 1 if it is 0. - ${If} $OptionsPhaseSeconds == 0 - IntOp $OptionsPhaseSeconds $OptionsPhaseSeconds + 1 - ${EndIf} - - ${NSD_GetState} $CheckboxShortcutOnBar $CheckboxShortcutOnBar - ${NSD_GetState} $CheckboxShortcutInStartMenu $CheckboxShortcutInStartMenu - ${NSD_GetState} $CheckboxShortcutOnDesktop $CheckboxShortcutOnDesktop - ${NSD_GetState} $CheckboxSendPing $CheckboxSendPing -!ifdef MOZ_MAINTENANCE_SERVICE - ${NSD_GetState} $CheckboxInstallMaintSvc $CheckboxInstallMaintSvc -!endif - -FunctionEnd - -Function createInstall - nsDialogs::Create /NOUNLOAD 1018 - Pop $Dialog - ; Since the text color for controls is set in this Dialog the foreground and - ; background colors of the Dialog must also be hardcoded. - SetCtlColors $Dialog ${COMMON_TEXT_COLOR_NORMAL} ${COMMON_BKGRD_COLOR} - - ${NSD_CreateLabel} 0 0 49u 64u "" - Pop $0 - ${GetDlgItemWidthHeight} $0 $1 $2 - System::Call 'user32::DestroyWindow(i r0)' - - ${NSD_CreateLabel} 0 0 11u 16u "" - Pop $0 - ${GetDlgItemWidthHeight} $0 $3 $4 - System::Call 'user32::DestroyWindow(i r0)' - - FindWindow $7 "#32770" "" $HWNDPARENT - ${GetDlgItemWidthHeight} $7 $8 $9 - - ; Allow a maximum text width of half of the Dialog's width - IntOp $R0 $8 / 2 - - ${GetTextWidthHeight} "${INSTALL_BLURB1}" $FontBlurb $R0 $5 $6 - IntOp $R1 $1 + $3 - IntOp $R1 $R1 + $5 - IntOp $R1 $8 - $R1 - IntOp $R1 $R1 / 2 - ${NSD_CreateBitmap} $R1 ${INSTALL_BLURB_TOP_DU} 49u 64u "" - Pop $BitmapBlurb1 - ${SetStretchedTransparentImage} $BitmapBlurb1 $PLUGINSDIR\clock.bmp $HwndBitmapBlurb1 - IntOp $R1 $R1 + $1 - IntOp $R1 $R1 + $3 - ${NSD_CreateLabel} $R1 ${INSTALL_BLURB_TOP_DU} $5 $6 "${INSTALL_BLURB1}" - Pop $LabelBlurb1 - SendMessage $LabelBlurb1 ${WM_SETFONT} $FontBlurb 0 - SetCtlColors $LabelBlurb1 ${INSTALL_BLURB_TEXT_COLOR} transparent - - ${GetTextWidthHeight} "${INSTALL_BLURB2}" $FontBlurb $R0 $5 $6 - IntOp $R1 $1 + $3 - IntOp $R1 $R1 + $5 - IntOp $R1 $8 - $R1 - IntOp $R1 $R1 / 2 - ${NSD_CreateBitmap} $R1 ${INSTALL_BLURB_TOP_DU} 49u 64u "" - Pop $BitmapBlurb2 - ${SetStretchedTransparentImage} $BitmapBlurb2 $PLUGINSDIR\particles.bmp $HwndBitmapBlurb2 - IntOp $R1 $R1 + $1 - IntOp $R1 $R1 + $3 - ${NSD_CreateLabel} $R1 ${INSTALL_BLURB_TOP_DU} $5 $6 "${INSTALL_BLURB2}" - Pop $LabelBlurb2 - SendMessage $LabelBlurb2 ${WM_SETFONT} $FontBlurb 0 - SetCtlColors $LabelBlurb2 ${INSTALL_BLURB_TEXT_COLOR} transparent - ShowWindow $BitmapBlurb2 ${SW_HIDE} - ShowWindow $LabelBlurb2 ${SW_HIDE} - - ${GetTextWidthHeight} "${INSTALL_BLURB3}" $FontBlurb $R0 $5 $6 - IntOp $R1 $1 + $3 - IntOp $R1 $R1 + $5 - IntOp $R1 $8 - $R1 - IntOp $R1 $R1 / 2 - ${NSD_CreateBitmap} $R1 ${INSTALL_BLURB_TOP_DU} 49u 64u "" - Pop $BitmapBlurb3 - ${SetStretchedTransparentImage} $BitmapBlurb3 $PLUGINSDIR\pencil.bmp $HWndBitmapBlurb3 - IntOp $R1 $R1 + $1 - IntOp $R1 $R1 + $3 - ${NSD_CreateLabel} $R1 ${INSTALL_BLURB_TOP_DU} $5 $6 "${INSTALL_BLURB3}" - Pop $LabelBlurb3 - SendMessage $LabelBlurb3 ${WM_SETFONT} $FontBlurb 0 - SetCtlColors $LabelBlurb3 ${INSTALL_BLURB_TEXT_COLOR} transparent - ShowWindow $BitmapBlurb3 ${SW_HIDE} - ShowWindow $LabelBlurb3 ${SW_HIDE} - - ${NSD_CreateProgressBar} 103u 166u 241u 9u "" - Pop $Progressbar - ${NSD_AddStyle} $Progressbar ${PBS_MARQUEE} - SendMessage $Progressbar ${PBM_SETMARQUEE} 1 \ - $ProgressbarMarqueeIntervalMS ; start=1|stop=0 interval(ms)=+N - - ${NSD_CreateLabelCenter} 103u 180u 241u 20u "$(DOWNLOADING_LABEL)" - Pop $LabelDownloading - SendMessage $LabelDownloading ${WM_SETFONT} $FontNormal 0 - SetCtlColors $LabelDownloading ${INSTALL_PROGRESS_TEXT_COLOR_NORMAL} transparent - - ${If} ${FileExists} "$INSTDIR\${FileMainEXE}" - ${NSD_CreateLabelCenter} 103u 180u 241u 20u "$(UPGRADING_LABEL)" - ${Else} - ${NSD_CreateLabelCenter} 103u 180u 241u 20u "$(INSTALLING_LABEL)" - ${EndIf} - Pop $LabelInstalling - SendMessage $LabelInstalling ${WM_SETFONT} $FontNormal 0 - SetCtlColors $LabelInstalling ${INSTALL_PROGRESS_TEXT_COLOR_NORMAL} transparent - ShowWindow $LabelInstalling ${SW_HIDE} - - ${NSD_CreateBitmap} ${APPNAME_BMP_EDGE_DU} ${APPNAME_BMP_TOP_DU} \ - ${APPNAME_BMP_WIDTH_DU} ${APPNAME_BMP_HEIGHT_DU} "" - Pop $2 - ${SetStretchedTransparentImage} $2 $PLUGINSDIR\appname.bmp $0 - - GetDlgItem $0 $HWNDPARENT 1 ; Install button - EnableWindow $0 0 - ShowWindow $0 ${SW_HIDE} - - GetDlgItem $0 $HWNDPARENT 3 ; Back button used for Options - EnableWindow $0 0 - ShowWindow $0 ${SW_HIDE} - - GetDlgItem $0 $HWNDPARENT 2 ; Cancel button - SendMessage $0 ${WM_SETTEXT} 0 "STR:$(CANCEL_BUTTON)" - ; Focus the Cancel button otherwise it isn't possible to tab to it since it is - ; the only control that can be tabbed to. - ${NSD_SetFocus} $0 - ; Kill the Cancel button's focus so pressing enter won't cancel the install. - SendMessage $0 ${WM_KILLFOCUS} 0 0 - - ${If} "$CanSetAsDefault" == "true" - GetDlgItem $0 $HWNDPARENT 10 ; Default browser checkbox - SendMessage $0 ${BM_GETCHECK} 0 0 $CheckboxSetAsDefault - EnableWindow $0 0 - ShowWindow $0 ${SW_HIDE} - ${EndIf} - - GetDlgItem $0 $HWNDPARENT 11 - ${If} ${FileExists} "$INSTDIR\${FileMainEXE}" - SendMessage $0 ${WM_SETTEXT} 0 "STR:$(ONE_MOMENT_UPGRADE)" - ${Else} - SendMessage $0 ${WM_SETTEXT} 0 "STR:$(ONE_MOMENT_INSTALL)" - ${EndIf} - SendMessage $0 ${WM_SETFONT} $FontNormal 0 - SetCtlColors $0 ${FOOTER_CONTROL_TEXT_COLOR_FADED} ${FOOTER_BKGRD_COLOR} - ShowWindow $0 ${SW_SHOW} - - ; Set $DownloadReset to true so the first download tick count is measured. - StrCpy $DownloadReset "true" - StrCpy $IsDownloadFinished "false" - StrCpy $DownloadRetryCount "0" - StrCpy $DownloadedBytes "0" - StrCpy $StartLastDownloadTickCount "" - StrCpy $EndDownloadPhaseTickCount "" - StrCpy $DownloadFirstTransferSeconds "" - StrCpy $ExitCode "${ERR_DOWNLOAD_CANCEL}" - StrCpy $OpenedDownloadPage "0" - - ClearErrors - ReadINIStr $ExistingVersion "$INSTDIR\application.ini" "App" "Version" - ${If} ${Errors} - StrCpy $ExistingVersion "0" - ${EndIf} - - ClearErrors - ReadINIStr $ExistingBuildID "$INSTDIR\application.ini" "App" "BuildID" - ${If} ${Errors} - StrCpy $ExistingBuildID "0" - ${EndIf} - - ${If} ${FileExists} "$LOCALAPPDATA\Mozilla\Basilisk" - StrCpy $ExistingProfile "1" - ${Else} - StrCpy $ExistingProfile "0" - ${EndIf} - - StrCpy $DownloadServerIP "" - - System::Call "kernel32::GetTickCount()l .s" - Pop $StartDownloadPhaseTickCount - - ${If} ${FileExists} "$INSTDIR\uninstall\uninstall.log" - StrCpy $InstallTotalSteps ${InstallPaveOverTotalSteps} - ${Else} - StrCpy $InstallTotalSteps ${InstallCleanTotalSteps} - ${EndIf} - - ${ITBL3Create} - ${ITBL3SetProgressState} "${TBPF_INDETERMINATE}" - - ${NSD_CreateTimer} StartDownload ${DownloadIntervalMS} - - LockWindow off - nsDialogs::Show - - ${NSD_FreeImage} $0 - ${NSD_FreeImage} $HwndBitmapBlurb1 - ${NSD_FreeImage} $HwndBitmapBlurb2 - ${NSD_FreeImage} $HWndBitmapBlurb3 -FunctionEnd - -Function StartDownload - ${NSD_KillTimer} StartDownload - InetBgDL::Get "${URLStubDownload}${URLStubDownloadAppend}" "$PLUGINSDIR\download.exe" \ - /CONNECTTIMEOUT 120 /RECEIVETIMEOUT 120 /END - StrCpy $4 "" - ${NSD_CreateTimer} OnDownload ${DownloadIntervalMS} - ${If} ${FileExists} "$INSTDIR\${TO_BE_DELETED}" - RmDir /r "$INSTDIR\${TO_BE_DELETED}" - ${EndIf} -FunctionEnd - -Function SetProgressBars - SendMessage $Progressbar ${PBM_SETPOS} $ProgressCompleted 0 - ${ITBL3SetProgressValue} "$ProgressCompleted" "$ProgressTotal" -FunctionEnd - -Function RemoveFileProgressCallback - IntOp $InstallCounterStep $InstallCounterStep + 2 - System::Int64Op $ProgressCompleted + $InstallStepSize - Pop $ProgressCompleted - Call SetProgressBars - System::Int64Op $ProgressCompleted + $InstallStepSize - Pop $ProgressCompleted - Call SetProgressBars -FunctionEnd - -Function OnDownload - InetBgDL::GetStats - # $0 = HTTP status code, 0=Completed - # $1 = Completed files - # $2 = Remaining files - # $3 = Number of downloaded bytes for the current file - # $4 = Size of current file (Empty string if the size is unknown) - # /RESET must be used if status $0 > 299 (e.g. failure) - # When status is $0 =< 299 it is handled by InetBgDL - StrCpy $DownloadServerIP "$5" - ${If} $0 > 299 - ${NSD_KillTimer} OnDownload - IntOp $DownloadRetryCount $DownloadRetryCount + 1 - ${If} "$DownloadReset" != "true" - StrCpy $DownloadedBytes "0" - ${NSD_AddStyle} $Progressbar ${PBS_MARQUEE} - SendMessage $Progressbar ${PBM_SETMARQUEE} 1 \ - $ProgressbarMarqueeIntervalMS ; start=1|stop=0 interval(ms)=+N - ${ITBL3SetProgressState} "${TBPF_INDETERMINATE}" - ${EndIf} - InetBgDL::Get /RESET /END - StrCpy $DownloadSizeBytes "" - StrCpy $DownloadReset "true" - - ${If} $DownloadRetryCount >= ${DownloadMaxRetries} - StrCpy $ExitCode "${ERR_DOWNLOAD_TOO_MANY_RETRIES}" - ; Use a timer so the UI has a chance to update - ${NSD_CreateTimer} DisplayDownloadError ${InstallIntervalMS} - ${Else} - ${NSD_CreateTimer} StartDownload ${DownloadRetryIntervalMS} - ${EndIf} - Return - ${EndIf} - - ${If} "$DownloadReset" == "true" - System::Call "kernel32::GetTickCount()l .s" - Pop $StartLastDownloadTickCount - StrCpy $DownloadReset "false" - ; The seconds elapsed from the start of the download phase until the first - ; bytes are received are only recorded for the first request so it is - ; possible to determine connection issues for the first request. - ${If} "$DownloadFirstTransferSeconds" == "" - ; Get the seconds elapsed from the start of the download phase until the - ; first bytes are received. - ${GetSecondsElapsed} "$StartDownloadPhaseTickCount" "$StartLastDownloadTickCount" $DownloadFirstTransferSeconds - ${EndIf} - ${EndIf} - - ${If} "$DownloadSizeBytes" == "" - ${AndIf} "$4" != "" - ; Handle the case where the size of the file to be downloaded is less than - ; the minimum expected size or greater than the maximum expected size at the - ; beginning of the download. - ${If} $4 < ${DownloadMinSizeBytes} - ${OrIf} $4 > ${DownloadMaxSizeBytes} - ${NSD_KillTimer} OnDownload - InetBgDL::Get /RESET /END - StrCpy $DownloadReset "true" - - ${If} $DownloadRetryCount >= ${DownloadMaxRetries} - ; Use a timer so the UI has a chance to update - ${NSD_CreateTimer} DisplayDownloadError ${InstallIntervalMS} - ${Else} - ${NSD_CreateTimer} StartDownload ${DownloadIntervalMS} - ${EndIf} - Return - ${EndIf} - - StrCpy $DownloadSizeBytes "$4" - System::Int64Op $4 / 2 - Pop $HalfOfDownload - System::Int64Op $HalfOfDownload / $InstallTotalSteps - Pop $InstallStepSize - SendMessage $Progressbar ${PBM_SETMARQUEE} 0 0 ; start=1|stop=0 interval(ms)=+N - ${RemoveStyle} $Progressbar ${PBS_MARQUEE} - System::Int64Op $HalfOfDownload + $DownloadSizeBytes - Pop $ProgressTotal - StrCpy $ProgressCompleted 0 - SendMessage $Progressbar ${PBM_SETRANGE32} $ProgressCompleted $ProgressTotal - ${EndIf} - - ; Don't update the status until after the download starts - ${If} $2 != 0 - ${AndIf} "$4" == "" - Return - ${EndIf} - - ; Handle the case where the downloaded size is greater than the maximum - ; expected size during the download. - ${If} $DownloadedBytes > ${DownloadMaxSizeBytes} - InetBgDL::Get /RESET /END - StrCpy $DownloadReset "true" - - ${If} $DownloadRetryCount >= ${DownloadMaxRetries} - ; Use a timer so the UI has a chance to update - ${NSD_CreateTimer} DisplayDownloadError ${InstallIntervalMS} - ${Else} - ${NSD_CreateTimer} StartDownload ${DownloadIntervalMS} - ${EndIf} - Return - ${EndIf} - - ${If} $IsDownloadFinished != "true" - ${If} $2 == 0 - ${NSD_KillTimer} OnDownload - StrCpy $IsDownloadFinished "true" - ; The first step of the install progress bar is determined by the - ; InstallProgressFirstStep define and provides the user with immediate - ; feedback. - StrCpy $InstallCounterStep "${InstallProgressFirstStep}" - System::Call "kernel32::GetTickCount()l .s" - Pop $EndDownloadPhaseTickCount - - StrCpy $DownloadedBytes "$DownloadSizeBytes" - - ; When a download has finished handle the case where the downloaded size - ; is less than the minimum expected size or greater than the maximum - ; expected size during the download. - ${If} $DownloadedBytes < ${DownloadMinSizeBytes} - ${OrIf} $DownloadedBytes > ${DownloadMaxSizeBytes} - InetBgDL::Get /RESET /END - StrCpy $DownloadReset "true" - - ${If} $DownloadRetryCount >= ${DownloadMaxRetries} - ; Use a timer so the UI has a chance to update - ${NSD_CreateTimer} DisplayDownloadError ${InstallIntervalMS} - ${Else} - ${NSD_CreateTimer} StartDownload ${DownloadIntervalMS} - ${EndIf} - Return - ${EndIf} - - LockWindow on - ; Update the progress bars first in the UI change so they take affect - ; before other UI changes. - StrCpy $ProgressCompleted "$DownloadSizeBytes" - Call SetProgressBars - System::Int64Op $InstallStepSize * ${InstallProgressFirstStep} - Pop $R9 - System::Int64Op $ProgressCompleted + $R9 - Pop $ProgressCompleted - Call SetProgressBars - ShowWindow $LabelDownloading ${SW_HIDE} - ShowWindow $LabelInstalling ${SW_SHOW} - ShowWindow $LabelBlurb2 ${SW_HIDE} - ShowWindow $BitmapBlurb2 ${SW_HIDE} - ShowWindow $LabelBlurb3 ${SW_SHOW} - ShowWindow $BitmapBlurb3 ${SW_SHOW} - ; Disable the Cancel button during the install - GetDlgItem $5 $HWNDPARENT 2 - EnableWindow $5 0 - LockWindow off - - ; Open a handle to prevent modification of the full installer - StrCpy $R9 "${INVALID_HANDLE_VALUE}" - System::Call 'kernel32::CreateFileW(w "$PLUGINSDIR\download.exe", \ - i ${GENERIC_READ}, \ - i ${FILE_SHARE_READ}, i 0, \ - i ${OPEN_EXISTING}, i 0, i 0) i .R9' - StrCpy $HandleDownload "$R9" - - ${If} $HandleDownload == ${INVALID_HANDLE_VALUE} - StrCpy $ExitCode "${ERR_PREINSTALL_INVALID_HANDLE}" - StrCpy $0 "0" - StrCpy $1 "0" - ${Else} - CertCheck::VerifyCertTrust "$PLUGINSDIR\download.exe" - Pop $0 - CertCheck::VerifyCertNameIssuer "$PLUGINSDIR\download.exe" \ - "${CertNameDownload}" "${CertIssuerDownload}" - Pop $1 - ${If} $0 == 0 - ${AndIf} $1 == 0 - StrCpy $ExitCode "${ERR_PREINSTALL_CERT_UNTRUSTED_AND_ATTRIBUTES}" - ${ElseIf} $0 == 0 - StrCpy $ExitCode "${ERR_PREINSTALL_CERT_UNTRUSTED}" - ${ElseIf} $1 == 0 - StrCpy $ExitCode "${ERR_PREINSTALL_CERT_ATTRIBUTES}" - ${EndIf} - ${EndIf} - - System::Call "kernel32::GetTickCount()l .s" - Pop $EndPreInstallPhaseTickCount - - ${If} $0 == 0 - ${OrIf} $1 == 0 - ; Use a timer so the UI has a chance to update - ${NSD_CreateTimer} DisplayDownloadError ${InstallIntervalMS} - Return - ${EndIf} - - ; Instead of extracting the files we use the downloaded installer to - ; install in case it needs to perform operations that the stub doesn't - ; know about. - WriteINIStr "$PLUGINSDIR\${CONFIG_INI}" "Install" "InstallDirectoryPath" "$INSTDIR" - ; Don't create the QuickLaunch or Taskbar shortcut from the launched installer - WriteINIStr "$PLUGINSDIR\${CONFIG_INI}" "Install" "QuickLaunchShortcut" "false" - - ; Either avoid or force adding a taskbar pin based on the checkbox value: - ${If} $CheckboxShortcutOnBar == 0 - WriteINIStr "$PLUGINSDIR\${CONFIG_INI}" "Install" "TaskbarShortcut" "false" - ${Else} - WriteINIStr "$PLUGINSDIR\${CONFIG_INI}" "Install" "TaskbarShortcut" "true" - ${EndIf} - - ${If} $CheckboxShortcutOnDesktop == 1 - WriteINIStr "$PLUGINSDIR\${CONFIG_INI}" "Install" "DesktopShortcut" "true" - ${Else} - WriteINIStr "$PLUGINSDIR\${CONFIG_INI}" "Install" "DesktopShortcut" "false" - ${EndIf} - - ${If} $CheckboxShortcutInStartMenu == 1 - WriteINIStr "$PLUGINSDIR\${CONFIG_INI}" "Install" "StartMenuShortcuts" "true" - ${Else} - WriteINIStr "$PLUGINSDIR\${CONFIG_INI}" "Install" "StartMenuShortcuts" "false" - ${EndIf} - -!ifdef MOZ_MAINTENANCE_SERVICE - ${If} $CheckboxInstallMaintSvc == 1 - WriteINIStr "$PLUGINSDIR\${CONFIG_INI}" "Install" "MaintenanceService" "true" - ${Else} - WriteINIStr "$PLUGINSDIR\${CONFIG_INI}" "Install" "MaintenanceService" "false" - ${EndIf} -!else - WriteINIStr "$PLUGINSDIR\${CONFIG_INI}" "Install" "MaintenanceService" "false" -!endif - - ; Delete the taskbar shortcut history to ensure we do the right thing based on - ; the config file above. - ${GetShortcutsLogPath} $0 - Delete "$0" - - GetFunctionAddress $0 RemoveFileProgressCallback - ${RemovePrecompleteEntries} $0 - - ; Delete the install.log and let the full installer create it. When the - ; installer closes it we can detect that it has completed. - Delete "$INSTDIR\install.log" - - ; Delete firefox.exe.moz-upgrade and firefox.exe.moz-delete if it exists - ; since it being present will require an OS restart for the full - ; installer. - Delete "$INSTDIR\${FileMainEXE}.moz-upgrade" - Delete "$INSTDIR\${FileMainEXE}.moz-delete" - - System::Call "kernel32::GetTickCount()l .s" - Pop $EndPreInstallPhaseTickCount - - Exec "$\"$PLUGINSDIR\download.exe$\" /INI=$PLUGINSDIR\${CONFIG_INI}" - ${NSD_CreateTimer} CheckInstall ${InstallIntervalMS} - ${Else} - ${If} $HalfOfDownload != "true" - ${AndIf} $3 > $HalfOfDownload - StrCpy $HalfOfDownload "true" - LockWindow on - ShowWindow $LabelBlurb1 ${SW_HIDE} - ShowWindow $BitmapBlurb1 ${SW_HIDE} - ShowWindow $LabelBlurb2 ${SW_SHOW} - ShowWindow $BitmapBlurb2 ${SW_SHOW} - LockWindow off - ${EndIf} - StrCpy $DownloadedBytes "$3" - StrCpy $ProgressCompleted "$DownloadedBytes" - Call SetProgressBars - ${EndIf} - ${EndIf} -FunctionEnd - -Function OnPing - InetBgDL::GetStats - # $0 = HTTP status code, 0=Completed - # $1 = Completed files - # $2 = Remaining files - # $3 = Number of downloaded bytes for the current file - # $4 = Size of current file (Empty string if the size is unknown) - # /RESET must be used if status $0 > 299 (e.g. failure) - # When status is $0 =< 299 it is handled by InetBgDL - ${If} $2 == 0 - ${OrIf} $0 > 299 - ${NSD_KillTimer} OnPing - ${If} $0 > 299 - InetBgDL::Get /RESET /END - ${EndIf} - ; The following will exit the installer - SetAutoClose true - StrCpy $R9 "2" - Call RelativeGotoPage - ${EndIf} -FunctionEnd - -Function CheckInstall - IntOp $InstallCounterStep $InstallCounterStep + 1 - ${If} $InstallCounterStep >= $InstallTotalSteps - ${NSD_KillTimer} CheckInstall - ; Close the handle that prevents modification of the full installer - System::Call 'kernel32::CloseHandle(i $HandleDownload)' - StrCpy $ExitCode "${ERR_INSTALL_TIMEOUT}" - ; Use a timer so the UI has a chance to update - ${NSD_CreateTimer} DisplayDownloadError ${InstallIntervalMS} - Return - ${EndIf} - - System::Int64Op $ProgressCompleted + $InstallStepSize - Pop $ProgressCompleted - Call SetProgressBars - - ${If} ${FileExists} "$INSTDIR\install.log" - Delete "$INSTDIR\install.tmp" - CopyFiles /SILENT "$INSTDIR\install.log" "$INSTDIR\install.tmp" - - ; The unfocus and refocus that happens approximately here is caused by the - ; installer calling SHChangeNotify to refresh the shortcut icons. - - ; When the full installer completes the installation the install.log will no - ; longer be in use. - ClearErrors - Delete "$INSTDIR\install.log" - ${Unless} ${Errors} - ${NSD_KillTimer} CheckInstall - ; Close the handle that prevents modification of the full installer - System::Call 'kernel32::CloseHandle(i $HandleDownload)' - Rename "$INSTDIR\install.tmp" "$INSTDIR\install.log" - Delete "$PLUGINSDIR\download.exe" - Delete "$PLUGINSDIR\${CONFIG_INI}" - System::Call "kernel32::GetTickCount()l .s" - Pop $EndInstallPhaseTickCount - System::Int64Op $InstallStepSize * ${InstallProgressFinishStep} - Pop $InstallStepSize - ${NSD_CreateTimer} FinishInstall ${InstallIntervalMS} - ${EndUnless} - ${EndIf} -FunctionEnd - -Function FinishInstall - ; The full installer has completed but the progress bar still needs to finish - ; so increase the size of the step. - IntOp $InstallCounterStep $InstallCounterStep + ${InstallProgressFinishStep} - ${If} $InstallTotalSteps < $InstallCounterStep - StrCpy $InstallCounterStep "$InstallTotalSteps" - ${EndIf} - - ${If} $InstallTotalSteps != $InstallCounterStep - System::Int64Op $ProgressCompleted + $InstallStepSize - Pop $ProgressCompleted - Call SetProgressBars - Return - ${EndIf} - - ${NSD_KillTimer} FinishInstall - - StrCpy $ProgressCompleted "$ProgressTotal" - Call SetProgressBars - - ${If} "$CheckboxSetAsDefault" == "1" - ; NB: this code is duplicated in installer.nsi. Please keep in sync. - ; For data migration in the app, we want to know what the default browser - ; value was before we changed it. To do so, we read it here and store it - ; in our own registry key. - StrCpy $0 "" - ${If} ${AtLeastWinVista} - AppAssocReg::QueryCurrentDefault "http" "protocol" "effective" - Pop $1 - ; If the method hasn't failed, $1 will contain the progid. Check: - ${If} "$1" != "method failed" - ${AndIf} "$1" != "method not available" - ; Read the actual command from the progid - ReadRegStr $0 HKCR "$1\shell\open\command" "" - ${EndIf} - ${EndIf} - ; If using the App Association Registry didn't happen or failed, fall back - ; to the effective http default: - ${If} "$0" == "" - ReadRegStr $0 HKCR "http\shell\open\command" "" - ${EndIf} - ; If we have something other than empty string now, write the value. - ${If} "$0" != "" - ClearErrors - WriteRegStr HKCU "Software\Mozilla\Basilisk" "OldDefaultBrowserCommand" "$0" - ${EndIf} - - ${GetParameters} $0 - ClearErrors - ${GetOptions} "$0" "/UAC:" $0 - ${If} ${Errors} ; Not elevated - Call ExecSetAsDefaultAppUser - ${Else} ; Elevated - execute the function in the unelevated process - GetFunctionAddress $0 ExecSetAsDefaultAppUser - UAC::ExecCodeSegment $0 - ${EndIf} - ${EndIf} - - ${If} $CheckboxShortcutOnBar == 1 - ${If} ${AtMostWinVista} - ClearErrors - ${GetParameters} $0 - ClearErrors - ${GetOptions} "$0" "/UAC:" $0 - ${If} ${Errors} - Call AddQuickLaunchShortcut - ${Else} - GetFunctionAddress $0 AddQuickLaunchShortcut - UAC::ExecCodeSegment $0 - ${EndIf} - ${EndIf} - ${EndIf} - - ${If} ${FileExists} "$INSTDIR\${FileMainEXE}.moz-upgrade" - Delete "$INSTDIR\${FileMainEXE}" - Rename "$INSTDIR\${FileMainEXE}.moz-upgrade" "$INSTDIR\${FileMainEXE}" - ${EndIf} - - StrCpy $ExitCode "${ERR_SUCCESS}" - - StrCpy $InstallCounterStep 0 - ${NSD_CreateTimer} FinishProgressBar ${InstallIntervalMS} -FunctionEnd - -Function FinishProgressBar - IntOp $InstallCounterStep $InstallCounterStep + 1 - - ${If} $InstallCounterStep < 10 - Return - ${EndIf} - - ${NSD_KillTimer} FinishProgressBar - - Call CopyPostSigningData - Call LaunchApp - Call SendPing -FunctionEnd - -Function OnBack - StrCpy $WasOptionsButtonClicked "1" - StrCpy $R9 "1" ; Goto the next page - Call RelativeGotoPage - ; The call to Abort prevents NSIS from trying to move to the previous or the - ; next page. - Abort -FunctionEnd - -Function RelativeGotoPage - IntCmp $R9 0 0 Move Move - StrCmp $R9 "X" 0 Move - StrCpy $R9 "120" - - Move: - SendMessage $HWNDPARENT "0x408" "$R9" "" -FunctionEnd - -Function UpdateFreeSpaceLabel - ; Only update when $ExistingTopDir isn't set - ${If} "$ExistingTopDir" != "" - StrLen $5 "$ExistingTopDir" - StrLen $6 "$INSTDIR" - ${If} $5 <= $6 - StrCpy $7 "$INSTDIR" $5 - ${If} "$7" == "$ExistingTopDir" - Return - ${EndIf} - ${EndIf} - ${EndIf} - - Call CheckSpace - - StrCpy $0 "$SpaceAvailableBytes" - - StrCpy $1 "$(BYTE)" - - ${If} $0 > 1024 - ${OrIf} $0 < 0 - System::Int64Op $0 / 1024 - Pop $0 - StrCpy $1 "$(KILO)$(BYTE)" - ${If} $0 > 1024 - ${OrIf} $0 < 0 - System::Int64Op $0 / 1024 - Pop $0 - StrCpy $1 "$(MEGA)$(BYTE)" - ${If} $0 > 1024 - ${OrIf} $0 < 0 - System::Int64Op $0 / 1024 - Pop $0 - StrCpy $1 "$(GIGA)$(BYTE)" - ${EndIf} - ${EndIf} - ${EndIf} - - SendMessage $LabelFreeSpace ${WM_SETTEXT} 0 "STR:$0 $1" -FunctionEnd - -Function OnChange_DirRequest - Pop $0 - System::Call 'user32::GetWindowTextW(i $DirRequest, w .r0, i ${NSIS_MAX_STRLEN})' - StrCpy $1 "$0" 1 ; the first character - ${If} "$1" == "$\"" - StrCpy $1 "$0" "" -1 ; the last character - ${If} "$1" == "$\"" - StrCpy $0 "$0" "" 1 ; all but the first character - StrCpy $0 "$0" -1 ; all but the last character - ${EndIf} - ${EndIf} - - StrCpy $INSTDIR "$0" - Call UpdateFreeSpaceLabel - - GetDlgItem $0 $HWNDPARENT 1 ; Install button - ${If} ${FileExists} "$INSTDIR\${FileMainEXE}" - SendMessage $0 ${WM_SETTEXT} 0 "STR:$(UPGRADE_BUTTON)" - ${Else} - SendMessage $0 ${WM_SETTEXT} 0 "STR:$(INSTALL_BUTTON)" - ${EndIf} -FunctionEnd - -Function OnClick_ButtonBrowse - StrCpy $0 "$INSTDIR" - nsDialogs::SelectFolderDialog /NOUNLOAD "$(SELECT_FOLDER_TEXT)" $0 - Pop $0 - ${If} $0 == "error" ; returns 'error' if 'cancel' was pressed? - Return - ${EndIf} - - ${If} $0 != "" - StrCpy $INSTDIR "$0" - System::Call 'user32::SetWindowTextW(i $DirRequest, w "$INSTDIR")' - ${EndIf} -FunctionEnd - -Function CheckSpace - ${If} "$ExistingTopDir" != "" - StrLen $0 "$ExistingTopDir" - StrLen $1 "$INSTDIR" - ${If} $0 <= $1 - StrCpy $2 "$INSTDIR" $3 - ${If} "$2" == "$ExistingTopDir" - Return - ${EndIf} - ${EndIf} - ${EndIf} - - StrCpy $ExistingTopDir "$INSTDIR" - ${DoUntil} ${FileExists} "$ExistingTopDir" - ${GetParent} "$ExistingTopDir" $ExistingTopDir - ${If} "$ExistingTopDir" == "" - StrCpy $SpaceAvailableBytes "0" - StrCpy $HasRequiredSpaceAvailable "false" - Return - ${EndIf} - ${Loop} - - ${GetLongPath} "$ExistingTopDir" $ExistingTopDir - - ; GetDiskFreeSpaceExW requires a backslash. - StrCpy $0 "$ExistingTopDir" "" -1 ; the last character - ${If} "$0" != "\" - StrCpy $0 "\" - ${Else} - StrCpy $0 "" - ${EndIf} - - System::Call 'kernel32::GetDiskFreeSpaceExW(w, *l, *l, *l) i("$ExistingTopDir$0", .r1, .r2, .r3) .' - StrCpy $SpaceAvailableBytes "$1" - - System::Int64Op $SpaceAvailableBytes / 1048576 - Pop $1 - System::Int64Op $1 > ${APPROXIMATE_REQUIRED_SPACE_MB} - Pop $1 - ${If} $1 == 1 - StrCpy $HasRequiredSpaceAvailable "true" - ${Else} - StrCpy $HasRequiredSpaceAvailable "false" - ${EndIf} -FunctionEnd - -Function CanWrite - StrCpy $CanWriteToInstallDir "false" - - StrCpy $0 "$INSTDIR" - ; Use the existing directory when it exists - ${Unless} ${FileExists} "$INSTDIR" - ; Get the topmost directory that exists for new installs - ${DoUntil} ${FileExists} "$0" - ${GetParent} "$0" $0 - ${If} "$0" == "" - Return - ${EndIf} - ${Loop} - ${EndUnless} - - GetTempFileName $2 "$0" - Delete $2 - CreateDirectory "$2" - ${If} ${FileExists} "$2" - ${If} ${FileExists} "$INSTDIR" - GetTempFileName $3 "$INSTDIR" - ${Else} - GetTempFileName $3 "$2" - ${EndIf} - ${If} ${FileExists} "$3" - Delete "$3" - StrCpy $CanWriteToInstallDir "true" - ${EndIf} - RmDir "$2" - ${EndIf} -FunctionEnd - -Function AddQuickLaunchShortcut - CreateShortCut "$QUICKLAUNCH\${BrandFullName}.lnk" "$INSTDIR\${FileMainEXE}" - ${If} ${FileExists} "$QUICKLAUNCH\${BrandFullName}.lnk" - ShellLink::SetShortCutWorkingDirectory "$QUICKLAUNCH\${BrandFullName}.lnk" \ - "$INSTDIR" - ${EndIf} -FunctionEnd - -Function ExecSetAsDefaultAppUser - ; Using the helper.exe lessens the stub installer size. - ; This could ask for elevatation when the user doesn't install as admin. - Exec "$\"$INSTDIR\uninstall\helper.exe$\" /SetAsDefaultAppUser" -FunctionEnd - -Function LaunchApp -!ifndef DEV_EDITION - FindWindow $0 "${WindowClass}" - ${If} $0 <> 0 ; integer comparison - StrCpy $BasiliskLaunchCode "1" - MessageBox MB_OK|MB_ICONQUESTION "$(WARN_MANUALLY_CLOSE_APP_LAUNCH)" - Return - ${EndIf} -!endif - - StrCpy $BasiliskLaunchCode "2" - - ; Set the current working directory to the installation directory - SetOutPath "$INSTDIR" - ClearErrors - ${GetParameters} $0 - ${GetOptions} "$0" "/UAC:" $1 - ${If} ${Errors} - Exec "$\"$INSTDIR\${FileMainEXE}$\"" - ${Else} - GetFunctionAddress $0 LaunchAppFromElevatedProcess - UAC::ExecCodeSegment $0 - ${EndIf} -FunctionEnd - -Function LaunchAppFromElevatedProcess - ; Find the installation directory when launching using GetFunctionAddress - ; from an elevated installer since $INSTDIR will not be set in this installer - ${StrFilter} "${FileMainEXE}" "+" "" "" $R9 - ReadRegStr $0 HKLM "Software\Clients\StartMenuInternet\$R9\DefaultIcon" "" - ${GetPathFromString} "$0" $0 - ; Set the current working directory to the installation directory - ${GetParent} "$0" $1 - SetOutPath "$1" - Exec "$\"$0$\"" -FunctionEnd - -Function CopyPostSigningData - ${LineRead} "$EXEDIR\postSigningData" "1" $PostSigningData - ${If} ${Errors} - ClearErrors - StrCpy $PostSigningData "0" - ${Else} - CreateDirectory "$LOCALAPPDATA\Mozilla\Basilisk" - CopyFiles /SILENT "$EXEDIR\postSigningData" "$LOCALAPPDATA\Mozilla\Basilisk" - ${Endif} -FunctionEnd - -Function DisplayDownloadError - ${NSD_KillTimer} DisplayDownloadError - ; To better display the error state on the taskbar set the progress completed - ; value to the total value. - ${ITBL3SetProgressValue} "100" "100" - ${ITBL3SetProgressState} "${TBPF_ERROR}" - MessageBox MB_OKCANCEL|MB_ICONSTOP "$(ERROR_DOWNLOAD)" IDCANCEL +2 IDOK +1 - StrCpy $OpenedDownloadPage "1" ; Already initialized to 0 - - ${If} "$OpenedDownloadPage" == "1" - ClearErrors - ${GetParameters} $0 - ${GetOptions} "$0" "/UAC:" $1 - ${If} ${Errors} - Call OpenManualDownloadURL - ${Else} - GetFunctionAddress $0 OpenManualDownloadURL - UAC::ExecCodeSegment $0 - ${EndIf} - ${EndIf} - - Call SendPing -FunctionEnd - -Function OpenManualDownloadURL - ExecShell "open" "${URLManualDownload}${URLManualDownloadAppend}" -FunctionEnd - -Section -SectionEnd diff --git a/browser/installer/windows/stub.tag b/browser/installer/windows/stub.tag deleted file mode 100644 index f32bef36e..000000000 --- a/browser/installer/windows/stub.tag +++ /dev/null @@ -1,4 +0,0 @@ -;!@Install@!UTF-8! -Title="Mozilla Firefox" -RunProgram="setup-stub.exe" -;!@InstallEnd@! \ No newline at end of file -- cgit v1.2.3 From c9b266dc20054bcafeee5e59c0b7f60adbf5cdf7 Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Sat, 17 Feb 2018 16:28:03 +0100 Subject: Use windows 10 Accent colors. --- browser/themes/windows/browser-aero.css | 466 +++++++++++++++++++---------- browser/themes/windows/browser.css | 17 +- browser/themes/windows/caption-buttons.svg | 133 ++++---- browser/themes/windows/devedition.css | 10 +- 4 files changed, 406 insertions(+), 220 deletions(-) (limited to 'browser') diff --git a/browser/themes/windows/browser-aero.css b/browser/themes/windows/browser-aero.css index 5ff9d8250..8e1de9577 100644 --- a/browser/themes/windows/browser-aero.css +++ b/browser/themes/windows/browser-aero.css @@ -46,8 +46,7 @@ color: graytext; } - @media (-moz-os-version: windows-vista), - (-moz-os-version: windows-win7) { + @media (-moz-os-version: windows-win7) { .sidebar-header:not(:-moz-lwtheme), #sidebar-header:not(:-moz-lwtheme) { background-color: #EEF3FA; @@ -83,190 +82,353 @@ -moz-appearance: -moz-win-exclude-glass; } - @media not all and (-moz-os-version: windows-vista) { - @media not all and (-moz-os-version: windows-win7) { - @media not all and (-moz-os-version: windows-win8) { - @media (-moz-windows-default-theme) { - #main-window { - background-color: hsl(0, 0%, 78%); - } - - :root[tabsintitlebar] .tab-label:-moz-window-inactive { - /* Calculated to match the opacity change of Windows Explorer - titlebar text change for inactive windows. */ - opacity: .6; - } - } + @media (-moz-os-version: windows-win10) { + /* Draw XUL caption buttons and background on Windows 10 */ + @media (-moz-windows-default-theme) { + #main-window { + background-color: hsl(0, 0%, 78%); + } - @media not all and (-moz-windows-default-theme) { - #main-window { - background-color: transparent; - } - } + :root[tabsintitlebar] .tab-label:-moz-window-inactive { + /* Calculated to match the opacity change of Windows Explorer + titlebar text change for inactive windows. */ + opacity: .6; + } + } - #titlebar-buttonbox, - .titlebar-button { - -moz-appearance: none !important; - } + @media not all and (-moz-windows-accent-color-applies) { + /* Default styling for when no accent color is applied */ + #main-window:not(:-moz-window-inactive):not(:-moz-lwtheme) { + background-color: hsl(235, 33%, 19%); + } + + :root:not(:-moz-window-inactive):not(:-moz-lwtheme) { + --titlebar-text-color: white; + } + + #titlebar-min:not(:-moz-window-inactive):not(:-moz-lwtheme) { + list-style-image: url(chrome://browser/skin/caption-buttons.svg#minimize-highlight); + } - .titlebar-button { - border: none; - margin: 0 !important; - padding: 10px 17px; - } + #titlebar-max:not(:-moz-window-inactive):not(:-moz-lwtheme) { + list-style-image: url(chrome://browser/skin/caption-buttons.svg#maximize-highlight); + } - #main-window[sizemode=maximized] .titlebar-button { - padding-top: 8px; - padding-bottom: 8px; - } + #main-window[sizemode="maximized"] #titlebar-max:not(:-moz-window-inactive):not(:-moz-lwtheme) { + list-style-image: url(chrome://browser/skin/caption-buttons.svg#restore-highlight); + } + + #titlebar-close:not(:-moz-window-inactive):not(:-moz-lwtheme) { + list-style-image: url(chrome://browser/skin/caption-buttons.svg#close-highlight); + } - .titlebar-button > .toolbarbutton-icon { - width: 12px; - height: 12px; - } + .titlebar-button:not(#titlebar-close):not(:-moz-window-inactive):not(:-moz-lwtheme):hover { + background-color: hsla(0, 0%, 100%, .17); + } + + .titlebar-button:not(#titlebar-close):not(:-moz-window-inactive):not(:-moz-lwtheme):hover:active { + background-color: hsla(0, 0%, 100%, .27); + transition: none; + } + + #titlebar-close:not(:-moz-window-inactive):not(:-moz-lwtheme):hover { + background-color: hsla(0, 86%, 49%, 1); + } + + #titlebar-close:not(:-moz-window-inactive):not(:-moz-lwtheme):hover:active { + background-color: hsla(0, 60%, 39%, 1); + transition: none; + } + } + @media (-moz-windows-accent-color-applies) { + /* Styling for when an accent color is applied to the titlebar */ + #main-window:not(:-moz-window-inactive):not(:-moz-lwtheme) { + background-color: -moz-win-accentcolor; + } + + :root:not(:-moz-window-inactive):not(:-moz-lwtheme) { + --titlebar-text-color: -moz-win-accentcolortext; + } + + #titlebar-min { + list-style-image: url(chrome://browser/skin/caption-buttons.svg#minimize); + } + + #titlebar-max { + list-style-image: url(chrome://browser/skin/caption-buttons.svg#maximize); + } + + #main-window[sizemode="maximized"] #titlebar-max { + list-style-image: url(chrome://browser/skin/caption-buttons.svg#restore); + } + + #titlebar-close { + list-style-image: url(chrome://browser/skin/caption-buttons.svg#close); + } + + .titlebar-button:hover { + background-color: hsla(0, 0%, 0%, .17); + } + + .titlebar-button:hover:active { + background-color: hsla(0, 0%, 0%, .27); + transition: none; + } + + @media (-moz-windows-accent-color-is-dark) { + /* dark accent color */ #titlebar-min { - list-style-image: url(chrome://browser/skin/caption-buttons.svg#minimize); + list-style-image: url(chrome://browser/skin/caption-buttons.svg#minimize-highlight); } #titlebar-max { - list-style-image: url(chrome://browser/skin/caption-buttons.svg#maximize); + list-style-image: url(chrome://browser/skin/caption-buttons.svg#maximize-highlight); } #main-window[sizemode="maximized"] #titlebar-max { - list-style-image: url(chrome://browser/skin/caption-buttons.svg#restore); + list-style-image: url(chrome://browser/skin/caption-buttons.svg#restore-highlight); } #titlebar-close { - list-style-image: url(chrome://browser/skin/caption-buttons.svg#close); - } - #titlebar-close:hover { - list-style-image: url(chrome://browser/skin/caption-buttons.svg#close-white); + list-style-image: url(chrome://browser/skin/caption-buttons.svg#close-highlight); } - - #titlebar-min:-moz-lwtheme { - list-style-image: url(chrome://browser/skin/caption-buttons.svg#minimize-themes); + + .titlebar-button:not(#titlebar-close):not(:-moz-window-inactive):not(:-moz-lwtheme):hover { + background-color: hsla(0, 0%, 100%, .17); } - #titlebar-max:-moz-lwtheme { - list-style-image: url(chrome://browser/skin/caption-buttons.svg#maximize-themes); + .titlebar-button:not(#titlebar-close):not(:-moz-window-inactive):not(:-moz-lwtheme):hover:active { + background-color: hsla(0, 0%, 100%, .27); + transition: none; } - #main-window[sizemode="maximized"] #titlebar-max:-moz-lwtheme { - list-style-image: url(chrome://browser/skin/caption-buttons.svg#restore-themes); + + #titlebar-close:not(:-moz-window-inactive):not(:-moz-lwtheme):hover { + background-color: hsla(0, 86%, 49%, 1); } - #titlebar-close:-moz-lwtheme { - list-style-image: url(chrome://browser/skin/caption-buttons.svg#close-themes); + + #titlebar-close:not(:-moz-window-inactive):not(:-moz-lwtheme):hover:active { + background-color: hsla(0, 60%, 39%, 1); + transition: none; } + } + } /* Windows 10 accent color applies */ + @media not all and (-moz-windows-default-theme) { + #main-window { + background-color: transparent; + } + } - /* the 12px image renders a 10px icon, and the 10px upscaled gets rounded to 12.5, which - * rounds up to 13px, which makes the icon one pixel too big on 1.25dppx. Fix: */ - @media (min-resolution: 1.20dppx) and (max-resolution: 1.45dppx) { - .titlebar-button > .toolbarbutton-icon { - width: 11.5px; - height: 11.5px; - } - } + #titlebar-buttonbox, + .titlebar-button { + -moz-appearance: none !important; + } - /* 175% dpi should result in the same device pixel sizes as 150% dpi. */ - @media (min-resolution: 1.70dppx) and (max-resolution: 1.95dppx) { - .titlebar-button { - padding-left: 14.1px; - padding-right: 14.1px; - } - - .titlebar-button > .toolbarbutton-icon { - width: 10.8px; - height: 10.8px; - } - } + .titlebar-button { + border: none; + margin: 0 !important; + padding: 9px 17px; + transition: background-color linear 120ms; + } + + #main-window[sizemode="maximized"][tabsontop=true] #tabbrowser-tabs { + min-height: 28px; + } - /* 225% dpi should result in the same device pixel sizes as 200% dpi. */ - @media (min-resolution: 2.20dppx) and (max-resolution: 2.45dppx) { - .titlebar-button { - padding-left: 15.3333px; - padding-right: 15.3333px; - } - - .titlebar-button > .toolbarbutton-icon { - width: 10.8px; - height: 10.8px; - } - } + #main-window[sizemode=maximized] .titlebar-button { + padding-top: 8px; + padding-bottom: 8px; + } - /* 275% dpi should result in the same device pixel sizes as 250% dpi. */ - @media (min-resolution: 2.70dppx) and (max-resolution: 2.95dppx) { - /* NB: todo: this should also change padding on the buttons - * themselves, but without a device to test this on, it's - * impossible to know by how much. */ - .titlebar-button > .toolbarbutton-icon { - width: 10.8px; - height: 10.8px; - } - } + .titlebar-button > .toolbarbutton-icon { + width: 12px; + height: 12px; + } - @media (-moz-windows-default-theme) { - .titlebar-button:hover { - background-color: hsla(0, 0%, 0%, .12); - } + .titlebar-button:not(:hover) > .toolbarbutton-icon:-moz-window-inactive { + opacity: 0.5; + } - .titlebar-button:hover:active { - background-color: hsla(0, 0%, 0%, .22); - } + #main-window[chromemargin^="0,"][sizemode=normal] #navigator-toolbox { + margin-top: -4px; + } - .titlebar-button:not(:hover) > .toolbarbutton-icon:-moz-window-inactive { - opacity: 0.5; - } + #main-window[sizemode="maximized"] #titlebar-close { + padding-right: 19px; + } + + #titlebar-close:hover { + list-style-image: url(chrome://browser/skin/caption-buttons.svg#close-highlight); + background-color: hsla(0, 86%, 49%, 1); + } - #titlebar-close:hover { - background-color: hsl(355, 86%, 49%); - } + #titlebar-close:hover:active { + background-color: hsla(0, 86%, 49%, 0.6); + transition: none; + } + + /* inactive window */ - #titlebar-close:hover:active { - background-color: hsl(355, 82%, 69%); - } - } - @media not all and (-moz-windows-default-theme) { - .titlebar-button { - background-color: -moz-field; - } - .titlebar-button:hover { - background-color: Highlight; - } - - #titlebar-min { - list-style-image: url(chrome://browser/skin/caption-buttons.svg#minimize-highcontrast); - } - #titlebar-min:hover { - list-style-image: url(chrome://browser/skin/caption-buttons.svg#minimize-highcontrast-hover); - } - - #titlebar-max { - list-style-image: url(chrome://browser/skin/caption-buttons.svg#maximize-highcontrast); - } - #titlebar-max:hover { - list-style-image: url(chrome://browser/skin/caption-buttons.svg#maximize-highcontrast-hover); - } - - #main-window[sizemode="maximized"] #titlebar-max { - list-style-image: url(chrome://browser/skin/caption-buttons.svg#restore-highcontrast); - } - #main-window[sizemode="maximized"] #titlebar-max:hover { - list-style-image: url(chrome://browser/skin/caption-buttons.svg#restore-highcontrast-hover); - } - - #titlebar-close { - list-style-image: url(chrome://browser/skin/caption-buttons.svg#close-highcontrast); - } - #titlebar-close:hover { - list-style-image: url(chrome://browser/skin/caption-buttons.svg#close-highcontrast-hover); - } - } + #titlebar-min:-moz-window-inactive:not(:-moz-lwtheme) { + list-style-image: url(chrome://browser/skin/caption-buttons.svg#minimize); + } + + #titlebar-max:-moz-window-inactive:not(:-moz-lwtheme) { + list-style-image: url(chrome://browser/skin/caption-buttons.svg#maximize); + } + + #main-window[sizemode="maximized"] #titlebar-max:-moz-window-inactive:not(:-moz-lwtheme) { + list-style-image: url(chrome://browser/skin/caption-buttons.svg#restore); + } + + #titlebar-close:-moz-window-inactive:not(:-moz-lwtheme):not(:hover) { + list-style-image: url(chrome://browser/skin/caption-buttons.svg#close); + } + + .titlebar-button:-moz-window-inactive:not(:-moz-lwtheme):hover { + background-color: hsla(0, 0%, 0%, .17); + } + + .titlebar-button:-moz-window-inactive:not(:-moz-lwtheme):hover:active { + background-color: hsla(0, 0%, 0%, .27); + transition: none; + } + + /* light persona */ + + .titlebar-button:-moz-lwtheme-darktext:hover { + background-color: hsla(0, 0%, 0%, .17); + } + + .titlebar-button:-moz-lwtheme-darktext:hover:active { + background-color: hsla(0, 0%, 0%, .27); + transition: none; + } + + #titlebar-min:-moz-lwtheme-darktext { + list-style-image: url(chrome://browser/skin/caption-buttons.svg#minimize-outline); + } + + #titlebar-max:-moz-lwtheme-darktext { + list-style-image: url(chrome://browser/skin/caption-buttons.svg#maximize-outline); + } + + #main-window[sizemode="maximized"]:-moz-lwtheme-darktext #titlebar-max:-moz-lwtheme-darktext { + list-style-image: url(chrome://browser/skin/caption-buttons.svg#restore-outline); + } + + #titlebar-close:-moz-lwtheme-darktext { + list-style-image: url(chrome://browser/skin/caption-buttons.svg#close-outline); + } + #titlebar-close:hover:-moz-lwtheme-darktext { + list-style-image: url(chrome://browser/skin/caption-buttons.svg#close-outline); + } + + /* dark persona */ + + .titlebar-button:-moz-lwtheme-brighttext:hover { + background-color: hsla(0, 0%, 100%, .27); + } + + .titlebar-button:-moz-lwtheme-brighttext:hover:active { + background-color: hsla(0, 0%, 100%, .37); + transition: none; + } + + #titlebar-min:-moz-lwtheme-brighttext { + list-style-image: url(chrome://browser/skin/caption-buttons.svg#minimize-outline-inverted); + } + + #titlebar-max:-moz-lwtheme-brighttext { + list-style-image: url(chrome://browser/skin/caption-buttons.svg#maximize-outline-inverted); + } + + #main-window[sizemode="maximized"]:-moz-lwtheme-brighttext #titlebar-max:-moz-lwtheme-brighttext { + list-style-image: url(chrome://browser/skin/caption-buttons.svg#restore-outline-inverted); + } + + #titlebar-close:-moz-lwtheme-brighttext { + list-style-image: url(chrome://browser/skin/caption-buttons.svg#close-outline-inverted); + } + #titlebar-close:hover:-moz-lwtheme-brighttext { + list-style-image: url(chrome://browser/skin/caption-buttons.svg#close-outline-inverted); + } + + /* the 12px image renders a 10px icon, and the 10px upscaled gets rounded to 12.5, which + * rounds up to 13px, which makes the icon one pixel too big on 1.25dppx. Fix: */ + @media (min-resolution: 1.20dppx) and (max-resolution: 1.45dppx) { + .titlebar-button > .toolbarbutton-icon { + width: 11.5px; + height: 11.5px; + } + } + + /* 175% dpi should result in the same device pixel sizes as 150% dpi. */ + @media (min-resolution: 1.70dppx) and (max-resolution: 1.95dppx) { + .titlebar-button { + padding-left: 14.1px; + padding-right: 14.1px; + } + .titlebar-button > .toolbarbutton-icon { + width: 10.8px; + height: 10.8px; } } - } - @media (-moz-os-version: windows-vista), - (-moz-os-version: windows-win7), + /* 225% dpi should result in the same device pixel sizes as 200% dpi. */ + @media (min-resolution: 2.20dppx) and (max-resolution: 2.45dppx) { + .titlebar-button { + padding-left: 15.3333px; + padding-right: 15.3333px; + } + .titlebar-button > .toolbarbutton-icon { + width: 10.8px; + height: 10.8px; + } + } + + /* 275% dpi should result in the same device pixel sizes as 250% dpi. */ + @media (min-resolution: 2.70dppx) and (max-resolution: 2.95dppx) { + /* NB: todo: this should also change padding on the buttons + * themselves, but without a device to test this on, it's + * impossible to know by how much. */ + .titlebar-button > .toolbarbutton-icon { + width: 10.8px; + height: 10.8px; + } + } + + + @media not all and (-moz-windows-default-theme) { + .titlebar-button { + background-color: -moz-field; + } + .titlebar-button:hover { + background-color: Highlight; + } + + #titlebar-min { + list-style-image: url(chrome://browser/skin/caption-buttons.svg#minimize-outine-inverted); + } + + #titlebar-max { + list-style-image: url(chrome://browser/skin/caption-buttons.svg#maximize-outine-inverted); + } + + #main-window[sizemode="maximized"] #titlebar-max { + list-style-image: url(chrome://browser/skin/caption-buttons.svg#restore-outine-inverted); + } + + #titlebar-close { + list-style-image: url(chrome://browser/skin/caption-buttons.svg#close-outine-inverted); + } + #titlebar-close:hover { + list-style-image: url(chrome://browser/skin/caption-buttons.svg#close-outine-inverted); + } + } + } /* Win 10 styling */ + + @media (-moz-os-version: windows-win7), (-moz-os-version: windows-win8) { #main-window[sizemode="maximized"] #titlebar-buttonbox { margin-inline-end: 3px; diff --git a/browser/themes/windows/browser.css b/browser/themes/windows/browser.css index 2de5a6545..15e776da1 100644 --- a/browser/themes/windows/browser.css +++ b/browser/themes/windows/browser.css @@ -16,6 +16,8 @@ %define conditionalForwardWithUrlbar window:not([chromehidden~="toolbar"]) #urlbar-wrapper :root { + --titlebar-text-color: currentColor; + --space-above-tabbar: 15px; --backbutton-urlbar-overlap: 6px; @@ -187,19 +189,22 @@ toolbar:-moz-lwtheme { transition: min-height 170ms ease-out, max-height 170ms ease-out, visibility 170ms linear; } +#toolbar-menubar, +#TabsToolbar { + color: var(--titlebar-text-color); +} + @media not all and (-moz-windows-compositor), not all and (-moz-windows-default-theme) { /* Please keep the menu text colors in this media block in sync with * devedition.css, minus the :not(:-moz-lwtheme) condition - see Bug 1165718. */ - #main-window[tabsintitlebar]:not([inFullscreen]) #toolbar-menubar:not(:-moz-lwtheme), - #main-window[tabsintitlebar]:not([inFullscreen]) #TabsToolbar:not(:-moz-lwtheme) { - color: CaptionText; + :root[tabsintitlebar]:not([inFullscreen]):not(:-moz-lwtheme) { + --titlebar-text-color: CaptionText; } - #main-window[tabsintitlebar]:not([inFullscreen]) #toolbar-menubar:not(:-moz-lwtheme):-moz-window-inactive, - #main-window[tabsintitlebar]:not([inFullscreen]) #TabsToolbar:not(:-moz-lwtheme):-moz-window-inactive { - color: InactiveCaptionText; + :root[tabsintitlebar]:not([inFullscreen]):not(:-moz-lwtheme):-moz-window-inactive { + --titlebar-text-color: InactiveCaptionText; } } diff --git a/browser/themes/windows/caption-buttons.svg b/browser/themes/windows/caption-buttons.svg index 3ba4f95a1..9cb42d539 100644 --- a/browser/themes/windows/caption-buttons.svg +++ b/browser/themes/windows/caption-buttons.svg @@ -1,49 +1,61 @@ + - + - + + @@ -56,45 +68,54 @@ - - - - - - - + + + + + - - + + + - - + + + - - - + + + + + - - - - - - - - + + + + + - - - + + + - - - + + + - - - - + + + + + + + + + + + + + + diff --git a/browser/themes/windows/devedition.css b/browser/themes/windows/devedition.css index 4c25f33a1..2dc72eeeb 100644 --- a/browser/themes/windows/devedition.css +++ b/browser/themes/windows/devedition.css @@ -193,14 +193,12 @@ /* Use proper menu text styling in Win7 classic mode (copied from browser.css) */ @media not all and (-moz-windows-compositor), not all and (-moz-windows-default-theme) { - #main-window[tabsintitlebar]:not([inFullscreen]) #toolbar-menubar, - #main-window[tabsintitlebar]:not([inFullscreen]) #TabsToolbar { - color: CaptionText; + :root[tabsintitlebar]:not([inFullscreen]) { + --titlebar-text-color: CaptionText; } - #main-window[tabsintitlebar]:not([inFullscreen]) #toolbar-menubar:-moz-window-inactive, - #main-window[tabsintitlebar]:not([inFullscreen]) #TabsToolbar:-moz-window-inactive { - color: InactiveCaptionText; + :root[tabsintitlebar]:not([inFullscreen]):-moz-window-inactive { + --titlebar-text-color: InactiveCaptionText; } #main-window[tabsintitlebar] #main-menubar > menu { -- cgit v1.2.3 From d6d1c2dad1079a09a131a94c87c78aca9aa0d1da Mon Sep 17 00:00:00 2001 From: Lootyhoof Date: Fri, 21 Jul 2017 20:47:35 +0100 Subject: Don't force colors in tabbar and menubar --- browser/themes/windows/browser-aero.css | 5 ----- 1 file changed, 5 deletions(-) (limited to 'browser') diff --git a/browser/themes/windows/browser-aero.css b/browser/themes/windows/browser-aero.css index 8e1de9577..28599af7a 100644 --- a/browser/themes/windows/browser-aero.css +++ b/browser/themes/windows/browser-aero.css @@ -465,11 +465,6 @@ } @media (-moz-windows-default-theme) { - #toolbar-menubar:not(:-moz-lwtheme), - #TabsToolbar:not(:-moz-lwtheme) { - color: black; - } - #main-menubar > menu:not(:-moz-lwtheme) { color: inherit; } -- cgit v1.2.3 From 4ccbe3620eb1cd354ce66f51730d7baf9b1a5f81 Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Sat, 22 Jul 2017 01:53:42 +0200 Subject: Add a signal preference for dynamic color changes to adjust "brighttext" in the front-end. This makes all relevant toolbars pick up the fact that the Windows accent color has changed and should check and if necessary update the "brighttext" property on them for styling of controls. This is a bit of a hack-around to the fact that there is no real easy way otherwise to notify the front-end of color changes without needing a change in focus of the window. There is a deliberate 300ms delay built in, because otherwise the styles might not have propagated yet, resulting in brighttext not being updated properly. --- browser/base/content/browser.js | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'browser') diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js index d813a55cc..bbfef0049 100755 --- a/browser/base/content/browser.js +++ b/browser/base/content/browser.js @@ -8075,6 +8075,7 @@ var ToolbarIconColor = { window.addEventListener("activate", this); window.addEventListener("deactivate", this); Services.obs.addObserver(this, "lightweight-theme-styling-update", false); + gPrefService.addObserver("ui.colorChanged", this, false); // If the window isn't active now, we assume that it has never been active // before and will soon become active such that inferFromText will be @@ -8089,6 +8090,7 @@ var ToolbarIconColor = { window.removeEventListener("activate", this); window.removeEventListener("deactivate", this); Services.obs.removeObserver(this, "lightweight-theme-styling-update"); + gPrefService.removeObserver("ui.colorChanged", this); }, handleEvent: function (event) { @@ -8107,6 +8109,18 @@ var ToolbarIconColor = { // lightweight-theme-styling-update observer. setTimeout(() => { this.inferFromText(); }, 0); break; + case "nsPref:changed": + // system color change + var colorChangedPref = false; + try { + colorChangedPref = gPrefService.getBoolPref("ui.colorChanged"); + } catch(e) { } + // if pref indicates change, call inferFromText() on a small delay + if (colorChangedPref == true) + setTimeout(() => { this.inferFromText(); }, 300); + break; + default: + console.error("ToolbarIconColor: Uncaught topic " + aTopic); } }, @@ -8140,6 +8154,9 @@ var ToolbarIconColor = { else toolbar.setAttribute("brighttext", "true"); } + + // Clear pref if set, since we're done applying the color changes. + gPrefService.clearUserPref("ui.colorChanged"); } } -- cgit v1.2.3 From 6f5c57ae74045228c2cbe4b797fe228f03274e6c Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Sat, 22 Jul 2017 01:59:19 +0200 Subject: Align ToolbarIconColor luminance computation with UWP guideline as well to make it consistent with the rest of the browser. --- browser/base/content/browser.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'browser') diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js index bbfef0049..a8aff1bd7 100755 --- a/browser/base/content/browser.js +++ b/browser/base/content/browser.js @@ -8144,12 +8144,12 @@ var ToolbarIconColor = { let luminances = new Map; for (let toolbar of document.querySelectorAll(toolbarSelector)) { let [r, g, b] = parseRGB(getComputedStyle(toolbar).color); - let luminance = 0.2125 * r + 0.7154 * g + 0.0721 * b; + let luminance = (2 * r + 5 * g + b) / 8; luminances.set(toolbar, luminance); } for (let [toolbar, luminance] of luminances) { - if (luminance <= 110) + if (luminance <= 128) toolbar.removeAttribute("brighttext"); else toolbar.setAttribute("brighttext", "true"); -- cgit v1.2.3 From 170b82c2e254d3aa9b4e5f31f26dc89283a472a6 Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Sat, 17 Feb 2018 10:56:35 -0500 Subject: Reduce redundencies in Basilisk branding --- browser/branding/branding-common.mozbuild | 58 ----------------- browser/branding/official/dsstore | Bin 12292 -> 0 bytes browser/branding/official/moz.build | 47 +------------- browser/branding/official/newtab.ico | Bin 6518 -> 0 bytes browser/branding/official/newwindow.ico | Bin 6518 -> 0 bytes browser/branding/official/pbmode.ico | Bin 6518 -> 0 bytes browser/branding/official/pref/firefox-branding.js | 72 +++++++++------------ browser/branding/shared/branding.mozbuild | 56 ++++++++++++++++ browser/branding/shared/dsstore | Bin 0 -> 12292 bytes browser/branding/shared/newtab.ico | Bin 0 -> 6518 bytes browser/branding/shared/newwindow.ico | Bin 0 -> 6518 bytes browser/branding/shared/pbmode.ico | Bin 0 -> 6518 bytes browser/branding/shared/preferences.inc | 33 ++++++++++ browser/branding/shared/uaoverrides.inc | 38 +++++++++++ .../unofficial/basilisk.VisualElementsManifest.xml | 8 +++ browser/branding/unofficial/bgintro.bmp | Bin 682144 -> 0 bytes browser/branding/unofficial/clock.bmp | Bin 124214 -> 0 bytes .../unofficial/firefox.VisualElementsManifest.xml | 8 --- browser/branding/unofficial/moz.build | 4 +- browser/branding/unofficial/newtab.ico | Bin 6518 -> 0 bytes browser/branding/unofficial/newwindow.ico | Bin 6518 -> 0 bytes browser/branding/unofficial/particles.bmp | Bin 124216 -> 0 bytes browser/branding/unofficial/pbmode.ico | Bin 6518 -> 0 bytes browser/branding/unofficial/pencil-rtl.bmp | Bin 124214 -> 0 bytes browser/branding/unofficial/pencil.bmp | Bin 124214 -> 0 bytes .../branding/unofficial/pref/firefox-branding.js | 47 ++++++++------ 26 files changed, 196 insertions(+), 175 deletions(-) delete mode 100644 browser/branding/branding-common.mozbuild delete mode 100644 browser/branding/official/dsstore delete mode 100644 browser/branding/official/newtab.ico delete mode 100644 browser/branding/official/newwindow.ico delete mode 100644 browser/branding/official/pbmode.ico create mode 100644 browser/branding/shared/branding.mozbuild create mode 100644 browser/branding/shared/dsstore create mode 100644 browser/branding/shared/newtab.ico create mode 100644 browser/branding/shared/newwindow.ico create mode 100644 browser/branding/shared/pbmode.ico create mode 100644 browser/branding/shared/preferences.inc create mode 100644 browser/branding/shared/uaoverrides.inc create mode 100644 browser/branding/unofficial/basilisk.VisualElementsManifest.xml delete mode 100644 browser/branding/unofficial/bgintro.bmp delete mode 100644 browser/branding/unofficial/clock.bmp delete mode 100644 browser/branding/unofficial/firefox.VisualElementsManifest.xml delete mode 100644 browser/branding/unofficial/newtab.ico delete mode 100644 browser/branding/unofficial/newwindow.ico delete mode 100644 browser/branding/unofficial/particles.bmp delete mode 100644 browser/branding/unofficial/pbmode.ico delete mode 100644 browser/branding/unofficial/pencil-rtl.bmp delete mode 100644 browser/branding/unofficial/pencil.bmp (limited to 'browser') diff --git a/browser/branding/branding-common.mozbuild b/browser/branding/branding-common.mozbuild deleted file mode 100644 index f74724f4a..000000000 --- a/browser/branding/branding-common.mozbuild +++ /dev/null @@ -1,58 +0,0 @@ -# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*- -# vim: set filetype=python: -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - -@template -def FirefoxBranding(): - JS_PREFERENCE_FILES += [ - 'pref/firefox-branding.js', - ] - - if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows': - FINAL_TARGET_FILES['..'] += [ - 'firefox.VisualElementsManifest.xml', - ] - FINAL_TARGET_FILES.VisualElements += [ - 'VisualElements_150.png', - 'VisualElements_70.png', - ] - BRANDING_FILES += [ - 'appname.bmp', - 'bgintro.bmp', - 'branding.nsi', - 'clock.bmp', - 'document.ico', - 'firefox.ico', - 'newtab.ico', - 'newwindow.ico', - 'particles.bmp', - 'pbmode.ico', - 'pencil-rtl.bmp', - 'pencil.bmp', - 'wizHeader.bmp', - 'wizHeaderRTL.bmp', - 'wizWatermark.bmp', - ] - elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa': - BRANDING_FILES += [ - 'background.png', - 'disk.icns', - 'document.icns', - 'dsstore', - 'firefox.icns', - ] - elif 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']: - BRANDING_FILES += [ - 'default16.png', - 'default32.png', - 'default48.png', - 'mozicon128.png', - ] - FINAL_TARGET_FILES.icons += ['mozicon128.png'] - FINAL_TARGET_FILES.chrome.icons.default += [ - 'default16.png', - 'default32.png', - 'default48.png', - ] diff --git a/browser/branding/official/dsstore b/browser/branding/official/dsstore deleted file mode 100644 index 8ea703674..000000000 Binary files a/browser/branding/official/dsstore and /dev/null differ diff --git a/browser/branding/official/moz.build b/browser/branding/official/moz.build index 7fda7496c..e3b7fd1ab 100644 --- a/browser/branding/official/moz.build +++ b/browser/branding/official/moz.build @@ -9,48 +9,5 @@ DIRS += ['content', 'locales'] DIST_SUBDIR = 'browser' export('DIST_SUBDIR') -JS_PREFERENCE_FILES += [ - 'pref/firefox-branding.js', -] - -if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows': - FINAL_TARGET_FILES['..'] += [ - 'basilisk.VisualElementsManifest.xml', - ] - FINAL_TARGET_FILES.VisualElements += [ - 'VisualElements_150.png', - 'VisualElements_70.png', - ] - BRANDING_FILES += [ - 'appname.bmp', - 'branding.nsi', - 'document.ico', - 'firefox.ico', - 'newtab.ico', - 'newwindow.ico', - 'pbmode.ico', - 'wizHeader.bmp', - 'wizHeaderRTL.bmp', - 'wizWatermark.bmp', - ] -elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa': - BRANDING_FILES += [ - 'background.png', - 'disk.icns', - 'document.icns', - 'dsstore', - 'firefox.icns', - ] -elif 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']: - BRANDING_FILES += [ - 'default16.png', - 'default32.png', - 'default48.png', - 'mozicon128.png', - ] - FINAL_TARGET_FILES.icons += ['mozicon128.png'] - FINAL_TARGET_FILES.chrome.icons.default += [ - 'default16.png', - 'default32.png', - 'default48.png', - ] +include('../shared/branding.mozbuild') +ApplicationBranding() \ No newline at end of file diff --git a/browser/branding/official/newtab.ico b/browser/branding/official/newtab.ico deleted file mode 100644 index a9b37c08c..000000000 Binary files a/browser/branding/official/newtab.ico and /dev/null differ diff --git a/browser/branding/official/newwindow.ico b/browser/branding/official/newwindow.ico deleted file mode 100644 index 553720771..000000000 Binary files a/browser/branding/official/newwindow.ico and /dev/null differ diff --git a/browser/branding/official/pbmode.ico b/browser/branding/official/pbmode.ico deleted file mode 100644 index 47677c13f..000000000 Binary files a/browser/branding/official/pbmode.ico and /dev/null differ diff --git a/browser/branding/official/pref/firefox-branding.js b/browser/branding/official/pref/firefox-branding.js index a3d6927bb..eb2bf489b 100644 --- a/browser/branding/official/pref/firefox-branding.js +++ b/browser/branding/official/pref/firefox-branding.js @@ -2,55 +2,43 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -pref("startup.homepage_override_url", "https://www.basilisk-browser.org/releasenotes.shtml"); -pref("startup.homepage_welcome_url", "http://www.basilisk-browser.org/firstrun/"); +#filter substitution +#filter emptyLines + +// Set defines to construct URLs +#define BRANDING_BASEURL basilisk-browser.org +#define BRANDING_SITEURL www.@BRANDING_BASEURL@ +#define BRANDING_RELNOTESPATH releasenotes.shtml +#define BRANDING_FIRSTRUNPATH firstrun/ +#define BRANDING_APPUPDATEURL aus.@BRANDING_BASEURL@ +#define BRANDING_APPUPDATEPATH ?application=%PRODUCT%&version=%VERSION%&arch=%BUILD_TARGET%&buildid=%BUILD_ID%&channel=%CHANNEL% + +// Shared Branding Preferences +// XXX: These should REALLY go back to application preferences +#include ../../shared/preferences.inc + +// Branding Specific Preferences +pref("startup.homepage_override_url", "https://@BRANDING_SITEURL@/@BRANDING_RELNOTESPATH@"); +pref("startup.homepage_welcome_url", "http://@BRANDING_SITEURL@/@BRANDING_FIRSTRUNPATH@"); pref("startup.homepage_welcome_url.additional", ""); -pref("app.update.url", "https://aus.basilisk-browser.org/?application=%PRODUCT%&version=%VERSION%&arch=%BUILD_TARGET%&buildid=%BUILD_ID%&channel=%CHANNEL%"); -// Interval: Time between checks for a new version (in seconds) -pref("app.update.interval", 86400); // 1 day -// The time interval between the downloading of mar file chunks in the -// background (in seconds) -// 0 means "download everything at once" -pref("app.update.download.backgroundInterval", 0); -// Give the user x seconds to react before showing the big UI. default=192 hours -pref("app.update.promptWaitTime", 691200); +// Version release notes +pref("app.releaseNotesURL", "http://@BRANDING_SITEURL@/@BRANDING_RELNOTESPATH@"); + +// Vendor home page +pref("app.vendorURL", "http://@BRANDING_SITEURL@/"); + +pref("app.update.url", "https://@BRANDING_APPUPDATEURL@/@BRANDING_APPUPDATEPATH@"); + // URL user can browse to manually if for some reason all update installation // attempts fail. -pref("app.update.url.manual", "https://www.basilisk-browser.org/"); +pref("app.update.url.manual", "https://@BRANDING_SITEURL@/"); // A default value for the "More information about this update" link // supplied in the "An update is available" page of the update wizard. -pref("app.update.url.details", "https://www.basilisk-browser.org/releasenotes.shtml"); +pref("app.update.url.details", "https://@BRANDING_SITEURL@/@BRANDING_RELNOTESPATH@"); // Switch Application Updates off for now pref("app.update.enabled", false); -// Version release notes -pref("app.releaseNotesURL", "http://www.basilisk-browser.org/releasenotes.shtml"); -// Vendor home page -pref("app.vendorURL", "http://www.basilisk-browser.org/"); - -// The number of days a binary is permitted to be old -// without checking for an update. This assumes that -// app.update.checkInstallTime is true. -pref("app.update.checkInstallTime.days", 14); - -// Give the user x seconds to reboot before showing a badge on the hamburger -// button. default=immediately -pref("app.update.badgeWaitTime", 0); - -// Number of usages of the web console or scratchpad. -// If this is less than 5, then pasting code into the web console or scratchpad is disabled -pref("devtools.selfxss.count", 100); - -// Disable Google Safebrowsing by default. Without an API key, this won't work. -pref("browser.safebrowsing.phishing.enabled", false); -pref("browser.safebrowsing.malware.enabled", false); -pref("browser.safebrowsing.downloads.enabled", false); -pref("browser.safebrowsing.downloads.remote.enabled", false); -// Disable the UI controls for it as well for Basilisk-official. -pref("browser.safebrowsing.UI.enabled", false); - -// FxA override -pref("general.useragent.override.accounts.firefox.com", "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:55.0) Gecko/20100101 Goanna/4.0 Basilisk/55.0.0"); - +// Shared User Agent Overrides +#include ../../shared/uaoverrides.inc diff --git a/browser/branding/shared/branding.mozbuild b/browser/branding/shared/branding.mozbuild new file mode 100644 index 000000000..29d25094f --- /dev/null +++ b/browser/branding/shared/branding.mozbuild @@ -0,0 +1,56 @@ +# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*- +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +@template +def ApplicationBranding(): + JS_PREFERENCE_PP_FILES += [ + 'pref/firefox-branding.js', + ] + + if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows': + FINAL_TARGET_FILES['..'] += [ + 'basilisk.VisualElementsManifest.xml', + ] + FINAL_TARGET_FILES.VisualElements += [ + 'VisualElements_150.png', + 'VisualElements_70.png', + ] + BRANDING_FILES += [ + '../shared/newtab.ico', + '../shared/newwindow.ico', + '../shared/pbmode.ico', + 'appname.bmp', + 'branding.nsi', + 'document.ico', + 'firefox.ico', + 'wizHeader.bmp', + 'wizHeaderRTL.bmp', + 'wizWatermark.bmp', + ] + elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa': + BRANDING_FILES += [ + '../shared/dsstore', + 'disk.icns', + 'document.icns', + 'background.png', + 'firefox.icns', + ] + elif 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']: + BRANDING_FILES += [ + 'default16.png', + 'default32.png', + 'default48.png', + 'mozicon128.png', + ] + FINAL_TARGET_FILES.icons += ['mozicon128.png'] + FINAL_TARGET_FILES.chrome.icons.default += [ + 'default16.png', + 'default32.png', + 'default48.png', + ] + DEFINES['MOZ_APP_VERSION'] = CONFIG['MOZ_APP_VERSION'] + DEFINES['MOZ_BRANDING_DIRECTORY'] = CONFIG['MOZ_BRANDING_DIRECTORY'] + DEFINES['MOZILLA_UAVERSION_U'] = CONFIG['MOZILLA_UAVERSION_U'] \ No newline at end of file diff --git a/browser/branding/shared/dsstore b/browser/branding/shared/dsstore new file mode 100644 index 000000000..8ea703674 Binary files /dev/null and b/browser/branding/shared/dsstore differ diff --git a/browser/branding/shared/newtab.ico b/browser/branding/shared/newtab.ico new file mode 100644 index 000000000..a9b37c08c Binary files /dev/null and b/browser/branding/shared/newtab.ico differ diff --git a/browser/branding/shared/newwindow.ico b/browser/branding/shared/newwindow.ico new file mode 100644 index 000000000..553720771 Binary files /dev/null and b/browser/branding/shared/newwindow.ico differ diff --git a/browser/branding/shared/pbmode.ico b/browser/branding/shared/pbmode.ico new file mode 100644 index 000000000..47677c13f Binary files /dev/null and b/browser/branding/shared/pbmode.ico differ diff --git a/browser/branding/shared/preferences.inc b/browser/branding/shared/preferences.inc new file mode 100644 index 000000000..08f6c950b --- /dev/null +++ b/browser/branding/shared/preferences.inc @@ -0,0 +1,33 @@ +// Interval: Time between checks for a new version (in seconds) +pref("app.update.interval", 86400); // 1 day + +// The time interval between the downloading of mar file chunks in the +// background (in seconds) +// 0 means "download everything at once" +pref("app.update.download.backgroundInterval", 0); + +// Give the user x seconds to react before showing the big UI. default=192 hours +pref("app.update.promptWaitTime", 691200); + +// The number of days a binary is permitted to be old +// without checking for an update. This assumes that +// app.update.checkInstallTime is true. +pref("app.update.checkInstallTime.days", 14); + +// Give the user x seconds to reboot before showing a badge on the hamburger +// button. default=immediately +pref("app.update.badgeWaitTime", 0); + +// Number of usages of the web console or scratchpad. +// If this is less than 5, then pasting code into the web console or scratchpad is disabled +pref("devtools.selfxss.count", 100); + +// Disable Google Safebrowsing by default. Without an API key, this won't work. +pref("browser.safebrowsing.phishing.enabled", false); +pref("browser.safebrowsing.malware.enabled", false); +pref("browser.safebrowsing.downloads.enabled", false); +pref("browser.safebrowsing.downloads.remote.enabled", false); + +// Disable the UI controls for it as well for Basilisk-official. +pref("browser.safebrowsing.UI.enabled", false); + diff --git a/browser/branding/shared/uaoverrides.inc b/browser/branding/shared/uaoverrides.inc new file mode 100644 index 000000000..13a89ed7f --- /dev/null +++ b/browser/branding/shared/uaoverrides.inc @@ -0,0 +1,38 @@ +#define GUAO_PREF general.useragent.override + +#define GRE_VERSION @MOZILLA_UAVERSION_U@ +#define GRE_VERSION_SLICE Goanna/@GRE_VERSION@ +#define GRE_DATE_SLICE Goanna/20170101 +#define APP_SLICE Basilisk/@MOZ_APP_VERSION@ + +#define GK_VERSION 52.0 +#define GK_SLICE Gecko/20100101 +#define FX_SLICE Firefox/@GK_VERSION@ + +#ifdef XP_UNIX +#ifndef XP_MACOSX +#define OS_SLICE X11; Linux x86_64; +#else +#define OS_SLICE Macintosh; Intel Mac OS X 10.11; +#endif +#else +#define OS_SLICE Windows NT 6.1; WOW64; +#endif + +// FxA override +pref("@GUAO_PREF@.accounts.firefox.com", "Mozilla/5.0 (@OS_SLICE@ rv:@GK_VERSION@) @GK_SLICE@ @FX_SLICE@"); + +// Required for domains that have proven unresponsive to requests from users + +// The never-ending Facebook debacle... + +// UA-Sniffing domains below are pending responses from their operators - temp workaround + +// The following requires native mode. Or it blocks.. "too old firefox", breakage, etc. + +// UA-Sniffing domains below have indicated no interest in supporting Pale Moon (BOO!) + +// UA-sniffing domains that are "app/vendor-specific" and do not like Pale Moon + +// The following domains do not like the Goanna slice + diff --git a/browser/branding/unofficial/basilisk.VisualElementsManifest.xml b/browser/branding/unofficial/basilisk.VisualElementsManifest.xml new file mode 100644 index 000000000..7654e0ab7 --- /dev/null +++ b/browser/branding/unofficial/basilisk.VisualElementsManifest.xml @@ -0,0 +1,8 @@ + + + diff --git a/browser/branding/unofficial/bgintro.bmp b/browser/branding/unofficial/bgintro.bmp deleted file mode 100644 index 9f2a0a6e0..000000000 Binary files a/browser/branding/unofficial/bgintro.bmp and /dev/null differ diff --git a/browser/branding/unofficial/clock.bmp b/browser/branding/unofficial/clock.bmp deleted file mode 100644 index c74398edb..000000000 Binary files a/browser/branding/unofficial/clock.bmp and /dev/null differ diff --git a/browser/branding/unofficial/firefox.VisualElementsManifest.xml b/browser/branding/unofficial/firefox.VisualElementsManifest.xml deleted file mode 100644 index 7654e0ab7..000000000 --- a/browser/branding/unofficial/firefox.VisualElementsManifest.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - diff --git a/browser/branding/unofficial/moz.build b/browser/branding/unofficial/moz.build index 9045cee11..0d829fa5e 100644 --- a/browser/branding/unofficial/moz.build +++ b/browser/branding/unofficial/moz.build @@ -9,5 +9,5 @@ DIRS += ['content', 'locales'] DIST_SUBDIR = 'browser' export('DIST_SUBDIR') -include('../branding-common.mozbuild') -FirefoxBranding() +include('../shared/branding.mozbuild') +ApplicationBranding() diff --git a/browser/branding/unofficial/newtab.ico b/browser/branding/unofficial/newtab.ico deleted file mode 100644 index a9b37c08c..000000000 Binary files a/browser/branding/unofficial/newtab.ico and /dev/null differ diff --git a/browser/branding/unofficial/newwindow.ico b/browser/branding/unofficial/newwindow.ico deleted file mode 100644 index 553720771..000000000 Binary files a/browser/branding/unofficial/newwindow.ico and /dev/null differ diff --git a/browser/branding/unofficial/particles.bmp b/browser/branding/unofficial/particles.bmp deleted file mode 100644 index ab74ce047..000000000 Binary files a/browser/branding/unofficial/particles.bmp and /dev/null differ diff --git a/browser/branding/unofficial/pbmode.ico b/browser/branding/unofficial/pbmode.ico deleted file mode 100644 index 47677c13f..000000000 Binary files a/browser/branding/unofficial/pbmode.ico and /dev/null differ diff --git a/browser/branding/unofficial/pencil-rtl.bmp b/browser/branding/unofficial/pencil-rtl.bmp deleted file mode 100644 index e50d92db7..000000000 Binary files a/browser/branding/unofficial/pencil-rtl.bmp and /dev/null differ diff --git a/browser/branding/unofficial/pencil.bmp b/browser/branding/unofficial/pencil.bmp deleted file mode 100644 index 252c10f41..000000000 Binary files a/browser/branding/unofficial/pencil.bmp and /dev/null differ diff --git a/browser/branding/unofficial/pref/firefox-branding.js b/browser/branding/unofficial/pref/firefox-branding.js index b20a3a309..a5b617a53 100644 --- a/browser/branding/unofficial/pref/firefox-branding.js +++ b/browser/branding/unofficial/pref/firefox-branding.js @@ -2,32 +2,39 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +#filter substitution +#filter emptyLines + +// Set defines to construct URLs +#define BRANDING_BASEURL basilisk-browser.org +#define BRANDING_SITEURL www.@BRANDING_BASEURL@ + +// Shared Branding Preferences +// XXX: These should REALLY go back to application preferences +#include ../../shared/preferences.inc + +// Branding Specific Preferences pref("startup.homepage_override_url", ""); pref("startup.homepage_welcome_url", ""); pref("startup.homepage_welcome_url.additional", ""); -// The time interval between checks for a new version (in seconds) -pref("app.update.interval", 86400); // 24 hours -// The time interval between the downloading of mar file chunks in the -// background (in seconds) -pref("app.update.download.backgroundInterval", 60); -// Give the user x seconds to react before showing the big UI. default=24 hours -pref("app.update.promptWaitTime", 86400); + +// Version release notes +pref("app.releaseNotesURL", "about:blank"); + +// Vendor home page +pref("app.vendorURL", "about:"); + +pref("app.update.url", ""); + // URL user can browse to manually if for some reason all update installation // attempts fail. -pref("app.update.url.manual", "https://nightly.mozilla.org"); +pref("app.update.url.manual", "about:"); // A default value for the "More information about this update" link // supplied in the "An update is available" page of the update wizard. -pref("app.update.url.details", "https://nightly.mozilla.org"); - -// The number of days a binary is permitted to be old -// without checking for an update. This assumes that -// app.update.checkInstallTime is true. -pref("app.update.checkInstallTime.days", 2); +pref("app.update.url.details", "about:"); -// Give the user x seconds to reboot before showing a badge on the hamburger -// button. default=immediately -pref("app.update.badgeWaitTime", 0); +// Switch Application Updates off for unofficial branding +pref("app.update.enabled", false); -// Number of usages of the web console or scratchpad. -// If this is less than 5, then pasting code into the web console or scratchpad is disabled -pref("devtools.selfxss.count", 0); +// Shared User Agent Overrides +#include ../../shared/uaoverrides.inc -- cgit v1.2.3 From b19cfd8e7b744ad8e3f3dcf9038c838f110ef17a Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Sat, 17 Feb 2018 14:10:47 -0500 Subject: Basilisk requires devtools client for now so enable it by default but add a temporary exportable variable to bypass that --- browser/confvars.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'browser') diff --git a/browser/confvars.sh b/browser/confvars.sh index d4c2c008d..65cf154e9 100755 --- a/browser/confvars.sh +++ b/browser/confvars.sh @@ -62,4 +62,8 @@ MOZ_ADDON_SIGNING=0 MOZ_REQUIRE_SIGNING=0 # Include the DevTools client, not just the server (which is the default) -MOZ_DEVTOOLS=all +if test -n "$BASILISK_DISABLE_DEVTOOLS" ; then +MOZ_DEVTOOLS= +else +MOZ_DEVTOOLS=1 +fi -- cgit v1.2.3 From 45f2fcd80d2a7d536e8b486c18415a337b56cb46 Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Sat, 17 Feb 2018 14:50:05 -0500 Subject: Adjust requirements --- browser/installer/windows/nsis/defines.nsi.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'browser') diff --git a/browser/installer/windows/nsis/defines.nsi.in b/browser/installer/windows/nsis/defines.nsi.in index 015ad6620..30a9f3784 100644 --- a/browser/installer/windows/nsis/defines.nsi.in +++ b/browser/installer/windows/nsis/defines.nsi.in @@ -63,7 +63,7 @@ !define MinSupportedVer "Microsoft Windows 7 x64" #else !define ARCH "x86" -!define MinSupportedVer "Microsoft Windows XP SP2" +!define MinSupportedVer "Microsoft Windows 7" #endif !define MinSupportedCPU "SSE2" -- cgit v1.2.3 From e803a1be814ccffbed19072f77425c7252b5e19e Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Sun, 31 Dec 2017 12:34:43 +0100 Subject: Change format handlers to Basilisk. --- browser/installer/windows/nsis/oneoff_en-US.nsh | 12 - browser/installer/windows/nsis/shared.nsh | 100 +++--- browser/installer/windows/nsis/stub.nsi | 438 +++++++++++++++--------- browser/installer/windows/nsis/uninstaller.nsi | 6 +- 4 files changed, 325 insertions(+), 231 deletions(-) delete mode 100644 browser/installer/windows/nsis/oneoff_en-US.nsh (limited to 'browser') diff --git a/browser/installer/windows/nsis/oneoff_en-US.nsh b/browser/installer/windows/nsis/oneoff_en-US.nsh deleted file mode 100644 index 62d95ade9..000000000 --- a/browser/installer/windows/nsis/oneoff_en-US.nsh +++ /dev/null @@ -1,12 +0,0 @@ -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - -; Custom strings for en-US. This is not in the locale directory so these strings -; aren't translated. -!define INDENT " " -!define INTRO_BLURB "Thanks for choosing $BrandFullName. We’re not just designed to be different, we’re different by design." -!define INSTALL_BLURB1 "You're about to enjoy the very latest in speed, flexibility and security so you're always in control." -!define INSTALL_BLURB2 "And you're joining a global community of users, contributors and developers working to make the best browser in the world." -!define INSTALL_BLURB3 "You even get a haiku:$\n${INDENT}Proudly non-profit$\n${INDENT}Free to innovate for you$\n${INDENT}And a better Web" -!undef INDENT diff --git a/browser/installer/windows/nsis/shared.nsh b/browser/installer/windows/nsis/shared.nsh index 8d7eea618..fb2239d24 100755 --- a/browser/installer/windows/nsis/shared.nsh +++ b/browser/installer/windows/nsis/shared.nsh @@ -10,12 +10,12 @@ System::Call "kernel32::ProcessIdToSessionId(i $0, *i ${NSIS_MAX_STRLEN} r9)" ; Determine if we're the protected UserChoice default or not. If so fix the - ; start menu tile. In case there are 2 Firefox installations, we only do + ; start menu tile. In case there are 2 Basilisk installations, we only do ; this if the application being updated is the default. ReadRegStr $0 HKCU "Software\Microsoft\Windows\Shell\Associations\UrlAssociations\http\UserChoice" "ProgId" - ${If} $0 == "FirefoxURL" + ${If} $0 == "BasiliskURL" ${AndIf} $9 != 0 ; We're not running in session 0 - ReadRegStr $0 HKCU "Software\Classes\FirefoxURL\shell\open\command" "" + ReadRegStr $0 HKCU "Software\Classes\BasiliskURL\shell\open\command" "" ${GetPathFromString} "$0" $0 ${GetParent} "$0" $0 ${If} ${FileExists} "$0" @@ -327,13 +327,13 @@ ClearErrors EnumRegKey $7 HKCR "${FILE_TYPE}" 0 ${If} ${Errors} - WriteRegStr SHCTX "SOFTWARE\Classes\${FILE_TYPE}" "" "FirefoxHTML" + WriteRegStr SHCTX "SOFTWARE\Classes\${FILE_TYPE}" "" "BasiliskHTML" ${EndIf} - WriteRegStr SHCTX "SOFTWARE\Classes\${FILE_TYPE}\OpenWithProgids" "FirefoxHTML" "" + WriteRegStr SHCTX "SOFTWARE\Classes\${FILE_TYPE}\OpenWithProgids" "BasiliskHTML" "" !macroend !define AddAssociationIfNoneExist "!insertmacro AddAssociationIfNoneExist" -; Adds the protocol and file handler registry entries for making Firefox the +; Adds the protocol and file handler registry entries for making Basilisk the ; default handler (uses SHCTX). !macro SetHandlers ${GetLongPath} "$INSTDIR\${FileMainEXE}" $8 @@ -341,30 +341,30 @@ StrCpy $0 "SOFTWARE\Classes" StrCpy $2 "$\"$8$\" -osint -url $\"%1$\"" - ; Associate the file handlers with FirefoxHTML + ; Associate the file handlers with BasiliskHTML ReadRegStr $6 SHCTX "$0\.htm" "" - ${If} "$6" != "FirefoxHTML" - WriteRegStr SHCTX "$0\.htm" "" "FirefoxHTML" + ${If} "$6" != "BasiliskHTML" + WriteRegStr SHCTX "$0\.htm" "" "BasiliskHTML" ${EndIf} ReadRegStr $6 SHCTX "$0\.html" "" - ${If} "$6" != "FirefoxHTML" - WriteRegStr SHCTX "$0\.html" "" "FirefoxHTML" + ${If} "$6" != "BasiliskHTML" + WriteRegStr SHCTX "$0\.html" "" "BasiliskHTML" ${EndIf} ReadRegStr $6 SHCTX "$0\.shtml" "" - ${If} "$6" != "FirefoxHTML" - WriteRegStr SHCTX "$0\.shtml" "" "FirefoxHTML" + ${If} "$6" != "BasiliskHTML" + WriteRegStr SHCTX "$0\.shtml" "" "BasiliskHTML" ${EndIf} ReadRegStr $6 SHCTX "$0\.xht" "" - ${If} "$6" != "FirefoxHTML" - WriteRegStr SHCTX "$0\.xht" "" "FirefoxHTML" + ${If} "$6" != "BasiliskHTML" + WriteRegStr SHCTX "$0\.xht" "" "BasiliskHTML" ${EndIf} ReadRegStr $6 SHCTX "$0\.xhtml" "" - ${If} "$6" != "FirefoxHTML" - WriteRegStr SHCTX "$0\.xhtml" "" "FirefoxHTML" + ${If} "$6" != "BasiliskHTML" + WriteRegStr SHCTX "$0\.xhtml" "" "BasiliskHTML" ${EndIf} ${AddAssociationIfNoneExist} ".pdf" @@ -374,12 +374,12 @@ ${AddAssociationIfNoneExist} ".pdf" ${AddAssociationIfNoneExist} ".webm" - ; An empty string is used for the 5th param because FirefoxHTML is not a + ; An empty string is used for the 5th param because BasiliskHTML is not a ; protocol handler - ${AddDisabledDDEHandlerValues} "FirefoxHTML" "$2" "$8,1" \ + ${AddDisabledDDEHandlerValues} "BasiliskHTML" "$2" "$8,1" \ "${AppRegName} HTML Document" "" - ${AddDisabledDDEHandlerValues} "FirefoxURL" "$2" "$8,1" "${AppRegName} URL" \ + ${AddDisabledDDEHandlerValues} "BasiliskURL" "$2" "$8,1" "${AppRegName} URL" \ "true" ; An empty string is used for the 4th & 5th params because the following ; protocol handlers already have a display name and the additional keys @@ -449,35 +449,35 @@ WriteRegStr ${RegKey} "$0\Capabilities" "ApplicationIcon" "$8,0" WriteRegStr ${RegKey} "$0\Capabilities" "ApplicationName" "${BrandShortName}" - WriteRegStr ${RegKey} "$0\Capabilities\FileAssociations" ".htm" "FirefoxHTML" - WriteRegStr ${RegKey} "$0\Capabilities\FileAssociations" ".html" "FirefoxHTML" - WriteRegStr ${RegKey} "$0\Capabilities\FileAssociations" ".shtml" "FirefoxHTML" - WriteRegStr ${RegKey} "$0\Capabilities\FileAssociations" ".xht" "FirefoxHTML" - WriteRegStr ${RegKey} "$0\Capabilities\FileAssociations" ".xhtml" "FirefoxHTML" + WriteRegStr ${RegKey} "$0\Capabilities\FileAssociations" ".htm" "BasiliskHTML" + WriteRegStr ${RegKey} "$0\Capabilities\FileAssociations" ".html" "BasiliskHTML" + WriteRegStr ${RegKey} "$0\Capabilities\FileAssociations" ".shtml" "BasiliskHTML" + WriteRegStr ${RegKey} "$0\Capabilities\FileAssociations" ".xht" "BasiliskHTML" + WriteRegStr ${RegKey} "$0\Capabilities\FileAssociations" ".xhtml" "BasiliskHTML" WriteRegStr ${RegKey} "$0\Capabilities\StartMenu" "StartMenuInternet" "$R9" - WriteRegStr ${RegKey} "$0\Capabilities\URLAssociations" "ftp" "FirefoxURL" - WriteRegStr ${RegKey} "$0\Capabilities\URLAssociations" "http" "FirefoxURL" - WriteRegStr ${RegKey} "$0\Capabilities\URLAssociations" "https" "FirefoxURL" + WriteRegStr ${RegKey} "$0\Capabilities\URLAssociations" "ftp" "BasiliskURL" + WriteRegStr ${RegKey} "$0\Capabilities\URLAssociations" "http" "BasiliskURL" + WriteRegStr ${RegKey} "$0\Capabilities\URLAssociations" "https" "BasiliskURL" ; Vista Registered Application WriteRegStr ${RegKey} "Software\RegisteredApplications" "${AppRegName}" "$0\Capabilities" !macroend !define SetStartMenuInternet "!insertmacro SetStartMenuInternet" -; The IconHandler reference for FirefoxHTML can end up in an inconsistent state +; The IconHandler reference for BasiliskHTML can end up in an inconsistent state ; due to changes not being detected by the IconHandler for side by side ; installs (see bug 268512). The symptoms can be either an incorrect icon or no -; icon being displayed for files associated with Firefox (does not use SHCTX). +; icon being displayed for files associated with Basilisk (does not use SHCTX). !macro FixShellIconHandler RegKey ClearErrors - ReadRegStr $1 ${RegKey} "Software\Classes\FirefoxHTML\ShellEx\IconHandler" "" + ReadRegStr $1 ${RegKey} "Software\Classes\BasiliskHTML\ShellEx\IconHandler" "" ${Unless} ${Errors} - ReadRegStr $1 ${RegKey} "Software\Classes\FirefoxHTML\DefaultIcon" "" + ReadRegStr $1 ${RegKey} "Software\Classes\BasiliskHTML\DefaultIcon" "" ${GetLongPath} "$INSTDIR\${FileMainEXE}" $2 ${If} "$1" != "$2,1" - WriteRegStr ${RegKey} "Software\Classes\FirefoxHTML\DefaultIcon" "" "$2,1" + WriteRegStr ${RegKey} "Software\Classes\BasiliskHTML\DefaultIcon" "" "$2,1" ${EndIf} ${EndUnless} !macroend @@ -612,7 +612,7 @@ ; HKCU Software\Classes keys when associating handlers. The fix uses the merged ; view in HKCR to check for existance of an existing association. This macro ; cleans affected installations by removing the HKLM and HKCU value if it is set -; to FirefoxHTML when there is a value for PersistentHandler or by removing the +; to BasiliskHTML when there is a value for PersistentHandler or by removing the ; HKCU value when the HKLM value has a value other than an empty string. !macro FixBadFileAssociation FILE_TYPE ; Only delete the default value in case the key has values for OpenWithList, @@ -621,16 +621,16 @@ ReadRegStr $1 HKLM "Software\Classes\${FILE_TYPE}" "" ReadRegStr $2 HKCR "${FILE_TYPE}\PersistentHandler" "" ${If} "$2" != "" - ; Since there is a persistent handler remove FirefoxHTML as the default - ; value from both HKCU and HKLM if it set to FirefoxHTML. - ${If} "$0" == "FirefoxHTML" + ; Since there is a persistent handler remove BasiliskHTML as the default + ; value from both HKCU and HKLM if it set to BasiliskHTML. + ${If} "$0" == "BasiliskHTML" DeleteRegValue HKCU "Software\Classes\${FILE_TYPE}" "" ${EndIf} - ${If} "$1" == "FirefoxHTML" + ${If} "$1" == "BasiliskHTML" DeleteRegValue HKLM "Software\Classes\${FILE_TYPE}" "" ${EndIf} - ${ElseIf} "$0" == "FirefoxHTML" - ; Since KHCU is set to FirefoxHTML remove FirefoxHTML as the default value + ${ElseIf} "$0" == "BasiliskHTML" + ; Since KHCU is set to BasiliskHTML remove BasiliskHTML as the default value ; from HKCU if HKLM is set to a value other than an empty string. ${If} "$1" != "" DeleteRegValue HKCU "Software\Classes\${FILE_TYPE}" "" @@ -686,17 +686,17 @@ ; Only set the file and protocol handlers if the existing one under HKCR is ; for this install location. - ${IsHandlerForInstallDir} "FirefoxHTML" $R9 + ${IsHandlerForInstallDir} "BasiliskHTML" $R9 ${If} "$R9" == "true" - ; An empty string is used for the 5th param because FirefoxHTML is not a + ; An empty string is used for the 5th param because BasiliskHTML is not a ; protocol handler. - ${AddDisabledDDEHandlerValues} "FirefoxHTML" "$2" "$8,1" \ + ${AddDisabledDDEHandlerValues} "BasiliskHTML" "$2" "$8,1" \ "${AppRegName} HTML Document" "" ${EndIf} - ${IsHandlerForInstallDir} "FirefoxURL" $R9 + ${IsHandlerForInstallDir} "BasiliskURL" $R9 ${If} "$R9" == "true" - ${AddDisabledDDEHandlerValues} "FirefoxURL" "$2" "$8,1" \ + ${AddDisabledDDEHandlerValues} "BasiliskURL" "$2" "$8,1" \ "${AppRegName} URL" "true" ${EndIf} @@ -780,8 +780,8 @@ ${RegCleanAppHandler} "chrome" ; Remove protocol handler registry keys added by the MS shim - DeleteRegKey HKLM "Software\Classes\Firefox.URL" - DeleteRegKey HKCU "Software\Classes\Firefox.URL" + DeleteRegKey HKLM "Software\Classes\Basilisk.URL" + DeleteRegKey HKCU "Software\Classes\Basilisk.URL" ; Delete gopher from Capabilities\URLAssociations if it is present. ${StrFilter} "${FileMainEXE}" "+" "" "" $R9 @@ -792,10 +792,10 @@ DeleteRegValue HKLM "$0\Capabilities\URLAssociations" "gopher" ${EndUnless} - ; Delete gopher from the user's UrlAssociations if it points to FirefoxURL. + ; Delete gopher from the user's UrlAssociations if it points to BasiliskURL. StrCpy $0 "Software\Microsoft\Windows\Shell\Associations\UrlAssociations\gopher" ReadRegStr $2 HKCU "$0\UserChoice" "Progid" - ${If} "$2" == "FirefoxURL" + ${If} "$2" == "BasiliskURL" DeleteRegKey HKCU "$0" ${EndIf} !macroend @@ -943,7 +943,7 @@ ${If} $AddTaskbarSC == "" ; No need to check the default on Win8 and later ${If} ${AtMostWin2008R2} - ; Check if the Firefox is the http handler for this user + ; Check if the Basilisk is the http handler for this user SetShellVarContext current ; Set SHCTX to the current user ${IsHandlerForInstallDir} "http" $R9 ${If} $TmpVal == "HKLM" diff --git a/browser/installer/windows/nsis/stub.nsi b/browser/installer/windows/nsis/stub.nsi index 5c19c10fe..999ffa154 100644 --- a/browser/installer/windows/nsis/stub.nsi +++ b/browser/installer/windows/nsis/stub.nsi @@ -35,11 +35,10 @@ Var LabelDownloading Var LabelInstalling Var LabelFreeSpace Var CheckboxSetAsDefault -Var CheckboxShortcutOnBar ; Used for Quicklaunch or Taskbar as appropriate -Var CheckboxShortcutInStartMenu -Var CheckboxShortcutOnDesktop +Var CheckboxShortcuts Var CheckboxSendPing Var CheckboxInstallMaintSvc +Var DroplistArch Var DirRequest Var ButtonBrowse Var LabelBlurb1 @@ -73,7 +72,6 @@ Var InstallStepSize Var InstallTotalSteps Var ProgressCompleted Var ProgressTotal -Var TmpVal Var ExitCode Var BasiliskLaunchCode @@ -108,9 +106,13 @@ Var DownloadRetryCount Var OpenedDownloadPage Var DownloadServerIP Var PostSigningData +Var PreviousInstallDir +Var PreviousInstallArch Var ControlHeightPX Var ControlRightPX +Var ControlTopAdjustment +Var OptionsItemWidthPX ; Uncomment the following to prevent pinging the metrics server when testing ; the stub installer @@ -218,6 +220,9 @@ Var ControlRightPX !define INVALID_HANDLE_VALUE -1 !endif +!define DefaultInstDir32bit "$PROGRAMFILES32\${BrandFullName}" +!define DefaultInstDir64bit "$PROGRAMFILES64\${BrandFullName}" + !include "nsDialogs.nsh" !include "LogicLib.nsh" !include "FileFunc.nsh" @@ -230,6 +235,9 @@ Var ControlRightPX !insertmacro LineFind !insertmacro StrFilter +!include "StrFunc.nsh" +${StrTok} + !include "locales.nsi" !include "branding.nsi" @@ -243,8 +251,10 @@ Var ControlRightPX ; set the update channel to beta. !ifdef OFFICIAL !ifdef BETA_UPDATE_CHANNEL -!undef URLStubDownload -!define URLStubDownload "http://download.mozilla.org/?os=win&lang=${AB_CD}&product=firefox-beta-latest" +!undef URLStubDownload32 +!undef URLStubDownload64 +!define URLStubDownload32 "http://download.mozilla.org/?os=win&lang=${AB_CD}&product=firefox-beta-latest" +!define URLStubDownload64 "http://download.mozilla.org/?os=win64&lang=${AB_CD}&product=firefox-beta-latest" !undef URLManualDownload !define URLManualDownload "https://www.mozilla.org/${AB_CD}/firefox/installer-help/?channel=beta&installer_lang=${AB_CD}" !undef Channel @@ -275,11 +285,6 @@ icon "setup.ico" XPStyle on BrandingText " " ChangeUI all "nsisui.exe" -!ifdef HAVE_64BIT_BUILD - InstallDir "$PROGRAMFILES64\${BrandFullName}\" -!else - InstallDir "$PROGRAMFILES32\${BrandFullName}\" -!endif !ifdef ${AB_CD}_rtl LoadLanguageFile "locale-rtl.nlf" @@ -289,15 +294,10 @@ ChangeUI all "nsisui.exe" !include "nsisstrings.nlf" -!if "${AB_CD}" == "en-US" - ; Custom strings for en-US. This is done here so they aren't translated. - !include oneoff_en-US.nsh -!else - !define INTRO_BLURB "$(INTRO_BLURB1)" - !define INSTALL_BLURB1 "$(INSTALL_BLURB1)" - !define INSTALL_BLURB2 "$(INSTALL_BLURB2)" - !define INSTALL_BLURB3 "$(INSTALL_BLURB3)" -!endif +!define INTRO_BLURB "$(INTRO_BLURB1)" +!define INSTALL_BLURB1 "$(INSTALL_BLURB1)" +!define INSTALL_BLURB2 "$(INSTALL_BLURB2)" +!define INSTALL_BLURB3 "$(INSTALL_BLURB3)" Caption "$(WIN_CAPTION)" @@ -321,10 +321,8 @@ Function .onInit ; SSE2 instruction set is available. System::Call "kernel32::IsProcessorFeaturePresent(i 10)i .R7" -!ifdef HAVE_64BIT_BUILD - ; Restrict x64 builds from being installed on x86 and pre Win7 - ${Unless} ${RunningX64} - ${OrUnless} ${AtLeastWin7} + ; Windows NT 6.0 (Vista/Server 2008) and lower are not supported. + ${Unless} ${AtLeastWin7} ${If} "$R7" == "0" strCpy $R7 "$(WARN_MIN_SUPPORTED_OSVER_CPU_MSG)" ${Else} @@ -335,51 +333,20 @@ Function .onInit Quit ${EndUnless} - SetRegView 64 -!else - StrCpy $R8 "0" - ${If} ${AtMostWin2000} - StrCpy $R8 "1" - ${EndIf} - - ${If} ${IsWinXP} - ${AndIf} ${AtMostServicePack} 1 - StrCpy $R8 "1" - ${EndIf} - - ${If} $R8 == "1" - ; XXX-rstrong - some systems failed the AtLeastWin2000 test that we - ; used to use for an unknown reason and likely fail the AtMostWin2000 - ; and possibly the IsWinXP test as well. To work around this also - ; check if the Windows NT registry Key exists and if it does if the - ; first char in CurrentVersion is equal to 3 (Windows NT 3.5 and - ; 3.5.1), 4 (Windows NT 4), or 5 (Windows 2000 and Windows XP). - StrCpy $R8 "" - ClearErrors - ReadRegStr $R8 HKLM "SOFTWARE\Microsoft\Windows NT\CurrentVersion" "CurrentVersion" - StrCpy $R8 "$R8" 1 - ${If} ${Errors} - ${OrIf} "$R8" == "3" - ${OrIf} "$R8" == "4" - ${OrIf} "$R8" == "5" - ${If} "$R7" == "0" - strCpy $R7 "$(WARN_MIN_SUPPORTED_OSVER_CPU_MSG)" - ${Else} - strCpy $R7 "$(WARN_MIN_SUPPORTED_OSVER_MSG)" - ${EndIf} - MessageBox MB_OKCANCEL|MB_ICONSTOP "$R7" IDCANCEL +2 - ExecShell "open" "${URLSystemRequirements}" - Quit - ${EndIf} - ${EndUnless} -!endif - + ; SSE2 CPU support ${If} "$R7" == "0" MessageBox MB_OKCANCEL|MB_ICONSTOP "$(WARN_MIN_SUPPORTED_CPU_MSG)" IDCANCEL +2 ExecShell "open" "${URLSystemRequirements}" Quit ${EndIf} + ; Bug 1338583: disable 64-bit as default until Flash issues are resolved + ;${If} ${RunningX64} + ; StrCpy $INSTDIR "${DefaultInstDir64bit}" + ;${Else} + StrCpy $INSTDIR "${DefaultInstDir32bit}" + ;${EndIf} + ; Require elevation if the user can elevate ${ElevateUAC} @@ -391,16 +358,25 @@ Function .onInit ${EndIf} !endif + ; If we have any existing installation, use its location as the default + ; path for this install, even if it's not the same architecture. + SetRegView 32 SetShellVarContext all ; Set SHCTX to HKLM ${GetSingleInstallPath} "Software\Mozilla\${BrandFullNameInternal}" $R9 + ${If} "$R9" == "false" + ${AndIf} ${RunningX64} + SetRegView 64 + ${GetSingleInstallPath} "Software\Mozilla\${BrandFullNameInternal}" $R9 + ${EndIf} + ${If} "$R9" == "false" SetShellVarContext current ; Set SHCTX to HKCU ${GetSingleInstallPath} "Software\Mozilla\${BrandFullNameInternal}" $R9 ${If} ${RunningX64} ; In HKCU there is no WOW64 redirection, which means we may have gotten - ; the path to a 32-bit install even though we're 64-bit, or vice-versa. + ; the path to a 32-bit install even though we're 64-bit. ; In that case, just use the default path instead of offering an upgrade. ; But only do that override if the existing install is in Program Files, ; because that's the only place we can be sure is specific @@ -408,20 +384,36 @@ Function .onInit ; The WordFind syntax below searches for the first occurence of the ; "delimiter" (the Program Files path) in the install path and returns ; anything that appears before that. If nothing appears before that, - ; then the install is under Program Files (32 or 64). -!ifdef HAVE_64BIT_BUILD + ; then the install is under Program Files. ${WordFind} $R9 $PROGRAMFILES32 "+1{" $0 -!else - ${WordFind} $R9 $PROGRAMFILES64 "+1{" $0 -!endif ${If} $0 == "" StrCpy $R9 "false" ${EndIf} ${EndIf} ${EndIf} + StrCpy $PreviousInstallDir "" + StrCpy $PreviousInstallArch "" ${If} "$R9" != "false" - StrCpy $INSTDIR "$R9" + ; Don't override the default install path with an existing installation + ; of a different architecture. + System::Call "*(i)p.r0" + StrCpy $1 "$R9\${FileMainEXE}" + System::Call "Kernel32::GetBinaryTypeW(w r1, p r0)i" + System::Call "*$0(i.r2)" + System::Free $0 + + ${If} $2 == "6" ; 6 == SCS_64BIT_BINARY + ${AndIf} ${RunningX64} + StrCpy $PreviousInstallDir "$R9" + StrCpy $PreviousInstallArch "64" + StrCpy $INSTDIR "$PreviousInstallDir" + ${ElseIf} $2 == "0" ; 0 == SCS_32BIT_BINARY + ${AndIfNot} ${RunningX64} + StrCpy $PreviousInstallDir "$R9" + StrCpy $PreviousInstallArch "32" + StrCpy $INSTDIR "$PreviousInstallDir" + ${EndIf} ${EndIf} ; Used to determine if the default installation directory was used. @@ -458,9 +450,7 @@ Function .onInit StrCpy $InitialInstallRequirementsCode "" StrCpy $IsDownloadFinished "" StrCpy $BasiliskLaunchCode "0" - StrCpy $CheckboxShortcutOnBar "1" - StrCpy $CheckboxShortcutInStartMenu "1" - StrCpy $CheckboxShortcutOnDesktop "1" + StrCpy $CheckboxShortcuts "1" StrCpy $CheckboxSendPing "1" !ifdef MOZ_MAINTENANCE_SERVICE StrCpy $CheckboxInstallMaintSvc "1" @@ -468,6 +458,12 @@ Function .onInit StrCpy $CheckboxInstallMaintSvc "0" !endif StrCpy $WasOptionsButtonClicked "0" + ; Bug 1338583: disable 64-bit as default until Flash issues are resolved + ;${If} ${RunningX64} + ;StrCpy $DroplistArch "$(VERSION_64BIT)" + ;${Else} + StrCpy $DroplistArch "$(VERSION_32BIT)" + ;${EndIf} StrCpy $0 "" !ifdef FONT_FILE1 @@ -611,11 +607,11 @@ Function SendPing ; completion of all phases. ${GetSecondsElapsed} "$EndInstallPhaseTickCount" "$EndFinishPhaseTickCount" $4 -!ifdef HAVE_64BIT_BUILD - StrCpy $R0 "1" -!else - StrCpy $R0 "0" -!endif + ${If} $DroplistArch == "$(VERSION_64BIT)" + StrCpy $R0 "1" + ${Else} + StrCpy $R0 "0" + ${EndIf} ${If} ${RunningX64} StrCpy $R1 "1" @@ -932,6 +928,17 @@ Function createOptions ${EndIf} StrCpy $ExistingTopDir "" + StrCpy $ControlTopAdjustment 0 + + ; Convert the options item width to pixels, so we can tell when a text string + ; exceeds this width and needs multiple lines. + StrCpy $2 "${OPTIONS_ITEM_WIDTH_DU}" -1 + IntOp $2 $2 - 14 ; subtract approximate width of a checkbox + System::Call "*(i r2,i,i,i) p .r3" + System::Call "user32::MapDialogRect(p $HWNDPARENT, p r3)" + System::Call "*$3(i .s,i,i,i)" + Pop $OptionsItemWidthPX + System::Free $3 nsDialogs::Create /NOUNLOAD 1018 Pop $Dialog @@ -939,54 +946,13 @@ Function createOptions ; background colors of the Dialog must also be hardcoded. SetCtlColors $Dialog ${COMMON_TEXT_COLOR_NORMAL} ${COMMON_BKGRD_COLOR} - ${NSD_CreateLabel} ${OPTIONS_ITEM_EDGE_DU} 18u ${OPTIONS_ITEM_WIDTH_DU} \ - 12u "$(CREATE_SHORTCUTS)" - Pop $0 - SetCtlColors $0 ${COMMON_TEXT_COLOR_NORMAL} ${COMMON_BKGRD_COLOR} - SendMessage $0 ${WM_SETFONT} $FontNormal 0 - - ${If} ${AtLeastWin7} - StrCpy $0 "$(ADD_SC_TASKBAR)" - ${Else} - StrCpy $0 "$(ADD_SC_QUICKLAUNCHBAR)" - ${EndIf} - ${NSD_CreateCheckbox} ${OPTIONS_SUBITEM_EDGE_DU} 38u \ - ${OPTIONS_SUBITEM_WIDTH_DU} 12u "$0" - Pop $CheckboxShortcutOnBar - ; The uxtheme must be disabled on checkboxes in order to override the system - ; font color. - System::Call 'uxtheme::SetWindowTheme(i $CheckboxShortcutOnBar, w " ", w " ")' - SetCtlColors $CheckboxShortcutOnBar ${COMMON_TEXT_COLOR_NORMAL} ${COMMON_BKGRD_COLOR} - SendMessage $CheckboxShortcutOnBar ${WM_SETFONT} $FontNormal 0 - ${NSD_Check} $CheckboxShortcutOnBar - - ${NSD_CreateCheckbox} ${OPTIONS_SUBITEM_EDGE_DU} 54u ${OPTIONS_SUBITEM_WIDTH_DU} \ - 12u "$(ADD_CheckboxShortcutInStartMenu)" - Pop $CheckboxShortcutInStartMenu - ; The uxtheme must be disabled on checkboxes in order to override the system - ; font color. - System::Call 'uxtheme::SetWindowTheme(i $CheckboxShortcutInStartMenu, w " ", w " ")' - SetCtlColors $CheckboxShortcutInStartMenu ${COMMON_TEXT_COLOR_NORMAL} ${COMMON_BKGRD_COLOR} - SendMessage $CheckboxShortcutInStartMenu ${WM_SETFONT} $FontNormal 0 - ${NSD_Check} $CheckboxShortcutInStartMenu - - ${NSD_CreateCheckbox} ${OPTIONS_SUBITEM_EDGE_DU} 70u ${OPTIONS_SUBITEM_WIDTH_DU} \ - 12u "$(ADD_CheckboxShortcutOnDesktop)" - Pop $CheckboxShortcutOnDesktop - ; The uxtheme must be disabled on checkboxes in order to override the system - ; font color. - System::Call 'uxtheme::SetWindowTheme(i $CheckboxShortcutOnDesktop, w " ", w " ")' - SetCtlColors $CheckboxShortcutOnDesktop ${COMMON_TEXT_COLOR_NORMAL} ${COMMON_BKGRD_COLOR} - SendMessage $CheckboxShortcutOnDesktop ${WM_SETFONT} $FontNormal 0 - ${NSD_Check} $CheckboxShortcutOnDesktop - - ${NSD_CreateLabel} ${OPTIONS_ITEM_EDGE_DU} 100u ${OPTIONS_ITEM_WIDTH_DU} \ + ${NSD_CreateLabel} ${OPTIONS_ITEM_EDGE_DU} 25u ${OPTIONS_ITEM_WIDTH_DU} \ 12u "$(DEST_FOLDER)" Pop $0 SetCtlColors $0 ${COMMON_TEXT_COLOR_NORMAL} ${COMMON_BKGRD_COLOR} SendMessage $0 ${WM_SETFONT} $FontNormal 0 - ${NSD_CreateDirRequest} ${OPTIONS_SUBITEM_EDGE_DU} 116u 159u 14u "$INSTDIR" + ${NSD_CreateDirRequest} ${OPTIONS_SUBITEM_EDGE_DU} 41u 159u 14u "$INSTDIR" Pop $DirRequest SetCtlColors $DirRequest ${COMMON_TEXT_COLOR_NORMAL} ${COMMON_BKGRD_COLOR} SendMessage $DirRequest ${WM_SETFONT} $FontNormal 0 @@ -1002,7 +968,7 @@ Function createOptions ${NSD_AddExStyle} $DirRequest ${WS_EX_LTRREADING}|${WS_EX_LEFT} !endif - ${NSD_CreateBrowseButton} 280u 116u 50u 14u "$(BROWSE_BUTTON)" + ${NSD_CreateBrowseButton} 280u 41u 50u 14u "$(BROWSE_BUTTON)" Pop $ButtonBrowse SetCtlColors $ButtonBrowse "" ${COMMON_BKGRD_COLOR} ${NSD_OnClick} $ButtonBrowse OnClick_ButtonBrowse @@ -1023,13 +989,13 @@ Function createOptions IntOp $0 $0 + 8 ; Add padding to the control's width ; Make both controls the same width as the widest control - ${NSD_CreateLabelCenter} ${OPTIONS_SUBITEM_EDGE_DU} 134u $0 $ControlHeightPX "$(SPACE_REQUIRED)" + ${NSD_CreateLabelCenter} ${OPTIONS_SUBITEM_EDGE_DU} 59u $0 $ControlHeightPX "$(SPACE_REQUIRED)" Pop $5 SetCtlColors $5 ${COMMON_TEXT_COLOR_FADED} ${COMMON_BKGRD_COLOR} SendMessage $5 ${WM_SETFONT} $FontItalic 0 IntOp $2 $2 + 8 ; Add padding to the control's width - ${NSD_CreateLabelCenter} ${OPTIONS_SUBITEM_EDGE_DU} 145u $2 $ControlHeightPX "$(SPACE_AVAILABLE)" + ${NSD_CreateLabelCenter} ${OPTIONS_SUBITEM_EDGE_DU} 70u $2 $ControlHeightPX "$(SPACE_AVAILABLE)" Pop $6 SetCtlColors $6 ${COMMON_TEXT_COLOR_FADED} ${COMMON_BKGRD_COLOR} SendMessage $6 ${WM_SETFONT} $FontItalic 0 @@ -1043,7 +1009,7 @@ Function createOptions IntOp $ControlRightPX $ControlRightPX + 6 - ${NSD_CreateLabel} $ControlRightPX 134u 100% $ControlHeightPX \ + ${NSD_CreateLabel} $ControlRightPX 59u 100% $ControlHeightPX \ "${APPROXIMATE_REQUIRED_SPACE_MB} $(MEGA)$(BYTE)" Pop $7 SetCtlColors $7 ${COMMON_TEXT_COLOR_NORMAL} ${COMMON_BKGRD_COLOR} @@ -1051,15 +1017,54 @@ Function createOptions ; Create the free space label with an empty string and update it by calling ; UpdateFreeSpaceLabel - ${NSD_CreateLabel} $ControlRightPX 145u 100% $ControlHeightPX " " + ${NSD_CreateLabel} $ControlRightPX 70u 100% $ControlHeightPX " " Pop $LabelFreeSpace SetCtlColors $LabelFreeSpace ${COMMON_TEXT_COLOR_NORMAL} ${COMMON_BKGRD_COLOR} SendMessage $LabelFreeSpace ${WM_SETFONT} $FontNormal 0 Call UpdateFreeSpaceLabel - ${NSD_CreateCheckbox} ${OPTIONS_ITEM_EDGE_DU} 168u ${OPTIONS_SUBITEM_WIDTH_DU} \ - 12u "$(SEND_PING)" + ${If} ${AtLeastWin7} + StrCpy $0 "$(ADD_SC_DESKTOP_TASKBAR)" + ${Else} + StrCpy $0 "$(ADD_SC_DESKTOP_QUICKLAUNCHBAR)" + ${EndIf} + + ; In some locales, this string may be too long to fit on one line. + ; In that case, we'll need to give the control two lines worth of height. + StrCpy $1 12 ; single line height + ${GetTextExtent} $0 $FontNormal $R1 $R2 + ${If} $R1 > $OptionsItemWidthPX + ; Add a second line to the control height. + IntOp $1 $1 + 12 + ; The rest of the controls will have to be lower to account for this label + ; needing two lines worth of height. + IntOp $ControlTopAdjustment $ControlTopAdjustment + 12 + ${EndIf} + ${NSD_CreateCheckbox} ${OPTIONS_ITEM_EDGE_DU} 100u \ + ${OPTIONS_ITEM_WIDTH_DU} "$1u" "$0" + Pop $CheckboxShortcuts + ; The uxtheme must be disabled on checkboxes in order to override the system + ; font color. + System::Call 'uxtheme::SetWindowTheme(i $CheckboxShortcuts, w " ", w " ")' + SetCtlColors $CheckboxShortcuts ${COMMON_TEXT_COLOR_NORMAL} ${COMMON_BKGRD_COLOR} + SendMessage $CheckboxShortcuts ${WM_SETFONT} $FontNormal 0 + ${NSD_Check} $CheckboxShortcuts + + IntOp $0 116 + $ControlTopAdjustment + ; In some locales, this string may be too long to fit on one line. + ; In that case, we'll need to give the control two lines worth of height. + StrCpy $1 12 ; single line height + ${GetTextExtent} "$(SEND_PING)" $FontNormal $R1 $R2 + ${If} $R1 > $OptionsItemWidthPX + ; Add a second line to the control height. + IntOp $1 $1 + 12 + ; The rest of the controls will have to be lower to account for this label + ; needing two lines worth of height. + IntOp $ControlTopAdjustment $ControlTopAdjustment + 12 + ${EndIf} + ${NSD_CreateCheckbox} ${OPTIONS_ITEM_EDGE_DU} "$0u" ${OPTIONS_ITEM_WIDTH_DU} \ + "$1u" "$(SEND_PING)" Pop $CheckboxSendPing ; The uxtheme must be disabled on checkboxes in order to override the system ; font color. @@ -1069,6 +1074,7 @@ Function createOptions ${NSD_Check} $CheckboxSendPing !ifdef MOZ_MAINTENANCE_SERVICE + StrCpy $CheckboxInstallMaintSvc "0" ; We can only install the maintenance service if the user is an admin. Call IsUserAdmin Pop $0 @@ -1081,31 +1087,105 @@ Function createOptions StrCpy $0 "false" ${EndIf} - ; Only show the maintenance service checkbox if we have write access to HKLM - ClearErrors - WriteRegStr HKLM "Software\Mozilla" "${BrandShortName}InstallerTest" \ - "Write Test" - ${If} ${Errors} - ${OrIf} $0 != "true" - StrCpy $CheckboxInstallMaintSvc "0" - ${Else} + ${If} $0 == "true" + ; Only show the maintenance service checkbox if we have write access to HKLM DeleteRegValue HKLM "Software\Mozilla" "${BrandShortName}InstallerTest" - ; Read the registry instead of using ServicesHelper::IsInstalled so the - ; plugin isn't included in the stub installer to lessen its size. ClearErrors - ReadRegStr $0 HKLM "SYSTEM\CurrentControlSet\services\MozillaMaintenance" "ImagePath" - ${If} ${Errors} - ${NSD_CreateCheckbox} ${OPTIONS_ITEM_EDGE_DU} 184u ${OPTIONS_ITEM_WIDTH_DU} \ - 12u "$(INSTALL_MAINT_SERVICE)" - Pop $CheckboxInstallMaintSvc - System::Call 'uxtheme::SetWindowTheme(i $CheckboxInstallMaintSvc, w " ", w " ")' - SetCtlColors $CheckboxInstallMaintSvc ${COMMON_TEXT_COLOR_NORMAL} ${COMMON_BKGRD_COLOR} - SendMessage $CheckboxInstallMaintSvc ${WM_SETFONT} $FontNormal 0 - ${NSD_Check} $CheckboxInstallMaintSvc + WriteRegStr HKLM "Software\Mozilla" "${BrandShortName}InstallerTest" \ + "Write Test" + ${IfNot} ${Errors} + DeleteRegValue HKLM "Software\Mozilla" "${BrandShortName}InstallerTest" + ; Read the registry instead of using ServicesHelper::IsInstalled so the + ; plugin isn't included in the stub installer to lessen its size. + ClearErrors + ReadRegStr $0 HKLM "SYSTEM\CurrentControlSet\services\MozillaMaintenance" "ImagePath" + ${If} ${Errors} + IntOp $0 132 + $ControlTopAdjustment + ; In some locales, this string may be too long to fit on one line. + ; In that case, we'll need to give the control two lines worth of height. + StrCpy $1 12 ; single line height + ${GetTextExtent} "$(INSTALL_MAINT_SERVICE)" $FontNormal $R1 $R2 + ${If} $R1 > $OptionsItemWidthPX + ; Add a second line to the control height. + IntOp $1 $1 + 12 + ; The rest of the controls will have to be lower to account for this label + ; needing two lines worth of height. + IntOp $ControlTopAdjustment $ControlTopAdjustment + 12 + ${EndIf} + ${NSD_CreateCheckbox} ${OPTIONS_ITEM_EDGE_DU} "$0u" ${OPTIONS_ITEM_WIDTH_DU} \ + "$1u" "$(INSTALL_MAINT_SERVICE)" + Pop $CheckboxInstallMaintSvc + System::Call 'uxtheme::SetWindowTheme(i $CheckboxInstallMaintSvc, w " ", w " ")' + SetCtlColors $CheckboxInstallMaintSvc ${COMMON_TEXT_COLOR_NORMAL} ${COMMON_BKGRD_COLOR} + SendMessage $CheckboxInstallMaintSvc ${WM_SETFONT} $FontNormal 0 + ${NSD_Check} $CheckboxInstallMaintSvc + ; Since we're adding in an optional control, remember the lower the ones + ; that come after it. + IntOp $ControlTopAdjustment 20 + $ControlTopAdjustment + ${EndIf} ${EndIf} ${EndIf} !endif + ${If} ${RunningX64} + ; Get the exact pixel width we're going to need for this label. + ; The label string has a keyboard accelerator, which is an '&' that's in + ; the string but is not rendered, and GetTextExtent doesn't account for + ; those, so remove them first. Also handle any escaped &'s ("&&"). + StrCpy $R0 "$(ARCH_DROPLIST_LABEL)" + StrCpy $R1 "" + ${Do} + ${StrTok} $R2 $R0 "&" 0 0 + StrCpy $R1 "$R1$R2" + StrLen $R3 $R2 + IntOp $R3 $R3 + 1 + StrCpy $R0 $R0 "" $R3 + StrCpy $R4 $R0 1 + ${If} $R4 == "&" + StrCpy $R1 "$R1&" + StrCpy $R0 $R0 "" 1 + ${EndIf} + ${LoopUntil} $R0 == "" + + ${GetTextExtent} $R1 $FontNormal $R0 $R1 + IntOp $0 134 + $ControlTopAdjustment + ${NSD_CreateLabel} ${OPTIONS_ITEM_EDGE_DU} "$0u" $R0 $R1 "$(ARCH_DROPLIST_LABEL)" + Pop $0 + SetCtlColors $0 ${COMMON_TEXT_COLOR_NORMAL} ${COMMON_BKGRD_COLOR} + SendMessage $0 ${WM_SETFONT} $FontNormal 0 + + ; Set the dropdown list size to the same as the larger of the two options. + ${GetTextExtent} "$(VERSION_32BIT)" $FontNormal $R0 $R1 + ${GetTextExtent} "$(VERSION_64BIT)" $FontNormal $R2 $R3 + ${If} $R0 < $R2 + StrCpy $R0 $R2 + ${EndIf} + ${If} $R1 < $R3 + StrCpy $R3 $R1 + ${EndIf} + ; Add enough width for the dropdown button. How wide the button is depends + ; on he system display scaling setting, which we cannot easily determine, + ; so just use a value that works fine for a setting of 200% and adds a + ; little too much padding for settings below that. + IntOp $R0 $R0 + 56 + + ; Put the droplist right after the label, with some padding. + ${GetDlgItemEndPX} $0 $ControlRightPX + IntOp $ControlRightPX $ControlRightPX + 4 + IntOp $0 132 + $ControlTopAdjustment + ${NSD_CreateDropList} $ControlRightPX "$0u" $R0 $R3 "" + Pop $DroplistArch + ${NSD_CB_AddString} $DroplistArch "$(VERSION_32BIT)" + ${NSD_CB_AddString} $DroplistArch "$(VERSION_64BIT)" + ${NSD_OnChange} $DroplistArch OnChange_DroplistArch + ; The uxtheme must be disabled in order to override the system colors. + System::Call 'uxtheme::SetWindowTheme(i $DroplistArch, w " ", w " ")' + SetCtlColors $DroplistArch ${COMMON_TEXT_COLOR_NORMAL} ${COMMON_BKGRD_COLOR} + SendMessage $DroplistArch ${WM_SETFONT} $FontNormal 0 + ; Bug 1338583: disable 64-bit as default until Flash issues are resolved + ${NSD_CB_SelectString} $DroplistArch "$(VERSION_32BIT)" + ${EndIf} + GetDlgItem $0 $HWNDPARENT 1 ; Install button ${If} ${FileExists} "$INSTDIR\${FileMainEXE}" SendMessage $0 ${WM_SETTEXT} 0 "STR:$(UPGRADE_BUTTON)" @@ -1173,9 +1253,8 @@ Function leaveOptions IntOp $OptionsPhaseSeconds $OptionsPhaseSeconds + 1 ${EndIf} - ${NSD_GetState} $CheckboxShortcutOnBar $CheckboxShortcutOnBar - ${NSD_GetState} $CheckboxShortcutInStartMenu $CheckboxShortcutInStartMenu - ${NSD_GetState} $CheckboxShortcutOnDesktop $CheckboxShortcutOnDesktop + ${NSD_GetState} $CheckboxShortcuts $CheckboxShortcuts + ${NSD_GetText} $DroplistArch $DroplistArch ${NSD_GetState} $CheckboxSendPing $CheckboxSendPing !ifdef MOZ_MAINTENANCE_SERVICE ${NSD_GetState} $CheckboxInstallMaintSvc $CheckboxInstallMaintSvc @@ -1370,8 +1449,15 @@ FunctionEnd Function StartDownload ${NSD_KillTimer} StartDownload - InetBgDL::Get "${URLStubDownload}${URLStubDownloadAppend}" "$PLUGINSDIR\download.exe" \ - /CONNECTTIMEOUT 120 /RECEIVETIMEOUT 120 /END + ${If} $DroplistArch == "$(VERSION_64BIT)" + InetBgDL::Get "${URLStubDownload64}${URLStubDownloadAppend}" \ + "$PLUGINSDIR\download.exe" \ + /CONNECTTIMEOUT 120 /RECEIVETIMEOUT 120 /END + ${Else} + InetBgDL::Get "${URLStubDownload32}${URLStubDownloadAppend}" \ + "$PLUGINSDIR\download.exe" \ + /CONNECTTIMEOUT 120 /RECEIVETIMEOUT 120 /END + ${EndIf} StrCpy $4 "" ${NSD_CreateTimer} OnDownload ${DownloadIntervalMS} ${If} ${FileExists} "$INSTDIR\${TO_BE_DELETED}" @@ -1592,23 +1678,18 @@ Function OnDownload ; Don't create the QuickLaunch or Taskbar shortcut from the launched installer WriteINIStr "$PLUGINSDIR\${CONFIG_INI}" "Install" "QuickLaunchShortcut" "false" - ; Either avoid or force adding a taskbar pin based on the checkbox value: - ${If} $CheckboxShortcutOnBar == 0 + ; Always create a start menu shortcut, so the user always has some way + ; to access the application. + WriteINIStr "$PLUGINSDIR\${CONFIG_INI}" "Install" "StartMenuShortcuts" "true" + + ; Either avoid or force adding a taskbar pin and desktop shortcut + ; based on the checkbox value. + ${If} $CheckboxShortcuts == 0 WriteINIStr "$PLUGINSDIR\${CONFIG_INI}" "Install" "TaskbarShortcut" "false" + WriteINIStr "$PLUGINSDIR\${CONFIG_INI}" "Install" "DesktopShortcut" "false" ${Else} WriteINIStr "$PLUGINSDIR\${CONFIG_INI}" "Install" "TaskbarShortcut" "true" - ${EndIf} - - ${If} $CheckboxShortcutOnDesktop == 1 WriteINIStr "$PLUGINSDIR\${CONFIG_INI}" "Install" "DesktopShortcut" "true" - ${Else} - WriteINIStr "$PLUGINSDIR\${CONFIG_INI}" "Install" "DesktopShortcut" "false" - ${EndIf} - - ${If} $CheckboxShortcutInStartMenu == 1 - WriteINIStr "$PLUGINSDIR\${CONFIG_INI}" "Install" "StartMenuShortcuts" "true" - ${Else} - WriteINIStr "$PLUGINSDIR\${CONFIG_INI}" "Install" "StartMenuShortcuts" "false" ${EndIf} !ifdef MOZ_MAINTENANCE_SERVICE @@ -1785,7 +1866,7 @@ Function FinishInstall ${EndIf} ${EndIf} - ${If} $CheckboxShortcutOnBar == 1 + ${If} $CheckboxShortcuts == 1 ${If} ${AtMostWinVista} ClearErrors ${GetParameters} $0 @@ -1921,6 +2002,30 @@ Function OnClick_ButtonBrowse ${EndIf} FunctionEnd +Function OnChange_DroplistArch + ; When the user changes the 32/64-bit setting, change the default install path + ; to use the correct version of Program Files. But only do that if the user + ; hasn't selected their own install path yet, and if we didn't select our + ; default as the location of an existing install. + ${If} $INSTDIR == $InitialInstallDir + ${NSD_GetText} $DroplistArch $0 + ${If} $0 == "$(VERSION_32BIT)" + ${If} $PreviousInstallArch == 32 + StrCpy $InitialInstallDir $PreviousInstallDir + ${Else} + StrCpy $InitialInstallDir "${DefaultInstDir32bit}" + ${EndIf} + ${Else} + ${If} $PreviousInstallArch == 64 + StrCpy $InitialInstallDir $PreviousInstallDir + ${Else} + StrCpy $InitialInstallDir "${DefaultInstDir64bit}" + ${EndIf} + ${EndIf} + ${NSD_SetText} $DirRequest $InitialInstallDir + ${EndIf} +FunctionEnd + Function CheckSpace ${If} "$ExistingTopDir" != "" StrLen $0 "$ExistingTopDir" @@ -1985,6 +2090,7 @@ Function CanWrite GetTempFileName $2 "$0" Delete $2 CreateDirectory "$2" + ${If} ${FileExists} "$2" ${If} ${FileExists} "$INSTDIR" GetTempFileName $3 "$INSTDIR" diff --git a/browser/installer/windows/nsis/uninstaller.nsi b/browser/installer/windows/nsis/uninstaller.nsi index 687bcd6eb..87f4d838a 100755 --- a/browser/installer/windows/nsis/uninstaller.nsi +++ b/browser/installer/windows/nsis/uninstaller.nsi @@ -351,7 +351,7 @@ Section "Uninstall" StrCpy $0 "Software\Microsoft\MediaPlayer\ShimInclusionList\plugin-container.exe" DeleteRegKey HKLM "$0" DeleteRegKey HKCU "$0" - StrCpy $0 "Software\Classes\MIME\Database\Content Type\application/x-xpinstall;app=firefox" + StrCpy $0 "Software\Classes\MIME\Database\Content Type\application/x-xpinstall;app=Basilisk" DeleteRegKey HKLM "$0" DeleteRegKey HKCU "$0" ${Else} @@ -419,8 +419,8 @@ Section "Uninstall" ; Remove the installation directory if it is empty RmDir "$INSTDIR" - ; If firefox.exe was successfully deleted yet we still need to restart to - ; remove other files create a dummy firefox.exe.moz-delete to prevent the + ; If Basilisk.exe was successfully deleted yet we still need to restart to + ; remove other files create a dummy Basilisk.exe.moz-delete to prevent the ; installer from allowing an install without restart when it is required ; to complete an uninstall. ${If} ${RebootFlag} -- cgit v1.2.3 From 1a418cf476709cc49a4b7dcf4aef64c5100ddaf9 Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Sun, 31 Dec 2017 13:45:14 +0100 Subject: Rename Options to Preferences and unify location. This also removes OS-specific naming/handling for separate locations. Fixes #270. --- browser/base/content/browser-menubar.inc | 11 ----------- browser/base/content/browser.js | 4 +--- browser/base/content/sync/customize.xul | 7 +------ browser/base/jar.mn | 2 +- browser/components/customizableui/CustomizableWidgets.jsm | 5 +---- browser/components/preferences/in-content/preferences.xul | 8 -------- browser/locales/en-US/chrome/browser/aboutHome.dtd | 2 +- browser/locales/en-US/chrome/browser/browser.dtd | 6 ++---- browser/locales/en-US/chrome/browser/browser.properties | 6 ++---- .../browser/customizableui/customizableWidgets.properties | 4 ---- browser/locales/en-US/chrome/browser/migration/migration.dtd | 3 +-- .../locales/en-US/chrome/browser/preferences/preferences.dtd | 1 - browser/locales/en-US/chrome/browser/syncCustomize.dtd | 3 +-- browser/locales/en-US/chrome/browser/syncSetup.dtd | 2 +- 14 files changed, 12 insertions(+), 52 deletions(-) (limited to 'browser') diff --git a/browser/base/content/browser-menubar.inc b/browser/base/content/browser-menubar.inc index e952bc3ca..3fc098755 100644 --- a/browser/base/content/browser-menubar.inc +++ b/browser/base/content/browser-menubar.inc @@ -179,15 +179,6 @@ label="&bidiSwitchTextDirectionItem.label;" accesskey="&bidiSwitchTextDirectionItem.accesskey;" hidden="true"/> -#ifdef XP_UNIX -#ifndef XP_MACOSX - - -#endif -#endif @@ -521,13 +512,11 @@ -#ifndef XP_UNIX -#endif diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js index a8aff1bd7..9ccd86b12 100755 --- a/browser/base/content/browser.js +++ b/browser/base/content/browser.js @@ -473,9 +473,7 @@ var gPopupBlockerObserver = { var brandShortName = brandBundle.getString("brandShortName"); var popupCount = gBrowser.selectedBrowser.blockedPopups.length; - var stringKey = AppConstants.platform == "win" - ? "popupWarningButton" - : "popupWarningButtonUnix"; + var stringKey = "popupWarningButton"; var popupButtonText = gNavigatorBundle.getString(stringKey); var popupButtonAccesskey = gNavigatorBundle.getString(stringKey + ".accesskey"); diff --git a/browser/base/content/sync/customize.xul b/browser/base/content/sync/customize.xul index d95536d9a..827edf565 100644 --- a/browser/base/content/sync/customize.xul +++ b/browser/base/content/sync/customize.xul @@ -31,12 +31,7 @@ + value="&syncCustomize.description;"/> -#ifdef XP_WIN -#define USE_WIN_TITLE_STYLE -#endif - -#else title="&prefWindow.title;"> -#endif diff --git a/browser/locales/en-US/chrome/browser/aboutHome.dtd b/browser/locales/en-US/chrome/browser/aboutHome.dtd index 7e3b57a79..17b401c6c 100644 --- a/browser/locales/en-US/chrome/browser/aboutHome.dtd +++ b/browser/locales/en-US/chrome/browser/aboutHome.dtd @@ -26,7 +26,7 @@ - + diff --git a/browser/locales/en-US/chrome/browser/browser.dtd b/browser/locales/en-US/chrome/browser/browser.dtd index f6fc6e3fd..6de17b64f 100644 --- a/browser/locales/en-US/chrome/browser/browser.dtd +++ b/browser/locales/en-US/chrome/browser/browser.dtd @@ -315,10 +315,8 @@ These should match what Safari and other Apple applications use on OS X Lion. -- - - - - + + diff --git a/browser/locales/en-US/chrome/browser/browser.properties b/browser/locales/en-US/chrome/browser/browser.properties index 21e794f08..1947a3c90 100644 --- a/browser/locales/en-US/chrome/browser/browser.properties +++ b/browser/locales/en-US/chrome/browser/browser.properties @@ -128,10 +128,8 @@ lwthemeNeedsRestart.accesskey=R # See: http://developer.mozilla.org/en/docs/Localization_and_Plurals # #1 is brandShortName and #2 is the number of pop-ups blocked. popupWarning.message=#1 prevented this site from opening a pop-up window.;#1 prevented this site from opening #2 pop-up windows. -popupWarningButton=Options -popupWarningButton.accesskey=O -popupWarningButtonUnix=Preferences -popupWarningButtonUnix.accesskey=P +popupWarningButton=Preferences +popupWarningButton.accesskey=P popupAllow=Allow pop-ups for %S popupBlock=Block pop-ups for %S popupWarningDontShowFromMessage=Don’t show this message when pop-ups are blocked diff --git a/browser/locales/en-US/chrome/browser/customizableui/customizableWidgets.properties b/browser/locales/en-US/chrome/browser/customizableui/customizableWidgets.properties index a467aef69..a68f59fe3 100644 --- a/browser/locales/en-US/chrome/browser/customizableui/customizableWidgets.properties +++ b/browser/locales/en-US/chrome/browser/customizableui/customizableWidgets.properties @@ -39,10 +39,6 @@ add-ons-button.tooltiptext3 = Manage your add-ons (%S) preferences-button.label = Preferences preferences-button.tooltiptext2 = Open preferences preferences-button.tooltiptext.withshortcut = Open preferences (%S) -# LOCALIZATION NOTE (preferences-button.labelWin): Windows-only label for Options -preferences-button.labelWin = Options -# LOCALIZATION NOTE (preferences-button.tooltipWin): Windows-only tooltip for Options -preferences-button.tooltipWin2 = Open options zoom-controls.label = Zoom Controls zoom-controls.tooltiptext2 = Zoom controls diff --git a/browser/locales/en-US/chrome/browser/migration/migration.dtd b/browser/locales/en-US/chrome/browser/migration/migration.dtd index df6938c51..ad9293a5d 100644 --- a/browser/locales/en-US/chrome/browser/migration/migration.dtd +++ b/browser/locales/en-US/chrome/browser/migration/migration.dtd @@ -5,8 +5,7 @@ - - + diff --git a/browser/locales/en-US/chrome/browser/preferences/preferences.dtd b/browser/locales/en-US/chrome/browser/preferences/preferences.dtd index 380da7178..7702c8c51 100644 --- a/browser/locales/en-US/chrome/browser/preferences/preferences.dtd +++ b/browser/locales/en-US/chrome/browser/preferences/preferences.dtd @@ -3,7 +3,6 @@ - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> - diff --git a/browser/locales/en-US/chrome/browser/syncCustomize.dtd b/browser/locales/en-US/chrome/browser/syncCustomize.dtd index 3375c48ce..e59d1db25 100644 --- a/browser/locales/en-US/chrome/browser/syncCustomize.dtd +++ b/browser/locales/en-US/chrome/browser/syncCustomize.dtd @@ -6,8 +6,7 @@ - - + - + -- cgit v1.2.3 From 3cdef72da397f3878dfb24a91281ddeaf0eece37 Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Mon, 1 Jan 2018 05:33:04 +0100 Subject: Chase the fox out of the shell service. "Welcome to branding hell, boys!" Part 2 for #271. --- browser/components/shell/ShellService.jsm | 4 ++-- browser/components/shell/nsGNOMEShellService.cpp | 2 +- browser/components/shell/nsWindowsShellService.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'browser') diff --git a/browser/components/shell/ShellService.jsm b/browser/components/shell/ShellService.jsm index 2a3400b60..cc225eae0 100644 --- a/browser/components/shell/ShellService.jsm +++ b/browser/components/shell/ShellService.jsm @@ -62,10 +62,10 @@ let ShellServiceInternal = { if (AppConstants.platform == "win") { let optOutValue = WindowsRegistry.readRegKey(Ci.nsIWindowsRegKey.ROOT_KEY_CURRENT_USER, - "Software\\Mozilla\\Firefox", + "Software\\Mozilla\\Basilisk", "DefaultBrowserOptOut"); WindowsRegistry.removeRegKey(Ci.nsIWindowsRegKey.ROOT_KEY_CURRENT_USER, - "Software\\Mozilla\\Firefox", + "Software\\Mozilla\\Basilisk", "DefaultBrowserOptOut"); if (optOutValue == "True") { Services.prefs.setBoolPref("browser.shell.checkDefaultBrowser", false); diff --git a/browser/components/shell/nsGNOMEShellService.cpp b/browser/components/shell/nsGNOMEShellService.cpp index 1001a52ae..613b5bffc 100644 --- a/browser/components/shell/nsGNOMEShellService.cpp +++ b/browser/components/shell/nsGNOMEShellService.cpp @@ -451,7 +451,7 @@ nsGNOMEShellService::SetDesktopBackground(nsIDOMElement* aElement, // Set the image to an empty string first to force a refresh // (since we could be writing a new image on top of an existing - // Firefox_wallpaper.png and nautilus doesn't monitor the file for changes) + // Basilisk_wallpaper.png and nautilus doesn't monitor the file for changes) gconf->SetString(NS_LITERAL_CSTRING(kDesktopImageKey), EmptyCString()); diff --git a/browser/components/shell/nsWindowsShellService.cpp b/browser/components/shell/nsWindowsShellService.cpp index 6c43d95db..cb13c0910 100644 --- a/browser/components/shell/nsWindowsShellService.cpp +++ b/browser/components/shell/nsWindowsShellService.cpp @@ -135,7 +135,7 @@ OpenKeyForReading(HKEY aKeyRoot, const nsAString& aKeyName, HKEY* aKey) // The following keys are set to make Basilisk appear in the Start Menu as the // browser: // -// HKCU\SOFTWARE\Clients\StartMenuInternet\FIREFOX.EXE\ +// HKCU\SOFTWARE\Clients\StartMenuInternet\BASILISK.EXE\ // (default) REG_SZ // DefaultIcon (default) REG_SZ ,0 // InstallInfo HideIconsCommand REG_SZ /HideShortcuts -- cgit v1.2.3 From 20b6d5e9c0582fadeb8fa76d46cda14a190ca1a1 Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Mon, 1 Jan 2018 15:27:57 +0100 Subject: Add an option to control automatic filling in of login credentials and switch this off by default. This resolves #272. --- browser/components/preferences/in-content/security.xul | 4 ++++ browser/locales/en-US/chrome/browser/preferences/security.dtd | 3 +++ 2 files changed, 7 insertions(+) (limited to 'browser') diff --git a/browser/components/preferences/in-content/security.xul b/browser/components/preferences/in-content/security.xul index a10576c25..b7bdb9361 100644 --- a/browser/components/preferences/in-content/security.xul +++ b/browser/components/preferences/in-content/security.xul @@ -45,6 +45,7 @@ + @@ -103,6 +104,9 @@ accesskey="&passwordExceptions.accesskey;" preference="pref.privacy.disable_button.view_passwords_exceptions"/> + diff --git a/browser/locales/en-US/chrome/browser/preferences/security.dtd b/browser/locales/en-US/chrome/browser/preferences/security.dtd index ca9420401..7ccc9af50 100644 --- a/browser/locales/en-US/chrome/browser/preferences/security.dtd +++ b/browser/locales/en-US/chrome/browser/preferences/security.dtd @@ -31,6 +31,9 @@ + + + -- cgit v1.2.3 From afb673f1b21279c0b2dbe79cd8d738b029e6f376 Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Fri, 5 Jan 2018 11:55:12 +0100 Subject: Fix installer build bustage. Follow-up to cdef1d75eabfe6927aa0f4e0c18869653c9f1955 --- browser/installer/windows/Makefile.in | 3 --- 1 file changed, 3 deletions(-) (limited to 'browser') diff --git a/browser/installer/windows/Makefile.in b/browser/installer/windows/Makefile.in index fa6fd5ba9..acd7176cc 100644 --- a/browser/installer/windows/Makefile.in +++ b/browser/installer/windows/Makefile.in @@ -90,9 +90,6 @@ $(CONFIG_DIR)/setup.exe:: --preprocess-single-file $(topsrcdir) \ $(PPL_LOCALE_ARGS) $(CONFIG_DIR) \ nsisstrings.properties nsisstrings.nlf - $(PYTHON) $(topsrcdir)/toolkit/mozapps/installer/windows/nsis/preprocess-locale.py \ - --convert-utf8-utf16le \ - $(srcdir)/nsis/oneoff_en-US.nsh $(CONFIG_DIR)/oneoff_en-US.nsh GARBARGE_DIRS += instgen -- cgit v1.2.3 From aa752bce480514310b04a8cb05fe0faa9de85a5c Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Thu, 23 Nov 2017 17:52:48 +0100 Subject: Update names in installer defines. Having the proper `WindowClass` should resolve #170. --- browser/installer/windows/nsis/defines.nsi.in | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'browser') diff --git a/browser/installer/windows/nsis/defines.nsi.in b/browser/installer/windows/nsis/defines.nsi.in index ffb23ff1c..c52b67bcb 100644 --- a/browser/installer/windows/nsis/defines.nsi.in +++ b/browser/installer/windows/nsis/defines.nsi.in @@ -21,15 +21,15 @@ !endif # These defines should match application.ini settings -!define AppName "Firefox" +!define AppName "Basilisk" !define AppVersion "@APP_VERSION@" !define GREVersion @MOZILLA_VERSION@ !define AB_CD "@AB_CD@" !define FileMainEXE "@MOZ_APP_NAME@.exe" -!define WindowClass "FirefoxMessageWindow" -!define DDEApplication "Firefox" -!define AppRegName "Firefox" +!define WindowClass "BasiliskMessageWindow" +!define DDEApplication "Basilisk" +!define AppRegName "Basilisk" !ifndef DEV_EDITION !define BrandShortName "@MOZ_APP_DISPLAYNAME@" @@ -85,7 +85,7 @@ VIProductVersion "1.0.0.0" VIAddVersionKey "ProductName" "${BrandShortName}" VIAddVersionKey "CompanyName" "${CompanyName}" #ifdef MOZ_OFFICIAL_BRANDING -VIAddVersionKey "LegalTrademarks" "${BrandShortName} is a Trademark of The Mozilla Foundation." +VIAddVersionKey "LegalTrademarks" "${BrandShortName} is a Trademark of Moonchild Productions." #endif VIAddVersionKey "LegalCopyright" "${CompanyName}" VIAddVersionKey "FileVersion" "${AppVersion}" -- cgit v1.2.3 From b6c330e1ca4baff6c98bfa94b8c3855d5afbc7cb Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Sun, 18 Feb 2018 12:43:22 +0100 Subject: Stop shipping d3dcompiler_43.dll --- browser/config/mozconfigs/win32/common-opt | 1 - browser/config/mozconfigs/win32/debug | 1 - browser/installer/Makefile.in | 3 --- browser/installer/package-manifest.in | 4 ---- 4 files changed, 9 deletions(-) (limited to 'browser') diff --git a/browser/config/mozconfigs/win32/common-opt b/browser/config/mozconfigs/win32/common-opt index d43a9878b..816c8926a 100644 --- a/browser/config/mozconfigs/win32/common-opt +++ b/browser/config/mozconfigs/win32/common-opt @@ -4,7 +4,6 @@ ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL} ac_add_options --enable-jemalloc -ac_add_options --enable-require-all-d3dc-versions if [ -f /c/builds/gapi.data ]; then _gapi_keyfile=c:/builds/gapi.data diff --git a/browser/config/mozconfigs/win32/debug b/browser/config/mozconfigs/win32/debug index 6beee93c2..815276d0f 100644 --- a/browser/config/mozconfigs/win32/debug +++ b/browser/config/mozconfigs/win32/debug @@ -6,7 +6,6 @@ ac_add_options --enable-debug ac_add_options --enable-dmd ac_add_options --enable-profiling # needed for --enable-dmd to work on Windows ac_add_options --enable-verify-mar -ac_add_options --enable-require-all-d3dc-versions # Needed to enable breakpad in application.ini export MOZILLA_OFFICIAL=1 diff --git a/browser/installer/Makefile.in b/browser/installer/Makefile.in index 55df797ef..ccfce3cd9 100644 --- a/browser/installer/Makefile.in +++ b/browser/installer/Makefile.in @@ -61,9 +61,6 @@ DEFINES += -DMOZ_ANGLE_RENDERER=$(MOZ_ANGLE_RENDERER) ifdef MOZ_D3DCOMPILER_VISTA_DLL DEFINES += -DMOZ_D3DCOMPILER_VISTA_DLL=$(MOZ_D3DCOMPILER_VISTA_DLL) endif -ifdef MOZ_D3DCOMPILER_XP_DLL -DEFINES += -DMOZ_D3DCOMPILER_XP_DLL=$(MOZ_D3DCOMPILER_XP_DLL) -endif endif DEFINES += -DMOZ_CHILD_PROCESS_NAME=$(MOZ_CHILD_PROCESS_NAME) diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in index bddca2f29..c2269c069 100644 --- a/browser/installer/package-manifest.in +++ b/browser/installer/package-manifest.in @@ -607,10 +607,6 @@ #ifdef MOZ_D3DCOMPILER_VISTA_DLL @BINPATH@/@MOZ_D3DCOMPILER_VISTA_DLL@ #endif - -#ifdef MOZ_D3DCOMPILER_XP_DLL -@BINPATH@/@MOZ_D3DCOMPILER_XP_DLL@ -#endif #endif # MOZ_ANGLE_RENDERER ; [Browser Chrome Files] -- cgit v1.2.3 From 47b8c58d47bae45d723ef22665e8f13ecc66725f Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Sun, 18 Feb 2018 13:12:13 +0100 Subject: Prevent installing stand-alone installers on unsupported environments. - Prevent installers from installing on XP/Vista. - Prevent x64 installers from installing on x86. --- browser/branding/official/branding.nsi | 2 +- browser/installer/windows/nsis/installer.nsi | 61 +++++----------------- .../windows/nsis/maintenanceservice_installer.nsi | 5 +- 3 files changed, 16 insertions(+), 52 deletions(-) (limited to 'browser') diff --git a/browser/branding/official/branding.nsi b/browser/branding/official/branding.nsi index 24b0f4bba..58d7554df 100644 --- a/browser/branding/official/branding.nsi +++ b/browser/branding/official/branding.nsi @@ -20,7 +20,7 @@ !define OFFICIAL !define URLStubDownload "" !define URLManualDownload "" -!define URLSystemRequirements "" +!define URLSystemRequirements "http://www.basilisk-browser.org/requirements.shtml" !define Channel "release" # The installer's certificate name and issuer expected by the stub installer diff --git a/browser/installer/windows/nsis/installer.nsi b/browser/installer/windows/nsis/installer.nsi index aed5808cd..994c09279 100755 --- a/browser/installer/windows/nsis/installer.nsi +++ b/browser/installer/windows/nsis/installer.nsi @@ -1139,13 +1139,11 @@ Function .onInit ; Don't install on systems that don't support SSE2. The parameter value of ; 10 is for PF_XMMI64_INSTRUCTIONS_AVAILABLE which will check whether the - ; SSE2 instruction set is available. + ; SSE2 instruction set is available. Result returned in $R7. System::Call "kernel32::IsProcessorFeaturePresent(i 10)i .R7" -!ifdef HAVE_64BIT_BUILD - ; Restrict x64 builds from being installed on x86 and pre Win7 - ${Unless} ${RunningX64} - ${OrUnless} ${AtLeastWin7} + ; Windows NT 6.0 and lower are not supported on any architecture. + ${Unless} ${AtLeastWin7} ${If} "$R7" == "0" strCpy $R7 "$(WARN_MIN_SUPPORTED_OSVER_CPU_MSG)" ${Else} @@ -1156,59 +1154,28 @@ Function .onInit Quit ${EndUnless} - SetRegView 64 -!else - StrCpy $R8 "0" - ${If} ${AtMostWin2000} - StrCpy $R8 "1" - ${EndIf} - - ${If} ${IsWinXP} - ${AndIf} ${AtMostServicePack} 1 - StrCpy $R8 "1" - ${EndIf} - - ${If} $R8 == "1" - ; XXX-rstrong - some systems failed the AtLeastWin2000 test that we - ; used to use for an unknown reason and likely fail the AtMostWin2000 - ; and possibly the IsWinXP test as well. To work around this also - ; check if the Windows NT registry Key exists and if it does if the - ; first char in CurrentVersion is equal to 3 (Windows NT 3.5 and - ; 3.5.1), 4 (Windows NT 4), or 5 (Windows 2000 and Windows XP). - StrCpy $R8 "" - ClearErrors - ReadRegStr $R8 HKLM "SOFTWARE\Microsoft\Windows NT\CurrentVersion" "CurrentVersion" - StrCpy $R8 "$R8" 1 - ${If} ${Errors} - ${OrIf} "$R8" == "3" - ${OrIf} "$R8" == "4" - ${OrIf} "$R8" == "5" - ${If} "$R7" == "0" - strCpy $R7 "$(WARN_MIN_SUPPORTED_OSVER_CPU_MSG)" - ${Else} - strCpy $R7 "$(WARN_MIN_SUPPORTED_OSVER_MSG)" - ${EndIf} - MessageBox MB_OKCANCEL|MB_ICONSTOP "$R7" IDCANCEL +2 - ExecShell "open" "${URLSystemRequirements}" - Quit - ${EndIf} - ${EndUnless} -!endif - + ; SSE2 support ${If} "$R7" == "0" MessageBox MB_OKCANCEL|MB_ICONSTOP "$(WARN_MIN_SUPPORTED_CPU_MSG)" IDCANCEL +2 ExecShell "open" "${URLSystemRequirements}" Quit ${EndIf} +!ifdef HAVE_64BIT_BUILD + ${Unless} ${RunningX64} + MessageBox MB_OKCANCEL|MB_ICONSTOP "$(WARN_MIN_SUPPORTED_OSVER_MSG)" IDCANCEL +2 + ExecShell "open" "${URLSystemRequirements}" + Quit + ${EndUnless} + SetRegView 64 +!endif + ${InstallOnInitCommon} "$(WARN_MIN_SUPPORTED_OSVER_CPU_MSG)" ; The commands inside this ifndef are needed prior to NSIS 3.0a2 and can be ; removed after we require NSIS 3.0a2 or greater. !ifndef NSIS_PACKEDVERSION - ${If} ${AtLeastWinVista} - System::Call 'user32::SetProcessDPIAware()' - ${EndIf} + System::Call 'user32::SetProcessDPIAware()' !endif !insertmacro InitInstallOptionsFile "options.ini" diff --git a/browser/installer/windows/nsis/maintenanceservice_installer.nsi b/browser/installer/windows/nsis/maintenanceservice_installer.nsi index 4bc9d2bed..1f73bac6a 100644 --- a/browser/installer/windows/nsis/maintenanceservice_installer.nsi +++ b/browser/installer/windows/nsis/maintenanceservice_installer.nsi @@ -120,10 +120,7 @@ Function .onInit SetSilent silent - ; On Windows 2000 we do not install the maintenance service. - ; We won't run this installer from the parent installer, but just in case - ; someone tries to execute it on Windows 2000... - ${Unless} ${AtLeastWinXP} + ${Unless} ${AtLeastWin7} Abort ${EndUnless} FunctionEnd -- cgit v1.2.3 From 4f82d71df070e813927893fc20aa7954fbae997d Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Mon, 19 Feb 2018 16:28:18 +0100 Subject: Remove Windows shell integration checks for Windows Vista. Tag #22. --- browser/components/shell/nsWindowsShellService.cpp | 5 ----- 1 file changed, 5 deletions(-) (limited to 'browser') diff --git a/browser/components/shell/nsWindowsShellService.cpp b/browser/components/shell/nsWindowsShellService.cpp index cb13c0910..879b0c7f0 100644 --- a/browser/components/shell/nsWindowsShellService.cpp +++ b/browser/components/shell/nsWindowsShellService.cpp @@ -648,11 +648,6 @@ nsWindowsShellService::LaunchControlPanelDefaultsSelectionUI() nsresult nsWindowsShellService::LaunchControlPanelDefaultPrograms() { - // This Default Programs feature is Win7+ only. - if (!IsWin7OrLater()) { - return NS_ERROR_FAILURE; - } - // Build the path control.exe path safely WCHAR controlEXEPath[MAX_PATH + 1] = { '\0' }; if (!GetSystemDirectoryW(controlEXEPath, MAX_PATH)) { -- cgit v1.2.3 From da8f20a3b05387aaa1c7c81543f1aae6dd1ca99d Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Mon, 19 Feb 2018 20:04:11 +0100 Subject: Remove some obsolete front-end code in Basilisk. --- browser/base/content/browser-media.js | 15 +-------------- browser/base/content/browser.js | 8 -------- browser/base/content/browser.xul | 2 -- browser/base/content/tabbrowser.xml | 19 ------------------- browser/base/content/win6BrowserOverlay.xul | 12 ------------ browser/base/jar.mn | 6 ------ browser/components/customizableui/CustomizableUI.jsm | 14 ++------------ .../locales/en-US/chrome/browser/browser.properties | 3 --- 8 files changed, 3 insertions(+), 76 deletions(-) delete mode 100644 browser/base/content/win6BrowserOverlay.xul (limited to 'browser') diff --git a/browser/base/content/browser-media.js b/browser/base/content/browser-media.js index 81e7faf17..a013dbd8a 100644 --- a/browser/base/content/browser-media.js +++ b/browser/base/content/browser-media.js @@ -201,29 +201,16 @@ let gDecoderDoctorHandler = { getLabelForNotificationBox(type) { if (type == "adobe-cdm-not-found" && AppConstants.platform == "win") { - if (AppConstants.isPlatformAndVersionAtMost("win", "5.9")) { - // We supply our own Learn More button so we don't need to populate the message here. - return gNavigatorBundle.getFormattedString("emeNotifications.drmContentDisabled.message", [""]); - } return gNavigatorBundle.getString("decoder.noCodecs.message"); } if (type == "adobe-cdm-not-activated" && AppConstants.platform == "win") { - if (AppConstants.isPlatformAndVersionAtMost("win", "5.9")) { - return gNavigatorBundle.getString("decoder.noCodecsXP.message"); - } - if (!AppConstants.isPlatformAndVersionAtLeast("win", "6.1")) { - return gNavigatorBundle.getString("decoder.noCodecsVista.message"); - } return gNavigatorBundle.getString("decoder.noCodecs.message"); } if (type == "platform-decoder-not-found") { - if (AppConstants.isPlatformAndVersionAtLeast("win", "6.1")) { + if (AppConstants.platform == "win") { return gNavigatorBundle.getString("decoder.noHWAcceleration.message"); } - if (AppConstants.isPlatformAndVersionAtLeast("win", "6")) { - return gNavigatorBundle.getString("decoder.noHWAccelerationVista.message"); - } if (AppConstants.platform == "linux") { return gNavigatorBundle.getString("decoder.noCodecsLinux.message"); } diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js index 9ccd86b12..910dc4f68 100755 --- a/browser/base/content/browser.js +++ b/browser/base/content/browser.js @@ -97,11 +97,6 @@ XPCOMUtils.defineLazyGetter(this, "gCustomizeMode", function() { return new scope.CustomizeMode(window); }); -XPCOMUtils.defineLazyGetter(window, "gShowPageResizers", function () { - // Only show resizers on Windows 2000 and XP - return AppConstants.isPlatformAndVersionAtMost("win", "5.9"); -}); - XPCOMUtils.defineLazyGetter(this, "gPrefService", function() { return Services.prefs; }); @@ -3372,8 +3367,6 @@ var PrintPreviewListener = { this._chromeState.notificationsOpen = !notificationBox.notificationsHidden; notificationBox.notificationsHidden = true; - gBrowser.updateWindowResizers(); - this._chromeState.findOpen = gFindBarInitialized && !gFindBar.hidden; if (gFindBarInitialized) gFindBar.close(); @@ -5222,7 +5215,6 @@ function setToolbarVisibility(toolbar, isVisible, persist=true) { PlacesToolbarHelper.init(); BookmarkingUI.onToolbarVisibilityChange(); - gBrowser.updateWindowResizers(); if (isVisible) ToolbarIconColor.inferFromText(); } diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul index 2c74aecdf..be17fb0e2 100644 --- a/browser/base/content/browser.xul +++ b/browser/base/content/browser.xul @@ -546,9 +546,7 @@ #ifdef MENUBAR_CAN_AUTOHIDE toolbarname="&menubarCmd.label;" accesskey="&menubarCmd.accesskey;" -#if defined(MOZ_WIDGET_GTK) autohide="true" -#endif #endif context="toolbar-context-menu"> diff --git a/browser/base/content/tabbrowser.xml b/browser/base/content/tabbrowser.xml index 3f4c3518e..0cb0f3bd6 100644 --- a/browser/base/content/tabbrowser.xml +++ b/browser/base/content/tabbrowser.xml @@ -214,18 +214,6 @@ ]]> - - - - - - - - - - - diff --git a/browser/base/jar.mn b/browser/base/jar.mn index 60f1facc0..3fa5ea408 100644 --- a/browser/base/jar.mn +++ b/browser/base/jar.mn @@ -8,9 +8,6 @@ browser.jar: % overlay chrome://mozapps/content/update/updates.xul chrome://browser/content/softwareUpdateOverlay.xul % overlay chrome://global/content/console.xul chrome://browser/content/jsConsoleOverlay.xul #endif -#ifdef XP_WIN -% overlay chrome://browser/content/browser.xul chrome://browser/content/win6BrowserOverlay.xul os=WINNT osversion>=6 -#endif % overlay chrome://global/content/viewSource.xul chrome://browser/content/viewSourceOverlay.xul % overlay chrome://global/content/viewPartialSource.xul chrome://browser/content/viewSourceOverlay.xul @@ -186,9 +183,6 @@ browser.jar: * content/browser/webrtcIndicator.xul (content/webrtcIndicator.xul) content/browser/webrtcIndicator.js (content/webrtcIndicator.js) #endif -#ifdef XP_WIN - content/browser/win6BrowserOverlay.xul (content/win6BrowserOverlay.xul) -#endif # the following files are browser-specific overrides * content/browser/license.html (/toolkit/content/license.html) % override chrome://global/content/license.html chrome://browser/content/license.html diff --git a/browser/components/customizableui/CustomizableUI.jsm b/browser/components/customizableui/CustomizableUI.jsm index 86ff2708b..01389108d 100644 --- a/browser/components/customizableui/CustomizableUI.jsm +++ b/browser/components/customizableui/CustomizableUI.jsm @@ -262,24 +262,14 @@ var CustomizableUIInternal = { defaultCollapsed: false, }, true); - if (AppConstants.platform != "macosx") { + if (AppConstants.MENUBAR_CAN_AUTOHIDE) { this.registerArea(CustomizableUI.AREA_MENUBAR, { legacy: true, type: CustomizableUI.TYPE_TOOLBAR, defaultPlacements: [ "menubar-items", ], - get defaultCollapsed() { - if (AppConstants.MENUBAR_CAN_AUTOHIDE) { - if (AppConstants.platform == "linux") { - return true; - } - // This is duplicated logic from /browser/base/jar.mn - // for win6BrowserOverlay.xul. - return AppConstants.isPlatformAndVersionAtLeast("win", 6); - } - return false; - } + defaultCollapsed: true, }, true); } diff --git a/browser/locales/en-US/chrome/browser/browser.properties b/browser/locales/en-US/chrome/browser/browser.properties index 1947a3c90..6f3aab397 100644 --- a/browser/locales/en-US/chrome/browser/browser.properties +++ b/browser/locales/en-US/chrome/browser/browser.properties @@ -731,11 +731,8 @@ pendingCrashReports.alwaysSend = Always Send decoder.noCodecs.button = Learn how decoder.noCodecs.accesskey = L decoder.noCodecs.message = To play video, you may need to install Microsoft’s Media Feature Pack. -decoder.noCodecsVista.message = To play video, you may need to install Microsoft’s Platform Update Supplement for Windows Vista. -decoder.noCodecsXP.message = To play video, you may need to enable Adobe’s Primetime Content Decryption Module. decoder.noCodecsLinux.message = To play video, you may need to install the required video codecs. decoder.noHWAcceleration.message = To improve video quality, you may need to install Microsoft’s Media Feature Pack. -decoder.noHWAccelerationVista.message = To improve video quality, you may need to install Microsoft’s Platform Update Supplement for Windows Vista. decoder.noPulseAudio.message = To play audio, you may need to install the required PulseAudio software. decoder.unsupportedLibavcodec.message = libavcodec may be vulnerable or is not supported, and should be updated to play video. -- cgit v1.2.3 From fd9d8c20d21f527d99bf9ce3d3f0f25f85fb029c Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Tue, 20 Feb 2018 12:49:23 +0100 Subject: Remove Windows XP and Windows Vista theme components and resources. --- browser/installer/allowed-dupes.mn | 4 +- browser/themes/windows/Info-XP.png | Bin 590 -> 0 bytes browser/themes/windows/Privacy-16-XP.png | Bin 799 -> 0 bytes browser/themes/windows/Toolbar-XP.png | Bin 19638 -> 0 bytes browser/themes/windows/Toolbar-aero.png | Bin 18276 -> 0 bytes browser/themes/windows/Toolbar-aero@2x.png | Bin 47581 -> 0 bytes browser/themes/windows/Toolbar-lunaSilver.png | Bin 19034 -> 0 bytes browser/themes/windows/Toolbar-win7.png | Bin 0 -> 18276 bytes browser/themes/windows/Toolbar-win7@2x.png | Bin 0 -> 47581 bytes browser/themes/windows/actionicon-tab-XPVista7.png | Bin 421 -> 0 bytes browser/themes/windows/actionicon-tab-win7.png | Bin 0 -> 421 bytes browser/themes/windows/browser-aero.css | 17 +- browser/themes/windows/browser.css | 193 ++++----------------- browser/themes/windows/customizableui/panelUI.css | 26 ++- browser/themes/windows/devedition.css | 9 +- .../windows/downloads/allDownloadsViewOverlay.css | 52 +++--- .../windows/downloads/download-glow-XPVista7.png | Bin 494 -> 0 bytes .../downloads/download-glow-menuPanel-XPVista7.png | Bin 893 -> 0 bytes .../downloads/download-glow-menuPanel-win7.png | Bin 0 -> 893 bytes .../windows/downloads/download-glow-win7.png | Bin 0 -> 494 bytes browser/themes/windows/downloads/indicator.css | 8 +- browser/themes/windows/feeds/feedIcon-XP.png | Bin 1770 -> 0 bytes browser/themes/windows/feeds/feedIcon16-XP.png | Bin 762 -> 0 bytes browser/themes/windows/jar.mn | 137 +++++---------- browser/themes/windows/livemark-folder-XP.png | Bin 667 -> 0 bytes browser/themes/windows/menu-back-XP.png | Bin 341 -> 0 bytes browser/themes/windows/menu-forward-XP.png | Bin 342 -> 0 bytes browser/themes/windows/pageInfo-XP.png | Bin 7739 -> 0 bytes browser/themes/windows/places/allBookmarks-XP.png | Bin 504 -> 0 bytes .../windows/places/autocomplete-star-XPVista7.png | Bin 813 -> 0 bytes .../windows/places/autocomplete-star-win7.png | Bin 0 -> 813 bytes browser/themes/windows/places/bookmarksMenu-XP.png | Bin 334 -> 0 bytes .../themes/windows/places/bookmarksToolbar-XP.png | Bin 229 -> 0 bytes .../places/bookmarksToolbar-menuPanel-XP.png | Bin 689 -> 0 bytes browser/themes/windows/places/calendar-XP.png | Bin 559 -> 0 bytes browser/themes/windows/places/history-XP.png | Bin 821 -> 0 bytes .../themes/windows/places/libraryToolbar-XP.png | Bin 2037 -> 0 bytes browser/themes/windows/places/organizer.css | 58 ++----- browser/themes/windows/places/places.css | 18 +- browser/themes/windows/places/query-XP.png | Bin 612 -> 0 bytes browser/themes/windows/places/starred48-XP.png | Bin 1848 -> 0 bytes browser/themes/windows/places/tag-XP.png | Bin 480 -> 0 bytes .../themes/windows/places/toolbarDropMarker-XP.png | Bin 219 -> 0 bytes .../themes/windows/places/unsortedBookmarks-XP.png | Bin 712 -> 0 bytes .../themes/windows/preferences/alwaysAsk-XP.png | Bin 408 -> 0 bytes .../themes/windows/preferences/application-XP.png | Bin 388 -> 0 bytes browser/themes/windows/preferences/saveFile-XP.png | Bin 740 -> 0 bytes .../privatebrowsing-mask-tabstrip-XPVista7.png | Bin 949 -> 0 bytes .../windows/privatebrowsing-mask-tabstrip-win7.png | Bin 0 -> 949 bytes ...privatebrowsing-mask-titlebar-XPVista7-tall.png | Bin 940 -> 0 bytes .../privatebrowsing-mask-titlebar-XPVista7.png | Bin 860 -> 0 bytes .../privatebrowsing-mask-titlebar-win7-tall.png | Bin 0 -> 940 bytes .../windows/privatebrowsing-mask-titlebar-win7.png | Bin 0 -> 860 bytes browser/themes/windows/reload-stop-go-XPVista7.png | Bin 1944 -> 0 bytes .../themes/windows/reload-stop-go-XPVista7@2x.png | Bin 3661 -> 0 bytes browser/themes/windows/reload-stop-go-win7.png | Bin 0 -> 1944 bytes browser/themes/windows/reload-stop-go-win7@2x.png | Bin 0 -> 3661 bytes .../themes/windows/sync-horizontalbar-XPVista7.png | Bin 719 -> 0 bytes .../windows/sync-horizontalbar-XPVista7@2x.png | Bin 1702 -> 0 bytes browser/themes/windows/sync-horizontalbar-win7.png | Bin 0 -> 719 bytes .../themes/windows/sync-horizontalbar-win7@2x.png | Bin 0 -> 1702 bytes .../syncProgress-horizontalbar-XPVista7.png | Bin 11892 -> 0 bytes .../syncProgress-horizontalbar-XPVista7@2x.png | Bin 27608 -> 0 bytes .../windows/syncProgress-horizontalbar-win7.png | Bin 0 -> 11892 bytes .../windows/syncProgress-horizontalbar-win7@2x.png | Bin 0 -> 27608 bytes .../windows/syncProgress-toolbar-XPVista7.png | Bin 13293 -> 0 bytes .../windows/syncProgress-toolbar-XPVista7@2x.png | Bin 33662 -> 0 bytes .../themes/windows/syncProgress-toolbar-win7.png | Bin 0 -> 13293 bytes .../windows/syncProgress-toolbar-win7@2x.png | Bin 0 -> 33662 bytes .../themes/windows/tabbrowser/newtab-XPVista7.svg | 16 -- .../tabbrowser/newtab-inverted-XPVista7.svg | 13 -- .../windows/tabbrowser/newtab-inverted-win7.svg | 13 ++ browser/themes/windows/tabbrowser/newtab-win7.svg | 16 ++ .../windows/tabbrowser/tab-arrow-left-XPVista7.svg | 13 -- .../windows/tabbrowser/tab-arrow-left-win7.svg | 13 ++ .../toolbarbutton-dropdown-arrow-XPVista7.png | Bin 208 -> 0 bytes .../windows/toolbarbutton-dropdown-arrow-win7.png | Bin 0 -> 208 bytes .../windows/urlbar-history-dropmarker-XPVista7.png | Bin 479 -> 0 bytes .../urlbar-history-dropmarker-XPVista7@2x.png | Bin 788 -> 0 bytes .../windows/urlbar-history-dropmarker-win7.png | Bin 0 -> 479 bytes .../windows/urlbar-history-dropmarker-win7@2x.png | Bin 0 -> 788 bytes browser/themes/windows/windowsShared.inc | 2 - 82 files changed, 194 insertions(+), 414 deletions(-) delete mode 100644 browser/themes/windows/Info-XP.png delete mode 100644 browser/themes/windows/Privacy-16-XP.png delete mode 100644 browser/themes/windows/Toolbar-XP.png delete mode 100644 browser/themes/windows/Toolbar-aero.png delete mode 100644 browser/themes/windows/Toolbar-aero@2x.png delete mode 100644 browser/themes/windows/Toolbar-lunaSilver.png create mode 100644 browser/themes/windows/Toolbar-win7.png create mode 100644 browser/themes/windows/Toolbar-win7@2x.png delete mode 100644 browser/themes/windows/actionicon-tab-XPVista7.png create mode 100644 browser/themes/windows/actionicon-tab-win7.png delete mode 100644 browser/themes/windows/downloads/download-glow-XPVista7.png delete mode 100644 browser/themes/windows/downloads/download-glow-menuPanel-XPVista7.png create mode 100644 browser/themes/windows/downloads/download-glow-menuPanel-win7.png create mode 100644 browser/themes/windows/downloads/download-glow-win7.png delete mode 100644 browser/themes/windows/feeds/feedIcon-XP.png delete mode 100644 browser/themes/windows/feeds/feedIcon16-XP.png delete mode 100644 browser/themes/windows/livemark-folder-XP.png delete mode 100644 browser/themes/windows/menu-back-XP.png delete mode 100644 browser/themes/windows/menu-forward-XP.png delete mode 100644 browser/themes/windows/pageInfo-XP.png delete mode 100644 browser/themes/windows/places/allBookmarks-XP.png delete mode 100644 browser/themes/windows/places/autocomplete-star-XPVista7.png create mode 100644 browser/themes/windows/places/autocomplete-star-win7.png delete mode 100644 browser/themes/windows/places/bookmarksMenu-XP.png delete mode 100644 browser/themes/windows/places/bookmarksToolbar-XP.png delete mode 100644 browser/themes/windows/places/bookmarksToolbar-menuPanel-XP.png delete mode 100644 browser/themes/windows/places/calendar-XP.png delete mode 100644 browser/themes/windows/places/history-XP.png delete mode 100644 browser/themes/windows/places/libraryToolbar-XP.png delete mode 100644 browser/themes/windows/places/query-XP.png delete mode 100644 browser/themes/windows/places/starred48-XP.png delete mode 100644 browser/themes/windows/places/tag-XP.png delete mode 100644 browser/themes/windows/places/toolbarDropMarker-XP.png delete mode 100644 browser/themes/windows/places/unsortedBookmarks-XP.png delete mode 100644 browser/themes/windows/preferences/alwaysAsk-XP.png delete mode 100644 browser/themes/windows/preferences/application-XP.png delete mode 100644 browser/themes/windows/preferences/saveFile-XP.png delete mode 100644 browser/themes/windows/privatebrowsing-mask-tabstrip-XPVista7.png create mode 100644 browser/themes/windows/privatebrowsing-mask-tabstrip-win7.png delete mode 100644 browser/themes/windows/privatebrowsing-mask-titlebar-XPVista7-tall.png delete mode 100644 browser/themes/windows/privatebrowsing-mask-titlebar-XPVista7.png create mode 100644 browser/themes/windows/privatebrowsing-mask-titlebar-win7-tall.png create mode 100644 browser/themes/windows/privatebrowsing-mask-titlebar-win7.png delete mode 100644 browser/themes/windows/reload-stop-go-XPVista7.png delete mode 100644 browser/themes/windows/reload-stop-go-XPVista7@2x.png create mode 100644 browser/themes/windows/reload-stop-go-win7.png create mode 100644 browser/themes/windows/reload-stop-go-win7@2x.png delete mode 100644 browser/themes/windows/sync-horizontalbar-XPVista7.png delete mode 100644 browser/themes/windows/sync-horizontalbar-XPVista7@2x.png create mode 100644 browser/themes/windows/sync-horizontalbar-win7.png create mode 100644 browser/themes/windows/sync-horizontalbar-win7@2x.png delete mode 100644 browser/themes/windows/syncProgress-horizontalbar-XPVista7.png delete mode 100644 browser/themes/windows/syncProgress-horizontalbar-XPVista7@2x.png create mode 100644 browser/themes/windows/syncProgress-horizontalbar-win7.png create mode 100644 browser/themes/windows/syncProgress-horizontalbar-win7@2x.png delete mode 100644 browser/themes/windows/syncProgress-toolbar-XPVista7.png delete mode 100644 browser/themes/windows/syncProgress-toolbar-XPVista7@2x.png create mode 100644 browser/themes/windows/syncProgress-toolbar-win7.png create mode 100644 browser/themes/windows/syncProgress-toolbar-win7@2x.png delete mode 100644 browser/themes/windows/tabbrowser/newtab-XPVista7.svg delete mode 100644 browser/themes/windows/tabbrowser/newtab-inverted-XPVista7.svg create mode 100644 browser/themes/windows/tabbrowser/newtab-inverted-win7.svg create mode 100644 browser/themes/windows/tabbrowser/newtab-win7.svg delete mode 100644 browser/themes/windows/tabbrowser/tab-arrow-left-XPVista7.svg create mode 100644 browser/themes/windows/tabbrowser/tab-arrow-left-win7.svg delete mode 100644 browser/themes/windows/toolbarbutton-dropdown-arrow-XPVista7.png create mode 100644 browser/themes/windows/toolbarbutton-dropdown-arrow-win7.png delete mode 100644 browser/themes/windows/urlbar-history-dropmarker-XPVista7.png delete mode 100644 browser/themes/windows/urlbar-history-dropmarker-XPVista7@2x.png create mode 100644 browser/themes/windows/urlbar-history-dropmarker-win7.png create mode 100644 browser/themes/windows/urlbar-history-dropmarker-win7@2x.png (limited to 'browser') diff --git a/browser/installer/allowed-dupes.mn b/browser/installer/allowed-dupes.mn index 366842598..7baa6ebed 100644 --- a/browser/installer/allowed-dupes.mn +++ b/browser/installer/allowed-dupes.mn @@ -171,7 +171,7 @@ chrome/toolkit/skin/classic/global/dialog.css chrome/toolkit/skin/classic/global/dropmarker.css chrome/toolkit/skin/classic/global/global.css chrome/toolkit/skin/classic/global/groupbox.css -chrome/toolkit/skin/classic/global/icons/close-XPVista7.png +chrome/toolkit/skin/classic/global/icons/close-win7.png chrome/toolkit/skin/classic/global/icons/tabprompts-bgtexture.png chrome/toolkit/skin/classic/global/listbox.css chrome/toolkit/skin/classic/global/media/clicktoplay-bgtexture.png @@ -196,7 +196,6 @@ chrome/toolkit/skin/classic/global/toolbarbutton.css chrome/toolkit/skin/classic/global/tree.css chrome/toolkit/skin/classic/global/wizard.css chrome/toolkit/skin/classic/mozapps/downloads/buttons.png -chrome/toolkit/skin/classic/mozapps/downloads/downloadButtons-XP.png chrome/toolkit/skin/classic/mozapps/downloads/downloadButtons.png chrome/toolkit/skin/classic/mozapps/extensions/category-dictionaries.png chrome/toolkit/skin/classic/mozapps/extensions/category-experiments.png @@ -209,7 +208,6 @@ chrome/toolkit/skin/classic/mozapps/extensions/localeGeneric.png chrome/toolkit/skin/classic/mozapps/extensions/category-extensions.png chrome/toolkit/skin/classic/mozapps/extensions/extensionGeneric.png chrome/toolkit/skin/classic/mozapps/update/buttons.png -chrome/toolkit/skin/classic/mozapps/update/downloadButtons-XP.png chrome/toolkit/skin/classic/mozapps/update/downloadButtons.png chrome/toolkit/skin/classic/mozapps/xpinstall/xpinstallItemGeneric.png diff --git a/browser/themes/windows/Info-XP.png b/browser/themes/windows/Info-XP.png deleted file mode 100644 index c20f66ce6..000000000 Binary files a/browser/themes/windows/Info-XP.png and /dev/null differ diff --git a/browser/themes/windows/Privacy-16-XP.png b/browser/themes/windows/Privacy-16-XP.png deleted file mode 100644 index 335febbb3..000000000 Binary files a/browser/themes/windows/Privacy-16-XP.png and /dev/null differ diff --git a/browser/themes/windows/Toolbar-XP.png b/browser/themes/windows/Toolbar-XP.png deleted file mode 100644 index dff60911f..000000000 Binary files a/browser/themes/windows/Toolbar-XP.png and /dev/null differ diff --git a/browser/themes/windows/Toolbar-aero.png b/browser/themes/windows/Toolbar-aero.png deleted file mode 100644 index b191ce2aa..000000000 Binary files a/browser/themes/windows/Toolbar-aero.png and /dev/null differ diff --git a/browser/themes/windows/Toolbar-aero@2x.png b/browser/themes/windows/Toolbar-aero@2x.png deleted file mode 100644 index 033d87dff..000000000 Binary files a/browser/themes/windows/Toolbar-aero@2x.png and /dev/null differ diff --git a/browser/themes/windows/Toolbar-lunaSilver.png b/browser/themes/windows/Toolbar-lunaSilver.png deleted file mode 100644 index 30c425c26..000000000 Binary files a/browser/themes/windows/Toolbar-lunaSilver.png and /dev/null differ diff --git a/browser/themes/windows/Toolbar-win7.png b/browser/themes/windows/Toolbar-win7.png new file mode 100644 index 000000000..b191ce2aa Binary files /dev/null and b/browser/themes/windows/Toolbar-win7.png differ diff --git a/browser/themes/windows/Toolbar-win7@2x.png b/browser/themes/windows/Toolbar-win7@2x.png new file mode 100644 index 000000000..033d87dff Binary files /dev/null and b/browser/themes/windows/Toolbar-win7@2x.png differ diff --git a/browser/themes/windows/actionicon-tab-XPVista7.png b/browser/themes/windows/actionicon-tab-XPVista7.png deleted file mode 100644 index 8437c7655..000000000 Binary files a/browser/themes/windows/actionicon-tab-XPVista7.png and /dev/null differ diff --git a/browser/themes/windows/actionicon-tab-win7.png b/browser/themes/windows/actionicon-tab-win7.png new file mode 100644 index 000000000..8437c7655 Binary files /dev/null and b/browser/themes/windows/actionicon-tab-win7.png differ diff --git a/browser/themes/windows/browser-aero.css b/browser/themes/windows/browser-aero.css index 28599af7a..dbac6bb7a 100644 --- a/browser/themes/windows/browser-aero.css +++ b/browser/themes/windows/browser-aero.css @@ -445,7 +445,7 @@ } /* The borders on the glass frame are ours, and inside #browser, and on - * vista and win7 we want to make sure they are "glassy", so we can't use + * win7 we want to make sure they are "glassy", so we can't use * #browser as the exclude-glass container. We use #appcontent instead. */ #browser { -moz-appearance: none; @@ -458,7 +458,7 @@ @media (-moz-os-version: windows-win8) { /* Artificially draw window borders that are covered by lwtheme, see bug 591930. - * Borders for vista/win7 are below, win10 doesn't need them. */ + * Borders for win7 are below, win10 doesn't need them. */ #main-window[sizemode="normal"] > #tab-view-deck > #browser-panel:-moz-lwtheme { border-top: 1px solid @toolbarShadowColor@; } @@ -473,11 +473,9 @@ * On aero, the menubar fog disappears for inactive windows, and renders gray * illegible. */ - @media not all and (-moz-os-version: windows-vista) { - @media not all and (-moz-os-version: windows-win7) { - #toolbar-menubar:not(:-moz-lwtheme):-moz-window-inactive { - color: ThreeDShadow; - } + @media not all and (-moz-os-version: windows-win7) { + #toolbar-menubar:not(:-moz-lwtheme):-moz-window-inactive { + color: ThreeDShadow; } } } @@ -487,9 +485,8 @@ color: white; } - /* Show borders on vista through win8, but not on win10 and later: */ - @media (-moz-os-version: windows-vista), - (-moz-os-version: windows-win7), + /* Show borders on win7 and win8, but not on win10 and later: */ + @media (-moz-os-version: windows-win7), (-moz-os-version: windows-win8) { /* Vertical toolbar border */ #main-window:not([customizing])[sizemode=normal] #navigator-toolbox > toolbar:not(#toolbar-menubar):not(#TabsToolbar):not(:-moz-lwtheme), diff --git a/browser/themes/windows/browser.css b/browser/themes/windows/browser.css index 15e776da1..a0cdabfb2 100644 --- a/browser/themes/windows/browser.css +++ b/browser/themes/windows/browser.css @@ -131,8 +131,7 @@ toolbar:-moz-lwtheme { } @media (-moz-windows-default-theme) { - @media (-moz-os-version: windows-vista), - (-moz-os-version: windows-win7) { + @media (-moz-os-version: windows-win7) { #navigator-toolbox::after { border-bottom-color: #aabccf; } @@ -160,9 +159,7 @@ toolbar:-moz-lwtheme { background-image: linear-gradient(@toolbarHighlight@, @toolbarHighlight@); } -@media (-moz-os-version: windows-xp), - (-moz-os-version: windows-vista), - (-moz-os-version: windows-win7) { +@media (-moz-os-version: windows-win7) { #nav-bar { background-image: linear-gradient(@toolbarHighlight@, transparent) !important; } @@ -318,64 +315,6 @@ toolbar:-moz-lwtheme { } } -/* Render a window top border for lwthemes on WinXP modern themes: */ -@media (-moz-windows-theme: luna-blue) { - #main-window[tabsintitlebar][sizemode="normal"] > #tab-view-deck > #browser-panel:-moz-lwtheme { - background-image: linear-gradient(to bottom, - rgb(8, 49, 216) 0, rgb(8, 49, 216) 1px, - rgb(15, 77, 227) 1px, rgb(15, 77, 227) 2px, - rgb(22, 106, 238) 2px, rgb(22, 106, 238) 3px, - rgb(8, 85, 221) 3px, rgb(8, 85, 221) 4px, - transparent 4px); - } - - #main-window[tabsintitlebar][sizemode="normal"] > #tab-view-deck > #browser-panel:-moz-lwtheme:-moz-window-inactive { - background-image: linear-gradient(to bottom, - rgb(91, 104, 205) 0, rgb(91, 104, 205) 1px, - rgb(116, 128, 220) 1px, rgb(116, 128, 220) 2px, - rgb(117, 140, 221) 2px, rgb(117, 140, 221) 4px, - transparent 4px); - } -} - -@media (-moz-windows-theme: luna-silver) { - #main-window[tabsintitlebar][sizemode="normal"] > #tab-view-deck > #browser-panel:-moz-lwtheme { - background-image: linear-gradient(to bottom, - rgb(102,102,126) 0, rgb(102,102,126) 1px, - rgb(168,167,191) 1px, rgb(168,167,191) 2px, - white 2px, white 3px, - rgb(188,188,207) 3px, rgb(188,188,207) 4px, - transparent 4px); - } - - #main-window[tabsintitlebar][sizemode="normal"] > #tab-view-deck > #browser-panel:-moz-lwtheme:-moz-window-inactive { - background-image: linear-gradient(to bottom, - rgb(186,186,197) 0, rgb(186,186,197) 1px, - rgb(236,238,245) 1px, rgb(236,238,245) 2px, - white 2px, white 3px, - rgb(215,215,227) 3px, rgb(215,215,227) 4px, - transparent 4px); - } -} - -@media (-moz-windows-theme: luna-olive) { - #main-window[tabsintitlebar][sizemode="normal"] > #tab-view-deck > #browser-panel:-moz-lwtheme { - background-image: linear-gradient(to bottom, - rgb(139,161,105) 0, rgb(139,161,105) 1px, - rgb(171, 189, 133) 1px, rgb(171, 189, 133) 2px, - rgb(164,178,127) 2px, rgb(164,178,127) 3px, - transparent 3px); - } - - #main-window[tabsintitlebar][sizemode="normal"] > #tab-view-deck > #browser-panel:-moz-lwtheme:-moz-window-inactive { - background-image: linear-gradient(to bottom, - rgb(207, 214, 188) 0, rgb(207, 214, 188) 1px, - rgb(224, 226, 200) 1px, rgb(224, 226, 200) 2px, - rgb(214, 216, 190) 2px, rgb(214, 216, 190) 3px, - transparent 3px); - } -} - #TabsToolbar:not([collapsed="true"]) + #nav-bar { /* Move up into the TabsToolbar for the inner highlight at the top of the nav-bar */ margin-top: calc(-1 * var(--navbar-tab-toolbar-highlight-overlap)); @@ -406,12 +345,6 @@ toolbar:-moz-lwtheme { background-color: -moz-dialog; } -@media (-moz-os-version: windows-xp) and (-moz-windows-default-theme) { - #main-window[tabsintitlebar][sizemode="normal"] #toolbar-menubar { - margin-top: 4px; - } -} - /* ::::: titlebar ::::: */ #main-window[sizemode="normal"] > #titlebar { @@ -432,7 +365,7 @@ toolbar:-moz-lwtheme { * click and hover mouse events to work properly for the button in the restored * window state. Otherwise, elements in the navigator-toolbox, like the menubar, * can swallow those events. It will also place the buttons above the fog on - * themes with Aero Glass. + * Windows 7 with Aero Glass. */ #titlebar-buttonbox { z-index: 1; @@ -442,12 +375,6 @@ toolbar:-moz-lwtheme { margin-left: 22px; /* space needed for Aero Snap */ } -@media (-moz-os-version: windows-xp) { - .titlebar-placeholder[type="caption-buttons"] { - margin-left: 10px; /* less space needed on XP because there's no Aero Snap */ - } -} - /* titlebar command buttons */ #titlebar-min { @@ -670,13 +597,6 @@ menuitem.bookmark-item { %include ../shared/toolbarbuttons.inc.css -@media (-moz-windows-theme: luna-silver) and (max-resolution: 1dppx) { - :-moz-any(@primaryToolbarButtons@), - #bookmarks-menu-button.toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon { - list-style-image: url("chrome://browser/skin/Toolbar-lunaSilver.png"); - } -} - #main-window:not([customizing]) .toolbarbutton-1[disabled=true] > .toolbarbutton-icon, #main-window:not([customizing]) .toolbarbutton-1[disabled=true] > .toolbarbutton-menu-dropmarker, #main-window:not([customizing]) .toolbarbutton-1[disabled=true] > .toolbarbutton-menubutton-dropmarker, @@ -780,10 +700,7 @@ toolbar[brighttext] .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker { max-width: 32px; } -@media (-moz-os-version: windows-xp), - (-moz-os-version: windows-vista), - (-moz-os-version: windows-win7) { - /* < Win8 */ +@media (-moz-os-version: windows-win7) { :root { --toolbarbutton-hover-background: linear-gradient(hsla(0,0%,100%,.6), hsla(0,0%,100%,.1)); --toolbarbutton-hover-bordercolor: hsla(210,54%,20%,.15) hsla(210,54%,20%,.2) hsla(210,54%,20%,.25); @@ -1101,9 +1018,7 @@ toolbar[brighttext] #close-button { list-style-image: url(chrome://browser/skin/caption-buttons.svg#close-white); } -@media (-moz-os-version: windows-xp), - (-moz-os-version: windows-vista), - (-moz-os-version: windows-win7) { +@media (-moz-os-version: windows-win7) { #window-controls { margin-inline-start: 4px; } @@ -1159,8 +1074,7 @@ toolbar[brighttext] #close-button { } } -@media (-moz-os-version: windows-vista), - (-moz-os-version: windows-win7) { +@media (-moz-os-version: windows-win7) { #window-controls { -moz-box-align: start; } @@ -1204,8 +1118,7 @@ toolbar[brighttext] #close-button { } @media (-moz-windows-default-theme) { - @media (-moz-os-version: windows-vista), - (-moz-os-version: windows-win7), + @media (-moz-os-version: windows-win7), (-moz-os-version: windows-win8) { #main-window:not(:-moz-lwtheme) { --urlbar-border-color: hsla(210,54%,20%,.25) hsla(210,54%,20%,.27) hsla(210,54%,20%,.3); @@ -1242,8 +1155,7 @@ toolbar[brighttext] #close-button { border-radius: 1px; } - @media (-moz-os-version: windows-vista), - (-moz-os-version: windows-win7), + @media (-moz-os-version: windows-win7), (-moz-os-version: windows-win8) { #urlbar:not(:-moz-lwtheme), .searchbar-textbox:not(:-moz-lwtheme) { @@ -1266,11 +1178,9 @@ toolbar[brighttext] #close-button { } } - @media not all and (-moz-os-version: windows-xp) { - #urlbar:not(:-moz-lwtheme)[focused], - .searchbar-textbox:not(:-moz-lwtheme)[focused] { - border-color: Highlight; - } + #urlbar:not(:-moz-lwtheme)[focused], + .searchbar-textbox:not(:-moz-lwtheme)[focused] { + border-color: Highlight; } } @@ -2023,9 +1933,7 @@ html|span.ac-emphasize-text-url { } } -@media (-moz-os-version: windows-xp), - (-moz-os-version: windows-vista), - (-moz-os-version: windows-win7) { +@media (-moz-os-version: windows-win7) { #sidebar-header > .close-icon { padding-top: 4px; padding-bottom: 4px; @@ -2046,39 +1954,28 @@ html|span.ac-emphasize-text-url { margin-bottom: calc(-1 * var(--tab-toolbar-navbar-overlap)); /* overlap the nav-bar's top border */ } -@media (-moz-os-version: windows-xp) and (-moz-windows-default-theme) { - #main-window[sizemode=normal] #TabsToolbar { - padding-left: 2px; - padding-right: 2px; - } -} - %include ../shared/tabs.inc.css /* Remove border between tab strip and navigation toolbar on Windows 10+ */ -@media not all and (-moz-os-version: windows-xp) { - @media not all and (-moz-os-version: windows-vista) { - @media not all and (-moz-os-version: windows-win7) { - @media not all and (-moz-os-version: windows-win8) { - @media (-moz-windows-default-theme) { - .tab-background-end[selected=true]::after, - .tab-background-start[selected=true]::after { - content: none; - } - - #TabsToolbar { - --tab-stroke-background-size: 0 0; - } - - :root { - --tab-toolbar-navbar-overlap: 0px; - } - - #nav-bar { - border-top-style: none !important; - box-shadow: none; - } - } +@media not all and (-moz-os-version: windows-win7) { + @media not all and (-moz-os-version: windows-win8) { + @media (-moz-windows-default-theme) { + .tab-background-end[selected=true]::after, + .tab-background-start[selected=true]::after { + content: none; + } + + #TabsToolbar { + --tab-stroke-background-size: 0 0; + } + + :root { + --tab-toolbar-navbar-overlap: 0px; + } + + #nav-bar { + border-top-style: none !important; + box-shadow: none; } } } @@ -2563,22 +2460,6 @@ notification.pluginVulnerable > .notification-inner > .messageCloseButton { position: relative; } -@media (-moz-os-version: windows-xp) { - @media not all and (-moz-windows-classic) { - #private-browsing-indicator-titlebar > .private-browsing-indicator { - background-image: url("chrome://browser/skin/privatebrowsing-mask-titlebar-XPVista7-tall.png"); - height: 28px; - } - - #main-window[sizemode="maximized"] > #titlebar > #titlebar-content > #titlebar-buttonbox-container > #private-browsing-indicator-titlebar > .private-browsing-indicator { - top: -5px; - } - #main-window[sizemode="normal"] > #titlebar > #titlebar-content > #titlebar-buttonbox-container > #private-browsing-indicator-titlebar > .private-browsing-indicator { - top: -1px; - } - } -} - @media (-moz-windows-classic) { /** * We have to use top instead of background-position in this case, otherwise @@ -2590,8 +2471,7 @@ notification.pluginVulnerable > .notification-inner > .messageCloseButton { } } -@media (-moz-os-version: windows-vista), - (-moz-os-version: windows-win7) { +@media (-moz-os-version: windows-win7) { @media (-moz-windows-glass) { #main-window[sizemode="normal"] > #titlebar > #titlebar-content > #titlebar-buttonbox-container > #private-browsing-indicator-titlebar > .private-browsing-indicator { top: 1px; @@ -2608,7 +2488,7 @@ notification.pluginVulnerable > .notification-inner > .messageCloseButton { @media (-moz-windows-default-theme) { @media not all and (-moz-windows-compositor) { #main-window[sizemode="normal"] > #titlebar > #titlebar-content > #titlebar-buttonbox-container > #private-browsing-indicator-titlebar > .private-browsing-indicator { - background-image: url("chrome://browser/skin/privatebrowsing-mask-titlebar-XPVista7-tall.png"); + background-image: url("chrome://browser/skin/privatebrowsing-mask-titlebar-win7-tall.png"); height: 28px; } } @@ -2641,19 +2521,14 @@ notification.pluginVulnerable > .notification-inner > .messageCloseButton { margin-top: -4px; } - -@media not all and (-moz-os-version: windows-xp) { %include browser-aero.css -} .browser-extension-panel > .panel-arrowcontainer > .panel-arrowcontent { padding: 0; overflow: hidden; } -@media (-moz-os-version: windows-xp), - (-moz-os-version: windows-vista), - (-moz-os-version: windows-win7) { +@media (-moz-os-version: windows-win7) { .cui-widget-panelview[id^=PanelUI-webext-] { border-radius: 4px; } diff --git a/browser/themes/windows/customizableui/panelUI.css b/browser/themes/windows/customizableui/panelUI.css index 92080d599..189a163f3 100644 --- a/browser/themes/windows/customizableui/panelUI.css +++ b/browser/themes/windows/customizableui/panelUI.css @@ -131,21 +131,17 @@ menu.subviewbutton > .menu-right:-moz-locale-dir(rtl) { } /* Win8 and beyond. */ -@media not all and (-moz-os-version: windows-xp) { - @media not all and (-moz-os-version: windows-vista) { - @media not all and (-moz-os-version: windows-win7) { - panelview .toolbarbutton-1, - .subviewbutton, - .widget-overflow-list .toolbarbutton-1, - .panelUI-grid .toolbarbutton-1 > .toolbarbutton-menubutton-button, - #BMB_bookmarksPopup menupopup[placespopup=true] > hbox, - #edit-controls@inAnyPanel@, - #zoom-controls@inAnyPanel@, - #edit-controls@inAnyPanel@ > toolbarbutton, - #zoom-controls@inAnyPanel@ > toolbarbutton { - border-radius: 0; - } - } +@media not all and (-moz-os-version: windows-win7) { + panelview .toolbarbutton-1, + .subviewbutton, + .widget-overflow-list .toolbarbutton-1, + .panelUI-grid .toolbarbutton-1 > .toolbarbutton-menubutton-button, + #BMB_bookmarksPopup menupopup[placespopup=true] > hbox, + #edit-controls@inAnyPanel@, + #zoom-controls@inAnyPanel@, + #edit-controls@inAnyPanel@ > toolbarbutton, + #zoom-controls@inAnyPanel@ > toolbarbutton { + border-radius: 0; } } diff --git a/browser/themes/windows/devedition.css b/browser/themes/windows/devedition.css index 2dc72eeeb..bdf4bb80e 100644 --- a/browser/themes/windows/devedition.css +++ b/browser/themes/windows/devedition.css @@ -16,7 +16,7 @@ /* The window background is white due to no accentcolor in the lightweight theme. It can't be changed to transparent when there is no compositor - (Win XP or 7 in classic / basic theme), or else dragging and focus become + (Win 7 in classic / basic theme), or else dragging and focus become broken. So instead just show the normal titlebar in that case, and override the window color as transparent when the compositor is available. */ @media not all and (-moz-windows-compositor) { @@ -116,9 +116,7 @@ } } -@media (-moz-os-version: windows-xp), - (-moz-os-version: windows-vista), - (-moz-os-version: windows-win7), +@media (-moz-os-version: windows-win7), (-moz-os-version: windows-win8) { :root { --space-above-tabbar: 15px; @@ -261,8 +259,7 @@ color: var(--chrome-color); } -@media (-moz-os-version: windows-vista), - (-moz-os-version: windows-win7), +@media (-moz-os-version: windows-win7), (-moz-os-version: windows-win8) { /* And then we add them back on toolbars so that they don't look borderless: */ #main-window:not([customizing])[sizemode=normal] #navigator-toolbox::after, diff --git a/browser/themes/windows/downloads/allDownloadsViewOverlay.css b/browser/themes/windows/downloads/allDownloadsViewOverlay.css index e288f1e90..0ee83f669 100644 --- a/browser/themes/windows/downloads/allDownloadsViewOverlay.css +++ b/browser/themes/windows/downloads/allDownloadsViewOverlay.css @@ -18,32 +18,30 @@ /*** Highlighted list items ***/ -@media not all and (-moz-os-version: windows-xp) { - @media (-moz-windows-default-theme) { - /* - -moz-appearance: menuitem is almost right, but the hover effect is not - transparent and is lighter than desired. - - Copied from the autocomplete richlistbox styling in - toolkit/themes/windows/global/autocomplete.css - - This styling should be kept in sync with the style from the above file. - */ - @itemFocused@ { - color: inherit; - background-color: transparent; - /* four gradients for the bevel highlights on each edge, one for blue background */ - background-image: - linear-gradient(to bottom, rgba(255,255,255,0.9) 3px, transparent 3px), - linear-gradient(to right, rgba(255,255,255,0.5) 3px, transparent 3px), - linear-gradient(to left, rgba(255,255,255,0.5) 3px, transparent 3px), - linear-gradient(to top, rgba(255,255,255,0.4) 3px, transparent 3px), - linear-gradient(to bottom, rgba(163,196,247,0.3), rgba(122,180,246,0.3)); - background-clip: content-box; - border-radius: 6px; - outline: 1px solid rgb(124,163,206); - -moz-outline-radius: 3px; - outline-offset: -2px; - } +@media (-moz-windows-default-theme) { + /* + -moz-appearance: menuitem is almost right, but the hover effect is not + transparent and is lighter than desired. + + Copied from the autocomplete richlistbox styling in + toolkit/themes/windows/global/autocomplete.css + + This styling should be kept in sync with the style from the above file. + */ + @itemFocused@ { + color: inherit; + background-color: transparent; + /* four gradients for the bevel highlights on each edge, one for blue background */ + background-image: + linear-gradient(to bottom, rgba(255,255,255,0.9) 3px, transparent 3px), + linear-gradient(to right, rgba(255,255,255,0.5) 3px, transparent 3px), + linear-gradient(to left, rgba(255,255,255,0.5) 3px, transparent 3px), + linear-gradient(to top, rgba(255,255,255,0.4) 3px, transparent 3px), + linear-gradient(to bottom, rgba(163,196,247,0.3), rgba(122,180,246,0.3)); + background-clip: content-box; + border-radius: 6px; + outline: 1px solid rgb(124,163,206); + -moz-outline-radius: 3px; + outline-offset: -2px; } } diff --git a/browser/themes/windows/downloads/download-glow-XPVista7.png b/browser/themes/windows/downloads/download-glow-XPVista7.png deleted file mode 100644 index e7415e83d..000000000 Binary files a/browser/themes/windows/downloads/download-glow-XPVista7.png and /dev/null differ diff --git a/browser/themes/windows/downloads/download-glow-menuPanel-XPVista7.png b/browser/themes/windows/downloads/download-glow-menuPanel-XPVista7.png deleted file mode 100644 index 7ff7e6a03..000000000 Binary files a/browser/themes/windows/downloads/download-glow-menuPanel-XPVista7.png and /dev/null differ diff --git a/browser/themes/windows/downloads/download-glow-menuPanel-win7.png b/browser/themes/windows/downloads/download-glow-menuPanel-win7.png new file mode 100644 index 000000000..7ff7e6a03 Binary files /dev/null and b/browser/themes/windows/downloads/download-glow-menuPanel-win7.png differ diff --git a/browser/themes/windows/downloads/download-glow-win7.png b/browser/themes/windows/downloads/download-glow-win7.png new file mode 100644 index 000000000..e7415e83d Binary files /dev/null and b/browser/themes/windows/downloads/download-glow-win7.png differ diff --git a/browser/themes/windows/downloads/indicator.css b/browser/themes/windows/downloads/indicator.css index 627265088..7f921f8de 100644 --- a/browser/themes/windows/downloads/indicator.css +++ b/browser/themes/windows/downloads/indicator.css @@ -166,13 +166,9 @@ toolbar[brighttext] #downloads-button:not([counter])[attention="success"] > #dow font-size: 9px; line-height: 9px; text-align: center; -} -@media not all and (-moz-os-version: windows-xp) { - #downloads-indicator-counter { - /* Bug 812345 added this... */ - margin-bottom: -1px; - } + /* Bug 812345 added this... */ + margin-bottom: -1px; } toolbar[brighttext] #downloads-indicator-counter { diff --git a/browser/themes/windows/feeds/feedIcon-XP.png b/browser/themes/windows/feeds/feedIcon-XP.png deleted file mode 100644 index d0cafb1d4..000000000 Binary files a/browser/themes/windows/feeds/feedIcon-XP.png and /dev/null differ diff --git a/browser/themes/windows/feeds/feedIcon16-XP.png b/browser/themes/windows/feeds/feedIcon16-XP.png deleted file mode 100644 index dd7821f8d..000000000 Binary files a/browser/themes/windows/feeds/feedIcon16-XP.png and /dev/null differ diff --git a/browser/themes/windows/jar.mn b/browser/themes/windows/jar.mn index 89c589aba..10abfd001 100644 --- a/browser/themes/windows/jar.mn +++ b/browser/themes/windows/jar.mn @@ -11,21 +11,17 @@ browser.jar: * skin/classic/browser/syncedtabs/sidebar.css (syncedtabs/sidebar.css) skin/classic/browser/actionicon-tab.png skin/classic/browser/actionicon-tab@2x.png - skin/classic/browser/actionicon-tab-XPVista7.png + skin/classic/browser/actionicon-tab-win7.png * skin/classic/browser/browser.css * skin/classic/browser/devedition.css * skin/classic/browser/browser-lightweightTheme.css skin/classic/browser/caption-buttons.svg skin/classic/browser/click-to-play-warning-stripes.png skin/classic/browser/Info.png - skin/classic/browser/Info-XP.png skin/classic/browser/keyhole-forward-mask.svg skin/classic/browser/livemark-folder.png - skin/classic/browser/livemark-folder-XP.png skin/classic/browser/menu-back.png - skin/classic/browser/menu-back-XP.png skin/classic/browser/menu-forward.png - skin/classic/browser/menu-forward-XP.png skin/classic/browser/menuPanel-customize.png skin/classic/browser/menuPanel-customize@2x.png skin/classic/browser/menuPanel-exit.png @@ -36,36 +32,33 @@ browser.jar: skin/classic/browser/monitor_16-10.png skin/classic/browser/pageInfo.css skin/classic/browser/pageInfo.png - skin/classic/browser/pageInfo-XP.png skin/classic/browser/privatebrowsing-mask-tabstrip.png - skin/classic/browser/privatebrowsing-mask-tabstrip-XPVista7.png + skin/classic/browser/privatebrowsing-mask-tabstrip-win7.png skin/classic/browser/privatebrowsing-mask-titlebar.png - skin/classic/browser/privatebrowsing-mask-titlebar-XPVista7.png - skin/classic/browser/privatebrowsing-mask-titlebar-XPVista7-tall.png + skin/classic/browser/privatebrowsing-mask-titlebar-win7.png + skin/classic/browser/privatebrowsing-mask-titlebar-win7-tall.png skin/classic/browser/reload-stop-go.png skin/classic/browser/reload-stop-go@2x.png - skin/classic/browser/reload-stop-go-XPVista7.png - skin/classic/browser/reload-stop-go-XPVista7@2x.png + skin/classic/browser/reload-stop-go-win7.png + skin/classic/browser/reload-stop-go-win7@2x.png skin/classic/browser/searchbar.css skin/classic/browser/setDesktopBackground.css skin/classic/browser/slowStartup-16.png skin/classic/browser/Toolbar.png skin/classic/browser/Toolbar@2x.png - skin/classic/browser/Toolbar-aero.png - skin/classic/browser/Toolbar-aero@2x.png + skin/classic/browser/Toolbar-win7.png + skin/classic/browser/Toolbar-win7@2x.png skin/classic/browser/Toolbar-inverted.png skin/classic/browser/Toolbar-inverted@2x.png - skin/classic/browser/Toolbar-lunaSilver.png skin/classic/browser/Toolbar-win8.png skin/classic/browser/Toolbar-win8@2x.png - skin/classic/browser/Toolbar-XP.png - skin/classic/browser/toolbarbutton-dropdown-arrow-XPVista7.png + skin/classic/browser/toolbarbutton-dropdown-arrow-win7.png skin/classic/browser/toolbarbutton-dropdown-arrow-inverted.png skin/classic/browser/urlbar-popup-blocked.png skin/classic/browser/urlbar-history-dropmarker.png skin/classic/browser/urlbar-history-dropmarker@2x.png - skin/classic/browser/urlbar-history-dropmarker-XPVista7.png - skin/classic/browser/urlbar-history-dropmarker-XPVista7@2x.png + skin/classic/browser/urlbar-history-dropmarker-win7.png + skin/classic/browser/urlbar-history-dropmarker-win7@2x.png skin/classic/browser/webRTC-indicator.css * skin/classic/browser/controlcenter/panel.css (controlcenter/panel.css) skin/classic/browser/customizableui/background-noise-toolbar.png (customizableui/background-noise-toolbar.png) @@ -78,57 +71,40 @@ browser.jar: * skin/classic/browser/customizableui/panelUI.css (customizableui/panelUI.css) * skin/classic/browser/downloads/allDownloadsViewOverlay.css (downloads/allDownloadsViewOverlay.css) skin/classic/browser/downloads/download-glow-menuPanel.png (downloads/download-glow-menuPanel.png) - skin/classic/browser/downloads/download-glow-menuPanel-XPVista7.png (downloads/download-glow-menuPanel-XPVista7.png) + skin/classic/browser/downloads/download-glow-menuPanel-win7.png (downloads/download-glow-menuPanel-win7.png) skin/classic/browser/downloads/download-notification-finish.png (downloads/download-notification-finish.png) skin/classic/browser/downloads/download-notification-start.png (downloads/download-notification-start.png) * skin/classic/browser/downloads/downloads.css (downloads/downloads.css) skin/classic/browser/feeds/feedIcon.png (feeds/feedIcon.png) skin/classic/browser/feeds/feedIcon16.png (feeds/feedIcon16.png) - skin/classic/browser/feeds/feedIcon-XP.png (feeds/feedIcon-XP.png) - skin/classic/browser/feeds/feedIcon16-XP.png (feeds/feedIcon16-XP.png) skin/classic/browser/feeds/subscribe.css (feeds/subscribe.css) skin/classic/browser/feeds/subscribe-ui.css (feeds/subscribe-ui.css) * skin/classic/browser/newtab/newTab.css (newtab/newTab.css) skin/classic/browser/places/autocomplete-star.png (places/autocomplete-star.png) skin/classic/browser/places/autocomplete-star@2x.png (places/autocomplete-star@2x.png) - skin/classic/browser/places/autocomplete-star-XPVista7.png (places/autocomplete-star-XPVista7.png) + skin/classic/browser/places/autocomplete-star-win7.png (places/autocomplete-star-win7.png) skin/classic/browser/places/places.css (places/places.css) * skin/classic/browser/places/organizer.css (places/organizer.css) skin/classic/browser/places/query.png (places/query.png) - skin/classic/browser/places/query-XP.png (places/query-XP.png) skin/classic/browser/places/bookmarksMenu.png (places/bookmarksMenu.png) - skin/classic/browser/places/bookmarksMenu-XP.png (places/bookmarksMenu-XP.png) skin/classic/browser/places/bookmarksToolbar.png (places/bookmarksToolbar.png) - skin/classic/browser/places/bookmarksToolbar-XP.png (places/bookmarksToolbar-XP.png) skin/classic/browser/places/bookmarksToolbar-menuPanel.png (places/bookmarksToolbar-menuPanel.png) - skin/classic/browser/places/bookmarksToolbar-menuPanel-XP.png (places/bookmarksToolbar-menuPanel-XP.png) skin/classic/browser/places/bookmarks-notification-finish.png (places/bookmarks-notification-finish.png) skin/classic/browser/places/calendar.png (places/calendar.png) - skin/classic/browser/places/calendar-XP.png (places/calendar-XP.png) skin/classic/browser/places/toolbarDropMarker.png (places/toolbarDropMarker.png) - skin/classic/browser/places/toolbarDropMarker-XP.png (places/toolbarDropMarker-XP.png) skin/classic/browser/places/editBookmarkOverlay.css (places/editBookmarkOverlay.css) skin/classic/browser/places/libraryToolbar.png (places/libraryToolbar.png) - skin/classic/browser/places/libraryToolbar-XP.png (places/libraryToolbar-XP.png) skin/classic/browser/places/starred48.png (places/starred48.png) - skin/classic/browser/places/starred48-XP.png (places/starred48-XP.png) skin/classic/browser/places/unstarred48.png (places/unstarred48.png) skin/classic/browser/places/tag.png (places/tag.png) - skin/classic/browser/places/tag-XP.png (places/tag-XP.png) skin/classic/browser/places/history.png (places/history.png) - skin/classic/browser/places/history-XP.png (places/history-XP.png) skin/classic/browser/places/allBookmarks.png (places/allBookmarks.png) - skin/classic/browser/places/allBookmarks-XP.png (places/allBookmarks-XP.png) skin/classic/browser/places/unsortedBookmarks.png (places/unsortedBookmarks.png) - skin/classic/browser/places/unsortedBookmarks-XP.png (places/unsortedBookmarks-XP.png) skin/classic/browser/places/downloads.png (places/downloads.png) skin/classic/browser/places/livemark-item.png (places/livemark-item.png) skin/classic/browser/preferences/alwaysAsk.png (preferences/alwaysAsk.png) - skin/classic/browser/preferences/alwaysAsk-XP.png (preferences/alwaysAsk-XP.png) skin/classic/browser/preferences/application.png (preferences/application.png) - skin/classic/browser/preferences/application-XP.png (preferences/application-XP.png) skin/classic/browser/preferences/saveFile.png (preferences/saveFile.png) - skin/classic/browser/preferences/saveFile-XP.png (preferences/saveFile-XP.png) skin/classic/browser/preferences/preferences.css (preferences/preferences.css) * skin/classic/browser/preferences/in-content/preferences.css (preferences/in-content/preferences.css) * skin/classic/browser/preferences/in-content/dialog.css (preferences/in-content/dialog.css) @@ -136,13 +112,13 @@ browser.jar: skin/classic/browser/social/services-16.png (social/services-16.png) skin/classic/browser/social/services-64.png (social/services-64.png) skin/classic/browser/tabbrowser/newtab.svg (tabbrowser/newtab.svg) - skin/classic/browser/tabbrowser/newtab-XPVista7.svg (tabbrowser/newtab-XPVista7.svg) + skin/classic/browser/tabbrowser/newtab-win7.svg (tabbrowser/newtab-win7.svg) skin/classic/browser/tabbrowser/newtab-inverted.svg (tabbrowser/newtab-inverted.svg) - skin/classic/browser/tabbrowser/newtab-inverted-XPVista7.svg (tabbrowser/newtab-inverted-XPVista7.svg) + skin/classic/browser/tabbrowser/newtab-inverted-win7.svg (tabbrowser/newtab-inverted-win7.svg) skin/classic/browser/tabbrowser/tab-active-middle.png (tabbrowser/tab-active-middle.png) skin/classic/browser/tabbrowser/tab-active-middle@2x.png (tabbrowser/tab-active-middle@2x.png) skin/classic/browser/tabbrowser/tab-arrow-left.svg (tabbrowser/tab-arrow-left.svg) - skin/classic/browser/tabbrowser/tab-arrow-left-XPVista7.svg (tabbrowser/tab-arrow-left-XPVista7.svg) + skin/classic/browser/tabbrowser/tab-arrow-left-win7.svg (tabbrowser/tab-arrow-left-win7.svg) skin/classic/browser/tabbrowser/tab-arrow-left-inverted.svg (tabbrowser/tab-arrow-left-inverted.svg) skin/classic/browser/tabbrowser/tab-background-start.png (tabbrowser/tab-background-start.png) skin/classic/browser/tabbrowser/tab-background-start@2x.png (tabbrowser/tab-background-start@2x.png) @@ -174,8 +150,8 @@ browser.jar: skin/classic/browser/sync-desktopIcon.svg (../shared/sync-desktopIcon.svg) skin/classic/browser/sync-horizontalbar.png skin/classic/browser/sync-horizontalbar@2x.png - skin/classic/browser/sync-horizontalbar-XPVista7.png - skin/classic/browser/sync-horizontalbar-XPVista7@2x.png + skin/classic/browser/sync-horizontalbar-win7.png + skin/classic/browser/sync-horizontalbar-win7@2x.png skin/classic/browser/sync-mobileIcon.svg (../shared/sync-mobileIcon.svg) skin/classic/browser/sync-notification-24.png skin/classic/browser/syncSetup.css @@ -183,16 +159,16 @@ browser.jar: skin/classic/browser/syncQuota.css skin/classic/browser/syncProgress-horizontalbar.png skin/classic/browser/syncProgress-horizontalbar@2x.png - skin/classic/browser/syncProgress-horizontalbar-XPVista7.png - skin/classic/browser/syncProgress-horizontalbar-XPVista7@2x.png + skin/classic/browser/syncProgress-horizontalbar-win7.png + skin/classic/browser/syncProgress-horizontalbar-win7@2x.png skin/classic/browser/syncProgress-menuPanel.png skin/classic/browser/syncProgress-menuPanel@2x.png skin/classic/browser/syncProgress-toolbar.png skin/classic/browser/syncProgress-toolbar@2x.png skin/classic/browser/syncProgress-toolbar-inverted.png skin/classic/browser/syncProgress-toolbar-inverted@2x.png - skin/classic/browser/syncProgress-toolbar-XPVista7.png - skin/classic/browser/syncProgress-toolbar-XPVista7@2x.png + skin/classic/browser/syncProgress-toolbar-win7.png + skin/classic/browser/syncProgress-toolbar-win7@2x.png #ifdef E10S_TESTING_ONLY skin/classic/browser/e10s-64@2x.png (../shared/e10s-64@2x.png) #endif @@ -205,58 +181,31 @@ browser.jar: % override chrome://browser/skin/feeds/videoFeedIcon16.png chrome://browser/skin/feeds/feedIcon16.png % override chrome://browser/skin/aboutSessionRestore-window-icon.png chrome://browser/skin/preferences/application.png os!=WINNT -% override chrome://browser/skin/aboutSessionRestore-window-icon.png chrome://browser/skin/preferences/application.png os=WINNT osversion<6 -% override chrome://browser/skin/Info.png chrome://browser/skin/Info-XP.png os=WINNT osversion<6 -% override chrome://browser/skin/livemark-folder.png chrome://browser/skin/livemark-folder-XP.png os=WINNT osversion<6 -% override chrome://browser/skin/menu-back.png chrome://browser/skin/menu-back-XP.png os=WINNT osversion<6 -% override chrome://browser/skin/menu-forward.png chrome://browser/skin/menu-forward-XP.png os=WINNT osversion<6 -% override chrome://browser/skin/pageInfo.png chrome://browser/skin/pageInfo-XP.png os=WINNT osversion<6 -% override chrome://browser/skin/feeds/feedIcon.png chrome://browser/skin/feeds/feedIcon-XP.png os=WINNT osversion<6 -% override chrome://browser/skin/feeds/feedIcon16.png chrome://browser/skin/feeds/feedIcon16-XP.png os=WINNT osversion<6 -% override chrome://browser/skin/places/query.png chrome://browser/skin/places/query-XP.png os=WINNT osversion<6 -% override chrome://browser/skin/places/bookmarksMenu.png chrome://browser/skin/places/bookmarksMenu-XP.png os=WINNT osversion<6 -% override chrome://browser/skin/places/bookmarksToolbar.png chrome://browser/skin/places/bookmarksToolbar-XP.png os=WINNT osversion<6 -% override chrome://browser/skin/places/bookmarksToolbar-menuPanel.png chrome://browser/skin/places/bookmarksToolbar-menuPanel-XP.png os=WINNT osversion<6 -% override chrome://browser/skin/places/calendar.png chrome://browser/skin/places/calendar-XP.png os=WINNT osversion<6 -% override chrome://browser/skin/places/toolbarDropMarker.png chrome://browser/skin/places/toolbarDropMarker-XP.png os=WINNT osversion<6 -% override chrome://browser/skin/places/libraryToolbar.png chrome://browser/skin/places/libraryToolbar-XP.png os=WINNT osversion<6 -% override chrome://browser/skin/places/starred48.png chrome://browser/skin/places/starred48-XP.png os=WINNT osversion<6 -% override chrome://browser/skin/places/tag.png chrome://browser/skin/places/tag-XP.png os=WINNT osversion<6 -% override chrome://browser/skin/places/history.png chrome://browser/skin/places/history-XP.png os=WINNT osversion<6 -% override chrome://browser/skin/places/allBookmarks.png chrome://browser/skin/places/allBookmarks-XP.png os=WINNT osversion<6 -% override chrome://browser/skin/places/unsortedBookmarks.png chrome://browser/skin/places/unsortedBookmarks-XP.png os=WINNT osversion<6 -% override chrome://browser/skin/preferences/alwaysAsk.png chrome://browser/skin/preferences/alwaysAsk-XP.png os=WINNT osversion<6 -% override chrome://browser/skin/preferences/application.png chrome://browser/skin/preferences/application-XP.png os=WINNT osversion<6 -% override chrome://browser/skin/preferences/saveFile.png chrome://browser/skin/preferences/saveFile-XP.png os=WINNT osversion<6 +% override chrome://browser/skin/actionicon-tab.png chrome://browser/skin/actionicon-tab-win7.png os=WINNT osversion<=6.1 +% override chrome://browser/skin/privatebrowsing-mask-tabstrip.png chrome://browser/skin/privatebrowsing-mask-tabstrip-win7.png os=WINNT osversion<=6.1 +% override chrome://browser/skin/privatebrowsing-mask-titlebar.png chrome://browser/skin/privatebrowsing-mask-titlebar-win7.png os=WINNT osversion<=6.1 +% override chrome://browser/skin/reload-stop-go.png chrome://browser/skin/reload-stop-go-win7.png os=WINNT osversion<=6.1 +% override chrome://browser/skin/reload-stop-go@2x.png chrome://browser/skin/reload-stop-go-win7@2x.png os=WINNT osversion<=6.1 +% override chrome://browser/skin/sync-horizontalbar.png chrome://browser/skin/sync-horizontalbar-win7.png os=WINNT osversion<=6.1 +% override chrome://browser/skin/sync-horizontalbar@2x.png chrome://browser/skin/sync-horizontalbar-win7@2x.png os=WINNT osversion<=6.1 +% override chrome://browser/skin/syncProgress-horizontalbar.png chrome://browser/skin/syncProgress-horizontalbar-win7.png os=WINNT osversion<=6.1 +% override chrome://browser/skin/syncProgress-horizontalbar@2x.png chrome://browser/skin/syncProgress-horizontalbar-win7@2x.png os=WINNT osversion<=6.1 +% override chrome://browser/skin/syncProgress-toolbar.png chrome://browser/skin/syncProgress-toolbar-win7.png os=WINNT osversion<=6.1 +% override chrome://browser/skin/syncProgress-toolbar@2x.png chrome://browser/skin/syncProgress-toolbar-win7@2x.png os=WINNT osversion<=6.1 +% override chrome://browser/skin/toolbarbutton-dropdown-arrow.png chrome://browser/skin/toolbarbutton-dropdown-arrow-win7.png os=WINNT osversion<=6.1 +% override chrome://browser/skin/urlbar-history-dropmarker.png chrome://browser/skin/urlbar-history-dropmarker-win7.png os=WINNT osversion<=6.1 +% override chrome://browser/skin/urlbar-history-dropmarker@2x.png chrome://browser/skin/urlbar-history-dropmarker-win7@2x.png os=WINNT osversion<=6.1 +% override chrome://browser/skin/downloads/download-glow-menuPanel.png chrome://browser/skin/downloads/download-glow-menuPanel-win7.png os=WINNT osversion<=6.1 +% override chrome://browser/skin/places/autocomplete-star.png chrome://browser/skin/places/autocomplete-star-win7.png os=WINNT osversion<=6.1 +% override chrome://browser/skin/tabbrowser/newtab.svg chrome://browser/skin/tabbrowser/newtab-win7.svg os=WINNT osversion<=6.1 +% override chrome://browser/skin/tabbrowser/newtab-inverted.svg chrome://browser/skin/tabbrowser/newtab-inverted-win7.svg os=WINNT osversion<=6.1 +% override chrome://browser/skin/tabbrowser/tab-arrow-left.svg chrome://browser/skin/tabbrowser/tab-arrow-left-win7.svg os=WINNT osversion<=6.1 -% override chrome://browser/skin/actionicon-tab.png chrome://browser/skin/actionicon-tab-XPVista7.png os=WINNT osversion<=6.1 -% override chrome://browser/skin/privatebrowsing-mask-tabstrip.png chrome://browser/skin/privatebrowsing-mask-tabstrip-XPVista7.png os=WINNT osversion<=6.1 -% override chrome://browser/skin/privatebrowsing-mask-titlebar.png chrome://browser/skin/privatebrowsing-mask-titlebar-XPVista7.png os=WINNT osversion<=6.1 -% override chrome://browser/skin/reload-stop-go.png chrome://browser/skin/reload-stop-go-XPVista7.png os=WINNT osversion<=6.1 -% override chrome://browser/skin/reload-stop-go@2x.png chrome://browser/skin/reload-stop-go-XPVista7@2x.png os=WINNT osversion<=6.1 -% override chrome://browser/skin/sync-horizontalbar.png chrome://browser/skin/sync-horizontalbar-XPVista7.png os=WINNT osversion<=6.1 -% override chrome://browser/skin/sync-horizontalbar@2x.png chrome://browser/skin/sync-horizontalbar-XPVista7@2x.png os=WINNT osversion<=6.1 -% override chrome://browser/skin/syncProgress-horizontalbar.png chrome://browser/skin/syncProgress-horizontalbar-XPVista7.png os=WINNT osversion<=6.1 -% override chrome://browser/skin/syncProgress-horizontalbar@2x.png chrome://browser/skin/syncProgress-horizontalbar-XPVista7@2x.png os=WINNT osversion<=6.1 -% override chrome://browser/skin/syncProgress-toolbar.png chrome://browser/skin/syncProgress-toolbar-XPVista7.png os=WINNT osversion<=6.1 -% override chrome://browser/skin/syncProgress-toolbar@2x.png chrome://browser/skin/syncProgress-toolbar-XPVista7@2x.png os=WINNT osversion<=6.1 -% override chrome://browser/skin/toolbarbutton-dropdown-arrow.png chrome://browser/skin/toolbarbutton-dropdown-arrow-XPVista7.png os=WINNT osversion<=6.1 -% override chrome://browser/skin/urlbar-history-dropmarker.png chrome://browser/skin/urlbar-history-dropmarker-XPVista7.png os=WINNT osversion<=6.1 -% override chrome://browser/skin/urlbar-history-dropmarker@2x.png chrome://browser/skin/urlbar-history-dropmarker-XPVista7@2x.png os=WINNT osversion<=6.1 -% override chrome://browser/skin/downloads/download-glow-menuPanel.png chrome://browser/skin/downloads/download-glow-menuPanel-XPVista7.png os=WINNT osversion<=6.1 -% override chrome://browser/skin/places/autocomplete-star.png chrome://browser/skin/places/autocomplete-star-XPVista7.png os=WINNT osversion<=6.1 -% override chrome://browser/skin/tabbrowser/newtab.svg chrome://browser/skin/tabbrowser/newtab-XPVista7.svg os=WINNT osversion<=6.1 -% override chrome://browser/skin/tabbrowser/newtab-inverted.svg chrome://browser/skin/tabbrowser/newtab-inverted-XPVista7.svg os=WINNT osversion<=6.1 -% override chrome://browser/skin/tabbrowser/tab-arrow-left.svg chrome://browser/skin/tabbrowser/tab-arrow-left-XPVista7.svg os=WINNT osversion<=6.1 - -% override chrome://browser/skin/Toolbar@2x.png chrome://browser/skin/Toolbar-aero@2x.png os=WINNT osversion=6 -% override chrome://browser/skin/Toolbar@2x.png chrome://browser/skin/Toolbar-aero@2x.png os=WINNT osversion=6.1 +% override chrome://browser/skin/Toolbar@2x.png chrome://browser/skin/Toolbar-win7@2x.png os=WINNT osversion=6.1 % override chrome://browser/skin/Toolbar@2x.png chrome://browser/skin/Toolbar-win8@2x.png os=WINNT osversion=6.2 % override chrome://browser/skin/Toolbar@2x.png chrome://browser/skin/Toolbar-win8@2x.png os=WINNT osversion=6.3 -% override chrome://browser/skin/Toolbar.png chrome://browser/skin/Toolbar-XP.png os=WINNT osversion<6 -% override chrome://browser/skin/Toolbar.png chrome://browser/skin/Toolbar-aero.png os=WINNT osversion=6 -% override chrome://browser/skin/Toolbar.png chrome://browser/skin/Toolbar-aero.png os=WINNT osversion=6.1 +% override chrome://browser/skin/Toolbar.png chrome://browser/skin/Toolbar-win7.png os=WINNT osversion=6.1 % override chrome://browser/skin/Toolbar.png chrome://browser/skin/Toolbar-win8.png os=WINNT osversion=6.2 % override chrome://browser/skin/Toolbar.png chrome://browser/skin/Toolbar-win8.png os=WINNT osversion=6.3 diff --git a/browser/themes/windows/livemark-folder-XP.png b/browser/themes/windows/livemark-folder-XP.png deleted file mode 100644 index 00aa0364d..000000000 Binary files a/browser/themes/windows/livemark-folder-XP.png and /dev/null differ diff --git a/browser/themes/windows/menu-back-XP.png b/browser/themes/windows/menu-back-XP.png deleted file mode 100644 index ecb8ccd1a..000000000 Binary files a/browser/themes/windows/menu-back-XP.png and /dev/null differ diff --git a/browser/themes/windows/menu-forward-XP.png b/browser/themes/windows/menu-forward-XP.png deleted file mode 100644 index a7460dc27..000000000 Binary files a/browser/themes/windows/menu-forward-XP.png and /dev/null differ diff --git a/browser/themes/windows/pageInfo-XP.png b/browser/themes/windows/pageInfo-XP.png deleted file mode 100644 index bbf257237..000000000 Binary files a/browser/themes/windows/pageInfo-XP.png and /dev/null differ diff --git a/browser/themes/windows/places/allBookmarks-XP.png b/browser/themes/windows/places/allBookmarks-XP.png deleted file mode 100644 index f7903cc5f..000000000 Binary files a/browser/themes/windows/places/allBookmarks-XP.png and /dev/null differ diff --git a/browser/themes/windows/places/autocomplete-star-XPVista7.png b/browser/themes/windows/places/autocomplete-star-XPVista7.png deleted file mode 100644 index af694e91c..000000000 Binary files a/browser/themes/windows/places/autocomplete-star-XPVista7.png and /dev/null differ diff --git a/browser/themes/windows/places/autocomplete-star-win7.png b/browser/themes/windows/places/autocomplete-star-win7.png new file mode 100644 index 000000000..af694e91c Binary files /dev/null and b/browser/themes/windows/places/autocomplete-star-win7.png differ diff --git a/browser/themes/windows/places/bookmarksMenu-XP.png b/browser/themes/windows/places/bookmarksMenu-XP.png deleted file mode 100644 index 8f0c8bf58..000000000 Binary files a/browser/themes/windows/places/bookmarksMenu-XP.png and /dev/null differ diff --git a/browser/themes/windows/places/bookmarksToolbar-XP.png b/browser/themes/windows/places/bookmarksToolbar-XP.png deleted file mode 100644 index 9e988de20..000000000 Binary files a/browser/themes/windows/places/bookmarksToolbar-XP.png and /dev/null differ diff --git a/browser/themes/windows/places/bookmarksToolbar-menuPanel-XP.png b/browser/themes/windows/places/bookmarksToolbar-menuPanel-XP.png deleted file mode 100644 index 0e4247adb..000000000 Binary files a/browser/themes/windows/places/bookmarksToolbar-menuPanel-XP.png and /dev/null differ diff --git a/browser/themes/windows/places/calendar-XP.png b/browser/themes/windows/places/calendar-XP.png deleted file mode 100644 index 7645af5cd..000000000 Binary files a/browser/themes/windows/places/calendar-XP.png and /dev/null differ diff --git a/browser/themes/windows/places/history-XP.png b/browser/themes/windows/places/history-XP.png deleted file mode 100644 index fcc89bbbf..000000000 Binary files a/browser/themes/windows/places/history-XP.png and /dev/null differ diff --git a/browser/themes/windows/places/libraryToolbar-XP.png b/browser/themes/windows/places/libraryToolbar-XP.png deleted file mode 100644 index 75b390ff6..000000000 Binary files a/browser/themes/windows/places/libraryToolbar-XP.png and /dev/null differ diff --git a/browser/themes/windows/places/organizer.css b/browser/themes/windows/places/organizer.css index 4de603b9f..9ae4c8370 100644 --- a/browser/themes/windows/places/organizer.css +++ b/browser/themes/windows/places/organizer.css @@ -20,13 +20,6 @@ list-style-image: url("chrome://browser/skin/Toolbar.png"); } -@media (-moz-windows-theme: luna-silver) { - #back-button, - #forward-button { - list-style-image: url("chrome://browser/skin/Toolbar-lunaSilver.png"); - } -} - #back-button { -moz-image-region: rect(0, 54px, 18px, 36px); } @@ -119,11 +112,6 @@ -moz-image-region: rect(16px, 48px, 32px, 32px); } -/* Root View */ -#placesView { - border-top: 1px solid ThreeDDarkShadow; -} - /* Info box */ #detailsDeck { border-top: 1px solid ThreeDShadow; @@ -151,35 +139,28 @@ padding-inline-end: 9px; } - -@media not all and (-moz-os-version: windows-xp) { - #placesView { - border-top: none; +@media not all and (-moz-windows-classic) { + #placesToolbox { + -moz-appearance: none; + background-color: transparent; } - @media not all and (-moz-windows-classic) { - #placesToolbox { - -moz-appearance: none; - background-color: transparent; - } - - #placesToolbar { - -moz-appearance: none; - background-color: -moz-Dialog; - color: -moz-dialogText; - } + #placesToolbar { + -moz-appearance: none; + background-color: -moz-Dialog; + color: -moz-dialogText; } +} - @media (-moz-windows-default-theme) { - #placesView > splitter { - border: 0; - border-inline-end: 1px solid #A9B7C9; - min-width: 0; - width: 3px; - background-color: transparent; - margin-inline-start: -3px; - position: relative; - } +@media (-moz-windows-default-theme) { + #placesView > splitter { + border: 0; + border-inline-end: 1px solid #A9B7C9; + min-width: 0; + width: 3px; + background-color: transparent; + margin-inline-start: -3px; + position: relative; } } @@ -193,8 +174,7 @@ } } -@media (-moz-windows-default-theme) and (-moz-os-version: windows-vista), - (-moz-windows-default-theme) and (-moz-os-version: windows-win7) { +@media (-moz-windows-default-theme) and (-moz-os-version: windows-win7) { #placesView, #infoPane, #placesList, diff --git a/browser/themes/windows/places/places.css b/browser/themes/windows/places/places.css index 4ec8f6555..769cfcc25 100644 --- a/browser/themes/windows/places/places.css +++ b/browser/themes/windows/places/places.css @@ -24,21 +24,17 @@ cursor: default; } -/* Style Places sidebars as Vista media collection */ @media (-moz-windows-default-theme) { - @media not all and (-moz-os-version: windows-xp) { - .sidebar-placesTree { - background-color: transparent; - border-top: none; - } + .sidebar-placesTree { + background-color: transparent; + border-top: none; + } - .sidebar-placesTreechildren::-moz-tree-cell-text(leaf, hover) { - text-decoration: none; - } + .sidebar-placesTreechildren::-moz-tree-cell-text(leaf, hover) { + text-decoration: none; } - @media (-moz-os-version: windows-vista), - (-moz-os-version: windows-win7) { + @media (-moz-os-version: windows-win7) { #bookmarksPanel, #history-panel, #tabs-panel { diff --git a/browser/themes/windows/places/query-XP.png b/browser/themes/windows/places/query-XP.png deleted file mode 100644 index 9e79fc791..000000000 Binary files a/browser/themes/windows/places/query-XP.png and /dev/null differ diff --git a/browser/themes/windows/places/starred48-XP.png b/browser/themes/windows/places/starred48-XP.png deleted file mode 100644 index 1cb7bc57d..000000000 Binary files a/browser/themes/windows/places/starred48-XP.png and /dev/null differ diff --git a/browser/themes/windows/places/tag-XP.png b/browser/themes/windows/places/tag-XP.png deleted file mode 100644 index 4b4a13e66..000000000 Binary files a/browser/themes/windows/places/tag-XP.png and /dev/null differ diff --git a/browser/themes/windows/places/toolbarDropMarker-XP.png b/browser/themes/windows/places/toolbarDropMarker-XP.png deleted file mode 100644 index 9173b7a7a..000000000 Binary files a/browser/themes/windows/places/toolbarDropMarker-XP.png and /dev/null differ diff --git a/browser/themes/windows/places/unsortedBookmarks-XP.png b/browser/themes/windows/places/unsortedBookmarks-XP.png deleted file mode 100644 index cf73f9464..000000000 Binary files a/browser/themes/windows/places/unsortedBookmarks-XP.png and /dev/null differ diff --git a/browser/themes/windows/preferences/alwaysAsk-XP.png b/browser/themes/windows/preferences/alwaysAsk-XP.png deleted file mode 100644 index 8693211ac..000000000 Binary files a/browser/themes/windows/preferences/alwaysAsk-XP.png and /dev/null differ diff --git a/browser/themes/windows/preferences/application-XP.png b/browser/themes/windows/preferences/application-XP.png deleted file mode 100644 index 7d279ff84..000000000 Binary files a/browser/themes/windows/preferences/application-XP.png and /dev/null differ diff --git a/browser/themes/windows/preferences/saveFile-XP.png b/browser/themes/windows/preferences/saveFile-XP.png deleted file mode 100644 index e115eaa9f..000000000 Binary files a/browser/themes/windows/preferences/saveFile-XP.png and /dev/null differ diff --git a/browser/themes/windows/privatebrowsing-mask-tabstrip-XPVista7.png b/browser/themes/windows/privatebrowsing-mask-tabstrip-XPVista7.png deleted file mode 100644 index bd5d46a76..000000000 Binary files a/browser/themes/windows/privatebrowsing-mask-tabstrip-XPVista7.png and /dev/null differ diff --git a/browser/themes/windows/privatebrowsing-mask-tabstrip-win7.png b/browser/themes/windows/privatebrowsing-mask-tabstrip-win7.png new file mode 100644 index 000000000..bd5d46a76 Binary files /dev/null and b/browser/themes/windows/privatebrowsing-mask-tabstrip-win7.png differ diff --git a/browser/themes/windows/privatebrowsing-mask-titlebar-XPVista7-tall.png b/browser/themes/windows/privatebrowsing-mask-titlebar-XPVista7-tall.png deleted file mode 100644 index 4a723c54e..000000000 Binary files a/browser/themes/windows/privatebrowsing-mask-titlebar-XPVista7-tall.png and /dev/null differ diff --git a/browser/themes/windows/privatebrowsing-mask-titlebar-XPVista7.png b/browser/themes/windows/privatebrowsing-mask-titlebar-XPVista7.png deleted file mode 100644 index 835912b53..000000000 Binary files a/browser/themes/windows/privatebrowsing-mask-titlebar-XPVista7.png and /dev/null differ diff --git a/browser/themes/windows/privatebrowsing-mask-titlebar-win7-tall.png b/browser/themes/windows/privatebrowsing-mask-titlebar-win7-tall.png new file mode 100644 index 000000000..4a723c54e Binary files /dev/null and b/browser/themes/windows/privatebrowsing-mask-titlebar-win7-tall.png differ diff --git a/browser/themes/windows/privatebrowsing-mask-titlebar-win7.png b/browser/themes/windows/privatebrowsing-mask-titlebar-win7.png new file mode 100644 index 000000000..835912b53 Binary files /dev/null and b/browser/themes/windows/privatebrowsing-mask-titlebar-win7.png differ diff --git a/browser/themes/windows/reload-stop-go-XPVista7.png b/browser/themes/windows/reload-stop-go-XPVista7.png deleted file mode 100644 index 3ef32c3ce..000000000 Binary files a/browser/themes/windows/reload-stop-go-XPVista7.png and /dev/null differ diff --git a/browser/themes/windows/reload-stop-go-XPVista7@2x.png b/browser/themes/windows/reload-stop-go-XPVista7@2x.png deleted file mode 100644 index 38b27bf0c..000000000 Binary files a/browser/themes/windows/reload-stop-go-XPVista7@2x.png and /dev/null differ diff --git a/browser/themes/windows/reload-stop-go-win7.png b/browser/themes/windows/reload-stop-go-win7.png new file mode 100644 index 000000000..3ef32c3ce Binary files /dev/null and b/browser/themes/windows/reload-stop-go-win7.png differ diff --git a/browser/themes/windows/reload-stop-go-win7@2x.png b/browser/themes/windows/reload-stop-go-win7@2x.png new file mode 100644 index 000000000..38b27bf0c Binary files /dev/null and b/browser/themes/windows/reload-stop-go-win7@2x.png differ diff --git a/browser/themes/windows/sync-horizontalbar-XPVista7.png b/browser/themes/windows/sync-horizontalbar-XPVista7.png deleted file mode 100644 index 2c97ce6db..000000000 Binary files a/browser/themes/windows/sync-horizontalbar-XPVista7.png and /dev/null differ diff --git a/browser/themes/windows/sync-horizontalbar-XPVista7@2x.png b/browser/themes/windows/sync-horizontalbar-XPVista7@2x.png deleted file mode 100644 index ee117ab73..000000000 Binary files a/browser/themes/windows/sync-horizontalbar-XPVista7@2x.png and /dev/null differ diff --git a/browser/themes/windows/sync-horizontalbar-win7.png b/browser/themes/windows/sync-horizontalbar-win7.png new file mode 100644 index 000000000..2c97ce6db Binary files /dev/null and b/browser/themes/windows/sync-horizontalbar-win7.png differ diff --git a/browser/themes/windows/sync-horizontalbar-win7@2x.png b/browser/themes/windows/sync-horizontalbar-win7@2x.png new file mode 100644 index 000000000..ee117ab73 Binary files /dev/null and b/browser/themes/windows/sync-horizontalbar-win7@2x.png differ diff --git a/browser/themes/windows/syncProgress-horizontalbar-XPVista7.png b/browser/themes/windows/syncProgress-horizontalbar-XPVista7.png deleted file mode 100644 index 48cd11055..000000000 Binary files a/browser/themes/windows/syncProgress-horizontalbar-XPVista7.png and /dev/null differ diff --git a/browser/themes/windows/syncProgress-horizontalbar-XPVista7@2x.png b/browser/themes/windows/syncProgress-horizontalbar-XPVista7@2x.png deleted file mode 100644 index 741dd2ed4..000000000 Binary files a/browser/themes/windows/syncProgress-horizontalbar-XPVista7@2x.png and /dev/null differ diff --git a/browser/themes/windows/syncProgress-horizontalbar-win7.png b/browser/themes/windows/syncProgress-horizontalbar-win7.png new file mode 100644 index 000000000..48cd11055 Binary files /dev/null and b/browser/themes/windows/syncProgress-horizontalbar-win7.png differ diff --git a/browser/themes/windows/syncProgress-horizontalbar-win7@2x.png b/browser/themes/windows/syncProgress-horizontalbar-win7@2x.png new file mode 100644 index 000000000..741dd2ed4 Binary files /dev/null and b/browser/themes/windows/syncProgress-horizontalbar-win7@2x.png differ diff --git a/browser/themes/windows/syncProgress-toolbar-XPVista7.png b/browser/themes/windows/syncProgress-toolbar-XPVista7.png deleted file mode 100644 index 49e224f0d..000000000 Binary files a/browser/themes/windows/syncProgress-toolbar-XPVista7.png and /dev/null differ diff --git a/browser/themes/windows/syncProgress-toolbar-XPVista7@2x.png b/browser/themes/windows/syncProgress-toolbar-XPVista7@2x.png deleted file mode 100644 index fd2038725..000000000 Binary files a/browser/themes/windows/syncProgress-toolbar-XPVista7@2x.png and /dev/null differ diff --git a/browser/themes/windows/syncProgress-toolbar-win7.png b/browser/themes/windows/syncProgress-toolbar-win7.png new file mode 100644 index 000000000..49e224f0d Binary files /dev/null and b/browser/themes/windows/syncProgress-toolbar-win7.png differ diff --git a/browser/themes/windows/syncProgress-toolbar-win7@2x.png b/browser/themes/windows/syncProgress-toolbar-win7@2x.png new file mode 100644 index 000000000..fd2038725 Binary files /dev/null and b/browser/themes/windows/syncProgress-toolbar-win7@2x.png differ diff --git a/browser/themes/windows/tabbrowser/newtab-XPVista7.svg b/browser/themes/windows/tabbrowser/newtab-XPVista7.svg deleted file mode 100644 index 3f431c9db..000000000 --- a/browser/themes/windows/tabbrowser/newtab-XPVista7.svg +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - diff --git a/browser/themes/windows/tabbrowser/newtab-inverted-XPVista7.svg b/browser/themes/windows/tabbrowser/newtab-inverted-XPVista7.svg deleted file mode 100644 index 10ffbc745..000000000 --- a/browser/themes/windows/tabbrowser/newtab-inverted-XPVista7.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - diff --git a/browser/themes/windows/tabbrowser/newtab-inverted-win7.svg b/browser/themes/windows/tabbrowser/newtab-inverted-win7.svg new file mode 100644 index 000000000..10ffbc745 --- /dev/null +++ b/browser/themes/windows/tabbrowser/newtab-inverted-win7.svg @@ -0,0 +1,13 @@ + + + + + + + + + + + diff --git a/browser/themes/windows/tabbrowser/newtab-win7.svg b/browser/themes/windows/tabbrowser/newtab-win7.svg new file mode 100644 index 000000000..3f431c9db --- /dev/null +++ b/browser/themes/windows/tabbrowser/newtab-win7.svg @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + diff --git a/browser/themes/windows/tabbrowser/tab-arrow-left-XPVista7.svg b/browser/themes/windows/tabbrowser/tab-arrow-left-XPVista7.svg deleted file mode 100644 index 41bb5ab13..000000000 --- a/browser/themes/windows/tabbrowser/tab-arrow-left-XPVista7.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - diff --git a/browser/themes/windows/tabbrowser/tab-arrow-left-win7.svg b/browser/themes/windows/tabbrowser/tab-arrow-left-win7.svg new file mode 100644 index 000000000..41bb5ab13 --- /dev/null +++ b/browser/themes/windows/tabbrowser/tab-arrow-left-win7.svg @@ -0,0 +1,13 @@ + + + + + + + + + + + diff --git a/browser/themes/windows/toolbarbutton-dropdown-arrow-XPVista7.png b/browser/themes/windows/toolbarbutton-dropdown-arrow-XPVista7.png deleted file mode 100644 index 5f892f532..000000000 Binary files a/browser/themes/windows/toolbarbutton-dropdown-arrow-XPVista7.png and /dev/null differ diff --git a/browser/themes/windows/toolbarbutton-dropdown-arrow-win7.png b/browser/themes/windows/toolbarbutton-dropdown-arrow-win7.png new file mode 100644 index 000000000..5f892f532 Binary files /dev/null and b/browser/themes/windows/toolbarbutton-dropdown-arrow-win7.png differ diff --git a/browser/themes/windows/urlbar-history-dropmarker-XPVista7.png b/browser/themes/windows/urlbar-history-dropmarker-XPVista7.png deleted file mode 100644 index b03338822..000000000 Binary files a/browser/themes/windows/urlbar-history-dropmarker-XPVista7.png and /dev/null differ diff --git a/browser/themes/windows/urlbar-history-dropmarker-XPVista7@2x.png b/browser/themes/windows/urlbar-history-dropmarker-XPVista7@2x.png deleted file mode 100644 index bff2997f8..000000000 Binary files a/browser/themes/windows/urlbar-history-dropmarker-XPVista7@2x.png and /dev/null differ diff --git a/browser/themes/windows/urlbar-history-dropmarker-win7.png b/browser/themes/windows/urlbar-history-dropmarker-win7.png new file mode 100644 index 000000000..b03338822 Binary files /dev/null and b/browser/themes/windows/urlbar-history-dropmarker-win7.png differ diff --git a/browser/themes/windows/urlbar-history-dropmarker-win7@2x.png b/browser/themes/windows/urlbar-history-dropmarker-win7@2x.png new file mode 100644 index 000000000..bff2997f8 Binary files /dev/null and b/browser/themes/windows/urlbar-history-dropmarker-win7@2x.png differ diff --git a/browser/themes/windows/windowsShared.inc b/browser/themes/windows/windowsShared.inc index 0cb2ab163..199a62292 100644 --- a/browser/themes/windows/windowsShared.inc +++ b/browser/themes/windows/windowsShared.inc @@ -8,6 +8,4 @@ %define fgTabTexture linear-gradient(transparent 2px, @toolbarHighlight@ 2px, @toolbarHighlight@) %define fgTabBackgroundColor -moz-dialog %define fgTabTextureLWT @fgTabTexture@ - -% Aero-only defines %define customToolbarColor hsl(210,75%,92%) -- cgit v1.2.3 From 4c697043da9fe3f58a7e070dad74eab6972695a0 Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Tue, 20 Feb 2018 14:01:05 +0100 Subject: Remove windows-xp and windows-vista from @media(-moz-os-version) --- browser/components/webextensions/extension-win-panel.css | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'browser') diff --git a/browser/components/webextensions/extension-win-panel.css b/browser/components/webextensions/extension-win-panel.css index ddafe3ea5..9da6da14c 100644 --- a/browser/components/webextensions/extension-win-panel.css +++ b/browser/components/webextensions/extension-win-panel.css @@ -1,6 +1,4 @@ -@media (-moz-os-version: windows-xp), - (-moz-os-version: windows-vista), - (-moz-os-version: windows-win7) { +@media (-moz-os-version: windows-win7) { body { border-radius: 4px; } -- cgit v1.2.3 From ef9aeb6a08749ecc43242ba523d67632a6ddc0dc Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Thu, 10 Aug 2017 23:16:51 +0200 Subject: Update UA construction. --- browser/config/version.txt | 2 +- browser/config/version_display.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'browser') diff --git a/browser/config/version.txt b/browser/config/version.txt index b406fbef6..d90a8c220 100644 --- a/browser/config/version.txt +++ b/browser/config/version.txt @@ -1 +1 @@ -55.0.0 +52.9.0 diff --git a/browser/config/version_display.txt b/browser/config/version_display.txt index b406fbef6..d90a8c220 100644 --- a/browser/config/version_display.txt +++ b/browser/config/version_display.txt @@ -1 +1 @@ -55.0.0 +52.9.0 -- cgit v1.2.3 From 580ebc105678c6d01cf64e7d75116d77984024a0 Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Fri, 11 Aug 2017 00:28:41 +0200 Subject: Replace display version in about box with build ID. --- browser/base/content/aboutDialog.js | 15 ++++++++------- browser/base/content/aboutDialog.xul | 2 +- 2 files changed, 9 insertions(+), 8 deletions(-) (limited to 'browser') diff --git a/browser/base/content/aboutDialog.js b/browser/base/content/aboutDialog.js index b024d2d52..55d8ff262 100644 --- a/browser/base/content/aboutDialog.js +++ b/browser/base/content/aboutDialog.js @@ -40,16 +40,17 @@ function init(aEvent) // Pref is unset } - // Include the build ID and display warning if this is an "a#" (nightly or aurora) build + // Include the build ID let versionField = document.getElementById("version"); let version = Services.appinfo.version; + let buildID = Services.appinfo.appBuildID; + let year = buildID.slice(0, 4); + let month = buildID.slice(4, 6); + let day = buildID.slice(6, 8); + versionField.textContent = buildID + ` (${year}-${month}-${day})`; + + // Display warning if this is an "a#" (nightly or aurora) build if (/a\d+$/.test(version)) { - let buildID = Services.appinfo.appBuildID; - let year = buildID.slice(0, 4); - let month = buildID.slice(4, 6); - let day = buildID.slice(6, 8); - versionField.textContent += ` (${year}-${month}-${day})`; - document.getElementById("experimental").hidden = false; document.getElementById("communityDesc").hidden = true; } diff --git a/browser/base/content/aboutDialog.xul b/browser/base/content/aboutDialog.xul index ef2804f31..7988c0e34 100644 --- a/browser/base/content/aboutDialog.xul +++ b/browser/base/content/aboutDialog.xul @@ -45,7 +45,7 @@ -#expand +#expand #ifndef NIGHTLY_BUILD #endif -- cgit v1.2.3 From 5f813f143bad0919f4c228f5045c3b090eeb25fd Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Wed, 21 Feb 2018 22:31:23 +0100 Subject: Provide UA Gecko and Firefox slices by default for web compatibility. --- browser/branding/official/pref/firefox-branding.js | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'browser') diff --git a/browser/branding/official/pref/firefox-branding.js b/browser/branding/official/pref/firefox-branding.js index eb2bf489b..190b84e78 100644 --- a/browser/branding/official/pref/firefox-branding.js +++ b/browser/branding/official/pref/firefox-branding.js @@ -37,6 +37,10 @@ pref("app.update.url.manual", "https://@BRANDING_SITEURL@/"); // supplied in the "An update is available" page of the update wizard. pref("app.update.url.details", "https://@BRANDING_SITEURL@/@BRANDING_RELNOTESPATH@"); +// Provide UA Gecko and Firefox slices for web compatibility +pref("general.useragent.compatMode.firefox",true); +pref("general.useragent.compatMode.gecko",true); + // Switch Application Updates off for now pref("app.update.enabled", false); -- cgit v1.2.3 From 49e8a36e170da3066d7c0216fca272ecac988102 Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Fri, 11 Aug 2017 20:02:04 +0200 Subject: Link about dialog version to general.useragent.appVersionIsBuildID. true: YYYY.MM.DD.HHMM false: v{internal version number} (YYYY-MM-DD) --- browser/base/content/aboutDialog.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'browser') diff --git a/browser/base/content/aboutDialog.js b/browser/base/content/aboutDialog.js index 55d8ff262..04384d584 100644 --- a/browser/base/content/aboutDialog.js +++ b/browser/base/content/aboutDialog.js @@ -47,7 +47,13 @@ function init(aEvent) let year = buildID.slice(0, 4); let month = buildID.slice(4, 6); let day = buildID.slice(6, 8); - versionField.textContent = buildID + ` (${year}-${month}-${day})`; + let hour = buildID.slice(8, 10); + let minute = buildID.slice(10, 12); + if (Services.prefs.getBoolPref("general.useragent.appVersionIsBuildID")) { + versionField.textContent = `${year}.${month}.${day}.${hour}${minute}`; + } else { + versionField.textContent = `v` + version + ` (${year}-${month}-${day})`; + } // Display warning if this is an "a#" (nightly or aurora) build if (/a\d+$/.test(version)) { -- cgit v1.2.3 From 8896ca5c0a7b8bc6a086bf60d67b14fca5488dc8 Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Sat, 12 Aug 2017 00:48:59 +0200 Subject: Update various texts and references. --- browser/base/content/aboutDialog.xul | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) (limited to 'browser') diff --git a/browser/base/content/aboutDialog.xul b/browser/base/content/aboutDialog.xul index 7988c0e34..b77896b95 100644 --- a/browser/base/content/aboutDialog.xul +++ b/browser/base/content/aboutDialog.xul @@ -47,7 +47,7 @@ #expand #ifndef NIGHTLY_BUILD - +#expand #endif @@ -120,19 +120,13 @@ - &community.start2;&community.middle2;&community.end3; + Basilisk is community software released by and Mozilla developers. Learn to this software. - &helpus.start;&helpus.middle;&helpus.end; + Want to help? Please consider or get involved with our of the Unified XUL Platform. @@ -141,7 +135,7 @@ - + &trademarkInfo.part1; -- cgit v1.2.3 From bc0273b478b2185ec51adc4a27db2e1b014a6dab Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Sat, 21 Oct 2017 16:39:52 +0200 Subject: Strip HHMM from the about dialog displayed version. --- browser/base/content/aboutDialog.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'browser') diff --git a/browser/base/content/aboutDialog.js b/browser/base/content/aboutDialog.js index 04384d584..f9571621f 100644 --- a/browser/base/content/aboutDialog.js +++ b/browser/base/content/aboutDialog.js @@ -50,7 +50,7 @@ function init(aEvent) let hour = buildID.slice(8, 10); let minute = buildID.slice(10, 12); if (Services.prefs.getBoolPref("general.useragent.appVersionIsBuildID")) { - versionField.textContent = `${year}.${month}.${day}.${hour}${minute}`; + versionField.textContent = `${year}.${month}.${day}`; } else { versionField.textContent = `v` + version + ` (${year}-${month}-${day})`; } -- cgit v1.2.3 From ee221138d4bbb5e6209d648a1a14cc176100963a Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Thu, 22 Feb 2018 00:04:26 +0100 Subject: Restore the dynamic release notes URL from pref --- browser/base/content/aboutDialog.xul | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'browser') diff --git a/browser/base/content/aboutDialog.xul b/browser/base/content/aboutDialog.xul index b77896b95..f64e79681 100644 --- a/browser/base/content/aboutDialog.xul +++ b/browser/base/content/aboutDialog.xul @@ -47,7 +47,7 @@ #expand #ifndef NIGHTLY_BUILD -#expand + #endif -- cgit v1.2.3 From 3458dde44f5693ef2c1c2ff8b056fc1f4022701d Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Sat, 26 Aug 2017 15:04:25 +0200 Subject: Add site-specific overrides and remove the overruling global. --- browser/components/nsBrowserGlue.js | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'browser') diff --git a/browser/components/nsBrowserGlue.js b/browser/components/nsBrowserGlue.js index d69a11f6b..f97c173a0 100644 --- a/browser/components/nsBrowserGlue.js +++ b/browser/components/nsBrowserGlue.js @@ -64,6 +64,7 @@ XPCOMUtils.defineLazyServiceGetter(this, "AlertsService", "@mozilla.org/alerts-s ["Task", "resource://gre/modules/Task.jsm"], ["UITour", "resource:///modules/UITour.jsm"], ["URLBarZoom", "resource:///modules/URLBarZoom.jsm"], + ["UserAgentOverrides", "resource://gre/modules/UserAgentOverrides.jsm"], ["WebChannel", "resource://gre/modules/WebChannel.jsm"], ["WindowsRegistry", "resource://gre/modules/WindowsRegistry.jsm"], ["webrtcUI", "resource:///modules/webrtcUI.jsm"], @@ -662,6 +663,8 @@ BrowserGlue.prototype = { } } catch (ex) { /* missing any of the prefs is not critical */ } + UserAgentOverrides.init(); + PageThumbs.init(); webrtcUI.init(); AboutHome.init(); @@ -1042,6 +1045,7 @@ BrowserGlue.prototype = { BrowserUsageTelemetry.uninit(); SelfSupportBackend.uninit(); + UserAgentOverrides.uninit(); PageThumbs.uninit(); NewTabMessages.uninit(); AboutNewTab.uninit(); -- cgit v1.2.3 From 6f96569b4499be07c210ca6c38739bbbc7ebdee7 Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Thu, 22 Feb 2018 08:13:47 +0100 Subject: Set BASILISK_VERSION override major.minor to 52.9 --- browser/confvars.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'browser') diff --git a/browser/confvars.sh b/browser/confvars.sh index 65cf154e9..0cccede38 100755 --- a/browser/confvars.sh +++ b/browser/confvars.sh @@ -18,7 +18,7 @@ if test "$OS_ARCH" = "WINNT"; then MOZ_MAINTENANCE_SERVICE= fi -# For Basilisk we want to use 55.0.YYYY.MM.DD as MOZ_APP_VERSION in release +# For Basilisk we want to use 52.9.YYYY.MM.DD as MOZ_APP_VERSION in release # builds so add-on developers have something to target while maintaining # Firefox compatiblity. # To enable add "export BASILISK_VERSION=1" to the .mozconfig file. @@ -26,7 +26,7 @@ fi # don't export the variable if you are in development or don't care. # When not exported we fall back the value in the version*.txt file. if test -n "$BASILISK_VERSION" ; then - MOZ_APP_VERSION=55.0.`date --utc '+%Y.%m.%d'` + MOZ_APP_VERSION=52.9.`date --utc '+%Y.%m.%d'` MOZ_APP_VERSION_DISPLAY=`date --utc '+%Y.%m.%d'` else MOZ_APP_VERSION=`cat ${_topsrcdir}/$MOZ_BUILD_APP/config/version.txt` -- cgit v1.2.3 From cff4a7d0b65b9cfe272d72f7a26e3dcc33ea0a03 Mon Sep 17 00:00:00 2001 From: janekptacijarabaci Date: Sun, 27 Aug 2017 10:19:04 +0200 Subject: Bug 1217907: [RTL] Wrong direction in about:preferences#general homepage --- browser/themes/shared/incontentprefs/preferences.inc.css | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'browser') diff --git a/browser/themes/shared/incontentprefs/preferences.inc.css b/browser/themes/shared/incontentprefs/preferences.inc.css index 577baa6ed..0e62660de 100644 --- a/browser/themes/shared/incontentprefs/preferences.inc.css +++ b/browser/themes/shared/incontentprefs/preferences.inc.css @@ -173,6 +173,11 @@ treecol { margin-inline-start: 0; } +#browserHomePage:-moz-locale-dir(rtl) input { + unicode-bidi: plaintext; + direction: rtl; +} + /* Content pane */ #playDRMContentLink { /* Line up with the buttons in the other grid bits: */ -- cgit v1.2.3 From f3f9b7b06e37f870463a5f2196457cca6b10d700 Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Thu, 22 Feb 2018 11:57:51 +0100 Subject: Prevent issues and possible leaks with the bookmarks menu bar as a result of XBL re-binding. --- browser/base/content/browser-places.js | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'browser') diff --git a/browser/base/content/browser-places.js b/browser/base/content/browser-places.js index 14e90cde2..de880d11d 100644 --- a/browser/base/content/browser-places.js +++ b/browser/base/content/browser-places.js @@ -1555,6 +1555,10 @@ var BookmarkingUI = { // so kill current view and let popupshowing generate a new one. if (this.button._placesView) this.button._placesView.uninit(); + // ...and do the same for the menu bar. + let menubar = document.getElementById("bookmarksMenu"); + if (menubar._placesview) + menubar._placesview.uninit(); // We have to do the same thing for the "special" views underneath the // the bookmarks menu. -- cgit v1.2.3 From 7eb2c156ba826a0ebf05db56a9fccf46094478ea Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Fri, 23 Feb 2018 09:39:10 +0100 Subject: Fix typo in f3f9b7b06e37f870463a5f2196457cca6b10d700 (caps) --- browser/base/content/browser-places.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'browser') diff --git a/browser/base/content/browser-places.js b/browser/base/content/browser-places.js index de880d11d..a447880be 100644 --- a/browser/base/content/browser-places.js +++ b/browser/base/content/browser-places.js @@ -1557,8 +1557,8 @@ var BookmarkingUI = { this.button._placesView.uninit(); // ...and do the same for the menu bar. let menubar = document.getElementById("bookmarksMenu"); - if (menubar._placesview) - menubar._placesview.uninit(); + if (menubar && menubar._placesView) + menubar._placesView.uninit(); // We have to do the same thing for the "special" views underneath the // the bookmarks menu. -- cgit v1.2.3 From 011dac290a9ea52539754aa64958df204425eb76 Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Tue, 12 Dec 2017 22:44:02 +0100 Subject: Don't build GMP-clearkey when not building EME. --- browser/installer/package-manifest.in | 2 ++ 1 file changed, 2 insertions(+) (limited to 'browser') diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in index c2269c069..dee6a3faa 100644 --- a/browser/installer/package-manifest.in +++ b/browser/installer/package-manifest.in @@ -821,8 +821,10 @@ bin/libfreebl_32int64_3.so ; media +#ifdef MOZ_EME @RESPATH@/gmp-clearkey/0.1/@DLL_PREFIX@clearkey@DLL_SUFFIX@ @RESPATH@/gmp-clearkey/0.1/clearkey.info +#endif ; gfx #ifdef XP_WIN -- cgit v1.2.3 From c88c161875beca091fe183a3b04480422b3d3885 Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Wed, 13 Dec 2017 17:47:44 +0100 Subject: Remove unnecessary front-end features and pres when not building EME. Tag #26. --- browser/app/profile/firefox.js | 19 ++++++++++--------- browser/base/content/browser-media.js | 4 ++++ browser/base/jar.mn | 2 +- browser/components/preferences/in-content/content.js | 2 ++ browser/components/preferences/in-content/content.xul | 4 ++++ browser/components/preferences/in-content/jar.mn | 2 +- 6 files changed, 22 insertions(+), 11 deletions(-) (limited to 'browser') diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js index b46d944e8..94615ded0 100644 --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js @@ -1330,20 +1330,21 @@ pref("identity.fxaccounts.migrateToDevEdition", false); pref("ui.key.menuAccessKeyFocuses", true); #endif +#ifdef MOZ_EME // Encrypted media extensions. -#ifdef XP_LINUX -// On Linux EME is visible but disabled by default. This is so that the -// "Play DRM content" checkbox in the Firefox UI is unchecked by default. +// EME is visible but disabled by default. This is so that the +// "Play DRM content" checkbox in the browser UI is unchecked by default. // DRM requires downloading and installing proprietary binaries, which -// users on an open source operating systems didn't opt into. The first -// time a site using EME is encountered, the user will be prompted to -// enable DRM, whereupon the EME plugin binaries will be downloaded if -// permission is granted. +// users didn't necessarily opt-in to by installing the browser. +// The first time a site using EME is encountered, the user will be +// prompted to enable DRM, whereupon the EME plugin binaries will be +// downloaded if permission is granted. pref("media.eme.enabled", false); +pref("media.eme.apiVisible", true); #else -pref("media.eme.enabled", true); +// Disable redundant interfaces +pref("media.eme.apiVisible", false); #endif -pref("media.eme.apiVisible", true); // Decode using Gecko Media Plugins in