diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in index 6ebf2f62c477..9fcb5900b77f 100644 --- a/browser/installer/package-manifest.in +++ b/browser/installer/package-manifest.in @@ -221,10 +221,13 @@ @RESPATH@/chrome/toolkit.manifest #ifdef MOZ_GTK @RESPATH@/browser/chrome/icons/default/default16.png +@RESPATH@/browser/chrome/icons/default/default22.png +@RESPATH@/browser/chrome/icons/default/default24.png @RESPATH@/browser/chrome/icons/default/default32.png @RESPATH@/browser/chrome/icons/default/default48.png @RESPATH@/browser/chrome/icons/default/default64.png @RESPATH@/browser/chrome/icons/default/default128.png +@RESPATH@/browser/chrome/icons/default/default256.png #endif ; [DevTools Startup Files] diff --git a/moz.build b/moz.build index a931749b4581..26fad42e0e79 100644 --- a/moz.build +++ b/moz.build @@ -160,6 +160,7 @@ DIRS += [ "python", "testing", "third_party/python", + "waterfox", ] if not CONFIG["JS_STANDALONE"]: diff --git a/other-licenses/7zstub/firefox/7zSD.ARM64.sfx b/other-licenses/7zstub/firefox/7zSD.ARM64.sfx index 5451c3553ba6..f2d97189244d 100644 Binary files a/other-licenses/7zstub/firefox/7zSD.ARM64.sfx and b/other-licenses/7zstub/firefox/7zSD.ARM64.sfx differ diff --git a/other-licenses/7zstub/firefox/7zSD.ARM64_original.sfx b/other-licenses/7zstub/firefox/7zSD.ARM64_original.sfx new file mode 100644 index 000000000000..5451c3553ba6 Binary files /dev/null and b/other-licenses/7zstub/firefox/7zSD.ARM64_original.sfx differ diff --git a/other-licenses/7zstub/firefox/7zSD.Win32.sfx b/other-licenses/7zstub/firefox/7zSD.Win32.sfx index 4d529b0433da..35d314393ebd 100644 Binary files a/other-licenses/7zstub/firefox/7zSD.Win32.sfx and b/other-licenses/7zstub/firefox/7zSD.Win32.sfx differ diff --git a/other-licenses/7zstub/firefox/7zSD.Win32_original.sfx b/other-licenses/7zstub/firefox/7zSD.Win32_original.sfx new file mode 100644 index 000000000000..4d529b0433da Binary files /dev/null and b/other-licenses/7zstub/firefox/7zSD.Win32_original.sfx differ diff --git a/other-licenses/7zstub/firefox/resource.rc b/other-licenses/7zstub/firefox/resource.rc index 3a50a450c3fd..1b7711230f35 100644 --- a/other-licenses/7zstub/firefox/resource.rc +++ b/other-licenses/7zstub/firefox/resource.rc @@ -16,13 +16,13 @@ BEGIN BEGIN BLOCK "040904b0" BEGIN - VALUE "CompanyName", "Mozilla" - VALUE "FileDescription", "Firefox" + VALUE "CompanyName", "Waterfox Limited" + VALUE "FileDescription", "Waterfox" VALUE "FileVersion", MY_VERSION VALUE "InternalName", "7zSD.sfx" - VALUE "LegalCopyright", "Mozilla" + VALUE "LegalCopyright", "Waterfox Limited" VALUE "OriginalFilename", "7zSD.sfx" - VALUE "ProductName", "Firefox" + VALUE "ProductName", "Waterfox" VALUE "ProductVersion", MY_VERSION END END diff --git a/other-licenses/7zstub/firefox/setup.ico b/other-licenses/7zstub/firefox/setup.ico index 05ef62368ede..80b28caa2884 100644 Binary files a/other-licenses/7zstub/firefox/setup.ico and b/other-licenses/7zstub/firefox/setup.ico differ diff --git a/waterfox/browser/branding/LICENSE b/waterfox/browser/branding/LICENSE new file mode 100644 index 000000000000..3e7b64d21611 --- /dev/null +++ b/waterfox/browser/branding/LICENSE @@ -0,0 +1,8 @@ +These files are under the MPL 2, as below. However, please note that you +are not granted any trademark rights or licenses to the trademarks of +Waterfox Limited or any party, including without limitation the +Waterfox name or logo. + +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 https://mozilla.org/MPL/2.0/. diff --git a/waterfox/browser/branding/VisualElements_150.png b/waterfox/browser/branding/VisualElements_150.png new file mode 100644 index 000000000000..828ef6828456 Binary files /dev/null and b/waterfox/browser/branding/VisualElements_150.png differ diff --git a/waterfox/browser/branding/VisualElements_70.png b/waterfox/browser/branding/VisualElements_70.png new file mode 100644 index 000000000000..dbba4a3f97b3 Binary files /dev/null and b/waterfox/browser/branding/VisualElements_70.png differ diff --git a/waterfox/browser/branding/background.png b/waterfox/browser/branding/background.png new file mode 100644 index 000000000000..5f8b443d3151 Binary files /dev/null and b/waterfox/browser/branding/background.png differ diff --git a/waterfox/browser/branding/branding-common.mozbuild b/waterfox/browser/branding/branding-common.mozbuild new file mode 100644 index 000000000000..70d2d34749a0 --- /dev/null +++ b/waterfox/browser/branding/branding-common.mozbuild @@ -0,0 +1,31 @@ +# -*- 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 Branding(): + 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', + ] + elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk': + FINAL_TARGET_FILES.chrome.icons.default += [ + 'default128.png', + 'default16.png', + 'default22.png', + 'default24.png', + 'default256.png', + 'default32.png', + 'default48.png', + 'default64.png', + ] diff --git a/waterfox/browser/branding/branding.nsi b/waterfox/browser/branding/branding.nsi new file mode 100644 index 000000000000..4303f0f3964b --- /dev/null +++ b/waterfox/browser/branding/branding.nsi @@ -0,0 +1,76 @@ +# 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/. + +# NSIS branding defines for official release builds. +# The nightly build branding.nsi is located in browser/installer/windows/nsis/ +# The unofficial build branding.nsi is located in browser/branding/unofficial/ + +# BrandFullNameInternal is used for some registry and file system values +# instead of BrandFullName and typically should not be modified. +!define BrandFullNameInternal "Waterfox" +!define BrandFullName "Waterfox" +!define CompanyName "Waterfox Limited" +!define URLInfoAbout "https://www.waterfox.net" +!define URLUpdateInfo "https://www.waterfox.net/docs/releases/${AppVersion}" +!define HelpLink "https://www.waterfox.net/support/" + +; 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. +!define OFFICIAL +!define URLStubDownloadX86 "" +!define URLStubDownloadAMD64 "https://cdn.waterfox.net/releases/win64/latest" +!define URLStubDownloadAArch64 "" +!define URLManualDownload "https://www.waterfox.net/download/" +!define URLSystemRequirements "https://www.waterfox.net/support/desktop/system-requirements/" +!define Channel "release" + +# The installer's certificate name and issuer expected by the stub installer +!define CertNameDownload "WATERFOX LIMITED" +!define CertIssuerDownload "GlobalSign GCC R45 EV CodeSigning CA 2020" + +# Dialog units are used so the UI displays correctly with the system's DPI +# settings. These are tweaked to look good with the en-US strings; ideally +# we would customize them for each locale but we don't really have a way to +# implement that and it would be a ton of work for the localizers. +!define PROFILE_CLEANUP_LABEL_TOP "50u" +!define PROFILE_CLEANUP_LABEL_LEFT "22u" +!define PROFILE_CLEANUP_LABEL_WIDTH "175u" +!define PROFILE_CLEANUP_LABEL_HEIGHT "100u" +!define PROFILE_CLEANUP_LABEL_ALIGN "left" +!define PROFILE_CLEANUP_CHECKBOX_LEFT "22u" +!define PROFILE_CLEANUP_CHECKBOX_WIDTH "175u" +!define PROFILE_CLEANUP_BUTTON_LEFT "22u" +!define INSTALL_HEADER_TOP "70u" +!define INSTALL_HEADER_LEFT "22u" +!define INSTALL_HEADER_WIDTH "180u" +!define INSTALL_HEADER_HEIGHT "100u" +!define INSTALL_BODY_LEFT "22u" +!define INSTALL_BODY_WIDTH "180u" +!define INSTALL_INSTALLING_TOP "115u" +!define INSTALL_INSTALLING_LEFT "270u" +!define INSTALL_INSTALLING_WIDTH "150u" +!define INSTALL_PROGRESS_BAR_TOP "100u" +!define INSTALL_PROGRESS_BAR_LEFT "270u" +!define INSTALL_PROGRESS_BAR_WIDTH "150u" +!define INSTALL_PROGRESS_BAR_HEIGHT "12u" + +!define PROFILE_CLEANUP_CHECKBOX_TOP_MARGIN "12u" +!define PROFILE_CLEANUP_BUTTON_TOP_MARGIN "12u" +!define PROFILE_CLEANUP_BUTTON_X_PADDING "80u" +!define PROFILE_CLEANUP_BUTTON_Y_PADDING "8u" +!define INSTALL_BODY_TOP_MARGIN "20u" + +# Font settings that can be customized for each channel +!define INSTALL_HEADER_FONT_SIZE 20 +!define INSTALL_HEADER_FONT_WEIGHT 600 +!define INSTALL_INSTALLING_FONT_SIZE 15 +!define INSTALL_INSTALLING_FONT_WEIGHT 600 + +# UI Colors that can be customized for each channel +!define COMMON_TEXT_COLOR 0x000000 +!define COMMON_BACKGROUND_COLOR 0xFFFFFF +!define INSTALL_INSTALLING_TEXT_COLOR 0xFFFFFF +# This color is written as 0x00BBGGRR because it's actually a COLORREF value. +!define PROGRESS_BAR_BACKGROUND_COLOR 0xFFAA00 diff --git a/waterfox/browser/branding/configure.sh b/waterfox/browser/branding/configure.sh new file mode 100644 index 000000000000..a2c2d64c9274 --- /dev/null +++ b/waterfox/browser/branding/configure.sh @@ -0,0 +1,27 @@ +# 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/. + +MOZ_APP_DISPLAYNAME=Waterfox +MOZ_APP_NAME=Waterfox +MOZ_APP_PROFILE=Waterfox +MOZ_APP_VENDOR="WaterfoxLimited" +MOZ_DISTRIBUTION_ID=net.waterfox +MOZ_INCLUDE_SOURCE_INFO=1 +MOZ_REQUIRE_SIGNING= +MOZ_TELEMETRY_REPORTING= +MOZ_APP_UA_NAME="Firefox" + +if test "$MOZ_UPDATE_CHANNEL" = "beta"; then + # Official beta builds + MOZ_ASYNCIHANDLERCONTROL_IID="d4d2d920-5d8d-46b0-8169-6c75518fd6e8" + MOZ_HANDLER_CLSID="bb83e31f-4bed-47ec-9edb-cd328ce4c65a" + MOZ_IGECKOBACKCHANNEL_IID="3248b994-9ae6-4eb6-81c7-f50c95ad9e9d" + MOZ_IHANDLERCONTROL_IID="eced8a70-3d19-4d40-b4eb-726231285528" +else + # Official release/esr builds + MOZ_ASYNCIHANDLERCONTROL_IID="fb2703de-e41b-4565-a50b-777f44879c65" + MOZ_HANDLER_CLSID="af069df1-ed1c-4994-9097-8c033d09539c" + MOZ_IGECKOBACKCHANNEL_IID="6f2c203c-73b4-4f74-8a79-1e99202815e3" + MOZ_IHANDLERCONTROL_IID="713883ba-0f4e-481e-823e-e1cb9a7a283c" +fi diff --git a/waterfox/browser/branding/content/about-logo.png b/waterfox/browser/branding/content/about-logo.png new file mode 100644 index 000000000000..4c962f79782e Binary files /dev/null and b/waterfox/browser/branding/content/about-logo.png differ diff --git a/waterfox/browser/branding/content/about-logo.svg b/waterfox/browser/branding/content/about-logo.svg new file mode 100644 index 000000000000..531737bcdd14 --- /dev/null +++ b/waterfox/browser/branding/content/about-logo.svg @@ -0,0 +1,42891 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/waterfox/browser/branding/content/about-logo@2x.png b/waterfox/browser/branding/content/about-logo@2x.png new file mode 100644 index 000000000000..01ea8c399440 Binary files /dev/null and b/waterfox/browser/branding/content/about-logo@2x.png differ diff --git a/waterfox/browser/branding/content/about-wordmark.svg b/waterfox/browser/branding/content/about-wordmark.svg new file mode 100644 index 000000000000..63f3b8c4aa52 --- /dev/null +++ b/waterfox/browser/branding/content/about-wordmark.svg @@ -0,0 +1,13 @@ + + + + about-wordmark + + + + + + + \ No newline at end of file diff --git a/waterfox/browser/branding/content/about.png b/waterfox/browser/branding/content/about.png new file mode 100644 index 000000000000..148e465724d5 Binary files /dev/null and b/waterfox/browser/branding/content/about.png differ diff --git a/waterfox/browser/branding/content/aboutDialog.css b/waterfox/browser/branding/content/aboutDialog.css new file mode 100644 index 000000000000..fe436012f719 --- /dev/null +++ b/waterfox/browser/branding/content/aboutDialog.css @@ -0,0 +1,58 @@ +/* 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/. */ + +#aboutDialogContainer { + background-color: #20123a; + color: #fff; + color-scheme: dark; +} + +#clientBox { + padding: 10px 0 15px; +} + +#leftBox { + background-image: url("chrome://branding/content/about-logo.png"); + background-repeat: no-repeat; + background-size: 192px auto; + background-position: center 20%; + /* min-width and min-height create room for the logo */ + min-width: 210px; + min-height: 210px; + margin-top: 20px; + margin-inline-start: 30px; +} + +@media (min-resolution: 2dppx) { + #leftBox { + background-image: url("chrome://branding/content/about-logo@2x.png"); + } +} + +.text-link { + color: #fff !important; + text-decoration: underline; +} + +#rightBox { + margin-inline: 30px; +} + +#bottomBox { + background-color: hsla(235, 43%, 10%, .5); + padding: 15px 10px 15px; +} + +#trademark { + font-size: xx-small; + text-align: center; + color: #999999; + margin-block: 10px; +} + +@media (-moz-platform: macos) { + #checkForUpdatesButton, #downloadAndInstallButton, #updateButton { + color: #053361; + } +} diff --git a/waterfox/browser/branding/content/firefox-wordmark.svg b/waterfox/browser/branding/content/firefox-wordmark.svg new file mode 100644 index 000000000000..c4c46b7161ab --- /dev/null +++ b/waterfox/browser/branding/content/firefox-wordmark.svg @@ -0,0 +1,12 @@ + + + + Waterfox + + + + + + \ No newline at end of file diff --git a/waterfox/browser/branding/content/jar.mn b/waterfox/browser/branding/content/jar.mn new file mode 100644 index 000000000000..69e19cf536f3 --- /dev/null +++ b/waterfox/browser/branding/content/jar.mn @@ -0,0 +1,18 @@ +# 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/. + +browser.jar: +% content branding %content/branding/ contentaccessible=yes + content/branding/about.png + content/branding/about-logo.png + content/branding/about-logo.svg + content/branding/about-logo@2x.png + content/branding/about-wordmark.svg + content/branding/firefox-wordmark.svg + content/branding/icon16.png (../default16.png) + content/branding/icon32.png (../default32.png) + content/branding/icon48.png (../default48.png) + content/branding/icon64.png (../default64.png) + content/branding/icon128.png (../default128.png) + content/branding/aboutDialog.css diff --git a/waterfox/browser/branding/content/moz.build b/waterfox/browser/branding/content/moz.build new file mode 100644 index 000000000000..d988c0ff9b16 --- /dev/null +++ b/waterfox/browser/branding/content/moz.build @@ -0,0 +1,7 @@ +# -*- 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/. + +JAR_MANIFESTS += ["jar.mn"] diff --git a/waterfox/browser/branding/default128.png b/waterfox/browser/branding/default128.png new file mode 100644 index 000000000000..86c687598fae Binary files /dev/null and b/waterfox/browser/branding/default128.png differ diff --git a/waterfox/browser/branding/default16.png b/waterfox/browser/branding/default16.png new file mode 100644 index 000000000000..71767c13b634 Binary files /dev/null and b/waterfox/browser/branding/default16.png differ diff --git a/waterfox/browser/branding/default22.png b/waterfox/browser/branding/default22.png new file mode 100644 index 000000000000..c67f06ddd03d Binary files /dev/null and b/waterfox/browser/branding/default22.png differ diff --git a/waterfox/browser/branding/default24.png b/waterfox/browser/branding/default24.png new file mode 100644 index 000000000000..d7d3df390290 Binary files /dev/null and b/waterfox/browser/branding/default24.png differ diff --git a/waterfox/browser/branding/default256.png b/waterfox/browser/branding/default256.png new file mode 100644 index 000000000000..a91639d11c7b Binary files /dev/null and b/waterfox/browser/branding/default256.png differ diff --git a/waterfox/browser/branding/default32.png b/waterfox/browser/branding/default32.png new file mode 100644 index 000000000000..da8c1461d13e Binary files /dev/null and b/waterfox/browser/branding/default32.png differ diff --git a/waterfox/browser/branding/default48.png b/waterfox/browser/branding/default48.png new file mode 100644 index 000000000000..fde53fc48eba Binary files /dev/null and b/waterfox/browser/branding/default48.png differ diff --git a/waterfox/browser/branding/default64.png b/waterfox/browser/branding/default64.png new file mode 100644 index 000000000000..4787ee0d342b Binary files /dev/null and b/waterfox/browser/branding/default64.png differ diff --git a/waterfox/browser/branding/disk.icns b/waterfox/browser/branding/disk.icns new file mode 100644 index 000000000000..ca9a9313ae6e Binary files /dev/null and b/waterfox/browser/branding/disk.icns differ diff --git a/waterfox/browser/branding/document.icns b/waterfox/browser/branding/document.icns new file mode 100644 index 000000000000..6733b9ff3e94 Binary files /dev/null and b/waterfox/browser/branding/document.icns differ diff --git a/waterfox/browser/branding/document.ico b/waterfox/browser/branding/document.ico new file mode 100644 index 000000000000..2f4cdd6a070a Binary files /dev/null and b/waterfox/browser/branding/document.ico differ diff --git a/waterfox/browser/branding/document_pdf.ico b/waterfox/browser/branding/document_pdf.ico new file mode 100644 index 000000000000..d6fe7c5bded9 Binary files /dev/null and b/waterfox/browser/branding/document_pdf.ico differ diff --git a/waterfox/browser/branding/dsstore b/waterfox/browser/branding/dsstore new file mode 100644 index 000000000000..8ea703674566 Binary files /dev/null and b/waterfox/browser/branding/dsstore differ diff --git a/waterfox/browser/branding/firefox.VisualElementsManifest.xml b/waterfox/browser/branding/firefox.VisualElementsManifest.xml new file mode 100644 index 000000000000..85e09dd7a910 --- /dev/null +++ b/waterfox/browser/branding/firefox.VisualElementsManifest.xml @@ -0,0 +1,12 @@ + + + + + diff --git a/waterfox/browser/branding/firefox.icns b/waterfox/browser/branding/firefox.icns new file mode 100644 index 000000000000..6fa12793b239 Binary files /dev/null and b/waterfox/browser/branding/firefox.icns differ diff --git a/waterfox/browser/branding/firefox.ico b/waterfox/browser/branding/firefox.ico new file mode 100644 index 000000000000..958e87c800c5 Binary files /dev/null and b/waterfox/browser/branding/firefox.ico differ diff --git a/waterfox/browser/branding/firefox64.ico b/waterfox/browser/branding/firefox64.ico new file mode 100644 index 000000000000..958e87c800c5 Binary files /dev/null and b/waterfox/browser/branding/firefox64.ico differ diff --git a/waterfox/browser/branding/license.txt b/waterfox/browser/branding/license.txt new file mode 100644 index 000000000000..14e2f777f6c3 --- /dev/null +++ b/waterfox/browser/branding/license.txt @@ -0,0 +1,373 @@ +Mozilla Public License Version 2.0 +================================== + +1. Definitions +-------------- + +1.1. "Contributor" + means each individual or legal entity that creates, contributes to + the creation of, or owns Covered Software. + +1.2. "Contributor Version" + means the combination of the Contributions of others (if any) used + by a Contributor and that particular Contributor's Contribution. + +1.3. "Contribution" + means Covered Software of a particular Contributor. + +1.4. "Covered Software" + means Source Code Form to which the initial Contributor has attached + the notice in Exhibit A, the Executable Form of such Source Code + Form, and Modifications of such Source Code Form, in each case + including portions thereof. + +1.5. "Incompatible With Secondary Licenses" + means + + (a) that the initial Contributor has attached the notice described + in Exhibit B to the Covered Software; or + + (b) that the Covered Software was made available under the terms of + version 1.1 or earlier of the License, but not also under the + terms of a Secondary License. + +1.6. "Executable Form" + means any form of the work other than Source Code Form. + +1.7. "Larger Work" + means a work that combines Covered Software with other material, in + a separate file or files, that is not Covered Software. + +1.8. "License" + means this document. + +1.9. "Licensable" + means having the right to grant, to the maximum extent possible, + whether at the time of the initial grant or subsequently, any and + all of the rights conveyed by this License. + +1.10. "Modifications" + means any of the following: + + (a) any file in Source Code Form that results from an addition to, + deletion from, or modification of the contents of Covered + Software; or + + (b) any new file in Source Code Form that contains any Covered + Software. + +1.11. "Patent Claims" of a Contributor + means any patent claim(s), including without limitation, method, + process, and apparatus claims, in any patent Licensable by such + Contributor that would be infringed, but for the grant of the + License, by the making, using, selling, offering for sale, having + made, import, or transfer of either its Contributions or its + Contributor Version. + +1.12. "Secondary License" + means either the GNU General Public License, Version 2.0, the GNU + Lesser General Public License, Version 2.1, the GNU Affero General + Public License, Version 3.0, or any later versions of those + licenses. + +1.13. "Source Code Form" + means the form of the work preferred for making modifications. + +1.14. "You" (or "Your") + means an individual or a legal entity exercising rights under this + License. For legal entities, "You" includes any entity that + controls, is controlled by, or is under common control with You. For + purposes of this definition, "control" means (a) the power, direct + or indirect, to cause the direction or management of such entity, + whether by contract or otherwise, or (b) ownership of more than + fifty percent (50%) of the outstanding shares or beneficial + ownership of such entity. + +2. License Grants and Conditions +-------------------------------- + +2.1. Grants + +Each Contributor hereby grants You a world-wide, royalty-free, +non-exclusive license: + +(a) under intellectual property rights (other than patent or trademark) + Licensable by such Contributor to use, reproduce, make available, + modify, display, perform, distribute, and otherwise exploit its + Contributions, either on an unmodified basis, with Modifications, or + as part of a Larger Work; and + +(b) under Patent Claims of such Contributor to make, use, sell, offer + for sale, have made, import, and otherwise transfer either its + Contributions or its Contributor Version. + +2.2. Effective Date + +The licenses granted in Section 2.1 with respect to any Contribution +become effective for each Contribution on the date the Contributor first +distributes such Contribution. + +2.3. Limitations on Grant Scope + +The licenses granted in this Section 2 are the only rights granted under +this License. No additional rights or licenses will be implied from the +distribution or licensing of Covered Software under this License. +Notwithstanding Section 2.1(b) above, no patent license is granted by a +Contributor: + +(a) for any code that a Contributor has removed from Covered Software; + or + +(b) for infringements caused by: (i) Your and any other third party's + modifications of Covered Software, or (ii) the combination of its + Contributions with other software (except as part of its Contributor + Version); or + +(c) under Patent Claims infringed by Covered Software in the absence of + its Contributions. + +This License does not grant any rights in the trademarks, service marks, +or logos of any Contributor (except as may be necessary to comply with +the notice requirements in Section 3.4). + +2.4. Subsequent Licenses + +No Contributor makes additional grants as a result of Your choice to +distribute the Covered Software under a subsequent version of this +License (see Section 10.2) or under the terms of a Secondary License (if +permitted under the terms of Section 3.3). + +2.5. Representation + +Each Contributor represents that the Contributor believes its +Contributions are its original creation(s) or it has sufficient rights +to grant the rights to its Contributions conveyed by this License. + +2.6. Fair Use + +This License is not intended to limit any rights You have under +applicable copyright doctrines of fair use, fair dealing, or other +equivalents. + +2.7. Conditions + +Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted +in Section 2.1. + +3. Responsibilities +------------------- + +3.1. Distribution of Source Form + +All distribution of Covered Software in Source Code Form, including any +Modifications that You create or to which You contribute, must be under +the terms of this License. You must inform recipients that the Source +Code Form of the Covered Software is governed by the terms of this +License, and how they can obtain a copy of this License. You may not +attempt to alter or restrict the recipients' rights in the Source Code +Form. + +3.2. Distribution of Executable Form + +If You distribute Covered Software in Executable Form then: + +(a) such Covered Software must also be made available in Source Code + Form, as described in Section 3.1, and You must inform recipients of + the Executable Form how they can obtain a copy of such Source Code + Form by reasonable means in a timely manner, at a charge no more + than the cost of distribution to the recipient; and + +(b) You may distribute such Executable Form under the terms of this + License, or sublicense it under different terms, provided that the + license for the Executable Form does not attempt to limit or alter + the recipients' rights in the Source Code Form under this License. + +3.3. Distribution of a Larger Work + +You may create and distribute a Larger Work under terms of Your choice, +provided that You also comply with the requirements of this License for +the Covered Software. If the Larger Work is a combination of Covered +Software with a work governed by one or more Secondary Licenses, and the +Covered Software is not Incompatible With Secondary Licenses, this +License permits You to additionally distribute such Covered Software +under the terms of such Secondary License(s), so that the recipient of +the Larger Work may, at their option, further distribute the Covered +Software under the terms of either this License or such Secondary +License(s). + +3.4. Notices + +You may not remove or alter the substance of any license notices +(including copyright notices, patent notices, disclaimers of warranty, +or limitations of liability) contained within the Source Code Form of +the Covered Software, except that You may alter any license notices to +the extent required to remedy known factual inaccuracies. + +3.5. Application of Additional Terms + +You may choose to offer, and to charge a fee for, warranty, support, +indemnity or liability obligations to one or more recipients of Covered +Software. However, You may do so only on Your own behalf, and not on +behalf of any Contributor. You must make it absolutely clear that any +such warranty, support, indemnity, or liability obligation is offered by +You alone, and You hereby agree to indemnify every Contributor for any +liability incurred by such Contributor as a result of warranty, support, +indemnity or liability terms You offer. You may include additional +disclaimers of warranty and limitations of liability specific to any +jurisdiction. + +4. Inability to Comply Due to Statute or Regulation +--------------------------------------------------- + +If it is impossible for You to comply with any of the terms of this +License with respect to some or all of the Covered Software due to +statute, judicial order, or regulation then You must: (a) comply with +the terms of this License to the maximum extent possible; and (b) +describe the limitations and the code they affect. Such description must +be placed in a text file included with all distributions of the Covered +Software under this License. Except to the extent prohibited by statute +or regulation, such description must be sufficiently detailed for a +recipient of ordinary skill to be able to understand it. + +5. Termination +-------------- + +5.1. The rights granted under this License will terminate automatically +if You fail to comply with any of its terms. However, if You become +compliant, then the rights granted under this License from a particular +Contributor are reinstated (a) provisionally, unless and until such +Contributor explicitly and finally terminates Your grants, and (b) on an +ongoing basis, if such Contributor fails to notify You of the +non-compliance by some reasonable means prior to 60 days after You have +come back into compliance. Moreover, Your grants from a particular +Contributor are reinstated on an ongoing basis if such Contributor +notifies You of the non-compliance by some reasonable means, this is the +first time You have received notice of non-compliance with this License +from such Contributor, and You become compliant prior to 30 days after +Your receipt of the notice. + +5.2. If You initiate litigation against any entity by asserting a patent +infringement claim (excluding declaratory judgment actions, +counter-claims, and cross-claims) alleging that a Contributor Version +directly or indirectly infringes any patent, then the rights granted to +You by any and all Contributors for the Covered Software under Section +2.1 of this License shall terminate. + +5.3. In the event of termination under Sections 5.1 or 5.2 above, all +end user license agreements (excluding distributors and resellers) which +have been validly granted by You or Your distributors under this License +prior to termination shall survive termination. + +************************************************************************ +* * +* 6. Disclaimer of Warranty * +* ------------------------- * +* * +* Covered Software is provided under this License on an "as is" * +* basis, without warranty of any kind, either expressed, implied, or * +* statutory, including, without limitation, warranties that the * +* Covered Software is free of defects, merchantable, fit for a * +* particular purpose or non-infringing. The entire risk as to the * +* quality and performance of the Covered Software is with You. * +* Should any Covered Software prove defective in any respect, You * +* (not any Contributor) assume the cost of any necessary servicing, * +* repair, or correction. This disclaimer of warranty constitutes an * +* essential part of this License. No use of any Covered Software is * +* authorized under this License except under this disclaimer. * +* * +************************************************************************ + +************************************************************************ +* * +* 7. Limitation of Liability * +* -------------------------- * +* * +* Under no circumstances and under no legal theory, whether tort * +* (including negligence), contract, or otherwise, shall any * +* Contributor, or anyone who distributes Covered Software as * +* permitted above, be liable to You for any direct, indirect, * +* special, incidental, or consequential damages of any character * +* including, without limitation, damages for lost profits, loss of * +* goodwill, work stoppage, computer failure or malfunction, or any * +* and all other commercial damages or losses, even if such party * +* shall have been informed of the possibility of such damages. This * +* limitation of liability shall not apply to liability for death or * +* personal injury resulting from such party's negligence to the * +* extent applicable law prohibits such limitation. Some * +* jurisdictions do not allow the exclusion or limitation of * +* incidental or consequential damages, so this exclusion and * +* limitation may not apply to You. * +* * +************************************************************************ + +8. Litigation +------------- + +Any litigation relating to this License may be brought only in the +courts of a jurisdiction where the defendant maintains its principal +place of business and such litigation shall be governed by laws of that +jurisdiction, without reference to its conflict-of-law provisions. +Nothing in this Section shall prevent a party's ability to bring +cross-claims or counter-claims. + +9. Miscellaneous +---------------- + +This License represents the complete agreement concerning the subject +matter hereof. If any provision of this License is held to be +unenforceable, such provision shall be reformed only to the extent +necessary to make it enforceable. Any law or regulation which provides +that the language of a contract shall be construed against the drafter +shall not be used to construe this License against a Contributor. + +10. Versions of the License +--------------------------- + +10.1. New Versions + +Mozilla Foundation is the license steward. Except as provided in Section +10.3, no one other than the license steward has the right to modify or +publish new versions of this License. Each version will be given a +distinguishing version number. + +10.2. Effect of New Versions + +You may distribute the Covered Software under the terms of the version +of the License under which You originally received the Covered Software, +or under the terms of any subsequent version published by the license +steward. + +10.3. Modified Versions + +If you create software not governed by this License, and you want to +create a new license for such software, you may create and use a +modified version of this License if you rename the license and remove +any references to the name of the license steward (except to note that +such modified license differs from this License). + +10.4. Distributing Source Code Form that is Incompatible With Secondary +Licenses + +If You choose to distribute Source Code Form that is Incompatible With +Secondary Licenses under the terms of this version of the License, the +notice described in Exhibit B of this License must be attached. + +Exhibit A - Source Code Form License Notice +------------------------------------------- + + 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/. + +If it is not possible or desirable to put the notice in a particular +file, then You may include the notice in a location (such as a LICENSE +file in a relevant directory) where a recipient would be likely to look +for such a notice. + +You may add additional accurate notices of copyright ownership. + +Exhibit B - "Incompatible With Secondary Licenses" Notice +--------------------------------------------------------- + + This Source Code Form is "Incompatible With Secondary Licenses", as + defined by the Mozilla Public License, v. 2.0. diff --git a/waterfox/browser/branding/locales/en-US/brand.dtd b/waterfox/browser/branding/locales/en-US/brand.dtd new file mode 100644 index 000000000000..0e2619c06b9d --- /dev/null +++ b/waterfox/browser/branding/locales/en-US/brand.dtd @@ -0,0 +1,5 @@ + + + diff --git a/waterfox/browser/branding/locales/en-US/brand.ftl b/waterfox/browser/branding/locales/en-US/brand.ftl new file mode 100644 index 000000000000..f664869d2e8e --- /dev/null +++ b/waterfox/browser/branding/locales/en-US/brand.ftl @@ -0,0 +1,12 @@ +# 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/. + +-brand-shorter-name = Waterfox +-brand-short-name = Waterfox +-brand-full-name = Waterfox +# This brand name can be used in messages where the product name needs to +# remain unchanged across different versions (Nightly, Beta, etc.). +-brand-product-name = Waterfox +-vendor-short-name = Waterfox Limited +trademarkInfo = Waterfox and the Waterfox logo are trademarks of Waterfox Limited. diff --git a/waterfox/browser/branding/locales/en-US/brand.properties b/waterfox/browser/branding/locales/en-US/brand.properties new file mode 100644 index 000000000000..801900a9577f --- /dev/null +++ b/waterfox/browser/branding/locales/en-US/brand.properties @@ -0,0 +1,7 @@ +# 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/. + +brandShorterName=Waterfox +brandShortName=Waterfox +brandFullName=Waterfox diff --git a/waterfox/browser/branding/locales/jar.mn b/waterfox/browser/branding/locales/jar.mn new file mode 100644 index 000000000000..d13c2110148f --- /dev/null +++ b/waterfox/browser/branding/locales/jar.mn @@ -0,0 +1,12 @@ +#filter substitution +# 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/. + +[localization] @AB_CD@.jar: + branding (%*.ftl) + +@AB_CD@.jar: +% locale branding @AB_CD@ %locale/branding/ + locale/branding/brand.dtd (%brand.dtd) + locale/branding/brand.properties (%brand.properties) diff --git a/waterfox/browser/branding/locales/moz.build b/waterfox/browser/branding/locales/moz.build new file mode 100644 index 000000000000..d988c0ff9b16 --- /dev/null +++ b/waterfox/browser/branding/locales/moz.build @@ -0,0 +1,7 @@ +# -*- 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/. + +JAR_MANIFESTS += ["jar.mn"] diff --git a/waterfox/browser/branding/moz.build b/waterfox/browser/branding/moz.build new file mode 100644 index 000000000000..9aaf458602b9 --- /dev/null +++ b/waterfox/browser/branding/moz.build @@ -0,0 +1,13 @@ +# -*- 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/. + +DIRS += ["content", "locales"] + +DIST_SUBDIR = "browser" +export("DIST_SUBDIR") + +include("branding-common.mozbuild") +Branding() diff --git a/waterfox/browser/branding/newtab.ico b/waterfox/browser/branding/newtab.ico new file mode 100644 index 000000000000..a9b37c08c6e1 Binary files /dev/null and b/waterfox/browser/branding/newtab.ico differ diff --git a/waterfox/browser/branding/newwindow.ico b/waterfox/browser/branding/newwindow.ico new file mode 100644 index 000000000000..55372077102c Binary files /dev/null and b/waterfox/browser/branding/newwindow.ico differ diff --git a/waterfox/browser/branding/pbmode.ico b/waterfox/browser/branding/pbmode.ico new file mode 100644 index 000000000000..47677c13fba6 Binary files /dev/null and b/waterfox/browser/branding/pbmode.ico differ diff --git a/waterfox/browser/branding/pref/firefox-branding.js b/waterfox/browser/branding/pref/firefox-branding.js new file mode 100644 index 000000000000..bb52f5c3b5db --- /dev/null +++ b/waterfox/browser/branding/pref/firefox-branding.js @@ -0,0 +1,50 @@ +/* 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/. */ + +// This file contains branding-specific prefs. + +pref( + "startup.homepage_override_url", + "https://www.waterfox.net/docs/releases/%DISPLAY_VERSION%/?update" +); +pref("startup.homepage_welcome_url", "about:welcome"); +pref( + "startup.homepage_welcome_url.additional", + "https://www.waterfox.net/docs/releases/%DISPLAY_VERSION%/?new" +); +// Interval: Time between checks for a new version (in seconds) +pref("app.update.interval", 43200); // 12 hours +// Give the user x seconds to react before showing the big UI. default=192 hours +pref("app.update.promptWaitTime", 691200); +// app.update.url.manual: URL user can browse to manually if for some reason +// all update installation attempts fail. +// app.update.url.details: 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.manual", + "https://www.waterfox.net/download/?reason=manual-update" +); +pref("app.update.url.details", "https://www.waterfox.net/docs/releases/"); +pref( + "app.releaseNotesURL", + "https://www.waterfox.net/docs/releases/%DISPLAY_VERSION%/?utm_source=waterfox-browser&utm_medium=waterfox-browser&utm_campaign=whatsnew" +); +pref( + "app.releaseNotesURL.aboutDialog", + "https://www.waterfox.net/docs/releases/%DISPLAY_VERSION%/?utm_source=waterfox-browser&utm_medium=waterfox-desktop&utm_campaign=about-dialog" +); + +// 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", 31); + +// Give the user x seconds to reboot before showing a badge on the hamburger +// button. default=4 days +pref("app.update.badgeWaitTime", 345600); + +// Number of usages of the web console. +// If this is less than 5, then pasting code into the web console is disabled +pref("devtools.selfxss.count", 0); diff --git a/waterfox/browser/branding/stubinstaller/bgstub.jpg b/waterfox/browser/branding/stubinstaller/bgstub.jpg new file mode 100644 index 000000000000..c10915e17c1d Binary files /dev/null and b/waterfox/browser/branding/stubinstaller/bgstub.jpg differ diff --git a/waterfox/browser/branding/stubinstaller/installing_page.css b/waterfox/browser/branding/stubinstaller/installing_page.css new file mode 100644 index 000000000000..d09838249bb1 --- /dev/null +++ b/waterfox/browser/branding/stubinstaller/installing_page.css @@ -0,0 +1,87 @@ +/* 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/. */ + +body { + color: white; +} + +/* + * We want to treat the two pieces of text in the left column as one unit and + center that unit vertically in the window. In order to make IE8 do that, + we have to wrap the two bits of text in a container and make that a + table-cell (which means we need an outer container that's display: table). + So that's what this mess is doing. + */ +#text_column { + position: fixed; + height: 100%; + margin-left: 30px; + width: 40%; + display: table; +} + +#text_column_container { + display: table-cell; + vertical-align: middle; + padding-top: 60px; +} + +#header { + font-size: 24px; + font-weight: 800; + margin-top: 0; +} + +#content { + font-size: 22px; +} + +#installing { + position: fixed; + right: 30px; + bottom: 55%; + margin-top: auto; + margin-bottom: auto; + width: 35%; +} + +#label { + color: white; + + position: relative; + top: 50px; + + text-align: center; + font-size: 20px; +} + +#progress_background { + width: 100%; + height: 20px; + background-color: white; +} + +body.high-contrast #progress_background { + outline: solid; +} + +#progress_bar { + margin: 0; + width: 0%; + height: 100%; + background-color: #00AAFF; +} + +/* In high contrast mode, fill the entire progress bar with its border. */ +body.high-contrast #progress_bar { + /* This border should be the height of progress_background. */ + border-top: 20px solid; + box-sizing: border-box; +} + +/* No blurb or footer for this layout. */ +#blurb, +#footer { + visibility: hidden; +} diff --git a/waterfox/browser/branding/stubinstaller/profile_cleanup_page.css b/waterfox/browser/branding/stubinstaller/profile_cleanup_page.css new file mode 100644 index 000000000000..5754016600da --- /dev/null +++ b/waterfox/browser/branding/stubinstaller/profile_cleanup_page.css @@ -0,0 +1,75 @@ +/* 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/. */ + +body { + color: white; +} + +/* + * We want to treat the two pieces of text in the left column as one unit and + center that unit vertically in the window. In order to make IE8 do that, + we have to wrap the two bits of text in a container and make that a + table-cell (which means we need an outer container that's display: table). + So that's what this mess is doing. + */ +#profileRefreshForm { + position: fixed; + height: 100%; + margin-left: 30px; + width: 40%; + display: table; +} + +#profileRefreshContainer { + display: table-cell; + vertical-align: middle; +} + +#refreshCheckboxContainer, +#refreshButtonContainer { + margin-top: 20px; +} + +#header { + font-size: 25px; + font-weight: 600; +} + +#refreshCheckboxContainer { + position: relative; +} + +#refreshCheckbox { + position: absolute; + top: 1px; +} + +#checkboxLabel { + font-size: 14px; + display: block; +} + +.checkboxLabel-ltr { + margin-left: 25px; +} + +.checkboxLabel-rtl { + margin-right: 25px; +} + +#refreshButton { + padding: 8px 70px; + font-size: 16px; + background: #005ccc; + color: white; +} + +body.normal-contrast #refreshButton { + border: none; +} + +/* No footer for this layout. */ +#footer { + visibility: hidden; +} diff --git a/waterfox/browser/branding/wizHeader.bmp b/waterfox/browser/branding/wizHeader.bmp new file mode 100644 index 000000000000..2a7505c7a4a5 Binary files /dev/null and b/waterfox/browser/branding/wizHeader.bmp differ diff --git a/waterfox/browser/branding/wizHeaderRTL.bmp b/waterfox/browser/branding/wizHeaderRTL.bmp new file mode 100644 index 000000000000..bf19fd45a0d1 Binary files /dev/null and b/waterfox/browser/branding/wizHeaderRTL.bmp differ diff --git a/waterfox/browser/branding/wizWatermark.bmp b/waterfox/browser/branding/wizWatermark.bmp new file mode 100644 index 000000000000..763314b91dee Binary files /dev/null and b/waterfox/browser/branding/wizWatermark.bmp differ diff --git a/waterfox/moz.build b/waterfox/moz.build new file mode 100644 index 000000000000..f3cd9851f285 --- /dev/null +++ b/waterfox/moz.build @@ -0,0 +1,12 @@ +# -*- 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/. + +for icon in ("firefox", "document", "newwindow", "newtab", "pbmode", "document_pdf"): + DEFINES[icon.upper() + "_ICO"] = '"%s/%s/%s.ico"' % ( + TOPSRCDIR, + "waterfox/branding", + icon, + )