diff options
author | janekptacijarabaci <janekptacijarabaci@seznam.cz> | 2018-03-27 15:57:18 +0200 |
---|---|---|
committer | janekptacijarabaci <janekptacijarabaci@seznam.cz> | 2018-03-27 15:57:18 +0200 |
commit | d990d8ab2cade6c928e8bbe56ae038d020cef599 (patch) | |
tree | c7561ae0f303cb0d4a7a7507178531b4852e4dea /application | |
parent | 0c36b27511c1fbca594f0426c493ef601fda3e4c (diff) | |
parent | 8d5ec757ece850fb7ad5c712868f305636e41177 (diff) | |
download | UXP-d990d8ab2cade6c928e8bbe56ae038d020cef599.tar UXP-d990d8ab2cade6c928e8bbe56ae038d020cef599.tar.gz UXP-d990d8ab2cade6c928e8bbe56ae038d020cef599.tar.lz UXP-d990d8ab2cade6c928e8bbe56ae038d020cef599.tar.xz UXP-d990d8ab2cade6c928e8bbe56ae038d020cef599.zip |
Merge branch 'master' of https://github.com/MoonchildProductions/UXP into js_array_values_1
Diffstat (limited to 'application')
-rw-r--r-- | application/palemoon/base/content/aboutDialog.xul | 4 | ||||
-rw-r--r-- | application/palemoon/base/content/browser-menubar.inc | 4 | ||||
-rw-r--r-- | application/palemoon/components/preferences/tabs.js | 35 | ||||
-rw-r--r-- | application/palemoon/components/preferences/tabs.xul | 3 | ||||
-rw-r--r-- | application/palemoon/config/version.txt | 2 | ||||
-rw-r--r-- | application/palemoon/confvars.sh | 4 | ||||
-rw-r--r-- | application/palemoon/fonts/EmojiOneMozilla.ttf | bin | 0 -> 1227260 bytes | |||
-rw-r--r-- | application/palemoon/fonts/README.txt | 9 | ||||
-rw-r--r-- | application/palemoon/fonts/moz.build | 11 | ||||
-rw-r--r-- | application/palemoon/installer/package-manifest.in | 3 | ||||
-rw-r--r-- | application/palemoon/locales/en-US/chrome/browser/browser.dtd | 16 | ||||
-rw-r--r-- | application/palemoon/locales/en-US/chrome/browser/statusbar/meta.properties | 2 | ||||
-rw-r--r-- | application/palemoon/locales/en-US/chrome/browser/statusbar/statusbar-overlay.dtd | 4 | ||||
-rw-r--r-- | application/palemoon/moz.build | 1 | ||||
-rw-r--r-- | application/palemoon/themes/windows/browser.css | 2 |
15 files changed, 74 insertions, 26 deletions
diff --git a/application/palemoon/base/content/aboutDialog.xul b/application/palemoon/base/content/aboutDialog.xul index 1ba8f06a1..743ff21df 100644 --- a/application/palemoon/base/content/aboutDialog.xul +++ b/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> diff --git a/application/palemoon/base/content/browser-menubar.inc b/application/palemoon/base/content/browser-menubar.inc index f818f5149..fa9d7f0f4 100644 --- a/application/palemoon/base/content/browser-menubar.inc +++ b/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 diff --git a/application/palemoon/components/preferences/tabs.js b/application/palemoon/components/preferences/tabs.js index 9e15d8bb4..f0ad8490c 100644 --- a/application/palemoon/components/preferences/tabs.js +++ b/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); } diff --git a/application/palemoon/components/preferences/tabs.xul b/application/palemoon/components/preferences/tabs.xul index fc15a87ef..f5b44b776 100644 --- a/application/palemoon/components/preferences/tabs.xul +++ b/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" /> diff --git a/application/palemoon/config/version.txt b/application/palemoon/config/version.txt index bdad95223..1d43844fa 100644 --- a/application/palemoon/config/version.txt +++ b/application/palemoon/config/version.txt @@ -1 +1 @@ -27.8.0a1
\ No newline at end of file +27.9.0a1
\ No newline at end of file diff --git a/application/palemoon/confvars.sh b/application/palemoon/confvars.sh index ba760f0aa..7466d0c3c 100644 --- a/application/palemoon/confvars.sh +++ b/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 diff --git a/application/palemoon/fonts/EmojiOneMozilla.ttf b/application/palemoon/fonts/EmojiOneMozilla.ttf Binary files differnew file mode 100644 index 000000000..50356509d --- /dev/null +++ b/application/palemoon/fonts/EmojiOneMozilla.ttf diff --git a/application/palemoon/fonts/README.txt b/application/palemoon/fonts/README.txt new file mode 100644 index 000000000..188ea3fff --- /dev/null +++ b/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. diff --git a/application/palemoon/fonts/moz.build b/application/palemoon/fonts/moz.build new file mode 100644 index 000000000..93d07120b --- /dev/null +++ b/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' + ] diff --git a/application/palemoon/installer/package-manifest.in b/application/palemoon/installer/package-manifest.in index 0228deb52..a581ff469 100644 --- a/application/palemoon/installer/package-manifest.in +++ b/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/* diff --git a/application/palemoon/locales/en-US/chrome/browser/browser.dtd b/application/palemoon/locales/en-US/chrome/browser/browser.dtd index d6965cd74..fe5f64854 100644 --- a/application/palemoon/locales/en-US/chrome/browser/browser.dtd +++ b/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"> diff --git a/application/palemoon/locales/en-US/chrome/browser/statusbar/meta.properties b/application/palemoon/locales/en-US/chrome/browser/statusbar/meta.properties index fd8a13547..24cb5c092 100644 --- a/application/palemoon/locales/en-US/chrome/browser/statusbar/meta.properties +++ b/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 diff --git a/application/palemoon/locales/en-US/chrome/browser/statusbar/statusbar-overlay.dtd b/application/palemoon/locales/en-US/chrome/browser/statusbar/statusbar-overlay.dtd index 0ea5ffc26..bb0ab95f8 100644 --- a/application/palemoon/locales/en-US/chrome/browser/statusbar/statusbar-overlay.dtd +++ b/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"> diff --git a/application/palemoon/moz.build b/application/palemoon/moz.build index b911f2818..2b9d8f09b 100644 --- a/application/palemoon/moz.build +++ b/application/palemoon/moz.build @@ -9,6 +9,7 @@ CONFIGURE_SUBST_FILES += ['installer/Makefile'] DIRS += [ 'base', 'components', + 'fonts', 'locales', 'modules', 'themes', diff --git a/application/palemoon/themes/windows/browser.css b/application/palemoon/themes/windows/browser.css index 9fdd67b55..7c837764d 100644 --- a/application/palemoon/themes/windows/browser.css +++ b/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); } |