mirror of
https://codeberg.org/librewolf/source.git
synced 2024-12-22 05:33:03 -05:00
Merge branch 'main' of gitlab.com:librewolf-community/browser/source
This commit is contained in:
Bert van der Weerd
commit
347dca2170
5 changed files with 85 additions and 120 deletions
|
|
@ -2,123 +2,86 @@
|
|||
* 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/. */
|
||||
|
||||
"use strict";
|
||||
"use strict";
|
||||
|
||||
/* import-globals-from aboutDialog-appUpdater.js */
|
||||
|
||||
// Services = object with smart getters for common XPCOM services
|
||||
var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
|
||||
var { AppConstants } = ChromeUtils.import(
|
||||
"resource://gre/modules/AppConstants.jsm"
|
||||
);
|
||||
if (AppConstants.MOZ_UPDATER) {
|
||||
Services.scriptloader.loadSubScript(
|
||||
"chrome://browser/content/aboutDialog-appUpdater.js",
|
||||
this
|
||||
);
|
||||
}
|
||||
|
||||
async function init(aEvent) {
|
||||
if (aEvent.target != document) {
|
||||
return;
|
||||
}
|
||||
|
||||
var distroId = Services.prefs.getCharPref("distribution.id", "");
|
||||
if (distroId) {
|
||||
var distroAbout = Services.prefs.getStringPref("distribution.about", "");
|
||||
// If there is about text, we always show it.
|
||||
if (distroAbout) {
|
||||
var distroField = document.getElementById("distribution");
|
||||
distroField.value = distroAbout;
|
||||
distroField.style.display = "block";
|
||||
}
|
||||
// If it's not a mozilla distribution, show the rest,
|
||||
// unless about text exists, then we always show.
|
||||
if (!distroId.startsWith("mozilla-") || distroAbout) {
|
||||
var distroVersion = Services.prefs.getCharPref(
|
||||
"distribution.version",
|
||||
""
|
||||
);
|
||||
if (distroVersion) {
|
||||
distroId += " - " + distroVersion;
|
||||
}
|
||||
|
||||
var distroIdField = document.getElementById("distributionId");
|
||||
distroIdField.value = distroId;
|
||||
distroIdField.style.display = "block";
|
||||
}
|
||||
}
|
||||
|
||||
// Include the build ID and display warning if this is an "a#" (nightly or aurora) build
|
||||
let versionId = "aboutDialog-version";
|
||||
let versionAttributes = {
|
||||
version: AppConstants.MOZ_APP_VERSION_DISPLAY,
|
||||
bits: Services.appinfo.is64Bit ? 64 : 32,
|
||||
};
|
||||
|
||||
let version = Services.appinfo.version;
|
||||
if (/a\d+$/.test(version)) {
|
||||
versionId = "aboutDialog-version-nightly";
|
||||
let buildID = Services.appinfo.appBuildID;
|
||||
let year = buildID.slice(0, 4);
|
||||
let month = buildID.slice(4, 6);
|
||||
let day = buildID.slice(6, 8);
|
||||
versionAttributes.isodate = `${year}-${month}-${day}`;
|
||||
|
||||
document.getElementById("experimental").hidden = false;
|
||||
document.getElementById("communityDesc").hidden = true;
|
||||
}
|
||||
|
||||
// Use Fluent arguments for append version and the architecture of the build
|
||||
let versionField = document.getElementById("version");
|
||||
|
||||
document.l10n.setAttributes(versionField, versionId, versionAttributes);
|
||||
|
||||
await document.l10n.translateElements([versionField]);
|
||||
|
||||
// Show a release notes link if we have a URL.
|
||||
let relNotesLink = document.getElementById("releasenotes");
|
||||
let relNotesPrefType = Services.prefs.getPrefType(
|
||||
"app.releaseNotesURL.aboutDialog"
|
||||
);
|
||||
if (relNotesPrefType != Services.prefs.PREF_INVALID) {
|
||||
let relNotesURL = Services.urlFormatter.formatURLPref(
|
||||
"app.releaseNotesURL.aboutDialog"
|
||||
);
|
||||
if (relNotesURL != "about:blank") {
|
||||
relNotesLink.href = relNotesURL;
|
||||
relNotesLink.hidden = false;
|
||||
}
|
||||
}
|
||||
|
||||
if (AppConstants.MOZ_UPDATER) {
|
||||
gAppUpdater = new appUpdater({ buttonAutoFocus: true });
|
||||
|
||||
let channelLabel = document.getElementById("currentChannel");
|
||||
let currentChannelText = document.getElementById("currentChannelText");
|
||||
channelLabel.value = UpdateUtils.UpdateChannel;
|
||||
let hasWinPackageId = false;
|
||||
try {
|
||||
hasWinPackageId = Services.sysinfo.getProperty("hasWinPackageId");
|
||||
} catch (_ex) {
|
||||
// The hasWinPackageId property doesn't exist; assume it should be false.
|
||||
}
|
||||
if (/^release($|\-)/.test(channelLabel.value) || hasWinPackageId) {
|
||||
currentChannelText.hidden = true;
|
||||
}
|
||||
}
|
||||
|
||||
if (AppConstants.IS_ESR) {
|
||||
document.getElementById("release").hidden = false;
|
||||
}
|
||||
|
||||
window.sizeToContent();
|
||||
|
||||
if (AppConstants.platform == "macosx") {
|
||||
window.moveTo(
|
||||
screen.availWidth / 2 - window.outerWidth / 2,
|
||||
screen.availHeight / 5
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
/* import-globals-from aboutDialog-appUpdater.js */
|
||||
|
||||
// Services = object with smart getters for common XPCOM services
|
||||
var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
|
||||
var { AppConstants } = ChromeUtils.import(
|
||||
"resource://gre/modules/AppConstants.jsm"
|
||||
);
|
||||
if (AppConstants.MOZ_UPDATER) {
|
||||
Services.scriptloader.loadSubScript(
|
||||
"chrome://browser/content/aboutDialog-appUpdater.js",
|
||||
this
|
||||
);
|
||||
}
|
||||
|
||||
async function init(aEvent) {
|
||||
if (aEvent.target != document) {
|
||||
return;
|
||||
}
|
||||
|
||||
var distroId = Services.prefs.getCharPref("distribution.id", "");
|
||||
if (distroId) {
|
||||
var distroAbout = Services.prefs.getStringPref("distribution.about", "");
|
||||
// If there is about text, we always show it.
|
||||
if (distroAbout) {
|
||||
var distroField = document.getElementById("distribution");
|
||||
distroField.value = distroAbout;
|
||||
distroField.style.display = "block";
|
||||
}
|
||||
// If it's not a mozilla distribution, show the rest,
|
||||
// unless about text exists, then we always show.
|
||||
if (!distroId.startsWith("mozilla-") || distroAbout) {
|
||||
var distroVersion = Services.prefs.getCharPref(
|
||||
"distribution.version",
|
||||
""
|
||||
);
|
||||
if (distroVersion) {
|
||||
distroId += " - " + distroVersion;
|
||||
}
|
||||
|
||||
var distroIdField = document.getElementById("distributionId");
|
||||
distroIdField.value = distroId;
|
||||
distroIdField.style.display = "block";
|
||||
}
|
||||
}
|
||||
|
||||
// Include the build ID and display warning if this is an "a#" (nightly or aurora) build
|
||||
let versionId = "aboutDialog-version";
|
||||
let versionAttributes = {
|
||||
version: AppConstants.MOZ_APP_VERSION_DISPLAY,
|
||||
bits: Services.appinfo.is64Bit ? 64 : 32,
|
||||
};
|
||||
|
||||
let version = Services.appinfo.version;
|
||||
if (/a\d+$/.test(version)) {
|
||||
versionId = "aboutDialog-version-nightly";
|
||||
let buildID = Services.appinfo.appBuildID;
|
||||
let year = buildID.slice(0, 4);
|
||||
let month = buildID.slice(4, 6);
|
||||
let day = buildID.slice(6, 8);
|
||||
versionAttributes.isodate = `${year}-${month}-${day}`;
|
||||
|
||||
document.getElementById("experimental").hidden = false;
|
||||
document.getElementById("communityDesc").hidden = true;
|
||||
}
|
||||
|
||||
// Use Fluent arguments for append version and the architecture of the build
|
||||
let versionField = document.getElementById("version");
|
||||
|
||||
document.l10n.setAttributes(versionField, versionId, versionAttributes);
|
||||
|
||||
await document.l10n.translateElements([versionField]);
|
||||
|
||||
window.sizeToContent();
|
||||
|
||||
if (AppConstants.platform == "macosx") {
|
||||
window.moveTo(
|
||||
screen.availWidth / 2 - window.outerWidth / 2,
|
||||
screen.availHeight / 5
|
||||
);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,7 +6,6 @@
|
|||
|
||||
<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
|
||||
<?xml-stylesheet href="chrome://browser/content/aboutDialog.css" type="text/css"?>
|
||||
<?xml-stylesheet href="chrome://branding/content/aboutDialog.css" type="text/css"?>
|
||||
|
||||
<window xmlns:html="http://www.w3.org/1999/xhtml"
|
||||
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
|
||||
|
|
|
|||
|
|
@ -12,3 +12,5 @@ browser.jar:
|
|||
content/branding/logo.svg
|
||||
content/branding/identity-icons-brand.svg
|
||||
content/branding/horizontal-lockup.svg
|
||||
content/branding/about-logo.png (../empty.png)
|
||||
content/branding/firefox-wordmark.svg (../empty.svg)
|
||||
|
|
|
|||
BIN
themes/browser/branding/librewolf/empty.png
Normal file
BIN
themes/browser/branding/librewolf/empty.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 563 B |
1
themes/browser/branding/librewolf/empty.svg
Normal file
1
themes/browser/branding/librewolf/empty.svg
Normal file
|
|
@ -0,0 +1 @@
|
|||
<svg version="1.1" viewBox="0 0 1 1" xmlns="http://www.w3.org/2000/svg"></svg>
|
||||
|
After Width: | Height: | Size: 79 B |
Loading…
Reference in a new issue