From 821e0f9fd6ebafbf8355fb5db4a9d8eb7f298d5c Mon Sep 17 00:00:00 2001 From: yyc12345 Date: Thu, 2 Jul 2026 15:43:58 +0800 Subject: [PATCH] revert: remove passoc support on Windows. - remove passoc executable support on Windows. - but preserve the icons created by upstream for future expanding. --- .github/workflows/windows.yml | 4 -- CMakeLists.txt | 6 -- dist/passoc/ppic.pacfg | 118 ---------------------------------- 3 files changed, 128 deletions(-) delete mode 100644 dist/passoc/ppic.pacfg diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 7221617..5dba226 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -125,10 +125,6 @@ jobs: cmake --build build --config Release cmake --install build --config Release --prefix "%PWD%\build" echo ::endgroup:: - echo ::group::===== passoc stuff ===== - curl -fsSL -o passoc-standalone.zip https://github.com/BLumia/pineapple-assoc-manager/releases/latest/download/pineapple-assoc-manager-qt${{ matrix.qt_ver }}-standalone.zip - 7z x passoc-standalone.zip passoc.exe -y -o"build/bin" - echo ::endgroup:: :: ------ pkg ------ windeployqt --verbose=2 --no-compiler-runtime --no-quick-import --no-translations --no-network --no-opengl-sw --no-system-d3d-compiler --no-system-dxc-compiler --skip-plugin-types tls,networkinformation build\bin\ppic.exe robocopy ./dependencies_bin/bin build/bin *.dll diff --git a/CMakeLists.txt b/CMakeLists.txt index 27959e7..1fac056 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -271,12 +271,6 @@ if (DEFINED QM_FILE_INSTALL_DIR) endif() if (WIN32) - install( - FILES dist/passoc/ppic.pacfg - DESTINATION ${CMAKE_INSTALL_BINDIR} - RENAME default-assoc.pacfg - ) - install( FILES dist/passoc/generic.ico diff --git a/dist/passoc/ppic.pacfg b/dist/passoc/ppic.pacfg deleted file mode 100644 index 9c732e3..0000000 --- a/dist/passoc/ppic.pacfg +++ /dev/null @@ -1,118 +0,0 @@ -targetApp=ppic.exe -friendlyAppName=Pineapple Pictures -friendlyAppName[zh_CN]=菠萝看图 -openCommand="\"{targetAppFullPath}\" \"%1\"" - -[ProgId/jpeg] -name=JPEG Image -name[zh_CN]=JPEG 图像 -extensions=jpg,jpeg,jfif - -[ProgId/gif] -name=GIF Animation Image -name[zh_CN]=GIF 动图 - -[ProgId/png] -name=PNG Image -name[zh_CN]=PNG 图像 - -[ProgId/svg] -name=Scalable Vector Graphics -name[zh_CN]=可缩放矢量图像 - -[ProgId/webp] -name=WebP Image -name[zh_CN]=WebP 图像 -extensions=webp - -[ProgId/avif] -name=AV1 Image File -name[zh_CN]=AV1 图像文件 - -[ProgId/ico] -name=Windows Icon Image -name[zh_CN]=Windows 图标图像 - -[ProgId/icns] -name=Apple Icon Image -name[zh_CN]=苹果图标图像 - -[ProgId/psd] -name=Photoshop Document -name[zh_CN]=Photoshop 文档 -extensions=psd,psb,pdd,psdt - -[ProgId/kra] -name=Krita Document -name[zh_CN]=Krita 文档 - -[ProgId/xcf] -name=GIMP Document -name[zh_CN]=GIMP 文档 - -[ProgId/tga] -name=TARGA Image -name[zh_CN]=TARGA 图像 - -[ProgId/tif] -name=Tagged Image File Format -name[zh_CN]=标签图像文件格式 -extensions=tif,tiff - -[ProgId/bmp] -name=Bitmap -name[zh_CN]=位图 - -[ProgId/wbmp] -name=Wireless Bitmap -name[zh_CN]=无线位图 - -[ProgId/dds] -name=DirectDraw Surface - -[ProgId/hdr] -name=High Dynamic Range Image -name[zh_CN]=高动态范围图像 - -[ProgId/iff] -name=Interchange File Format -name[zh_CN]=可交换文件格式 - -[ProgId/pic] -name=Softimage Picture -name[zh_CN]=Softimage 图像 - -[ProgId/pcx] -name=PiCture eXchange PC Paintbrush Image -name[zh_CN]=PC Paintbrush 图像 - -[ProgId/qoi] -name=Quite OK Image -name[zh_CN]=挺 OK 图像 - -[ProgId/ras] -name=Sun Raster Image -name[zh_CN]=Sun 栅格图象 -extensions=ras,sun - -[ProgId/ora] -name=OpenRaster Image -name[zh_CN]=OpenRaster 图象 - -[ProgId/ani] -name=Animated Cursor -name[zh_CN]=动态光标 - -[ProgId/pfm] -name=Portable Float Map -extensions=pfm,phm - -[ProgId/rgb] -name=Silicon Graphics Image -extensions=rgb,rgba,bw,sgi - -[ProgId/pxr] -name=Pixar Raster Image - -[ProgId/sct] -name=Scitex Continuous Tone