From 727ed27f0854ec748f96d9fa23892d67569a8761 Mon Sep 17 00:00:00 2001 From: Ascrod <32915892+Ascrod@users.noreply.github.com> Date: Sat, 6 Oct 2018 12:47:25 -0400 Subject: Basilisk Installer: Update Windows ARP URLs. --- application/basilisk/branding/official/branding.nsi | 4 ++-- application/basilisk/branding/unofficial/branding.nsi | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'application/basilisk/branding') diff --git a/application/basilisk/branding/official/branding.nsi b/application/basilisk/branding/official/branding.nsi index 58d7554df..f550c3e43 100644 --- a/application/basilisk/branding/official/branding.nsi +++ b/application/basilisk/branding/official/branding.nsi @@ -12,7 +12,7 @@ !define CompanyName "Moonchild Productions" !define URLInfoAbout "https://www.basilisk-browser.org" !define URLUpdateInfo "https://www.basilisk-browser.org/releasenotes.shtml" -!define HelpLink "https://www.basilisk-browser.org" +!define HelpLink "https://www.basilisk-browser.org/contact.shtml" ; The OFFICIAL define is a workaround to support different urls for Release and ; Beta since they share the same branding when building with other branches that @@ -20,7 +20,7 @@ !define OFFICIAL !define URLStubDownload "" !define URLManualDownload "" -!define URLSystemRequirements "http://www.basilisk-browser.org/requirements.shtml" +!define URLSystemRequirements "https://www.basilisk-browser.org/requirements.shtml" !define Channel "release" # The installer's certificate name and issuer expected by the stub installer diff --git a/application/basilisk/branding/unofficial/branding.nsi b/application/basilisk/branding/unofficial/branding.nsi index 77f08a4cb..179ce76f9 100644 --- a/application/basilisk/branding/unofficial/branding.nsi +++ b/application/basilisk/branding/unofficial/branding.nsi @@ -10,12 +10,13 @@ # instead of BrandFullName and typically should not be modified. !define BrandFullNameInternal "Serpent" !define CompanyName "Moonchild Productions" -!define URLInfoAbout "http://www.basilisk-browser.org" +!define URLInfoAbout "https://www.basilisk-browser.org" +!define URLUpdateInfo "https://www.basilisk-browser.org" !define HelpLink "https://forum.palemoon.org" !define URLStubDownload "" !define URLManualDownload "" -!define URLSystemRequirements "" +!define URLSystemRequirements "https://www.basilisk-browser.org" !define Channel "unofficial" # The installer's certificate name and issuer expected by the stub installer -- cgit v1.2.3 From 312b0e42cfb3982b8e2f62ba17052dfe1a616b7e Mon Sep 17 00:00:00 2001 From: Ascrod <32915892+Ascrod@users.noreply.github.com> Date: Sat, 6 Oct 2018 18:23:07 -0400 Subject: Basilisk Installer: Remove unused stub defines and strings. --- .../basilisk/branding/official/branding.nsi | 34 ---------------------- .../basilisk/branding/unofficial/branding.nsi | 30 ------------------- 2 files changed, 64 deletions(-) (limited to 'application/basilisk/branding') diff --git a/application/basilisk/branding/official/branding.nsi b/application/basilisk/branding/official/branding.nsi index f550c3e43..250abd84d 100644 --- a/application/basilisk/branding/official/branding.nsi +++ b/application/basilisk/branding/official/branding.nsi @@ -13,38 +13,4 @@ !define URLInfoAbout "https://www.basilisk-browser.org" !define URLUpdateInfo "https://www.basilisk-browser.org/releasenotes.shtml" !define HelpLink "https://www.basilisk-browser.org/contact.shtml" - -; The OFFICIAL define is a workaround to support different urls for Release and -; Beta since they share the same branding when building with other branches that -; set the update channel to beta. -!define OFFICIAL -!define URLStubDownload "" -!define URLManualDownload "" !define URLSystemRequirements "https://www.basilisk-browser.org/requirements.shtml" -!define Channel "release" - -# The installer's certificate name and issuer expected by the stub installer -!define CertNameDownload "" -!define CertIssuerDownload "" - -# Dialog units are used so the UI displays correctly with the system's DPI -# settings. -# The dialog units for the bitmap's dimensions should match exactly with the -# bitmap's width and height in pixels. -!define APPNAME_BMP_WIDTH_DU "134u" -!define APPNAME_BMP_HEIGHT_DU "36u" -!define INTRO_BLURB_WIDTH_DU "258u" -!define INTRO_BLURB_EDGE_DU "170u" -!define INTRO_BLURB_LTR_TOP_DU "20u" -!define INTRO_BLURB_RTL_TOP_DU "12u" - -# UI Colors that can be customized for each channel -!define FOOTER_CONTROL_TEXT_COLOR_NORMAL 0x000000 -!define FOOTER_CONTROL_TEXT_COLOR_FADED 0x666666 -!define FOOTER_BKGRD_COLOR 0xFFFFFF -!define INTRO_BLURB_TEXT_COLOR 0x666666 -!define INSTALL_BLURB_TEXT_COLOR 0x666666 -!define INSTALL_PROGRESS_TEXT_COLOR_NORMAL 0x666666 -!define COMMON_TEXT_COLOR_NORMAL 0x000000 -!define COMMON_TEXT_COLOR_FADED 0x666666 -!define COMMON_BKGRD_COLOR 0xF0F0F0 diff --git a/application/basilisk/branding/unofficial/branding.nsi b/application/basilisk/branding/unofficial/branding.nsi index 179ce76f9..586dd0074 100644 --- a/application/basilisk/branding/unofficial/branding.nsi +++ b/application/basilisk/branding/unofficial/branding.nsi @@ -13,34 +13,4 @@ !define URLInfoAbout "https://www.basilisk-browser.org" !define URLUpdateInfo "https://www.basilisk-browser.org" !define HelpLink "https://forum.palemoon.org" - -!define URLStubDownload "" -!define URLManualDownload "" !define URLSystemRequirements "https://www.basilisk-browser.org" -!define Channel "unofficial" - -# The installer's certificate name and issuer expected by the stub installer -!define CertNameDownload "" -!define CertIssuerDownload "" - -# Dialog units are used so the UI displays correctly with the system's DPI -# settings. -# The dialog units for the bitmap's dimensions should match exactly with the -# bitmap's width and height in pixels. -!define APPNAME_BMP_WIDTH_DU 159u -!define APPNAME_BMP_HEIGHT_DU 50u -!define INTRO_BLURB_WIDTH_DU "230u" -!define INTRO_BLURB_EDGE_DU "198u" -!define INTRO_BLURB_LTR_TOP_DU "16u" -!define INTRO_BLURB_RTL_TOP_DU "11u" - -# UI Colors that can be customized for each channel -!define FOOTER_CONTROL_TEXT_COLOR_NORMAL 0x000000 -!define FOOTER_CONTROL_TEXT_COLOR_FADED 0x999999 -!define FOOTER_BKGRD_COLOR 0xFFFFFF -!define INTRO_BLURB_TEXT_COLOR 0xFFFFFF -!define INSTALL_BLURB_TEXT_COLOR 0xFFFFFF -!define INSTALL_PROGRESS_TEXT_COLOR_NORMAL 0xFFFFFF -!define COMMON_TEXT_COLOR_NORMAL 0xFFFFFF -!define COMMON_TEXT_COLOR_FADED 0xA1AAB3 -!define COMMON_BKGRD_COLOR 0x0F1B26 -- cgit v1.2.3