Centaury branding

master
Fedor 2019-03-14 03:36:07 +03:00
parent 9291eb9adf
commit 7b27b7d8d1
30 changed files with 3018 additions and 811 deletions

View File

@ -23,13 +23,6 @@ NSDISTMODE = copy
include $(topsrcdir)/config/config.mk include $(topsrcdir)/config/config.mk
ifeq ($(OS_ARCH),WINNT)
# Rebuild firefox.exe if the manifest changes - it's included by splash.rc.
# (this dependency should really be just for firefox.exe, not other targets)
# Note the manifest file exists in the tree, so we use the explicit filename
# here.
EXTRA_DEPS += basilisk.exe.manifest
endif
PROGRAMS_DEST = $(DIST)/bin PROGRAMS_DEST = $(DIST)/bin
@ -42,7 +35,7 @@ libs::
cp -p $(MOZ_APP_NAME)$(BIN_SUFFIX) $(DIST)/bin/$(MOZ_APP_NAME)-bin$(BIN_SUFFIX) cp -p $(MOZ_APP_NAME)$(BIN_SUFFIX) $(DIST)/bin/$(MOZ_APP_NAME)-bin$(BIN_SUFFIX)
endif endif
GARBAGE += $(addprefix $(FINAL_TARGET)/defaults/pref/, basilisk.js) GARBAGE += $(addprefix $(FINAL_TARGET)/defaults/pref/, centaury.js)
endif endif

View File

@ -20,9 +20,9 @@
[App] [App]
# Vendor=@MOZ_APP_VENDOR@ # Vendor=@MOZ_APP_VENDOR@
Vendor=Moonchild Productions Vendor=""
# Name=@MOZ_APP_BASENAME@ # Name=@MOZ_APP_BASENAME@
Name=Basilisk Name=Centaury
RemotingName=@MOZ_APP_REMOTINGNAME@ RemotingName=@MOZ_APP_REMOTINGNAME@
#ifdef MOZ_APP_DISPLAYNAME #ifdef MOZ_APP_DISPLAYNAME
CodeName=@MOZ_APP_DISPLAYNAME@ CodeName=@MOZ_APP_DISPLAYNAME@

View File

@ -1,8 +1,8 @@
WIN32_MODULE_COMPANYNAME=Moonchild Productions WIN32_MODULE_COMPANYNAME=Theodor
WIN32_MODULE_COPYRIGHT=©Basilisk and Mozilla Developers; available under the MPL 2 license. WIN32_MODULE_COPYRIGHT=©Centaury and Mozilla Developers; available under the MPL 2 license.
WIN32_MODULE_PRODUCTVERSION=@MOZ_APP_WINVERSION@ WIN32_MODULE_PRODUCTVERSION=@MOZ_APP_WINVERSION@
WIN32_MODULE_PRODUCTVERSION_STRING=@MOZ_APP_VERSION@ WIN32_MODULE_PRODUCTVERSION_STRING=@MOZ_APP_VERSION@
WIN32_MODULE_TRADEMARKS=Basilisk is a Trademark of Moonchild Productions. WIN32_MODULE_TRADEMARKS=Centaury is a Trademark of Me.
WIN32_MODULE_DESCRIPTION=@MOZ_APP_DISPLAYNAME@ WIN32_MODULE_DESCRIPTION=@MOZ_APP_DISPLAYNAME@
WIN32_MODULE_PRODUCTNAME=@MOZ_APP_DISPLAYNAME@ WIN32_MODULE_PRODUCTNAME=@MOZ_APP_DISPLAYNAME@
WIN32_MODULE_NAME=@MOZ_APP_DISPLAYNAME@ WIN32_MODULE_NAME=@MOZ_APP_DISPLAYNAME@

View File

@ -9,7 +9,7 @@ DIRS += ['profile/extensions']
GeckoProgram(CONFIG['MOZ_APP_NAME']) GeckoProgram(CONFIG['MOZ_APP_NAME'])
JS_PREFERENCE_PP_FILES += [ JS_PREFERENCE_PP_FILES += [
'profile/basilisk.js', 'profile/centaury.js',
] ]
SOURCES += [ SOURCES += [

View File

@ -75,7 +75,7 @@ static void Output(const char *fmt, ... )
decltype(MessageBoxW)* messageBoxW = decltype(MessageBoxW)* messageBoxW =
(decltype(MessageBoxW)*) GetProcAddress(user32, "MessageBoxW"); (decltype(MessageBoxW)*) GetProcAddress(user32, "MessageBoxW");
if (messageBoxW) { if (messageBoxW) {
messageBoxW(nullptr, wide_msg, L"Basilisk", MB_OK messageBoxW(nullptr, wide_msg, L"Centaury", MB_OK
| MB_ICONERROR | MB_ICONERROR
| MB_SETFOREGROUND); | MB_SETFOREGROUND);
} }
@ -161,7 +161,7 @@ static int do_main(int argc, char* argv[], char* envp[], nsIFile *xreDirectory)
nsresult rv; nsresult rv;
uint32_t mainFlags = 0; uint32_t mainFlags = 0;
// Allow basilisk.exe to launch XULRunner apps via -app <application.ini> // Allow Centaury.exe to launch XULRunner apps via -app <application.ini>
// Note that -app must be the *first* argument. // Note that -app must be the *first* argument.
const char *appDataFile = getenv("XUL_APP_FILE"); const char *appDataFile = getenv("XUL_APP_FILE");
if (appDataFile && *appDataFile) { if (appDataFile && *appDataFile) {

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -6,8 +6,6 @@
#include <windows.h> #include <windows.h>
#include "nsNativeAppSupportWin.h" #include "nsNativeAppSupportWin.h"
1 24 "basilisk.exe.manifest"
IDI_APPICON ICON FIREFOX_ICO IDI_APPICON ICON FIREFOX_ICO
IDI_DOCUMENT ICON DOCUMENT_ICO IDI_DOCUMENT ICON DOCUMENT_ICO
IDI_APPLICATION ICON FIREFOX_ICO IDI_APPLICATION ICON FIREFOX_ICO

View File

@ -122,18 +122,12 @@
&warningDesc.version; &warningDesc.version;
</description> </description>
</vbox> </vbox>
#ifdef MC_PRIVATE_BUILD
<description class="text-blurb" id="communityDesc">
This is a private build of Basilisk. 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.basilisk-browser.org/">Basilisk website</label>.
</description>
#else
<description class="text-blurb" id="communityDesc"> <description class="text-blurb" id="communityDesc">
Basilisk is community software released by <label class="text-link" href="http://www.palemoon.org/">the Pale Moon team</label> and Mozilla developers. Learn <label class="text-link" useoriginprincipal="true" href="about:credits">who contributed</label> to this software. Centaury built on Basilisk code on the purpose adapt it for Windows XP. Adaptations are very insignificant, it perfoms the same as its original.
</description> </description>
<description class="text-blurb" id="contributeDesc"> <description class="text-blurb" id="contributeDesc">
Want to help? Please consider <label class="text-link" href="https://www.palemoon.org/donations.shtml">donating</label> or get involved with our <label class="text-link" href="https://github.com/MoonchildProductions/UXP">development</label> of the Unified XUL Platform. Want to help? Please consider <label class="text-link" href="https://www.palemoon.org/donations.shtml">donating</label> or get involved with our <label class="text-link" href="https://github.com/MoonchildProductions/UXP">development</label> of the Unified XUL Platform.
</description> </description>
#endif
</vbox> </vbox>
</vbox> </vbox>
</hbox> </hbox>

View File

@ -43,7 +43,7 @@
#endif #endif
<menupopup id="menu_HelpPopup" onpopupshowing="buildHelpMenu();"> <menupopup id="menu_HelpPopup" onpopupshowing="buildHelpMenu();">
<menuitem id="menu_openHelp" <menuitem id="menu_openHelp"
oncommand="openHelpLink('firefox-help')" oncommand="openHelpLink('')"
onclick="checkForMiddleClick(this, event);" onclick="checkForMiddleClick(this, event);"
label="&productHelp2.label;" label="&productHelp2.label;"
accesskey="&productHelp2.accesskey;" accesskey="&productHelp2.accesskey;"
@ -53,7 +53,7 @@
/> />
#endif #endif
<menuitem id="menu_keyboardShortcuts" <menuitem id="menu_keyboardShortcuts"
oncommand="openHelpLink('keyboard-shortcuts')" oncommand="openHelpLink('')"
onclick="checkForMiddleClick(this, event);" onclick="checkForMiddleClick(this, event);"
label="&helpKeyboardShortcuts.label;" label="&helpKeyboardShortcuts.label;"
accesskey="&helpKeyboardShortcuts.accesskey;"/> accesskey="&helpKeyboardShortcuts.accesskey;"/>
@ -91,7 +91,7 @@
<keyset id="baseMenuKeyset"> <keyset id="baseMenuKeyset">
#ifdef XP_MACOSX #ifdef XP_MACOSX
<key id="key_openHelpMac" <key id="key_openHelpMac"
oncommand="openHelpLink('firefox-osxkey');" oncommand="openHelpLink('');"
key="&helpMac.commandkey;" key="&helpMac.commandkey;"
modifiers="accel"/> modifiers="accel"/>
<!-- These are used to build the Application menu under Cocoa widgets --> <!-- These are used to build the Application menu under Cocoa widgets -->

View File

@ -1702,7 +1702,7 @@ function HandleAppCommandEvent(evt) {
gFindBar.onFindCommand(); gFindBar.onFindCommand();
break; break;
case "Help": case "Help":
openHelpLink('firefox-help'); openHelpLink('');
break; break;
case "Open": case "Open":
BrowserOpenFileWindow(); BrowserOpenFileWindow();

View File

@ -7,12 +7,12 @@
@template @template
def ApplicationBranding(): def ApplicationBranding():
JS_PREFERENCE_PP_FILES += [ JS_PREFERENCE_PP_FILES += [
'pref/basilisk-branding.js', 'pref/centaury-branding.js',
] ]
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows': if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
FINAL_TARGET_FILES['..'] += [ FINAL_TARGET_FILES['..'] += [
'basilisk.VisualElementsManifest.xml', 'centaury.VisualElementsManifest.xml',
] ]
FINAL_TARGET_FILES.VisualElements += [ FINAL_TARGET_FILES.VisualElements += [
'VisualElements_150.png', 'VisualElements_150.png',

View File

@ -1,9 +1,8 @@
The Serpent application name and Serpent logo are licensed under a The Centaury application name and Centaury logo are licensed under a
Creative Commons Attribution license. Creative Commons Attribution license.
The Serpent logo is derived from "Sea Serpent" The Centaury logo is derived from Centaury by me,
by Lorc,
licensed under the Creative Commons license CC-BY 3.0 licensed under the Creative Commons license CC-BY 3.0
Branding files are created by M. Straver and similarly released Branding files are created by Theodor
under the Creative Commons license CC-BY 3.0 under the Creative Commons license CC-BY 3.0

View File

@ -8,9 +8,10 @@
# BrandFullNameInternal is used for some registry and file system values # BrandFullNameInternal is used for some registry and file system values
# instead of BrandFullName and typically should not be modified. # instead of BrandFullName and typically should not be modified.
!define BrandFullNameInternal "Serpent" !define BrandFullNameInternal "Centaury"
!define CompanyName "Moonchild Productions" !define CompanyName ""
!define URLInfoAbout "https://www.basilisk-browser.org" !define URLInfoAbout "https://feodor2.github.io/Mypal/"
!define URLUpdateInfo "https://www.basilisk-browser.org" !define URLUpdateInfo "https://feodor2.github.io/Mypal/"
!define HelpLink "https://forum.palemoon.org" !define HelpLink "https://github.com/Feodor2/Mypal/wiki"
!define URLSystemRequirements "https://www.basilisk-browser.org" !define URLSystemRequirements "https://feodor2.github.io/Mypal/"

View File

@ -2,4 +2,4 @@
# 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/.
MOZ_APP_DISPLAYNAME=Serpent MOZ_APP_DISPLAYNAME=Centaury

View File

@ -2,9 +2,9 @@
- 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/. -->
<!ENTITY brandShorterName "Serpent"> <!ENTITY brandShorterName "Centaury">
<!ENTITY brandShortName "Serpent"> <!ENTITY brandShortName "Centaury">
<!ENTITY brandFullName "Serpent"> <!ENTITY brandFullName "Centaury">
<!ENTITY vendorShortName "Moonchild"> <!ENTITY vendorShortName "">
<!ENTITY vendorFullName "Moonchild Productions"> <!ENTITY vendorFullName "">
<!ENTITY trademarkInfo.part1 " "> <!ENTITY trademarkInfo.part1 " ">

View File

@ -2,10 +2,10 @@
# 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/.
brandShorterName=Serpent brandShorterName=Centaury
brandShortName=Serpent brandShortName=Centaury
brandFullName=Serpent brandFullName=Centaury
vendorShortName=Moonchild vendorShortName=
vendorFullName=Moonchild Productions vendorFullName=
syncBrandShortName=Sync syncBrandShortName=Sync

View File

@ -62,10 +62,10 @@ let ShellServiceInternal = {
if (AppConstants.platform == "win") { if (AppConstants.platform == "win") {
let optOutValue = WindowsRegistry.readRegKey(Ci.nsIWindowsRegKey.ROOT_KEY_CURRENT_USER, let optOutValue = WindowsRegistry.readRegKey(Ci.nsIWindowsRegKey.ROOT_KEY_CURRENT_USER,
"Software\\Mozilla\\Basilisk", "Software\\Mozilla\\Centaury",
"DefaultBrowserOptOut"); "DefaultBrowserOptOut");
WindowsRegistry.removeRegKey(Ci.nsIWindowsRegKey.ROOT_KEY_CURRENT_USER, WindowsRegistry.removeRegKey(Ci.nsIWindowsRegKey.ROOT_KEY_CURRENT_USER,
"Software\\Mozilla\\Basilisk", "Software\\Mozilla\\Centaury",
"DefaultBrowserOptOut"); "DefaultBrowserOptOut");
if (optOutValue == "True") { if (optOutValue == "True") {
Services.prefs.setBoolPref("browser.shell.checkDefaultBrowser", false); Services.prefs.setBoolPref("browser.shell.checkDefaultBrowser", false);

View File

@ -3,7 +3,7 @@
# 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/.
MOZ_APP_BASENAME=Basilisk MOZ_APP_BASENAME=Centaury
MOZ_APP_VENDOR=Moonchild MOZ_APP_VENDOR=Moonchild
MOZ_PHOENIX=1 MOZ_PHOENIX=1
MOZ_AUSTRALIS=1 MOZ_AUSTRALIS=1
@ -18,11 +18,11 @@ fi
# For Basilisk we want to use 52.9.YYYY.MM.DD as MOZ_APP_VERSION in release # For Basilisk we want to use 52.9.YYYY.MM.DD as MOZ_APP_VERSION in release
# builds so add-on developers have something to target while maintaining # builds so add-on developers have something to target while maintaining
# Firefox compatiblity. # Firefox compatiblity.
# To enable add "export BASILISK_VERSION=1" to the .mozconfig file. # To enable add "export CENTAURY_VERSION=1" to the .mozconfig file.
# However, this will cause a full rebuild at 00:00 UTC every day so # However, this will cause a full rebuild at 00:00 UTC every day so
# don't export the variable if you are in development or don't care. # don't export the variable if you are in development or don't care.
# When not exported we fall back the value in the version*.txt file. # When not exported we fall back the value in the version*.txt file.
if test -n "$BASILISK_VERSION" ; then if test -n "$CENTAURY_VERSION" ; then
MOZ_APP_VERSION=52.9.`date --utc '+%Y.%m.%d'` MOZ_APP_VERSION=52.9.`date --utc '+%Y.%m.%d'`
MOZ_APP_VERSION_DISPLAY=`date --utc '+%Y.%m.%d'` MOZ_APP_VERSION_DISPLAY=`date --utc '+%Y.%m.%d'`
else else

View File

@ -112,7 +112,7 @@
; [Base Browser Files] ; [Base Browser Files]
#ifndef XP_UNIX #ifndef XP_UNIX
@BINPATH@/@MOZ_APP_NAME@.exe @BINPATH@/@MOZ_APP_NAME@.exe
@BINPATH@/basilisk.VisualElementsManifest.xml @BINPATH@/centaury.VisualElementsManifest.xml
@BINPATH@/browser/VisualElements/VisualElements_150.png @BINPATH@/browser/VisualElements/VisualElements_150.png
@BINPATH@/browser/VisualElements/VisualElements_70.png @BINPATH@/browser/VisualElements/VisualElements_70.png
#else #else
@ -634,8 +634,8 @@
; [Default Preferences] ; [Default Preferences]
; All the pref files must be part of base to prevent migration bugs ; All the pref files must be part of base to prevent migration bugs
@RESPATH@/browser/@PREF_DIR@/basilisk.js @RESPATH@/browser/@PREF_DIR@/centaury.js
@RESPATH@/browser/@PREF_DIR@/basilisk-branding.js @RESPATH@/browser/@PREF_DIR@/centaury-branding.js
@RESPATH@/greprefs.js @RESPATH@/greprefs.js
@RESPATH@/defaults/autoconfig/prefcalls.js @RESPATH@/defaults/autoconfig/prefcalls.js
@RESPATH@/browser/defaults/permissions @RESPATH@/browser/defaults/permissions

View File

@ -1,4 +1,4 @@
;!@Install@!UTF-8! ;!@Install@!UTF-8!
Title="Basilisk" Title="Centaury"
RunProgram="setup.exe" RunProgram="setup.exe"
;!@InstallEnd@! ;!@InstallEnd@!

View File

@ -4,15 +4,15 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/. # file, You can obtain one at http://mozilla.org/MPL/2.0/.
# These defines should match application.ini settings # These defines should match application.ini settings
!define AppName "Basilisk" !define AppName "Centaury"
!define AppVersion "@APP_VERSION@" !define AppVersion "@APP_VERSION@"
!define GREVersion @MOZILLA_VERSION@ !define GREVersion @MOZILLA_VERSION@
!define AB_CD "@AB_CD@" !define AB_CD "@AB_CD@"
!define FileMainEXE "@MOZ_APP_NAME@.exe" !define FileMainEXE "@MOZ_APP_NAME@.exe"
!define WindowClass "BasiliskMessageWindow" !define WindowClass "CentauryMessageWindow"
!define DDEApplication "Basilisk" !define DDEApplication "Centaury"
!define AppRegName "Basilisk" !define AppRegName "Centaury"
!ifndef DEV_EDITION !ifndef DEV_EDITION
!define BrandShortName "@MOZ_APP_DISPLAYNAME@" !define BrandShortName "@MOZ_APP_DISPLAYNAME@"

View File

@ -249,7 +249,7 @@ Section "-InstallStartCleanup"
${InitHashAppModelId} "$INSTDIR" "Software\Mozilla\${AppName}\TaskBarIDs" ${InitHashAppModelId} "$INSTDIR" "Software\Mozilla\${AppName}\TaskBarIDs"
; Remove the updates directory for Vista and above ; Remove the updates directory for Vista and above
${CleanUpdateDirectories} "Mozilla\Basilisk" "Mozilla\updates" ${CleanUpdateDirectories} "Mozilla\Centaury" "Mozilla\updates"
${RemoveDeprecatedFiles} ${RemoveDeprecatedFiles}
${RemovePrecompleteEntries} "false" ${RemovePrecompleteEntries} "false"
@ -387,9 +387,9 @@ Section "-Application" APP_IDX
; In Win8, the delegate execute handler picks up the value in BasiliskURL and ; In Win8, the delegate execute handler picks up the value in BasiliskURL and
; BasiliskHTML to launch the desktop browser when it needs to. ; BasiliskHTML to launch the desktop browser when it needs to.
${AddDisabledDDEHandlerValues} "BasiliskHTML" "$2" "$8,1" \ ${AddDisabledDDEHandlerValues} "CentauryHTML" "$2" "$8,1" \
"${AppRegName} Document" "" "${AppRegName} Document" ""
${AddDisabledDDEHandlerValues} "BasiliskURL" "$2" "$8,1" "${AppRegName} URL" \ ${AddDisabledDDEHandlerValues} "CentauryURL" "$2" "$8,1" "${AppRegName} URL" \
"true" "true"
; For pre win8, the following keys should only be set if we can write to HKLM. ; For pre win8, the following keys should only be set if we can write to HKLM.
@ -584,7 +584,7 @@ Section "-InstallEndCleanup"
; If we have something other than empty string now, write the value. ; If we have something other than empty string now, write the value.
${If} "$0" != "" ${If} "$0" != ""
ClearErrors ClearErrors
WriteRegStr HKCU "Software\Mozilla\Basilisk" "OldDefaultBrowserCommand" "$0" WriteRegStr HKCU "Software\Mozilla\Centaury" "OldDefaultBrowserCommand" "$0"
${EndIf} ${EndIf}
${LogHeader} "Setting as the default browser" ${LogHeader} "Setting as the default browser"
@ -600,7 +600,7 @@ Section "-InstallEndCleanup"
${ElseIfNot} ${Errors} ${ElseIfNot} ${Errors}
${LogHeader} "Writing default-browser opt-out" ${LogHeader} "Writing default-browser opt-out"
ClearErrors ClearErrors
WriteRegStr HKCU "Software\Mozilla\Basilisk" "DefaultBrowserOptOut" "True" WriteRegStr HKCU "Software\Mozilla\Centaury" "DefaultBrowserOptOut" "True"
${If} ${Errors} ${If} ${Errors}
${LogMsg} "Error writing default-browser opt-out" ${LogMsg} "Error writing default-browser opt-out"
${EndIf} ${EndIf}

View File

@ -13,9 +13,9 @@
; start menu tile. In case there are 2 Basilisk installations, we only do ; start menu tile. In case there are 2 Basilisk installations, we only do
; this if the application being updated is the default. ; this if the application being updated is the default.
ReadRegStr $0 HKCU "Software\Microsoft\Windows\Shell\Associations\UrlAssociations\http\UserChoice" "ProgId" ReadRegStr $0 HKCU "Software\Microsoft\Windows\Shell\Associations\UrlAssociations\http\UserChoice" "ProgId"
${If} $0 == "BasiliskURL" ${If} $0 == "CentauryURL"
${AndIf} $9 != 0 ; We're not running in session 0 ${AndIf} $9 != 0 ; We're not running in session 0
ReadRegStr $0 HKCU "Software\Classes\BasiliskURL\shell\open\command" "" ReadRegStr $0 HKCU "Software\Classes\CentauryURL\shell\open\command" ""
${GetPathFromString} "$0" $0 ${GetPathFromString} "$0" $0
${GetParent} "$0" $0 ${GetParent} "$0" $0
${If} ${FileExists} "$0" ${If} ${FileExists} "$0"
@ -282,9 +282,9 @@
ClearErrors ClearErrors
EnumRegKey $7 HKCR "${FILE_TYPE}" 0 EnumRegKey $7 HKCR "${FILE_TYPE}" 0
${If} ${Errors} ${If} ${Errors}
WriteRegStr SHCTX "SOFTWARE\Classes\${FILE_TYPE}" "" "BasiliskHTML" WriteRegStr SHCTX "SOFTWARE\Classes\${FILE_TYPE}" "" "CentauryHTML"
${EndIf} ${EndIf}
WriteRegStr SHCTX "SOFTWARE\Classes\${FILE_TYPE}\OpenWithProgids" "BasiliskHTML" "" WriteRegStr SHCTX "SOFTWARE\Classes\${FILE_TYPE}\OpenWithProgids" "CentauryHTML" ""
!macroend !macroend
!define AddAssociationIfNoneExist "!insertmacro AddAssociationIfNoneExist" !define AddAssociationIfNoneExist "!insertmacro AddAssociationIfNoneExist"
@ -298,28 +298,28 @@
; Associate the file handlers with BasiliskHTML ; Associate the file handlers with BasiliskHTML
ReadRegStr $6 SHCTX "$0\.htm" "" ReadRegStr $6 SHCTX "$0\.htm" ""
${If} "$6" != "BasiliskHTML" ${If} "$6" != "CentauryHTML"
WriteRegStr SHCTX "$0\.htm" "" "BasiliskHTML" WriteRegStr SHCTX "$0\.htm" "" "CentauryHTML"
${EndIf} ${EndIf}
ReadRegStr $6 SHCTX "$0\.html" "" ReadRegStr $6 SHCTX "$0\.html" ""
${If} "$6" != "BasiliskHTML" ${If} "$6" != "CentauryHTML"
WriteRegStr SHCTX "$0\.html" "" "BasiliskHTML" WriteRegStr SHCTX "$0\.html" "" "CentauryHTML"
${EndIf} ${EndIf}
ReadRegStr $6 SHCTX "$0\.shtml" "" ReadRegStr $6 SHCTX "$0\.shtml" ""
${If} "$6" != "BasiliskHTML" ${If} "$6" != "CentauryHTML"
WriteRegStr SHCTX "$0\.shtml" "" "BasiliskHTML" WriteRegStr SHCTX "$0\.shtml" "" "CentauryHTML"
${EndIf} ${EndIf}
ReadRegStr $6 SHCTX "$0\.xht" "" ReadRegStr $6 SHCTX "$0\.xht" ""
${If} "$6" != "BasiliskHTML" ${If} "$6" != "CentauryHTML"
WriteRegStr SHCTX "$0\.xht" "" "BasiliskHTML" WriteRegStr SHCTX "$0\.xht" "" "CentauryHTML"
${EndIf} ${EndIf}
ReadRegStr $6 SHCTX "$0\.xhtml" "" ReadRegStr $6 SHCTX "$0\.xhtml" ""
${If} "$6" != "BasiliskHTML" ${If} "$6" != "CentauryHTML"
WriteRegStr SHCTX "$0\.xhtml" "" "BasiliskHTML" WriteRegStr SHCTX "$0\.xhtml" "" "CentauryHTML"
${EndIf} ${EndIf}
${AddAssociationIfNoneExist} ".pdf" ${AddAssociationIfNoneExist} ".pdf"
@ -331,10 +331,10 @@
; An empty string is used for the 5th param because BasiliskHTML is not a ; An empty string is used for the 5th param because BasiliskHTML is not a
; protocol handler ; protocol handler
${AddDisabledDDEHandlerValues} "BasiliskHTML" "$2" "$8,1" \ ${AddDisabledDDEHandlerValues} "CentauryHTML" "$2" "$8,1" \
"${AppRegName} HTML Document" "" "${AppRegName} HTML Document" ""
${AddDisabledDDEHandlerValues} "BasiliskURL" "$2" "$8,1" "${AppRegName} URL" \ ${AddDisabledDDEHandlerValues} "CentauryURL" "$2" "$8,1" "${AppRegName} URL" \
"true" "true"
; An empty string is used for the 4th & 5th params because the following ; An empty string is used for the 4th & 5th params because the following
; protocol handlers already have a display name and the additional keys ; protocol handlers already have a display name and the additional keys
@ -404,17 +404,17 @@
WriteRegStr ${RegKey} "$0\Capabilities" "ApplicationIcon" "$8,0" WriteRegStr ${RegKey} "$0\Capabilities" "ApplicationIcon" "$8,0"
WriteRegStr ${RegKey} "$0\Capabilities" "ApplicationName" "${BrandShortName}" WriteRegStr ${RegKey} "$0\Capabilities" "ApplicationName" "${BrandShortName}"
WriteRegStr ${RegKey} "$0\Capabilities\FileAssociations" ".htm" "BasiliskHTML" WriteRegStr ${RegKey} "$0\Capabilities\FileAssociations" ".htm" "CentauryHTML"
WriteRegStr ${RegKey} "$0\Capabilities\FileAssociations" ".html" "BasiliskHTML" WriteRegStr ${RegKey} "$0\Capabilities\FileAssociations" ".html" "CentauryHTML"
WriteRegStr ${RegKey} "$0\Capabilities\FileAssociations" ".shtml" "BasiliskHTML" WriteRegStr ${RegKey} "$0\Capabilities\FileAssociations" ".shtml" "CentauryHTML"
WriteRegStr ${RegKey} "$0\Capabilities\FileAssociations" ".xht" "BasiliskHTML" WriteRegStr ${RegKey} "$0\Capabilities\FileAssociations" ".xht" "CentauryHTML"
WriteRegStr ${RegKey} "$0\Capabilities\FileAssociations" ".xhtml" "BasiliskHTML" WriteRegStr ${RegKey} "$0\Capabilities\FileAssociations" ".xhtml" "CentauryHTML"
WriteRegStr ${RegKey} "$0\Capabilities\StartMenu" "StartMenuInternet" "$R9" WriteRegStr ${RegKey} "$0\Capabilities\StartMenu" "StartMenuInternet" "$R9"
WriteRegStr ${RegKey} "$0\Capabilities\URLAssociations" "ftp" "BasiliskURL" WriteRegStr ${RegKey} "$0\Capabilities\URLAssociations" "ftp" "CentauryURL"
WriteRegStr ${RegKey} "$0\Capabilities\URLAssociations" "http" "BasiliskURL" WriteRegStr ${RegKey} "$0\Capabilities\URLAssociations" "http" "CentauryURL"
WriteRegStr ${RegKey} "$0\Capabilities\URLAssociations" "https" "BasiliskURL" WriteRegStr ${RegKey} "$0\Capabilities\URLAssociations" "https" "CentauryURL"
; Vista Registered Application ; Vista Registered Application
WriteRegStr ${RegKey} "Software\RegisteredApplications" "${AppRegName}" "$0\Capabilities" WriteRegStr ${RegKey} "Software\RegisteredApplications" "${AppRegName}" "$0\Capabilities"
@ -427,12 +427,12 @@
; icon being displayed for files associated with Basilisk (does not use SHCTX). ; icon being displayed for files associated with Basilisk (does not use SHCTX).
!macro FixShellIconHandler RegKey !macro FixShellIconHandler RegKey
ClearErrors ClearErrors
ReadRegStr $1 ${RegKey} "Software\Classes\BasiliskHTML\ShellEx\IconHandler" "" ReadRegStr $1 ${RegKey} "Software\Classes\CentauryHTML\ShellEx\IconHandler" ""
${Unless} ${Errors} ${Unless} ${Errors}
ReadRegStr $1 ${RegKey} "Software\Classes\BasiliskHTML\DefaultIcon" "" ReadRegStr $1 ${RegKey} "Software\Classes\CentauryHTML\DefaultIcon" ""
${GetLongPath} "$INSTDIR\${FileMainEXE}" $2 ${GetLongPath} "$INSTDIR\${FileMainEXE}" $2
${If} "$1" != "$2,1" ${If} "$1" != "$2,1"
WriteRegStr ${RegKey} "Software\Classes\BasiliskHTML\DefaultIcon" "" "$2,1" WriteRegStr ${RegKey} "Software\Classes\CentauryHTML\DefaultIcon" "" "$2,1"
${EndIf} ${EndIf}
${EndUnless} ${EndUnless}
!macroend !macroend
@ -578,13 +578,13 @@
${If} "$2" != "" ${If} "$2" != ""
; Since there is a persistent handler remove BasiliskHTML as the default ; Since there is a persistent handler remove BasiliskHTML as the default
; value from both HKCU and HKLM if it set to BasiliskHTML. ; value from both HKCU and HKLM if it set to BasiliskHTML.
${If} "$0" == "BasiliskHTML" ${If} "$0" == "CentauryHTML"
DeleteRegValue HKCU "Software\Classes\${FILE_TYPE}" "" DeleteRegValue HKCU "Software\Classes\${FILE_TYPE}" ""
${EndIf} ${EndIf}
${If} "$1" == "BasiliskHTML" ${If} "$1" == "CentauryHTML"
DeleteRegValue HKLM "Software\Classes\${FILE_TYPE}" "" DeleteRegValue HKLM "Software\Classes\${FILE_TYPE}" ""
${EndIf} ${EndIf}
${ElseIf} "$0" == "BasiliskHTML" ${ElseIf} "$0" == "CentauryHTML"
; Since KHCU is set to BasiliskHTML remove BasiliskHTML as the default value ; Since KHCU is set to BasiliskHTML remove BasiliskHTML as the default value
; from HKCU if HKLM is set to a value other than an empty string. ; from HKCU if HKLM is set to a value other than an empty string.
${If} "$1" != "" ${If} "$1" != ""
@ -641,17 +641,17 @@
; Only set the file and protocol handlers if the existing one under HKCR is ; Only set the file and protocol handlers if the existing one under HKCR is
; for this install location. ; for this install location.
${IsHandlerForInstallDir} "BasiliskHTML" $R9 ${IsHandlerForInstallDir} "CentauryHTML" $R9
${If} "$R9" == "true" ${If} "$R9" == "true"
; An empty string is used for the 5th param because BasiliskHTML is not a ; An empty string is used for the 5th param because BasiliskHTML is not a
; protocol handler. ; protocol handler.
${AddDisabledDDEHandlerValues} "BasiliskHTML" "$2" "$8,1" \ ${AddDisabledDDEHandlerValues} "CentauryHTML" "$2" "$8,1" \
"${AppRegName} HTML Document" "" "${AppRegName} HTML Document" ""
${EndIf} ${EndIf}
${IsHandlerForInstallDir} "BasiliskURL" $R9 ${IsHandlerForInstallDir} "CentauryURL" $R9
${If} "$R9" == "true" ${If} "$R9" == "true"
${AddDisabledDDEHandlerValues} "BasiliskURL" "$2" "$8,1" \ ${AddDisabledDDEHandlerValues} "CentauryURL" "$2" "$8,1" \
"${AppRegName} URL" "true" "${AppRegName} URL" "true"
${EndIf} ${EndIf}
@ -687,8 +687,8 @@
${RegCleanAppHandler} "chrome" ${RegCleanAppHandler} "chrome"
; Remove protocol handler registry keys added by the MS shim ; Remove protocol handler registry keys added by the MS shim
DeleteRegKey HKLM "Software\Classes\Basilisk.URL" DeleteRegKey HKLM "Software\Classes\Centaury.URL"
DeleteRegKey HKCU "Software\Classes\Basilisk.URL" DeleteRegKey HKCU "Software\Classes\Centaury.URL"
; Delete gopher from Capabilities\URLAssociations if it is present. ; Delete gopher from Capabilities\URLAssociations if it is present.
${StrFilter} "${FileMainEXE}" "+" "" "" $R9 ${StrFilter} "${FileMainEXE}" "+" "" "" $R9
@ -702,7 +702,7 @@
; Delete gopher from the user's UrlAssociations if it points to BasiliskURL. ; Delete gopher from the user's UrlAssociations if it points to BasiliskURL.
StrCpy $0 "Software\Microsoft\Windows\Shell\Associations\UrlAssociations\gopher" StrCpy $0 "Software\Microsoft\Windows\Shell\Associations\UrlAssociations\gopher"
ReadRegStr $2 HKCU "$0\UserChoice" "Progid" ReadRegStr $2 HKCU "$0\UserChoice" "Progid"
${If} "$2" == "BasiliskURL" ${If} "$2" == "CentauryURL"
DeleteRegKey HKCU "$0" DeleteRegKey HKCU "$0"
${EndIf} ${EndIf}
!macroend !macroend

View File

@ -258,7 +258,7 @@ Section "Uninstall"
${EndIf} ${EndIf}
; Remove the updates directory for Vista and above ; Remove the updates directory for Vista and above
${un.CleanUpdateDirectories} "Mozilla\Basilisk" "Mozilla\updates" ${un.CleanUpdateDirectories} "Mozilla\Centaury" "Mozilla\updates"
; Remove any app model id's stored in the registry for this install path ; Remove any app model id's stored in the registry for this install path
DeleteRegValue HKCU "Software\Mozilla\${AppName}\TaskBarIDs" "$INSTDIR" DeleteRegValue HKCU "Software\Mozilla\${AppName}\TaskBarIDs" "$INSTDIR"
@ -278,27 +278,27 @@ Section "Uninstall"
${un.SetAppLSPCategories} ${un.SetAppLSPCategories}
${EndIf} ${EndIf}
${un.RegCleanAppHandler} "BasiliskURL" ${un.RegCleanAppHandler} "CentauryURL"
${un.RegCleanAppHandler} "BasiliskHTML" ${un.RegCleanAppHandler} "CentauryHTML"
${un.RegCleanProtocolHandler} "ftp" ${un.RegCleanProtocolHandler} "ftp"
${un.RegCleanProtocolHandler} "http" ${un.RegCleanProtocolHandler} "http"
${un.RegCleanProtocolHandler} "https" ${un.RegCleanProtocolHandler} "https"
ClearErrors ClearErrors
ReadRegStr $R9 HKCR "BasiliskHTML" "" ReadRegStr $R9 HKCR "CentauryHTML" ""
; Don't clean up the file handlers if the BasiliskHTML key still exists since ; Don't clean up the file handlers if the BasiliskHTML key still exists since
; there should be a second installation that may be the default file handler ; there should be a second installation that may be the default file handler
${If} ${Errors} ${If} ${Errors}
${un.RegCleanFileHandler} ".htm" "BasiliskHTML" ${un.RegCleanFileHandler} ".htm" "CentauryHTML"
${un.RegCleanFileHandler} ".html" "BasiliskHTML" ${un.RegCleanFileHandler} ".html" "CentauryHTML"
${un.RegCleanFileHandler} ".shtml" "BasiliskHTML" ${un.RegCleanFileHandler} ".shtml" "CentauryHTML"
${un.RegCleanFileHandler} ".xht" "BasiliskHTML" ${un.RegCleanFileHandler} ".xht" "CentauryHTML"
${un.RegCleanFileHandler} ".xhtml" "BasiliskHTML" ${un.RegCleanFileHandler} ".xhtml" "CentauryHTML"
${un.RegCleanFileHandler} ".oga" "BasiliskHTML" ${un.RegCleanFileHandler} ".oga" "CentauryHTML"
${un.RegCleanFileHandler} ".ogg" "BasiliskHTML" ${un.RegCleanFileHandler} ".ogg" "CentauryHTML"
${un.RegCleanFileHandler} ".ogv" "BasiliskHTML" ${un.RegCleanFileHandler} ".ogv" "CentauryHTML"
${un.RegCleanFileHandler} ".pdf" "BasiliskHTML" ${un.RegCleanFileHandler} ".pdf" "CentauryHTML"
${un.RegCleanFileHandler} ".webm" "BasiliskHTML" ${un.RegCleanFileHandler} ".webm" "CentauryHTML"
${EndIf} ${EndIf}
SetShellVarContext all ; Set SHCTX to HKLM SetShellVarContext all ; Set SHCTX to HKLM
@ -351,7 +351,7 @@ Section "Uninstall"
StrCpy $0 "Software\Microsoft\MediaPlayer\ShimInclusionList\plugin-container.exe" StrCpy $0 "Software\Microsoft\MediaPlayer\ShimInclusionList\plugin-container.exe"
DeleteRegKey HKLM "$0" DeleteRegKey HKLM "$0"
DeleteRegKey HKCU "$0" DeleteRegKey HKCU "$0"
StrCpy $0 "Software\Classes\MIME\Database\Content Type\application/x-xpinstall;app=Basilisk" StrCpy $0 "Software\Classes\MIME\Database\Content Type\application/x-xpinstall;app=Centaury"
DeleteRegKey HKLM "$0" DeleteRegKey HKLM "$0"
DeleteRegKey HKCU "$0" DeleteRegKey HKCU "$0"
${Else} ${Else}
@ -448,7 +448,7 @@ Section "Uninstall"
; subsequently deleted after checking. If the value is found during startup ; subsequently deleted after checking. If the value is found during startup
; the browser will offer to Reset Basilisk. We use the UpdateChannel to match ; the browser will offer to Reset Basilisk. We use the UpdateChannel to match
; uninstalls of Basilisk-release with reinstalls of Basilisk-release, for example. ; uninstalls of Basilisk-release with reinstalls of Basilisk-release, for example.
WriteRegStr HKCU "Software\Mozilla\Basilisk" "Uninstalled-${UpdateChannel}" "True" WriteRegStr HKCU "Software\Mozilla\Centaury" "Uninstalled-${UpdateChannel}" "True"
${un.IsFirewallSvcRunning} ${un.IsFirewallSvcRunning}
Pop $0 Pop $0

View File

@ -1,7 +1,7 @@
{ {
"default": { "default": {
"visibleDefaultEngines": [ "visibleDefaultEngines": [
"ddg", "yahoo", "bing", "wikipedia" "ddg", "yandex", "mailru", "yahoo", "bing", "wikipedia"
] ]
}, },
"regionOverrides": { "regionOverrides": {
@ -10,693 +10,7 @@
"en-US": { "en-US": {
"default": { "default": {
"visibleDefaultEngines": [ "visibleDefaultEngines": [
"ddg", "yahoo", "bing", "wikipedia" "ddg", "yandex", "mailru", "yahoo", "bing", "wikipedia"
]
}
},
"ach": {
"default": {
"visibleDefaultEngines": [
"ddg", "yahoo", "bing", "wikipedia"
]
}
},
"af": {
"default": {
"visibleDefaultEngines": [
"ddg", "yahoo", "bing", "wikipedia"
]
}
},
"an": {
"default": {
"visibleDefaultEngines": [
"ddg", "yahoo", "bing", "wikipedia"
]
}
},
"ar": {
"default": {
"visibleDefaultEngines": [
"ddg", "yahoo", "bing", "wikipedia"
]
}
},
"as": {
"default": {
"visibleDefaultEngines": [
"ddg", "yahoo", "bing", "wikipedia"
]
}
},
"ast": {
"default": {
"visibleDefaultEngines": [
"ddg", "yahoo", "bing", "wikipedia"
]
}
},
"az": {
"default": {
"visibleDefaultEngines": [
"ddg", "yahoo", "bing", "wikipedia"
]
}
},
"bg": {
"default": {
"visibleDefaultEngines": [
"ddg", "yahoo", "bing", "wikipedia"
]
}
},
"bn-BD": {
"default": {
"visibleDefaultEngines": [
"ddg", "yahoo", "bing", "wikipedia"
]
}
},
"bn-IN": {
"default": {
"visibleDefaultEngines": [
"ddg", "yahoo", "bing", "wikipedia"
]
}
},
"br": {
"default": {
"visibleDefaultEngines": [
"ddg", "yahoo", "bing", "wikipedia"
]
}
},
"bs": {
"default": {
"visibleDefaultEngines": [
"ddg", "yahoo", "bing", "wikipedia"
]
}
},
"ca": {
"default": {
"visibleDefaultEngines": [
"ddg", "yahoo", "bing", "wikipedia"
]
}
},
"cak": {
"default": {
"visibleDefaultEngines": [
"ddg", "yahoo", "bing", "wikipedia"
]
}
},
"cs": {
"default": {
"visibleDefaultEngines": [
"ddg", "yahoo", "bing", "wikipedia"
]
}
},
"cy": {
"default": {
"visibleDefaultEngines": [
"ddg", "yahoo", "bing", "wikipedia"
]
}
},
"da": {
"default": {
"visibleDefaultEngines": [
"ddg", "yahoo", "bing", "wikipedia"
]
}
},
"de": {
"default": {
"visibleDefaultEngines": [
"ddg", "yahoo", "bing", "wikipedia"
]
}
},
"dsb": {
"default": {
"visibleDefaultEngines": [
"ddg", "yahoo", "bing", "wikipedia"
]
}
},
"el": {
"default": {
"visibleDefaultEngines": [
"ddg", "yahoo", "bing", "wikipedia"
]
}
},
"en-GB": {
"default": {
"visibleDefaultEngines": [
"ddg", "yahoo", "bing", "wikipedia"
]
}
},
"en-ZA": {
"default": {
"visibleDefaultEngines": [
"ddg", "yahoo", "bing", "wikipedia"
]
}
},
"eo": {
"default": {
"visibleDefaultEngines": [
"ddg", "yahoo", "bing", "wikipedia"
]
}
},
"es-AR": {
"default": {
"visibleDefaultEngines": [
"ddg", "yahoo", "bing", "wikipedia"
]
}
},
"es-CL": {
"default": {
"visibleDefaultEngines": [
"ddg", "yahoo", "bing", "wikipedia"
]
}
},
"es-ES": {
"default": {
"visibleDefaultEngines": [
"ddg", "yahoo", "bing", "wikipedia"
]
}
},
"es-MX": {
"default": {
"visibleDefaultEngines": [
"ddg", "yahoo", "bing", "wikipedia"
]
}
},
"et": {
"default": {
"visibleDefaultEngines": [
"ddg", "yahoo", "bing", "wikipedia"
]
}
},
"eu": {
"default": {
"visibleDefaultEngines": [
"ddg", "yahoo", "bing", "wikipedia"
]
}
},
"fa": {
"default": {
"visibleDefaultEngines": [
"ddg", "yahoo", "bing", "wikipedia"
]
}
},
"ff": {
"default": {
"visibleDefaultEngines": [
"ddg", "yahoo", "bing", "wikipedia"
]
}
},
"fi": {
"default": {
"visibleDefaultEngines": [
"ddg", "yahoo", "bing", "wikipedia"
]
}
},
"fr": {
"default": {
"visibleDefaultEngines": [
"ddg", "yahoo", "bing", "wikipedia"
]
}
},
"fy-NL": {
"default": {
"visibleDefaultEngines": [
"ddg", "yahoo", "bing", "wikipedia"
]
}
},
"ga-IE": {
"default": {
"visibleDefaultEngines": [
"ddg", "yahoo", "bing", "wikipedia"
]
}
},
"gd": {
"default": {
"visibleDefaultEngines": [
"ddg", "yahoo", "bing", "wikipedia"
]
}
},
"gl": {
"default": {
"visibleDefaultEngines": [
"ddg", "yahoo", "bing", "wikipedia"
]
}
},
"gn": {
"default": {
"visibleDefaultEngines": [
"ddg", "yahoo", "bing", "wikipedia"
]
}
},
"gu-IN": {
"default": {
"visibleDefaultEngines": [
"ddg", "yahoo", "bing", "wikipedia"
]
}
},
"he": {
"default": {
"visibleDefaultEngines": [
"ddg", "yahoo", "bing", "wikipedia"
]
}
},
"hi-IN": {
"default": {
"visibleDefaultEngines": [
"ddg", "yahoo", "bing", "wikipedia"
]
}
},
"hr": {
"default": {
"visibleDefaultEngines": [
"ddg", "yahoo", "bing", "wikipedia"
]
}
},
"hsb": {
"default": {
"visibleDefaultEngines": [
"ddg", "yahoo", "bing", "wikipedia"
]
}
},
"hu": {
"default": {
"visibleDefaultEngines": [
"ddg", "yahoo", "bing", "wikipedia"
]
}
},
"hy-AM": {
"default": {
"visibleDefaultEngines": [
"ddg", "yahoo", "bing", "wikipedia"
]
}
},
"id": {
"default": {
"visibleDefaultEngines": [
"ddg", "yahoo", "bing", "wikipedia"
]
}
},
"is": {
"default": {
"visibleDefaultEngines": [
"ddg", "yahoo", "bing", "wikipedia"
]
}
},
"it": {
"default": {
"visibleDefaultEngines": [
"ddg", "yahoo", "bing", "wikipedia"
]
}
},
"ja-JP-mac": {
"default": {
"visibleDefaultEngines": [
"ddg", "yahoo", "bing", "wikipedia"
]
}
},
"ja": {
"default": {
"visibleDefaultEngines": [
"ddg", "yahoo", "bing", "wikipedia"
]
}
},
"ka": {
"default": {
"visibleDefaultEngines": [
"ddg", "yahoo", "bing", "wikipedia"
]
}
},
"kab": {
"default": {
"visibleDefaultEngines": [
"ddg", "yahoo", "bing", "wikipedia"
]
}
},
"kk": {
"default": {
"visibleDefaultEngines": [
"ddg", "yahoo", "bing", "wikipedia"
]
}
},
"km": {
"default": {
"visibleDefaultEngines": [
"ddg", "yahoo", "bing", "wikipedia"
]
}
},
"kn": {
"default": {
"visibleDefaultEngines": [
"ddg", "yahoo", "bing", "wikipedia"
]
}
},
"ko": {
"default": {
"visibleDefaultEngines": [
"ddg", "yahoo", "bing", "wikipedia"
]
}
},
"lij": {
"default": {
"visibleDefaultEngines": [
"ddg", "yahoo", "bing", "wikipedia"
]
}
},
"lt": {
"default": {
"visibleDefaultEngines": [
"ddg", "yahoo", "bing", "wikipedia"
]
}
},
"ltg": {
"default": {
"visibleDefaultEngines": [
"ddg", "yahoo", "bing", "wikipedia"
]
}
},
"lv": {
"default": {
"visibleDefaultEngines": [
"ddg", "yahoo", "bing", "wikipedia"
]
}
},
"mai": {
"default": {
"visibleDefaultEngines": [
"ddg", "yahoo", "bing", "wikipedia"
]
}
},
"mk": {
"default": {
"visibleDefaultEngines": [
"ddg", "yahoo", "bing", "wikipedia"
]
}
},
"ml": {
"default": {
"visibleDefaultEngines": [
"ddg", "yahoo", "bing", "wikipedia"
]
}
},
"mr": {
"default": {
"visibleDefaultEngines": [
"ddg", "yahoo", "bing", "wikipedia"
]
}
},
"ms": {
"default": {
"visibleDefaultEngines": [
"ddg", "yahoo", "bing", "wikipedia"
]
}
},
"my": {
"default": {
"visibleDefaultEngines": [
"ddg", "yahoo", "bing", "wikipedia"
]
}
},
"nb-NO": {
"default": {
"visibleDefaultEngines": [
"ddg", "yahoo", "bing", "wikipedia"
]
}
},
"ne-NP": {
"default": {
"visibleDefaultEngines": [
"ddg", "yahoo", "bing", "wikipedia"
]
}
},
"nl": {
"default": {
"visibleDefaultEngines": [
"ddg", "yahoo", "bing", "wikipedia"
]
}
},
"nn-NO": {
"default": {
"visibleDefaultEngines": [
"ddg", "yahoo", "bing", "wikipedia"
]
}
},
"or": {
"default": {
"visibleDefaultEngines": [
"ddg", "yahoo", "bing", "wikipedia"
]
}
},
"pa-IN": {
"default": {
"visibleDefaultEngines": [
"ddg", "yahoo", "bing", "wikipedia"
]
}
},
"pl": {
"default": {
"visibleDefaultEngines": [
"ddg", "yahoo", "bing", "wikipedia"
]
}
},
"pt-BR": {
"default": {
"visibleDefaultEngines": [
"ddg", "yahoo", "bing", "wikipedia"
]
}
},
"pt-PT": {
"default": {
"visibleDefaultEngines": [
"ddg", "yahoo", "bing", "wikipedia"
]
}
},
"rm": {
"default": {
"visibleDefaultEngines": [
"ddg", "yahoo", "bing", "wikipedia"
]
}
},
"ro": {
"default": {
"visibleDefaultEngines": [
"ddg", "yahoo", "bing", "wikipedia"
]
}
},
"ru": {
"default": {
"visibleDefaultEngines": [
"ddg", "yahoo", "bing", "wikipedia"
]
}
},
"si": {
"default": {
"visibleDefaultEngines": [
"ddg", "yahoo", "bing", "wikipedia"
]
}
},
"sk": {
"default": {
"visibleDefaultEngines": [
"ddg", "yahoo", "bing", "wikipedia"
]
}
},
"sl": {
"default": {
"visibleDefaultEngines": [
"ddg", "yahoo", "bing", "wikipedia"
]
}
},
"son": {
"default": {
"visibleDefaultEngines": [
"ddg", "yahoo", "bing", "wikipedia"
]
}
},
"sq": {
"default": {
"visibleDefaultEngines": [
"ddg", "yahoo", "bing", "wikipedia"
]
}
},
"sr": {
"default": {
"visibleDefaultEngines": [
"ddg", "yahoo", "bing", "wikipedia"
]
}
},
"sv-SE": {
"default": {
"visibleDefaultEngines": [
"ddg", "yahoo", "bing", "wikipedia"
]
}
},
"ta": {
"default": {
"visibleDefaultEngines": [
"ddg", "yahoo", "bing", "wikipedia"
]
}
},
"te": {
"default": {
"visibleDefaultEngines": [
"ddg", "yahoo", "bing", "wikipedia"
]
}
},
"th": {
"default": {
"visibleDefaultEngines": [
"ddg", "yahoo", "bing", "wikipedia"
]
}
},
"tl": {
"default": {
"visibleDefaultEngines": [
"ddg", "yahoo", "bing", "wikipedia"
]
}
},
"tr": {
"default": {
"visibleDefaultEngines": [
"ddg", "yahoo", "bing", "wikipedia"
]
}
},
"uk": {
"default": {
"visibleDefaultEngines": [
"ddg", "yahoo", "bing", "wikipedia"
]
}
},
"ur": {
"default": {
"visibleDefaultEngines": [
"ddg", "yahoo", "bing", "wikipedia"
]
}
},
"uz": {
"default": {
"visibleDefaultEngines": [
"ddg", "yahoo", "bing", "wikipedia"
]
}
},
"vi": {
"default": {
"visibleDefaultEngines": [
"ddg", "yahoo", "bing", "wikipedia"
]
}
},
"wo": {
"default": {
"visibleDefaultEngines": [
"ddg", "yahoo", "bing", "wikipedia"
]
}
},
"xh": {
"default": {
"visibleDefaultEngines": [
"ddg", "yahoo", "bing", "wikipedia"
]
}
},
"zh-CN": {
"default": {
"visibleDefaultEngines": [
"ddg", "yahoo", "bing", "wikipedia"
]
}
},
"zh-TW": {
"default": {
"visibleDefaultEngines": [
"ddg", "yahoo", "bing", "wikipedia"
] ]
} }
} }

View File

@ -0,0 +1,19 @@
<!-- 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/. -->
<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
<ShortName>Поиск@Mail.Ru</ShortName>
<Description>Search with Поиск@Mail.Ru</Description>
<InputEncoding>windows-1251</InputEncoding>
<Image width="16" height="16">data:image/x-icon;base64,AAABAAEAEBAAAAEACABoBQAAFgAAACgAAAAQAAAAIAAAAAEACAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAABS2voAR9L5AEPS+QBL0PkARND5AETP+QA0zvkAQc75ADHK+AA7yfgALsf4AC7G+AAzxPcALMP4ACrC9wD3ypcAKr73ACa89wAjufYAI7j2AB639gAhtvYAGrX1ACC09QD/mf8AHrL1AB2w9QAbrvUAGqz0ABeo9AAKp/QAFabzABSk8wAJn/MAEJ/zAA6d8gAHmvMADJryAAeU8QAHkvEAB5HxAAWO8QAFj/EABYvxAAWK8QAGivAABYnxAAaJ8AAGiPAAA4fxAAWF7wADhfEABYPvAAOC8AAFge8ABXzuAAR77gACeu8ABHnuAAR47gAEdu0ABHXtAAR07QADce0AA3DtAANu7AADbOwAAmnsAAJl6wACZOsAAV/rAAFg6wDMeTkAcSQFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAASEhJSkpKSkpKSkpKSkpKSkgPSElKSkpKSkpKSkpKSkpKSA9ISUpKSkpKSkpKSkpKSkpID0hJSitDQ0c5SkpKSkpKSkgPQTg4KiQxRUU1SkpKSkpKKDAwSkpKSkpKSkpKSkpKSigoSkohOyxKSkIzSkpKShQjSkoiJi83Pz8pQC5KSkodIEoJGwlKFjY9Sjo6SkpKGhxKChFKSkooMko2NkpKShMXSgAIAEoJIiJKLS1KSkoEFUpKBgYNEhsWSiceSkpKSg0FSkoABgZKShYlSkpKSkoFCwFKSkpKShAfFkpKSkpKSgELDg4DDBUZEEpKSkpKSkpKSgIICA4HSkpKSh//AAAP/wAAh/8AAMIPAADgAwAA8f8AAPMZAADmAAAA5EQAAOTkAADkRAAA5gQAAPMZAADx8QAA+AMAAP4PAAA=</Image>
<Url type="application/x-suggestions+json" method="GET" template="http://suggests.go.mail.ru/ff3">
<Param name="q" value="{searchTerms}"/>
</Url>
<Url type="text/html" method="GET" template="http://go.mail.ru/search">
<Param name="q" value="{searchTerms}"/>
<Param name="utf8in" value="1"/>
<Param name="fr" value="ff3tb"/>
</Url>
<SearchForm>http://go.mail.ru</SearchForm>
</SearchPlugin>

View File

@ -0,0 +1,24 @@
<!-- 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/. -->
<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
<ShortName>Яндекс</ShortName>
<Description>Воспользуйтесь Яндексом для поиска в Интернете.</Description>
<InputEncoding>UTF-8</InputEncoding>
<Image width="16" height="16">data:image/x-icon;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAB50lEQVQ4T43SvWsacRgH8OcPCITSLRQ6BSRL1gxZTNZQsgYC3QKunVoMnTKFhBQSnDqIUa5gxNbBCgriC4pv50sJ1lIR5SROpRVbz+O4b5/flbvedekJH+557nvfH8chdbvdIFMYPAgBICdqt9uKpmnw8huNRuDnX8J5QKvVgmEYnqiqClmWwZ113kmger0OXdf/Wv6EIb0BTo+AgB94ceDKJ5MJuHPOMwlUqVSwWq1sevQaxqvn0O5l6HdvgaMdV75cLtFoNMC9Xd6JisWiedNiPNuB9l4yZ+1jEvBvuXJBURRwL8YzUT6fx2KxsGHrKdQPCXNW794Bvieu3CLegrsnlM1mMZ/PbfqeH6vToDkvb2+Bx49cuWU2m4G7bUqn0xiPx7ZpqYRf29v4cXyMxf4+tLU1V24ZDAbgbptSqRSGw6HL9OwM37n4bXPTvP6bC7lcDtw9oWQyiX6/b/vMH1XZ2MAoEMDXqytM+QBnLtRqNXAvxjNRPB5Hr9ez9Q8PMfD50OM/2P3FBb7wAc680+mIMri3yzuRJEloNpsmORTCJy7INzd/9stLc7dyIZPJgDvnPJNA0WgU1WrVkxJ/4FgsBu6s804CRSKRh0KhgHK5/F+JRAL8fJBnslA4HH7NHhg8CDnLwm8IYz560xw92AAAAABJRU5ErkJggg==</Image>
<Url type="application/x-suggestions+json" method="GET" template="http://suggest.yandex.net/suggest-ff.cgi">
<Param name="part" value="{searchTerms}"/>
</Url>
<Url type="text/html" method="GET" template="http://yandex.ru/yandsearch">
<Param name="text" value="{searchTerms}"/>
<Param name="from" value="fx3"/>
<Param name="clid" value="1909644"/>
</Url>
<Url type="application/x-moz-keywordsearch" method="GET" template="http://yandex.ru/yandsearch">
<Param name="stype" value="first"/>
<Param name="clid" value="1909644"/>
<Param name="text" value="{searchTerms}"/>
</Url>
<SearchForm>http://www.yandex.ru/</SearchForm>
</SearchPlugin>