Browse Source

Sync Pale Moon code

pull/1/head
NTD 4 years ago committed by Roy Tam
parent
commit
1648d92f30
  1. 4
      application/palemoon/base/content/aboutDialog.xul
  2. 4
      application/palemoon/base/content/browser-menubar.inc
  3. 35
      application/palemoon/components/preferences/tabs.js
  4. 3
      application/palemoon/components/preferences/tabs.xul
  5. 2
      application/palemoon/config/version.txt
  6. 4
      application/palemoon/confvars.sh
  7. BIN
      application/palemoon/fonts/EmojiOneMozilla.ttf
  8. 9
      application/palemoon/fonts/README.txt
  9. 11
      application/palemoon/fonts/moz.build
  10. 3
      application/palemoon/installer/package-manifest.in
  11. 16
      application/palemoon/locales/en-US/chrome/browser/browser.dtd
  12. 2
      application/palemoon/locales/en-US/chrome/browser/statusbar/meta.properties
  13. 4
      application/palemoon/locales/en-US/chrome/browser/statusbar/statusbar-overlay.dtd
  14. 1
      application/palemoon/moz.build
  15. 2
      application/palemoon/themes/windows/browser.css

4
application/palemoon/base/content/aboutDialog.xul

@ -88,6 +88,9 @@
</vbox>
<description class="text-pmcreds">
#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>.
#else
Pale Moon is released by <label class="text-link" href="http://www.moonchildproductions.info">Moonchild Productions</label>.
</description>
<description class="text-pmcreds">
@ -96,6 +99,7 @@
<description class="text-blurb">
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.
#endif
</description>
</vbox>
</vbox>

4
application/palemoon/base/content/browser-menubar.inc

@ -85,8 +85,8 @@
observes="workOfflineMenuitemState"
oncommand="BrowserOffline.toggleOfflineStatus();"/>
<menuitem id="menu_restart"
label="&appMenuRestart.label;"
accesskey="&appMenuRestart.accesskey;"
label="&restartCmd.label;"
accesskey="&restartCmd.accesskey;"
command="cmd_restartApplication"/>
<menuitem id="menu_FileQuitItem"
#ifdef XP_WIN

35
application/palemoon/components/preferences/tabs.js

@ -89,7 +89,7 @@ var gTabsPane = {
case "about:logopage":
newtabUrlChoice.value = 1;
break;
case "https://start.palemoon.org/":
case "http://start.palemoon.org/":
newtabUrlChoice.value = 2;
break;
case newtabUrlSanitizedPref.value:
@ -101,6 +101,8 @@ var gTabsPane = {
default: // Custom URL entered.
document.getElementById("newtabPageCustom").hidden = false;
newtabUrlChoice.value = 0;
// We need this to consider instantApply.
this.newtabPageCustom = newtabUrlPref.value;
}
},
@ -109,32 +111,45 @@ var gTabsPane = {
* if the choice is "my home page", get and sanitize the browser home page
* URL to make it suitable for newtab use.
*
* Called from prefwindow's ondialogaccept handler.
* Called from prefwindow's ondialogaccept handler and
* from browser.newtab.choice's oncommand to consider instantApply.
*/
writeNewtabUrl: function() {
writeNewtabUrl: function(newtabUrlChoice) {
try {
let newtabUrlChoice = Services.prefs.getIntPref("browser.newtab.choice");
let browserHomepageUrl = Services.prefs.getCharPref("browser.startup.homepage");
if (newtabUrlChoice) {
if (Services.prefs.getBoolPref("browser.preferences.instantApply")) {
newtabUrlChoice = parseInt(newtabUrlChoice);
} else {
return;
}
} else {
newtabUrlChoice = Services.prefs.getIntPref("browser.newtab.choice");
}
let browserHomepageUrl = Services.prefs.getComplexValue("browser.startup.homepage",
Components.interfaces.nsIPrefLocalizedString).data;
let newtabUrlPref = Services.prefs.getCharPref("browser.newtab.url");
switch (newtabUrlChoice) {
case 1:
newtabUrlPref="about:logopage";
newtabUrlPref = "about:logopage";
break;
case 2:
newtabUrlPref="https://start.palemoon.org/";
newtabUrlPref = "http://start.palemoon.org/";
break;
case 3:
// If url is a pipe-delimited set of pages, just take the first one.
let newtabUrlSanitizedPref=browserHomepageUrl.split("|")[0];
// XXX: do we need extra sanitation here, e.g. for invalid URLs?
Services.prefs.setCharPref("browser.newtab.myhome", newtabUrlSanitizedPref);
newtabUrlPref=newtabUrlSanitizedPref;
newtabUrlPref = newtabUrlSanitizedPref;
break;
case 4:
newtabUrlPref="about:newtab";
newtabUrlPref = "about:newtab";
break;
default:
// In case of any other value it's a custom URL, so don't change anything...
// In case of any other value it's a custom URL, consider instantApply.
if (this.newtabPageCustom) {
newtabUrlPref = this.newtabPageCustom;
}
}
Services.prefs.setCharPref("browser.newtab.url",newtabUrlPref);
} catch(e) { console.error(e); }

3
application/palemoon/components/preferences/tabs.xul

@ -84,7 +84,8 @@
<label value="&newtabPage.label;"/>
<menulist
id="newtabPage"
preference="browser.newtab.choice">
preference="browser.newtab.choice"
oncommand="gTabsPane.writeNewtabUrl(event.target.value);">
<menupopup>
<menuitem label="&newtabPage.custom.label;" value="0" id="newtabPageCustom" hidden="true" />
<menuitem label="&newtabPage.blank.label;" value="1" />

2
application/palemoon/config/version.txt

@ -1 +1 @@
27.8.0a1
27.9.0a1

4
application/palemoon/confvars.sh

@ -8,6 +8,10 @@ MOZ_APP_VENDOR=Moonchild
MOZ_UPDATER=1
MOZ_PHOENIX=1
if test "$OS_TARGET" = "WINNT"; then
MOZ_BUNDLED_FONTS=1
fi
MOZ_CHROME_FILE_FORMAT=omni
MOZ_SERVICES_COMMON=1
MOZ_MEDIA_NAVIGATOR=1

BIN
application/palemoon/fonts/EmojiOneMozilla.ttf

Binary file not shown.

9
application/palemoon/fonts/README.txt

@ -0,0 +1,9 @@
EmojiOne Mozilla
================
The upstream repository of EmojiOne Mozilla can be found at
https://github.com/mozilla/emojione-colr
Please refer commit history for the current version of the font.
This file purposely omit the version, so there is no need to update it here.

11
application/palemoon/fonts/moz.build

@ -0,0 +1,11 @@
# -*- Mode: python; c-basic-offset: 4; 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/.
if CONFIG['OS_ARCH'] in ('WINNT'):
DIST_SUBDIR = ''
FINAL_TARGET_FILES.fonts += [
'EmojiOneMozilla.ttf'
]

3
application/palemoon/installer/package-manifest.in

@ -51,6 +51,9 @@
@RESPATH@/browser/defaults/profile/localstore.rdf
@RESPATH@/browser/defaults/profile/mimeTypes.rdf
@RESPATH@/dictionaries/*
#if defined(XP_WIN)
@RESPATH@/fonts/*
#endif
@RESPATH@/hyphenation/*
@RESPATH@/browser/@PREF_DIR@/palemoon-l10n.js
@RESPATH@/browser/searchplugins/*

16
application/palemoon/locales/en-US/chrome/browser/browser.dtd

@ -67,6 +67,9 @@ can reach it easily. -->
<!ENTITY goOfflineCmd.label "Work Offline">
<!ENTITY goOfflineCmd.accesskey "k">
<!ENTITY restartCmd.label "Restart…">
<!ENTITY restartCmd.accesskey "R">
<!ENTITY menubarCmd.label "Menu Bar">
<!ENTITY menubarCmd.accesskey "M">
<!ENTITY navbarCmd.label "Navigation Toolbar">
@ -307,7 +310,7 @@ These should match what Safari and other Apple applications use on OS X Lion. --
<!ENTITY viewToolbarsMenu.accesskey "T">
<!ENTITY viewSidebarMenu.label "Sidebar">
<!ENTITY viewSidebarMenu.accesskey "e">
<!ENTITY viewCustomizeToolbar.label "Customize">
<!ENTITY viewCustomizeToolbar.label "Customize">
<!ENTITY viewCustomizeToolbar.accesskey "C">
<!ENTITY viewTabsOnTop.label "Tabs on Top">
<!ENTITY viewTabsOnTop.accesskey "T">
@ -325,7 +328,7 @@ These should match what Safari and other Apple applications use on OS X Lion. --
<!ENTITY appMenuEdit.label "Edit">
<!ENTITY appMenuCustomize.label "Customize">
<!ENTITY appMenuToolbarLayout.label "Toolbar Layout">
<!ENTITY appMenuToolbarLayout.label "Toolbar Layout">
<!ENTITY appMenuSidebars.label "Sidebars">
<!ENTITY appMenuFind.label "Find…">
<!ENTITY appMenuUnsorted.label "Unsorted Bookmarks">
@ -546,7 +549,7 @@ you can use these alternative items. Otherwise, their values should be empty. -
<!ENTITY zoomInButton.tooltip "Zoom in">
<!ENTITY zoomControls.label "Zoom Controls">
<!ENTITY appMenuRestart.label "Restart">
<!ENTITY appMenuRestart.label "Restart">
<!ENTITY appMenuRestart.accesskey "R">
<!ENTITY quitApplicationCmdWin.label "Exit">
@ -573,11 +576,8 @@ you can use these alternative items. Otherwise, their values should be empty. -
<!ENTITY pageReportIcon.tooltip "Change pop-up blocking settings for this website">
<!ENTITY allowPopups.accesskey "p">
<!-- On Windows we use the term "Options" to describe settings, but
on Linux and Mac OS X we use "Preferences" - carry that distinction
over into this string, which is used in the "popup blocked" info bar . -->
<!ENTITY editPopupSettingsUnix.label "Edit Pop-up Blocker Preferences…">
<!ENTITY editPopupSettings.label "Edit Pop-up Blocker Options…">
<!ENTITY editPopupSettingsUnix.label "Edit Pop-up Blocker Preferences">
<!ENTITY editPopupSettings.label "Edit Pop-up Blocker Preferences">
<!ENTITY editPopupSettings.accesskey "E">
<!ENTITY dontShowMessage.accesskey "D">

2
application/palemoon/locales/en-US/chrome/browser/statusbar/meta.properties

@ -1,5 +1,5 @@
# Translator names. If there is more than one, separate with commas. Only include your name, not the locale you're translating.
translator=Sparky Bluefang
translator=Moonchild
# Extension title. This usually should not be translated.
name=Status-4-Evar

4
application/palemoon/locales/en-US/chrome/browser/statusbar/statusbar-overlay.dtd

@ -4,7 +4,7 @@
<!ENTITY status4evar.progress.widget.title "Progress Meter">
<!ENTITY status4evar.throbber.widget.title "Activity Indicator">
<!ENTITY status4evar.download.widget.title "Download Status">
<!ENTITY status4evar.options.widget.title "Pale Moon status bar options">
<!ENTITY status4evar.options.widget.title "Status Bar Preferences">
<!ENTITY status4evar.options.widget.label "Pale Moon status bar">
<!ENTITY status4evar.menu.options.label "Status bar options...">
<!ENTITY status4evar.menu.options.label "Status Bar Preferences">

1
application/palemoon/moz.build

@ -9,6 +9,7 @@ CONFIGURE_SUBST_FILES += ['installer/Makefile']
DIRS += [
'base',
'components',
'fonts',
'locales',
'modules',
'themes',

2
application/palemoon/themes/windows/browser.css

@ -1887,7 +1887,7 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
/* Hide the transparent top border by default */
margin-top: -1px;
/* Reduce the gap between the tabs */
-moz-margin-start: -0.8px;
-moz-margin-start: -1px;
box-shadow: var(--tab-box-shadow);
}

Loading…
Cancel
Save