1. change icon from * to a lock icon

2. typo correct
3. misc update
This commit is contained in:
longpanda 2021-02-27 10:37:40 +08:00
parent 08634fba9f
commit 7b08954e57
9 changed files with 34 additions and 15 deletions

Binary file not shown.

View File

@ -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}"

View File

@ -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

View File

@ -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];
}

View File

@ -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

View File

@ -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)

View File

@ -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

Binary file not shown.