mirror of
https://repo.dactyloidae.xyz/Dactyloidae/UXP.git
synced 2026-10-22 23:27:30 +09:00
Merge remote-tracking branch 'origin/master' into custom
This commit is contained in:
Roy Tam
commit
3dea264e2b
28 changed files with 244 additions and 824 deletions
|
|
@ -26,6 +26,7 @@ pref("@GUAO_PREF@.addons.mozilla.org", "Mozilla/5.0 (@OS_SLICE@ rv:@GK_VERSION@)
|
||||||
// Required for domains that have proven unresponsive to requests from users
|
// Required for domains that have proven unresponsive to requests from users
|
||||||
pref("@GUAO_PREF@.youtube.com","Mozilla/5.0 (@OS_SLICE@ rv:42.0) @GK_SLICE@ Firefox/42.0 @APP_SLICE@");
|
pref("@GUAO_PREF@.youtube.com","Mozilla/5.0 (@OS_SLICE@ rv:42.0) @GK_SLICE@ Firefox/42.0 @APP_SLICE@");
|
||||||
pref("@GUAO_PREF@.gaming.youtube.com","Mozilla/5.0 (@OS_SLICE@ rv:42.0) @GK_SLICE@ Firefox/42.0");
|
pref("@GUAO_PREF@.gaming.youtube.com","Mozilla/5.0 (@OS_SLICE@ rv:42.0) @GK_SLICE@ Firefox/42.0");
|
||||||
|
pref("@GUAO_PREF@.netflix.com","Mozilla/5.0 (@OS_SLICE@ rv:42.0) @GK_SLICE@ Firefox/42.0 @APP_SLICE@");
|
||||||
|
|
||||||
// The never-ending Facebook debacle...
|
// The never-ending Facebook debacle...
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -2,56 +2,53 @@
|
||||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
* 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/. */
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||||
|
|
||||||
#PMaboutDialog {
|
#aboutPMDialogContainer {
|
||||||
width: 620px;
|
width: 700px;
|
||||||
|
height: 410px;
|
||||||
}
|
}
|
||||||
|
|
||||||
#PMrightBox {
|
#aboutVersionBox {
|
||||||
background-image: url("chrome://branding/content/about-wordmark.png");
|
font-family: Arial, helvetica;
|
||||||
background-repeat: no-repeat;
|
height: 38 px;
|
||||||
/* padding-top creates room for the wordmark */
|
|
||||||
padding-top: 38px;
|
|
||||||
margin-top:20px;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#PMrightBox:-moz-locale-dir(rtl) {
|
#aboutVersion {
|
||||||
background-position: 100% 0;
|
text-align: center;
|
||||||
}
|
font-size: 18px;
|
||||||
|
font-weight: bold;
|
||||||
#PMbottomBox {
|
margin: 4px;
|
||||||
padding: 15px 10px 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
#PMversion {
|
|
||||||
margin-top: 10px;
|
|
||||||
-moz-margin-start: 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#distribution,
|
#distribution,
|
||||||
#distributionId {
|
#distributionId {
|
||||||
|
text-align: center;
|
||||||
|
font-size: 14px;
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
display: none;
|
display: none;
|
||||||
margin-top: 0;
|
margin-top: 0;
|
||||||
margin-bottom: 0;
|
margin-bottom: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
.text-blurb {
|
#aboutTextBox {
|
||||||
margin-bottom: 10px;
|
font-family: Arial, helvetica;
|
||||||
-moz-margin-start: 0;
|
font-size: 14px;
|
||||||
-moz-padding-start: 0;
|
margin: 5px 20px;
|
||||||
|
padding: 4px 10px 0px;
|
||||||
|
border-radius: 3px;
|
||||||
|
color: black;
|
||||||
|
background-color: rgba(240, 240, 240, .6);
|
||||||
}
|
}
|
||||||
|
|
||||||
#updateButton,
|
#aboutLinkBox {
|
||||||
#updateDeck > hbox > label {
|
font-family: Arial, helvetica;
|
||||||
-moz-margin-start: 0;
|
|
||||||
-moz-padding-start: 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.update-throbber {
|
.text-credits {
|
||||||
width: 16px;
|
margin: 5px 0px;
|
||||||
min-height: 16px;
|
}
|
||||||
-moz-margin-end: 3px;
|
|
||||||
list-style-image: url("chrome://global/skin/icons/loading_16.png");
|
.text-center {
|
||||||
|
text-align: center;
|
||||||
}
|
}
|
||||||
|
|
||||||
.text-link,
|
.text-link,
|
||||||
|
|
@ -63,5 +60,15 @@
|
||||||
.bottom-link,
|
.bottom-link,
|
||||||
.bottom-link:focus {
|
.bottom-link:focus {
|
||||||
text-align: center;
|
text-align: center;
|
||||||
|
text-decoration: none !important;
|
||||||
|
padding: 4px;
|
||||||
|
border-radius: 3px;
|
||||||
|
color: #244C8A;
|
||||||
|
background-color: rgba(240, 240, 240, .7);
|
||||||
margin: 0 40px;
|
margin: 0 40px;
|
||||||
|
transition: background-color 0.5s ease-out;
|
||||||
|
}
|
||||||
|
|
||||||
|
.bottom-link:hover {
|
||||||
|
background-color: rgba(240, 240, 255, .95);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -42,13 +42,9 @@ function init(aEvent)
|
||||||
if (/[ab]\d+$/.test(version)) {
|
if (/[ab]\d+$/.test(version)) {
|
||||||
let buildID = Services.appinfo.appBuildID;
|
let buildID = Services.appinfo.appBuildID;
|
||||||
let buildDate = buildID.slice(0,4) + "-" + buildID.slice(4,6) + "-" + buildID.slice(6,8);
|
let buildDate = buildID.slice(0,4) + "-" + buildID.slice(4,6) + "-" + buildID.slice(6,8);
|
||||||
document.getElementById("PMversion").textContent += " (" + buildDate + ")";
|
document.getElementById("aboutVersion").textContent += " (" + buildDate + ")";
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef MOZ_UPDATER
|
|
||||||
gAppUpdater = new appUpdater();
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef XP_MACOSX
|
#ifdef XP_MACOSX
|
||||||
// it may not be sized at this point, and we need its width to calculate its position
|
// it may not be sized at this point, and we need its width to calculate its position
|
||||||
window.sizeToContent();
|
window.sizeToContent();
|
||||||
|
|
@ -64,527 +60,3 @@ function init(aEvent)
|
||||||
relnotes.setAttribute("href", releaseNotesURL);
|
relnotes.setAttribute("href", releaseNotesURL);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef MOZ_UPDATER
|
|
||||||
Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
|
|
||||||
Components.utils.import("resource://gre/modules/DownloadUtils.jsm");
|
|
||||||
Components.utils.import("resource://gre/modules/AddonManager.jsm");
|
|
||||||
|
|
||||||
var gAppUpdater;
|
|
||||||
|
|
||||||
function onUnload(aEvent) {
|
|
||||||
if (gAppUpdater.isChecking)
|
|
||||||
gAppUpdater.checker.stopChecking(Components.interfaces.nsIUpdateChecker.CURRENT_CHECK);
|
|
||||||
// Safe to call even when there isn't a download in progress.
|
|
||||||
gAppUpdater.removeDownloadListener();
|
|
||||||
gAppUpdater = null;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
function appUpdater()
|
|
||||||
{
|
|
||||||
this.updateDeck = document.getElementById("updateDeck");
|
|
||||||
|
|
||||||
// Hide the update deck when there is already an update window open to avoid
|
|
||||||
// syncing issues between them.
|
|
||||||
if (Services.wm.getMostRecentWindow("Update:Wizard")) {
|
|
||||||
this.updateDeck.hidden = true;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
XPCOMUtils.defineLazyServiceGetter(this, "aus",
|
|
||||||
"@mozilla.org/updates/update-service;1",
|
|
||||||
"nsIApplicationUpdateService");
|
|
||||||
XPCOMUtils.defineLazyServiceGetter(this, "checker",
|
|
||||||
"@mozilla.org/updates/update-checker;1",
|
|
||||||
"nsIUpdateChecker");
|
|
||||||
XPCOMUtils.defineLazyServiceGetter(this, "um",
|
|
||||||
"@mozilla.org/updates/update-manager;1",
|
|
||||||
"nsIUpdateManager");
|
|
||||||
|
|
||||||
this.bundle = Services.strings.
|
|
||||||
createBundle("chrome://browser/locale/browser.properties");
|
|
||||||
|
|
||||||
this.updateBtn = document.getElementById("updateButton");
|
|
||||||
|
|
||||||
// The button label value must be set so its height is correct.
|
|
||||||
this.setupUpdateButton("update.checkInsideButton");
|
|
||||||
|
|
||||||
let manualURL = Services.urlFormatter.formatURLPref("app.update.url.manual");
|
|
||||||
let manualLink = document.getElementById("manualLink");
|
|
||||||
manualLink.value = manualURL;
|
|
||||||
manualLink.href = manualURL;
|
|
||||||
document.getElementById("failedLink").href = manualURL;
|
|
||||||
|
|
||||||
if (this.updateDisabledAndLocked) {
|
|
||||||
this.selectPanel("adminDisabled");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (this.isPending || this.isApplied) {
|
|
||||||
this.setupUpdateButton("update.restart." +
|
|
||||||
(this.isMajor ? "upgradeButton" : "updateButton"));
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (this.aus.isOtherInstanceHandlingUpdates) {
|
|
||||||
this.selectPanel("otherInstanceHandlingUpdates");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (this.isDownloading) {
|
|
||||||
this.startDownload();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (this.updateEnabled && this.updateAuto) {
|
|
||||||
this.selectPanel("checkingForUpdates");
|
|
||||||
this.isChecking = true;
|
|
||||||
this.checker.checkForUpdates(this.updateCheckListener, true);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
appUpdater.prototype =
|
|
||||||
{
|
|
||||||
// true when there is an update check in progress.
|
|
||||||
isChecking: false,
|
|
||||||
|
|
||||||
// true when there is an update already staged / ready to be applied.
|
|
||||||
get isPending() {
|
|
||||||
if (this.update) {
|
|
||||||
return this.update.state == "pending" ||
|
|
||||||
this.update.state == "pending-service";
|
|
||||||
}
|
|
||||||
return this.um.activeUpdate &&
|
|
||||||
(this.um.activeUpdate.state == "pending" ||
|
|
||||||
this.um.activeUpdate.state == "pending-service");
|
|
||||||
},
|
|
||||||
|
|
||||||
// true when there is an update already installed in the background.
|
|
||||||
get isApplied() {
|
|
||||||
if (this.update)
|
|
||||||
return this.update.state == "applied" ||
|
|
||||||
this.update.state == "applied-service";
|
|
||||||
return this.um.activeUpdate &&
|
|
||||||
(this.um.activeUpdate.state == "applied" ||
|
|
||||||
this.um.activeUpdate.state == "applied-service");
|
|
||||||
},
|
|
||||||
|
|
||||||
// true when there is an update download in progress.
|
|
||||||
get isDownloading() {
|
|
||||||
if (this.update)
|
|
||||||
return this.update.state == "downloading";
|
|
||||||
return this.um.activeUpdate &&
|
|
||||||
this.um.activeUpdate.state == "downloading";
|
|
||||||
},
|
|
||||||
|
|
||||||
// true when the update type is major.
|
|
||||||
get isMajor() {
|
|
||||||
if (this.update)
|
|
||||||
return this.update.type == "major";
|
|
||||||
return this.um.activeUpdate.type == "major";
|
|
||||||
},
|
|
||||||
|
|
||||||
// true when updating is disabled by an administrator.
|
|
||||||
get updateDisabledAndLocked() {
|
|
||||||
return !this.updateEnabled &&
|
|
||||||
Services.prefs.prefIsLocked("app.update.enabled");
|
|
||||||
},
|
|
||||||
|
|
||||||
// true when updating is enabled.
|
|
||||||
get updateEnabled() {
|
|
||||||
try {
|
|
||||||
return Services.prefs.getBoolPref("app.update.enabled");
|
|
||||||
}
|
|
||||||
catch (e) { }
|
|
||||||
return true; // Firefox default is true
|
|
||||||
},
|
|
||||||
|
|
||||||
// true when updating in background is enabled.
|
|
||||||
get backgroundUpdateEnabled() {
|
|
||||||
return this.updateEnabled &&
|
|
||||||
gAppUpdater.aus.canStageUpdates;
|
|
||||||
},
|
|
||||||
|
|
||||||
// true when updating is automatic.
|
|
||||||
get updateAuto() {
|
|
||||||
try {
|
|
||||||
return Services.prefs.getBoolPref("app.update.auto");
|
|
||||||
}
|
|
||||||
catch (e) { }
|
|
||||||
return true; // Firefox default is true
|
|
||||||
},
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Sets the deck's selected panel.
|
|
||||||
*
|
|
||||||
* @param aChildID
|
|
||||||
* The id of the deck's child to select.
|
|
||||||
*/
|
|
||||||
selectPanel: function(aChildID) {
|
|
||||||
this.updateDeck.selectedPanel = document.getElementById(aChildID);
|
|
||||||
this.updateBtn.disabled = (aChildID != "updateButtonBox");
|
|
||||||
},
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Sets the update button's label and accesskey.
|
|
||||||
*
|
|
||||||
* @param aKeyPrefix
|
|
||||||
* The prefix for the properties file entry to use for setting the
|
|
||||||
* label and accesskey.
|
|
||||||
*/
|
|
||||||
setupUpdateButton: function(aKeyPrefix) {
|
|
||||||
this.updateBtn.label = this.bundle.GetStringFromName(aKeyPrefix + ".label");
|
|
||||||
this.updateBtn.accessKey = this.bundle.GetStringFromName(aKeyPrefix + ".accesskey");
|
|
||||||
if (!document.commandDispatcher.focusedElement ||
|
|
||||||
document.commandDispatcher.focusedElement == this.updateBtn)
|
|
||||||
this.updateBtn.focus();
|
|
||||||
},
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Handles oncommand for the update button.
|
|
||||||
*/
|
|
||||||
buttonOnCommand: function() {
|
|
||||||
if (this.isPending || this.isApplied) {
|
|
||||||
// Notify all windows that an application quit has been requested.
|
|
||||||
let cancelQuit = Components.classes["@mozilla.org/supports-PRBool;1"].
|
|
||||||
createInstance(Components.interfaces.nsISupportsPRBool);
|
|
||||||
Services.obs.notifyObservers(cancelQuit, "quit-application-requested", "restart");
|
|
||||||
|
|
||||||
// Something aborted the quit process.
|
|
||||||
if (cancelQuit.data)
|
|
||||||
return;
|
|
||||||
|
|
||||||
let appStartup = Components.classes["@mozilla.org/toolkit/app-startup;1"].
|
|
||||||
getService(Components.interfaces.nsIAppStartup);
|
|
||||||
|
|
||||||
// If already in safe mode restart in safe mode (bug 327119)
|
|
||||||
if (Services.appinfo.inSafeMode) {
|
|
||||||
appStartup.restartInSafeMode(Components.interfaces.nsIAppStartup.eAttemptQuit);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
appStartup.quit(Components.interfaces.nsIAppStartup.eAttemptQuit |
|
|
||||||
Components.interfaces.nsIAppStartup.eRestart);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
const URI_UPDATE_PROMPT_DIALOG = "chrome://mozapps/content/update/updates.xul";
|
|
||||||
// Firefox no longer displays a license for updates and the licenseURL check
|
|
||||||
// is just in case a distibution does.
|
|
||||||
if (this.update) {
|
|
||||||
var ary = null;
|
|
||||||
ary = Components.classes["@mozilla.org/supports-array;1"].
|
|
||||||
createInstance(Components.interfaces.nsISupportsArray);
|
|
||||||
ary.AppendElement(this.update);
|
|
||||||
var openFeatures = "chrome,centerscreen,dialog=no,resizable=no,titlebar,toolbar=no";
|
|
||||||
Services.ww.openWindow(null, URI_UPDATE_PROMPT_DIALOG, "", openFeatures, ary);
|
|
||||||
window.close();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
this.selectPanel("checkingForUpdates");
|
|
||||||
this.isChecking = true;
|
|
||||||
this.checker.checkForUpdates(this.updateCheckListener, true);
|
|
||||||
},
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Implements nsIUpdateCheckListener. The methods implemented by
|
|
||||||
* nsIUpdateCheckListener are in a different scope from nsIIncrementalDownload
|
|
||||||
* to make it clear which are used by each interface.
|
|
||||||
*/
|
|
||||||
updateCheckListener: {
|
|
||||||
/**
|
|
||||||
* See nsIUpdateService.idl
|
|
||||||
*/
|
|
||||||
onCheckComplete: function(aRequest, aUpdates, aUpdateCount) {
|
|
||||||
gAppUpdater.isChecking = false;
|
|
||||||
gAppUpdater.update = gAppUpdater.aus.
|
|
||||||
selectUpdate(aUpdates, aUpdates.length);
|
|
||||||
if (!gAppUpdater.update) {
|
|
||||||
gAppUpdater.selectPanel("noUpdatesFound");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (gAppUpdater.update.unsupported) {
|
|
||||||
if (gAppUpdater.update.detailsURL) {
|
|
||||||
let unsupportedLink = document.getElementById("unsupportedLink");
|
|
||||||
unsupportedLink.href = gAppUpdater.update.detailsURL;
|
|
||||||
}
|
|
||||||
gAppUpdater.selectPanel("unsupportedSystem");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!gAppUpdater.aus.canApplyUpdates) {
|
|
||||||
gAppUpdater.selectPanel("manualUpdate");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
gAppUpdater.selectPanel("updateButtonBox");
|
|
||||||
gAppUpdater.setupUpdateButton("update.openUpdateUI." +
|
|
||||||
(this.isMajor ? "upgradeButton"
|
|
||||||
: "applyButton"));
|
|
||||||
},
|
|
||||||
|
|
||||||
/**
|
|
||||||
* See nsIUpdateService.idl
|
|
||||||
*/
|
|
||||||
onError: function(aRequest, aUpdate) {
|
|
||||||
// Errors in the update check are treated as no updates found. If the
|
|
||||||
// update check fails repeatedly without a success the user will be
|
|
||||||
// notified with the normal app update user interface so this is safe.
|
|
||||||
gAppUpdater.isChecking = false;
|
|
||||||
gAppUpdater.selectPanel("noUpdatesFound");
|
|
||||||
},
|
|
||||||
|
|
||||||
/**
|
|
||||||
* See nsISupports.idl
|
|
||||||
*/
|
|
||||||
QueryInterface: function(aIID) {
|
|
||||||
if (!aIID.equals(Components.interfaces.nsIUpdateCheckListener) &&
|
|
||||||
!aIID.equals(Components.interfaces.nsISupports))
|
|
||||||
throw Components.results.NS_ERROR_NO_INTERFACE;
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
},
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Checks the compatibility of add-ons for the application update.
|
|
||||||
*/
|
|
||||||
checkAddonCompatibility: function() {
|
|
||||||
var self = this;
|
|
||||||
AddonManager.getAllAddons(function(aAddons) {
|
|
||||||
self.addons = [];
|
|
||||||
self.addonsCheckedCount = 0;
|
|
||||||
aAddons.forEach(function(aAddon) {
|
|
||||||
// Protect against code that overrides the add-ons manager and doesn't
|
|
||||||
// implement the isCompatibleWith or the findUpdates method.
|
|
||||||
if (!("isCompatibleWith" in aAddon) || !("findUpdates" in aAddon)) {
|
|
||||||
let errMsg = "Add-on doesn't implement either the isCompatibleWith " +
|
|
||||||
"or the findUpdates method!";
|
|
||||||
if (aAddon.id)
|
|
||||||
errMsg += " Add-on ID: " + aAddon.id;
|
|
||||||
Components.utils.reportError(errMsg);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// If an add-on isn't appDisabled and isn't userDisabled then it is
|
|
||||||
// either active now or the user expects it to be active after the
|
|
||||||
// restart. If that is the case and the add-on is not installed by the
|
|
||||||
// application and is not compatible with the new application version
|
|
||||||
// then the user should be warned that the add-on will become
|
|
||||||
// incompatible. If an addon's type equals plugin it is skipped since
|
|
||||||
// checking plugins compatibility information isn't supported and
|
|
||||||
// getting the scope property of a plugin breaks in some environments
|
|
||||||
// (see bug 566787).
|
|
||||||
try {
|
|
||||||
if (aAddon.type != "plugin" && aAddon.isCompatible &&
|
|
||||||
!aAddon.appDisabled && !aAddon.userDisabled &&
|
|
||||||
aAddon.scope != AddonManager.SCOPE_APPLICATION &&
|
|
||||||
!aAddon.isCompatibleWith(self.update.appVersion,
|
|
||||||
self.update.platformVersion))
|
|
||||||
self.addons.push(aAddon);
|
|
||||||
}
|
|
||||||
catch (e) {
|
|
||||||
Components.utils.reportError(e);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
self.addonsTotalCount = self.addons.length;
|
|
||||||
if (self.addonsTotalCount == 0) {
|
|
||||||
self.startDownload();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
self.checkAddonsForUpdates();
|
|
||||||
});
|
|
||||||
},
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Checks if there are updates for add-ons that are incompatible with the
|
|
||||||
* application update.
|
|
||||||
*/
|
|
||||||
checkAddonsForUpdates: function() {
|
|
||||||
this.addons.forEach(function(aAddon) {
|
|
||||||
aAddon.findUpdates(this, AddonManager.UPDATE_WHEN_NEW_APP_DETECTED,
|
|
||||||
this.update.appVersion,
|
|
||||||
this.update.platformVersion);
|
|
||||||
}, this);
|
|
||||||
},
|
|
||||||
|
|
||||||
/**
|
|
||||||
* See XPIProvider.jsm
|
|
||||||
*/
|
|
||||||
onCompatibilityUpdateAvailable: function(aAddon) {
|
|
||||||
for (var i = 0; i < this.addons.length; ++i) {
|
|
||||||
if (this.addons[i].id == aAddon.id) {
|
|
||||||
this.addons.splice(i, 1);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
|
|
||||||
/**
|
|
||||||
* See XPIProvider.jsm
|
|
||||||
*/
|
|
||||||
onUpdateAvailable: function(aAddon, aInstall) {
|
|
||||||
if (!Services.blocklist.isAddonBlocklisted(aAddon.id, aInstall.version,
|
|
||||||
this.update.appVersion,
|
|
||||||
this.update.platformVersion)) {
|
|
||||||
// Compatibility or new version updates mean the same thing here.
|
|
||||||
this.onCompatibilityUpdateAvailable(aAddon);
|
|
||||||
}
|
|
||||||
},
|
|
||||||
|
|
||||||
/**
|
|
||||||
* See XPIProvider.jsm
|
|
||||||
*/
|
|
||||||
onUpdateFinished: function(aAddon) {
|
|
||||||
++this.addonsCheckedCount;
|
|
||||||
|
|
||||||
if (this.addonsCheckedCount < this.addonsTotalCount)
|
|
||||||
return;
|
|
||||||
|
|
||||||
if (this.addons.length == 0) {
|
|
||||||
// Compatibility updates or new version updates were found for all add-ons
|
|
||||||
this.startDownload();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
this.selectPanel("updateButtonBox");
|
|
||||||
this.setupUpdateButton("update.openUpdateUI." +
|
|
||||||
(this.isMajor ? "upgradeButton" : "applyButton"));
|
|
||||||
},
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Starts the download of an update mar.
|
|
||||||
*/
|
|
||||||
startDownload: function() {
|
|
||||||
if (!this.update)
|
|
||||||
this.update = this.um.activeUpdate;
|
|
||||||
this.update.QueryInterface(Components.interfaces.nsIWritablePropertyBag);
|
|
||||||
this.update.setProperty("foregroundDownload", "true");
|
|
||||||
|
|
||||||
this.aus.pauseDownload();
|
|
||||||
let state = this.aus.downloadUpdate(this.update, false);
|
|
||||||
if (state == "failed") {
|
|
||||||
this.selectPanel("downloadFailed");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
this.setupDownloadingUI();
|
|
||||||
},
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Switches to the UI responsible for tracking the download.
|
|
||||||
*/
|
|
||||||
setupDownloadingUI: function() {
|
|
||||||
this.downloadStatus = document.getElementById("downloadStatus");
|
|
||||||
this.downloadStatus.value =
|
|
||||||
DownloadUtils.getTransferTotal(0, this.update.selectedPatch.size);
|
|
||||||
this.selectPanel("downloading");
|
|
||||||
this.aus.addDownloadListener(this);
|
|
||||||
},
|
|
||||||
|
|
||||||
removeDownloadListener: function() {
|
|
||||||
if (this.aus) {
|
|
||||||
this.aus.removeDownloadListener(this);
|
|
||||||
}
|
|
||||||
},
|
|
||||||
|
|
||||||
/**
|
|
||||||
* See nsIRequestObserver.idl
|
|
||||||
*/
|
|
||||||
onStartRequest: function(aRequest, aContext) {
|
|
||||||
},
|
|
||||||
|
|
||||||
/**
|
|
||||||
* See nsIRequestObserver.idl
|
|
||||||
*/
|
|
||||||
onStopRequest: function(aRequest, aContext, aStatusCode) {
|
|
||||||
switch (aStatusCode) {
|
|
||||||
case Components.results.NS_ERROR_UNEXPECTED:
|
|
||||||
if (this.update.selectedPatch.state == "download-failed" &&
|
|
||||||
(this.update.isCompleteUpdate || this.update.patchCount != 2)) {
|
|
||||||
// Verification error of complete patch, informational text is held in
|
|
||||||
// the update object.
|
|
||||||
this.removeDownloadListener();
|
|
||||||
this.selectPanel("downloadFailed");
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
// Verification failed for a partial patch, complete patch is now
|
|
||||||
// downloading so return early and do NOT remove the download listener!
|
|
||||||
break;
|
|
||||||
case Components.results.NS_BINDING_ABORTED:
|
|
||||||
// Do not remove UI listener since the user may resume downloading again.
|
|
||||||
break;
|
|
||||||
case Components.results.NS_OK:
|
|
||||||
this.removeDownloadListener();
|
|
||||||
if (this.backgroundUpdateEnabled) {
|
|
||||||
this.selectPanel("applying");
|
|
||||||
let update = this.um.activeUpdate;
|
|
||||||
let self = this;
|
|
||||||
Services.obs.addObserver(function (aSubject, aTopic, aData) {
|
|
||||||
// Update the UI when the background updater is finished
|
|
||||||
let status = aData;
|
|
||||||
if (status == "applied" || status == "applied-service" ||
|
|
||||||
status == "pending" || status == "pending-service") {
|
|
||||||
// If the update is successfully applied, or if the updater has
|
|
||||||
// fallen back to non-staged updates, show the Restart to Update
|
|
||||||
// button.
|
|
||||||
self.selectPanel("updateButtonBox");
|
|
||||||
self.setupUpdateButton("update.restart." +
|
|
||||||
(self.isMajor ? "upgradeButton" : "updateButton"));
|
|
||||||
} else if (status == "failed") {
|
|
||||||
// Background update has failed, let's show the UI responsible for
|
|
||||||
// prompting the user to update manually.
|
|
||||||
self.selectPanel("downloadFailed");
|
|
||||||
} else if (status == "downloading") {
|
|
||||||
// We've fallen back to downloading the full update because the
|
|
||||||
// partial update failed to get staged in the background.
|
|
||||||
// Therefore we need to keep our observer.
|
|
||||||
self.setupDownloadingUI();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
Services.obs.removeObserver(arguments.callee, "update-staged");
|
|
||||||
}, "update-staged", false);
|
|
||||||
} else {
|
|
||||||
this.selectPanel("updateButtonBox");
|
|
||||||
this.setupUpdateButton("update.restart." +
|
|
||||||
(this.isMajor ? "upgradeButton" : "updateButton"));
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
this.removeDownloadListener();
|
|
||||||
this.selectPanel("downloadFailed");
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
},
|
|
||||||
|
|
||||||
/**
|
|
||||||
* See nsIProgressEventSink.idl
|
|
||||||
*/
|
|
||||||
onStatus: function(aRequest, aContext, aStatus, aStatusArg) {
|
|
||||||
},
|
|
||||||
|
|
||||||
/**
|
|
||||||
* See nsIProgressEventSink.idl
|
|
||||||
*/
|
|
||||||
onProgress: function(aRequest, aContext, aProgress, aProgressMax) {
|
|
||||||
this.downloadStatus.value =
|
|
||||||
DownloadUtils.getTransferTotal(aProgress, aProgressMax);
|
|
||||||
},
|
|
||||||
|
|
||||||
/**
|
|
||||||
* See nsISupports.idl
|
|
||||||
*/
|
|
||||||
QueryInterface: function(aIID) {
|
|
||||||
if (!aIID.equals(Components.interfaces.nsIProgressEventSink) &&
|
|
||||||
!aIID.equals(Components.interfaces.nsIRequestObserver) &&
|
|
||||||
!aIID.equals(Components.interfaces.nsISupports))
|
|
||||||
throw Components.results.NS_ERROR_NO_INTERFACE;
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
};
|
|
||||||
#endif
|
|
||||||
|
|
|
||||||
|
|
@ -38,86 +38,48 @@
|
||||||
|
|
||||||
<script type="application/javascript" src="chrome://browser/content/aboutDialog.js"/>
|
<script type="application/javascript" src="chrome://browser/content/aboutDialog.js"/>
|
||||||
|
|
||||||
<vbox id="aboutPMDialogContainer">
|
<vbox id="aboutPMDialogContainer" flex="1">
|
||||||
<hbox id="PMclientBox">
|
<vbox id="aboutHeaderBox" />
|
||||||
<vbox id="PMleftBox" flex="1"/>
|
<vbox id="aboutVersionBox" flex="3">
|
||||||
<vbox id="PMrightBox" flex="1">
|
|
||||||
#ifdef HAVE_64BIT_BUILD
|
#ifdef HAVE_64BIT_BUILD
|
||||||
#expand <label id="PMversion">Version: __MOZ_APP_VERSION__ (64-bit)</label>
|
#expand <label id="aboutVersion">Version: __MOZ_APP_VERSION__ (64-bit)</label>
|
||||||
#else
|
#else
|
||||||
#expand <label id="PMversion">Version: __MOZ_APP_VERSION__ (32-bit)</label>
|
#expand <label id="aboutVersion">Version: __MOZ_APP_VERSION__ (32-bit)</label>
|
||||||
#endif
|
#endif
|
||||||
<label id="distribution" class="text-blurb"/>
|
<label id="distribution" class="text-blurb"/>
|
||||||
<label id="distributionId" class="text-blurb"/>
|
<label id="distributionId" class="text-blurb"/>
|
||||||
|
|
||||||
<vbox id="detailsBox">
|
</vbox>
|
||||||
<vbox id="updateBox">
|
<vbox id="aboutTextBox" flex="1">
|
||||||
#ifdef MOZ_UPDATER
|
<description class="text-credits text-center">
|
||||||
<deck id="updateDeck" orient="vertical">
|
|
||||||
<hbox id="updateButtonBox" align="center">
|
|
||||||
<button id="updateButton" align="start"
|
|
||||||
oncommand="gAppUpdater.buttonOnCommand();"/>
|
|
||||||
<spacer flex="1"/>
|
|
||||||
</hbox>
|
|
||||||
<hbox id="checkingForUpdates" align="center">
|
|
||||||
<image class="update-throbber"/><label>&update.checkingForUpdates;</label>
|
|
||||||
</hbox>
|
|
||||||
<hbox id="checkingAddonCompat" align="center">
|
|
||||||
<image class="update-throbber"/><label>&update.checkingAddonCompat;</label>
|
|
||||||
</hbox>
|
|
||||||
<hbox id="downloading" align="center">
|
|
||||||
<image class="update-throbber"/><label>&update.downloading.start;</label><label id="downloadStatus"/><label>&update.downloading.end;</label>
|
|
||||||
</hbox>
|
|
||||||
<hbox id="applying" align="center">
|
|
||||||
<image class="update-throbber"/><label>&update.applying;</label>
|
|
||||||
</hbox>
|
|
||||||
<hbox id="downloadFailed" align="center">
|
|
||||||
<label>&update.failed.start;</label><label id="failedLink" class="text-link">&update.failed.linkText;</label><label>&update.failed.end;</label>
|
|
||||||
</hbox>
|
|
||||||
<hbox id="adminDisabled" align="center">
|
|
||||||
<label>&update.adminDisabled;</label>
|
|
||||||
</hbox>
|
|
||||||
<hbox id="noUpdatesFound" align="center">
|
|
||||||
<label>&update.noUpdatesFound;</label>
|
|
||||||
</hbox>
|
|
||||||
<hbox id="manualUpdate" align="center">
|
|
||||||
<label>&update.manual.start;</label><label id="manualLink" class="text-link"/><label>&update.manual.end;</label>
|
|
||||||
</hbox>
|
|
||||||
</deck>
|
|
||||||
#endif
|
|
||||||
</vbox>
|
|
||||||
|
|
||||||
<description class="text-pmcreds">
|
|
||||||
#if defined(MOZ_OFFICIAL_BRANDING) || defined(MC_OFFICIAL)
|
#if defined(MOZ_OFFICIAL_BRANDING) || defined(MC_OFFICIAL)
|
||||||
#ifdef MC_PRIVATE_BUILD
|
#ifdef MC_PRIVATE_BUILD
|
||||||
This is a private build of Pale Moon. If you did not manually build this copy from source yourself, then please download an official version from the <label class="text-link" href="http://www.palemoon.org/">Pale Moon website</label>.
|
This is a private build of Pale Moon. If you did not manually build this copy from source yourself, then please download an official version from the <label class="text-link" href="http://www.palemoon.org/">Pale Moon website</label>.
|
||||||
#else
|
#else
|
||||||
Pale Moon is released by <label class="text-link" href="http://www.moonchildproductions.info">Moonchild Productions</label>.
|
<label class="text-link" href="http://www.palemoon.org">Pale Moon</label> is released by <label class="text-link" href="http://www.moonchildproductions.info">Moonchild Productions</label>.
|
||||||
</description>
|
</description>
|
||||||
<description class="text-pmcreds">
|
<description class="text-credits text-center">
|
||||||
Special thanks to all our supporters and donors for making this browser possible!
|
Special thanks to all our supporters and donors for making this browser possible!
|
||||||
</description>
|
</description>
|
||||||
<description class="text-blurb">
|
<description class="text-credits">
|
||||||
If you wish to contribute, please consider helping out by providing support to other users on the <label class="text-link" href="https://forum.palemoon.org/">Pale Moon forum</label>
|
If you wish to contribute, please consider helping out by providing support to other users on the <label class="text-link" href="https://forum.palemoon.org/">Pale Moon forum</label>
|
||||||
or getting involved in our development by tackling some of the issues found in our GitHub issue tracker.
|
or getting involved in our development by tackling some of the issues found in our GitHub issue tracker.
|
||||||
#endif
|
#endif
|
||||||
#else
|
#else
|
||||||
&brandFullName; is released by &vendorShortName;.
|
&brandFullName; is released by &vendorShortName;.
|
||||||
</description>
|
</description>
|
||||||
<description class="text-blurb">
|
<description class="text-credits">
|
||||||
This is an unofficial build of Pale Moon. For official builds, please go to <label class="text-link" href="http://www.palemoon.org/">the Pale Moon website</label>.
|
This is an unofficial build of Pale Moon. For official builds, please go to <label class="text-link" href="http://www.palemoon.org/">the Pale Moon website</label>.
|
||||||
#endif
|
#endif
|
||||||
</description>
|
</description>
|
||||||
</vbox>
|
</vbox>
|
||||||
</vbox>
|
<vbox id="aboutLinkBox">
|
||||||
</hbox>
|
|
||||||
<vbox id="PMbottomBox">
|
|
||||||
<hbox pack="center">
|
<hbox pack="center">
|
||||||
<label class="text-link bottom-link" href="about:license">Licensing information</label>
|
|
||||||
<label class="text-link bottom-link" href="about:rights">End-user rights</label>
|
<label class="text-link bottom-link" href="about:rights">End-user rights</label>
|
||||||
|
<label class="text-link bottom-link" href="about:license">Licensing information</label>
|
||||||
<label class="text-link bottom-link" id="releaseNotesURL">Release notes</label>
|
<label class="text-link bottom-link" id="releaseNotesURL">Release notes</label>
|
||||||
</hbox>
|
</hbox>
|
||||||
<description id="PMtrademark">&trademarkInfo.part1;</description>
|
<description id="aboutPMtrademark">&trademarkInfo.part1;</description>
|
||||||
</vbox>
|
</vbox>
|
||||||
</vbox>
|
</vbox>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -66,7 +66,7 @@
|
||||||
accesskey="&helpSafeMode.accesskey;"
|
accesskey="&helpSafeMode.accesskey;"
|
||||||
label="&helpSafeMode.label;"
|
label="&helpSafeMode.label;"
|
||||||
oncommand="restart(true);"/>
|
oncommand="restart(true);"/>
|
||||||
<menuseparator id="updateSeparator"/>
|
<menuseparator id="updatesSeparator"/>
|
||||||
<menuitem id="checkForUpdates" class="menuitem-iconic"
|
<menuitem id="checkForUpdates" class="menuitem-iconic"
|
||||||
#ifdef MOZ_UPDATER
|
#ifdef MOZ_UPDATER
|
||||||
label="&updateCmd.label;"
|
label="&updateCmd.label;"
|
||||||
|
|
|
||||||
Binary file not shown.
|
After Width: | Height: | Size: 109 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 148 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 2.1 KiB After Width: | Height: | Size: 11 KiB |
|
|
@ -9,24 +9,57 @@
|
||||||
xmlns="http://www.w3.org/2000/svg"
|
xmlns="http://www.w3.org/2000/svg"
|
||||||
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
||||||
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
||||||
width="245.75363"
|
width="314.56464"
|
||||||
height="34.463379"
|
height="44.113129"
|
||||||
id="svg2"
|
id="svg2"
|
||||||
version="1.1"
|
version="1.1"
|
||||||
inkscape:version="0.48.5 r10040"
|
inkscape:version="0.92.1 r15371"
|
||||||
sodipodi:docname="drawing.svg">
|
sodipodi:docname="about-wordmark.svg">
|
||||||
<defs
|
<defs
|
||||||
id="defs4" />
|
id="defs4">
|
||||||
|
<filter
|
||||||
|
style="color-interpolation-filters:sRGB"
|
||||||
|
inkscape:label="Drop Shadow"
|
||||||
|
id="filter4610">
|
||||||
|
<feFlood
|
||||||
|
flood-opacity="1"
|
||||||
|
flood-color="rgb(252,252,247)"
|
||||||
|
result="flood"
|
||||||
|
id="feFlood4600" />
|
||||||
|
<feComposite
|
||||||
|
in="flood"
|
||||||
|
in2="SourceGraphic"
|
||||||
|
operator="in"
|
||||||
|
result="composite1"
|
||||||
|
id="feComposite4602" />
|
||||||
|
<feGaussianBlur
|
||||||
|
in="composite1"
|
||||||
|
stdDeviation="1"
|
||||||
|
result="blur"
|
||||||
|
id="feGaussianBlur4604" />
|
||||||
|
<feOffset
|
||||||
|
dx="2.77556e-017"
|
||||||
|
dy="0"
|
||||||
|
result="offset"
|
||||||
|
id="feOffset4606" />
|
||||||
|
<feComposite
|
||||||
|
in="SourceGraphic"
|
||||||
|
in2="offset"
|
||||||
|
operator="over"
|
||||||
|
result="composite2"
|
||||||
|
id="feComposite4608" />
|
||||||
|
</filter>
|
||||||
|
</defs>
|
||||||
<sodipodi:namedview
|
<sodipodi:namedview
|
||||||
id="base"
|
id="base"
|
||||||
pagecolor="#ffffff"
|
pagecolor="#000000"
|
||||||
bordercolor="#666666"
|
bordercolor="#666666"
|
||||||
borderopacity="1.0"
|
borderopacity="1.0"
|
||||||
inkscape:pageopacity="0.0"
|
inkscape:pageopacity="0"
|
||||||
inkscape:pageshadow="2"
|
inkscape:pageshadow="2"
|
||||||
inkscape:zoom="1.979899"
|
inkscape:zoom="1.979899"
|
||||||
inkscape:cx="122.96783"
|
inkscape:cx="140.32026"
|
||||||
inkscape:cy="-35.932748"
|
inkscape:cy="-32.25665"
|
||||||
inkscape:document-units="px"
|
inkscape:document-units="px"
|
||||||
inkscape:current-layer="layer1"
|
inkscape:current-layer="layer1"
|
||||||
showgrid="false"
|
showgrid="false"
|
||||||
|
|
@ -55,77 +88,91 @@
|
||||||
inkscape:label="Layer 1"
|
inkscape:label="Layer 1"
|
||||||
inkscape:groupmode="layer"
|
inkscape:groupmode="layer"
|
||||||
id="layer1"
|
id="layer1"
|
||||||
transform="translate(-51.826283,-53.778809)">
|
transform="translate(-29.067649,-53.687969)">
|
||||||
<text
|
<text
|
||||||
xml:space="preserve"
|
xml:space="preserve"
|
||||||
style="font-size:48px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Museo 500;-inkscape-font-specification:Museo 500"
|
style="font-style:normal;font-weight:normal;font-size:12.80000019px;line-height:0%;font-family:'Museo 500';-inkscape-font-specification:'Museo 500';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.06666672"
|
||||||
x="32.324883"
|
x="34.479874"
|
||||||
y="30.087807"
|
y="32.093662"
|
||||||
id="text2985"
|
id="text2985"><tspan
|
||||||
sodipodi:linespacing="125%"><tspan
|
|
||||||
sodipodi:role="line"
|
sodipodi:role="line"
|
||||||
id="tspan2987"
|
id="tspan2987"
|
||||||
x="32.324883"
|
x="34.479874"
|
||||||
y="30.087807" /></text>
|
y="32.093662"
|
||||||
|
style="font-size:51.20000076px;line-height:1.25;stroke-width:1.06666672"> </tspan></text>
|
||||||
<flowRoot
|
<flowRoot
|
||||||
xml:space="preserve"
|
xml:space="preserve"
|
||||||
id="flowRoot2989"
|
id="flowRoot2989"
|
||||||
style="font-size:48px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Museo 500;-inkscape-font-specification:Museo 500"><flowRegion
|
style="font-style:normal;font-weight:normal;font-size:12.80000019px;line-height:0.01%;font-family:'Museo 500';-inkscape-font-specification:'Museo 500';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.06666672"><flowRegion
|
||||||
id="flowRegion2991"><rect
|
id="flowRegion2991"
|
||||||
|
style="stroke-width:1.06666672"><rect
|
||||||
id="rect2993"
|
id="rect2993"
|
||||||
width="654.57886"
|
width="698.21747"
|
||||||
height="371.73615"
|
height="396.51855"
|
||||||
x="44.446712"
|
x="47.409828"
|
||||||
y="104.8391" /></flowRegion><flowPara
|
y="111.82838"
|
||||||
id="flowPara2995" /></flowRoot> <g
|
style="stroke-width:1.13777781" /></flowRegion><flowPara
|
||||||
id="g3795">
|
id="flowPara2995"
|
||||||
|
style="font-size:51.20000076px;line-height:1.25;stroke-width:1.06666672"> </flowPara></flowRoot> <g
|
||||||
|
id="g3795"
|
||||||
|
style="filter:url(#filter4610)">
|
||||||
<g
|
<g
|
||||||
id="text2997"
|
id="text2997"
|
||||||
style="font-size:48px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#262678;fill-opacity:1;stroke:none;font-family:Museo 500;-inkscape-font-specification:Museo 500">
|
style="font-style:normal;font-weight:normal;font-size:48px;line-height:125%;font-family:'Museo 500';-inkscape-font-specification:'Museo 500';letter-spacing:0px;word-spacing:0px;fill:#262678;fill-opacity:1;stroke:none">
|
||||||
<path
|
<path
|
||||||
id="path3779"
|
id="path3779"
|
||||||
d="m 54.9464,87.666504 0,-29.759766 -3.120117,0 0,-4.127929 14.928222,0 c 3.135722,3.3e-5 5.687722,0.96805 7.656006,2.904052 1.968235,1.936065 2.952365,4.503933 2.952393,7.703614 -2.8e-5,3.199727 -0.99197,5.791765 -2.97583,7.776123 -1.98391,1.984388 -4.528097,2.976575 -7.632569,2.976562 l -7.007812,0 0,12.527344 z m 4.800293,-16.655274 6.240234,0 c 1.983381,1.7e-5 3.55125,-0.592023 4.703613,-1.776123 1.152322,-1.184062 1.728494,-2.800027 1.728516,-4.8479 -2.2e-5,-2.016576 -0.568137,-3.600803 -1.704346,-4.752686 -1.13625,-1.151826 -2.696063,-1.727753 -4.679443,-1.727783 l -6.288574,0 z"
|
d="M 58.609493,93.510938 V 61.767187 h -3.328124 v -4.403124 h 15.923436 c 3.34477,3.5e-5 6.066904,1.032587 8.166407,3.097655 2.09945,2.065136 3.149189,4.804196 3.149219,8.217189 -3e-5,3.413042 -1.058101,6.177882 -3.174219,8.294531 -2.11617,2.11668 -4.82997,3.175013 -8.141407,3.174999 h -7.474999 v 13.362501 z m 5.120313,-17.765626 h 6.656249 c 2.115607,1.8e-5 3.788,-0.631491 5.017188,-1.894531 1.229143,-1.263 1.843727,-2.986696 1.84375,-5.171094 -2.3e-5,-2.151014 -0.606013,-3.840856 -1.817969,-5.069531 -1.212,-1.228615 -2.875801,-1.842937 -4.991406,-1.842969 h -6.707812 z"
|
||||||
inkscape:connector-curvature="0" />
|
inkscape:connector-curvature="0"
|
||||||
|
style="stroke-width:1.06666672" />
|
||||||
<path
|
<path
|
||||||
id="path3781"
|
id="path3781"
|
||||||
d="m 80.184193,80.850586 c -2e-6,-1.248039 0.256101,-2.360098 0.76831,-3.336182 0.512204,-0.976063 1.224362,-1.744128 2.136475,-2.304199 0.912104,-0.560045 1.856194,-1.031969 2.832275,-1.415771 0.976066,-0.383775 2.080069,-0.663804 3.312012,-0.840088 1.231921,-0.176255 2.24779,-0.288315 3.047607,-0.336182 0.79979,-0.04784 1.647934,-0.07176 2.544434,-0.07178 l 1.056152,0 0,-0.240235 c -1.7e-5,-2.11131 -0.416032,-3.607158 -1.248047,-4.487548 -0.832046,-0.880351 -2.208021,-1.320536 -4.127929,-1.320557 -0.896496,2.1e-5 -1.784679,0.136007 -2.664551,0.407959 -0.879891,0.271993 -1.319832,0.76003 -1.319824,1.464111 l 0,1.393067 -4.368164,0 0,-2.400879 c -4e-6,-0.927713 0.312007,-1.719705 0.936035,-2.375977 0.624018,-0.656227 1.431878,-1.12815 2.423584,-1.415771 0.991691,-0.287574 1.887686,-0.487525 2.687988,-0.599854 0.800282,-0.11228 1.584217,-0.168432 2.351807,-0.168457 3.680648,2.5e-5 6.264874,0.840112 7.752685,2.520264 1.487772,1.680196 2.231668,4.008075 2.231688,6.983642 l 0,10.319825 c -2e-5,0.704105 0.35203,1.056156 1.05615,1.056152 l 1.96729,0 0,3.984375 -4.3667,0 c -2.01662,0 -3.02492,-0.928222 -3.024902,-2.784668 l 0.09668,-1.439941 -0.09668,0 c -0.06349,0.127933 -0.143329,0.303959 -0.239502,0.528076 -0.09621,0.224124 -0.360369,0.608157 -0.792481,1.152099 -0.432145,0.543948 -0.920182,1.023928 -1.464111,1.439942 -0.54396,0.416016 -1.279799,0.800049 -2.20752,1.152099 -0.927746,0.352051 -1.935558,0.528076 -3.023437,0.528076 -2.240242,0 -4.17652,-0.656005 -5.808838,-1.968017 -1.632327,-1.312009 -2.448488,-3.119869 -2.448486,-5.423584 z m 5.66455,-2.831543 c -0.639655,0.671884 -0.959479,1.535653 -0.959472,2.591309 -7e-6,1.05567 0.399895,1.967534 1.199707,2.735595 0.799796,0.76807 1.919912,1.152103 3.360351,1.1521 1.855456,3e-6 3.399156,-0.807857 4.631104,-2.423584 1.231917,-1.615716 1.847883,-3.383536 1.8479,-5.303467 l 0,-0.815918 -1.199707,0 c -1.183609,1.2e-5 -2.21559,0.03981 -3.095947,0.119385 -0.880383,0.0796 -1.904552,0.255626 -3.07251,0.528076 -1.167978,0.272472 -2.071785,0.744639 -2.711426,1.416504 z"
|
d="m 85.529806,86.240625 c -2e-6,-1.331242 0.273174,-2.517438 0.819531,-3.558594 0.54635,-1.041134 1.305986,-1.860403 2.278906,-2.457812 0.972911,-0.597382 1.97994,-1.100767 3.021094,-1.510156 1.041137,-0.40936 2.21874,-0.708058 3.532812,-0.896094 1.314049,-0.188005 2.397643,-0.307536 3.250781,-0.358594 0.853109,-0.05103 1.7578,-0.07654 2.71406,-0.07656 h 1.12657 v -0.256251 c -2e-5,-2.252064 -0.44377,-3.847635 -1.33125,-4.786718 -0.88752,-0.939041 -2.355227,-1.408572 -4.403129,-1.408594 -0.956263,2.2e-5 -1.903658,0.145074 -2.842188,0.435156 -0.93855,0.290126 -1.407821,0.810699 -1.407812,1.561719 v 1.485938 h -4.659375 v -2.560938 c -4e-6,-0.98956 0.332807,-1.834352 0.998437,-2.534375 0.665619,-0.699976 1.527337,-1.20336 2.585156,-1.510156 1.057804,-0.306746 2.013532,-0.520027 2.867188,-0.639844 0.853634,-0.119766 1.689831,-0.179661 2.508594,-0.179688 3.926029,2.7e-5 6.682529,0.89612 8.269529,2.688282 1.58696,1.792209 2.38045,4.27528 2.38047,7.449218 v 11.007813 c -2e-5,0.751046 0.3755,1.126567 1.12656,1.126562 h 2.09844 v 4.25 h -4.65781 c -2.15106,0 -3.22658,-0.990103 -3.22656,-2.970312 l 0.10312,-1.535937 h -0.10312 c -0.0677,0.136462 -0.15289,0.324223 -0.25547,0.563281 -0.10263,0.239065 -0.3844,0.648701 -0.84532,1.228905 -0.46095,0.580212 -0.98152,1.09219 -1.561714,1.535939 -0.580224,0.44375 -1.365119,0.853385 -2.354688,1.228905 -0.989596,0.375521 -2.064596,0.563281 -3.225,0.563281 -2.389591,0 -4.454955,-0.699738 -6.196094,-2.099218 -1.741149,-1.399476 -2.61172,-3.32786 -2.611718,-5.785156 z m 6.042187,-3.020312 c -0.682299,0.716676 -1.023445,1.638029 -1.023437,2.764062 -8e-6,1.126048 0.426554,2.098703 1.279687,2.917968 0.853116,0.819275 2.047906,1.22891 3.584375,1.228907 1.979153,3e-6 3.625766,-0.861714 4.939842,-2.585156 1.31405,-1.723431 1.97108,-3.609105 1.9711,-5.657032 V 81.01875 h -1.27969 c -1.262519,1.3e-5 -2.363298,0.04246 -3.302346,0.127344 -0.939075,0.08491 -2.031522,0.272668 -3.277344,0.563281 -1.245843,0.290637 -2.209904,0.794282 -2.892187,1.510938 z"
|
||||||
inkscape:connector-curvature="0" />
|
inkscape:connector-curvature="0"
|
||||||
|
style="stroke-width:1.06666672" />
|
||||||
<path
|
<path
|
||||||
id="path3783"
|
id="path3783"
|
||||||
d="m 108.54943,84.594727 0,-25.776856 c -1e-5,-0.703095 -0.35206,-1.054658 -1.05616,-1.054687 l -1.96875,0 0,-3.984375 4.6084,0 c 1.08789,3.3e-5 1.87182,0.240023 2.35181,0.71997 0.47997,0.480013 0.71996,1.263948 0.71997,2.351807 l 0,25.775391 c -1e-5,0.704105 0.35204,1.056156 1.05615,1.056152 l 1.96875,0 0,3.984375 -4.6084,0 c -1.08789,0 -1.87183,-0.23999 -2.3518,-0.719971 -0.47999,-0.479979 -0.71998,-1.263914 -0.71997,-2.351806 z"
|
d="M 115.78606,90.234375 V 62.739062 c -1e-5,-0.749968 -0.37553,-1.124968 -1.12657,-1.124999 h -2.1 v -4.25 h 4.91562 c 1.16042,3.5e-5 1.99661,0.256024 2.5086,0.767968 0.51197,0.512014 0.76796,1.348211 0.76797,2.508594 v 27.49375 c -10e-6,0.751046 0.37551,1.126567 1.12656,1.126563 h 2.1 v 4.25 h -4.91563 c -1.16041,0 -1.99662,-0.25599 -2.50858,-0.767969 -0.51199,-0.511978 -0.76798,-1.348175 -0.76797,-2.508594 z"
|
||||||
inkscape:connector-curvature="0" />
|
inkscape:connector-curvature="0"
|
||||||
|
style="stroke-width:1.06666672" />
|
||||||
<path
|
<path
|
||||||
id="path3785"
|
id="path3785"
|
||||||
d="m 119.13732,75.522949 c 0,-3.808578 1.15185,-6.88084 3.45556,-9.216797 2.30371,-2.335913 5.21581,-3.503881 8.73633,-3.503906 3.29588,2.5e-5 5.86375,1.072045 7.70362,3.216065 1.83982,2.144062 2.75974,4.86403 2.75976,8.159912 l -0.14355,1.92041 -17.71289,0 c 0.1289,2.496103 0.99315,4.472175 2.59277,5.928222 1.5996,1.456059 3.51952,2.184086 5.75976,2.184082 1.24804,4e-6 2.4641,-0.239986 3.6482,-0.71997 1.18406,-0.479976 2.04807,-0.944087 2.59204,-1.392334 l 0.86426,-0.720703 2.01562,3.312011 c -0.25588,0.256839 -0.63991,0.585208 -1.1521,0.985108 -0.51223,0.399904 -1.58425,0.927735 -3.21606,1.583496 -1.63186,0.655761 -3.29592,0.983642 -4.99219,0.983642 -3.80763,0 -6.91138,-1.208007 -9.31128,-3.624023 -2.3999,-2.41601 -3.59985,-5.447745 -3.59985,-9.095215 z m 4.99219,-2.833008 12.86279,0 c -0.0635,-1.951155 -0.63918,-3.470928 -1.72705,-4.559326 -1.08791,-1.088358 -2.41603,-1.632547 -3.98438,-1.632568 -1.82423,2.1e-5 -3.38429,0.536153 -4.68017,1.608398 -1.29591,1.072284 -2.11964,2.600115 -2.47119,4.583496 z"
|
d="m 127.07981,80.557812 c 0,-4.062483 1.22864,-7.339562 3.68593,-9.83125 2.45729,-2.49164 5.56353,-3.737473 9.31875,-3.7375 3.51561,2.7e-5 6.25467,1.143515 8.2172,3.43047 1.96247,2.286999 2.94372,5.188298 2.94374,8.703906 l -0.15312,2.048437 h -18.89375 c 0.13749,2.66251 1.05936,4.77032 2.76562,6.323437 1.70624,1.55313 3.75416,2.329692 6.14375,2.329687 1.33124,5e-6 2.62837,-0.255985 3.89141,-0.767968 1.263,-0.511974 2.18461,-1.007026 2.76484,-1.485156 l 0.92188,-0.76875 2.14999,3.532812 c -0.27294,0.273962 -0.68257,0.624222 -1.2289,1.050782 -0.54638,0.426564 -1.68987,0.989584 -3.43047,1.689062 -1.74065,0.699479 -3.51565,1.049218 -5.325,1.049218 -4.06147,0 -7.37214,-1.28854 -9.93203,-3.865624 -2.5599,-2.577077 -3.83984,-5.810928 -3.83984,-9.701563 z m 5.325,-3.021875 h 13.72031 c -0.0677,-2.081232 -0.68179,-3.702323 -1.84219,-4.863281 -1.16043,-1.160915 -2.5771,-1.741383 -4.25,-1.741406 -1.94585,2.3e-5 -3.60991,0.571897 -4.99218,1.715625 -1.38231,1.143769 -2.26095,2.773456 -2.63594,4.889062 z"
|
||||||
inkscape:connector-curvature="0" />
|
inkscape:connector-curvature="0"
|
||||||
|
style="stroke-width:1.06666672" />
|
||||||
<path
|
<path
|
||||||
id="path3787"
|
id="path3787"
|
||||||
d="m 157.83702,87.666504 0,-4.12793 1.63184,0 c 0.64062,4e-6 0.99267,-0.352046 1.05615,-1.056152 l 2.3042,-28.703613 4.94385,0 7.96875,17.95166 1.68018,4.271484 0.0952,0 c 0.57615,-1.631823 1.13621,-3.055649 1.68018,-4.271484 l 7.96875,-17.95166 4.94384,0 2.3042,28.703613 c 0.0634,0.704106 0.415,1.056156 1.05469,1.056152 l 1.58496,0 0,4.12793 -4.27295,0 c -1.0557,0 -1.81546,-0.23999 -2.27929,-0.719971 -0.4639,-0.479979 -0.72806,-1.263914 -0.79248,-2.351806 l -1.39161,-17.904786 -0.0952,-4.990722 -0.0967,0 c -0.63968,2.111352 -1.23148,3.774924 -1.77539,4.990722 l -6.86426,14.879883 -4.03271,0 -6.86426,-14.879883 c -0.25587,-0.511697 -0.53566,-1.191628 -0.83936,-2.039795 -0.30372,-0.84812 -0.53565,-1.559789 -0.6958,-2.135009 l -0.28857,-0.864258 -0.0952,0 c 0.0312,2.015649 -9.8e-4,3.695335 -0.0967,5.039062 l -1.34326,17.904786 c -0.0645,1.087892 -0.32862,1.871827 -0.79248,2.351806 -0.46387,0.479981 -1.23975,0.719971 -2.32764,0.719971 z"
|
d="m 168.35949,93.510938 v -4.403126 h 1.74063 c 0.68333,5e-6 1.05885,-0.375515 1.12656,-1.126562 l 2.45781,-30.617187 h 5.27344 l 8.5,19.148437 1.79219,4.55625 h 0.10155 c 0.61456,-1.740611 1.21196,-3.259359 1.79219,-4.55625 l 8.5,-19.148437 h 5.27343 l 2.45781,30.617187 c 0.0676,0.751047 0.44267,1.126567 1.12501,1.126562 h 1.69062 v 4.403126 h -4.55781 c -1.12608,0 -1.93649,-0.25599 -2.43125,-0.767969 -0.49482,-0.511978 -0.77659,-1.348175 -0.84531,-2.508594 L 200.87198,71.135937 200.77043,65.8125 h -0.10314 c -0.68233,2.252109 -1.31358,4.026586 -1.89375,5.323437 l -7.32188,15.871875 h -4.30156 l -7.32188,-15.871875 c -0.27292,-0.54581 -0.57137,-1.27107 -0.89531,-2.175781 -0.32397,-0.904662 -0.57136,-1.663775 -0.74219,-2.277343 l -0.30781,-0.921875 h -0.10154 c 0.0333,2.150025 -0.001,3.94169 -0.10315,5.374999 l -1.43281,19.098438 c -0.0688,1.160419 -0.35053,1.996616 -0.84531,2.508594 -0.4948,0.511979 -1.3224,0.767969 -2.48282,0.767969 z"
|
||||||
inkscape:connector-curvature="0" />
|
inkscape:connector-curvature="0"
|
||||||
|
style="stroke-width:1.06666672" />
|
||||||
<path
|
<path
|
||||||
id="path3789"
|
id="path3789"
|
||||||
d="m 203.55333,84.594727 c -2.52734,-2.432612 -3.79101,-5.472892 -3.79101,-9.12085 0,-3.647933 1.26391,-6.671856 3.79175,-9.071777 2.52782,-2.399879 5.61595,-3.599829 9.2644,-3.599854 3.67967,2.5e-5 6.78343,1.199975 9.31128,3.599854 2.5278,2.399921 3.79172,5.423844 3.79175,9.071777 -3e-5,3.647958 -1.272,6.687994 -3.81592,9.120117 -2.54397,2.43213 -5.63991,3.648193 -9.28784,3.648193 -3.64796,0 -6.73609,-1.215819 -9.26441,-3.64746 z m 3.38379,-15.312012 c -1.61524,1.631853 -2.42286,3.695815 -2.42285,6.191894 -1e-5,2.496104 0.80785,4.57618 2.42358,6.240235 1.61572,1.664067 3.57592,2.496097 5.88062,2.496093 2.33592,4e-6 4.31175,-0.82397 5.92749,-2.471923 1.6157,-1.647942 2.42356,-3.736075 2.42358,-6.264405 -2e-5,-2.496079 -0.80788,-4.560041 -2.42358,-6.191894 -1.61574,-1.631816 -3.59157,-2.447733 -5.92749,-2.447754 -2.3047,2.1e-5 -4.26515,0.815938 -5.88135,2.447754 z"
|
d="m 217.12355,90.234375 c -2.69583,-2.594786 -4.04374,-5.837751 -4.04374,-9.728906 0,-3.891129 1.34817,-7.116647 4.04453,-9.676562 2.69634,-2.559871 5.99035,-3.839818 9.88203,-3.839845 3.92498,2.7e-5 7.23566,1.279974 9.93203,3.839845 2.69632,2.559915 4.0445,5.785433 4.04453,9.676562 -3e-5,3.891155 -1.3568,7.13386 -4.07031,9.728125 -2.71357,2.594272 -6.01591,3.891405 -9.90703,3.891405 -3.89116,0 -7.18516,-1.296873 -9.88204,-3.890624 z m 3.60938,-16.332812 c -1.72292,1.740643 -2.58439,3.942202 -2.58438,6.604687 -1e-5,2.662511 0.86171,4.881258 2.58516,6.65625 1.72343,1.775005 3.81431,2.662504 6.27266,2.662499 2.49165,5e-6 4.5992,-0.878901 6.32265,-2.636717 1.72342,-1.757805 2.58513,-3.985147 2.58516,-6.682032 -3e-5,-2.662485 -0.86174,-4.864044 -2.58516,-6.604687 -1.72345,-1.740604 -3.831,-2.610916 -6.32265,-2.610938 -2.45835,2.2e-5 -4.5495,0.870334 -6.27344,2.610938 z"
|
||||||
inkscape:connector-curvature="0" />
|
inkscape:connector-curvature="0"
|
||||||
|
style="stroke-width:1.06666672" />
|
||||||
<path
|
<path
|
||||||
id="path3791"
|
id="path3791"
|
||||||
d="m 233.17833,84.594727 c -2.52734,-2.432612 -3.79101,-5.472892 -3.79101,-9.12085 0,-3.647933 1.26391,-6.671856 3.79175,-9.071777 2.52782,-2.399879 5.61595,-3.599829 9.2644,-3.599854 3.67967,2.5e-5 6.78343,1.199975 9.31128,3.599854 2.5278,2.399921 3.79172,5.423844 3.79175,9.071777 -3e-5,3.647958 -1.272,6.687994 -3.81592,9.120117 -2.54397,2.43213 -5.63991,3.648193 -9.28784,3.648193 -3.64796,0 -6.73609,-1.215819 -9.26441,-3.64746 z m 3.38379,-15.312012 c -1.61524,1.631853 -2.42286,3.695815 -2.42285,6.191894 -1e-5,2.496104 0.80785,4.57618 2.42358,6.240235 1.61572,1.664067 3.57592,2.496097 5.88062,2.496093 2.33592,4e-6 4.31175,-0.82397 5.92749,-2.471923 1.6157,-1.647942 2.42356,-3.736075 2.42358,-6.264405 -2e-5,-2.496079 -0.80788,-4.560041 -2.42358,-6.191894 -1.61574,-1.631816 -3.59157,-2.447733 -5.92749,-2.447754 -2.3047,2.1e-5 -4.26515,0.815938 -5.88135,2.447754 z"
|
d="m 248.72355,90.234375 c -2.69583,-2.594786 -4.04374,-5.837751 -4.04374,-9.728906 0,-3.891129 1.34817,-7.116647 4.04453,-9.676562 2.69634,-2.559871 5.99035,-3.839818 9.88203,-3.839845 3.92498,2.7e-5 7.23566,1.279974 9.93203,3.839845 2.69632,2.559915 4.0445,5.785433 4.04453,9.676562 -3e-5,3.891155 -1.3568,7.13386 -4.07031,9.728125 -2.71357,2.594272 -6.01591,3.891405 -9.90703,3.891405 -3.89116,0 -7.18516,-1.296873 -9.88204,-3.890624 z m 3.60938,-16.332812 c -1.72292,1.740643 -2.58439,3.942202 -2.58438,6.604687 -1e-5,2.662511 0.86171,4.881258 2.58516,6.65625 1.72343,1.775005 3.81431,2.662504 6.27266,2.662499 2.49165,5e-6 4.5992,-0.878901 6.32265,-2.636717 1.72342,-1.757805 2.58513,-3.985147 2.58516,-6.682032 -3e-5,-2.662485 -0.86174,-4.864044 -2.58516,-6.604687 -1.72345,-1.740604 -3.831,-2.610916 -6.32265,-2.610938 -2.45835,2.2e-5 -4.5495,0.870334 -6.27344,2.610938 z"
|
||||||
inkscape:connector-curvature="0" />
|
inkscape:connector-curvature="0"
|
||||||
|
style="stroke-width:1.06666672" />
|
||||||
<path
|
<path
|
||||||
id="path3793"
|
id="path3793"
|
||||||
d="m 261.36339,87.666504 0,-19.248047 c 0,-0.704082 -0.35205,-1.056132 -1.05615,-1.056152 l -1.96729,0 0,-3.984375 4.46338,0 c 2.04785,2.4e-5 3.07177,0.896019 3.07178,2.687988 l 0,0.912598 -0.0952,1.391601 0.0952,0 c 0.64062,-1.375956 1.72899,-2.647927 3.26514,-3.815918 1.53612,-1.167944 3.48777,-1.751928 5.85498,-1.751953 2.84861,2.5e-5 4.95286,0.768091 6.31274,2.304199 1.35984,1.536154 2.03977,3.872089 2.0398,7.007813 l 0,10.511719 c -3e-5,0.704105 0.35202,1.056156 1.05615,1.056152 l 1.96728,0 0,3.984375 -4.60693,0 c -1.08791,0 -1.87185,-0.23999 -2.35181,-0.719971 -0.48,-0.479979 -0.71999,-1.263914 -0.71997,-2.351806 l 0,-11.424317 c -2e-5,-1.952132 -0.31203,-3.456037 -0.93603,-4.511719 -0.62405,-1.055644 -1.83205,-1.583475 -3.62403,-1.583496 -1.85646,2.1e-5 -3.48072,0.552022 -4.8728,1.656006 -1.3921,1.104022 -2.32789,2.535905 -2.80737,4.295654 -0.2881,0.832046 -0.43214,1.919935 -0.43213,3.263672 l 0,11.375977 z"
|
d="M 278.78762,93.510938 V 72.979687 c 0,-0.75102 -0.37552,-1.12654 -1.12656,-1.126562 h -2.09845 v -4.25 h 4.76094 c 2.18438,2.6e-5 3.27656,0.955754 3.27657,2.867188 v 0.973437 l -0.10155,1.484375 h 0.10155 c 0.68333,-1.467687 1.84425,-2.824456 3.48281,-4.070313 1.63853,-1.245807 3.72029,-1.868723 6.24532,-1.86875 3.03851,2.7e-5 5.28305,0.819297 6.73358,2.457813 1.4505,1.638564 2.17576,4.130228 2.17579,7.475 v 11.2125 c -3e-5,0.751046 0.37549,1.126567 1.12656,1.126563 h 2.09843 v 4.25 h -4.91406 c -1.16043,0 -1.99664,-0.25599 -2.50859,-0.767969 -0.512,-0.511978 -0.76799,-1.348175 -0.76797,-2.508594 V 78.048437 c -2e-5,-2.082274 -0.33283,-3.686439 -0.99843,-4.8125 -0.66566,-1.12602 -1.95419,-1.68904 -3.86563,-1.689062 -1.98023,2.2e-5 -3.71277,0.588823 -5.19766,1.766406 -1.4849,1.177624 -2.48308,2.704965 -2.99453,4.582031 -0.3073,0.887516 -0.46095,2.047931 -0.46093,3.48125 v 12.134376 z"
|
||||||
inkscape:connector-curvature="0" />
|
inkscape:connector-curvature="0"
|
||||||
|
style="stroke-width:1.06666672" />
|
||||||
</g>
|
</g>
|
||||||
<g
|
<g
|
||||||
id="text3769"
|
id="text3769"
|
||||||
style="font-size:10px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#262678;fill-opacity:1;stroke:none;font-family:Museo 500;-inkscape-font-specification:Museo 500">
|
style="font-style:normal;font-weight:normal;font-size:10px;line-height:125%;font-family:'Museo 500';-inkscape-font-specification:'Museo 500';letter-spacing:0px;word-spacing:0px;fill:#262678;fill-opacity:1;stroke:none">
|
||||||
<path
|
<path
|
||||||
id="path3774"
|
id="path3774"
|
||||||
d="m 285.52277,60.897457 0,-6.199951 -1.41999,0 c -0.14669,6e-6 -0.22003,0.07335 -0.22003,0.220032 l 0,0.449829 -0.88989,0 0,-0.929871 c 0,-0.226637 0.0433,-0.383294 0.12985,-0.469971 0.0866,-0.08666 0.24328,-0.129997 0.47012,-0.130004 l 4.85993,0 c 0.22664,7e-6 0.38329,0.04334 0.46997,0.130004 0.0867,0.08668 0.13,0.243334 0.13,0.469971 l 0,0.929871 -0.88989,0 0,-0.449829 c 0,-0.146682 -0.0734,-0.220026 -0.22003,-0.220032 l -1.41998,0 0,6.199951 z"
|
d="m 304.55762,64.957287 v -6.613281 h -1.51465 c -0.15647,7e-6 -0.2347,0.07824 -0.2347,0.234701 v 0.479818 h -0.94922 v -0.991863 c 0,-0.241746 0.0462,-0.408847 0.13851,-0.501302 0.0924,-0.09244 0.2595,-0.138663 0.50146,-0.138671 h 5.18392 c 0.24175,8e-6 0.40885,0.04623 0.50131,0.138671 0.0925,0.09246 0.13866,0.259556 0.13866,0.501302 v 0.991863 h -0.94921 v -0.479818 c 0,-0.156461 -0.0783,-0.234694 -0.2347,-0.234701 h -1.51465 v 6.613281 z"
|
||||||
inkscape:connector-curvature="0" />
|
inkscape:connector-curvature="0"
|
||||||
|
style="stroke-width:1.06666672" />
|
||||||
<path
|
<path
|
||||||
id="path3776"
|
id="path3776"
|
||||||
d="m 289.40979,60.897457 0,-0.859985 0.33997,0 c 0.13346,10e-7 0.2068,-0.07334 0.22003,-0.220032 l 0.48004,-5.979919 1.02997,0 1.66015,3.739929 0.35004,0.889892 0.0198,0 c 0.12003,-0.339963 0.23671,-0.636593 0.35003,-0.889892 l 1.66016,-3.739929 1.02997,0 0.48004,5.979919 c 0.0132,0.146689 0.0865,0.220033 0.21973,0.220032 l 0.3302,0 0,0.859985 -0.8902,0 c -0.21994,0 -0.37822,-0.05 -0.47486,-0.149994 -0.0966,-0.09999 -0.15167,-0.263315 -0.1651,-0.489959 l -0.28991,-3.730164 -0.0198,-1.039734 -0.0201,0 c -0.13327,0.439865 -0.25656,0.786443 -0.36987,1.039734 l -1.43006,3.099976 -0.84015,0 -1.43005,-3.099976 c -0.0533,-0.106604 -0.11159,-0.248256 -0.17487,-0.424957 -0.0633,-0.176692 -0.11159,-0.324957 -0.14495,-0.444794 l -0.0601,-0.180054 -0.0198,0 c 0.007,0.419927 -2.1e-4,0.769862 -0.0201,1.049805 l -0.27985,3.730164 c -0.0134,0.226644 -0.0685,0.389964 -0.1651,0.489959 -0.0966,0.1 -0.25828,0.149994 -0.48492,0.149994 z"
|
d="M 308.70378,64.957287 V 64.03997 h 0.36263 c 0.14236,10e-7 0.22059,-0.07823 0.2347,-0.234701 l 0.51204,-6.37858 h 1.09864 l 1.77082,3.989258 0.37338,0.949218 h 0.0211 c 0.12803,-0.362627 0.25249,-0.679033 0.37336,-0.949218 l 1.77084,-3.989258 h 1.09864 l 0.51204,6.37858 c 0.0141,0.156469 0.0923,0.234702 0.23438,0.234701 h 0.35221 v 0.917317 h -0.94955 c -0.2346,0 -0.40343,-0.05333 -0.50651,-0.159993 -0.10304,-0.106656 -0.16178,-0.280869 -0.17611,-0.522623 l -0.30924,-3.978842 -0.0211,-1.109049 h -0.0214 c -0.14215,0.469189 -0.27366,0.838872 -0.39452,1.109049 l -1.5254,3.306641 h -0.89616 l -1.52539,-3.306641 c -0.0568,-0.113711 -0.11903,-0.264806 -0.18653,-0.453287 -0.0675,-0.188472 -0.11903,-0.346621 -0.15461,-0.474447 l -0.0641,-0.192058 h -0.0211 c 0.007,0.447922 -2.2e-4,0.821186 -0.0214,1.119792 l -0.2985,3.978842 c -0.0143,0.241754 -0.0731,0.415962 -0.17611,0.522623 -0.10304,0.106667 -0.2755,0.159993 -0.51725,0.159993 z"
|
||||||
inkscape:connector-curvature="0" />
|
inkscape:connector-curvature="0"
|
||||||
|
style="stroke-width:1.06666672" />
|
||||||
</g>
|
</g>
|
||||||
</g>
|
</g>
|
||||||
</g>
|
</g>
|
||||||
|
|
|
||||||
|
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 14 KiB |
|
|
@ -3,41 +3,51 @@
|
||||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||||
|
|
||||||
#aboutPMDialogContainer {
|
#aboutPMDialogContainer {
|
||||||
background-image: url("chrome://branding/content/about-background.png");
|
background-image: url("chrome://branding/content/about-background.jpg");
|
||||||
background-repeat: no-repeat;
|
background-repeat: no-repeat;
|
||||||
background-color: #F7F7F7;
|
background-color: #9ABCD5;
|
||||||
background-size: cover;
|
color: #101020;
|
||||||
color: #000020;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#PMleftBox {
|
#aboutHeaderBox {
|
||||||
/* background-image: url("chrome://branding/content/about-logo.png"); */
|
background-image: url("chrome://branding/content/about-wordmark.png");
|
||||||
background-repeat: no-repeat;
|
background-repeat: no-repeat;
|
||||||
/* min-width and min-height create room for the logo */
|
background-position: center center;
|
||||||
min-width: 210px;
|
height: 44px;
|
||||||
min-height: 210px;
|
|
||||||
margin-top:20px;
|
|
||||||
-moz-margin-start: 30px;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#PMrightBox {
|
#aboutVersionBox {
|
||||||
margin-left: 30px;
|
text-shadow: 1px 1px 0px #9ABCD5;
|
||||||
margin-right: 30px;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#PMbottomBox {
|
#aboutTextBox {
|
||||||
|
animation: 3s fadeIn;
|
||||||
|
animation-fill-mode: forwards;
|
||||||
|
text-shadow: 1px 1px 0px #9ABCD5;
|
||||||
|
color: #101020;
|
||||||
|
}
|
||||||
|
|
||||||
|
@keyframes fadeIn {
|
||||||
|
0% {
|
||||||
|
opacity: 0;
|
||||||
|
}
|
||||||
|
50% {
|
||||||
|
opacity: 0;
|
||||||
|
}
|
||||||
|
100% {
|
||||||
|
opacity: 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#aboutLinkBox {
|
||||||
padding: 15px 10px 0;
|
padding: 15px 10px 0;
|
||||||
background-color: rgba(240,240,255,.7);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#PMupdateDeck > hbox > label:not([class="text-link"]) {
|
#aboutPMtrademark {
|
||||||
color: #909090;
|
font-size: 10px;
|
||||||
}
|
|
||||||
|
|
||||||
#PMtrademark {
|
|
||||||
font-size: xx-small;
|
|
||||||
text-align: center;
|
text-align: center;
|
||||||
color: #999999;
|
color: #C0C0C0;
|
||||||
|
text-shadow: 1px 1px 0px #000000;
|
||||||
margin-top: 10px;
|
margin-top: 10px;
|
||||||
margin-bottom: 10px;
|
margin-bottom: 10px;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,7 @@
|
||||||
browser.jar:
|
browser.jar:
|
||||||
% content branding %content/branding/ contentaccessible=yes
|
% content branding %content/branding/ contentaccessible=yes
|
||||||
content/branding/about.png (about.png)
|
content/branding/about.png (about.png)
|
||||||
content/branding/about-background.png (about-background.png)
|
content/branding/about-background.jpg (about-background.jpg)
|
||||||
content/branding/about-logo.png (about-logo.png)
|
content/branding/about-logo.png (about-logo.png)
|
||||||
content/branding/about-logo@2x.png (about-logo@2x.png)
|
content/branding/about-logo@2x.png (about-logo@2x.png)
|
||||||
content/branding/about-wordmark.png (about-wordmark.png)
|
content/branding/about-wordmark.png (about-wordmark.png)
|
||||||
|
|
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 66 KiB After Width: | Height: | Size: 93 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 251 B |
|
|
@ -1,8 +0,0 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
|
|
||||||
|
|
||||||
<svg version="1.1" id="aboutWordmark" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="132px" height="48px" viewBox="0 0 132 48" xml:space="preserve">
|
|
||||||
|
|
||||||
<path fill="#55575C"/>
|
|
||||||
|
|
||||||
</svg>
|
|
||||||
|
Before Width: | Height: | Size: 377 B |
|
|
@ -9,16 +9,11 @@
|
||||||
color: #fff;
|
color: #fff;
|
||||||
}
|
}
|
||||||
|
|
||||||
.text-link {
|
#aboutVersionBox {
|
||||||
color: #eef !important;
|
/* No wordmark: leave empty space */
|
||||||
|
margin-top: 20px;
|
||||||
}
|
}
|
||||||
|
|
||||||
#PMrightBox {
|
#aboutLinkBox {
|
||||||
/* this margin prevents text from overlapping the planet image */
|
padding: 15px 10px 20px;
|
||||||
margin-left: 280px;
|
|
||||||
margin-right: 20px;
|
|
||||||
}
|
|
||||||
|
|
||||||
#PMbottomBox {
|
|
||||||
background-color: rgba(0,0,0,.7);
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -8,7 +8,6 @@ browser.jar:
|
||||||
content/branding/about-background.png (about-background.png)
|
content/branding/about-background.png (about-background.png)
|
||||||
content/branding/about-logo.png (about-logo.png)
|
content/branding/about-logo.png (about-logo.png)
|
||||||
content/branding/about-logo@2x.png (about-logo@2x.png)
|
content/branding/about-logo@2x.png (about-logo@2x.png)
|
||||||
content/branding/about-wordmark.svg (about-wordmark.svg)
|
|
||||||
content/branding/icon48.png (icon48.png)
|
content/branding/icon48.png (icon48.png)
|
||||||
content/branding/icon64.png (icon64.png)
|
content/branding/icon64.png (icon64.png)
|
||||||
content/branding/icon16.png (../default16.png)
|
content/branding/icon16.png (../default16.png)
|
||||||
|
|
|
||||||
Binary file not shown.
|
After Width: | Height: | Size: 112 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 323 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 2.1 KiB After Width: | Height: | Size: 11 KiB |
|
|
@ -1,8 +0,0 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
|
|
||||||
|
|
||||||
<svg version="1.1" id="aboutWordmark" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="132px" height="48px" viewBox="0 0 132 48" xml:space="preserve">
|
|
||||||
|
|
||||||
<path fill="#55575C"/>
|
|
||||||
|
|
||||||
</svg>
|
|
||||||
|
Before Width: | Height: | Size: 377 B |
|
|
@ -3,45 +3,51 @@
|
||||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||||
|
|
||||||
#aboutPMDialogContainer {
|
#aboutPMDialogContainer {
|
||||||
background-image: url("chrome://branding/content/about-background.png");
|
background-image: url("chrome://branding/content/about-background.jpg");
|
||||||
background-repeat: no-repeat;
|
background-repeat: no-repeat;
|
||||||
background-color: #100000;
|
background-color: #D5BC9A;
|
||||||
background-size: cover;
|
color: #202010;
|
||||||
color: #E0E0FF;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#PMleftBox {
|
#aboutHeaderBox {
|
||||||
background-image: url("chrome://branding/content/about-logo.png");
|
background-image: url("chrome://branding/content/about-wordmark.png");
|
||||||
background-repeat: no-repeat;
|
background-repeat: no-repeat;
|
||||||
/* min-width and min-height create room for the logo */
|
background-position: center center;
|
||||||
min-width: 210px;
|
height: 44px;
|
||||||
min-height: 210px;
|
|
||||||
margin-top:20px;
|
|
||||||
-moz-margin-start: 30px;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#PMrightBox {
|
#aboutVersionBox {
|
||||||
margin-left: 30px;
|
text-shadow: 1px 1px 0px #D5BC9A;
|
||||||
margin-right: 30px;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#detailsBox > description > .text-link {
|
#aboutTextBox {
|
||||||
color: #CDC36F;
|
animation: 3s fadeIn;
|
||||||
|
animation-fill-mode: forwards;
|
||||||
|
text-shadow: 1px 1px 0px #D5BC9A;
|
||||||
|
color: #202010;
|
||||||
}
|
}
|
||||||
|
|
||||||
#PMbottomBox {
|
@keyframes fadeIn {
|
||||||
|
0% {
|
||||||
|
opacity: 0;
|
||||||
|
}
|
||||||
|
50% {
|
||||||
|
opacity: 0;
|
||||||
|
}
|
||||||
|
100% {
|
||||||
|
opacity: 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#aboutLinkBox {
|
||||||
padding: 15px 10px 0;
|
padding: 15px 10px 0;
|
||||||
background-color: rgba(240,240,255,.7);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#PMupdateDeck > hbox > label:not([class="text-link"]) {
|
#aboutPMtrademark {
|
||||||
color: #909090;
|
font-size: 10px;
|
||||||
}
|
|
||||||
|
|
||||||
#PMtrademark {
|
|
||||||
font-size: xx-small;
|
|
||||||
text-align: center;
|
text-align: center;
|
||||||
color: #333333;
|
color: #C0C0C0;
|
||||||
|
text-shadow: 1px 1px 0px #000000;
|
||||||
margin-top: 10px;
|
margin-top: 10px;
|
||||||
margin-bottom: 10px;
|
margin-bottom: 10px;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,7 @@
|
||||||
browser.jar:
|
browser.jar:
|
||||||
% content branding %content/branding/ contentaccessible=yes
|
% content branding %content/branding/ contentaccessible=yes
|
||||||
content/branding/about.png (about.png)
|
content/branding/about.png (about.png)
|
||||||
content/branding/about-background.png (about-background.png)
|
content/branding/about-background.jpg (about-background.jpg)
|
||||||
content/branding/about-logo.png (about-logo.png)
|
content/branding/about-logo.png (about-logo.png)
|
||||||
content/branding/about-logo@2x.png (about-logo@2x.png)
|
content/branding/about-logo@2x.png (about-logo@2x.png)
|
||||||
content/branding/about-wordmark.png (about-wordmark.png)
|
content/branding/about-wordmark.png (about-wordmark.png)
|
||||||
|
|
|
||||||
|
|
@ -65,18 +65,8 @@ enum class SurfaceFormat : int8_t {
|
||||||
// This represents the unknown format.
|
// This represents the unknown format.
|
||||||
UNKNOWN,
|
UNKNOWN,
|
||||||
|
|
||||||
// The following values are endian-independent synonyms. The _UINT32 suffix
|
|
||||||
// indicates that the name reflects the layout when viewed as a uint32_t
|
|
||||||
// value.
|
|
||||||
#if MOZ_LITTLE_ENDIAN
|
|
||||||
A8R8G8B8_UINT32 = B8G8R8A8, // 0xAARRGGBB
|
A8R8G8B8_UINT32 = B8G8R8A8, // 0xAARRGGBB
|
||||||
X8R8G8B8_UINT32 = B8G8R8X8 // 0x00RRGGBB
|
X8R8G8B8_UINT32 = B8G8R8X8 // 0x00RRGGBB
|
||||||
#elif MOZ_BIG_ENDIAN
|
|
||||||
A8R8G8B8_UINT32 = A8R8G8B8, // 0xAARRGGBB
|
|
||||||
X8R8G8B8_UINT32 = X8R8G8B8 // 0x00RRGGBB
|
|
||||||
#else
|
|
||||||
# error "bad endianness"
|
|
||||||
#endif
|
|
||||||
};
|
};
|
||||||
|
|
||||||
inline bool IsOpaque(SurfaceFormat aFormat)
|
inline bool IsOpaque(SurfaceFormat aFormat)
|
||||||
|
|
|
||||||
|
|
@ -53,9 +53,10 @@ if CONFIG['OS_ARCH'] == 'WINNT':
|
||||||
'nsDownloadScanner.cpp',
|
'nsDownloadScanner.cpp',
|
||||||
]
|
]
|
||||||
|
|
||||||
# XXX - Until Suite builds off XULRunner we can't guarantee our implementation
|
# The Communicator Downloads Manager uses its own DownloadManagerUI
|
||||||
# of nsIDownloadManagerUI overrides toolkit's.
|
# component and it can't be guaranteed that its implimentation will override
|
||||||
if not CONFIG['MOZ_SUITE']:
|
# toolkit's so don't include toolkit's
|
||||||
|
if not CONFIG['MOZ_SUITE'] and not CONFIG['BINOC_COMM_DLMGR']:
|
||||||
EXTRA_COMPONENTS += [
|
EXTRA_COMPONENTS += [
|
||||||
'nsDownloadManagerUI.js',
|
'nsDownloadManagerUI.js',
|
||||||
'nsDownloadManagerUI.manifest',
|
'nsDownloadManagerUI.manifest',
|
||||||
|
|
|
||||||
|
|
@ -43,15 +43,11 @@
|
||||||
<parameter name="fn"/>
|
<parameter name="fn"/>
|
||||||
<body>
|
<body>
|
||||||
<![CDATA[
|
<![CDATA[
|
||||||
if (!this.isRemoteBrowser) {
|
this.inLoadURI = true;
|
||||||
this.inLoadURI = true;
|
try {
|
||||||
try {
|
|
||||||
fn();
|
|
||||||
} finally {
|
|
||||||
this.inLoadURI = false;
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
fn();
|
fn();
|
||||||
|
} finally {
|
||||||
|
this.inLoadURI = false;
|
||||||
}
|
}
|
||||||
]]>
|
]]>
|
||||||
</body>
|
</body>
|
||||||
|
|
@ -307,7 +303,7 @@
|
||||||
<method name="preserveLayers">
|
<method name="preserveLayers">
|
||||||
<parameter name="preserve"/>
|
<parameter name="preserve"/>
|
||||||
<body>
|
<body>
|
||||||
// Only useful for remote browsers.
|
<!-- Only useful for remote browsers. -->
|
||||||
</body>
|
</body>
|
||||||
</method>
|
</method>
|
||||||
|
|
||||||
|
|
@ -338,8 +334,9 @@
|
||||||
</getter>
|
</getter>
|
||||||
</property>
|
</property>
|
||||||
|
|
||||||
|
<!-- stubbed to false until all callers are removed -->
|
||||||
<property name="isRemoteBrowser"
|
<property name="isRemoteBrowser"
|
||||||
onget="return (this.getAttribute('remote') == 'true');"
|
onget="return false;"
|
||||||
readonly="true"/>
|
readonly="true"/>
|
||||||
|
|
||||||
<property name="messageManager"
|
<property name="messageManager"
|
||||||
|
|
@ -920,7 +917,7 @@
|
||||||
os.addObserver(this, "browser:purge-session-history", true);
|
os.addObserver(this, "browser:purge-session-history", true);
|
||||||
|
|
||||||
// enable global history if we weren't told otherwise
|
// enable global history if we weren't told otherwise
|
||||||
if (!this.hasAttribute("disableglobalhistory") && !this.isRemoteBrowser) {
|
if (!this.hasAttribute("disableglobalhistory")) {
|
||||||
try {
|
try {
|
||||||
this.docShell.useGlobalHistory = true;
|
this.docShell.useGlobalHistory = true;
|
||||||
} catch (ex) {
|
} catch (ex) {
|
||||||
|
|
@ -949,9 +946,7 @@
|
||||||
this.relatedBrowser = relatedBrowser;
|
this.relatedBrowser = relatedBrowser;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!this.isRemoteBrowser) {
|
this.addEventListener("pagehide", this.onPageHide, true);
|
||||||
this.addEventListener("pagehide", this.onPageHide, true);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (this.messageManager) {
|
if (this.messageManager) {
|
||||||
this.messageManager.addMessageListener("PopupBlocking:UpdateBlockedPopups", this);
|
this.messageManager.addMessageListener("PopupBlocking:UpdateBlockedPopups", this);
|
||||||
|
|
@ -1000,9 +995,7 @@
|
||||||
|
|
||||||
this.lastURI = null;
|
this.lastURI = null;
|
||||||
|
|
||||||
if (!this.isRemoteBrowser) {
|
this.removeEventListener("pagehide", this.onPageHide, true);
|
||||||
this.removeEventListener("pagehide", this.onPageHide, true);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (this._autoScrollNeedsCleanup) {
|
if (this._autoScrollNeedsCleanup) {
|
||||||
// we polluted the global scope, so clean it up
|
// we polluted the global scope, so clean it up
|
||||||
|
|
@ -1288,9 +1281,6 @@
|
||||||
<parameter name="aOtherBrowser"/>
|
<parameter name="aOtherBrowser"/>
|
||||||
<body>
|
<body>
|
||||||
<![CDATA[
|
<![CDATA[
|
||||||
if (this.isRemoteBrowser != aOtherBrowser.isRemoteBrowser)
|
|
||||||
throw new Error("Can only swap docshells between browsers in the same process.");
|
|
||||||
|
|
||||||
// Give others a chance to swap state.
|
// Give others a chance to swap state.
|
||||||
// IMPORTANT: Since a swapDocShells call does not swap the messageManager
|
// IMPORTANT: Since a swapDocShells call does not swap the messageManager
|
||||||
// instances attached to a browser to aOtherBrowser, others
|
// instances attached to a browser to aOtherBrowser, others
|
||||||
|
|
@ -1324,28 +1314,6 @@
|
||||||
"_webNavigation"
|
"_webNavigation"
|
||||||
];
|
];
|
||||||
|
|
||||||
if (this.isRemoteBrowser) {
|
|
||||||
fieldsToSwap.push(...[
|
|
||||||
"_remoteWebNavigation",
|
|
||||||
"_remoteWebNavigationImpl",
|
|
||||||
"_remoteWebProgressManager",
|
|
||||||
"_remoteWebProgress",
|
|
||||||
"_remoteFinder",
|
|
||||||
"_securityUI",
|
|
||||||
"_documentURI",
|
|
||||||
"_documentContentType",
|
|
||||||
"_contentTitle",
|
|
||||||
"_characterSet",
|
|
||||||
"_contentPrincipal",
|
|
||||||
"_imageDocument",
|
|
||||||
"_fullZoom",
|
|
||||||
"_textZoom",
|
|
||||||
"_isSyntheticDocument",
|
|
||||||
"_innerWindowID",
|
|
||||||
"_manifestURI",
|
|
||||||
]);
|
|
||||||
}
|
|
||||||
|
|
||||||
var ourFieldValues = {};
|
var ourFieldValues = {};
|
||||||
var otherFieldValues = {};
|
var otherFieldValues = {};
|
||||||
for (let field of fieldsToSwap) {
|
for (let field of fieldsToSwap) {
|
||||||
|
|
@ -1368,27 +1336,10 @@
|
||||||
aOtherBrowser[field] = ourFieldValues[field];
|
aOtherBrowser[field] = ourFieldValues[field];
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!this.isRemoteBrowser) {
|
// Null the current nsITypeAheadFind instances so that they're
|
||||||
// Null the current nsITypeAheadFind instances so that they're
|
// lazily re-created on access. We need to do this because they
|
||||||
// lazily re-created on access. We need to do this because they
|
// might have attached the wrong docShell.
|
||||||
// might have attached the wrong docShell.
|
this._fastFind = aOtherBrowser._fastFind = null;
|
||||||
this._fastFind = aOtherBrowser._fastFind = null;
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
// Rewire the remote listeners
|
|
||||||
this._remoteWebNavigationImpl.swapBrowser(this);
|
|
||||||
aOtherBrowser._remoteWebNavigationImpl.swapBrowser(aOtherBrowser);
|
|
||||||
|
|
||||||
if (this._remoteWebProgressManager && aOtherBrowser._remoteWebProgressManager) {
|
|
||||||
this._remoteWebProgressManager.swapBrowser(this);
|
|
||||||
aOtherBrowser._remoteWebProgressManager.swapBrowser(aOtherBrowser);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (this._remoteFinder)
|
|
||||||
this._remoteFinder.swapBrowser(this);
|
|
||||||
if (aOtherBrowser._remoteFinder)
|
|
||||||
aOtherBrowser._remoteFinder.swapBrowser(aOtherBrowser);
|
|
||||||
}
|
|
||||||
|
|
||||||
event = new CustomEvent("EndSwapDocShells", {"detail": aOtherBrowser});
|
event = new CustomEvent("EndSwapDocShells", {"detail": aOtherBrowser});
|
||||||
this.dispatchEvent(event);
|
this.dispatchEvent(event);
|
||||||
|
|
@ -1540,11 +1491,6 @@
|
||||||
event.preventDefault();
|
event.preventDefault();
|
||||||
}
|
}
|
||||||
|
|
||||||
// No need to handle "dragover" in e10s, since nsDocShellTreeOwner.cpp in the child process
|
|
||||||
// handles that case using "@mozilla.org/content/dropped-link-handler;1" service.
|
|
||||||
if (this.isRemoteBrowser)
|
|
||||||
return;
|
|
||||||
|
|
||||||
let linkHandler = Components.classes["@mozilla.org/content/dropped-link-handler;1"].
|
let linkHandler = Components.classes["@mozilla.org/content/dropped-link-handler;1"].
|
||||||
getService(Components.interfaces.nsIDroppedLinkHandler);
|
getService(Components.interfaces.nsIDroppedLinkHandler);
|
||||||
if (linkHandler.canDropLink(event, false))
|
if (linkHandler.canDropLink(event, false))
|
||||||
|
|
@ -1553,9 +1499,7 @@
|
||||||
</handler>
|
</handler>
|
||||||
<handler event="drop" group="system">
|
<handler event="drop" group="system">
|
||||||
<
Binary file not shown.
|
After Width: | Height: | Size: 91 B |
BIN
toolkit/themes/windows/global/arrow/arrow-rit-hov.gif
Normal file
BIN
toolkit/themes/windows/global/arrow/arrow-rit-hov.gif
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 91 B |
Loading…
Add table
Add a link
Reference in a new issue