From 7b08954e57f5cc35e13293fed03c33fbc7756bbc Mon Sep 17 00:00:00 2001 From: longpanda Date: Sat, 27 Feb 2021 10:37:40 +0800 Subject: [PATCH] 1. change icon from * to a lock icon 2. typo correct 3. misc update --- INSTALL/Ventoy2Disk.exe | Bin 324096 -> 324096 bytes INSTALL/VentoyWeb.sh | 4 ++-- INSTALL/tool/VentoyWorker.sh | 20 ++++++++++---------- Ventoy2Disk/Ventoy2Disk/Language.c | 10 ++++++++++ Ventoy2Disk/Ventoy2Disk/Language.h | 9 +++++++++ Ventoy2Disk/Ventoy2Disk/PhyDrive.c | 4 ++-- Ventoy2Disk/Ventoy2Disk/Ventoy2Disk.h | 2 +- Ventoy2Disk/Ventoy2Disk/Ventoy2Disk.rc | Bin 12236 -> 12236 bytes Ventoy2Disk/Ventoy2Disk/WinDialog.c | Bin 64684 -> 64752 bytes 9 files changed, 34 insertions(+), 15 deletions(-) diff --git a/INSTALL/Ventoy2Disk.exe b/INSTALL/Ventoy2Disk.exe index 032375b32d47c37e33c11ee123ddfcc53689f725..770a8b1b5e06246b5ec7bc66b7b53f646fe66994 100644 GIT binary patch delta 13144 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 diff --git a/INSTALL/VentoyWeb.sh b/INSTALL/VentoyWeb.sh index 9baf33b8..bb6a910a 100644 --- a/INSTALL/VentoyWeb.sh +++ b/INSTALL/VentoyWeb.sh @@ -101,8 +101,8 @@ vtVer=$(cat ventoy/version) echo "" echo "===============================================================" if [ "$LANG" = "zh_CN.UTF-8" ]; then - echo " Ventoy Server $vtVer 已经启动 ..." - echo " 请打开浏览器,访问 http://${HOST}:${PORT}" + echo " Ventoy Server $vtVer 宸茬粡鍚姩 ..." + echo " 璇锋墦寮娴忚鍣紝璁块棶 http://${HOST}:${PORT}" else echo " Ventoy Server $vtVer is running ..." echo " Please open your browser and visit http://${HOST}:${PORT}" diff --git a/INSTALL/tool/VentoyWorker.sh b/INSTALL/tool/VentoyWorker.sh index 7e276db5..ac2102c8 100644 --- a/INSTALL/tool/VentoyWorker.sh +++ b/INSTALL/tool/VentoyWorker.sh @@ -6,9 +6,9 @@ print_usage() { echo 'Usage: Ventoy2Disk.sh CMD [ OPTION ] /dev/sdX' echo ' CMD:' - echo ' -i install ventoy to sdX (fail if disk already installed with ventoy)' - echo ' -I force install ventoy to sdX (no matter installed or not)' - echo ' -u update ventoy in sdX' + echo ' -i install Ventoy to sdX (fails if disk already installed with Ventoy)' + echo ' -I force install Ventoy to sdX (no matter installed or not)' + echo ' -u update Ventoy in sdX' echo ' -l list Ventoy information in sdX' echo '' echo ' OPTION: (optional)' @@ -96,7 +96,7 @@ vtdebug "MODE=$MODE FORCE=$FORCE RESERVE_SPACE=$RESERVE_SPACE RESERVE_SIZE_MB=$R if check_tool_work_ok; then vtdebug "check tool work ok" else - vterr "Some tools can not run in current system. Please check log.txt for detail." + vterr "Some tools can not run on current system. Please check log.txt for details." exit 1 fi @@ -160,14 +160,14 @@ if [ -d ./tmp_mnt ]; then umount ./tmp_mnt >/dev/null 2>&1 rm -rf ./tmp_mnt if [ -d ./tmp_mnt ]; then - vterr "tmp_mnt directory exit, please delete it first." + vterr "tmp_mnt directory exits, please delete it first." exit 1 fi fi if [ "$MODE" = "install" ]; then - vtdebug "install ventoy ..." + vtdebug "install Ventoy ..." if [ -n "$VTGPT" ]; then if parted -v > /dev/null 2>&1; then @@ -193,7 +193,7 @@ if [ "$MODE" = "install" ]; then if [ -z "$FORCE" ]; then vtwarn "$DISK already contains a Ventoy with version $version" vtwarn "Use -u option to do a safe upgrade operation." - vtwarn "OR if you really want to reinstall ventoy to $DISK, please use -I option." + vtwarn "OR if you really want to reinstall Ventoy to $DISK, please use -I option." vtwarn "" exit 1 fi @@ -366,11 +366,11 @@ if [ "$MODE" = "install" ]; then echo "" else - vtdebug "update ventoy ..." + vtdebug "update Ventoy ..." oldver=$(get_disk_ventoy_version $DISK) if [ $? -ne 0 ]; then - vtwarn "$DISK does not contain ventoy or data corupted" + vtwarn "$DISK does not contain Ventoy or data corrupted" echo "" vtwarn "Please use -i option if you want to install ventoy to $DISK" echo "" @@ -481,7 +481,7 @@ else fi echo "" - vtinfo "Update Ventoy to $DISK successfully finished." + vtinfo "Update Ventoy on $DISK successfully finished." echo "" fi diff --git a/Ventoy2Disk/Ventoy2Disk/Language.c b/Ventoy2Disk/Ventoy2Disk/Language.c index 6bc75d69..e8a97124 100644 --- a/Ventoy2Disk/Ventoy2Disk/Language.c +++ b/Ventoy2Disk/Ventoy2Disk/Language.c @@ -26,3 +26,13 @@ const TCHAR * GetString(enum STR_ID ID) { return g_cur_lang_data->MsgString[ID]; }; + +static const UINT16 g_unicode_icon[UNICODE_BUTT][3] = +{ + { 0xD83D, 0xDD12, 0x0000 }, +}; + +const UINT16 * GetUnicodeIcon(icon) +{ + return g_unicode_icon[icon]; +} diff --git a/Ventoy2Disk/Ventoy2Disk/Language.h b/Ventoy2Disk/Ventoy2Disk/Language.h index 41329960..144a9b23 100644 --- a/Ventoy2Disk/Ventoy2Disk/Language.h +++ b/Ventoy2Disk/Ventoy2Disk/Language.h @@ -125,4 +125,13 @@ const TCHAR * GetString(enum STR_ID ID); #define _G(a) GetString(a) +typedef enum UNICODE_ICON +{ + UNICODE_LOCK = 0, + UNICODE_BUTT +}UNICODE_ICON; + +const UINT16 * GetUnicodeIcon(icon); +#define _UICON(i) GetUnicodeIcon(i) + #endif diff --git a/Ventoy2Disk/Ventoy2Disk/PhyDrive.c b/Ventoy2Disk/Ventoy2Disk/PhyDrive.c index b863bb17..76816933 100644 --- a/Ventoy2Disk/Ventoy2Disk/PhyDrive.c +++ b/Ventoy2Disk/Ventoy2Disk/PhyDrive.c @@ -1693,7 +1693,7 @@ int InstallVentoy2PhyDrive(PHY_DRIVE_INFO *pPhyDrive, int PartStyle) } PROGRESS_BAR_SET_POS(PT_WRITE_STG1_IMG); - Log("Writting Boot Image ............................. "); + Log("Writing Boot Image ............................. "); if (WriteGrubStage1ToPhyDrive(hDrive, PartStyle) != 0) { Log("WriteGrubStage1ToPhyDrive failed."); @@ -1702,7 +1702,7 @@ int InstallVentoy2PhyDrive(PHY_DRIVE_INFO *pPhyDrive, int PartStyle) } PROGRESS_BAR_SET_POS(PT_WRITE_PART_TABLE); - Log("Writting Partition Table ........................ "); + Log("Writing Partition Table ........................ "); SetFilePointer(hDrive, 0, NULL, FILE_BEGIN); if (PartStyle) diff --git a/Ventoy2Disk/Ventoy2Disk/Ventoy2Disk.h b/Ventoy2Disk/Ventoy2Disk/Ventoy2Disk.h index d615e2ab..b9a84db4 100644 --- a/Ventoy2Disk/Ventoy2Disk/Ventoy2Disk.h +++ b/Ventoy2Disk/Ventoy2Disk/Ventoy2Disk.h @@ -231,6 +231,6 @@ UINT32 VentoyCrc32(void *Buffer, UINT32 Length); liCurrentPosition.QuadPart = pos; \ SetFilePointerEx(hDrive, liCurrentPosition, &liCurrentPosition, FILE_BEGIN)\ -#define SECURE_ICON_STRING "*" +#define SECURE_ICON_STRING _UICON(UNICODE_LOCK) #endif diff --git a/Ventoy2Disk/Ventoy2Disk/Ventoy2Disk.rc b/Ventoy2Disk/Ventoy2Disk/Ventoy2Disk.rc index bb68eb2207377d0ee1c623303b081a4a58cc4282..a5db5c6d5a8065114556d84bcfcede01fa8cc1fb 100644 GIT binary patch delta 32 ncmX>Te@(Y2(SWWUQEh{LR;8z6t>Vt}Y5$ delta 32 ncmX>Te@(Y2(SWWUQEh{LR;8z6t>Vtx^g} diff --git a/Ventoy2Disk/Ventoy2Disk/WinDialog.c b/Ventoy2Disk/Ventoy2Disk/WinDialog.c index 98613fbab6771d86be7fe24e6929a7c8a2326fdc..bec810e8cc5bcea12f86cd4574367a229fe9a688 100644 GIT binary patch delta 185 zcmZ4Ullj9><_*hqC)ariP5#iyHMy@>Z1OGLG%!EGSP97Xne3OQHTiM0t19JVlZVe-OT*)EjIwLJTBn?