diff --git a/icons/linux/crossdesk_1024x1024.png b/icons/linux/crossdesk_1024x1024.png new file mode 100644 index 0000000..101c48b Binary files /dev/null and b/icons/linux/crossdesk_1024x1024.png differ diff --git a/icons/linux/crossdesk_128x128.png b/icons/linux/crossdesk_128x128.png index 9347235..b93a763 100644 Binary files a/icons/linux/crossdesk_128x128.png and b/icons/linux/crossdesk_128x128.png differ diff --git a/icons/linux/crossdesk_16x16.png b/icons/linux/crossdesk_16x16.png index f7321ea..51000ae 100644 Binary files a/icons/linux/crossdesk_16x16.png and b/icons/linux/crossdesk_16x16.png differ diff --git a/icons/linux/crossdesk_24x24.png b/icons/linux/crossdesk_24x24.png index 2439938..77593c2 100644 Binary files a/icons/linux/crossdesk_24x24.png and b/icons/linux/crossdesk_24x24.png differ diff --git a/icons/linux/crossdesk_256x256.png b/icons/linux/crossdesk_256x256.png index 3f24b3f..65e62bc 100644 Binary files a/icons/linux/crossdesk_256x256.png and b/icons/linux/crossdesk_256x256.png differ diff --git a/icons/linux/crossdesk_32x32.png b/icons/linux/crossdesk_32x32.png new file mode 100644 index 0000000..8b7fc3c Binary files /dev/null and b/icons/linux/crossdesk_32x32.png differ diff --git a/icons/linux/crossdesk_48x48.png b/icons/linux/crossdesk_48x48.png index e77b1eb..5b330f8 100644 Binary files a/icons/linux/crossdesk_48x48.png and b/icons/linux/crossdesk_48x48.png differ diff --git a/icons/macos/crossdesk.icns b/icons/macos/crossdesk.icns index e4c3808..f6ded62 100644 Binary files a/icons/macos/crossdesk.icns and b/icons/macos/crossdesk.icns differ diff --git a/icons/windows/crossdesk.ico b/icons/windows/crossdesk.ico index 5b1f083..0a26673 100644 Binary files a/icons/windows/crossdesk.ico and b/icons/windows/crossdesk.ico differ diff --git a/scripts/linux/pkg_arm64.sh b/scripts/linux/pkg_arm64.sh index 74d2728..9fbc3be 100644 --- a/scripts/linux/pkg_arm64.sh +++ b/scripts/linux/pkg_arm64.sh @@ -21,7 +21,7 @@ mkdir -p "$DEBIAN_DIR" "$BIN_DIR" "$CERT_SRC_DIR" "$DESKTOP_DIR" cp build/linux/arm64/release/crossdesk "$BIN_DIR" cp certs/crossdesk.cn_root.crt "$CERT_SRC_DIR/crossdesk.cn_root.crt" -for size in 16 24 48 128 256; do +for size in 16 24 32 48 128 256 1024; do mkdir -p "$ICON_BASE_DIR/${size}x${size}/apps" cp "icons/linux/crossdesk_${size}x${size}.png" \ "$ICON_BASE_DIR/${size}x${size}/apps/crossdesk.png" @@ -65,7 +65,7 @@ if [ "\$1" = "remove" ] || [ "\$1" = "purge" ]; then rm -f /usr/local/bin/crossdesk rm -f /usr/share/applications/$APP_NAME.desktop rm -rf /opt/$APP_NAME - for size in 16 24 48 128 256; do + for size in 16 24 32 48 128 256 1024; do rm -f /usr/share/icons/hicolor/\${size}x\${size}/apps/crossdesk.png done fi diff --git a/scripts/linux/pkg_x86_64.sh b/scripts/linux/pkg_x86_64.sh index e1df118..f3b4ba0 100644 --- a/scripts/linux/pkg_x86_64.sh +++ b/scripts/linux/pkg_x86_64.sh @@ -21,7 +21,7 @@ mkdir -p "$DEBIAN_DIR" "$BIN_DIR" "$CERT_SRC_DIR" "$DESKTOP_DIR" cp build/linux/x86_64/release/crossdesk "$BIN_DIR" cp certs/crossdesk.cn_root.crt "$CERT_SRC_DIR/crossdesk.cn_root.crt" -for size in 16 24 48 128 256; do +for size in 16 24 32 48 128 256 1024; do mkdir -p "$ICON_BASE_DIR/${size}x${size}/apps" cp "icons/linux/crossdesk_${size}x${size}.png" \ "$ICON_BASE_DIR/${size}x${size}/apps/crossdesk.png" @@ -65,7 +65,7 @@ if [ "\$1" = "remove" ] || [ "\$1" = "purge" ]; then rm -f /usr/local/bin/crossdesk rm -f /usr/share/applications/$APP_NAME.desktop rm -rf /opt/$APP_NAME - for size in 16 24 48 128 256; do + for size in 16 24 32 48 128 256 1024; do rm -f /usr/share/icons/hicolor/\${size}x\${size}/apps/crossdesk.png done fi diff --git a/scripts/windows/crossdesk.manifest b/scripts/windows/crossdesk.manifest new file mode 100644 index 0000000..28530aa --- /dev/null +++ b/scripts/windows/crossdesk.manifest @@ -0,0 +1,43 @@ + + + + + + + + CrossDesk Application + + + + + + + + + + + + + + + true/pm + + PerMonitorV2 + + + + + + + + + + + + + + \ No newline at end of file diff --git a/scripts/windows/nsis_script.nsi b/scripts/windows/nsis_script.nsi index 5b7b0ac..bfb4b3b 100644 --- a/scripts/windows/nsis_script.nsi +++ b/scripts/windows/nsis_script.nsi @@ -15,6 +15,10 @@ ; ֤· !define CERT_FILE "${__FILEDIR__}\..\..\certs\crossdesk.cn_root.crt" +; װǷеѡ +!define MUI_FINISHPAGE_RUN "crossdesk.exe" ; Ĭг +!define MUI_FINISHPAGE_TEXT "װɣǷ CrossDesk?" + ; ѹ SetCompressor /FINAL lzma @@ -43,8 +47,8 @@ Section "MainSection" ; óļ· File /oname=crossdesk.exe "..\..\build\windows\x64\release\crossdesk.exe" - - ; ? ͼļװĿ¼ + + ; ? ͼļװĿ¼ File "${MUI_ICON}" ; джϢ @@ -55,11 +59,19 @@ Section "MainSection" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${UNINSTALL_REG_KEY}" "DisplayVersion" "${PRODUCT_VERSION}" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${UNINSTALL_REG_KEY}" "Publisher" "${PRODUCT_PUBLISHER}" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${UNINSTALL_REG_KEY}" "URLInfoAbout" "${PRODUCT_WEB_SITE}" - WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${UNINSTALL_REG_KEY}" "DisplayIcon" "$INSTDIR\crossdesk.ico" + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${UNINSTALL_REG_KEY}" "DisplayIcon" "$INSTDIR\crossdesk.ico" WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${UNINSTALL_REG_KEY}" "NoModify" 1 WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${UNINSTALL_REG_KEY}" "NoRepair" 1 SectionEnd +; װɺ +Section -Post + ExecWait '"C:\Program Files (x86)\Windows Kits\10\bin\10.0.26100.0\x86\mt.exe" -manifest "$INSTDIR\crossdesk.manifest" -outputresource:"$INSTDIR\crossdesk.exe";1' + ; ûѡ + StrCmp $INSTDIR\crossdesk.exe "" 0 +2 + Exec "$INSTDIR\crossdesk.exe" +SectionEnd + Section "Cert" SetOutPath "$APPDATA\CrossDesk\certs" File /r "${CERT_FILE}"