diff --git a/.github/workflows/build-electron.yml b/.github/workflows/build-electron.yml index ee8ba889..3e4c1c7f 100644 --- a/.github/workflows/build-electron.yml +++ b/.github/workflows/build-electron.yml @@ -85,6 +85,8 @@ jobs: Release_Windows: runs-on: windows-latest + env: + SIGNTOOL_PATH: "C:\\Program Files (x86)\\Windows Kits\\10\\bin\\x64\\signtool.exe" steps: - uses: actions/checkout@v3 - uses: actions/setup-node@v3 diff --git a/electron_icons/appx/BadgeLogo.scale-100.png b/electron_icons/appx/BadgeLogo.scale-100.png new file mode 100644 index 00000000..9d772556 Binary files /dev/null and b/electron_icons/appx/BadgeLogo.scale-100.png differ diff --git a/electron_icons/appx/BadgeLogo.scale-125.png b/electron_icons/appx/BadgeLogo.scale-125.png new file mode 100644 index 00000000..4c4fef3d Binary files /dev/null and b/electron_icons/appx/BadgeLogo.scale-125.png differ diff --git a/electron_icons/appx/BadgeLogo.scale-150.png b/electron_icons/appx/BadgeLogo.scale-150.png new file mode 100644 index 00000000..dc8146b8 Binary files /dev/null and b/electron_icons/appx/BadgeLogo.scale-150.png differ diff --git a/electron_icons/appx/BadgeLogo.scale-200.png b/electron_icons/appx/BadgeLogo.scale-200.png new file mode 100644 index 00000000..a8b81737 Binary files /dev/null and b/electron_icons/appx/BadgeLogo.scale-200.png differ diff --git a/electron_icons/appx/BadgeLogo.scale-400.png b/electron_icons/appx/BadgeLogo.scale-400.png new file mode 100644 index 00000000..6b268bef Binary files /dev/null and b/electron_icons/appx/BadgeLogo.scale-400.png differ diff --git a/electron_icons/appx/Kiwix_icon_nontransparent_store_logo.png b/electron_icons/appx/Kiwix_icon_nontransparent_store_logo.png new file mode 100644 index 00000000..403e8cc0 Binary files /dev/null and b/electron_icons/appx/Kiwix_icon_nontransparent_store_logo.png differ diff --git a/electron_icons/appx/Kiwix_icon_nontransparent_store_logo_1080.png b/electron_icons/appx/Kiwix_icon_nontransparent_store_logo_1080.png new file mode 100644 index 00000000..583e1f46 Binary files /dev/null and b/electron_icons/appx/Kiwix_icon_nontransparent_store_logo_1080.png differ diff --git a/electron_icons/appx/Kiwix_icon_nontransparent_store_logo_150.png b/electron_icons/appx/Kiwix_icon_nontransparent_store_logo_150.png new file mode 100644 index 00000000..7e5e8cbf Binary files /dev/null and b/electron_icons/appx/Kiwix_icon_nontransparent_store_logo_150.png differ diff --git a/electron_icons/appx/Kiwix_icon_nontransparent_store_logo_300.png b/electron_icons/appx/Kiwix_icon_nontransparent_store_logo_300.png new file mode 100644 index 00000000..d6c9f224 Binary files /dev/null and b/electron_icons/appx/Kiwix_icon_nontransparent_store_logo_300.png differ diff --git a/electron_icons/appx/Kiwix_icon_nontransparent_store_logo_71.png b/electron_icons/appx/Kiwix_icon_nontransparent_store_logo_71.png new file mode 100644 index 00000000..a900ea2d Binary files /dev/null and b/electron_icons/appx/Kiwix_icon_nontransparent_store_logo_71.png differ diff --git a/electron_icons/appx/LargeTile.scale-100.png b/electron_icons/appx/LargeTile.scale-100.png new file mode 100644 index 00000000..0e78604d Binary files /dev/null and b/electron_icons/appx/LargeTile.scale-100.png differ diff --git a/electron_icons/appx/LargeTile.scale-125.png b/electron_icons/appx/LargeTile.scale-125.png new file mode 100644 index 00000000..c912adaf Binary files /dev/null and b/electron_icons/appx/LargeTile.scale-125.png differ diff --git a/electron_icons/appx/LargeTile.scale-150.png b/electron_icons/appx/LargeTile.scale-150.png new file mode 100644 index 00000000..f13f993f Binary files /dev/null and b/electron_icons/appx/LargeTile.scale-150.png differ diff --git a/electron_icons/appx/LargeTile.scale-200.png b/electron_icons/appx/LargeTile.scale-200.png new file mode 100644 index 00000000..2b04c874 Binary files /dev/null and b/electron_icons/appx/LargeTile.scale-200.png differ diff --git a/electron_icons/appx/LargeTile.scale-400.png b/electron_icons/appx/LargeTile.scale-400.png new file mode 100644 index 00000000..ec9720cd Binary files /dev/null and b/electron_icons/appx/LargeTile.scale-400.png differ diff --git a/electron_icons/appx/SmallTile.scale-100.png b/electron_icons/appx/SmallTile.scale-100.png new file mode 100644 index 00000000..7d1ce2ee Binary files /dev/null and b/electron_icons/appx/SmallTile.scale-100.png differ diff --git a/electron_icons/appx/SmallTile.scale-125.png b/electron_icons/appx/SmallTile.scale-125.png new file mode 100644 index 00000000..b0cc54eb Binary files /dev/null and b/electron_icons/appx/SmallTile.scale-125.png differ diff --git a/electron_icons/appx/SmallTile.scale-150.png b/electron_icons/appx/SmallTile.scale-150.png new file mode 100644 index 00000000..0a099f2c Binary files /dev/null and b/electron_icons/appx/SmallTile.scale-150.png differ diff --git a/electron_icons/appx/SmallTile.scale-200.png b/electron_icons/appx/SmallTile.scale-200.png new file mode 100644 index 00000000..b8fd22b4 Binary files /dev/null and b/electron_icons/appx/SmallTile.scale-200.png differ diff --git a/electron_icons/appx/SmallTile.scale-400.png b/electron_icons/appx/SmallTile.scale-400.png new file mode 100644 index 00000000..95ab5908 Binary files /dev/null and b/electron_icons/appx/SmallTile.scale-400.png differ diff --git a/electron_icons/appx/Square150x150Logo.scale-100.png b/electron_icons/appx/Square150x150Logo.scale-100.png new file mode 100644 index 00000000..31cf1876 Binary files /dev/null and b/electron_icons/appx/Square150x150Logo.scale-100.png differ diff --git a/electron_icons/appx/Square150x150Logo.scale-125.png b/electron_icons/appx/Square150x150Logo.scale-125.png new file mode 100644 index 00000000..5bc6a79a Binary files /dev/null and b/electron_icons/appx/Square150x150Logo.scale-125.png differ diff --git a/electron_icons/appx/Square150x150Logo.scale-150.png b/electron_icons/appx/Square150x150Logo.scale-150.png new file mode 100644 index 00000000..bac45e91 Binary files /dev/null and b/electron_icons/appx/Square150x150Logo.scale-150.png differ diff --git a/electron_icons/appx/Square150x150Logo.scale-200.png b/electron_icons/appx/Square150x150Logo.scale-200.png new file mode 100644 index 00000000..b9c9e50c Binary files /dev/null and b/electron_icons/appx/Square150x150Logo.scale-200.png differ diff --git a/electron_icons/appx/Square150x150Logo.scale-400.png b/electron_icons/appx/Square150x150Logo.scale-400.png new file mode 100644 index 00000000..c77d9d6a Binary files /dev/null and b/electron_icons/appx/Square150x150Logo.scale-400.png differ diff --git a/electron_icons/appx/Square44x44Logo.altform-unplated_targetsize-16.png b/electron_icons/appx/Square44x44Logo.altform-unplated_targetsize-16.png new file mode 100644 index 00000000..e9820a43 Binary files /dev/null and b/electron_icons/appx/Square44x44Logo.altform-unplated_targetsize-16.png differ diff --git a/electron_icons/appx/Square44x44Logo.altform-unplated_targetsize-256.png b/electron_icons/appx/Square44x44Logo.altform-unplated_targetsize-256.png new file mode 100644 index 00000000..37d5405c Binary files /dev/null and b/electron_icons/appx/Square44x44Logo.altform-unplated_targetsize-256.png differ diff --git a/electron_icons/appx/Square44x44Logo.altform-unplated_targetsize-32.png b/electron_icons/appx/Square44x44Logo.altform-unplated_targetsize-32.png new file mode 100644 index 00000000..3c3872f5 Binary files /dev/null and b/electron_icons/appx/Square44x44Logo.altform-unplated_targetsize-32.png differ diff --git a/electron_icons/appx/Square44x44Logo.altform-unplated_targetsize-48.png b/electron_icons/appx/Square44x44Logo.altform-unplated_targetsize-48.png new file mode 100644 index 00000000..e4dd924e Binary files /dev/null and b/electron_icons/appx/Square44x44Logo.altform-unplated_targetsize-48.png differ diff --git a/electron_icons/appx/Square44x44Logo.scale-100.png b/electron_icons/appx/Square44x44Logo.scale-100.png new file mode 100644 index 00000000..d4f6cee7 Binary files /dev/null and b/electron_icons/appx/Square44x44Logo.scale-100.png differ diff --git a/electron_icons/appx/Square44x44Logo.scale-125.png b/electron_icons/appx/Square44x44Logo.scale-125.png new file mode 100644 index 00000000..6f220382 Binary files /dev/null and b/electron_icons/appx/Square44x44Logo.scale-125.png differ diff --git a/electron_icons/appx/Square44x44Logo.scale-150.png b/electron_icons/appx/Square44x44Logo.scale-150.png new file mode 100644 index 00000000..64acaa9c Binary files /dev/null and b/electron_icons/appx/Square44x44Logo.scale-150.png differ diff --git a/electron_icons/appx/Square44x44Logo.scale-200.png b/electron_icons/appx/Square44x44Logo.scale-200.png new file mode 100644 index 00000000..0db563a5 Binary files /dev/null and b/electron_icons/appx/Square44x44Logo.scale-200.png differ diff --git a/electron_icons/appx/Square44x44Logo.scale-400.png b/electron_icons/appx/Square44x44Logo.scale-400.png new file mode 100644 index 00000000..d3124261 Binary files /dev/null and b/electron_icons/appx/Square44x44Logo.scale-400.png differ diff --git a/electron_icons/appx/Square44x44Logo.targetsize-16.png b/electron_icons/appx/Square44x44Logo.targetsize-16.png new file mode 100644 index 00000000..e9820a43 Binary files /dev/null and b/electron_icons/appx/Square44x44Logo.targetsize-16.png differ diff --git a/electron_icons/appx/Square44x44Logo.targetsize-24.png b/electron_icons/appx/Square44x44Logo.targetsize-24.png new file mode 100644 index 00000000..46fb0a93 Binary files /dev/null and b/electron_icons/appx/Square44x44Logo.targetsize-24.png differ diff --git a/electron_icons/appx/Square44x44Logo.targetsize-24_altform-unplated.png b/electron_icons/appx/Square44x44Logo.targetsize-24_altform-unplated.png new file mode 100644 index 00000000..46fb0a93 Binary files /dev/null and b/electron_icons/appx/Square44x44Logo.targetsize-24_altform-unplated.png differ diff --git a/electron_icons/appx/Square44x44Logo.targetsize-256.png b/electron_icons/appx/Square44x44Logo.targetsize-256.png new file mode 100644 index 00000000..16718d71 Binary files /dev/null and b/electron_icons/appx/Square44x44Logo.targetsize-256.png differ diff --git a/electron_icons/appx/Square44x44Logo.targetsize-32.png b/electron_icons/appx/Square44x44Logo.targetsize-32.png new file mode 100644 index 00000000..3c3872f5 Binary files /dev/null and b/electron_icons/appx/Square44x44Logo.targetsize-32.png differ diff --git a/electron_icons/appx/Square44x44Logo.targetsize-48.png b/electron_icons/appx/Square44x44Logo.targetsize-48.png new file mode 100644 index 00000000..e4dd924e Binary files /dev/null and b/electron_icons/appx/Square44x44Logo.targetsize-48.png differ diff --git a/electron_icons/appx/Wide310x150Logo.scale-100.png b/electron_icons/appx/Wide310x150Logo.scale-100.png new file mode 100644 index 00000000..345c826b Binary files /dev/null and b/electron_icons/appx/Wide310x150Logo.scale-100.png differ diff --git a/electron_icons/appx/Wide310x150Logo.scale-125.png b/electron_icons/appx/Wide310x150Logo.scale-125.png new file mode 100644 index 00000000..0106d79f Binary files /dev/null and b/electron_icons/appx/Wide310x150Logo.scale-125.png differ diff --git a/electron_icons/appx/Wide310x150Logo.scale-150.png b/electron_icons/appx/Wide310x150Logo.scale-150.png new file mode 100644 index 00000000..4eec8e03 Binary files /dev/null and b/electron_icons/appx/Wide310x150Logo.scale-150.png differ diff --git a/electron_icons/appx/Wide310x150Logo.scale-200.png b/electron_icons/appx/Wide310x150Logo.scale-200.png new file mode 100644 index 00000000..c3d785c6 Binary files /dev/null and b/electron_icons/appx/Wide310x150Logo.scale-200.png differ diff --git a/electron_icons/appx/Wide310x150Logo.scale-400.png b/electron_icons/appx/Wide310x150Logo.scale-400.png new file mode 100644 index 00000000..88ba5f4a Binary files /dev/null and b/electron_icons/appx/Wide310x150Logo.scale-400.png differ diff --git a/electron_icons/appx/icon.ico b/electron_icons/appx/icon.ico new file mode 100644 index 00000000..4ca68585 Binary files /dev/null and b/electron_icons/appx/icon.ico differ diff --git a/electron_icons/appx/icon.png b/electron_icons/appx/icon.png new file mode 100644 index 00000000..5c833403 Binary files /dev/null and b/electron_icons/appx/icon.png differ diff --git a/electron_icons/appx/splashscreen.scale-100.png b/electron_icons/appx/splashscreen.scale-100.png new file mode 100644 index 00000000..c3d785c6 Binary files /dev/null and b/electron_icons/appx/splashscreen.scale-100.png differ diff --git a/electron_icons/appx/splashscreen.scale-125.png b/electron_icons/appx/splashscreen.scale-125.png new file mode 100644 index 00000000..901fb69c Binary files /dev/null and b/electron_icons/appx/splashscreen.scale-125.png differ diff --git a/electron_icons/appx/splashscreen.scale-150.png b/electron_icons/appx/splashscreen.scale-150.png new file mode 100644 index 00000000..53d9ea85 Binary files /dev/null and b/electron_icons/appx/splashscreen.scale-150.png differ diff --git a/electron_icons/appx/splashscreen.scale-200.png b/electron_icons/appx/splashscreen.scale-200.png new file mode 100644 index 00000000..88ba5f4a Binary files /dev/null and b/electron_icons/appx/splashscreen.scale-200.png differ diff --git a/electron_icons/appx/splashscreen.scale-400.png b/electron_icons/appx/splashscreen.scale-400.png new file mode 100644 index 00000000..1ab91de6 Binary files /dev/null and b/electron_icons/appx/splashscreen.scale-400.png differ diff --git a/electron_icons/appx/storelogo.scale-100.png b/electron_icons/appx/storelogo.scale-100.png new file mode 100644 index 00000000..32334b23 Binary files /dev/null and b/electron_icons/appx/storelogo.scale-100.png differ diff --git a/electron_icons/appx/storelogo.scale-125.png b/electron_icons/appx/storelogo.scale-125.png new file mode 100644 index 00000000..3841ebfa Binary files /dev/null and b/electron_icons/appx/storelogo.scale-125.png differ diff --git a/electron_icons/appx/storelogo.scale-150.png b/electron_icons/appx/storelogo.scale-150.png new file mode 100644 index 00000000..adc3f9af Binary files /dev/null and b/electron_icons/appx/storelogo.scale-150.png differ diff --git a/electron_icons/appx/storelogo.scale-200.png b/electron_icons/appx/storelogo.scale-200.png new file mode 100644 index 00000000..639fcff5 Binary files /dev/null and b/electron_icons/appx/storelogo.scale-200.png differ diff --git a/electron_icons/appx/storelogo.scale-400.png b/electron_icons/appx/storelogo.scale-400.png new file mode 100644 index 00000000..9c004d00 Binary files /dev/null and b/electron_icons/appx/storelogo.scale-400.png differ diff --git a/electron_icons/appx/web_hi_res_512.png b/electron_icons/appx/web_hi_res_512.png new file mode 100644 index 00000000..abd8a8dc Binary files /dev/null and b/electron_icons/appx/web_hi_res_512.png differ diff --git a/images/icon.ico b/images/icon.ico new file mode 100644 index 00000000..4ca68585 Binary files /dev/null and b/images/icon.ico differ diff --git a/images/icon.png b/images/icon.png new file mode 100644 index 00000000..5c833403 Binary files /dev/null and b/images/icon.png differ diff --git a/images/icon_transparency.png b/images/icon_transparency.png new file mode 100644 index 00000000..1ec3dd07 Binary files /dev/null and b/images/icon_transparency.png differ diff --git a/package.json b/package.json index 593b5f36..d45d5555 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ "productName": "Kiwix JS Electron", "directories": { "output": "bld/Electron", - "buildResources": "../electron_icons" + "buildResources": "electron_icons" }, "afterPack": "./scripts/appimage-fix.js", "win": { @@ -30,6 +30,9 @@ { "target": "portable", "arch": "ia32" + }, + { + "target": "appx" } ] }, @@ -69,6 +72,15 @@ "allowElevation": "true", "runAfterFinish": "true" }, + "appx": { + "backgroundColor": "transparent", + "displayName": "Kiwix JS Electron", + "identityName": "Kiwix.KiwixJS.Electron", + "publisher": "CN=Association Kiwix, O=Association Kiwix, L=Lausanne, C=CH", + "publisherDisplayName": "Association Kiwix", + "languages": "en-GB", + "showNameOnTiles": "true" + }, "files": [ "service-worker.js", "index.html", diff --git a/scripts/Publish-ElectronPackages.ps1 b/scripts/Publish-ElectronPackages.ps1 index 01fe50a5..b4122e30 100644 --- a/scripts/Publish-ElectronPackages.ps1 +++ b/scripts/Publish-ElectronPackages.ps1 @@ -127,7 +127,7 @@ if (-not $githubonly) { $Packages | % { $file = $_ - if ($file -match '\.(exe|zip|msix)$') { + if ($file -match '\.(exe|zip|msix|appx)$') { $directory = $file -replace '^(.+[\\/])[^\\/]+$', '$1' $filename = $file -replace '^.+[\\/]([^\\/]+)$', '$1' # Convert all spaces and hyphens to underscore