mirror of
https://github.com/ventoy/Ventoy.git
synced 2024-11-09 19:11:02 +00:00
Remove VTOY_HELP_TXT_LANGUAGE option from Global Control Plugin.
This commit is contained in:
parent
c896c03efe
commit
194e948cb6
@ -3549,7 +3549,11 @@ grub_err_t ventoy_cmd_cur_menu_lang(grub_extcmd_context_t ctxt, int argc, char *
|
|||||||
{
|
{
|
||||||
(void)ctxt;
|
(void)ctxt;
|
||||||
(void)argc;
|
(void)argc;
|
||||||
(void)args;
|
|
||||||
|
if (argc > 0)
|
||||||
|
{
|
||||||
|
grub_env_set(args[0], g_cur_menu_language);
|
||||||
|
}
|
||||||
|
|
||||||
grub_printf("%s\n", g_cur_menu_language);
|
grub_printf("%s\n", g_cur_menu_language);
|
||||||
grub_printf("%s\n", g_ventoy_hotkey_tip);
|
grub_printf("%s\n", g_ventoy_hotkey_tip);
|
||||||
|
@ -103,8 +103,9 @@ function ventoy_show_help {
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
loopback vt_help_tarfs mem:${vtoy_help_txt_mem_addr}:size:${vtoy_help_txt_mem_size}
|
loopback vt_help_tarfs mem:${vtoy_help_txt_mem_addr}:size:${vtoy_help_txt_mem_size}
|
||||||
if [ -f "(vt_help_tarfs)/help/${VTOY_HELP_TXT_LANGUAGE}.txt" ]; then
|
vt_cur_menu_lang vtCurLang
|
||||||
cat "(vt_help_tarfs)/help/${VTOY_HELP_TXT_LANGUAGE}.txt"
|
if [ -f "(vt_help_tarfs)/help/${vtCurLang}.txt" ]; then
|
||||||
|
cat "(vt_help_tarfs)/help/${vtCurLang}.txt"
|
||||||
else
|
else
|
||||||
cat "(vt_help_tarfs)/help/en_US.txt"
|
cat "(vt_help_tarfs)/help/en_US.txt"
|
||||||
fi
|
fi
|
||||||
|
@ -221,6 +221,7 @@ cp $OPT VentoyVlnk.exe $tmpdir/
|
|||||||
cp $OPT FOR_X64_ARM.txt $tmpdir/
|
cp $OPT FOR_X64_ARM.txt $tmpdir/
|
||||||
mkdir -p $tmpdir/altexe
|
mkdir -p $tmpdir/altexe
|
||||||
cp $OPT Ventoy2Disk_*.exe $tmpdir/altexe/
|
cp $OPT Ventoy2Disk_*.exe $tmpdir/altexe/
|
||||||
|
cp $OPT VentoyPlugson_*.exe $tmpdir/altexe/
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@ -13,6 +13,11 @@ if [ ! -f ./vs/VentoyPlugson/Release/VentoyPlugson.exe ]; then
|
|||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if [ ! -f ./vs/VentoyPlugson/x64/Release/VentoyPlugson_X64.exe ]; then
|
||||||
|
echo "NO VentoyPlugson_X64.exe found"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
if [ -f ./www.tar.xz ]; then
|
if [ -f ./www.tar.xz ]; then
|
||||||
rm -f ./www.tar.xz
|
rm -f ./www.tar.xz
|
||||||
fi
|
fi
|
||||||
@ -33,6 +38,10 @@ xz --check=crc32 www.tar
|
|||||||
rm -f ../INSTALL/VentoyPlugson.exe
|
rm -f ../INSTALL/VentoyPlugson.exe
|
||||||
cp -a ./vs/VentoyPlugson/Release/VentoyPlugson.exe ../INSTALL/VentoyPlugson.exe
|
cp -a ./vs/VentoyPlugson/Release/VentoyPlugson.exe ../INSTALL/VentoyPlugson.exe
|
||||||
|
|
||||||
|
rm -f ../INSTALL/VentoyPlugson_X64.exe
|
||||||
|
cp -a ./vs/VentoyPlugson/x64/Release/VentoyPlugson_X64.exe ../INSTALL/VentoyPlugson_X64.exe
|
||||||
|
|
||||||
|
|
||||||
rm -f ../INSTALL/tool/plugson.tar.xz
|
rm -f ../INSTALL/tool/plugson.tar.xz
|
||||||
mv ./www.tar.xz ../INSTALL/tool/plugson.tar.xz
|
mv ./www.tar.xz ../INSTALL/tool/plugson.tar.xz
|
||||||
|
|
||||||
|
@ -425,7 +425,7 @@ int vtoy_json_parse(VTOY_JSON *pstJson, const char *szJsonData)
|
|||||||
char *pcNewBuf = NULL;
|
char *pcNewBuf = NULL;
|
||||||
const char *pcEnd = NULL;
|
const char *pcEnd = NULL;
|
||||||
|
|
||||||
uiMemSize = strlen(szJsonData) + 1;
|
uiMemSize = (uint32_t)strlen(szJsonData) + 1;
|
||||||
pcNewBuf = (char *)malloc(uiMemSize);
|
pcNewBuf = (char *)malloc(uiMemSize);
|
||||||
if (NULL == pcNewBuf)
|
if (NULL == pcNewBuf)
|
||||||
{
|
{
|
||||||
|
@ -71,7 +71,6 @@ static const char *g_plugin_name[plugin_type_max] =
|
|||||||
"auto_memdisk", "dud"
|
"auto_memdisk", "dud"
|
||||||
};
|
};
|
||||||
|
|
||||||
static char g_ventoy_help_lang[MAX_LANGUAGE][8];
|
|
||||||
static char g_ventoy_menu_lang[MAX_LANGUAGE][8];
|
static char g_ventoy_menu_lang[MAX_LANGUAGE][8];
|
||||||
|
|
||||||
static char g_pub_path[2 * MAX_PATH];
|
static char g_pub_path[2 * MAX_PATH];
|
||||||
@ -522,7 +521,6 @@ void ventoy_data_default_control(data_control *data)
|
|||||||
data->secondary_menu_timeout = 0;
|
data->secondary_menu_timeout = 0;
|
||||||
|
|
||||||
strlcpy(data->default_kbd_layout, "QWERTY_USA");
|
strlcpy(data->default_kbd_layout, "QWERTY_USA");
|
||||||
strlcpy(data->help_text_language, "en_US");
|
|
||||||
strlcpy(data->menu_language, "en_US");
|
strlcpy(data->menu_language, "en_US");
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -553,7 +551,6 @@ int ventoy_data_cmp_control(data_control *data1, data_control *data2)
|
|||||||
if (strcmp(data1->default_search_root, data2->default_search_root) ||
|
if (strcmp(data1->default_search_root, data2->default_search_root) ||
|
||||||
strcmp(data1->default_image, data2->default_image) ||
|
strcmp(data1->default_image, data2->default_image) ||
|
||||||
strcmp(data1->default_kbd_layout, data2->default_kbd_layout) ||
|
strcmp(data1->default_kbd_layout, data2->default_kbd_layout) ||
|
||||||
strcmp(data1->help_text_language, data2->help_text_language) ||
|
|
||||||
strcmp(data1->menu_language, data2->menu_language))
|
strcmp(data1->menu_language, data2->menu_language))
|
||||||
{
|
{
|
||||||
return 1;
|
return 1;
|
||||||
@ -597,7 +594,6 @@ int ventoy_data_save_control(data_control *data, const char *title, char *buf, i
|
|||||||
VTOY_JSON_FMT_CTRL_INT(L2, "VTOY_SECONDARY_TIMEOUT", secondary_menu_timeout);
|
VTOY_JSON_FMT_CTRL_INT(L2, "VTOY_SECONDARY_TIMEOUT", secondary_menu_timeout);
|
||||||
|
|
||||||
VTOY_JSON_FMT_CTRL_STRN(L2, "VTOY_DEFAULT_KBD_LAYOUT", default_kbd_layout);
|
VTOY_JSON_FMT_CTRL_STRN(L2, "VTOY_DEFAULT_KBD_LAYOUT", default_kbd_layout);
|
||||||
VTOY_JSON_FMT_CTRL_STRN(L2, "VTOY_HELP_TXT_LANGUAGE", help_text_language);
|
|
||||||
VTOY_JSON_FMT_CTRL_STRN(L2, "VTOY_MENU_LANGUAGE", menu_language);
|
VTOY_JSON_FMT_CTRL_STRN(L2, "VTOY_MENU_LANGUAGE", menu_language);
|
||||||
|
|
||||||
if (strcmp(def->default_search_root, data->default_search_root))
|
if (strcmp(def->default_search_root, data->default_search_root))
|
||||||
@ -645,7 +641,6 @@ int ventoy_data_json_control(data_control *ctrl, char *buf, int buflen)
|
|||||||
VTOY_JSON_FMT_SINT("menu_timeout", ctrl->menu_timeout);
|
VTOY_JSON_FMT_SINT("menu_timeout", ctrl->menu_timeout);
|
||||||
VTOY_JSON_FMT_SINT("secondary_menu_timeout", ctrl->secondary_menu_timeout);
|
VTOY_JSON_FMT_SINT("secondary_menu_timeout", ctrl->secondary_menu_timeout);
|
||||||
VTOY_JSON_FMT_STRN("default_kbd_layout", ctrl->default_kbd_layout);
|
VTOY_JSON_FMT_STRN("default_kbd_layout", ctrl->default_kbd_layout);
|
||||||
VTOY_JSON_FMT_STRN("help_text_language", ctrl->help_text_language);
|
|
||||||
VTOY_JSON_FMT_STRN("menu_language", ctrl->menu_language);
|
VTOY_JSON_FMT_STRN("menu_language", ctrl->menu_language);
|
||||||
|
|
||||||
valid = 0;
|
valid = 0;
|
||||||
@ -665,15 +660,6 @@ int ventoy_data_json_control(data_control *ctrl, char *buf, int buflen)
|
|||||||
VTOY_JSON_FMT_STRN("default_image", ctrl->default_image);
|
VTOY_JSON_FMT_STRN("default_image", ctrl->default_image);
|
||||||
VTOY_JSON_FMT_SINT("default_image_valid", valid);
|
VTOY_JSON_FMT_SINT("default_image_valid", valid);
|
||||||
|
|
||||||
VTOY_JSON_FMT_KEY("help_list");
|
|
||||||
VTOY_JSON_FMT_ARY_BEGIN();
|
|
||||||
|
|
||||||
for (i = 0; g_ventoy_help_lang[i][0]; i++)
|
|
||||||
{
|
|
||||||
VTOY_JSON_FMT_ITEM(g_ventoy_help_lang[i]);
|
|
||||||
}
|
|
||||||
VTOY_JSON_FMT_ARY_ENDEX();
|
|
||||||
|
|
||||||
VTOY_JSON_FMT_KEY("menu_list");
|
VTOY_JSON_FMT_KEY("menu_list");
|
||||||
VTOY_JSON_FMT_ARY_BEGIN();
|
VTOY_JSON_FMT_ARY_BEGIN();
|
||||||
|
|
||||||
@ -725,7 +711,6 @@ static int ventoy_api_save_control(struct mg_connection *conn, VTOY_JSON *json)
|
|||||||
|
|
||||||
VTOY_JSON_STR("default_image", ctrl->default_image);
|
VTOY_JSON_STR("default_image", ctrl->default_image);
|
||||||
VTOY_JSON_STR("default_search_root", ctrl->default_search_root);
|
VTOY_JSON_STR("default_search_root", ctrl->default_search_root);
|
||||||
VTOY_JSON_STR("help_text_language", ctrl->help_text_language);
|
|
||||||
VTOY_JSON_STR("menu_language", ctrl->menu_language);
|
VTOY_JSON_STR("menu_language", ctrl->menu_language);
|
||||||
VTOY_JSON_STR("default_kbd_layout", ctrl->default_kbd_layout);
|
VTOY_JSON_STR("default_kbd_layout", ctrl->default_kbd_layout);
|
||||||
|
|
||||||
@ -3706,7 +3691,7 @@ static int ventoy_api_preview_json(struct mg_connection *conn, VTOY_JSON *json)
|
|||||||
goto json;
|
goto json;
|
||||||
}
|
}
|
||||||
|
|
||||||
utf16enclen = utf8_to_utf16((unsigned char *)JSON_SAVE_BUFFER, len, utf16buf, len + 2);
|
utf16enclen = (int)utf8_to_utf16((unsigned char *)JSON_SAVE_BUFFER, len, utf16buf, len + 2);
|
||||||
|
|
||||||
encodebuf = (char *)malloc(utf16enclen * 4 + 16);
|
encodebuf = (char *)malloc(utf16enclen * 4 + 16);
|
||||||
if (!encodebuf)
|
if (!encodebuf)
|
||||||
@ -4088,17 +4073,6 @@ static int ventoy_parse_control(VTOY_JSON *json, void *p)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (strcmp(child->pcName, "VTOY_HELP_TXT_LANGUAGE") == 0)
|
|
||||||
{
|
|
||||||
for (i = 0; g_ventoy_help_lang[i][0]; i++)
|
|
||||||
{
|
|
||||||
if (strcmp(child->unData.pcStrVal, g_ventoy_help_lang[i]) == 0)
|
|
||||||
{
|
|
||||||
strlcpy(data->help_text_language, child->unData.pcStrVal);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else if (strcmp(child->pcName, "VTOY_MENU_LANGUAGE") == 0)
|
else if (strcmp(child->pcName, "VTOY_MENU_LANGUAGE") == 0)
|
||||||
{
|
{
|
||||||
for (i = 0; g_ventoy_menu_lang[i][0]; i++)
|
for (i = 0; g_ventoy_menu_lang[i][0]; i++)
|
||||||
@ -5341,19 +5315,6 @@ int ventoy_http_init(void)
|
|||||||
char *Buffer = NULL;
|
char *Buffer = NULL;
|
||||||
int BufLen = 0;
|
int BufLen = 0;
|
||||||
|
|
||||||
ventoy_read_file_to_buf("www/helplist", 4, (void **)&Buffer, &BufLen);
|
|
||||||
if (Buffer)
|
|
||||||
{
|
|
||||||
for (i = 0; i < BufLen / 5; i++)
|
|
||||||
{
|
|
||||||
memcpy(g_ventoy_help_lang[i], Buffer + i * 5, 5);
|
|
||||||
g_ventoy_help_lang[i][5] = 0;
|
|
||||||
}
|
|
||||||
free(Buffer);
|
|
||||||
}
|
|
||||||
|
|
||||||
Buffer = NULL;
|
|
||||||
BufLen = 0;
|
|
||||||
ventoy_read_file_to_buf("www/menulist", 4, (void **)&Buffer, &BufLen);
|
ventoy_read_file_to_buf("www/menulist", 4, (void **)&Buffer, &BufLen);
|
||||||
if (Buffer)
|
if (Buffer)
|
||||||
{
|
{
|
||||||
@ -5366,15 +5327,6 @@ int ventoy_http_init(void)
|
|||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
ventoy_file *file;
|
ventoy_file *file;
|
||||||
file = ventoy_tar_find_file("www/helplist");
|
|
||||||
if (file)
|
|
||||||
{
|
|
||||||
for (i = 0; i < file->size / 5; i++)
|
|
||||||
{
|
|
||||||
memcpy(g_ventoy_help_lang[i], (char *)(file->addr) + i * 5, 5);
|
|
||||||
g_ventoy_help_lang[i][5] = 0;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
file = ventoy_tar_find_file("www/menulist");
|
file = ventoy_tar_find_file("www/menulist");
|
||||||
if (file)
|
if (file)
|
||||||
|
@ -83,7 +83,6 @@ typedef struct data_control
|
|||||||
char default_search_root[MAX_PATH];
|
char default_search_root[MAX_PATH];
|
||||||
char default_image[MAX_PATH];
|
char default_image[MAX_PATH];
|
||||||
char default_kbd_layout[32];
|
char default_kbd_layout[32];
|
||||||
char help_text_language[32];
|
|
||||||
char menu_language[32];
|
char menu_language[32];
|
||||||
}data_control;
|
}data_control;
|
||||||
|
|
||||||
@ -389,7 +388,7 @@ else\
|
|||||||
#define ventoy_parse_json(name) \
|
#define ventoy_parse_json(name) \
|
||||||
{\
|
{\
|
||||||
int __loop;\
|
int __loop;\
|
||||||
int __len = strlen(#name);\
|
int __len = (int)strlen(#name);\
|
||||||
if (strncmp(#name, node->pcName, __len) == 0)\
|
if (strncmp(#name, node->pcName, __len) == 0)\
|
||||||
{\
|
{\
|
||||||
for (__loop = 0; __loop < bios_max; __loop++)\
|
for (__loop = 0; __loop < bios_max; __loop++)\
|
||||||
|
Binary file not shown.
@ -1,22 +1,31 @@
|
|||||||
|
|
||||||
Microsoft Visual Studio Solution File, Format Version 12.00
|
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||||
# Visual Studio 2013
|
# Visual Studio Version 16
|
||||||
VisualStudioVersion = 12.0.21005.1
|
VisualStudioVersion = 16.0.31729.503
|
||||||
MinimumVisualStudioVersion = 10.0.40219.1
|
MinimumVisualStudioVersion = 10.0.40219.1
|
||||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VentoyPlugson", "VentoyPlugson\VentoyPlugson.vcxproj", "{321D6EE2-2AB3-4103-9F05-EC4EC67A75E1}"
|
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VentoyPlugson", "VentoyPlugson\VentoyPlugson.vcxproj", "{321D6EE2-2AB3-4103-9F05-EC4EC67A75E1}"
|
||||||
EndProject
|
EndProject
|
||||||
Global
|
Global
|
||||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||||
Debug|Win32 = Debug|Win32
|
Debug|Win32 = Debug|Win32
|
||||||
|
Debug|x64 = Debug|x64
|
||||||
Release|Win32 = Release|Win32
|
Release|Win32 = Release|Win32
|
||||||
|
Release|x64 = Release|x64
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
||||||
{321D6EE2-2AB3-4103-9F05-EC4EC67A75E1}.Debug|Win32.ActiveCfg = Debug|Win32
|
{321D6EE2-2AB3-4103-9F05-EC4EC67A75E1}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||||
{321D6EE2-2AB3-4103-9F05-EC4EC67A75E1}.Debug|Win32.Build.0 = Debug|Win32
|
{321D6EE2-2AB3-4103-9F05-EC4EC67A75E1}.Debug|Win32.Build.0 = Debug|Win32
|
||||||
|
{321D6EE2-2AB3-4103-9F05-EC4EC67A75E1}.Debug|x64.ActiveCfg = Debug|x64
|
||||||
|
{321D6EE2-2AB3-4103-9F05-EC4EC67A75E1}.Debug|x64.Build.0 = Debug|x64
|
||||||
{321D6EE2-2AB3-4103-9F05-EC4EC67A75E1}.Release|Win32.ActiveCfg = Release|Win32
|
{321D6EE2-2AB3-4103-9F05-EC4EC67A75E1}.Release|Win32.ActiveCfg = Release|Win32
|
||||||
{321D6EE2-2AB3-4103-9F05-EC4EC67A75E1}.Release|Win32.Build.0 = Release|Win32
|
{321D6EE2-2AB3-4103-9F05-EC4EC67A75E1}.Release|Win32.Build.0 = Release|Win32
|
||||||
|
{321D6EE2-2AB3-4103-9F05-EC4EC67A75E1}.Release|x64.ActiveCfg = Release|x64
|
||||||
|
{321D6EE2-2AB3-4103-9F05-EC4EC67A75E1}.Release|x64.Build.0 = Release|x64
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
GlobalSection(SolutionProperties) = preSolution
|
GlobalSection(SolutionProperties) = preSolution
|
||||||
HideSolutionNode = FALSE
|
HideSolutionNode = FALSE
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
|
GlobalSection(ExtensibilityGlobals) = postSolution
|
||||||
|
SolutionGuid = {D15C2D76-198B-4FE5-8232-D57D911FB022}
|
||||||
|
EndGlobalSection
|
||||||
EndGlobal
|
EndGlobal
|
||||||
|
@ -5,10 +5,18 @@
|
|||||||
<Configuration>Debug</Configuration>
|
<Configuration>Debug</Configuration>
|
||||||
<Platform>Win32</Platform>
|
<Platform>Win32</Platform>
|
||||||
</ProjectConfiguration>
|
</ProjectConfiguration>
|
||||||
|
<ProjectConfiguration Include="Debug|x64">
|
||||||
|
<Configuration>Debug</Configuration>
|
||||||
|
<Platform>x64</Platform>
|
||||||
|
</ProjectConfiguration>
|
||||||
<ProjectConfiguration Include="Release|Win32">
|
<ProjectConfiguration Include="Release|Win32">
|
||||||
<Configuration>Release</Configuration>
|
<Configuration>Release</Configuration>
|
||||||
<Platform>Win32</Platform>
|
<Platform>Win32</Platform>
|
||||||
</ProjectConfiguration>
|
</ProjectConfiguration>
|
||||||
|
<ProjectConfiguration Include="Release|x64">
|
||||||
|
<Configuration>Release</Configuration>
|
||||||
|
<Platform>x64</Platform>
|
||||||
|
</ProjectConfiguration>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<PropertyGroup Label="Globals">
|
<PropertyGroup Label="Globals">
|
||||||
<ProjectGuid>{321D6EE2-2AB3-4103-9F05-EC4EC67A75E1}</ProjectGuid>
|
<ProjectGuid>{321D6EE2-2AB3-4103-9F05-EC4EC67A75E1}</ProjectGuid>
|
||||||
@ -23,6 +31,12 @@
|
|||||||
<PlatformToolset>v142</PlatformToolset>
|
<PlatformToolset>v142</PlatformToolset>
|
||||||
<CharacterSet>MultiByte</CharacterSet>
|
<CharacterSet>MultiByte</CharacterSet>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
|
||||||
|
<ConfigurationType>Application</ConfigurationType>
|
||||||
|
<UseDebugLibraries>true</UseDebugLibraries>
|
||||||
|
<PlatformToolset>v142</PlatformToolset>
|
||||||
|
<CharacterSet>MultiByte</CharacterSet>
|
||||||
|
</PropertyGroup>
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
|
||||||
<ConfigurationType>Application</ConfigurationType>
|
<ConfigurationType>Application</ConfigurationType>
|
||||||
<UseDebugLibraries>false</UseDebugLibraries>
|
<UseDebugLibraries>false</UseDebugLibraries>
|
||||||
@ -30,24 +44,46 @@
|
|||||||
<WholeProgramOptimization>true</WholeProgramOptimization>
|
<WholeProgramOptimization>true</WholeProgramOptimization>
|
||||||
<CharacterSet>MultiByte</CharacterSet>
|
<CharacterSet>MultiByte</CharacterSet>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
|
||||||
|
<ConfigurationType>Application</ConfigurationType>
|
||||||
|
<UseDebugLibraries>false</UseDebugLibraries>
|
||||||
|
<PlatformToolset>v142</PlatformToolset>
|
||||||
|
<WholeProgramOptimization>true</WholeProgramOptimization>
|
||||||
|
<CharacterSet>MultiByte</CharacterSet>
|
||||||
|
</PropertyGroup>
|
||||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
||||||
<ImportGroup Label="ExtensionSettings">
|
<ImportGroup Label="ExtensionSettings">
|
||||||
</ImportGroup>
|
</ImportGroup>
|
||||||
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||||
</ImportGroup>
|
</ImportGroup>
|
||||||
|
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
|
||||||
|
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||||
|
</ImportGroup>
|
||||||
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||||
</ImportGroup>
|
</ImportGroup>
|
||||||
|
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
|
||||||
|
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||||
|
</ImportGroup>
|
||||||
<PropertyGroup Label="UserMacros" />
|
<PropertyGroup Label="UserMacros" />
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||||
<LinkIncremental>true</LinkIncremental>
|
<LinkIncremental>true</LinkIncremental>
|
||||||
<IncludePath>..\..\..\src\Core;..\..\..\src\Web;..\..\..\src\Include;..\..\..\src\Lib\xz-embedded\linux\include;..\..\..\src\Lib\xz-embedded\linux\include\linux;..\..\..\src\Lib\xz-embedded\userspace;..\..\..\src\Lib\fat_io_lib;..\..\..\src\Lib\libhttp\include;$(ProjectDir);$(IncludePath)</IncludePath>
|
<IncludePath>..\..\..\src\Core;..\..\..\src\Web;..\..\..\src\Include;..\..\..\src\Lib\xz-embedded\linux\include;..\..\..\src\Lib\xz-embedded\linux\include\linux;..\..\..\src\Lib\xz-embedded\userspace;..\..\..\src\Lib\fat_io_lib;..\..\..\src\Lib\libhttp\include;$(ProjectDir);$(IncludePath)</IncludePath>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||||
|
<LinkIncremental>true</LinkIncremental>
|
||||||
|
<IncludePath>..\..\..\src\Core;..\..\..\src\Web;..\..\..\src\Include;..\..\..\src\Lib\xz-embedded\linux\include;..\..\..\src\Lib\xz-embedded\linux\include\linux;..\..\..\src\Lib\xz-embedded\userspace;..\..\..\src\Lib\fat_io_lib;..\..\..\src\Lib\libhttp\include;$(ProjectDir);$(IncludePath)</IncludePath>
|
||||||
|
</PropertyGroup>
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||||
<LinkIncremental>false</LinkIncremental>
|
<LinkIncremental>false</LinkIncremental>
|
||||||
<IncludePath>..\..\..\src\Core;..\..\..\src\Web;..\..\..\src\Include;..\..\..\src\Lib\xz-embedded\linux\include;..\..\..\src\Lib\xz-embedded\linux\include\linux;..\..\..\src\Lib\xz-embedded\userspace;..\..\..\src\Lib\fat_io_lib;..\..\..\src\Lib\libhttp\include;$(ProjectDir);$(IncludePath);$(VC_IncludePath);$(WindowsSDK_IncludePath)</IncludePath>
|
<IncludePath>..\..\..\src\Core;..\..\..\src\Web;..\..\..\src\Include;..\..\..\src\Lib\xz-embedded\linux\include;..\..\..\src\Lib\xz-embedded\linux\include\linux;..\..\..\src\Lib\xz-embedded\userspace;..\..\..\src\Lib\fat_io_lib;..\..\..\src\Lib\libhttp\include;$(ProjectDir);$(IncludePath);$(VC_IncludePath);$(WindowsSDK_IncludePath)</IncludePath>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||||
|
<LinkIncremental>false</LinkIncremental>
|
||||||
|
<IncludePath>..\..\..\src\Core;..\..\..\src\Web;..\..\..\src\Include;..\..\..\src\Lib\xz-embedded\linux\include;..\..\..\src\Lib\xz-embedded\linux\include\linux;..\..\..\src\Lib\xz-embedded\userspace;..\..\..\src\Lib\fat_io_lib;..\..\..\src\Lib\libhttp\include;$(ProjectDir);$(IncludePath);$(VC_IncludePath);$(WindowsSDK_IncludePath)</IncludePath>
|
||||||
|
<TargetName>VentoyPlugson_X64</TargetName>
|
||||||
|
</PropertyGroup>
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||||
<ClCompile>
|
<ClCompile>
|
||||||
<PrecompiledHeader>
|
<PrecompiledHeader>
|
||||||
@ -68,6 +104,26 @@
|
|||||||
<AdditionalManifestFiles>$(ProjectDir)\Res\Plugson32.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
|
<AdditionalManifestFiles>$(ProjectDir)\Res\Plugson32.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
|
||||||
</Manifest>
|
</Manifest>
|
||||||
</ItemDefinitionGroup>
|
</ItemDefinitionGroup>
|
||||||
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||||
|
<ClCompile>
|
||||||
|
<PrecompiledHeader>
|
||||||
|
</PrecompiledHeader>
|
||||||
|
<WarningLevel>Level3</WarningLevel>
|
||||||
|
<Optimization>Disabled</Optimization>
|
||||||
|
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;INIT;STATIC=static;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
|
<SDLCheck>true</SDLCheck>
|
||||||
|
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
|
||||||
|
</ClCompile>
|
||||||
|
<Link>
|
||||||
|
<SubSystem>Windows</SubSystem>
|
||||||
|
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||||
|
<UACExecutionLevel>RequireAdministrator</UACExecutionLevel>
|
||||||
|
<DelayLoadDLLs>gdi32.dll;winspool.dll;comdlg32.dll;advapi32.dll;shell32.dll;ole32.dll;oleaut32.dll;uuid.dll;odbc32.dll;odbccp32.dll</DelayLoadDLLs>
|
||||||
|
</Link>
|
||||||
|
<Manifest>
|
||||||
|
<AdditionalManifestFiles>$(ProjectDir)\Res\Plugson32.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
|
||||||
|
</Manifest>
|
||||||
|
</ItemDefinitionGroup>
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||||
<ClCompile>
|
<ClCompile>
|
||||||
<WarningLevel>Level3</WarningLevel>
|
<WarningLevel>Level3</WarningLevel>
|
||||||
@ -92,6 +148,30 @@
|
|||||||
<AdditionalManifestFiles>$(ProjectDir)\Res\Plugson32.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
|
<AdditionalManifestFiles>$(ProjectDir)\Res\Plugson32.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
|
||||||
</Manifest>
|
</Manifest>
|
||||||
</ItemDefinitionGroup>
|
</ItemDefinitionGroup>
|
||||||
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||||
|
<ClCompile>
|
||||||
|
<WarningLevel>Level3</WarningLevel>
|
||||||
|
<PrecompiledHeader>
|
||||||
|
</PrecompiledHeader>
|
||||||
|
<Optimization>MaxSpeed</Optimization>
|
||||||
|
<FunctionLevelLinking>true</FunctionLevelLinking>
|
||||||
|
<IntrinsicFunctions>true</IntrinsicFunctions>
|
||||||
|
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;INIT;STATIC=static;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
|
<SDLCheck>true</SDLCheck>
|
||||||
|
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
|
||||||
|
</ClCompile>
|
||||||
|
<Link>
|
||||||
|
<SubSystem>Windows</SubSystem>
|
||||||
|
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||||
|
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
||||||
|
<OptimizeReferences>true</OptimizeReferences>
|
||||||
|
<UACExecutionLevel>RequireAdministrator</UACExecutionLevel>
|
||||||
|
<DelayLoadDLLs>gdi32.dll;winspool.dll;comdlg32.dll;advapi32.dll;shell32.dll;ole32.dll;oleaut32.dll;uuid.dll;odbc32.dll;odbccp32.dll</DelayLoadDLLs>
|
||||||
|
</Link>
|
||||||
|
<Manifest>
|
||||||
|
<AdditionalManifestFiles>$(ProjectDir)\Res\Plugson32.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
|
||||||
|
</Manifest>
|
||||||
|
</ItemDefinitionGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ClCompile Include="..\..\..\src\Core\ventoy_crc32.c" />
|
<ClCompile Include="..\..\..\src\Core\ventoy_crc32.c" />
|
||||||
<ClCompile Include="..\..\..\src\Core\ventoy_disk.c" />
|
<ClCompile Include="..\..\..\src\Core\ventoy_disk.c" />
|
||||||
|
@ -6,8 +6,17 @@
|
|||||||
<LocalDebuggerCommandArguments>
|
<LocalDebuggerCommandArguments>
|
||||||
</LocalDebuggerCommandArguments>
|
</LocalDebuggerCommandArguments>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||||
|
<LocalDebuggerWorkingDirectory>E:\</LocalDebuggerWorkingDirectory>
|
||||||
|
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
|
||||||
|
<LocalDebuggerCommandArguments />
|
||||||
|
</PropertyGroup>
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||||
<LocalDebuggerWorkingDirectory>E:\</LocalDebuggerWorkingDirectory>
|
<LocalDebuggerWorkingDirectory>E:\</LocalDebuggerWorkingDirectory>
|
||||||
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
|
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||||
|
<LocalDebuggerWorkingDirectory>E:\</LocalDebuggerWorkingDirectory>
|
||||||
|
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
|
||||||
|
</PropertyGroup>
|
||||||
</Project>
|
</Project>
|
BIN
Plugson/vs/VentoyPlugson/x64/Release/VentoyPlugson_X64.exe
Normal file
BIN
Plugson/vs/VentoyPlugson/x64/Release/VentoyPlugson_X64.exe
Normal file
Binary file not shown.
@ -1032,43 +1032,6 @@
|
|||||||
</div><!-- /.box -->
|
</div><!-- /.box -->
|
||||||
|
|
||||||
|
|
||||||
<div class="box box-primary box-solid">
|
|
||||||
<div class="box-header with-border">
|
|
||||||
<h3 class="box-title" style="font-size: 14px;font-weight: bold;">VTOY_HELP_TXT_LANGUAGE
|
|
||||||
<span id="id_span_desc_cn"> —— 帮助信息语言</span></h3>
|
|
||||||
<div class="box-tools pull-right">
|
|
||||||
<button class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
|
|
||||||
</div><!-- /.box-tools -->
|
|
||||||
</div><!-- /.box-header -->
|
|
||||||
<div class="box-body no-padding">
|
|
||||||
<table class="table table-bordered no-padding">
|
|
||||||
<tr style="font-weight:bold;">
|
|
||||||
<td class="td_ctrl_col" id="td_title_setting">选项设置</td>
|
|
||||||
<td>
|
|
||||||
<select id="id_ctrl_sel_help_lang" name="name_ctrl_sel_help_lang" class="form-control">
|
|
||||||
|
|
||||||
</select>
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
<tr id="tr_title_desc_cn">
|
|
||||||
<td class="td_ctrl_col">选项说明</td>
|
|
||||||
<td>
|
|
||||||
快捷键 <code>h</code> 显示的帮助信息的语言版本。默认是 "en_US"。
|
|
||||||
具体请参考 <a target="_blank" href='https://www.ventoy.net/cn/plugin_control.html#vtoy_help_language'>Ventoy 帮助信息</a>
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
<tr id="tr_title_desc_en">
|
|
||||||
<td class="td_ctrl_col">Option Description</td>
|
|
||||||
<td>
|
|
||||||
The language of the help text when press <code>h</code>. Default is "en_US",
|
|
||||||
refer <a target="_blank" href='https://www.ventoy.net/en/plugin_control.html#vtoy_help_language'>Ventoy Help Text</a> for details.
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
</table>
|
|
||||||
</div><!-- /.box-body -->
|
|
||||||
</div><!-- /.box -->
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@ -1127,7 +1090,6 @@
|
|||||||
data.filter_vhd = parseInt($('input:radio[name=id_ctrl_radio_filt_vhd]:checked').val());
|
data.filter_vhd = parseInt($('input:radio[name=id_ctrl_radio_filt_vhd]:checked').val());
|
||||||
data.filter_vtoy = parseInt($('input:radio[name=id_ctrl_radio_filt_vtoy]:checked').val());
|
data.filter_vtoy = parseInt($('input:radio[name=id_ctrl_radio_filt_vtoy]:checked').val());
|
||||||
|
|
||||||
data.help_text_language = $('select[id=id_ctrl_sel_help_lang').val();
|
|
||||||
data.menu_language = $('select[id=id_ctrl_sel_menu_lang').val();
|
data.menu_language = $('select[id=id_ctrl_sel_menu_lang').val();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1220,17 +1182,6 @@
|
|||||||
//VTOY_FILE_FLT_VTOY
|
//VTOY_FILE_FLT_VTOY
|
||||||
$('input:radio[name=id_ctrl_radio_filt_vtoy]')[data.filter_vtoy].checked = true;
|
$('input:radio[name=id_ctrl_radio_filt_vtoy]')[data.filter_vtoy].checked = true;
|
||||||
|
|
||||||
//VTOY_HELP_TXT_LANGUAGE
|
|
||||||
if ($("select[id=id_ctrl_sel_help_lang")[0].options.length === 0)
|
|
||||||
{
|
|
||||||
for (var i = 0; i < data.help_list.length; i++) {
|
|
||||||
var hlang = data.help_list[i];
|
|
||||||
var opt = '<option title="'+hlang+'">'+hlang+'</option>';
|
|
||||||
$('select[id=id_ctrl_sel_help_lang').append(opt);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
$('select[id=id_ctrl_sel_help_lang').val(data.help_text_language);
|
|
||||||
|
|
||||||
//VTOY_MENU_LANGUAGE
|
//VTOY_MENU_LANGUAGE
|
||||||
if ($("select[id=id_ctrl_sel_menu_lang")[0].options.length === 0)
|
if ($("select[id=id_ctrl_sel_menu_lang")[0].options.length === 0)
|
||||||
{
|
{
|
||||||
@ -1271,7 +1222,6 @@
|
|||||||
filter_img: data.filter_img,
|
filter_img: data.filter_img,
|
||||||
filter_vhd: data.filter_vhd,
|
filter_vhd: data.filter_vhd,
|
||||||
filter_vtoy: data.filter_vtoy,
|
filter_vtoy: data.filter_vtoy,
|
||||||
help_text_language: data.help_text_language,
|
|
||||||
menu_language: data.menu_language
|
menu_language: data.menu_language
|
||||||
}, function(e) {
|
}, function(e) {
|
||||||
Message.success(g_vtoy_cur_language.STR_SAVE_SUCCESS);
|
Message.success(g_vtoy_cur_language.STR_SAVE_SUCCESS);
|
||||||
@ -1376,7 +1326,6 @@
|
|||||||
});
|
});
|
||||||
$('select[id=id_ctrl_sel_max_depth]').change(VtoySaveCurrentPage);
|
$('select[id=id_ctrl_sel_max_depth]').change(VtoySaveCurrentPage);
|
||||||
$('select[id=id_ctrl_sel_kbd]').change(VtoySaveCurrentPage);
|
$('select[id=id_ctrl_sel_kbd]').change(VtoySaveCurrentPage);
|
||||||
$('select[id=id_ctrl_sel_help_lang]').change(VtoySaveCurrentPage);
|
|
||||||
$('select[id=id_ctrl_sel_menu_lang]').change(VtoySaveCurrentPage);
|
$('select[id=id_ctrl_sel_menu_lang]').change(VtoySaveCurrentPage);
|
||||||
$('input[id=id_ctrl_text_timeout]').change(function() {
|
$('input[id=id_ctrl_text_timeout]').change(function() {
|
||||||
var value = $('input:text[id=id_ctrl_text_timeout]').val();
|
var value = $('input:text[id=id_ctrl_text_timeout]').val();
|
||||||
|
Loading…
Reference in New Issue
Block a user