diff --git a/.gitignore b/.gitignore index e146895051..37b3d5a6d2 100644 --- a/.gitignore +++ b/.gitignore @@ -60,6 +60,8 @@ My Project # Qt GUI build and translations directories /Project/QMake/GUI/build /Source/Resource/Translations +/Source/WindowsQtPackage/Assets +Source/WindowsQtPackage/resources.pri build/ .vscode/ @@ -73,3 +75,7 @@ Source/GUI/Android/app/src/main/res/raw*/lang.csv Source/GUI/Android/app/src/main/res/values-*/strings.xml /Source/GUI/Android/build Source/GUI/Android/local.properties + +# GUI Assets +/Source/WindowsSparsePackage/Resources/Assets +Source/WindowsSparsePackage/Resources/resources.pri diff --git a/Release/Build_GUI_Windows.ps1 b/Release/Build_GUI_Windows.ps1 index 778c92133d..ab9722d32b 100755 --- a/Release/Build_GUI_Windows.ps1 +++ b/Release/Build_GUI_Windows.ps1 @@ -62,6 +62,12 @@ Push-Location -Path "${release_directory}\..\Project\MSVC2022" MSBuild /restore "/p:RestorePackagesConfig=true;Configuration=Release;Platform=Win32" "/t:MediaInfo_PackageHelper" MediaInfo.sln Pop-Location +### Build: Image assets and resources ### +xcopy "${release_directory}\..\Source\Resource\Image\MSIX_Assets" "${release_directory}\..\Source\WindowsSparsePackage\Resources\Assets\" /i /e /r /y +Push-Location -Path "${release_directory}\..\Source\WindowsSparsePackage\Resources" + makepri new /pr "${release_directory}\..\Source\WindowsSparsePackage\Resources" /cf "${release_directory}\..\Source\WindowsSparsePackage\Resources\priconfig.xml" +Pop-Location + ### Build: zlib BCB library ### Push-Location -Path "${release_directory}\..\..\zlib\contrib\BCB" MSBuild "/p:Configuration=Release;Platform=${arch_bcb}" zlib.cbproj diff --git a/Release/Release_GUI_Qt_Windows_x64_MSIX.cmd b/Release/Release_GUI_Qt_Windows_x64_MSIX.cmd index 72fb0eca97..e8b2b195d1 100644 --- a/Release/Release_GUI_Qt_Windows_x64_MSIX.cmd +++ b/Release/Release_GUI_Qt_Windows_x64_MSIX.cmd @@ -47,6 +47,10 @@ copy "%~dp0\..\Project\MSVC2022\MediaInfo_WindowsShellExtension\x64\Release Qt\M signtool.exe sign /fd SHA256 /a /f %CERT_PATH% /p %CERT_PASS% /tr http://timestamp.acs.microsoft.com /td sha256 %~dp0\MediaInfo_Qt_Windows_x64\MediaInfo.exe %~dp0\MediaInfo_Qt_Windows_x64\MediaInfo_WindowsShellExtension.dll :: add MSIX manifest and assets +xcopy %~dp0\..\Source\Resource\Image\MSIX_Assets %~dp0\..\Source\WindowsQtPackage\Assets\ /i /e /r /y +pushd %~dp0\..\Source\WindowsQtPackage +makepri.exe new /pr %~dp0\..\Source\WindowsQtPackage /cf %~dp0\..\Source\WindowsQtPackage\priconfig.xml +popd xcopy %~dp0\..\Source\WindowsQtPackage %~dp0\MediaInfo_Qt_Windows_x64\ /i /e /r /y :: package and sign MSIX diff --git a/Source/GUI/VCL/MediaInfo.VisualElementsManifest.xml b/Source/GUI/VCL/MediaInfo.VisualElementsManifest.xml index 404eb32a50..becfc41f00 100644 --- a/Source/GUI/VCL/MediaInfo.VisualElementsManifest.xml +++ b/Source/GUI/VCL/MediaInfo.VisualElementsManifest.xml @@ -1,8 +1,8 @@ + Square70x70Logo="Assets\SmallTile.png"/> \ No newline at end of file diff --git a/Source/Resource/Image/MSIX_Assets/LargeTile.scale-100.png b/Source/Resource/Image/MSIX_Assets/LargeTile.scale-100.png new file mode 100644 index 0000000000..c2789f0577 Binary files /dev/null and b/Source/Resource/Image/MSIX_Assets/LargeTile.scale-100.png differ diff --git a/Source/Resource/Image/MSIX_Assets/LargeTile.scale-100_altform-colorful_theme-light.png b/Source/Resource/Image/MSIX_Assets/LargeTile.scale-100_altform-colorful_theme-light.png new file mode 100644 index 0000000000..4fd80516df Binary files /dev/null and b/Source/Resource/Image/MSIX_Assets/LargeTile.scale-100_altform-colorful_theme-light.png differ diff --git a/Source/Resource/Image/MSIX_Assets/LargeTile.scale-200.png b/Source/Resource/Image/MSIX_Assets/LargeTile.scale-200.png new file mode 100644 index 0000000000..62f5634db7 Binary files /dev/null and b/Source/Resource/Image/MSIX_Assets/LargeTile.scale-200.png differ diff --git a/Source/Resource/Image/MSIX_Assets/LargeTile.scale-200_altform-colorful_theme-light.png b/Source/Resource/Image/MSIX_Assets/LargeTile.scale-200_altform-colorful_theme-light.png new file mode 100644 index 0000000000..d32d68fffe Binary files /dev/null and b/Source/Resource/Image/MSIX_Assets/LargeTile.scale-200_altform-colorful_theme-light.png differ diff --git a/Source/Resource/Image/MSIX_Assets/LargeTile.scale-400.png b/Source/Resource/Image/MSIX_Assets/LargeTile.scale-400.png new file mode 100644 index 0000000000..9c73bc0fb4 Binary files /dev/null and b/Source/Resource/Image/MSIX_Assets/LargeTile.scale-400.png differ diff --git a/Source/Resource/Image/MSIX_Assets/LargeTile.scale-400_altform-colorful_theme-light.png b/Source/Resource/Image/MSIX_Assets/LargeTile.scale-400_altform-colorful_theme-light.png new file mode 100644 index 0000000000..9325c69193 Binary files /dev/null and b/Source/Resource/Image/MSIX_Assets/LargeTile.scale-400_altform-colorful_theme-light.png differ diff --git a/Source/Resource/Image/MSIX_Assets/SmallTile.scale-100.png b/Source/Resource/Image/MSIX_Assets/SmallTile.scale-100.png new file mode 100644 index 0000000000..dd12b878da Binary files /dev/null and b/Source/Resource/Image/MSIX_Assets/SmallTile.scale-100.png differ diff --git a/Source/Resource/Image/MSIX_Assets/SmallTile.scale-100_altform-colorful_theme-light.png b/Source/Resource/Image/MSIX_Assets/SmallTile.scale-100_altform-colorful_theme-light.png new file mode 100644 index 0000000000..57f4f37df2 Binary files /dev/null and b/Source/Resource/Image/MSIX_Assets/SmallTile.scale-100_altform-colorful_theme-light.png differ diff --git a/Source/Resource/Image/MSIX_Assets/SmallTile.scale-200.png b/Source/Resource/Image/MSIX_Assets/SmallTile.scale-200.png new file mode 100644 index 0000000000..4b046989e5 Binary files /dev/null and b/Source/Resource/Image/MSIX_Assets/SmallTile.scale-200.png differ diff --git a/Source/Resource/Image/MSIX_Assets/SmallTile.scale-200_altform-colorful_theme-light.png b/Source/Resource/Image/MSIX_Assets/SmallTile.scale-200_altform-colorful_theme-light.png new file mode 100644 index 0000000000..21c3d11193 Binary files /dev/null and b/Source/Resource/Image/MSIX_Assets/SmallTile.scale-200_altform-colorful_theme-light.png differ diff --git a/Source/Resource/Image/MSIX_Assets/SmallTile.scale-400.png b/Source/Resource/Image/MSIX_Assets/SmallTile.scale-400.png new file mode 100644 index 0000000000..f63e4d8591 Binary files /dev/null and b/Source/Resource/Image/MSIX_Assets/SmallTile.scale-400.png differ diff --git a/Source/Resource/Image/MSIX_Assets/SmallTile.scale-400_altform-colorful_theme-light.png b/Source/Resource/Image/MSIX_Assets/SmallTile.scale-400_altform-colorful_theme-light.png new file mode 100644 index 0000000000..64a9ed8c9e Binary files /dev/null and b/Source/Resource/Image/MSIX_Assets/SmallTile.scale-400_altform-colorful_theme-light.png differ diff --git a/Source/Resource/Image/MSIX_Assets/Square150x150Logo.scale-100.png b/Source/Resource/Image/MSIX_Assets/Square150x150Logo.scale-100.png new file mode 100644 index 0000000000..e0f2ac1491 Binary files /dev/null and b/Source/Resource/Image/MSIX_Assets/Square150x150Logo.scale-100.png differ diff --git a/Source/Resource/Image/MSIX_Assets/Square150x150Logo.scale-100_altform-colorful_theme-light.png b/Source/Resource/Image/MSIX_Assets/Square150x150Logo.scale-100_altform-colorful_theme-light.png new file mode 100644 index 0000000000..873e03525e Binary files /dev/null and b/Source/Resource/Image/MSIX_Assets/Square150x150Logo.scale-100_altform-colorful_theme-light.png differ diff --git a/Source/Resource/Image/MSIX_Assets/Square150x150Logo.scale-200.png b/Source/Resource/Image/MSIX_Assets/Square150x150Logo.scale-200.png new file mode 100644 index 0000000000..6bb8c2f1bb Binary files /dev/null and b/Source/Resource/Image/MSIX_Assets/Square150x150Logo.scale-200.png differ diff --git a/Source/Resource/Image/MSIX_Assets/Square150x150Logo.scale-200_altform-colorful_theme-light.png b/Source/Resource/Image/MSIX_Assets/Square150x150Logo.scale-200_altform-colorful_theme-light.png new file mode 100644 index 0000000000..69a9431e03 Binary files /dev/null and b/Source/Resource/Image/MSIX_Assets/Square150x150Logo.scale-200_altform-colorful_theme-light.png differ diff --git a/Source/Resource/Image/MSIX_Assets/Square150x150Logo.scale-400.png b/Source/Resource/Image/MSIX_Assets/Square150x150Logo.scale-400.png new file mode 100644 index 0000000000..de73f0448f Binary files /dev/null and b/Source/Resource/Image/MSIX_Assets/Square150x150Logo.scale-400.png differ diff --git a/Source/Resource/Image/MSIX_Assets/Square150x150Logo.scale-400_altform-colorful_theme-light.png b/Source/Resource/Image/MSIX_Assets/Square150x150Logo.scale-400_altform-colorful_theme-light.png new file mode 100644 index 0000000000..95bbf30f08 Binary files /dev/null and b/Source/Resource/Image/MSIX_Assets/Square150x150Logo.scale-400_altform-colorful_theme-light.png differ diff --git a/Source/Resource/Image/MSIX_Assets/Square44x44Logo.altform-lightunplated_targetsize-16.png b/Source/Resource/Image/MSIX_Assets/Square44x44Logo.altform-lightunplated_targetsize-16.png new file mode 100644 index 0000000000..134954493d Binary files /dev/null and b/Source/Resource/Image/MSIX_Assets/Square44x44Logo.altform-lightunplated_targetsize-16.png differ diff --git a/Source/Resource/Image/MSIX_Assets/Square44x44Logo.altform-lightunplated_targetsize-256.png b/Source/Resource/Image/MSIX_Assets/Square44x44Logo.altform-lightunplated_targetsize-256.png new file mode 100644 index 0000000000..83d73fe7e0 Binary files /dev/null and b/Source/Resource/Image/MSIX_Assets/Square44x44Logo.altform-lightunplated_targetsize-256.png differ diff --git a/Source/Resource/Image/MSIX_Assets/Square44x44Logo.altform-lightunplated_targetsize-48.png b/Source/Resource/Image/MSIX_Assets/Square44x44Logo.altform-lightunplated_targetsize-48.png new file mode 100644 index 0000000000..aefaab4e77 Binary files /dev/null and b/Source/Resource/Image/MSIX_Assets/Square44x44Logo.altform-lightunplated_targetsize-48.png differ diff --git a/Source/Resource/Image/MSIX_Assets/Square44x44Logo.altform-unplated_targetsize-16.png b/Source/Resource/Image/MSIX_Assets/Square44x44Logo.altform-unplated_targetsize-16.png new file mode 100644 index 0000000000..ab2aa87956 Binary files /dev/null and b/Source/Resource/Image/MSIX_Assets/Square44x44Logo.altform-unplated_targetsize-16.png differ diff --git a/Source/Resource/Image/MSIX_Assets/Square44x44Logo.altform-unplated_targetsize-256.png b/Source/Resource/Image/MSIX_Assets/Square44x44Logo.altform-unplated_targetsize-256.png new file mode 100644 index 0000000000..0710cb7333 Binary files /dev/null and b/Source/Resource/Image/MSIX_Assets/Square44x44Logo.altform-unplated_targetsize-256.png differ diff --git a/Source/Resource/Image/MSIX_Assets/Square44x44Logo.altform-unplated_targetsize-48.png b/Source/Resource/Image/MSIX_Assets/Square44x44Logo.altform-unplated_targetsize-48.png new file mode 100644 index 0000000000..91b6a676ac Binary files /dev/null and b/Source/Resource/Image/MSIX_Assets/Square44x44Logo.altform-unplated_targetsize-48.png differ diff --git a/Source/Resource/Image/MSIX_Assets/Square44x44Logo.scale-100.png b/Source/Resource/Image/MSIX_Assets/Square44x44Logo.scale-100.png new file mode 100644 index 0000000000..d029604db4 Binary files /dev/null and b/Source/Resource/Image/MSIX_Assets/Square44x44Logo.scale-100.png differ diff --git a/Source/Resource/Image/MSIX_Assets/Square44x44Logo.scale-100_altform-colorful_theme-light.png b/Source/Resource/Image/MSIX_Assets/Square44x44Logo.scale-100_altform-colorful_theme-light.png new file mode 100644 index 0000000000..5493d0335a Binary files /dev/null and b/Source/Resource/Image/MSIX_Assets/Square44x44Logo.scale-100_altform-colorful_theme-light.png differ diff --git a/Source/Resource/Image/MSIX_Assets/Square44x44Logo.scale-200.png b/Source/Resource/Image/MSIX_Assets/Square44x44Logo.scale-200.png new file mode 100644 index 0000000000..1c03d373d9 Binary files /dev/null and b/Source/Resource/Image/MSIX_Assets/Square44x44Logo.scale-200.png differ diff --git a/Source/Resource/Image/MSIX_Assets/Square44x44Logo.scale-200_altform-colorful_theme-light.png b/Source/Resource/Image/MSIX_Assets/Square44x44Logo.scale-200_altform-colorful_theme-light.png new file mode 100644 index 0000000000..d6b7987417 Binary files /dev/null and b/Source/Resource/Image/MSIX_Assets/Square44x44Logo.scale-200_altform-colorful_theme-light.png differ diff --git a/Source/Resource/Image/MSIX_Assets/Square44x44Logo.scale-400.png b/Source/Resource/Image/MSIX_Assets/Square44x44Logo.scale-400.png new file mode 100644 index 0000000000..ec77e570be Binary files /dev/null and b/Source/Resource/Image/MSIX_Assets/Square44x44Logo.scale-400.png differ diff --git a/Source/Resource/Image/MSIX_Assets/Square44x44Logo.scale-400_altform-colorful_theme-light.png b/Source/Resource/Image/MSIX_Assets/Square44x44Logo.scale-400_altform-colorful_theme-light.png new file mode 100644 index 0000000000..dc78cf2fa0 Binary files /dev/null and b/Source/Resource/Image/MSIX_Assets/Square44x44Logo.scale-400_altform-colorful_theme-light.png differ diff --git a/Source/Resource/Image/MSIX_Assets/Square44x44Logo.targetsize-16.png b/Source/Resource/Image/MSIX_Assets/Square44x44Logo.targetsize-16.png new file mode 100644 index 0000000000..64d076bb5c Binary files /dev/null and b/Source/Resource/Image/MSIX_Assets/Square44x44Logo.targetsize-16.png differ diff --git a/Source/Resource/Image/MSIX_Assets/Square44x44Logo.targetsize-256.png b/Source/Resource/Image/MSIX_Assets/Square44x44Logo.targetsize-256.png new file mode 100644 index 0000000000..d567a4a90f Binary files /dev/null and b/Source/Resource/Image/MSIX_Assets/Square44x44Logo.targetsize-256.png differ diff --git a/Source/Resource/Image/MSIX_Assets/Square44x44Logo.targetsize-48.png b/Source/Resource/Image/MSIX_Assets/Square44x44Logo.targetsize-48.png new file mode 100644 index 0000000000..b2ffb202c8 Binary files /dev/null and b/Source/Resource/Image/MSIX_Assets/Square44x44Logo.targetsize-48.png differ diff --git a/Source/Resource/Image/MSIX_Assets/Wide310x150Logo.scale-100.png b/Source/Resource/Image/MSIX_Assets/Wide310x150Logo.scale-100.png new file mode 100644 index 0000000000..1ed9f6e6f1 Binary files /dev/null and b/Source/Resource/Image/MSIX_Assets/Wide310x150Logo.scale-100.png differ diff --git a/Source/Resource/Image/MSIX_Assets/Wide310x150Logo.scale-100_altform-colorful_theme-light.png b/Source/Resource/Image/MSIX_Assets/Wide310x150Logo.scale-100_altform-colorful_theme-light.png new file mode 100644 index 0000000000..b20de59920 Binary files /dev/null and b/Source/Resource/Image/MSIX_Assets/Wide310x150Logo.scale-100_altform-colorful_theme-light.png differ diff --git a/Source/Resource/Image/MSIX_Assets/Wide310x150Logo.scale-200.png b/Source/Resource/Image/MSIX_Assets/Wide310x150Logo.scale-200.png new file mode 100644 index 0000000000..b9d92e3655 Binary files /dev/null and b/Source/Resource/Image/MSIX_Assets/Wide310x150Logo.scale-200.png differ diff --git a/Source/Resource/Image/MSIX_Assets/Wide310x150Logo.scale-200_altform-colorful_theme-light.png b/Source/Resource/Image/MSIX_Assets/Wide310x150Logo.scale-200_altform-colorful_theme-light.png new file mode 100644 index 0000000000..10d2907d3a Binary files /dev/null and b/Source/Resource/Image/MSIX_Assets/Wide310x150Logo.scale-200_altform-colorful_theme-light.png differ diff --git a/Source/Resource/Image/MSIX_Assets/Wide310x150Logo.scale-400.png b/Source/Resource/Image/MSIX_Assets/Wide310x150Logo.scale-400.png new file mode 100644 index 0000000000..827157b33c Binary files /dev/null and b/Source/Resource/Image/MSIX_Assets/Wide310x150Logo.scale-400.png differ diff --git a/Source/Resource/Image/MSIX_Assets/Wide310x150Logo.scale-400_altform-colorful_theme-light.png b/Source/Resource/Image/MSIX_Assets/Wide310x150Logo.scale-400_altform-colorful_theme-light.png new file mode 100644 index 0000000000..d5be9fd4e4 Binary files /dev/null and b/Source/Resource/Image/MSIX_Assets/Wide310x150Logo.scale-400_altform-colorful_theme-light.png differ diff --git a/Source/Resource/Image/MediaInfoBig_inverted.png b/Source/Resource/Image/MediaInfoBig_inverted.png new file mode 100644 index 0000000000..61ba222058 Binary files /dev/null and b/Source/Resource/Image/MediaInfoBig_inverted.png differ diff --git a/Source/Resource/Image/MediaInfo_inverted.svg b/Source/Resource/Image/MediaInfo_inverted.svg new file mode 100644 index 0000000000..a21b4de83f --- /dev/null +++ b/Source/Resource/Image/MediaInfo_inverted.svg @@ -0,0 +1,166 @@ + + + + + + + + + + + + + + + + + + + image/svg+xml + + + 2010-06-05 + + + Jerome Martinez + + + + + drawing by Kevin Redon + + + + + + + + + + + + + ? + + + + + + diff --git a/Source/WindowsQtPackage/AppxManifest.xml b/Source/WindowsQtPackage/AppxManifest.xml index fb28956512..5a73dde3fa 100644 --- a/Source/WindowsQtPackage/AppxManifest.xml +++ b/Source/WindowsQtPackage/AppxManifest.xml @@ -32,7 +32,7 @@ to prevent an OS behaviour causing the application to be forced-closed when File Explorer context menu is loaded. --> - + diff --git a/Source/WindowsQtPackage/Assets/Square150x150Logo.scale-400.png b/Source/WindowsQtPackage/Assets/Square150x150Logo.scale-400.png deleted file mode 100644 index 2013930776..0000000000 Binary files a/Source/WindowsQtPackage/Assets/Square150x150Logo.scale-400.png and /dev/null differ diff --git a/Source/WindowsQtPackage/Assets/Square44x44Logo.altform-unplated_scale-400.png b/Source/WindowsQtPackage/Assets/Square44x44Logo.altform-unplated_scale-400.png deleted file mode 100644 index 13f5265706..0000000000 Binary files a/Source/WindowsQtPackage/Assets/Square44x44Logo.altform-unplated_scale-400.png and /dev/null differ diff --git a/Source/WindowsQtPackage/Assets/Square44x44Logo.scale-400.png b/Source/WindowsQtPackage/Assets/Square44x44Logo.scale-400.png deleted file mode 100644 index 37ae0d6aef..0000000000 Binary files a/Source/WindowsQtPackage/Assets/Square44x44Logo.scale-400.png and /dev/null differ diff --git a/Source/WindowsQtPackage/Assets/Square71x71Logo.scale-400.png b/Source/WindowsQtPackage/Assets/Square71x71Logo.scale-400.png deleted file mode 100644 index 3025ee8a96..0000000000 Binary files a/Source/WindowsQtPackage/Assets/Square71x71Logo.scale-400.png and /dev/null differ diff --git a/Source/WindowsQtPackage/resources.pri b/Source/WindowsQtPackage/resources.pri deleted file mode 100644 index 9a45d8e6aa..0000000000 Binary files a/Source/WindowsQtPackage/resources.pri and /dev/null differ diff --git a/Source/WindowsSparsePackage/MSIX/AppxManifest.xml b/Source/WindowsSparsePackage/MSIX/AppxManifest.xml index 3d11998b34..5a3fe80650 100644 --- a/Source/WindowsSparsePackage/MSIX/AppxManifest.xml +++ b/Source/WindowsSparsePackage/MSIX/AppxManifest.xml @@ -34,7 +34,7 @@ to prevent an OS behaviour causing the application to be forced-closed when File Explorer context menu is loaded. --> - + diff --git a/Source/WindowsSparsePackage/Resources/Assets/Square150x150Logo.scale-400.png b/Source/WindowsSparsePackage/Resources/Assets/Square150x150Logo.scale-400.png deleted file mode 100644 index 2013930776..0000000000 Binary files a/Source/WindowsSparsePackage/Resources/Assets/Square150x150Logo.scale-400.png and /dev/null differ diff --git a/Source/WindowsSparsePackage/Resources/Assets/Square44x44Logo.altform-unplated_scale-400.png b/Source/WindowsSparsePackage/Resources/Assets/Square44x44Logo.altform-unplated_scale-400.png deleted file mode 100644 index 13f5265706..0000000000 Binary files a/Source/WindowsSparsePackage/Resources/Assets/Square44x44Logo.altform-unplated_scale-400.png and /dev/null differ diff --git a/Source/WindowsSparsePackage/Resources/Assets/Square44x44Logo.scale-400.png b/Source/WindowsSparsePackage/Resources/Assets/Square44x44Logo.scale-400.png deleted file mode 100644 index 37ae0d6aef..0000000000 Binary files a/Source/WindowsSparsePackage/Resources/Assets/Square44x44Logo.scale-400.png and /dev/null differ diff --git a/Source/WindowsSparsePackage/Resources/Assets/Square71x71Logo.scale-400.png b/Source/WindowsSparsePackage/Resources/Assets/Square71x71Logo.scale-400.png deleted file mode 100644 index 3025ee8a96..0000000000 Binary files a/Source/WindowsSparsePackage/Resources/Assets/Square71x71Logo.scale-400.png and /dev/null differ diff --git a/Source/WindowsSparsePackage/Resources/resources.pri b/Source/WindowsSparsePackage/Resources/resources.pri deleted file mode 100644 index 6bcf647ed5..0000000000 Binary files a/Source/WindowsSparsePackage/Resources/resources.pri and /dev/null differ