vasilito/hiperiso
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: GUI build and web asset renaming

Browse Source 
Qt5 .pro file:
- Replace hardcoded /home/panda/ paths with $$PWD-relative paths
- All SOURCES/HEADERS/FORMS/INCLUDEPATH use $$PWD for shadow build safety
- Fixes qmake path resolution from any working directory

QT source content:
- Rename Ventoy2DiskWindow → Hiperiso2DiskWindow (class, UI, translation context)
- Rename VTOY_* macros → HISO_* (JSON_FMT, DEVICE_USB, EFI_PART_BYTES)
- Rename vtoydata → hisodata (struct field)
- Zero Ventoy/ventoy/VTOY/vtoy references remain in QT source

Plugson www and assets/webui:
- Rename all ventoy/vtoy → hiperiso/hiso in HTML, JS, CSS
- Fix critical AJAX endpoint mismatch: /vtoy/json → /hiso/json
  (C backend already used /hiso/json, JS was stale)

Build artifacts cleanup:
- Remove stale QT/build/ and .pro.user from git
- Add to .gitignore

Verified: Full build_gui_all.sh succeeds — Qt5 (199K), GTK3 (383K),
WebUI (247K), Plugson (245K), hisocli (52K), hisolnk (18K)
This commit is contained in:
vasilito
2026-06-30 15:59:38 +03:00
parent 025ae2701c
commit 759ccf30dd
40 changed files with 2918 additions and 3867 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
+3
View File
@@ -27,3 +27,6 @@ Thumbs.db
*~
*.swp
*.swo
*.pro.user
src/gui/QT/build/
src/gui/QT/build_output/
assets/webui/index.html
+310 -310
View File
File diff suppressed because it is too large Load Diff
assets/webui/static/css/vtoy.css
+11 -11
View File
@@ -141,15 +141,15 @@
}
}
/*vtoy server is running*/
#vtoy-main .loading {
/*hiso server is running*/
#hiso-main .loading {
width: 100%;
position: relative;
top:0;
left:0;
background-color: rgba(0, 0, 0, 0);
}
#vtoy-main .loading .title {
#hiso-main .loading .title {
width: 300px;
text-align: center;
margin: 250px auto 0px;
@@ -157,19 +157,19 @@
font-weight: 900;
font-size: 24px;
}
#vtoy-main .loading .rectbox {
#hiso-main .loading .rectbox {
width: 120px;
height: 40px;
margin: 10px auto;
}
#vtoy-main .loading .rectbox .title {
#hiso-main .loading .rectbox .title {
font-size: 14px;
font-family: 'Microsoft YaHei';
font-weight: 900;
text-align: center;
color: rgba(68, 149, 57, 1);
}
#vtoy-main .loading .rectbox .rect {
#hiso-main .loading .rectbox .rect {
width: 25px;
height: 25px;
background-color: rgba(68, 149, 57, 1);
@@ -179,34 +179,34 @@
-o-animation: loading 0.48s infinite ease-in-out;
animation: loading 0.48s infinite ease-in-out;
}
#vtoy-main .loading .rectbox .rect1 {
#hiso-main .loading .rectbox .rect1 {
-webkit-animation-delay: 0s;
-moz-animation-delay: 0s;
-o-animation-delay: 0s;
animation-delay: 0s;
}
#vtoy-main .loading .rectbox .rect2 {
#hiso-main .loading .rectbox .rect2 {
-webkit-animation-delay: 0.36s;
-moz-animation-delay: 0.12s;
-o-animation-delay: 0.12s;
animation-delay: 0.12s;
background-color: rgba(68, 149, 57, 0.2);
}
#vtoy-main .loading .rectbox .rect3 {
#hiso-main .loading .rectbox .rect3 {
-webkit-animation-delay: 0.72s;
-moz-animation-delay: 0.24s;
-o-animation-delay: 0.24s;
animation-delay: 0.24s;
background-color: rgba(68, 149, 57, 0.4);
}
#vtoy-main .loading .rectbox .rect4 {
#hiso-main .loading .rectbox .rect4 {
-webkit-animation-delay: 1.08s;
-moz-animation-delay: 0.36s;
-o-animation-delay: 0.36s;
animation-delay: 0.36s;
background-color: rgba(68, 149, 57, 0.6);
}
#vtoy-main .loading .rectbox .rect5 {
#hiso-main .loading .rectbox .rect5 {
-webkit-animation-delay: 1.44s;
-moz-animation-delay: 0.48s;
-o-animation-delay: 0.48s;
assets/webui/static/js/jquery.vtoy.alert.js
+5 -5
View File
@@ -46,7 +46,7 @@
alr.html(ahtml); // 复原
alr.find('.ok').removeClass('btn-success').addClass('btn-primary');
if (vtoy_chrome_app_mode == 0) {
if (hiso_chrome_app_mode == 0) {
if (document.body.clientHeight > 400) {
alr.find('.modal-dialog').css("top",((document.body.clientHeight - 400) / 2));
}
@@ -70,7 +70,7 @@
alr.html(ahtml);
alr.find('.ok').removeClass('btn-primary').addClass('btn-success');
alr.find('.cancel').show();
if (vtoy_chrome_app_mode == 0) {
if (hiso_chrome_app_mode == 0) {
if (document.body.clientHeight > 400) {
alr.find('.modal-dialog').css("top",((document.body.clientHeight - 400) / 2));
}
@@ -129,7 +129,7 @@
defaultTime = time;
}
var $proc;
$proc = $("#vtoy_proc");
$proc = $("#hiso_proc");
if('hide' === showOrHide) {
$proc.remove();
} else if ('show' === showOrHide) {
@@ -137,10 +137,10 @@
return;
}
$(document).find(":focus").blur();
$proc = $('<div id="vtoy_proc" class="loading"></div>');
$proc = $('<div id="hiso_proc" class="loading"></div>');
$("body").append($proc);
setTimeout(function() {
$proc.replaceWith('<div id="vtoy_proc" class="loading" style="background-color: rgba(0, 0, 0, 0.2);"><div class="rectbox"><div class="title">DATA</div><div class="rect rect1"></div><div class="rect rect2"></div><div class="rect rect3"></div><div class="rect rect4"></div><div class="rect rect5"></div></div></div>');
$proc.replaceWith('<div id="hiso_proc" class="loading" style="background-color: rgba(0, 0, 0, 0.2);"><div class="rectbox"><div class="title">DATA</div><div class="rect rect1"></div><div class="rect rect2"></div><div class="rect rect3"></div><div class="rect rect4"></div><div class="rect rect5"></div></div></div>');
}, $.isNumeric(time) ? time : 100);
} else {
alert("Modal.process参数必须为show/hide");
assets/webui/static/js/vtoy.js
+28 -28
View File
@@ -1,7 +1,7 @@
// 包装ajax请求
function callVtoy(p1, p2, p3) {
var url = '/vtoy/json';
function callHiso(p1, p2, p3) {
var url = '/hiso/json';
var data = {};
var func = function(data) {};
@@ -19,7 +19,7 @@ function callVtoy(p1, p2, p3) {
func = p3;
}
//vtoy.debug('callVtoy:\t\t\t\t' + JSON.stringify(data));
//hiso.debug('callHiso:\t\t\t\t' + JSON.stringify(data));
$.ajax({
url: url,
type: 'post',
@@ -31,7 +31,7 @@ function callVtoy(p1, p2, p3) {
if(undefined === errorThrown)
{
Message.error(vtoy_cur_language.STR_WEB_REMOTE_ABNORMAL);
Message.error(hiso_cur_language.STR_WEB_REMOTE_ABNORMAL);
}
else if(undefined === errorThrown.length)
{
@@ -46,12 +46,12 @@ function callVtoy(p1, p2, p3) {
{
case 'timeout':
{
Message.error(vtoy_cur_language.STR_WEB_REQUEST_TIMEOUT);
Message.error(hiso_cur_language.STR_WEB_REQUEST_TIMEOUT);
break;
}
case 'Service Unavailable':
{
Message.error(vtoy_cur_language.STR_WEB_SERVICE_UNAVAILABLE);
Message.error(hiso_cur_language.STR_WEB_SERVICE_UNAVAILABLE);
break;
}
case 'abort':
@@ -60,21 +60,21 @@ function callVtoy(p1, p2, p3) {
}
default:
{
Message.error(vtoy_cur_language.STR_WEB_COMMUNICATION_ERR + errorThrown);
Message.error(hiso_cur_language.STR_WEB_COMMUNICATION_ERR + errorThrown);
break;
}
}
}
},
complete: function(data) {
//vtoy.debug('callVtoy\'s resp:\t\t' + data.responseText);
//hiso.debug('callHiso\'s resp:\t\t' + data.responseText);
}
});
}
function callVtoyASyncTimeout(time, data, func) {
function callHisoASyncTimeout(time, data, func) {
$.ajax({
url: '/vtoy/json',
url: '/hiso/json',
type: 'post',
cache: false,
dataType: 'json',
@@ -99,7 +99,7 @@ function callVtoyASyncTimeout(time, data, func) {
{
case 'timeout':
{
callVtoyASyncTimeout(time, data, func);
callHisoASyncTimeout(time, data, func);
break;
}
case 'Service Unavailable':
@@ -118,33 +118,33 @@ function callVtoyASyncTimeout(time, data, func) {
}
},
complete: function(data) {
//vtoy.debug('callVtoyASyncTimeout\'s resp:\t' + JSON.stringify(data));
//hiso.debug('callHisoASyncTimeout\'s resp:\t' + JSON.stringify(data));
}
});
}
function callVtoySync(data, func) {
//vtoy.debug('callVtoySync:\t\t\t' + JSON.stringify(data));
function callHisoSync(data, func) {
//hiso.debug('callHisoSync:\t\t\t' + JSON.stringify(data));
$.ajax({
url: '/vtoy/json',
url: '/hiso/json',
type: 'post',
cache: false,
dataType: 'json',
async: false,
data: JSON.stringify(data),
success: function VtoyCallFuncWrapper(data) {
success: function HisoCallFuncWrapper(data) {
if (data.result === 'tokenerror') {
var titlestr = '<span class="fa fa-minus-circle" style="color:#dd4b39; font-weight:bold;"> ' + vtoy_cur_language.STR_ERROR + '</span>';
var msgstr = '<span style="font-size:14px; font-weight:bold;"> ' + vtoy_cur_language.STR_WEB_TOKEN_MISMATCH + '</span>';
var titlestr = '<span class="fa fa-minus-circle" style="color:#dd4b39; font-weight:bold;"> ' + hiso_cur_language.STR_ERROR + '</span>';
var msgstr = '<span style="font-size:14px; font-weight:bold;"> ' + hiso_cur_language.STR_WEB_TOKEN_MISMATCH + '</span>';
Modal.alert({title:titlestr, msg:msgstr, btnok:vtoy_cur_language.STR_BTN_OK }).on(function(e) {
Modal.alert({title:titlestr, msg:msgstr, btnok:hiso_cur_language.STR_BTN_OK }).on(function(e) {
window.location.reload(true);
});
}
else if (data.result === 'busy') {
var titlestr = '<span class="fa fa-check-circle" style="color:green; font-weight:bold;"> ' + vtoy_cur_language.STR_INFO + '</span>';
var msgstr = '<span style="font-size:14px; font-weight:bold;"> ' + vtoy_cur_language.STR_WEB_SERVICE_BUSY + '</span>';
Modal.alert({title:titlestr, msg:msgstr, btnok:vtoy_cur_language.STR_BTN_OK });
var titlestr = '<span class="fa fa-check-circle" style="color:green; font-weight:bold;"> ' + hiso_cur_language.STR_INFO + '</span>';
var msgstr = '<span style="font-size:14px; font-weight:bold;"> ' + hiso_cur_language.STR_WEB_SERVICE_BUSY + '</span>';
Modal.alert({title:titlestr, msg:msgstr, btnok:hiso_cur_language.STR_BTN_OK });
}else {
func(data);
}
@@ -152,7 +152,7 @@ function callVtoySync(data, func) {
error: function(xmlHttpRequest, textStatus, errorThrown) {
if(undefined === errorThrown)
{
Message.error(vtoy_cur_language.STR_WEB_REMOTE_ABNORMAL);
Message.error(hiso_cur_language.STR_WEB_REMOTE_ABNORMAL);
}
else if(undefined === errorThrown.length)
{
@@ -167,12 +167,12 @@ function callVtoySync(data, func) {
{
case 'timeout':
{
Message.error(vtoy_cur_language.STR_WEB_REQUEST_TIMEOUT);
Message.error(hiso_cur_language.STR_WEB_REQUEST_TIMEOUT);
break;
}
case 'Service Unavailable':
{
Message.error(vtoy_cur_language.STR_WEB_SERVICE_UNAVAILABLE);
Message.error(hiso_cur_language.STR_WEB_SERVICE_UNAVAILABLE);
break;
}
case 'abort':
@@ -181,19 +181,19 @@ function callVtoySync(data, func) {
}
default:
{
Message.error(vtoy_cur_language.STR_WEB_COMMUNICATION_ERR + errorThrown);
Message.error(hiso_cur_language.STR_WEB_COMMUNICATION_ERR + errorThrown);
break;
}
}
}
},
complete: function(data) {
//vtoy.debug('callVtoySync\'s resp:\t' + JSON.stringify(data));
//hiso.debug('callHisoSync\'s resp:\t' + JSON.stringify(data));
}
});
}
var vtoy = {
var hiso = {
baseurl : '',
status: '',
scan: {
scripts/build_gui_all.sh
+2 -2
View File
@@ -45,9 +45,9 @@ cp "$HIPERISO_ROOT/assets/HiperisoGTK.glade" "$PAYLOAD/tool/HiperisoGTK.glade"
# ── Qt5 GUI ──
echo ">>> Building Hiperiso2Disk.qt5"
mkdir -p "$GUI/QT/build_output"
cd "$GUI/QT"
mkdir -p build_output
qmake Hiperiso2Disk.pro -o build_output/Makefile
qmake Hiperiso2Disk.pro -o build_output/Makefile "CONFIG+=release"
make -j"$(nproc)" -C build_output 2>&1 | tail -5
strip build_output/Hiperiso2Disk
safe_install_bin build_output/Hiperiso2Disk "$PAYLOAD/tool/x86_64/Hiperiso2Disk.qt5"
src/gui/QT/Hiperiso2Disk.pro
+92 -118
View File
@@ -4,136 +4,110 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
CONFIG += c++11
# The following define makes your compiler emit warnings if you use
# any Qt feature that has been marked deprecated (the exact warnings
# depend on your compiler). Please consult the documentation of the
# deprecated API in order to know how to port your code away from it.
DEFINES += QT_DEPRECATED_WARNINGS
# You can also make your code fail to compile if it uses deprecated APIs.
# In order to do so, uncomment the following line.
# You can also select to disable deprecated APIs only up to a certain version of Qt.
#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0
SOURCES += \
Core/hiperiso_crc32.c \
Core/hiperiso_disk.c \
Core/hiperiso_json.c \
Core/hiperiso_log.c \
Core/hiperiso_md5.c \
Core/hiperiso_util.c \
Lib/exfat/src/libexfat/cluster.c \
Lib/exfat/src/libexfat/io.c \
Lib/exfat/src/libexfat/lookup.c \
Lib/exfat/src/libexfat/mount.c \
Lib/exfat/src/libexfat/node.c \
Lib/exfat/src/libexfat/repair.c \
Lib/exfat/src/libexfat/time.c \
Lib/exfat/src/libexfat/utf.c \
Lib/exfat/src/libexfat/utils.c \
Lib/exfat/src/mkfs/cbm.c \
Lib/exfat/src/mkfs/fat.c \
Lib/exfat/src/mkfs/mkexfat.c \
Lib/exfat/src/mkfs/mkexfat_main.c \
Lib/exfat/src/mkfs/rootdir.c \
Lib/exfat/src/mkfs/uct.c \
Lib/exfat/src/mkfs/uctc.c \
Lib/exfat/src/mkfs/vbr.c \
Lib/fat_io_lib/fat_access.c \
Lib/fat_io_lib/fat_cache.c \
Lib/fat_io_lib/fat_filelib.c \
Lib/fat_io_lib/fat_format.c \
Lib/fat_io_lib/fat_misc.c \
Lib/fat_io_lib/fat_string.c \
Lib/fat_io_lib/fat_table.c \
Lib/fat_io_lib/fat_write.c \
Lib/xz-embedded/linux/lib/decompress_unxz.c \
QT/refresh_icon_data.c \
QT/secure_icon_data.c \
QT/hiperiso_qt_stub.c \
Web/hiperiso_http.c \
main.cpp \
partcfgdialog.cpp \
hiperiso2diskwindow.cpp
$$PWD/../Core/hiperiso_crc32.c \
$$PWD/../Core/hiperiso_disk.c \
$$PWD/../Core/hiperiso_json.c \
$$PWD/../Core/hiperiso_log.c \
$$PWD/../Core/hiperiso_md5.c \
$$PWD/../Core/hiperiso_util.c \
$$PWD/../Lib/exfat/src/libexfat/cluster.c \
$$PWD/../Lib/exfat/src/libexfat/io.c \
$$PWD/../Lib/exfat/src/libexfat/lookup.c \
$$PWD/../Lib/exfat/src/libexfat/mount.c \
$$PWD/../Lib/exfat/src/libexfat/node.c \
$$PWD/../Lib/exfat/src/libexfat/repair.c \
$$PWD/../Lib/exfat/src/libexfat/time.c \
$$PWD/../Lib/exfat/src/libexfat/utf.c \
$$PWD/../Lib/exfat/src/libexfat/utils.c \
$$PWD/../Lib/exfat/src/mkfs/cbm.c \
$$PWD/../Lib/exfat/src/mkfs/fat.c \
$$PWD/../Lib/exfat/src/mkfs/mkexfat.c \
$$PWD/../Lib/exfat/src/mkfs/mkexfat_main.c \
$$PWD/../Lib/exfat/src/mkfs/rootdir.c \
$$PWD/../Lib/exfat/src/mkfs/uct.c \
$$PWD/../Lib/exfat/src/mkfs/uctc.c \
$$PWD/../Lib/exfat/src/mkfs/vbr.c \
$$PWD/../Lib/fat_io_lib/fat_access.c \
$$PWD/../Lib/fat_io_lib/fat_cache.c \
$$PWD/../Lib/fat_io_lib/fat_filelib.c \
$$PWD/../Lib/fat_io_lib/fat_format.c \
$$PWD/../Lib/fat_io_lib/fat_misc.c \
$$PWD/../Lib/fat_io_lib/fat_string.c \
$$PWD/../Lib/fat_io_lib/fat_table.c \
$$PWD/../Lib/fat_io_lib/fat_write.c \
$$PWD/../Lib/xz-embedded/linux/lib/decompress_unxz.c \
$$PWD/refresh_icon_data.c \
$$PWD/secure_icon_data.c \
$$PWD/hiperiso_qt_stub.c \
$$PWD/../Web/hiperiso_http.c \
$$PWD/main.cpp \
$$PWD/partcfgdialog.cpp \
$$PWD/hiperiso2diskwindow.cpp
HEADERS += \
Core/hiperiso_define.h \
Core/hiperiso_disk.h \
Core/hiperiso_json.h \
Core/hiperiso_util.h \
Include/Hiperiso2Disk.h \
Lib/exfat/src/libexfat/byteorder.h \
Lib/exfat/src/libexfat/compiler.h \
Lib/exfat/src/libexfat/config.h \
Lib/exfat/src/libexfat/exfat.h \
Lib/exfat/src/libexfat/exfatfs.h \
Lib/exfat/src/libexfat/platform.h \
Lib/exfat/src/mkfs/cbm.h \
Lib/exfat/src/mkfs/fat.h \
Lib/exfat/src/mkfs/mkexfat.h \
Lib/exfat/src/mkfs/rootdir.h \
Lib/exfat/src/mkfs/uct.h \
Lib/exfat/src/mkfs/uctc.h \
Lib/exfat/src/mkfs/vbr.h \
Lib/fat_io_lib/fat_access.h \
Lib/fat_io_lib/fat_cache.h \
Lib/fat_io_lib/fat_defs.h \
Lib/fat_io_lib/fat_filelib.h \
Lib/fat_io_lib/fat_format.h \
Lib/fat_io_lib/fat_list.h \
Lib/fat_io_lib/fat_misc.h \
Lib/fat_io_lib/fat_opts.h \
Lib/fat_io_lib/fat_string.h \
Lib/fat_io_lib/fat_table.h \
Lib/fat_io_lib/fat_types.h \
Lib/fat_io_lib/fat_write.h \
Lib/libhttp/include/civetweb.h \
Lib/libhttp/include/handle_form.inl \
Lib/libhttp/include/md5.inl \
Lib/libhttp/include/mod_duktape.inl \
Lib/libhttp/include/mod_lua.inl \
Lib/libhttp/include/timer.inl \
QT/hiperiso_qt.h \
Web/hiperiso_http.h \
partcfgdialog.h \
hiperiso2diskwindow.h
$$PWD/../Core/hiperiso_define.h \
$$PWD/../Core/hiperiso_disk.h \
$$PWD/../Core/hiperiso_json.h \
$$PWD/../Core/hiperiso_util.h \
$$PWD/../Include/Hiperiso2Disk.h \
$$PWD/../Lib/exfat/src/libexfat/byteorder.h \
$$PWD/../Lib/exfat/src/libexfat/compiler.h \
$$PWD/../Lib/exfat/src/libexfat/config.h \
$$PWD/../Lib/exfat/src/libexfat/exfat.h \
$$PWD/../Lib/exfat/src/libexfat/exfatfs.h \
$$PWD/../Lib/exfat/src/libexfat/platform.h \
$$PWD/../Lib/exfat/src/mkfs/cbm.h \
$$PWD/../Lib/exfat/src/mkfs/fat.h \
$$PWD/../Lib/exfat/src/mkfs/mkexfat.h \
$$PWD/../Lib/exfat/src/mkfs/rootdir.h \
$$PWD/../Lib/exfat/src/mkfs/uct.h \
$$PWD/../Lib/exfat/src/mkfs/uctc.h \
$$PWD/../Lib/exfat/src/mkfs/vbr.h \
$$PWD/../Lib/fat_io_lib/fat_access.h \
$$PWD/../Lib/fat_io_lib/fat_cache.h \
$$PWD/../Lib/fat_io_lib/fat_defs.h \
$$PWD/../Lib/fat_io_lib/fat_filelib.h \
$$PWD/../Lib/fat_io_lib/fat_format.h \
$$PWD/../Lib/fat_io_lib/fat_list.h \
$$PWD/../Lib/fat_io_lib/fat_misc.h \
$$PWD/../Lib/fat_io_lib/fat_opts.h \
$$PWD/../Lib/fat_io_lib/fat_string.h \
$$PWD/../Lib/fat_io_lib/fat_table.h \
$$PWD/../Lib/fat_io_lib/fat_types.h \
$$PWD/../Lib/fat_io_lib/fat_write.h \
$$PWD/../Lib/libhttp/include/civetweb.h \
$$PWD/../Lib/libhttp/include/handle_form.inl \
$$PWD/../Lib/libhttp/include/md5.inl \
$$PWD/../Lib/libhttp/include/mod_duktape.inl \
$$PWD/../Lib/libhttp/include/mod_lua.inl \
$$PWD/../Lib/libhttp/include/timer.inl \
$$PWD/hiperiso_qt.h \
$$PWD/../Web/hiperiso_http.h \
$$PWD/partcfgdialog.h \
$$PWD/hiperiso2diskwindow.h
FORMS += \
partcfgdialog.ui \
hiperiso2diskwindow.ui
$$PWD/partcfgdialog.ui \
$$PWD/hiperiso2diskwindow.ui
# Default rules for deployment.
qnx: target.path = /tmp/$${TARGET}/bin
else: unix:!android: target.path = /opt/$${TARGET}/bin
!isEmpty(target.path): INSTALLS += target
DISTFILES += \
Lib/fat_io_lib/API.txt \
Lib/fat_io_lib/COPYRIGHT.txt \
Lib/fat_io_lib/Configuration.txt \
Lib/fat_io_lib/History.txt \
Lib/fat_io_lib/License.txt \
Lib/fat_io_lib/Media Access API.txt \
Lib/fat_io_lib/version.txt
INCLUDEPATH +=/home/panda/Hiperiso2Disk/Core
INCLUDEPATH +=/home/panda/Hiperiso2Disk/Web
INCLUDEPATH +=/home/panda/Hiperiso2Disk/QT
INCLUDEPATH +=/home/panda/Hiperiso2Disk/Include
INCLUDEPATH +=/home/panda/Hiperiso2Disk/Lib/libhttp/include
INCLUDEPATH +=/home/panda/Hiperiso2Disk/Lib/fat_io_lib/include
INCLUDEPATH +=/home/panda/Hiperiso2Disk/Lib/xz-embedded/linux/include
INCLUDEPATH +=/home/panda/Hiperiso2Disk/Lib/xz-embedded/linux/include/linux
INCLUDEPATH +=/home/panda/Hiperiso2Disk/Lib/xz-embedded/userspace
INCLUDEPATH +=/home/panda/Hiperiso2Disk/Lib/exfat/src/libexfat
INCLUDEPATH +=/home/panda/Hiperiso2Disk/Lib/fat_io_lib
#INCLUDEPATH +=/usr/src/linux-headers-5.10.18-amd64-desktop/include
#INCLUDEPATH +=/usr/src/linux-headers-5.10.18-amd64-desktop/arch/x86/include
#INCLUDEPATH +=/usr/src/linux-headers-5.10.18-amd64-desktop/arch/x86/include/generated
INCLUDEPATH += $$PWD/../Core
INCLUDEPATH += $$PWD/../Web
INCLUDEPATH += $$PWD
INCLUDEPATH += $$PWD/../Include
INCLUDEPATH += $$PWD/../Lib/libhttp/include
INCLUDEPATH += $$PWD/../Lib/fat_io_lib/include
INCLUDEPATH += $$PWD/../Lib/xz-embedded/linux/include
INCLUDEPATH += $$PWD/../Lib/xz-embedded/linux/include/linux
INCLUDEPATH += $$PWD/../Lib/xz-embedded/userspace
INCLUDEPATH += $$PWD/../Lib/exfat/src/libexfat
INCLUDEPATH += $$PWD/../Lib/fat_io_lib
DEFINES += STATIC=static
DEFINES += INIT=
src/gui/QT/Hiperiso2Disk.pro.user
-338
View File
@@ -1,338 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProject>
<!-- Written by QtCreator 4.12.2, 2021-09-10T13:54:00. -->
<qtcreator>
<data>
<variable>EnvironmentId</variable>
<value type="QByteArray">{666f325e-a9c7-45d6-a820-626289f99bab}</value>
</data>
<data>
<variable>ProjectExplorer.Project.ActiveTarget</variable>
<value type="int">0</value>
</data>
<data>
<variable>ProjectExplorer.Project.EditorSettings</variable>
<valuemap type="QVariantMap">
<value type="bool" key="EditorConfiguration.AutoIndent">true</value>
<value type="bool" key="EditorConfiguration.AutoSpacesForTabs">false</value>
<value type="bool" key="EditorConfiguration.CamelCaseNavigation">true</value>
<valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.0">
<value type="QString" key="language">Cpp</value>
<valuemap type="QVariantMap" key="value">
<value type="QByteArray" key="CurrentPreferences">CppGlobal</value>
</valuemap>
</valuemap>
<valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.1">
<value type="QString" key="language">QmlJS</value>
<valuemap type="QVariantMap" key="value">
<value type="QByteArray" key="CurrentPreferences">QmlJSGlobal</value>
</valuemap>
</valuemap>
<value type="int" key="EditorConfiguration.CodeStyle.Count">2</value>
<value type="QByteArray" key="EditorConfiguration.Codec">UTF-8</value>
<value type="bool" key="EditorConfiguration.ConstrainTooltips">false</value>
<value type="int" key="EditorConfiguration.IndentSize">4</value>
<value type="bool" key="EditorConfiguration.KeyboardTooltips">false</value>
<value type="int" key="EditorConfiguration.MarginColumn">80</value>
<value type="bool" key="EditorConfiguration.MouseHiding">true</value>
<value type="bool" key="EditorConfiguration.MouseNavigation">true</value>
<value type="int" key="EditorConfiguration.PaddingMode">1</value>
<value type="bool" key="EditorConfiguration.ScrollWheelZooming">true</value>
<value type="bool" key="EditorConfiguration.ShowMargin">false</value>
<value type="int" key="EditorConfiguration.SmartBackspaceBehavior">0</value>
<value type="bool" key="EditorConfiguration.SmartSelectionChanging">true</value>
<value type="bool" key="EditorConfiguration.SpacesForTabs">true</value>
<value type="int" key="EditorConfiguration.TabKeyBehavior">0</value>
<value type="int" key="EditorConfiguration.TabSize">8</value>
<value type="bool" key="EditorConfiguration.UseGlobal">true</value>
<value type="int" key="EditorConfiguration.Utf8BomBehavior">1</value>
<value type="bool" key="EditorConfiguration.addFinalNewLine">true</value>
<value type="bool" key="EditorConfiguration.cleanIndentation">true</value>
<value type="bool" key="EditorConfiguration.cleanWhitespace">true</value>
<value type="bool" key="EditorConfiguration.inEntireDocument">false</value>
</valuemap>
</data>
<data>
<variable>ProjectExplorer.Project.PluginSettings</variable>
<valuemap type="QVariantMap">
<valuelist type="QVariantList" key="ClangCodeModel.CustomCommandLineKey"/>
<value type="bool" key="ClangCodeModel.UseGlobalConfig">true</value>
<value type="QString" key="ClangCodeModel.WarningConfigId">Builtin.Questionable</value>
<valuemap type="QVariantMap" key="ClangTools">
<value type="bool" key="ClangTools.BuildBeforeAnalysis">true</value>
<value type="QString" key="ClangTools.DiagnosticConfig">Builtin.DefaultTidyAndClazy</value>
<value type="int" key="ClangTools.ParallelJobs">2</value>
<valuelist type="QVariantList" key="ClangTools.SelectedDirs"/>
<valuelist type="QVariantList" key="ClangTools.SelectedFiles"/>
<valuelist type="QVariantList" key="ClangTools.SuppressedDiagnostics"/>
<value type="bool" key="ClangTools.UseGlobalSettings">true</value>
</valuemap>
</valuemap>
</data>
<data>
<variable>ProjectExplorer.Project.Target.0</variable>
<valuemap type="QVariantMap">
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop Qt 5.12.9 GCC 64bit</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop Qt 5.12.9 GCC 64bit</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">qt.qt5.5129.gcc_64_kit</value>
<value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
<value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
<value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
<valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
<value type="bool">true</value>
<value type="int" key="EnableQmlDebugging">0</value>
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/panda/build-Ventoy2Disk-Desktop_Qt_5_12_9_GCC_64bit-Debug</value>
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">/home/panda/build-Ventoy2Disk-Desktop_Qt_5_12_9_GCC_64bit-Debug</value>
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
<value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value>
<value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
<valuelist type="QVariantList" key="QtProjectManager.QMakeBuildStep.SelectedAbis"/>
</valuemap>
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
<valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.BuildTargets"/>
<value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value>
<value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value>
<value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
<value type="bool" key="Qt4ProjectManager.MakeStep.OverrideMakeflags">false</value>
</valuemap>
<value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Build</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
</valuemap>
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
<valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.BuildTargets"/>
<value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value>
<value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
<value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
<value type="bool" key="Qt4ProjectManager.MakeStep.OverrideMakeflags">false</value>
</valuemap>
<value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Clean</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
</valuemap>
<value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
<value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
<valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Debug</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
<value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">2</value>
<value type="int" key="QtQuickCompiler">2</value>
<value type="int" key="SeparateDebugInfo">2</value>
</valuemap>
<valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.1">
<value type="bool">true</value>
<value type="int" key="EnableQmlDebugging">2</value>
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/panda/build-Ventoy2Disk-Desktop_Qt_5_12_9_GCC_64bit-Release</value>
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">/home/panda/build-Ventoy2Disk-Desktop_Qt_5_12_9_GCC_64bit-Release</value>
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
<value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value>
<value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
<valuelist type="QVariantList" key="QtProjectManager.QMakeBuildStep.SelectedAbis"/>
</valuemap>
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
<valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.BuildTargets"/>
<value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value>
<value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value>
<value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
<value type="bool" key="Qt4ProjectManager.MakeStep.OverrideMakeflags">false</value>
</valuemap>
<value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Build</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
</valuemap>
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
<valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.BuildTargets"/>
<value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value>
<value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
<value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
<value type="bool" key="Qt4ProjectManager.MakeStep.OverrideMakeflags">false</value>
</valuemap>
<value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Clean</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
</valuemap>
<value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
<value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
<valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Release</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
<value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value>
<value type="int" key="QtQuickCompiler">0</value>
<value type="int" key="SeparateDebugInfo">2</value>
</valuemap>
<valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.2">
<value type="bool">true</value>
<value type="int" key="EnableQmlDebugging">0</value>
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/panda/build-Ventoy2Disk-Desktop_Qt_5_12_9_GCC_64bit-Profile</value>
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">/home/panda/build-Ventoy2Disk-Desktop_Qt_5_12_9_GCC_64bit-Profile</value>
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
<value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value>
<value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
<valuelist type="QVariantList" key="QtProjectManager.QMakeBuildStep.SelectedAbis"/>
</valuemap>
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
<valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.BuildTargets"/>
<value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value>
<value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value>
<value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
<value type="bool" key="Qt4ProjectManager.MakeStep.OverrideMakeflags">false</value>
</valuemap>
<value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Build</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
</valuemap>
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
<valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.BuildTargets"/>
<value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value>
<value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
<value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
<value type="bool" key="Qt4ProjectManager.MakeStep.OverrideMakeflags">false</value>
</valuemap>
<value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Clean</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
</valuemap>
<value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
<value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
<valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Profile</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
<value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value>
<value type="int" key="QtQuickCompiler">0</value>
<value type="int" key="SeparateDebugInfo">0</value>
</valuemap>
<value type="int" key="ProjectExplorer.Target.BuildConfigurationCount">3</value>
<valuemap type="QVariantMap" key="ProjectExplorer.Target.DeployConfiguration.0">
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
<value type="int" key="ProjectExplorer.BuildStepList.StepsCount">0</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deploy</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Deploy</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Deploy</value>
</valuemap>
<value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">1</value>
<valuemap type="QVariantMap" key="ProjectExplorer.DeployConfiguration.CustomData"/>
<value type="bool" key="ProjectExplorer.DeployConfiguration.CustomDataEnabled">false</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.DefaultDeployConfiguration</value>
</valuemap>
<value type="int" key="ProjectExplorer.Target.DeployConfigurationCount">1</value>
<valuemap type="QVariantMap" key="ProjectExplorer.Target.PluginSettings"/>
<valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.0">
<value type="QString" key="Analyzer.Perf.CallgraphMode">dwarf</value>
<valuelist type="QVariantList" key="Analyzer.Perf.Events">
<value type="QString">cpu-cycles</value>
</valuelist>
<valuelist type="QVariantList" key="Analyzer.Perf.ExtraArguments"/>
<value type="int" key="Analyzer.Perf.Frequency">250</value>
<valuelist type="QVariantList" key="Analyzer.Perf.RecordArguments">
<value type="QString">-e</value>
<value type="QString">cpu-cycles</value>
<value type="QString">--call-graph</value>
<value type="QString">dwarf,4096</value>
<value type="QString">-F</value>
<value type="QString">250</value>
</valuelist>
<value type="QString" key="Analyzer.Perf.SampleMode">-F</value>
<value type="bool" key="Analyzer.Perf.Settings.UseGlobalSettings">true</value>
<value type="int" key="Analyzer.Perf.StackSize">4096</value>
<value type="bool" key="Analyzer.QmlProfiler.AggregateTraces">false</value>
<value type="bool" key="Analyzer.QmlProfiler.FlushEnabled">false</value>
<value type="uint" key="Analyzer.QmlProfiler.FlushInterval">1000</value>
<value type="QString" key="Analyzer.QmlProfiler.LastTraceFile"></value>
<value type="bool" key="Analyzer.QmlProfiler.Settings.UseGlobalSettings">true</value>
<valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/>
<value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value>
<value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value>
<value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value>
<value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value>
<value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value>
<value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value>
<value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value>
<value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value>
<value type="QString" key="Analyzer.Valgrind.KCachegrindExecutable">kcachegrind</value>
<value type="int" key="Analyzer.Valgrind.LeakCheckOnFinish">1</value>
<value type="int" key="Analyzer.Valgrind.NumCallers">25</value>
<valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/>
<value type="int" key="Analyzer.Valgrind.SelfModifyingCodeDetection">1</value>
<value type="bool" key="Analyzer.Valgrind.Settings.UseGlobalSettings">true</value>
<value type="bool" key="Analyzer.Valgrind.ShowReachable">false</value>
<value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value>
<value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value>
<valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds">
<value type="int">0</value>
<value type="int">1</value>
<value type="int">2</value>
<value type="int">3</value>
<value type="int">4</value>
<value type="int">5</value>
<value type="int">6</value>
<value type="int">7</value>
<value type="int">8</value>
<value type="int">9</value>
<value type="int">10</value>
<value type="int">11</value>
<value type="int">12</value>
<value type="int">13</value>
<value type="int">14</value>
</valuelist>
<value type="int" key="PE.EnvironmentAspect.Base">2</value>
<valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:/home/panda/Ventoy2Disk/Ventoy2Disk.pro</value>
<value type="QString" key="ProjectExplorer.RunConfiguration.BuildKey">/home/panda/Ventoy2Disk/Ventoy2Disk.pro</value>
<value type="QString" key="RunConfiguration.Arguments"></value>
<value type="bool" key="RunConfiguration.Arguments.multi">false</value>
<value type="QString" key="RunConfiguration.OverrideDebuggerStartup"></value>
<value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
<value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
<value type="bool" key="RunConfiguration.UseLibrarySearchPath">true</value>
<value type="bool" key="RunConfiguration.UseMultiProcess">false</value>
<value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
<value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
<value type="QString" key="RunConfiguration.WorkingDirectory">/home/panda/Desktop/ventoy-1.0.52-linux/ventoy-1.0.52</value>
<value type="QString" key="RunConfiguration.WorkingDirectory.default">/home/panda/build-Ventoy2Disk-Desktop_Qt_5_12_9_GCC_64bit-Debug</value>
</valuemap>
<value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value>
</valuemap>
</data>
<data>
<variable>ProjectExplorer.Project.TargetCount</variable>
<value type="int">1</value>
</data>
<data>
<variable>ProjectExplorer.Project.Updater.FileVersion</variable>
<value type="int">22</value>
</data>
<data>
<variable>Version</variable>
<value type="int">22</value>
</data>
</qtcreator>
src/gui/QT/build/Makefile
-1760
View File
File diff suppressed because it is too large Load Diff
src/gui/QT/build_output/.qmake.stash
+20
View File
@@ -0,0 +1,20 @@
QMAKE_CXX.QT_COMPILER_STDCXX = 202002L
QMAKE_CXX.QMAKE_GCC_MAJOR_VERSION = 16
QMAKE_CXX.QMAKE_GCC_MINOR_VERSION = 1
QMAKE_CXX.QMAKE_GCC_PATCH_VERSION = 1
QMAKE_CXX.COMPILER_MACROS = \
QT_COMPILER_STDCXX \
QMAKE_GCC_MAJOR_VERSION \
QMAKE_GCC_MINOR_VERSION \
QMAKE_GCC_PATCH_VERSION
QMAKE_CXX.INCDIRS = \
/usr/include/c++/16.1.1 \
/usr/include/c++/16.1.1/x86_64-pc-linux-gnu \
/usr/include/c++/16.1.1/backward \
/usr/lib/gcc/x86_64-pc-linux-gnu/16.1.1/include \
/usr/local/include \
/usr/include
QMAKE_CXX.LIBDIRS = \
/usr/lib/gcc/x86_64-pc-linux-gnu/16.1.1 \
/usr/lib \
/lib
src/gui/QT/build_output/Hiperiso2Disk
Executable
BIN
View File
Binary file not shown.
src/gui/QT/build_output/Makefile
+1072
View File
File diff suppressed because it is too large Load Diff
src/gui/QT/build/moc_hiperiso2diskwindow.cpp → src/gui/QT/build_output/moc_hiperiso2diskwindow.cpp
+65 -57
View File
@@ -1,18 +1,19 @@
/****************************************************************************
** Meta object code from reading C++ file 'ventoy2diskwindow.h'
** Meta object code from reading C++ file 'hiperiso2diskwindow.h'
**
** Created by: The Qt Meta Object Compiler version 67 (Qt 5.9.0)
** Created by: The Qt Meta Object Compiler version 67 (Qt 5.15.19)
**
** WARNING! All changes made in this file will be lost!
*****************************************************************************/
#include "../ventoy2diskwindow.h"
#include <memory>
#include "../hiperiso2diskwindow.h"
#include <QtCore/qbytearray.h>
#include <QtCore/qmetatype.h>
#if !defined(Q_MOC_OUTPUT_REVISION)
#error "The header file 'ventoy2diskwindow.h' doesn't include <QObject>."
#error "The header file 'hiperiso2diskwindow.h' doesn't include <QObject>."
#elif Q_MOC_OUTPUT_REVISION != 67
#error "This file was generated using the moc from 5.9.0. It"
#error "This file was generated using the moc from 5.15.19. It"
#error "cannot be used with the include files from this version of Qt."
#error "(The moc has changed too much.)"
#endif
@@ -45,7 +46,7 @@ QT_MOC_LITERAL(4, 28, 4) // "data"
static const uint qt_meta_data_MyQThread[] = {
// content:
7, // revision
8, // revision
0, // classname
0, 0, // classinfo
1, 14, // methods
@@ -67,18 +68,17 @@ static const uint qt_meta_data_MyQThread[] = {
void MyQThread::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a)
{
if (_c == QMetaObject::InvokeMetaMethod) {
MyQThread *_t = static_cast<MyQThread *>(_o);
Q_UNUSED(_t)
auto *_t = static_cast<MyQThread *>(_o);
(void)_t;
switch (_id) {
case 0: _t->thread_event((*reinterpret_cast< int(*)>(_a[1])),(*reinterpret_cast< int(*)>(_a[2]))); break;
default: ;
}
} else if (_c == QMetaObject::IndexOfMethod) {
int *result = reinterpret_cast<int *>(_a[0]);
void **func = reinterpret_cast<void **>(_a[1]);
{
typedef void (MyQThread::*_t)(int , int );
if (*reinterpret_cast<_t *>(func) == static_cast<_t>(&MyQThread::thread_event)) {
using _t = void (MyQThread::*)(int , int );
if (*reinterpret_cast<_t *>(_a[1]) == static_cast<_t>(&MyQThread::thread_event)) {
*result = 0;
return;
}
@@ -86,10 +86,14 @@ void MyQThread::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, v
}
}
const QMetaObject MyQThread::staticMetaObject = {
{ &QThread::staticMetaObject, qt_meta_stringdata_MyQThread.data,
qt_meta_data_MyQThread, qt_static_metacall, nullptr, nullptr}
};
QT_INIT_METAOBJECT const QMetaObject MyQThread::staticMetaObject = { {
QMetaObject::SuperData::link<QThread::staticMetaObject>(),
qt_meta_stringdata_MyQThread.data,
qt_meta_data_MyQThread,
qt_static_metacall,
nullptr,
nullptr
} };
const QMetaObject *MyQThread::metaObject() const
@@ -101,7 +105,7 @@ void *MyQThread::qt_metacast(const char *_clname)
{
if (!_clname) return nullptr;
if (!strcmp(_clname, qt_meta_stringdata_MyQThread.stringdata0))
return static_cast<void*>(const_cast< MyQThread*>(this));
return static_cast<void*>(this);
return QThread::qt_metacast(_clname);
}
@@ -125,58 +129,58 @@ int MyQThread::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
// SIGNAL 0
void MyQThread::thread_event(int _t1, int _t2)
{
void *_a[] = { nullptr, const_cast<void*>(reinterpret_cast<const void*>(&_t1)), const_cast<void*>(reinterpret_cast<const void*>(&_t2)) };
void *_a[] = { nullptr, const_cast<void*>(reinterpret_cast<const void*>(std::addressof(_t1))), const_cast<void*>(reinterpret_cast<const void*>(std::addressof(_t2))) };
QMetaObject::activate(this, &staticMetaObject, 0, _a);
}
struct qt_meta_stringdata_Ventoy2DiskWindow_t {
struct qt_meta_stringdata_Hiperiso2DiskWindow_t {
QByteArrayData data[19];
char stringdata0[367];
char stringdata0[371];
};
#define QT_MOC_LITERAL(idx, ofs, len) \
Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(len, \
qptrdiff(offsetof(qt_meta_stringdata_Ventoy2DiskWindow_t, stringdata0) + ofs \
qptrdiff(offsetof(qt_meta_stringdata_Hiperiso2DiskWindow_t, stringdata0) + ofs \
- idx * sizeof(QByteArrayData)) \
)
static const qt_meta_stringdata_Ventoy2DiskWindow_t qt_meta_stringdata_Ventoy2DiskWindow = {
static const qt_meta_stringdata_Hiperiso2DiskWindow_t qt_meta_stringdata_Hiperiso2DiskWindow = {
{
QT_MOC_LITERAL(0, 0, 17), // "Ventoy2DiskWindow"
QT_MOC_LITERAL(1, 18, 12), // "thread_event"
QT_MOC_LITERAL(2, 31, 0), // ""
QT_MOC_LITERAL(3, 32, 3), // "msg"
QT_MOC_LITERAL(4, 36, 4), // "data"
QT_MOC_LITERAL(5, 41, 23), // "part_style_check_action"
QT_MOC_LITERAL(6, 65, 8), // "QAction*"
QT_MOC_LITERAL(7, 74, 3), // "act"
QT_MOC_LITERAL(8, 78, 17), // "lang_check_action"
QT_MOC_LITERAL(9, 96, 24), // "on_ButtonInstall_clicked"
QT_MOC_LITERAL(10, 121, 23), // "on_ButtonUpdate_clicked"
QT_MOC_LITERAL(11, 145, 24), // "on_ButtonRefresh_clicked"
QT_MOC_LITERAL(12, 170, 37), // "on_comboBoxDevice_currentInde..."
QT_MOC_LITERAL(13, 208, 5), // "index"
QT_MOC_LITERAL(14, 214, 42), // "on_actionPartition_Configurat..."
QT_MOC_LITERAL(15, 257, 31), // "on_actionClear_Ventoy_triggered"
QT_MOC_LITERAL(16, 289, 33), // "on_actionShow_All_Devices_tog..."
QT_MOC_LITERAL(17, 323, 4), // "arg1"
QT_MOC_LITERAL(18, 328, 38) // "on_actionSecure_Boot_Support_..."
QT_MOC_LITERAL(0, 0, 19), // "Hiperiso2DiskWindow"
QT_MOC_LITERAL(1, 20, 12), // "thread_event"
QT_MOC_LITERAL(2, 33, 0), // ""
QT_MOC_LITERAL(3, 34, 3), // "msg"
QT_MOC_LITERAL(4, 38, 4), // "data"
QT_MOC_LITERAL(5, 43, 23), // "part_style_check_action"
QT_MOC_LITERAL(6, 67, 8), // "QAction*"
QT_MOC_LITERAL(7, 76, 3), // "act"
QT_MOC_LITERAL(8, 80, 17), // "lang_check_action"
QT_MOC_LITERAL(9, 98, 24), // "on_ButtonInstall_clicked"
QT_MOC_LITERAL(10, 123, 23), // "on_ButtonUpdate_clicked"
QT_MOC_LITERAL(11, 147, 24), // "on_ButtonRefresh_clicked"
QT_MOC_LITERAL(12, 172, 37), // "on_comboBoxDevice_currentInde..."
QT_MOC_LITERAL(13, 210, 5), // "index"
QT_MOC_LITERAL(14, 216, 42), // "on_actionPartition_Configurat..."
QT_MOC_LITERAL(15, 259, 33), // "on_actionClear_Hiperiso_trigg..."
QT_MOC_LITERAL(16, 293, 33), // "on_actionShow_All_Devices_tog..."
QT_MOC_LITERAL(17, 327, 4), // "arg1"
QT_MOC_LITERAL(18, 332, 38) // "on_actionSecure_Boot_Support_..."
},
"Ventoy2DiskWindow\0thread_event\0\0msg\0"
"Hiperiso2DiskWindow\0thread_event\0\0msg\0"
"data\0part_style_check_action\0QAction*\0"
"act\0lang_check_action\0on_ButtonInstall_clicked\0"
"on_ButtonUpdate_clicked\0"
"on_ButtonRefresh_clicked\0"
"on_comboBoxDevice_currentIndexChanged\0"
"index\0on_actionPartition_Configuration_triggered\0"
"on_actionClear_Ventoy_triggered\0"
"on_actionClear_Hiperiso_triggered\0"
"on_actionShow_All_Devices_toggled\0"
"arg1\0on_actionSecure_Boot_Support_triggered"
};
#undef QT_MOC_LITERAL
static const uint qt_meta_data_Ventoy2DiskWindow[] = {
static const uint qt_meta_data_Hiperiso2DiskWindow[] = {
// content:
7, // revision
8, // revision
0, // classname
0, 0, // classinfo
11, 14, // methods
@@ -215,11 +219,11 @@ static const uint qt_meta_data_Ventoy2DiskWindow[] = {
0 // eod
};
void Ventoy2DiskWindow::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a)
void Hiperiso2DiskWindow::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a)
{
if (_c == QMetaObject::InvokeMetaMethod) {
Ventoy2DiskWindow *_t = static_cast<Ventoy2DiskWindow *>(_o);
Q_UNUSED(_t)
auto *_t = static_cast<Hiperiso2DiskWindow *>(_o);
(void)_t;
switch (_id) {
case 0: _t->thread_event((*reinterpret_cast< int(*)>(_a[1])),(*reinterpret_cast< int(*)>(_a[2]))); break;
case 1: _t->part_style_check_action((*reinterpret_cast< QAction*(*)>(_a[1]))); break;
@@ -229,7 +233,7 @@ void Ventoy2DiskWindow::qt_static_metacall(QObject *_o, QMetaObject::Call _c, in
case 5: _t->on_ButtonRefresh_clicked(); break;
case 6: _t->on_comboBoxDevice_currentIndexChanged((*reinterpret_cast< int(*)>(_a[1]))); break;
case 7: _t->on_actionPartition_Configuration_triggered(); break;
case 8: _t->on_actionClear_Ventoy_triggered(); break;
case 8: _t->on_actionClear_Hiperiso_triggered(); break;
case 9: _t->on_actionShow_All_Devices_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break;
case 10: _t->on_actionSecure_Boot_Support_triggered(); break;
default: ;
@@ -255,26 +259,30 @@ void Ventoy2DiskWindow::qt_static_metacall(QObject *_o, QMetaObject::Call _c, in
}
}
const QMetaObject Ventoy2DiskWindow::staticMetaObject = {
{ &QMainWindow::staticMetaObject, qt_meta_stringdata_Ventoy2DiskWindow.data,
qt_meta_data_Ventoy2DiskWindow, qt_static_metacall, nullptr, nullptr}
};
QT_INIT_METAOBJECT const QMetaObject Hiperiso2DiskWindow::staticMetaObject = { {
QMetaObject::SuperData::link<QMainWindow::staticMetaObject>(),
qt_meta_stringdata_Hiperiso2DiskWindow.data,
qt_meta_data_Hiperiso2DiskWindow,
qt_static_metacall,
nullptr,
nullptr
} };
const QMetaObject *Ventoy2DiskWindow::metaObject() const
const QMetaObject *Hiperiso2DiskWindow::metaObject() const
{
return QObject::d_ptr->metaObject ? QObject::d_ptr->dynamicMetaObject() : &staticMetaObject;
}
void *Ventoy2DiskWindow::qt_metacast(const char *_clname)
void *Hiperiso2DiskWindow::qt_metacast(const char *_clname)
{
if (!_clname) return nullptr;
if (!strcmp(_clname, qt_meta_stringdata_Ventoy2DiskWindow.stringdata0))
return static_cast<void*>(const_cast< Ventoy2DiskWindow*>(this));
if (!strcmp(_clname, qt_meta_stringdata_Hiperiso2DiskWindow.stringdata0))
return static_cast<void*>(this);
return QMainWindow::qt_metacast(_clname);
}
int Ventoy2DiskWindow::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
int Hiperiso2DiskWindow::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
{
_id = QMainWindow::qt_metacall(_c, _id, _a);
if (_id < 0)
src/gui/QT/build/moc_partcfgdialog.cpp → src/gui/QT/build_output/moc_partcfgdialog.cpp
+15 -10
View File
@@ -1,18 +1,19 @@
/****************************************************************************
** Meta object code from reading C++ file 'partcfgdialog.h'
**
** Created by: The Qt Meta Object Compiler version 67 (Qt 5.9.0)
** Created by: The Qt Meta Object Compiler version 67 (Qt 5.15.19)
**
** WARNING! All changes made in this file will be lost!
*****************************************************************************/
#include <memory>
#include "../partcfgdialog.h"
#include <QtCore/qbytearray.h>
#include <QtCore/qmetatype.h>
#if !defined(Q_MOC_OUTPUT_REVISION)
#error "The header file 'partcfgdialog.h' doesn't include <QObject>."
#elif Q_MOC_OUTPUT_REVISION != 67
#error "This file was generated using the moc from 5.9.0. It"
#error "This file was generated using the moc from 5.15.19. It"
#error "cannot be used with the include files from this version of Qt."
#error "(The moc has changed too much.)"
#endif
@@ -48,7 +49,7 @@ QT_MOC_LITERAL(5, 92, 4) // "arg1"
static const uint qt_meta_data_PartCfgDialog[] = {
// content:
7, // revision
8, // revision
0, // classname
0, 0, // classinfo
3, 14, // methods
@@ -74,8 +75,8 @@ static const uint qt_meta_data_PartCfgDialog[] = {
void PartCfgDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a)
{
if (_c == QMetaObject::InvokeMetaMethod) {
PartCfgDialog *_t = static_cast<PartCfgDialog *>(_o);
Q_UNUSED(_t)
auto *_t = static_cast<PartCfgDialog *>(_o);
(void)_t;
switch (_id) {
case 0: _t->on_pushButtonOK_clicked(); break;
case 1: _t->on_pushButtonCancel_clicked(); break;
@@ -85,10 +86,14 @@ void PartCfgDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _i
}
}
const QMetaObject PartCfgDialog::staticMetaObject = {
{ &QDialog::staticMetaObject, qt_meta_stringdata_PartCfgDialog.data,
qt_meta_data_PartCfgDialog, qt_static_metacall, nullptr, nullptr}
};
QT_INIT_METAOBJECT const QMetaObject PartCfgDialog::staticMetaObject = { {
QMetaObject::SuperData::link<QDialog::staticMetaObject>(),
qt_meta_stringdata_PartCfgDialog.data,
qt_meta_data_PartCfgDialog,
qt_static_metacall,
nullptr,
nullptr
} };
const QMetaObject *PartCfgDialog::metaObject() const
@@ -100,7 +105,7 @@ void *PartCfgDialog::qt_metacast(const char *_clname)
{
if (!_clname) return nullptr;
if (!strcmp(_clname, qt_meta_stringdata_PartCfgDialog.stringdata0))
return static_cast<void*>(const_cast< PartCfgDialog*>(this));
return static_cast<void*>(this);
return QDialog::qt_metacast(_clname);
}
src/gui/QT/build/moc_predefs.h → src/gui/QT/build_output/moc_predefs.h
+174 -103
View File
@@ -1,374 +1,445 @@
#define __DBL_MIN_EXP__ (-1021)
#define __FLT32X_MAX_EXP__ 1024
#define __cpp_attributes 200809
#define __LDBL_MANT_DIG__ 64
#define __UINT_LEAST16_MAX__ 0xffff
#define __FLT16_HAS_QUIET_NAN__ 1
#define __ATOMIC_ACQUIRE 2
#define __FLT128_MAX_10_EXP__ 4932
#define __FLT_MIN__ 1.17549435082228750796873653722224568e-38F
#define __GCC_IEC_559_COMPLEX 2
#define __UINT_LEAST8_TYPE__ unsigned char
#define __SIZEOF_FLOAT80__ 16
#define __BFLT16_DENORM_MIN__ 9.18354961579912115600575419704879436e-41BF16
#define __INTMAX_C(c) c ## L
#define __CHAR_BIT__ 8
#define __UINT8_MAX__ 0xff
#define __SCHAR_WIDTH__ 8
#define __WINT_MAX__ 0xffffffffU
#define __FLT32_MIN_EXP__ (-125)
#define __cpp_static_assert 200410
#define __cpp_static_assert 200410L
#define __BFLT16_MIN_10_EXP__ (-37)
#define __cpp_inheriting_constructors 201511L
#define __ORDER_LITTLE_ENDIAN__ 1234
#define __SIZE_MAX__ 0xffffffffffffffffUL
#define __WCHAR_MAX__ 0x7fffffff
#define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_1 1
#define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_2 1
#define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4 1
#define __DBL_DENORM_MIN__ double(4.94065645841246544176568792868221372e-324L)
#define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_8 1
#define __GCC_ATOMIC_CHAR_LOCK_FREE 2
#define __GCC_IEC_559 2
#define __FLT32X_DECIMAL_DIG__ 17
#define __FLT_EVAL_METHOD__ 0
#define __unix__ 1
#define __cpp_binary_literals 201304
#define __cpp_binary_literals 201304L
#define __FLT64_DECIMAL_DIG__ 17
#define __GCC_ATOMIC_CHAR32_T_LOCK_FREE 2
#define __x86_64 1
#define __cpp_variadic_templates 200704
#define __cpp_variadic_templates 200704L
#define __UINT_FAST64_MAX__ 0xffffffffffffffffUL
#define __SIG_ATOMIC_TYPE__ int
#define __DBL_MIN_10_EXP__ (-307)
#define __FINITE_MATH_ONLY__ 0
#define __GNUC_PATCHLEVEL__ 0
#define __FLT32X_MAX_EXP__ 1024
#define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_1 1
#define __FLT32_HAS_DENORM__ 1
#define __UINT_FAST8_MAX__ 0xff
#define __has_include(STR) __has_include__(STR)
#define __cpp_rvalue_reference 200610L
#define __FLT32_MAX_10_EXP__ 38
#define __DEC64_MAX_EXP__ 385
#define __INT8_C(c) c
#define __LDBL_HAS_INFINITY__ 1
#define __INT_LEAST8_WIDTH__ 8
#define __UINT_LEAST64_MAX__ 0xffffffffffffffffUL
#define __INT_LEAST8_MAX__ 0x7f
#define __cpp_attributes 200809L
#define __SHRT_MAX__ 0x7fff
#define __LDBL_MAX__ 1.18973149535723176502126385303097021e+4932L
#define __FLT64X_MAX_10_EXP__ 4932
#define __BFLT16_MAX_10_EXP__ 38
#define __BFLT16_MAX_EXP__ 128
#define __LDBL_IS_IEC_60559__ 1
#define __FLT64X_HAS_QUIET_NAN__ 1
#define __UINT_LEAST8_MAX__ 0xff
#define __GCC_ATOMIC_BOOL_LOCK_FREE 2
#define __FLT128_DENORM_MIN__ 6.47517511943802511092443895822764655e-4966F128
#define __UINTMAX_TYPE__ long unsigned int
#define __cpp_nsdmi 200809L
#define __BFLT16_DECIMAL_DIG__ 4
#define __linux 1
#define __DEC32_EPSILON__ 1E-6DF
#define __FLT_EVAL_METHOD_TS_18661_3__ 0
#define __OPTIMIZE__ 1
#define __unix 1
#define __UINT32_MAX__ 0xffffffffU
#define __GXX_EXPERIMENTAL_CXX0X__ 1
#define __LDBL_MAX_EXP__ 16384
#define __DBL_DENORM_MIN__ double(4.94065645841246544176568792868221372e-324L)
#define __FLT128_MIN_EXP__ (-16381)
#define __DEC64X_MAX_EXP__ 6145
#define __WINT_MIN__ 0U
#define __linux__ 1
#define __FLT128_MIN_10_EXP__ (-4931)
#define __FLT32X_IS_IEC_60559__ 1
#define __INT_LEAST16_WIDTH__ 16
#define __SCHAR_MAX__ 0x7f
#define __FLT128_MANT_DIG__ 113
#define __WCHAR_MIN__ (-__WCHAR_MAX__ - 1)
#define __INT64_C(c) c ## L
#define __DBL_DIG__ 15
#define __SSP_STRONG__ 3
#define __GCC_ATOMIC_POINTER_LOCK_FREE 2
#define __FLT64X_MANT_DIG__ 64
#define __SIZEOF_INT__ 4
#define __SIZEOF_POINTER__ 8
#define __ATOMIC_SEQ_CST 5
#define __unix 1
#define __INT_LEAST64_MAX__ 0x7fffffffffffffffL
#define __FLT32X_MANT_DIG__ 53
#define __GCC_ATOMIC_CHAR16_T_LOCK_FREE 2
#define __USER_LABEL_PREFIX__
#define __FLT64X_EPSILON__ 1.08420217248550443400745280086994171e-19F64x
#define __STDC_HOSTED__ 1
#define __LDBL_HAS_INFINITY__ 1
#define __FLT32_DIG__ 6
#define __DEC64_MIN_EXP__ (-382)
#define __DBL_DIG__ 15
#define __STDC_EMBED_EMPTY__ 2
#define __FLT_EPSILON__ 1.19209289550781250000000000000000000e-7F
#define __GXX_WEAK__ 1
#define __SHRT_WIDTH__ 16
#define __FLT32_IS_IEC_60559__ 1
#define __LDBL_MIN__ 3.36210314311209350626267781732175260e-4932L
#define __DBL_IS_IEC_60559__ 1
#define __DEC32_MAX__ 9.999999E96DF
#define __cpp_threadsafe_static_init 200806
#define __cpp_threadsafe_static_init 200806L
#define __FLT64X_DENORM_MIN__ 3.64519953188247460252840593361941982e-4951F64x
#define __FLT32X_HAS_INFINITY__ 1
#define __INT32_MAX__ 0x7fffffff
#define __unix__ 1
#define __INT_WIDTH__ 32
#define __SIZEOF_LONG__ 8
#define __STDC_IEC_559__ 1
#define __STDC_ISO_10646__ 201706L
#define __UINT16_C(c) c
#define __PTRDIFF_WIDTH__ 64
#define __DECIMAL_DIG__ 21
#define __FLT64_EPSILON__ 2.22044604925031308084726333618164062e-16F64
#define __STDC_IEC_559_COMPLEX__ 1
#define __gnu_linux__ 1
#define __INTMAX_WIDTH__ 64
#define __INT16_MAX__ 0x7fff
#define __FLT64_MIN_EXP__ (-1021)
#define __has_include_next(STR) __has_include_next__(STR)
#define __DEC64X_EPSILON__ 1E-33D64x
#define __FLT64X_MIN_10_EXP__ (-4931)
#define __LDBL_HAS_QUIET_NAN__ 1
#define __FLT16_MIN_EXP__ (-13)
#define __FLT64_MANT_DIG__ 53
#define __GNUC__ 8
#define __FLT64X_MANT_DIG__ 64
#define __BFLT16_DIG__ 2
#define __GNUC__ 16
#define __GXX_RTTI 1
#define __pie__ 2
#define __MMX__ 1
#define __cpp_delegating_constructors 200604
#define __FLT_HAS_DENORM__ 1
#define __SIZEOF_LONG_DOUBLE__ 16
#define __BIGGEST_ALIGNMENT__ 16
#define __STDC_UTF_16__ 1
#define __FLT64_MAX_10_EXP__ 308
#define __FLT32_HAS_INFINITY__ 1
#define __BFLT16_IS_IEC_60559__ 0
#define __FLT16_MAX_10_EXP__ 4
#define __cpp_delegating_constructors 200604L
#define __DBL_MAX__ double(1.79769313486231570814527423731704357e+308L)
#define __cpp_raw_strings 200710
#define __cpp_raw_strings 200710L
#define __INT_FAST32_MAX__ 0x7fffffffffffffffL
#define __DBL_HAS_INFINITY__ 1
#define __INT64_MAX__ 0x7fffffffffffffffL
#define __SIZEOF_FLOAT__ 4
#define __HAVE_SPECULATION_SAFE_VALUE 1
#define __DEC32_MIN_EXP__ (-94)
#define __INTPTR_WIDTH__ 64
#define __UINT_LEAST32_MAX__ 0xffffffffU
#define __FLT32X_HAS_DENORM__ 1
#define __INT_FAST16_TYPE__ long int
#define __MMX_WITH_SSE__ 1
#define __LDBL_HAS_DENORM__ 1
#define __SEG_GS 1
#define __BFLT16_EPSILON__ 7.81250000000000000000000000000000000e-3BF16
#define __cplusplus 201103L
#define __cpp_ref_qualifiers 200710
#define __DEC128_MAX__ 9.999999999999999999999999999999999E6144DL
#define __INT_LEAST32_MAX__ 0x7fffffff
#define __cpp_ref_qualifiers 200710L
#define __DEC32_MIN__ 1E-95DF
#define __DEPRECATED 1
#define __cpp_rvalue_references 200610
#define __cpp_rvalue_references 200610L
#define __DBL_MAX_EXP__ 1024
#define __WCHAR_WIDTH__ 32
#define __FLT32_MAX__ 3.40282346638528859811704183484516925e+38F32
#define __DEC128_EPSILON__ 1E-33DL
#define __FLT16_DECIMAL_DIG__ 5
#define __SSE2_MATH__ 1
#define __ATOMIC_HLE_RELEASE 131072
#define __PTRDIFF_MAX__ 0x7fffffffffffffffL
#define __amd64 1
#define __DEC64X_MAX__ 9.999999999999999999999999999999999E6144D64x
#define __ATOMIC_HLE_ACQUIRE 65536
#define __FLT32_HAS_QUIET_NAN__ 1
#define __GNUG__ 8
#define __GNUG__ 16
#define __LONG_LONG_MAX__ 0x7fffffffffffffffLL
#define __SIZEOF_SIZE_T__ 8
#define __cpp_rvalue_reference 200610
#define __cpp_nsdmi 200809
#define __BFLT16_HAS_INFINITY__ 1
#define __FLT64X_MIN_EXP__ (-16381)
#define __SIZEOF_WINT_T__ 4
#define __FLT32X_DIG__ 15
#define __LONG_LONG_WIDTH__ 64
#define __cpp_initializer_lists 200806
#define __cpp_initializer_lists 200806L
#define __FLT32_MAX_EXP__ 128
#define __cpp_hex_float 201603
#define __GCC_HAVE_DWARF2_CFI_ASM 1
#define __GXX_ABI_VERSION 1013
#define __FLT128_HAS_INFINITY__ 1
#define __cpp_hex_float 201603L
#define __GXX_ABI_VERSION 1021
#define __FLT_MIN_EXP__ (-125)
#define __cpp_lambdas 200907
#define __FLT64X_HAS_QUIET_NAN__ 1
#define __GCC_HAVE_DWARF2_CFI_ASM 1
#define __x86_64 1
#define __cpp_lambdas 200907L
#define __INT_FAST64_TYPE__ long int
#define __BFLT16_MAX__ 3.38953138925153547590470800371487867e+38BF16
#define __FLT64_DENORM_MIN__ 4.94065645841246544176568792868221372e-324F64
#define __DBL_MIN__ double(2.22507385850720138309023271733240406e-308L)
#define __FLT16_DENORM_MIN__ 5.96046447753906250000000000000000000e-8F16
#define __FLT128_EPSILON__ 1.92592994438723585305597794258492732e-34F128
#define __FLT64X_NORM_MAX__ 1.18973149535723176502126385303097021e+4932F64x
#define __SIZEOF_POINTER__ 8
#define __SIZE_TYPE__ long unsigned int
#define __LP64__ 1
#define __DBL_HAS_QUIET_NAN__ 1
#define __FLT32X_EPSILON__ 2.22044604925031308084726333618164062e-16F32x
#define __LDBL_MAX_EXP__ 16384
#define __DECIMAL_BID_FORMAT__ 1
#define __FLT64_MIN_10_EXP__ (-307)
#define __FLT16_MIN_10_EXP__ (-4)
#define __FLT64X_DECIMAL_DIG__ 21
#define __DEC128_MIN__ 1E-6143DL
#define __REGISTER_PREFIX__
#define __UINT16_MAX__ 0xffff
#define __DBL_HAS_DENORM__ 1
#define __FLT128_HAS_INFINITY__ 1
#define __FLT32_MIN__ 1.17549435082228750796873653722224568e-38F32
#define __UINT8_TYPE__ unsigned char
#define __FLT_DIG__ 6
#define __DEC_EVAL_METHOD__ 2
#define __FLT_MANT_DIG__ 24
#define __LDBL_DECIMAL_DIG__ 21
#define __VERSION__ "8.3.0"
#define __VERSION__ "16.1.1 20260430"
#define __UINT64_C(c) c ## UL
#define __cpp_unicode_characters 200704
#define __cpp_unicode_characters 200704L
#define __DEC64X_MIN__ 1E-6143D64x
#define _STDC_PREDEF_H 1
#define __INT_LEAST32_MAX__ 0x7fffffff
#define __GCC_ATOMIC_INT_LOCK_FREE 2
#define __FLT128_MAX_EXP__ 16384
#define __FLT32_MANT_DIG__ 24
#define __cpp_decltype 200707L
#define __FLOAT_WORD_ORDER__ __ORDER_LITTLE_ENDIAN__
#define __STDC_IEC_559_COMPLEX__ 1
#define __FLT32X_MIN_EXP__ (-1021)
#define __STDC_IEC_60559_COMPLEX__ 201404L
#define __BFLT16_MIN__ 1.17549435082228750796873653722224568e-38BF16
#define __FLT128_HAS_DENORM__ 1
#define __FLT32_DECIMAL_DIG__ 9
#define __FLT128_DIG__ 33
#define __SCHAR_WIDTH__ 8
#define __INT32_C(c) c
#define __DEC64_EPSILON__ 1E-15DD
#define __ORDER_PDP_ENDIAN__ 3412
#define __DEC128_MIN_EXP__ (-6142)
#define __FLT32_MAX_10_EXP__ 38
#define __DEC128_MAX__ 9.999999999999999999999999999999999E6144DL
#define __INT_FAST32_TYPE__ long int
#define __UINT_LEAST16_TYPE__ short unsigned int
#define __FLT64X_HAS_INFINITY__ 1
#define __DEC64X_MANT_DIG__ 34
#define __DEC128_MAX_EXP__ 6145
#define unix 1
#define __INT16_MAX__ 0x7fff
#define __cpp_rtti 199711
#define __SIZE_TYPE__ long unsigned int
#define __DBL_HAS_DENORM__ 1
#define __cpp_rtti 199711L
#define __UINT64_MAX__ 0xffffffffffffffffUL
#define __FLT_IS_IEC_60559__ 1
#define __GNUC_WIDE_EXECUTION_CHARSET_NAME "UTF-32LE"
#define __FLT64X_DIG__ 18
#define __INT8_TYPE__ signed char
#define __ELF__ 1
#define __GCC_ASM_FLAG_OUTPUTS__ 1
#define __UINT32_TYPE__ unsigned int
#define __BFLT16_HAS_QUIET_NAN__ 1
#define __FLT_RADIX__ 2
#define __INT_LEAST16_TYPE__ short int
#define __LDBL_EPSILON__ 1.08420217248550443400745280086994171e-19L
#define __UINTMAX_C(c) c ## UL
#define __GLIBCXX_BITSIZE_INT_N_0 128
#define __FLT16_DIG__ 3
#define __k8 1
#define __FLT32X_MIN__ 2.22507385850720138309023271733240406e-308F32x
#define __SIG_ATOMIC_MAX__ 0x7fffffff
#define __cpp_constexpr 200704L
#define __GCC_ATOMIC_WCHAR_T_LOCK_FREE 2
#define __USER_LABEL_PREFIX__
#define __STDC_IEC_60559_BFP__ 201404L
#define __SIZEOF_PTRDIFF_T__ 8
#define __FLT32X_MANT_DIG__ 53
#define __FLT64X_HAS_INFINITY__ 1
#define __SIZEOF_LONG__ 8
#define __LDBL_DIG__ 18
#define __FLT64_IS_IEC_60559__ 1
#define __x86_64__ 1
#define __FLT32X_MIN_EXP__ (-1021)
#define __FLT16_IS_IEC_60559__ 1
#define __FLT16_MAX_EXP__ 16
#define __DEC32_SUBNORMAL_MIN__ 0.000001E-95DF
#define __STDC_EMBED_FOUND__ 1
#define __INT_FAST16_MAX__ 0x7fffffffffffffffL
#define __GCC_CONSTRUCTIVE_SIZE 64
#define __FLT64_DIG__ 15
#define __UINT_FAST32_MAX__ 0xffffffffffffffffUL
#define __UINT_LEAST64_TYPE__ long unsigned int
#define __FLT16_EPSILON__ 9.76562500000000000000000000000000000e-4F16
#define __FLT_HAS_QUIET_NAN__ 1
#define __FLT_MAX_10_EXP__ 38
#define __LONG_MAX__ 0x7fffffffffffffffL
#define __FLT64X_HAS_DENORM__ 1
#define __DEC128_SUBNORMAL_MIN__ 0.000000000000000000000000000000001E-6143DL
#define __FLT_HAS_INFINITY__ 1
#define __cpp_unicode_literals 200710
#define __GNUC_EXECUTION_CHARSET_NAME "UTF-8"
#define __cpp_unicode_literals 200710L
#define __UINT_FAST16_TYPE__ long unsigned int
#define __DEC64_MAX__ 9.999999999999999E384DD
#define __STDC_EMBED_NOT_FOUND__ 0
#define __INT_FAST32_WIDTH__ 64
#define __CHAR16_TYPE__ short unsigned int
#define __PRAGMA_REDEFINE_EXTNAME 1
#define __DEC64X_SUBNORMAL_MIN__ 0.000000000000000000000000000000001E-6143D64x
#define __SIZE_WIDTH__ 64
#define __SEG_FS 1
#define __INT_LEAST16_MAX__ 0x7fff
#define __FLT16_NORM_MAX__ 6.55040000000000000000000000000000000e+4F16
#define __DEC64_MANT_DIG__ 16
#define __INT64_MAX__ 0x7fffffffffffffffL
#define __UINT_LEAST32_MAX__ 0xffffffffU
#define __SEG_GS 1
#define __FLT32_DENORM_MIN__ 1.40129846432481707092372958328991613e-45F32
#define __GCC_ATOMIC_LONG_LOCK_FREE 2
#define __SIG_ATOMIC_WIDTH__ 32
#define __INT_LEAST64_TYPE__ long int
#define __INT16_TYPE__ short int
#define __INT_LEAST8_TYPE__ signed char
#define __FLT16_MAX__ 6.55040000000000000000000000000000000e+4F16
#define __FLT128_MIN__ 3.36210314311209350626267781732175260e-4932F128
#define __SIZEOF_INT__ 4
#define __DEC32_MAX_EXP__ 97
#define __INT_FAST8_MAX__ 0x7f
#define __FLT128_MAX__ 1.18973149535723176508575932662800702e+4932F128
#define __INTPTR_MAX__ 0x7fffffffffffffffL
#define linux 1
#define __cpp_range_based_for 200907
#define __FLT64_HAS_QUIET_NAN__ 1
#define __FLT32_MIN_10_EXP__ (-37)
#define __SSE2__ 1
#define __EXCEPTIONS 1
#define __LDBL_MANT_DIG__ 64
#define __DBL_HAS_QUIET_NAN__ 1
#define __UINT16_C(c) c
#define __PTRDIFF_WIDTH__ 64
#define __cpp_range_based_for 200907L
#define __INT_FAST16_WIDTH__ 64
#define __FLT64_HAS_INFINITY__ 1
#define __FLT64X_MAX__ 1.18973149535723176502126385303097021e+4932F64x
#define __FLT16_HAS_INFINITY__ 1
#define __SIG_ATOMIC_MIN__ (-__SIG_ATOMIC_MAX__ - 1)
#define __code_model_small__ 1
#define __GCC_ATOMIC_LONG_LOCK_FREE 2
#define __DEC32_MANT_DIG__ 7
#define __k8__ 1
#define __INTPTR_TYPE__ long int
#define __UINT16_TYPE__ short unsigned int
#define __WCHAR_TYPE__ int
#define __SIZEOF_FLOAT__ 4
#define __pic__ 2
#define __UINTPTR_MAX__ 0xffffffffffffffffUL
#define __INT_FAST64_WIDTH__ 64
#define __DEC64_MIN_EXP__ (-382)
#define __cpp_decltype 200707
#define __FLT32_DECIMAL_DIG__ 9
#define __INT_FAST64_MAX__ 0x7fffffffffffffffL
#define __GCC_ATOMIC_TEST_AND_SET_TRUEVAL 1
#define __FLT_DIG__ 6
#define __FLT_NORM_MAX__ 3.40282346638528859811704183484516925e+38F
#define __FLT32_HAS_INFINITY__ 1
#define __FLT64X_MAX_EXP__ 16384
#define __UINT_FAST64_TYPE__ long unsigned int
#define __BFLT16_MIN_EXP__ (-125)
#define __INT_MAX__ 0x7fffffff
#define __amd64__ 1
#define __linux__ 1
#define __INT64_TYPE__ long int
#define __FLT_MAX_EXP__ 128
#define __ORDER_BIG_ENDIAN__ 4321
#define __DBL_MANT_DIG__ 53
#define __cpp_inheriting_constructors 201511
#define __SIZEOF_FLOAT128__ 16
#define __INT_LEAST64_MAX__ 0x7fffffffffffffffL
#define __BFLT16_MANT_DIG__ 8
#define __DEC64_MIN__ 1E-383DD
#define __WINT_TYPE__ unsigned int
#define __UINT_LEAST32_TYPE__ unsigned int
#define __SIZEOF_SHORT__ 2
#define __FLT32_NORM_MAX__ 3.40282346638528859811704183484516925e+38F32
#define __SSE__ 1
#define __LDBL_MIN_EXP__ (-16381)
#define __FLT64_MAX__ 1.79769313486231570814527423731704357e+308F64
#define __DEC64X_MIN_EXP__ (-6142)
#define __amd64__ 1
#define __WINT_WIDTH__ 32
#define __INT_LEAST8_MAX__ 0x7f
#define __INT_LEAST64_WIDTH__ 64
#define __FLT32X_MAX_10_EXP__ 308
#define __SIZEOF_INT128__ 16
#define __FLT16_MIN__ 6.10351562500000000000000000000000000e-5F16
#define __FLT64X_IS_IEC_60559__ 1
#define __GXX_CONSTEXPR_ASM__ 1
#define __LDBL_MAX_10_EXP__ 4932
#define __ATOMIC_RELAXED 0
#define __DBL_EPSILON__ double(2.22044604925031308084726333618164062e-16L)
#define __FLT128_MIN__ 3.36210314311209350626267781732175260e-4932F128
#define __INT_LEAST32_TYPE__ int
#define _LP64 1
#define __UINT8_C(c) c
#define __FLT64_MAX_EXP__ 1024
#define __INT_LEAST32_TYPE__ int
#define __SIZEOF_WCHAR_T__ 4
#define __GNUC_PATCHLEVEL__ 1
#define __FLT128_NORM_MAX__ 1.18973149535723176508575932662800702e+4932F128
#define __FLT64_NORM_MAX__ 1.79769313486231570814527423731704357e+308F64
#define __FLT128_HAS_QUIET_NAN__ 1
#define __INTMAX_MAX__ 0x7fffffffffffffffL
#define __INT_FAST8_TYPE__ signed char
#define __FLT64X_MIN__ 3.36210314311209350626267781732175260e-4932F64x
#define __FLT64_EPSILON__ 2.22044604925031308084726333618164062e-16F64
#define __STDCPP_THREADS__ 1
#define __BFLT16_HAS_DENORM__ 1
#define __GNUC_STDC_INLINE__ 1
#define __FLT64_HAS_DENORM__ 1
#define __FLT32_EPSILON__ 1.19209289550781250000000000000000000e-7F32
#define __FLT16_HAS_DENORM__ 1
#define __DBL_DECIMAL_DIG__ 17
#define __STDC_UTF_32__ 1
#define __INT_FAST8_WIDTH__ 8
#define __FXSR__ 1
#define __DEC_EVAL_METHOD__ 2
#define __FLT32X_MAX__ 1.79769313486231570814527423731704357e+308F32x
#define __cpp_runtime_arrays 198712
#define __DBL_NORM_MAX__ double(1.79769313486231570814527423731704357e+308L)
#define __BYTE_ORDER__ __ORDER_LITTLE_ENDIAN__
#define __GCC_DESTRUCTIVE_SIZE 64
#define __INTMAX_WIDTH__ 64
#define __cpp_runtime_arrays 198712L
#define __FLT32_DIG__ 6
#define __UINT64_TYPE__ long unsigned int
#define __UINT32_C(c) c ## U
#define __INTMAX_MAX__ 0x7fffffffffffffffL
#define __cpp_alias_templates 200704
#define __BYTE_ORDER__ __ORDER_LITTLE_ENDIAN__
#define __cpp_alias_templates 200704L
#define __FLT_DENORM_MIN__ 1.40129846432481707092372958328991613e-45F
#define __FLT128_IS_IEC_60559__ 1
#define __INT8_MAX__ 0x7f
#define __LONG_WIDTH__ 64
#define __DBL_MIN__ double(2.22507385850720138309023271733240406e-308L)
#define __PIC__ 2
#define __INT32_MAX__ 0x7fffffff
#define __UINT_FAST32_TYPE__ long unsigned int
#define __FLT16_MANT_DIG__ 11
#define __FLT32X_NORM_MAX__ 1.79769313486231570814527423731704357e+308F32x
#define __CHAR32_TYPE__ unsigned int
#define __FLT_MAX__ 3.40282346638528859811704183484516925e+38F
#define __cpp_constexpr 200704
#define __SSE2__ 1
#define __BFLT16_NORM_MAX__ 3.38953138925153547590470800371487867e+38BF16
#define __INT32_TYPE__ int
#define __SIZEOF_DOUBLE__ 8
#define __cpp_exceptions 199711
#define __cpp_exceptions 199711L
#define __FLT_MIN_10_EXP__ (-37)
#define __FLT64_MIN__ 2.22507385850720138309023271733240406e-308F64
#define __INT_LEAST32_WIDTH__ 32
#define __INTMAX_TYPE__ long int
#define __DEC128_MAX_EXP__ 6145
#define __GLIBCXX_BITSIZE_INT_N_0 128
#define __FLT32X_HAS_QUIET_NAN__ 1
#define __ATOMIC_CONSUME 1
#define __GNUC_MINOR__ 3
#define __GNUC_MINOR__ 1
#define __GLIBCXX_TYPE_INT_N_0 __int128
#define __INT_FAST16_WIDTH__ 64
#define __UINTMAX_MAX__ 0xffffffffffffffffUL
#define __DEC32_MANT_DIG__ 7
#define __PIE__ 2
#define __FLT32X_DENORM_MIN__ 4.94065645841246544176568792868221372e-324F32x
#define __DBL_MAX_10_EXP__ 308
#define __LDBL_DENORM_MIN__ 3.64519953188247460252840593361941982e-4951L
#define __INT16_C(c) c
#define __STDC__ 1
#define __FLT32X_DIG__ 15
#define __PTRDIFF_TYPE__ long int
#define __ATOMIC_SEQ_CST 5
#define __UINT32_TYPE__ unsigned int
#define __LONG_MAX__ 0x7fffffffffffffffL
#define __FLT32X_MIN_10_EXP__ (-307)
#define __UINTPTR_TYPE__ long unsigned int
#define __DEC64_SUBNORMAL_MIN__ 0.000000000000001E-383DD
#define __DEC128_MANT_DIG__ 34
#define __LDBL_MIN_10_EXP__ (-4931)
#define __FLT128_EPSILON__ 1.92592994438723585305597794258492732e-34F128
#define __SSE_MATH__ 1
#define __SIZEOF_LONG_LONG__ 8
#define __cpp_user_defined_literals 200809
#define __cpp_user_defined_literals 200809L
#define __FLT128_DECIMAL_DIG__ 36
#define __GCC_ATOMIC_LLONG_LOCK_FREE 2
#define __FLT32X_MIN__ 2.22507385850720138309023271733240406e-308F32x
#define __LDBL_DIG__ 18
#define __FLT32_HAS_QUIET_NAN__ 1
#define __FLT_DECIMAL_DIG__ 9
#define __UINT_FAST16_MAX__ 0xffffffffffffffffUL
#define __LDBL_NORM_MAX__ 1.18973149535723176502126385303097021e+4932L
#define __GCC_ATOMIC_SHORT_LOCK_FREE 2
#define __INT_LEAST64_WIDTH__ 64
#define __SIZE_MAX__ 0xffffffffffffffffUL
#define __UINT_FAST8_TYPE__ unsigned char
#define _GNU_SOURCE 1
#define __ATOMIC_ACQ_REL 4
src/gui/QT/build/ui_hiperiso2diskwindow.h → src/gui/QT/build_output/ui_hiperiso2diskwindow.h
+50 -51
View File
@@ -1,7 +1,7 @@
/********************************************************************************
** Form generated from reading UI file 'hiperiso2diskwindow.ui'
**
** Created by: Qt User Interface Compiler version 5.9.0
** Created by: Qt User Interface Compiler version 5.15.19
**
** WARNING! All changes made in this file will be lost when recompiling UI file!
********************************************************************************/
@@ -10,12 +10,11 @@
#define UI_HIPERISO2DISKWINDOW_H
#include <QtCore/QVariant>
#include <QtGui/QIcon>
#include <QtWidgets/QAction>
#include <QtWidgets/QApplication>
#include <QtWidgets/QButtonGroup>
#include <QtWidgets/QComboBox>
#include <QtWidgets/QGroupBox>
#include <QtWidgets/QHeaderView>
#include <QtWidgets/QLabel>
#include <QtWidgets/QMainWindow>
#include <QtWidgets/QMenu>
@@ -59,93 +58,93 @@ public:
void setupUi(QMainWindow *Hiperiso2DiskWindow)
{
if (Hiperiso2DiskWindow->objectName().isEmpty())
Hiperiso2DiskWindow->setObjectName(QStringLiteral("Hiperiso2DiskWindow"));
Hiperiso2DiskWindow->setObjectName(QString::fromUtf8("Hiperiso2DiskWindow"));
Hiperiso2DiskWindow->resize(441, 367);
actionSecure_Boot_Support = new QAction(Hiperiso2DiskWindow);
actionSecure_Boot_Support->setObjectName(QStringLiteral("actionSecure_Boot_Support"));
actionSecure_Boot_Support->setObjectName(QString::fromUtf8("actionSecure_Boot_Support"));
actionSecure_Boot_Support->setCheckable(true);
actionMBR = new QAction(Hiperiso2DiskWindow);
actionMBR->setObjectName(QStringLiteral("actionMBR"));
actionMBR->setObjectName(QString::fromUtf8("actionMBR"));
actionMBR->setCheckable(true);
actionGPT = new QAction(Hiperiso2DiskWindow);
actionGPT->setObjectName(QStringLiteral("actionGPT"));
actionGPT->setObjectName(QString::fromUtf8("actionGPT"));
actionGPT->setCheckable(true);
actionPartition_Configuration = new QAction(Hiperiso2DiskWindow);
actionPartition_Configuration->setObjectName(QStringLiteral("actionPartition_Configuration"));
actionPartition_Configuration->setObjectName(QString::fromUtf8("actionPartition_Configuration"));
actionClear_Hiperiso = new QAction(Hiperiso2DiskWindow);
actionClear_Hiperiso->setObjectName(QStringLiteral("actionClear_Hiperiso"));
actionClear_Hiperiso->setObjectName(QString::fromUtf8("actionClear_Hiperiso"));
actionShow_All_Devices = new QAction(Hiperiso2DiskWindow);
actionShow_All_Devices->setObjectName(QStringLiteral("actionShow_All_Devices"));
actionShow_All_Devices->setObjectName(QString::fromUtf8("actionShow_All_Devices"));
actionShow_All_Devices->setCheckable(true);
centralwidget = new QWidget(Hiperiso2DiskWindow);
centralwidget->setObjectName(QStringLiteral("centralwidget"));
centralwidget->setObjectName(QString::fromUtf8("centralwidget"));
groupBoxDevice = new QGroupBox(centralwidget);
groupBoxDevice->setObjectName(QStringLiteral("groupBoxDevice"));
groupBoxDevice->setObjectName(QString::fromUtf8("groupBoxDevice"));
groupBoxDevice->setGeometry(QRect(10, 10, 421, 80));
comboBoxDevice = new QComboBox(groupBoxDevice);
comboBoxDevice->setObjectName(QStringLiteral("comboBoxDevice"));
comboBoxDevice->setObjectName(QString::fromUtf8("comboBoxDevice"));
comboBoxDevice->setGeometry(QRect(10, 40, 361, 26));
ButtonRefresh = new QPushButton(groupBoxDevice);
ButtonRefresh->setObjectName(QStringLiteral("ButtonRefresh"));
ButtonRefresh->setObjectName(QString::fromUtf8("ButtonRefresh"));
ButtonRefresh->setGeometry(QRect(380, 37, 30, 30));
QIcon icon;
icon.addFile(QStringLiteral("../refresh.ico"), QSize(), QIcon::Normal, QIcon::Off);
icon.addFile(QString::fromUtf8("../refresh.ico"), QSize(), QIcon::Normal, QIcon::Off);
ButtonRefresh->setIcon(icon);
ButtonRefresh->setIconSize(QSize(24, 24));
groupBoxHiperisoLocal = new QGroupBox(centralwidget);
groupBoxHiperisoLocal->setObjectName(QStringLiteral("groupBoxHiperisoLocal"));
groupBoxHiperisoLocal->setObjectName(QString::fromUtf8("groupBoxHiperisoLocal"));
groupBoxHiperisoLocal->setGeometry(QRect(10, 100, 205, 80));
groupBoxHiperisoLocal->setAlignment(Qt::AlignCenter);
labelHiperisoLocalVer = new QLabel(groupBoxHiperisoLocal);
labelHiperisoLocalVer->setObjectName(QStringLiteral("labelHiperisoLocalVer"));
labelHiperisoLocalVer->setObjectName(QString::fromUtf8("labelHiperisoLocalVer"));
labelHiperisoLocalVer->setGeometry(QRect(30, 30, 135, 41));
labelHiperisoLocalVer->setAlignment(Qt::AlignCenter);
labelHiperisoLocalPartStyle = new QLabel(groupBoxHiperisoLocal);
labelHiperisoLocalPartStyle->setObjectName(QStringLiteral("labelHiperisoLocalPartStyle"));
labelHiperisoLocalPartStyle->setObjectName(QString::fromUtf8("labelHiperisoLocalPartStyle"));
labelHiperisoLocalPartStyle->setGeometry(QRect(172, 60, 31, 18));
labelHiperisoLocalSecure = new QLabel(groupBoxHiperisoLocal);
labelHiperisoLocalSecure->setObjectName(QStringLiteral("labelHiperisoLocalSecure"));
labelHiperisoLocalSecure->setObjectName(QString::fromUtf8("labelHiperisoLocalSecure"));
labelHiperisoLocalSecure->setGeometry(QRect(12, 36, 21, 31));
labelHiperisoLocalSecure->setPixmap(QPixmap(QString::fromUtf8("../secure.ico")));
groupBoxHiperisoDevice = new QGroupBox(centralwidget);
groupBoxHiperisoDevice->setObjectName(QStringLiteral("groupBoxHiperisoDevice"));
groupBoxHiperisoDevice->setObjectName(QString::fromUtf8("groupBoxHiperisoDevice"));
groupBoxHiperisoDevice->setGeometry(QRect(225, 100, 205, 80));
groupBoxHiperisoDevice->setAlignment(Qt::AlignCenter);
labelHiperisoDeviceVer = new QLabel(groupBoxHiperisoDevice);
labelHiperisoDeviceVer->setObjectName(QStringLiteral("labelHiperisoDeviceVer"));
labelHiperisoDeviceVer->setObjectName(QString::fromUtf8("labelHiperisoDeviceVer"));
labelHiperisoDeviceVer->setGeometry(QRect(30, 30, 135, 41));
labelHiperisoDeviceVer->setAlignment(Qt::AlignCenter);
labelHiperisoDevicePartStyle = new QLabel(groupBoxHiperisoDevice);
labelHiperisoDevicePartStyle->setObjectName(QStringLiteral("labelHiperisoDevicePartStyle"));
labelHiperisoDevicePartStyle->setObjectName(QString::fromUtf8("labelHiperisoDevicePartStyle"));
labelHiperisoDevicePartStyle->setGeometry(QRect(172, 60, 31, 18));
labelHiperisoDeviceSecure = new QLabel(groupBoxHiperisoDevice);
labelHiperisoDeviceSecure->setObjectName(QStringLiteral("labelHiperisoDeviceSecure"));
labelHiperisoDeviceSecure->setObjectName(QString::fromUtf8("labelHiperisoDeviceSecure"));
labelHiperisoDeviceSecure->setGeometry(QRect(12, 36, 21, 31));
labelHiperisoDeviceSecure->setPixmap(QPixmap(QString::fromUtf8("../secure.ico")));
groupBoxStatus = new QGroupBox(centralwidget);
groupBoxStatus->setObjectName(QStringLiteral("groupBoxStatus"));
groupBoxStatus->setObjectName(QString::fromUtf8("groupBoxStatus"));
groupBoxStatus->setGeometry(QRect(10, 190, 421, 61));
progressBar = new QProgressBar(groupBoxStatus);
progressBar->setObjectName(QStringLiteral("progressBar"));
progressBar->setObjectName(QString::fromUtf8("progressBar"));
progressBar->setGeometry(QRect(10, 30, 401, 23));
progressBar->setValue(0);
progressBar->setTextVisible(false);
ButtonInstall = new QPushButton(centralwidget);
ButtonInstall->setObjectName(QStringLiteral("ButtonInstall"));
ButtonInstall->setObjectName(QString::fromUtf8("ButtonInstall"));
ButtonInstall->setGeometry(QRect(90, 275, 101, 41));
ButtonUpdate = new QPushButton(centralwidget);
ButtonUpdate->setObjectName(QStringLiteral("ButtonUpdate"));
ButtonUpdate->setObjectName(QString::fromUtf8("ButtonUpdate"));
ButtonUpdate->setGeometry(QRect(250, 275, 101, 41));
Hiperiso2DiskWindow->setCentralWidget(centralwidget);
menubar = new QMenuBar(Hiperiso2DiskWindow);
menubar->setObjectName(QStringLiteral("menubar"));
menubar->setObjectName(QString::fromUtf8("menubar"));
menubar->setGeometry(QRect(0, 0, 441, 23));
menuOption = new QMenu(menubar);
menuOption->setObjectName(QStringLiteral("menuOption"));
menuOption->setObjectName(QString::fromUtf8("menuOption"));
menuPartition_Style = new QMenu(menuOption);
menuPartition_Style->setObjectName(QStringLiteral("menuPartition_Style"));
menuPartition_Style->setObjectName(QString::fromUtf8("menuPartition_Style"));
menuLanguage = new QMenu(menubar);
menuLanguage->setObjectName(QStringLiteral("menuLanguage"));
menuLanguage->setObjectName(QString::fromUtf8("menuLanguage"));
Hiperiso2DiskWindow->setMenuBar(menubar);
menubar->addAction(menuOption->menuAction());
@@ -165,30 +164,30 @@ public:
void retranslateUi(QMainWindow *Hiperiso2DiskWindow)
{
Hiperiso2DiskWindow->setWindowTitle(QApplication::translate("Hiperiso2DiskWindow", "Hiperiso2Disk", Q_NULLPTR));
actionSecure_Boot_Support->setText(QApplication::translate("Hiperiso2DiskWindow", "Secure Boot Support", Q_NULLPTR));
actionMBR->setText(QApplication::translate("Hiperiso2DiskWindow", "MBR", Q_NULLPTR));
actionGPT->setText(QApplication::translate("Hiperiso2DiskWindow", "GPT", Q_NULLPTR));
actionPartition_Configuration->setText(QApplication::translate("Hiperiso2DiskWindow", "Partition Configuration", Q_NULLPTR));
actionClear_Hiperiso->setText(QApplication::translate("Hiperiso2DiskWindow", "Clear Hiperiso", Q_NULLPTR));
actionShow_All_Devices->setText(QApplication::translate("Hiperiso2DiskWindow", "Show All Devices", Q_NULLPTR));
groupBoxDevice->setTitle(QApplication::translate("Hiperiso2DiskWindow", "Device", Q_NULLPTR));
Hiperiso2DiskWindow->setWindowTitle(QCoreApplication::translate("Hiperiso2DiskWindow", "Hiperiso2Disk", nullptr));
actionSecure_Boot_Support->setText(QCoreApplication::translate("Hiperiso2DiskWindow", "Secure Boot Support", nullptr));
actionMBR->setText(QCoreApplication::translate("Hiperiso2DiskWindow", "MBR", nullptr));
actionGPT->setText(QCoreApplication::translate("Hiperiso2DiskWindow", "GPT", nullptr));
actionPartition_Configuration->setText(QCoreApplication::translate("Hiperiso2DiskWindow", "Partition Configuration", nullptr));
actionClear_Hiperiso->setText(QCoreApplication::translate("Hiperiso2DiskWindow", "Clear Hiperiso", nullptr));
actionShow_All_Devices->setText(QCoreApplication::translate("Hiperiso2DiskWindow", "Show All Devices", nullptr));
groupBoxDevice->setTitle(QCoreApplication::translate("Hiperiso2DiskWindow", "Device", nullptr));
ButtonRefresh->setText(QString());
groupBoxHiperisoLocal->setTitle(QApplication::translate("Hiperiso2DiskWindow", "Hiperiso In Package", Q_NULLPTR));
labelHiperisoLocalVer->setText(QApplication::translate("Hiperiso2DiskWindow", "<html><head/><body><p><span style=\" font-size:20pt; font-weight:600; color:#ff0000;\">1.0.53</span></p></body></html>", Q_NULLPTR));
labelHiperisoLocalPartStyle->setText(QApplication::translate("Hiperiso2DiskWindow", "<html><head/><body><p>MBR</p></body></html>", Q_NULLPTR));
groupBoxHiperisoLocal->setTitle(QCoreApplication::translate("Hiperiso2DiskWindow", "Hiperiso In Package", nullptr));
labelHiperisoLocalVer->setText(QCoreApplication::translate("Hiperiso2DiskWindow", "<html><head/><body><p><span style=\" font-size:20pt; font-weight:600; color:#ff0000;\">1.0.53</span></p></body></html>", nullptr));
labelHiperisoLocalPartStyle->setText(QCoreApplication::translate("Hiperiso2DiskWindow", "<html><head/><body><p>MBR</p></body></html>", nullptr));
labelHiperisoLocalSecure->setText(QString());
groupBoxHiperisoDevice->setTitle(QApplication::translate("Hiperiso2DiskWindow", "Hiperiso In Device", Q_NULLPTR));
labelHiperisoDeviceVer->setText(QApplication::translate("Hiperiso2DiskWindow", "<html><head/><body><p><span style=\" font-size:20pt; font-weight:600; color:#ff0000;\">1.0.52</span></p></body></html>", Q_NULLPTR));
labelHiperisoDevicePartStyle->setText(QApplication::translate("Hiperiso2DiskWindow", "<html><head/><body><p>GPT</p></body></html>", Q_NULLPTR));
groupBoxHiperisoDevice->setTitle(QCoreApplication::translate("Hiperiso2DiskWindow", "Hiperiso In Device", nullptr));
labelHiperisoDeviceVer->setText(QCoreApplication::translate("Hiperiso2DiskWindow", "<html><head/><body><p><span style=\" font-size:20pt; font-weight:600; color:#ff0000;\">1.0.52</span></p></body></html>", nullptr));
labelHiperisoDevicePartStyle->setText(QCoreApplication::translate("Hiperiso2DiskWindow", "<html><head/><body><p>GPT</p></body></html>", nullptr));
labelHiperisoDeviceSecure->setText(QString());
groupBoxStatus->setTitle(QApplication::translate("Hiperiso2DiskWindow", "Status: REDAY", Q_NULLPTR));
groupBoxStatus->setTitle(QCoreApplication::translate("Hiperiso2DiskWindow", "Status: REDAY", nullptr));
progressBar->setFormat(QString());
ButtonInstall->setText(QApplication::translate("Hiperiso2DiskWindow", "Install", Q_NULLPTR));
ButtonUpdate->setText(QApplication::translate("Hiperiso2DiskWindow", "Update", Q_NULLPTR));
menuOption->setTitle(QApplication::translate("Hiperiso2DiskWindow", "Option", Q_NULLPTR));
menuPartition_Style->setTitle(QApplication::translate("Hiperiso2DiskWindow", "Partition Style", Q_NULLPTR));
menuLanguage->setTitle(QApplication::translate("Hiperiso2DiskWindow", "Language", Q_NULLPTR));
ButtonInstall->setText(QCoreApplication::translate("Hiperiso2DiskWindow", "Install", nullptr));
ButtonUpdate->setText(QCoreApplication::translate("Hiperiso2DiskWindow", "Update", nullptr));
menuOption->setTitle(QCoreApplication::translate("Hiperiso2DiskWindow", "Option", nullptr));
menuPartition_Style->setTitle(QCoreApplication::translate("Hiperiso2DiskWindow", "Partition Style", nullptr));
menuLanguage->setTitle(QCoreApplication::translate("Hiperiso2DiskWindow", "Language", nullptr));
} // retranslateUi
};
src/gui/QT/build/ui_partcfgdialog.h → src/gui/QT/build_output/ui_partcfgdialog.h
+29 -32
View File
@@ -1,7 +1,7 @@
/********************************************************************************
** Form generated from reading UI file 'partcfgdialog.ui'
**
** Created by: Qt User Interface Compiler version 5.9.0
** Created by: Qt User Interface Compiler version 5.15.19
**
** WARNING! All changes made in this file will be lost when recompiling UI file!
********************************************************************************/
@@ -10,14 +10,11 @@
#define UI_PARTCFGDIALOG_H
#include <QtCore/QVariant>
#include <QtWidgets/QAction>
#include <QtWidgets/QApplication>
#include <QtWidgets/QButtonGroup>
#include <QtWidgets/QCheckBox>
#include <QtWidgets/QComboBox>
#include <QtWidgets/QDialog>
#include <QtWidgets/QGroupBox>
#include <QtWidgets/QHeaderView>
#include <QtWidgets/QLineEdit>
#include <QtWidgets/QPushButton>
@@ -40,40 +37,42 @@ public:
void setupUi(QDialog *PartCfgDialog)
{
if (PartCfgDialog->objectName().isEmpty())
PartCfgDialog->setObjectName(QStringLiteral("PartCfgDialog"));
PartCfgDialog->setObjectName(QString::fromUtf8("PartCfgDialog"));
PartCfgDialog->resize(420, 258);
pushButtonOK = new QPushButton(PartCfgDialog);
pushButtonOK->setObjectName(QStringLiteral("pushButtonOK"));
pushButtonOK->setObjectName(QString::fromUtf8("pushButtonOK"));
pushButtonOK->setGeometry(QRect(90, 210, 90, 30));
pushButtonCancel = new QPushButton(PartCfgDialog);
pushButtonCancel->setObjectName(QStringLiteral("pushButtonCancel"));
pushButtonCancel->setObjectName(QString::fromUtf8("pushButtonCancel"));
pushButtonCancel->setGeometry(QRect(230, 210, 90, 30));
groupBox = new QGroupBox(PartCfgDialog);
groupBox->setObjectName(QStringLiteral("groupBox"));
groupBox->setGeometry(QRect(10, 0, 400, 61));
groupBox->setObjectName(QString::fromUtf8("groupBox"));
groupBox->setGeometry(QRect(10, 10, 400, 51));
checkBox = new QCheckBox(groupBox);
checkBox->setObjectName(QStringLiteral("checkBox"));
checkBox->setGeometry(QRect(10, 20, 381, 41));
checkBox->setObjectName(QString::fromUtf8("checkBox"));
checkBox->setGeometry(QRect(10, 10, 381, 41));
checkBox->setAutoRepeatInterval(0);
groupBox_2 = new QGroupBox(PartCfgDialog);
groupBox_2->setObjectName(QStringLiteral("groupBox_2"));
groupBox_2->setGeometry(QRect(10, 60, 200, 61));
groupBox_2->setObjectName(QString::fromUtf8("groupBox_2"));
groupBox_2->setGeometry(QRect(10, 60, 200, 60));
lineEdit = new QLineEdit(groupBox_2);
lineEdit->setObjectName(QStringLiteral("lineEdit"));
lineEdit->setGeometry(QRect(10, 30, 181, 26));
lineEdit->setObjectName(QString::fromUtf8("lineEdit"));
lineEdit->setGeometry(QRect(10, 20, 181, 26));
lineEdit->setMaxLength(14);
groupBox_3 = new QGroupBox(PartCfgDialog);
groupBox_3->setObjectName(QStringLiteral("groupBox_3"));
groupBox_3->setObjectName(QString::fromUtf8("groupBox_3"));
groupBox_3->setGeometry(QRect(210, 60, 200, 60));
comboBox = new QComboBox(groupBox_3);
comboBox->setObjectName(QStringLiteral("comboBox"));
comboBox->setGeometry(QRect(10, 30, 181, 26));
comboBox->addItem(QString());
comboBox->addItem(QString());
comboBox->setObjectName(QString::fromUtf8("comboBox"));
comboBox->setGeometry(QRect(10, 20, 181, 26));
groupBox_4 = new QGroupBox(PartCfgDialog);
groupBox_4->setObjectName(QStringLiteral("groupBox_4"));
groupBox_4->setGeometry(QRect(10, 120, 401, 61));
groupBox_4->setObjectName(QString::fromUtf8("groupBox_4"));
groupBox_4->setGeometry(QRect(10, 130, 401, 51));
checkBox_2 = new QCheckBox(groupBox_4);
checkBox_2->setObjectName(QStringLiteral("checkBox_2"));
checkBox_2->setGeometry(QRect(10, 30, 381, 24));
checkBox_2->setObjectName(QString::fromUtf8("checkBox_2"));
checkBox_2->setGeometry(QRect(10, 18, 381, 24));
checkBox_2->setChecked(true);
retranslateUi(PartCfgDialog);
@@ -86,20 +85,18 @@ public:
void retranslateUi(QDialog *PartCfgDialog)
{
PartCfgDialog->setWindowTitle(QApplication::translate("PartCfgDialog", "Partition Configuration", Q_NULLPTR));
pushButtonOK->setText(QApplication::translate("PartCfgDialog", "OK", Q_NULLPTR));
pushButtonCancel->setText(QApplication::translate("PartCfgDialog", "Cancel", Q_NULLPTR));
PartCfgDialog->setWindowTitle(QCoreApplication::translate("PartCfgDialog", "Partition Configuration", nullptr));
pushButtonOK->setText(QCoreApplication::translate("PartCfgDialog", "OK", nullptr));
pushButtonCancel->setText(QCoreApplication::translate("PartCfgDialog", "Cancel", nullptr));
groupBox->setTitle(QString());
checkBox->setText(QApplication::translate("PartCfgDialog", "Preserve some space at the end of the disk", Q_NULLPTR));
checkBox->setText(QCoreApplication::translate("PartCfgDialog", "Preserve some space at the end of the disk", nullptr));
groupBox_2->setTitle(QString());
groupBox_3->setTitle(QString());
comboBox->clear();
comboBox->insertItems(0, QStringList()
<< QApplication::translate("PartCfgDialog", "MB", Q_NULLPTR)
<< QApplication::translate("PartCfgDialog", "GB", Q_NULLPTR)
);
comboBox->setItemText(0, QCoreApplication::translate("PartCfgDialog", "MB", nullptr));
comboBox->setItemText(1, QCoreApplication::translate("PartCfgDialog", "GB", nullptr));
groupBox_4->setTitle(QString());
checkBox_2->setText(QApplication::translate("PartCfgDialog", "Align partitions with 4KB", Q_NULLPTR));
checkBox_2->setText(QCoreApplication::translate("PartCfgDialog", "Align partitions with 4KB", nullptr));
} // retranslateUi
};
src/gui/QT/hiperiso2diskwindow.cpp
+119 -119
View File
@@ -1,16 +1,16 @@
#include "ventoy2diskwindow.h"
#include "ui_ventoy2diskwindow.h"
#include "hiperiso2diskwindow.h"
#include "ui_hiperiso2diskwindow.h"
#include "partcfgdialog.h"
#include <QMessageBox>
extern "C" {
#include "ventoy_define.h"
#include "ventoy_util.h"
#include "ventoy_disk.h"
#include "ventoy_json.h"
#include "ventoy_http.h"
#include "ventoy_qt.h"
#include "hiperiso_define.h"
#include "hiperiso_util.h"
#include "hiperiso_disk.h"
#include "hiperiso_json.h"
#include "hiperiso_http.h"
#include "hiperiso_qt.h"
}
MyQThread::MyQThread(QObject *parent) : QThread(parent)
@@ -30,7 +30,7 @@ void MyQThread::install_run()
char dec[64];
char out[256];
char disk_name[32];
ventoy_disk *cur;
hiperiso_disk *cur;
vlog("install run %d ...\n", m_index);
@@ -39,32 +39,32 @@ void MyQThread::install_run()
snprintf(dec, sizeof(dec), "%llu", (unsigned long long)m_reserve_space);
buflen = sizeof(buf);
VTOY_JSON_FMT_BEGIN(pos, buf, buflen);
VTOY_JSON_FMT_OBJ_BEGIN();
VTOY_JSON_FMT_STRN("method", "install");
VTOY_JSON_FMT_STRN("disk", disk_name);
VTOY_JSON_FMT_STRN("reserve_space", dec);
VTOY_JSON_FMT_UINT("partstyle", ventoy_code_get_cur_part_style());
VTOY_JSON_FMT_UINT("secure_boot", m_secureboot);
VTOY_JSON_FMT_UINT("align_4kb", m_align4K);
VTOY_JSON_FMT_OBJ_END();
VTOY_JSON_FMT_END(pos);
HISO_JSON_FMT_BEGIN(pos, buf, buflen);
HISO_JSON_FMT_OBJ_BEGIN();
HISO_JSON_FMT_STRN("method", "install");
HISO_JSON_FMT_STRN("disk", disk_name);
HISO_JSON_FMT_STRN("reserve_space", dec);
HISO_JSON_FMT_UINT("partstyle", hiperiso_code_get_cur_part_style());
HISO_JSON_FMT_UINT("secure_boot", m_secureboot);
HISO_JSON_FMT_UINT("align_4kb", m_align4K);
HISO_JSON_FMT_OBJ_END();
HISO_JSON_FMT_END(pos);
out[0] = 0;
ventoy_func_handler(buf, out, sizeof(out));
hiperiso_func_handler(buf, out, sizeof(out));
vlog("func handler install <%s>\n", out);
if (strstr(out, "success"))
{
while (percent != 100)
{
percent = ventoy_code_get_percent();
percent = hiperiso_code_get_percent();
emit thread_event(THREAD_MSG_PROGRESS_BAR, percent);
msleep(50);
}
ret = ventoy_code_get_result();
ventoy_code_refresh_device();
ret = hiperiso_code_get_result();
hiperiso_code_refresh_device();
cur = NULL;
}
else
@@ -83,7 +83,7 @@ void MyQThread::update_run()
char buf[1024];
char out[256];
char disk_name[32];
ventoy_disk *cur;
hiperiso_disk *cur;
vlog("install run %d ...\n", m_index);
@@ -92,20 +92,20 @@ void MyQThread::update_run()
snprintf(buf, sizeof(buf), "{\"method\":\"update\",\"disk\":\"%s\",\"secure_boot\":%d}", disk_name, m_secureboot);
out[0] = 0;
ventoy_func_handler(buf, out, sizeof(out));
hiperiso_func_handler(buf, out, sizeof(out));
vlog("func handler update <%s>\n", out);
if (strstr(out, "success"))
{
while (percent != 100)
{
percent = ventoy_code_get_percent();
percent = hiperiso_code_get_percent();
emit thread_event(THREAD_MSG_PROGRESS_BAR, percent);
msleep(50);
}
ret = ventoy_code_get_result();
ventoy_code_refresh_device();
ret = hiperiso_code_get_result();
hiperiso_code_refresh_device();
cur = NULL;
}
else
@@ -134,9 +134,9 @@ void MyQThread::run()
}
Ventoy2DiskWindow::Ventoy2DiskWindow(QWidget *parent)
Hiperiso2DiskWindow::Hiperiso2DiskWindow(QWidget *parent)
: QMainWindow(parent)
, ui(new Ui::Ventoy2DiskWindow)
, ui(new Ui::Hiperiso2DiskWindow)
{
m_partcfg = new PartCfgDialog();
m_part_group = new QActionGroup(this);
@@ -146,7 +146,7 @@ Ventoy2DiskWindow::Ventoy2DiskWindow(QWidget *parent)
ui->setupUi(this);
}
Ventoy2DiskWindow::~Ventoy2DiskWindow()
Hiperiso2DiskWindow::~Hiperiso2DiskWindow()
{
delete m_partcfg;
delete m_part_group;
@@ -171,9 +171,9 @@ bool LangCompare(const QString &s1, const QString &s2)
}
}
int Ventoy2DiskWindow::lang_string(const QString &id, QString &str)
int Hiperiso2DiskWindow::lang_string(const QString &id, QString &str)
{
QString cur = ventoy_code_get_cur_language();
QString cur = hiperiso_code_get_cur_language();
for (QJsonArray::iterator p = m_lang_array.begin(); p != m_lang_array.end(); p++)
{
@@ -188,11 +188,11 @@ int Ventoy2DiskWindow::lang_string(const QString &id, QString &str)
return 1;
}
void Ventoy2DiskWindow::update_ui_language()
void Hiperiso2DiskWindow::update_ui_language()
{
QString dev;
QJsonObject obj;
QString cur = ventoy_code_get_cur_language();
QString cur = hiperiso_code_get_cur_language();
for (QJsonArray::iterator p = m_lang_array.begin(); p != m_lang_array.end(); p++)
{
@@ -207,7 +207,7 @@ void Ventoy2DiskWindow::update_ui_language()
ui->actionSecure_Boot_Support->setText(_LANG_STR("STR_MENU_SECURE_BOOT"));
ui->menuPartition_Style->setTitle(_LANG_STR("STR_MENU_PART_STYLE"));
ui->actionPartition_Configuration->setText(_LANG_STR("STR_MENU_PART_CFG"));
ui->actionClear_Ventoy->setText(_LANG_STR("STR_MENU_CLEAR"));
ui->actionClear_Hiperiso->setText(_LANG_STR("STR_MENU_CLEAR"));
ui->actionShow_All_Devices->setText(_LANG_STR("STR_SHOW_ALL_DEV"));
dev = _LANG_STR("STR_DEVICE");
@@ -222,8 +222,8 @@ void Ventoy2DiskWindow::update_ui_language()
ui->groupBoxDevice->setTitle(dev);
}
ui->groupBoxVentoyLocal->setTitle(_LANG_STR("STR_LOCAL_VER"));
ui->groupBoxVentoyDevice->setTitle(_LANG_STR("STR_DISK_VER"));
ui->groupBoxHiperisoLocal->setTitle(_LANG_STR("STR_LOCAL_VER"));
ui->groupBoxHiperisoDevice->setTitle(_LANG_STR("STR_DISK_VER"));
ui->groupBoxStatus->setTitle(_LANG_STR("STR_STATUS"));
ui->ButtonInstall->setText(_LANG_STR("STR_INSTALL"));
ui->ButtonUpdate->setText(_LANG_STR("STR_UPDATE"));
@@ -231,27 +231,27 @@ void Ventoy2DiskWindow::update_ui_language()
m_partcfg->setWindowTitle(_LANG_STR("STR_MENU_PART_CFG"));
}
void Ventoy2DiskWindow::lang_check_action(QAction *act)
void Hiperiso2DiskWindow::lang_check_action(QAction *act)
{
ventoy_code_set_cur_language(act->text().toStdString().c_str());
hiperiso_code_set_cur_language(act->text().toStdString().c_str());
update_ui_language();
}
void Ventoy2DiskWindow::LoadLanguages()
void Hiperiso2DiskWindow::LoadLanguages()
{
QString curlang = ventoy_code_get_cur_language();
QString curlang = hiperiso_code_get_cur_language();
if (curlang.isEmpty())
{
QString LANG = qgetenv("LANG");
if (LANG.startsWith("zh_CN"))
{
ventoy_code_set_cur_language("Chinese Simplified (简体中文)");
hiperiso_code_set_cur_language("Chinese Simplified (简体中文)");
}
else
{
ventoy_code_set_cur_language("English (English)");
hiperiso_code_set_cur_language("English (English)");
}
curlang = ventoy_code_get_cur_language();
curlang = hiperiso_code_get_cur_language();
}
@@ -291,32 +291,32 @@ void Ventoy2DiskWindow::LoadLanguages()
}
void Ventoy2DiskWindow::part_style_check_action(QAction *action)
void Hiperiso2DiskWindow::part_style_check_action(QAction *action)
{
int style = 0;
if (action->text() == "MBR")
{
style = 0;
ui->labelVentoyLocalPartStyle->setText("MBR");
ui->labelHiperisoLocalPartStyle->setText("MBR");
}
else
{
style = 1;
ui->labelVentoyLocalPartStyle->setText("GPT");
ui->labelHiperisoLocalPartStyle->setText("GPT");
}
if (style != ventoy_code_get_cur_part_style())
if (style != hiperiso_code_get_cur_part_style())
{
ventoy_code_set_cur_part_style(style);
hiperiso_code_set_cur_part_style(style);
}
}
static ventoy_disk *select_active_dev(const QString &select, int *activeid)
static hiperiso_disk *select_active_dev(const QString &select, int *activeid)
{
int i;
int alldev = ventoy_code_get_cur_show_all();
ventoy_disk *cur = NULL;
int alldev = hiperiso_code_get_cur_show_all();
hiperiso_disk *cur = NULL;
/* find the match one */
if (!select.isEmpty())
@@ -324,7 +324,7 @@ static ventoy_disk *select_active_dev(const QString &select, int *activeid)
for (i = 0; i < g_disk_num; i++)
{
cur = g_disk_list + i;
if (alldev == 0 && cur->type != VTOY_DEVICE_USB)
if (alldev == 0 && cur->type != HISO_DEVICE_USB)
{
continue;
}
@@ -337,16 +337,16 @@ static ventoy_disk *select_active_dev(const QString &select, int *activeid)
}
}
/* find the first one that installed with Ventoy */
/* find the first one that installed with Hiperiso */
for (i = 0; i < g_disk_num; i++)
{
cur = g_disk_list + i;
if (alldev == 0 && cur->type != VTOY_DEVICE_USB)
if (alldev == 0 && cur->type != HISO_DEVICE_USB)
{
continue;
}
if (cur->vtoydata.ventoy_valid)
if (cur->hisodata.hiperiso_valid)
{
*activeid = i;
return cur;
@@ -357,12 +357,12 @@ static ventoy_disk *select_active_dev(const QString &select, int *activeid)
for (i = 0; i < g_disk_num; i++)
{
cur = g_disk_list + i;
if (alldev == 0 && cur->type != VTOY_DEVICE_USB)
if (alldev == 0 && cur->type != HISO_DEVICE_USB)
{
continue;
}
if (cur->type == VTOY_DEVICE_USB)
if (cur->type == HISO_DEVICE_USB)
{
*activeid = i;
return cur;
@@ -373,7 +373,7 @@ static ventoy_disk *select_active_dev(const QString &select, int *activeid)
for (i = 0; i < g_disk_num; i++)
{
cur = g_disk_list + i;
if (alldev == 0 && cur->type != VTOY_DEVICE_USB)
if (alldev == 0 && cur->type != HISO_DEVICE_USB)
{
continue;
}
@@ -386,12 +386,12 @@ static ventoy_disk *select_active_dev(const QString &select, int *activeid)
}
void Ventoy2DiskWindow::FillDeviceList(const QString &select)
void Hiperiso2DiskWindow::FillDeviceList(const QString &select)
{
int active;
int count = 0;
int alldev = ventoy_code_get_cur_show_all();
ventoy_disk *cur;
int alldev = hiperiso_code_get_cur_show_all();
hiperiso_disk *cur;
ui->comboBoxDevice->clear();
@@ -399,7 +399,7 @@ void Ventoy2DiskWindow::FillDeviceList(const QString &select)
{
cur = g_disk_list + i;
if (alldev == 0 && cur->type != VTOY_DEVICE_USB)
if (alldev == 0 && cur->type != HISO_DEVICE_USB)
{
continue;
}
@@ -415,7 +415,7 @@ void Ventoy2DiskWindow::FillDeviceList(const QString &select)
{
vlog("combox count:%d, active:%s id:%d\n", count, cur->disk_name, active);
ui->ButtonInstall->setEnabled(true);
ui->ButtonUpdate->setEnabled(cur->vtoydata.ventoy_valid);
ui->ButtonUpdate->setEnabled(cur->hisodata.hiperiso_valid);
ui->comboBoxDevice->setCurrentIndex(active);
}
else
@@ -427,7 +427,7 @@ void Ventoy2DiskWindow::FillDeviceList(const QString &select)
}
void Ventoy2DiskWindow::OnInitWindow(void)
void Hiperiso2DiskWindow::OnInitWindow(void)
{
int len;
const uchar *data;
@@ -436,13 +436,13 @@ void Ventoy2DiskWindow::OnInitWindow(void)
QPixmap pix2;
char ver[512];
ui->labelVentoyLocalSecure->hide();
ui->labelHiperisoLocalSecure->hide();
m_part_group->addAction(ui->actionMBR);
m_part_group->addAction(ui->actionGPT);
connect(m_part_group, SIGNAL(triggered(QAction *)), this, SLOT(part_style_check_action(QAction *)));
if (ventoy_code_get_cur_part_style())
if (hiperiso_code_get_cur_part_style())
{
ui->actionGPT->setChecked(true);
m_part_group->triggered(ui->actionGPT);
@@ -453,8 +453,8 @@ void Ventoy2DiskWindow::OnInitWindow(void)
m_part_group->triggered(ui->actionMBR);
}
snprintf(ver, sizeof(ver), VERSION_FMT, ventoy_get_local_version());
ui->labelVentoyLocalVer->setText(QApplication::translate("Ventoy2DiskWindow", ver, nullptr));
snprintf(ver, sizeof(ver), VERSION_FMT, hiperiso_get_local_version());
ui->labelHiperisoLocalVer->setText(QApplication::translate("Hiperiso2DiskWindow", ver, nullptr));
LoadLanguages();
@@ -465,39 +465,39 @@ void Ventoy2DiskWindow::OnInitWindow(void)
data = (const uchar *)get_secure_icon_raw_data(&len);
pix2.loadFromData(data, len);
ui->labelVentoyLocalSecure->setPixmap(pix2);
ui->labelVentoyDeviceSecure->setPixmap(pix2);
ui->labelHiperisoLocalSecure->setPixmap(pix2);
ui->labelHiperisoDeviceSecure->setPixmap(pix2);
ui->labelVentoyDeviceSecure->setHidden(true);
ui->labelVentoyDeviceVer->setText("");
ui->labelVentoyDevicePartStyle->setText("");
ui->labelHiperisoDeviceSecure->setHidden(true);
ui->labelHiperisoDeviceVer->setText("");
ui->labelHiperisoDevicePartStyle->setText("");
ui->actionSecure_Boot_Support->trigger();
ui->actionShow_All_Devices->setChecked(ventoy_code_get_cur_show_all());
ui->actionShow_All_Devices->setChecked(hiperiso_code_get_cur_show_all());
connect(m_thread, &MyQThread::thread_event, this, &Ventoy2DiskWindow::thread_event);
connect(m_thread, &MyQThread::thread_event, this, &Hiperiso2DiskWindow::thread_event);
FillDeviceList("");
}
void Ventoy2DiskWindow::showEvent(QShowEvent *ev)
void Hiperiso2DiskWindow::showEvent(QShowEvent *ev)
{
QMainWindow::showEvent(ev);
OnInitWindow();
}
void Ventoy2DiskWindow::on_ButtonInstall_clicked()
void Hiperiso2DiskWindow::on_ButtonInstall_clicked()
{
int index;
quint64 size = 0, space = 0;
ventoy_disk *cur;
hiperiso_disk *cur;
QString title_warn, title_err, msg;
lang_string("STR_ERROR", title_err);
lang_string("STR_WARNING", title_warn);
if (m_thread->m_running || ventoy_code_is_busy())
if (m_thread->m_running || hiperiso_code_is_busy())
{
lang_string("STR_WAIT_PROCESS", msg);
QMessageBox::warning(NULL, title_warn, msg);
@@ -520,7 +520,7 @@ void Ventoy2DiskWindow::on_ButtonInstall_clicked()
return;
}
if (ventoy_code_get_cur_part_style() == 0 && cur->size_in_byte > 2199023255552ULL)
if (hiperiso_code_get_cur_part_style() == 0 && cur->size_in_byte > 2199023255552ULL)
{
lang_string("STR_DISK_2TB_MBR_ERROR", msg);
QMessageBox::critical(NULL, title_err, msg);
@@ -536,7 +536,7 @@ void Ventoy2DiskWindow::on_ButtonInstall_clicked()
space = m_partcfg->resvalue * 1024;
}
if (size <= space || (size - space) <= VTOYEFI_PART_BYTES / SIZE_1MB)
if (size <= space || (size - space) <= HISOEFI_PART_BYTES / SIZE_1MB)
{
lang_string("STR_SPACE_VAL_INVALID", msg);
QMessageBox::critical(NULL, title_err, msg);
@@ -571,17 +571,17 @@ void Ventoy2DiskWindow::on_ButtonInstall_clicked()
m_thread->start();
}
void Ventoy2DiskWindow::on_ButtonUpdate_clicked()
void Hiperiso2DiskWindow::on_ButtonUpdate_clicked()
{
int index;
ventoy_disk *cur;
hiperiso_disk *cur;
QString title_info, title_warn, title_err, msg;
lang_string("STR_ERROR", title_err);
lang_string("STR_WARNING", title_warn);
lang_string("STR_INFO", title_info);
if (m_thread->m_running || ventoy_code_is_busy())
if (m_thread->m_running || hiperiso_code_is_busy())
{
lang_string("STR_WAIT_PROCESS", msg);
QMessageBox::warning(NULL, title_warn, msg);
@@ -596,9 +596,9 @@ void Ventoy2DiskWindow::on_ButtonUpdate_clicked()
}
cur = g_disk_list + index;
if (cur->vtoydata.ventoy_valid == 0)
if (cur->hisodata.hiperiso_valid == 0)
{
vlog("invalid ventoy version");
vlog("invalid hiperiso version");
return;
}
@@ -620,11 +620,11 @@ void Ventoy2DiskWindow::on_ButtonUpdate_clicked()
m_thread->start();
}
void Ventoy2DiskWindow::on_ButtonRefresh_clicked()
void Hiperiso2DiskWindow::on_ButtonRefresh_clicked()
{
QString title_warn, msg;
if (m_thread->m_running || ventoy_code_is_busy())
if (m_thread->m_running || hiperiso_code_is_busy())
{
lang_string("STR_WARNING", title_warn);
lang_string("STR_WAIT_PROCESS", msg);
@@ -632,18 +632,18 @@ void Ventoy2DiskWindow::on_ButtonRefresh_clicked()
return;
}
ventoy_code_refresh_device();
hiperiso_code_refresh_device();
FillDeviceList("");
}
void Ventoy2DiskWindow::on_comboBoxDevice_currentIndexChanged(int index)
void Hiperiso2DiskWindow::on_comboBoxDevice_currentIndexChanged(int index)
{
char ver[512];
ventoy_disk *cur;
hiperiso_disk *cur;
ui->labelVentoyDeviceSecure->setHidden(true);
ui->labelVentoyDeviceVer->setText("");
ui->labelVentoyDevicePartStyle->setText("");
ui->labelHiperisoDeviceSecure->setHidden(true);
ui->labelHiperisoDeviceVer->setText("");
ui->labelHiperisoDevicePartStyle->setText("");
if (index < 0 || index > g_disk_num)
{
@@ -652,25 +652,25 @@ void Ventoy2DiskWindow::on_comboBoxDevice_currentIndexChanged(int index)
}
cur = g_disk_list + index;
if (cur->vtoydata.ventoy_valid)
if (cur->hisodata.hiperiso_valid)
{
if (cur->vtoydata.secure_boot_flag)
if (cur->hisodata.secure_boot_flag)
{
ui->labelVentoyDeviceSecure->setHidden(false);
ui->labelHiperisoDeviceSecure->setHidden(false);
}
else
{
ui->labelVentoyDeviceSecure->setHidden(true);
ui->labelHiperisoDeviceSecure->setHidden(true);
}
if ((int)(ui->actionSecure_Boot_Support->isChecked()) != cur->vtoydata.secure_boot_flag)
if ((int)(ui->actionSecure_Boot_Support->isChecked()) != cur->hisodata.secure_boot_flag)
{
ui->actionSecure_Boot_Support->trigger();
}
snprintf(ver, sizeof(ver), VERSION_FMT, cur->vtoydata.ventoy_ver);
ui->labelVentoyDeviceVer->setText(QApplication::translate("Ventoy2DiskWindow", ver, nullptr));
ui->labelVentoyDevicePartStyle->setText(cur->vtoydata.partition_style ? "GPT" : "MBR");
snprintf(ver, sizeof(ver), VERSION_FMT, cur->hisodata.hiperiso_ver);
ui->labelHiperisoDeviceVer->setText(QApplication::translate("Hiperiso2DiskWindow", ver, nullptr));
ui->labelHiperisoDevicePartStyle->setText(cur->hisodata.partition_style ? "GPT" : "MBR");
}
else
{
@@ -681,7 +681,7 @@ void Ventoy2DiskWindow::on_comboBoxDevice_currentIndexChanged(int index)
}
}
void Ventoy2DiskWindow::on_actionPartition_Configuration_triggered()
void Hiperiso2DiskWindow::on_actionPartition_Configuration_triggered()
{
m_partcfg->update_ui_status();
if (QDialog::Accepted == m_partcfg->exec())
@@ -702,11 +702,11 @@ void Ventoy2DiskWindow::on_actionPartition_Configuration_triggered()
}
}
void Ventoy2DiskWindow::on_actionClear_Ventoy_triggered()
void Hiperiso2DiskWindow::on_actionClear_Hiperiso_triggered()
{
int ret;
int index;
ventoy_disk *cur;
hiperiso_disk *cur;
QString title_err, title_warn, title_info, msg;
char disk_name[64];
char buf[256];
@@ -716,7 +716,7 @@ void Ventoy2DiskWindow::on_actionClear_Ventoy_triggered()
lang_string("STR_WARNING", title_warn);
lang_string("STR_INFO", title_info);
if (m_thread->m_running || ventoy_code_is_busy())
if (m_thread->m_running || hiperiso_code_is_busy())
{
lang_string("STR_WAIT_PROCESS", msg);
QMessageBox::warning(NULL, title_warn, msg);
@@ -748,13 +748,13 @@ void Ventoy2DiskWindow::on_actionClear_Ventoy_triggered()
snprintf(buf, sizeof(buf), "{\"method\":\"clean\",\"disk\":\"%s\"}", disk_name);
out[0] = 0;
ventoy_func_handler(buf, out, sizeof(out));
hiperiso_func_handler(buf, out, sizeof(out));
vlog("func handler clean <%s>\n", out);
if (strstr(out, "success"))
{
ret = ventoy_code_get_result();
ventoy_code_refresh_device();
ret = hiperiso_code_get_result();
hiperiso_code_refresh_device();
cur = NULL;
}
else
@@ -776,14 +776,14 @@ void Ventoy2DiskWindow::on_actionClear_Ventoy_triggered()
FillDeviceList(disk_name);
}
void Ventoy2DiskWindow::on_actionShow_All_Devices_toggled(bool arg1)
void Hiperiso2DiskWindow::on_actionShow_All_Devices_toggled(bool arg1)
{
ventoy_code_set_cur_show_all(arg1);
hiperiso_code_set_cur_show_all(arg1);
FillDeviceList("");
}
void Ventoy2DiskWindow::closeEvent(QCloseEvent *event)
void Hiperiso2DiskWindow::closeEvent(QCloseEvent *event)
{
vlog("On closeEvent ...\n");
@@ -800,17 +800,17 @@ void Ventoy2DiskWindow::closeEvent(QCloseEvent *event)
return;
}
ventoy_code_save_cfg();
hiperiso_code_save_cfg();
event->accept();
}
void Ventoy2DiskWindow::on_actionSecure_Boot_Support_triggered()
void Hiperiso2DiskWindow::on_actionSecure_Boot_Support_triggered()
{
ui->labelVentoyLocalSecure->setHidden(!(ui->actionSecure_Boot_Support->isChecked()));
ui->labelHiperisoLocalSecure->setHidden(!(ui->actionSecure_Boot_Support->isChecked()));
}
void Ventoy2DiskWindow::set_percent(int percent)
void Hiperiso2DiskWindow::set_percent(int percent)
{
int index;
QString status, radio;
@@ -831,7 +831,7 @@ void Ventoy2DiskWindow::set_percent(int percent)
}
}
void Ventoy2DiskWindow::thread_event(int msg, int data)
void Hiperiso2DiskWindow::thread_event(int msg, int data)
{
char disk_name[32];
QString title_err, title_info, tipmsg;
src/gui/QT/hiperiso2diskwindow.ui
+16 -16
View File
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>Ventoy2DiskWindow</class>
<widget class="QMainWindow" name="Ventoy2DiskWindow">
<class>Hiperiso2DiskWindow</class>
<widget class="QMainWindow" name="Hiperiso2DiskWindow">
<property name="geometry">
<rect>
<x>0</x>
@@ -11,7 +11,7 @@
</rect>
</property>
<property name="windowTitle">
<string>Ventoy2Disk</string>
<string>Hiperiso2Disk</string>
</property>
<widget class="QWidget" name="centralwidget">
<widget class="QGroupBox" name="groupBoxDevice">
@@ -60,7 +60,7 @@
</property>
</widget>
</widget>
<widget class="QGroupBox" name="groupBoxVentoyLocal">
<widget class="QGroupBox" name="groupBoxHiperisoLocal">
<property name="geometry">
<rect>
<x>10</x>
@@ -70,12 +70,12 @@
</rect>
</property>
<property name="title">
<string>Ventoy In Package</string>
<string>Hiperiso In Package</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
<widget class="QLabel" name="labelVentoyLocalVer">
<widget class="QLabel" name="labelHiperisoLocalVer">
<property name="geometry">
<rect>
<x>30</x>
@@ -91,7 +91,7 @@
<set>Qt::AlignCenter</set>
</property>
</widget>
<widget class="QLabel" name="labelVentoyLocalPartStyle">
<widget class="QLabel" name="labelHiperisoLocalPartStyle">
<property name="geometry">
<rect>
<x>172</x>
@@ -104,7 +104,7 @@
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;MBR&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
</widget>
<widget class="QLabel" name="labelVentoyLocalSecure">
<widget class="QLabel" name="labelHiperisoLocalSecure">
<property name="geometry">
<rect>
<x>12</x>
@@ -121,7 +121,7 @@
</property>
</widget>
</widget>
<widget class="QGroupBox" name="groupBoxVentoyDevice">
<widget class="QGroupBox" name="groupBoxHiperisoDevice">
<property name="geometry">
<rect>
<x>225</x>
@@ -131,12 +131,12 @@
</rect>
</property>
<property name="title">
<string>Ventoy In Device</string>
<string>Hiperiso In Device</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
<widget class="QLabel" name="labelVentoyDeviceVer">
<widget class="QLabel" name="labelHiperisoDeviceVer">
<property name="geometry">
<rect>
<x>30</x>
@@ -152,7 +152,7 @@
<set>Qt::AlignCenter</set>
</property>
</widget>
<widget class="QLabel" name="labelVentoyDevicePartStyle">
<widget class="QLabel" name="labelHiperisoDevicePartStyle">
<property name="geometry">
<rect>
<x>172</x>
@@ -165,7 +165,7 @@
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;GPT&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
</widget>
<widget class="QLabel" name="labelVentoyDeviceSecure">
<widget class="QLabel" name="labelHiperisoDeviceSecure">
<property name="geometry">
<rect>
<x>12</x>
@@ -264,7 +264,7 @@
<addaction name="actionSecure_Boot_Support"/>
<addaction name="menuPartition_Style"/>
<addaction name="actionPartition_Configuration"/>
<addaction name="actionClear_Ventoy"/>
<addaction name="actionClear_Hiperiso"/>
<addaction name="actionShow_All_Devices"/>
</widget>
<widget class="QMenu" name="menuLanguage">
@@ -304,9 +304,9 @@
<string>Partition Configuration</string>
</property>
</action>
<action name="actionClear_Ventoy">
<action name="actionClear_Hiperiso">
<property name="text">
<string>Clear Ventoy</string>
<string>Clear Hiperiso</string>
</property>
</action>
<action name="actionShow_All_Devices">
src/gui/QT/main.cpp
+14 -14
View File
@@ -1,4 +1,4 @@
#include "ventoy2diskwindow.h"
#include "hiperiso2diskwindow.h"
#include <QApplication>
#include <QMessageBox>
@@ -11,9 +11,9 @@
#include <sys/types.h>
extern "C" {
#include "ventoy_define.h"
#include "ventoy_util.h"
#include "ventoy_qt.h"
#include "hiperiso_define.h"
#include "hiperiso_util.h"
#include "hiperiso_qt.h"
}
using namespace std;
@@ -26,7 +26,7 @@ int main(int argc, char *argv[])
int ret;
long long size;
QApplication a(argc, argv);
Ventoy2DiskWindow w;
Hiperiso2DiskWindow w;
#ifdef QT_CHECK_EUID
if (geteuid() != 0)
@@ -57,10 +57,10 @@ int main(int argc, char *argv[])
return 1;
}
ventoy_log_init();
hiperiso_log_init();
snprintf(g_log_file, sizeof(g_log_file), "./log.txt");
snprintf(g_ini_file, sizeof(g_ini_file), "./Ventoy2Disk.ini");
snprintf(g_ini_file, sizeof(g_ini_file), "./Hiperiso2Disk.ini");
for (int i = 0; i < argc; i++)
{
if (argv[i] && argv[i + 1] && strcmp(argv[i], "-l") == 0)
@@ -81,13 +81,13 @@ int main(int argc, char *argv[])
}
vlog("===================================================\n");
vlog("===== Ventoy2Disk %s powered by QT %s =====\n", ventoy_get_local_version(), qVersion());
vlog("===== Hiperiso2Disk %s powered by QT %s =====\n", hiperiso_get_local_version(), qVersion());
vlog("===================================================\n");
vlog("log file is <%s> lastsize:%lld\n", g_log_file, (long long)size);
vlog("ini file is <%s>\n", g_ini_file);
ventoy_disk_init();
ventoy_http_init();
hiperiso_disk_init();
hiperiso_http_init();
w.setGeometry(QStyle::alignedRect(Qt::LeftToRight,
Qt::AlignCenter,
@@ -109,13 +109,13 @@ int main(int argc, char *argv[])
ret = a.exec();
ventoy_disk_exit();
ventoy_http_exit();
hiperiso_disk_exit();
hiperiso_http_exit();
vlog("######## Ventoy2Disk QT %s exit ########\n", ventoy_get_local_version());
vlog("######## Hiperiso2Disk QT %s exit ########\n", hiperiso_get_local_version());
/* log exit must at the end */
ventoy_log_exit();
hiperiso_log_exit();
return ret;
}
src/plugson/www/index.html
+39 -39
View File
@@ -6,7 +6,7 @@
<meta http-equiv="pragma" content="no-cache">
<!-- HTTP 1.0 -->
<meta http-equiv="cache-control" content="no-cache">
<title>Ventoy Plugson</title>
<title>Hiperiso Plugson</title>
<!-- Tell the browser to be responsive to screen width -->
<meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
<!-- Bootstrap 3.3.5 -->
@@ -21,7 +21,7 @@
folder instead of downloading all of them to reduce the load. -->
<link rel="stylesheet" href="static/AdminLTE/css/skins/skin-blue.min.css">
<link rel="stylesheet" href="static/datatables/dataTables.bootstrap.css">
<link rel="stylesheet" href="static/css/vtoy.css">
<link rel="stylesheet" href="static/css/hiso.css">
<!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
@@ -52,7 +52,7 @@
<!-- Logo -->
<a href="." class="logo">
<!-- logo for regular state and mobile devices -->
<span class="logo-lg" > <img src="/static/img/logo_32.png" > &nbsp;Ventoy Plugson</span>
<span class="logo-lg" > <img src="/static/img/logo_32.png" > &nbsp;Hiperiso Plugson</span>
</a>
<!-- Header Navbar: style can be found in header.less -->
<nav class="navbar navbar-static-top" role="navigation">
@@ -85,9 +85,9 @@
<!-- User Account: style can be found in dropdown.less -->
<li class="dropdown user user-menu">
<a href="https://www.ventoy.net" target="_blank" >
<a href="https://www.hiperiso.net" target="_blank" >
<span class="fa fa-link"></span>&nbsp;
<span class="hidden-xs">Ventoy</span>
<span class="hidden-xs">Hiperiso</span>
</a>
</li>
</ul>
@@ -762,7 +762,7 @@
<div class="pull-right hidden-xs">
<b id="plugson_build_date">20260625 19:36:29</b>
</div>
<strong><a href="https://www.ventoy.net" target="_blank">https://www.ventoy.net</a></strong>
<strong><a href="https://www.hiperiso.net" target="_blank">https://www.hiperiso.net</a></strong>
</footer>
<!-- Control Sidebar -->
@@ -780,10 +780,10 @@
<script src="/static/js/jQuery-2.1.4.min.js"></script>
<!-- jquery validate -->
<script src="/static/js/jquery.validate.min.js"></script>
<script src="/static/js/jquery.validate.vtoymethods.js?v=331"></script>
<script src="/static/js/jquery.validate.hisomethods.js?v=331"></script>
<script src="/static/js/jquery.vtoy.alert.js?v=331"></script>
<script src="/static/js/vtoy.js?v=331"></script>
<script src="/static/js/jquery.hiso.alert.js?v=331"></script>
<script src="/static/js/hiso.js?v=331"></script>
<script src="/static/js/md5.min.js"></script>
<!-- Bootstrap 3.3.5 -->
@@ -797,7 +797,7 @@
<script type="text/javascript">
function VtoyJsonCopyClick() {
function HisoJsonCopyClick() {
var copyText = document.getElementById("pre_json_preview");
copyText.select();
copyText.setSelectionRange(0, 99999); // For mobile devices
@@ -806,28 +806,28 @@
var successful = document.execCommand('copy');
copyText.setSelectionRange(0, 0);
if (successful) {
Message.success(g_vtoy_cur_language.STR_JSON_COPY_SUCCESS);
Message.success(g_hiso_cur_language.STR_JSON_COPY_SUCCESS);
} else {
Message.error(g_vtoy_cur_language.STR_JSON_COPY_FAILED);
Message.error(g_hiso_cur_language.STR_JSON_COPY_FAILED);
}
} catch (err) {
Message.error(g_vtoy_cur_language.STR_JSON_COPY_FAILED);
Message.error(g_hiso_cur_language.STR_JSON_COPY_FAILED);
}
}
function VtoyPreviewClick() {
callVtoySync({
function HisoPreviewClick() {
callHisoSync({
method : 'preview_json'
}, function(data) {
$('#JsonPeviewForm #JsonPreviewForm_lang_1').text(g_vtoy_cur_language.STR_JSON_PREVIEW);
$('#JsonPeviewForm #PrewForm_lang_2').text(g_vtoy_cur_language.STR_BTN_OK);
$('#JsonPeviewForm #JsonPreviewForm_lang_1').text(g_hiso_cur_language.STR_JSON_PREVIEW);
$('#JsonPeviewForm #PrewForm_lang_2').text(g_hiso_cur_language.STR_BTN_OK);
$('#pre_json_preview').text(VtoyUTF16HexToAscii(data.json));
$('#pre_json_preview').text(HisoUTF16HexToAscii(data.json));
$("#JsonPreviewModal").modal();
});
}
function VtoyLanguageClick() {
function HisoLanguageClick() {
var defaultPage = window.location.hash;
if (g_current_language === 'cn') {
@@ -836,8 +836,8 @@
g_current_language = 'cn';
}
if (typeof(VtoyPageLanguageChange)==='function') {
VtoyPageLanguageChange(g_current_language);
if (typeof(HisoPageLanguageChange)==='function') {
HisoPageLanguageChange(g_current_language);
}
}
@@ -845,7 +845,7 @@
//Main process
var m_syntax_error;
var m_invalid_config;
callVtoySync({
callHisoSync({
method : 'sysinfo'
}, function(data) {
g_current_language = data.language;
@@ -858,9 +858,9 @@
});
$('#id_btn_json_copy').click(VtoyJsonCopyClick);
$('#id_a_preview').click(VtoyPreviewClick);
$('#id_a_language').click(VtoyLanguageClick);
$('#id_btn_json_copy').click(HisoJsonCopyClick);
$('#id_a_preview').click(HisoPreviewClick);
$('#id_a_language').click(HisoLanguageClick);
$("#plugson-menu a").click(function() {
var href = $(this).data("href");
@@ -886,31 +886,31 @@
})();
(function ventoy_handshake() {
callVtoyCatchErr({
(function hiperiso_handshake() {
callHisoCatchErr({
method : 'handshake'
},
function(data) {
if (m_syntax_error === 1 && typeof(Modal) === 'object') {
var title = g_current_language == 'en' ? g_vtoy_cur_language_en.STR_INFO : g_vtoy_cur_language_cn.STR_INFO;
var msg = g_current_language == 'en' ? g_vtoy_cur_language_en.STR_SYNTAX_ERROR_TIP : g_vtoy_cur_language_cn.STR_SYNTAX_ERROR_TIP;
var title = g_current_language == 'en' ? g_hiso_cur_language_en.STR_INFO : g_hiso_cur_language_cn.STR_INFO;
var msg = g_current_language == 'en' ? g_hiso_cur_language_en.STR_SYNTAX_ERROR_TIP : g_hiso_cur_language_cn.STR_SYNTAX_ERROR_TIP;
Modal.alert({title:title,msg:msg}).on(function(e) {
});
m_syntax_error = 0;
}
if (m_invalid_config === 1 && typeof(Modal) === 'object') {
var title = g_current_language == 'en' ? g_vtoy_cur_language_en.STR_INFO : g_vtoy_cur_language_cn.STR_INFO;
var msg = g_current_language == 'en' ? g_vtoy_cur_language_en.STR_INVALID_CONFIG_TIP : g_vtoy_cur_language_cn.STR_INVALID_CONFIG_TIP;
var title = g_current_language == 'en' ? g_hiso_cur_language_en.STR_INFO : g_hiso_cur_language_cn.STR_INFO;
var msg = g_current_language == 'en' ? g_hiso_cur_language_en.STR_INVALID_CONFIG_TIP : g_hiso_cur_language_cn.STR_INVALID_CONFIG_TIP;
Modal.alert({title:title,msg:msg}).on(function(e) {
});
m_invalid_config = 0;
}
if (data.save_error === 1) {
var title = g_current_language == 'en' ? g_vtoy_cur_language_en.STR_INFO : g_vtoy_cur_language_cn.STR_INFO;
var msg = g_current_language == 'en' ? g_vtoy_cur_language_en.STR_CONFIG_SAVE_ERROR_TIP : g_vtoy_cur_language_cn.STR_CONFIG_SAVE_ERROR_TIP;
var title = g_current_language == 'en' ? g_hiso_cur_language_en.STR_INFO : g_hiso_cur_language_cn.STR_INFO;
var msg = g_current_language == 'en' ? g_hiso_cur_language_en.STR_CONFIG_SAVE_ERROR_TIP : g_hiso_cur_language_cn.STR_CONFIG_SAVE_ERROR_TIP;
Modal.alert({title:title,msg:msg}).on(function(e) {
});
}
@@ -920,14 +920,14 @@
}
setTimeout(function() {
ventoy_handshake();
hiperiso_handshake();
}, 200);
},
function(xmlHttpRequest, textStatus, errorThrown) {
if (undefined === errorThrown)
{
Message.error(g_vtoy_cur_language.STR_WEB_REMOTE_ABNORMAL);
Message.error(g_hiso_cur_language.STR_WEB_REMOTE_ABNORMAL);
}
else if(undefined === errorThrown.length)
{
@@ -942,12 +942,12 @@
{
case 'timeout':
{
Message.error(g_vtoy_cur_language.STR_WEB_REQUEST_TIMEOUT);
Message.error(g_hiso_cur_language.STR_WEB_REQUEST_TIMEOUT);
break;
}
case 'Service Unavailable':
{
Message.error(g_vtoy_cur_language.STR_WEB_SERVICE_UNAVAILABLE);
Message.error(g_hiso_cur_language.STR_WEB_SERVICE_UNAVAILABLE);
break;
}
case 'abort':
@@ -956,13 +956,13 @@
}
default:
{
Message.error(g_vtoy_cur_language.STR_WEB_COMMUNICATION_ERR + errorThrown);
Message.error(g_hiso_cur_language.STR_WEB_COMMUNICATION_ERR + errorThrown);
break;
}
}
}
Modal.confirm({msg:g_vtoy_cur_language.STR_CLOSE_TIP}).on(function(e) {
Modal.confirm({msg:g_hiso_cur_language.STR_CLOSE_TIP}).on(function(e) {
if(navigator.userAgent.indexOf("Firefox") != -1 || navigator.userAgent.indexOf("Chrome") != -1){
window.location.href = "about:blank";
window.close();
src/plugson/www/plugson_auto_install.html
+58 -58
View File
@@ -8,7 +8,7 @@
<button id="id_btn_reset" class="btn btn-sm btn-danger btn-del"><i class="fa fa-trash"></i><span id="id_btn_span_reset">Reset</span></button>
</div>
<div class="col-sm-2" style="font-size:16px;padding-top:8px;">
<a id="id_a_official_doc" target="_blank" href="https://www.ventoy.net/en/plugin_autoinstall.html"><span class="fa fa-link"></span><span id="id_span_official_doc">官网文档</span></a>
<a id="id_a_official_doc" target="_blank" href="https://www.hiperiso.net/en/plugin_autoinstall.html"><span class="fa fa-link"></span><span id="id_span_official_doc">官网文档</span></a>
</div>
</div>
<legend></legend>
@@ -40,30 +40,30 @@
</div>
<script type="text/javascript">
function VtoyPageLanguageChange(newlang) {
VtoyCommonChangeLanguage(newlang);
$('h1[id=id_h1_page_title]').text(g_vtoy_cur_language.STR_PLUG_AUTO_INSTALL);
function HisoPageLanguageChange(newlang) {
HisoCommonChangeLanguage(newlang);
$('h1[id=id_h1_page_title]').text(g_hiso_cur_language.STR_PLUG_AUTO_INSTALL);
$("span[id=id_span_file_exist]").each(function(){
$(this).text(g_vtoy_cur_language.STR_FILE_EXIST);
$(this).text(g_hiso_cur_language.STR_FILE_EXIST);
});
$("span[id=id_span_file_nonexist]").each(function(){
$(this).text(g_vtoy_cur_language.STR_FILE_NONEXIST);
$(this).text(g_hiso_cur_language.STR_FILE_NONEXIST);
});
$("span[id=id_span_file_fuzzy]").each(function(){
$(this).text(g_vtoy_cur_language.STR_FILE_FUZZY);
$(this).text(g_hiso_cur_language.STR_FILE_FUZZY);
});
$("span[id=id_span_dir_exist]").each(function(){
$(this).text(g_vtoy_cur_language.STR_DIR_EXIST);
$(this).text(g_hiso_cur_language.STR_DIR_EXIST);
});
$("span[id=id_span_dir_nonexist]").each(function(){
$(this).text(g_vtoy_cur_language.STR_DIR_NONEXIST);
$(this).text(g_hiso_cur_language.STR_DIR_NONEXIST);
});
$("th[id=id_th_template]").each(function(){
$(this).text(g_vtoy_cur_language.STR_AUTO_TEMPLATE);
$(this).text(g_hiso_cur_language.STR_AUTO_TEMPLATE);
});
if (newlang === 'en') {
@@ -76,7 +76,7 @@
}
}
function VtoySaveCurrentPage(index) {
function HisoSaveCurrentPage(index) {
var timeoutval = 0;
var autoselval = 1;
@@ -92,7 +92,7 @@
autoselval = parseInt($('#id_text_autosel_' + index).val());
}
callVtoy({
callHiso({
method : 'save_auto_install',
index: current_tab_index,
id: index,
@@ -105,7 +105,7 @@
let data = m_data_autoins[current_tab_index][index];
data.timeout = timeoutval;
data.autosel = autoselval;
Message.success(g_vtoy_cur_language.STR_SAVE_SUCCESS);
Message.success(g_hiso_cur_language.STR_SAVE_SUCCESS);
});
}
@@ -127,15 +127,15 @@
if (id.startsWith('id_text_autosel_')) {
var list = m_data_autoins[current_tab_index][index].list;
if (intval > list.length) {
Message.error(g_vtoy_cur_language.STR_INVALID_AUTOSEL);
Message.error(g_hiso_cur_language.STR_INVALID_AUTOSEL);
$(this).val(data.autosel);
return;
}
}
VtoySaveCurrentPage(index);
HisoSaveCurrentPage(index);
} else {
Message.error(g_vtoy_cur_language.STR_INVALID_NUMBER);
Message.error(g_hiso_cur_language.STR_INVALID_NUMBER);
if (id.startsWith('id_text_timeout_')) {
$(this).val(data.timeout);
@@ -177,7 +177,7 @@
$(textid).val('');
}
VtoySaveCurrentPage(index);
HisoSaveCurrentPage(index);
}
@@ -187,8 +187,8 @@
var tabid = '#tbl_inner_' + (i + 1);
var $inner_tbl = $(tabid + ' tbody');
var inaddbtn = ventoy_get_xslg_addbtn('AutoInsInnerAddBtn');
var indelbtn = ventoy_get_xslg_delbtn('AutoInsInnerDelBtn');
var inaddbtn = hiperiso_get_xslg_addbtn('AutoInsInnerAddBtn');
var indelbtn = hiperiso_get_xslg_delbtn('AutoInsInnerDelBtn');
$inner_tbl.empty();
@@ -196,7 +196,7 @@
var $tr;
td1 = '<td style="width: 5%;">'+(j+1)+'</td>';
td2 = '<td>'+inner[j].path+'</td>';
td3 = '<td style="width: 10%;">'+ventoy_get_status_line(0, inner[j].valid)+'</td>';
td3 = '<td style="width: 10%;">'+hiperiso_get_status_line(0, inner[j].valid)+'</td>';
td4 = '<td style="width: 10%;">' + indelbtn + '</td>';
$tr = $('<tr>' + td1 + td2 + td3 + td4 + '</tr>');
@@ -217,8 +217,8 @@
function FillAutoInsTable(data) {
var td1, td2, td3, td4, td5;
var addbtn = ventoy_get_addbtn('AutoInsAddBtn');
var delbtn = ventoy_get_delbtn('AutoInsDelBtn');
var addbtn = hiperiso_get_addbtn('AutoInsAddBtn');
var delbtn = hiperiso_get_delbtn('AutoInsDelBtn');
var $tbl = $("#id_autoins_tbl tbody");
$tbl.empty();
@@ -261,7 +261,7 @@
'<tbody><tr>'+
'<td style="width:70%;vertical-align: middle;">' + data[i].path + '</td>' +
'<td style="vertical-align: middle;">' + ventoy_get_status_line(data[i].type, data[i].valid) + '</td>' +
'<td style="vertical-align: middle;">' + hiperiso_get_status_line(data[i].type, data[i].valid) + '</td>' +
'<td><div style="padding-left:0;" class="col-sm-8"><input type="text" '+timeoutdisable+' value="'+timeoutval+'" class="form-control" id="id_text_timeout_'+i+'"/></div></td>'+
'<td><div style="padding-left:0;" class="col-sm-8"><input type="text" '+autoseldisable+' value="'+autoselval+'" class="form-control" id="id_text_autosel_'+i+'"/></div></td></tr>'+
@@ -270,7 +270,7 @@
'</tbody></table>';
var tdtbl2 = '<table class="table table-bordered" id="tbl_inner_' + (i+1) + '">'+
'<thead><tr><th>#</th><th id="id_th_template">'+g_vtoy_cur_language.STR_AUTO_TEMPLATE+'</th><th id="id_th_status">'+g_vtoy_cur_language.STR_STATUS+'</th><th id="id_th_operation">'+g_vtoy_cur_language.STR_OPERATION+'</th></tr></thead><tbody></tbody></table>';
'<thead><tr><th>#</th><th id="id_th_template">'+g_hiso_cur_language.STR_AUTO_TEMPLATE+'</th><th id="id_th_status">'+g_hiso_cur_language.STR_STATUS+'</th><th id="id_th_operation">'+g_hiso_cur_language.STR_OPERATION+'</th></tr></thead><tbody></tbody></table>';
td1 = '<td style="vertical-align: middle;">' + (i + 1) + '</td>';
td2 = '<td>' + tdtbl1 + tdtbl2 + '</td>';
@@ -309,7 +309,7 @@
}
}
function VtoyFillCurrentPageItem(data) {
function HisoFillCurrentPageItem(data) {
FillAutoInsTable(data);
}
@@ -318,12 +318,12 @@
var href = $(this).attr('href');
var index = parseInt(href.substr(5, 1));
if (index < 0 || index >= g_vtoy_data_default_index || current_tab_index === index) {
if (index < 0 || index >= g_hiso_data_default_index || current_tab_index === index) {
return;
}
current_tab_index = index;
VtoyFillCurrentPageItem(m_data_autoins[index]);
HisoFillCurrentPageItem(m_data_autoins[index]);
}
function AddAutoInstallEntry(type, exist1, path1, path2) {
@@ -352,12 +352,12 @@
for (var i = 0; i < list.length; i++) {
if (list[i].path === data.path) {
Message.error(g_vtoy_cur_language.STR_DUPLICATE_PATH);
Message.error(g_hiso_cur_language.STR_DUPLICATE_PATH);
return;
}
}
callVtoy({
callHiso({
method : 'auto_install_add',
index: current_tab_index,
path: data.path,
@@ -367,9 +367,9 @@
if (e.result === 'success') {
list.push(data);
FillAutoInsTable(list);
Message.success(g_vtoy_cur_language.STR_SAVE_SUCCESS);
Message.success(g_hiso_cur_language.STR_SAVE_SUCCESS);
} else if (e.result === 'duplicate') {
Message.error(g_vtoy_cur_language.STR_DUPLICATE_PATH);
Message.error(g_hiso_cur_language.STR_DUPLICATE_PATH);
}
});
}
@@ -388,26 +388,26 @@
var tip2 = (g_current_os === 'windows') ? '\\ISO\\Windows**.iso' : "/ISO/CentOS-7-x86_64-DVD-****.iso";
var tip3 = (g_current_os === 'windows') ? '\\script\\Windows_unattend.xml' : "/script/centos.ks";
var para = {
"title": g_vtoy_cur_language.STR_SET_AUTO_INS,
"label1": g_vtoy_cur_language.STR_FILE_PATH,
"label2": g_vtoy_cur_language.STR_SET_AUTO_TEMPLATE,
"title": g_hiso_cur_language.STR_SET_AUTO_INS,
"label1": g_hiso_cur_language.STR_FILE_PATH,
"label2": g_hiso_cur_language.STR_SET_AUTO_TEMPLATE,
"tip1": g_current_dir + tip1,
"tip2": g_current_dir + tip2,
"tip3": g_current_dir + tip3
};
VtoySetFileFile(OnAddImageAutoInstall, para);
HisoSetFileFile(OnAddImageAutoInstall, para);
} else {
var tip1 = (g_current_os === 'windows') ? '\\ISO\\Windows' : "/ISO/Linux";
var tip2 = (g_current_os === 'windows') ? '\\script\\Windows_unattend.xml' : "/script/centos.ks";
var para = {
"title": g_vtoy_cur_language.STR_SET_AUTO_INS,
"label1": g_vtoy_cur_language.STR_DIR_PATH,
"label2": g_vtoy_cur_language.STR_SET_AUTO_TEMPLATE,
"title": g_hiso_cur_language.STR_SET_AUTO_INS,
"label1": g_hiso_cur_language.STR_DIR_PATH,
"label2": g_hiso_cur_language.STR_SET_AUTO_TEMPLATE,
"tip1": g_current_dir + tip1,
"tip2": g_current_dir + tip2
};
VtoySetDirFile(OnAddDirAutoInstall, para);
HisoSetDirFile(OnAddDirAutoInstall, para);
}
}
@@ -415,26 +415,26 @@
var para = [
{
"selected": true,
"tip": g_vtoy_cur_language.STR_SET_AUTO_INSTALL_FOR_FILE
"tip": g_hiso_cur_language.STR_SET_AUTO_INSTALL_FOR_FILE
},
{
"selected": false,
"tip": g_vtoy_cur_language.STR_SET_AUTO_INSTALL_FOR_DIR
"tip": g_hiso_cur_language.STR_SET_AUTO_INSTALL_FOR_DIR
}
];
VtoySelectType(OnAddAutoInsBtnClick, para);
HisoSelectType(OnAddAutoInsBtnClick, para);
}
function AutoInstallDelEntry(path, index) {
callVtoySync({
callHisoSync({
method : 'auto_install_del',
index: current_tab_index,
path: path
}, function(data) {
m_data_autoins[current_tab_index].splice(index, 1);
FillAutoInsTable(m_data_autoins[current_tab_index]);
Message.success(g_vtoy_cur_language.STR_SAVE_SUCCESS);
Message.success(g_hiso_cur_language.STR_SAVE_SUCCESS);
});
}
@@ -455,12 +455,12 @@
for (var i = 0; i < data.list.length; i++) {
if (data.list[i].path === path) {
Message.error(g_vtoy_cur_language.STR_DUPLICATE_PATH);
Message.error(g_hiso_cur_language.STR_DUPLICATE_PATH);
return;
}
}
callVtoy({
callHiso({
method : 'auto_install_add_inner',
index: current_tab_index,
outpath: m_out_path,
@@ -474,7 +474,7 @@
data.list.push(node);
FillAutoInsInnerTable(m_out_index, data);
Message.success(g_vtoy_cur_language.STR_SAVE_SUCCESS);
Message.success(g_hiso_cur_language.STR_SAVE_SUCCESS);
});
}
@@ -486,7 +486,7 @@
var tip = (g_current_os === 'windows') ? '\\script\\Windows_unattend.xml' : "/script/centos.ks";
var para = {
"title": g_vtoy_cur_language.STR_ADD_AUTO_TEMPLATE,
"title": g_hiso_cur_language.STR_ADD_AUTO_TEMPLATE,
"fuzzy": 0,
"tip1": g_current_dir + tip,
"tip2": '',
@@ -497,11 +497,11 @@
m_out_index = outindex;
m_out_path = outpath;
VtoySelectFilePath(OnAddAutoTemplateScript, para);
HisoSelectFilePath(OnAddAutoTemplateScript, para);
}
function AutoInstallDelInnerEntry(outpath, outindex, path, index) {
callVtoy({
callHiso({
method : 'auto_install_del_inner',
index: current_tab_index,
outpath: outpath,
@@ -511,7 +511,7 @@
data.list.splice(index, 1);
FillAutoInsInnerTable(outindex, m_data_autoins[current_tab_index][outindex]);
Message.success(g_vtoy_cur_language.STR_SAVE_SUCCESS);
Message.success(g_hiso_cur_language.STR_SAVE_SUCCESS);
});
}
@@ -526,7 +526,7 @@
var list = m_data_autoins[current_tab_index][outindex].list;
if (list.length === 1) {
ventoy_confirm(g_vtoy_cur_language.STR_DEL_LAST, AutoInstallDelEntry, outpath, outindex);
hiperiso_confirm(g_hiso_cur_language.STR_DEL_LAST, AutoInstallDelEntry, outpath, outindex);
} else {
AutoInstallDelInnerEntry(outpath, outindex, path, index);
}
@@ -539,7 +539,7 @@
//Main process
var m_data_autoins;
var current_tab_index = 0;
callVtoySync({method : 'get_auto_install'}, function(data) {
callHisoSync({method : 'get_auto_install'}, function(data) {
m_data_autoins = data;
});
@@ -560,7 +560,7 @@
$('#id_btn_reset').click(function() {
Modal.confirm({msg:GetResetTabConfigTipMsg(current_tab_index, 'auto_install')}).on(function(e) {
if (e) {
callVtoySync({
callHisoSync({
method : 'auto_install_del',
index: current_tab_index,
path: g_del_all_path
@@ -569,14 +569,14 @@
});
m_data_autoins[current_tab_index].length = 0;
VtoyFillCurrentPageItem(m_data_autoins[g_vtoy_data_default_index]);
Message.success(g_vtoy_cur_language.STR_SAVE_SUCCESS);
HisoFillCurrentPageItem(m_data_autoins[g_hiso_data_default_index]);
Message.success(g_hiso_cur_language.STR_SAVE_SUCCESS);
}
});
});
$('#id_tab_autoins a[href="#tab_0"]').tab('show');
VtoyFillCurrentPageItem(m_data_autoins[0]);
VtoyPageLanguageChange(g_current_language);
HisoFillCurrentPageItem(m_data_autoins[0]);
HisoPageLanguageChange(g_current_language);
</script>
src/plugson/www/plugson_auto_memdisk.html
+27 -27
View File
@@ -8,7 +8,7 @@
<button id="id_btn_reset" class="btn btn-sm btn-danger btn-del"><i class="fa fa-trash"></i><span id="id_btn_span_reset">Reset</span></button>
</div>
<div class="col-sm-2" style="font-size:16px;padding-top:8px;">
<a id="id_a_official_doc" target="_blank" href="https://www.ventoy.net/en/plugin_automemdisk.html"><span class="fa fa-link"></span><span id="id_span_official_doc">官网文档</span></a>
<a id="id_a_official_doc" target="_blank" href="https://www.hiperiso.net/en/plugin_automemdisk.html"><span class="fa fa-link"></span><span id="id_span_official_doc">官网文档</span></a>
</div>
</div>
<legend></legend>
@@ -41,18 +41,18 @@
</div>
<script type="text/javascript">
function VtoyPageLanguageChange(newlang) {
VtoyCommonChangeLanguage(newlang);
$('h1[id=id_h1_page_title]').text(g_vtoy_cur_language.STR_PLUG_AUTO_MEMDISK);
function HisoPageLanguageChange(newlang) {
HisoCommonChangeLanguage(newlang);
$('h1[id=id_h1_page_title]').text(g_hiso_cur_language.STR_PLUG_AUTO_MEMDISK);
$("span[id=id_span_file_exist]").each(function(){
$(this).text(g_vtoy_cur_language.STR_FILE_EXIST);
$(this).text(g_hiso_cur_language.STR_FILE_EXIST);
});
$("span[id=id_span_file_nonexist]").each(function(){
$(this).text(g_vtoy_cur_language.STR_FILE_NONEXIST);
$(this).text(g_hiso_cur_language.STR_FILE_NONEXIST);
});
$("span[id=id_span_file_fuzzy]").each(function(){
$(this).text(g_vtoy_cur_language.STR_FILE_FUZZY);
$(this).text(g_hiso_cur_language.STR_FILE_FUZZY);
});
if (newlang === 'en') {
@@ -64,8 +64,8 @@
}
function FillMemdiskTable(data) {
var addbtn = ventoy_get_xslg_addbtn('MemdiskAddBtn');
var delbtn = ventoy_get_xslg_delbtn('MemdiskDelBtn');
var addbtn = hiperiso_get_xslg_addbtn('MemdiskAddBtn');
var delbtn = hiperiso_get_xslg_delbtn('MemdiskDelBtn');
var td1, td2, td3, td4;
var $tbl = $("#id_auto_memdisk_tbl tbody");
@@ -75,7 +75,7 @@
var $tr;
td1 = '<td>' + (i + 1) + '</td>';
td2 = '<td>' + data[i].path + '</td>';
td3 = '<td>' + ventoy_get_status_line(0, data[i].valid) + '</td>';
td3 = '<td>' + hiperiso_get_status_line(0, data[i].valid) + '</td>';
td4 = '<td>' + delbtn + '</td>';
$tr = $('<tr>' + td1 + td2 + td3 + td4 + '</tr>');
@@ -88,7 +88,7 @@
$tbl.append('<tr><td></td><td></td><td></td><td>' + addbtn + '</td></tr>');
}
function VtoyFillCurrentPageItem(data) {
function HisoFillCurrentPageItem(data) {
FillMemdiskTable(data);
}
@@ -97,18 +97,18 @@
var href = $(this).attr('href');
var index = parseInt(href.substr(5, 1));
if (index < 0 || index >= g_vtoy_data_default_index || current_tab_index === index) {
if (index < 0 || index >= g_hiso_data_default_index || current_tab_index === index) {
return;
}
current_tab_index = index;
VtoyFillCurrentPageItem(m_data_memdisk[index]);
HisoFillCurrentPageItem(m_data_memdisk[index]);
}
//Main process
var m_data_memdisk;
var current_tab_index = 0;
callVtoySync({method : 'get_auto_memdisk'}, function(data) {
callHisoSync({method : 'get_auto_memdisk'}, function(data) {
m_data_memdisk = data;
});
@@ -121,12 +121,12 @@
for (var i = 0; i < list.length; i++) {
if (list[i].path === data.path) {
Message.error(g_vtoy_cur_language.STR_DUPLICATE_PATH);
Message.error(g_hiso_cur_language.STR_DUPLICATE_PATH);
return;
}
}
callVtoy({
callHiso({
method : 'auto_memdisk_add',
index: current_tab_index,
path: data.path,
@@ -134,9 +134,9 @@
if (e.result === 'success') {
list.push(data);
FillMemdiskTable(list);
Message.success(g_vtoy_cur_language.STR_SAVE_SUCCESS);
Message.success(g_hiso_cur_language.STR_SAVE_SUCCESS);
} else if (e.result === 'duplicate') {
Message.error(g_vtoy_cur_language.STR_DUPLICATE_PATH);
Message.error(g_hiso_cur_language.STR_DUPLICATE_PATH);
}
});
}
@@ -145,7 +145,7 @@
var tip1 = (g_current_os === 'windows') ? '\\ISO\\Windows11.iso' : "/ISO/Ubuntu-20.04-desktop-amd64.iso";
var tip2 = (g_current_os === 'windows') ? '\\ISO\\Windows**.iso' : "/ISO/Ubuntu-*****-desktop-amd64.iso";
var para = {
"title": g_vtoy_cur_language.STR_ADD_FILE_TO_LIST,
"title": g_hiso_cur_language.STR_ADD_FILE_TO_LIST,
"fuzzy": 1,
"tip1": g_current_dir + tip1,
"tip2": g_current_dir + tip2,
@@ -153,7 +153,7 @@
"extra": false,
"extra_title": ''
};
VtoySelectFilePath(OnAddAutoMemdisk, para);
HisoSelectFilePath(OnAddAutoMemdisk, para);
});
$("#id_auto_memdisk_tbl").on('click', '.MemdiskDelBtn', function() {
@@ -161,14 +161,14 @@
var path = $tr.data('path');
var index = $tr.data('index');
callVtoySync({
callHisoSync({
method : 'auto_memdisk_del',
index: current_tab_index,
path: path
}, function(data) {
m_data_memdisk[current_tab_index].splice(index, 1);
FillMemdiskTable(m_data_memdisk[current_tab_index]);
Message.success(g_vtoy_cur_language.STR_SAVE_SUCCESS);
Message.success(g_hiso_cur_language.STR_SAVE_SUCCESS);
});
});
@@ -184,7 +184,7 @@
$('#id_btn_reset').click(function() {
Modal.confirm({msg:GetResetTabConfigTipMsg(current_tab_index, 'auto_memdisk')}).on(function(e) {
if (e) {
callVtoySync({
callHisoSync({
method : 'auto_memdisk_del',
index: current_tab_index,
path: g_del_all_path
@@ -193,14 +193,14 @@
});
m_data_memdisk[current_tab_index].length = 0;
VtoyFillCurrentPageItem(m_data_memdisk[g_vtoy_data_default_index]);
Message.success(g_vtoy_cur_language.STR_SAVE_SUCCESS);
HisoFillCurrentPageItem(m_data_memdisk[g_hiso_data_default_index]);
Message.success(g_hiso_cur_language.STR_SAVE_SUCCESS);
}
});
});
$('#id_tab_auto_memdisk a[href="#tab_0"]').tab('show');
VtoyFillCurrentPageItem(m_data_memdisk[0]);
VtoyPageLanguageChange(g_current_language);
HisoFillCurrentPageItem(m_data_memdisk[0]);
HisoPageLanguageChange(g_current_language);
</script>
src/plugson/www/plugson_conf_replace.html
+34 -34
View File
@@ -8,7 +8,7 @@
<button id="id_btn_reset" class="btn btn-sm btn-danger btn-del"><i class="fa fa-trash"></i><span id="id_btn_span_reset">Reset</span></button>
</div>
<div class="col-sm-2" style="font-size:16px;padding-top:8px;">
<a id="id_a_official_doc" target="_blank" href="https://www.ventoy.net/en/plugin_bootconf_replace.html"><span class="fa fa-link"></span><span id="id_span_official_doc">官网文档</span></a>
<a id="id_a_official_doc" target="_blank" href="https://www.hiperiso.net/en/plugin_bootconf_replace.html"><span class="fa fa-link"></span><span id="id_span_official_doc">官网文档</span></a>
</div>
</div>
<legend></legend>
@@ -44,18 +44,18 @@
</div>
<script type="text/javascript">
function VtoyPageLanguageChange(newlang) {
VtoyCommonChangeLanguage(newlang);
$('h1[id=id_h1_page_title]').text(g_vtoy_cur_language.STR_PLUG_CONF_REPLACE);
function HisoPageLanguageChange(newlang) {
HisoCommonChangeLanguage(newlang);
$('h1[id=id_h1_page_title]').text(g_hiso_cur_language.STR_PLUG_CONF_REPLACE);
$("span[id=id_span_file_exist]").each(function(){
$(this).text(g_vtoy_cur_language.STR_FILE_EXIST);
$(this).text(g_hiso_cur_language.STR_FILE_EXIST);
});
$("span[id=id_span_file_nonexist]").each(function(){
$(this).text(g_vtoy_cur_language.STR_FILE_NONEXIST);
$(this).text(g_hiso_cur_language.STR_FILE_NONEXIST);
});
$("span[id=id_span_file_fuzzy]").each(function(){
$(this).text(g_vtoy_cur_language.STR_FILE_FUZZY);
$(this).text(g_hiso_cur_language.STR_FILE_FUZZY);
});
if (newlang === 'en') {
@@ -71,8 +71,8 @@
}
function FillConfReplaceTable(data) {
var addbtn = ventoy_get_xslg_addbtn('ConfReplaceAddBtn');
var delbtn = ventoy_get_xslg_delbtn('ConfReplaceDelBtn');
var addbtn = hiperiso_get_xslg_addbtn('ConfReplaceAddBtn');
var delbtn = hiperiso_get_xslg_delbtn('ConfReplaceDelBtn');
var td1, td2, td3, td4, td5, td6, td7;
var $tbl = $("#id_conf_replace_tbl tbody");
@@ -82,10 +82,10 @@
var $tr;
td1 = '<td>' + (i + 1) + '</td>';
td2 = '<td>' + data[i].path + '</td>';
td3 = '<td>' + ventoy_get_status_line(0, data[i].valid) + '</td>';
td3 = '<td>' + hiperiso_get_status_line(0, data[i].valid) + '</td>';
td4 = '<td>' + data[i].org + '</td>';
td5 = '<td>' + data[i].new + '</td>';
td6 = '<td>' + ventoy_get_status_line(0, data[i].new_valid) + '</td>';
td6 = '<td>' + hiperiso_get_status_line(0, data[i].new_valid) + '</td>';
td7 = '<td>' + delbtn + '</td>';
$tr = $('<tr>' + td1 + td2 + td3 + td4 + td5 + td6 + td7 + '</tr>');
@@ -98,7 +98,7 @@
$tbl.append('<tr><td></td><td></td><td></td><td></td><td></td><td></td><td>' + addbtn + '</td></tr>');
}
function VtoyFillCurrentPageItem(data) {
function HisoFillCurrentPageItem(data) {
FillConfReplaceTable(data);
}
@@ -107,12 +107,12 @@
var href = $(this).attr('href');
var index = parseInt(href.substr(5, 1));
if (index < 0 || index >= g_vtoy_data_default_index || current_tab_index === index) {
if (index < 0 || index >= g_hiso_data_default_index || current_tab_index === index) {
return;
}
current_tab_index = index;
VtoyFillCurrentPageItem(m_data_conf_replace[index]);
HisoFillCurrentPageItem(m_data_conf_replace[index]);
}
//Main process
@@ -121,7 +121,7 @@
var m_conf_new_path;
var m_data_conf_replace;
var current_tab_index = 0;
callVtoySync({method : 'get_conf_replace'}, function(data) {
callHisoSync({method : 'get_conf_replace'}, function(data) {
m_data_conf_replace = data;
});
@@ -152,20 +152,20 @@
return;
}
m_conf_iso_path = ventoy_replace_slash(m_conf_iso_path);
m_conf_new_path = ventoy_replace_slash(m_conf_new_path);
m_conf_iso_path = hiperiso_replace_slash(m_conf_iso_path);
m_conf_new_path = hiperiso_replace_slash(m_conf_new_path);
if (!ventoy_common_check_path(m_conf_iso_path)) {
Message.error(g_vtoy_cur_language.STR_INVALID_FILE_PATH);
if (!hiperiso_common_check_path(m_conf_iso_path)) {
Message.error(g_hiso_cur_language.STR_INVALID_FILE_PATH);
return;
}
if (!ventoy_common_check_path(m_conf_new_path)) {
Message.error(g_vtoy_cur_language.STR_INVALID_FILE_PATH);
if (!hiperiso_common_check_path(m_conf_new_path)) {
Message.error(g_hiso_cur_language.STR_INVALID_FILE_PATH);
return;
}
callVtoy({
callHiso({
method : 'check_path2',
dir1: 0,
fuzzy1: 1,
@@ -190,7 +190,7 @@
data.img = 1;
}
callVtoy({
callHiso({
method : 'conf_replace_add',
index: current_tab_index,
path: data.path,
@@ -200,14 +200,14 @@
}, function(e) {
m_data_conf_replace[current_tab_index].push(data);
FillConfReplaceTable(m_data_conf_replace[current_tab_index]);
Message.success(g_vtoy_cur_language.STR_SAVE_SUCCESS);
Message.success(g_hiso_cur_language.STR_SAVE_SUCCESS);
});
$("#ConfReplaceModal").modal('hide');
} else if (retdata.exist1 === 0) {
Message.error(g_vtoy_cur_language.STR_INVALID_FILE_PATH);
Message.error(g_hiso_cur_language.STR_INVALID_FILE_PATH);
} else {
Message.error(g_vtoy_cur_language.STR_INVALID_NEW_FILE_PATH);
Message.error(g_hiso_cur_language.STR_INVALID_NEW_FILE_PATH);
}
});
}
@@ -239,7 +239,7 @@
});
$('#ConfReplaceForm #id_span_conf_tip3').each(function() {
var tip = (g_current_os === 'windows') ? '\\ventoy\\grub_new.cfg' : "/ventoy/grub_new.cfg";
var tip = (g_current_os === 'windows') ? '\\hiperiso\\grub_new.cfg' : "/hiperiso/grub_new.cfg";
$(this).text(g_current_dir + tip);
});
@@ -252,14 +252,14 @@
var path = $tr.data('path');
var index = $tr.data('index');
callVtoySync({
callHisoSync({
method : 'conf_replace_del',
index: current_tab_index,
path: path
}, function(data) {
m_data_conf_replace[current_tab_index].splice(index, 1);
FillConfReplaceTable(m_data_conf_replace[current_tab_index]);
Message.success(g_vtoy_cur_language.STR_SAVE_SUCCESS);
Message.success(g_hiso_cur_language.STR_SAVE_SUCCESS);
});
});
@@ -276,7 +276,7 @@
$('#id_btn_reset').click(function() {
Modal.confirm({msg:GetResetTabConfigTipMsg(current_tab_index, 'conf_replace')}).on(function(e) {
if (e) {
callVtoySync({
callHisoSync({
method : 'conf_replace_del',
index: current_tab_index,
path: g_del_all_path
@@ -285,14 +285,14 @@
});
m_data_conf_replace[current_tab_index].length = 0;
VtoyFillCurrentPageItem(m_data_conf_replace[g_vtoy_data_default_index]);
Message.success(g_vtoy_cur_language.STR_SAVE_SUCCESS);
HisoFillCurrentPageItem(m_data_conf_replace[g_hiso_data_default_index]);
Message.success(g_hiso_cur_language.STR_SAVE_SUCCESS);
}
});
});
$('#id_tab_conf_replace a[href="#tab_0"]').tab('show');
VtoyFillCurrentPageItem(m_data_conf_replace[0]);
VtoyPageLanguageChange(g_current_language);
HisoFillCurrentPageItem(m_data_conf_replace[0]);
HisoPageLanguageChange(g_current_language);
</script>
src/plugson/www/plugson_control.html
+118 -118
View File
@@ -15,7 +15,7 @@
</div>
<div class="col-sm-2" style="font-size:16px;padding-top:8px;">
<a id="id_a_official_doc" target="_blank" href="https://www.ventoy.net/cn/plugin_control.html"><span class="fa fa-link"></span><span id="id_span_official_doc">官网文档</span></a>
<a id="id_a_official_doc" target="_blank" href="https://www.hiperiso.net/cn/plugin_control.html"><span class="fa fa-link"></span><span id="id_span_official_doc">官网文档</span></a>
</div>
</div>
<legend></legend>
@@ -35,7 +35,7 @@
<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_MENU_LANGUAGE
<h3 class="box-title" style="font-size: 14px;font-weight: bold;">HISO_MENU_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>
@@ -54,13 +54,13 @@
<tr id="tr_title_desc_cn">
<td class="td_ctrl_col">选项说明</td>
<td>
Ventoy 菜单的语言版本。默认是 "en_US"。
Hiperiso 菜单的语言版本。默认是 "en_US"。
</td>
</tr>
<tr id="tr_title_desc_en">
<td class="td_ctrl_col">Option Description</td>
<td>
Ventoy menu language. Default is "en_US",
Hiperiso menu language. Default is "en_US",
</td>
</tr>
</table>
@@ -71,7 +71,7 @@
<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_DEFAULT_SEARCH_ROOT
<h3 class="box-title" style="font-size: 14px;font-weight: bold;">HISO_DEFAULT_SEARCH_ROOT
<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>
@@ -100,17 +100,17 @@
<tr id="tr_title_desc_cn">
<td class="td_ctrl_col">选项说明</td>
<td>
指定搜索ISO文件的根目录。默认Ventoy会搜索U盘上的所有目录和子目录，当你U盘上有海量的文件时，这个过程会很慢。<br/>
这种情况下你可以把ISO文件单独放在某个子目录下，然后通过这个变量来指定搜索路径，此时Ventoy就只会搜索该目录及其子目录。<br/>
指定搜索ISO文件的根目录。默认Hiperiso会搜索U盘上的所有目录和子目录，当你U盘上有海量的文件时，这个过程会很慢。<br/>
这种情况下你可以把ISO文件单独放在某个子目录下，然后通过这个变量来指定搜索路径，此时Hiperiso就只会搜索该目录及其子目录。<br/>
注意这里不能设置为U盘根目录，必须为一个子目录。
</td>
</tr>
<tr id="tr_title_desc_en">
<td class="td_ctrl_col">Option Description</td>
<td>
The root path where to search the image files. By default, Ventoy will search all the directories and subdirectories in the USB. This will be very slow when you have huge number of files in the USB.
The root path where to search the image files. By default, Hiperiso will search all the directories and subdirectories in the USB. This will be very slow when you have huge number of files in the USB.
In this case, you can put all the image files in one subdirectory and use this to specify the search path.
After that Ventoy will only search this directory and its subdirectories for image files.<br/>
After that Hiperiso will only search this directory and its subdirectories for image files.<br/>
Note: the path must not be the mountpoint of the first partition, but a subdirectory.
</td>
</tr>
@@ -122,7 +122,7 @@
<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_SECURE_BOOT_POLICY
<h3 class="box-title" style="font-size: 14px;font-weight: bold;">HISO_SECURE_BOOT_POLICY
<span id="id_span_desc_cn"> —— UEFI 安全启动策略</span></h3>
<div class="box-tools pull-right">
<button class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
@@ -154,7 +154,7 @@
<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_WIN_UEFI_RES_LOCK
<h3 class="box-title" style="font-size: 14px;font-weight: bold;">HISO_WIN_UEFI_RES_LOCK
<span id="id_span_desc_cn"> —— UEFI 分辨率锁定</span></h3>
<div class="box-tools pull-right">
<button class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
@@ -194,7 +194,7 @@
<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_WIN11_BYPASS_CHECK
<h3 class="box-title" style="font-size: 14px;font-weight: bold;">HISO_WIN11_BYPASS_CHECK
<span id="id_span_desc_cn"> —— 绕过Windows 11硬件检查</span></h3>
<div class="box-tools pull-right">
<button class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
@@ -221,7 +221,7 @@
<td class="td_ctrl_col" id="td_title_desc">选项说明</td>
<td>
该选项只对标准Windows 11 ISO文件有效，对于其他镜像文件无效。
当设置为1时，Ventoy 会在安装时创建以下几个注册表项用来绕过 Windows 11 安装程序的硬件检查。<br/>
当设置为1时，Hiperiso 会在安装时创建以下几个注册表项用来绕过 Windows 11 安装程序的硬件检查。<br/>
<code>HKEY_LOCAL_MACHINE\SYSTEM\Setup\LabConfig\BypassRAMCheck</code><br/>
<code>HKEY_LOCAL_MACHINE\SYSTEM\Setup\LabConfig\BypassTPMCheck</code><br/>
<code>HKEY_LOCAL_MACHINE\SYSTEM\Setup\LabConfig\BypassSecureBootCheck</code><br/>
@@ -232,7 +232,7 @@
<td class="td_ctrl_col" id="td_title_desc">Option Description</td>
<td>
This option only avaliable for standard Windows 11 ISO files.
When set to 1, Ventoy will create the following registries to bypass Windows 11 hardware check when install. <br/>
When set to 1, Hiperiso will create the following registries to bypass Windows 11 hardware check when install. <br/>
<code>HKEY_LOCAL_MACHINE\SYSTEM\Setup\LabConfig\BypassRAMCheck</code><br/>
<code>HKEY_LOCAL_MACHINE\SYSTEM\Setup\LabConfig\BypassTPMCheck</code><br/>
<code>HKEY_LOCAL_MACHINE\SYSTEM\Setup\LabConfig\BypassSecureBootCheck</code><br/>
@@ -248,7 +248,7 @@
<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_WIN11_BYPASS_NRO
<h3 class="box-title" style="font-size: 14px;font-weight: bold;">HISO_WIN11_BYPASS_NRO
<span id="id_span_desc_cn"> —— 绕过Windows 11 在线账户需求</span></h3>
<div class="box-tools pull-right">
<button class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
@@ -275,7 +275,7 @@
<td class="td_ctrl_col" id="td_title_desc">选项说明</td>
<td>
该选项只对标准Windows 11 ISO文件有效，对于其他镜像文件无效。
当设置为1时，Ventoy 会在安装时创建以下注册表项用来绕过 Windows 11 安装时对在线账户的需求。<br/>
当设置为1时，Hiperiso 会在安装时创建以下注册表项用来绕过 Windows 11 安装时对在线账户的需求。<br/>
<code>HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\OOBE\BypassNRO</code><br/>
</td>
</tr>
@@ -283,7 +283,7 @@
<td class="td_ctrl_col" id="td_title_desc">Option Description</td>
<td>
This option only avaliable for standard Windows 11 ISO files.
When set to 1, Ventoy will create the following registry to bypass Windows 11 online account requirement when install. <br/>
When set to 1, Hiperiso will create the following registry to bypass Windows 11 online account requirement when install. <br/>
<code>HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\OOBE\BypassNRO</code>
</td>
</tr>
@@ -298,7 +298,7 @@
<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_DEFAULT_MENU_MODE
<h3 class="box-title" style="font-size: 14px;font-weight: bold;">HISO_DEFAULT_MENU_MODE
<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>
@@ -333,7 +333,7 @@
<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_MENU_TIMEOUT
<h3 class="box-title" style="font-size: 14px;font-weight: bold;">HISO_MENU_TIMEOUT
<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>
@@ -371,7 +371,7 @@
<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_DEFAULT_IMAGE
<h3 class="box-title" style="font-size: 14px;font-weight: bold;">HISO_DEFAULT_IMAGE
<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>
@@ -400,16 +400,16 @@
<tr id="tr_title_desc_cn">
<td class="td_ctrl_col">选项说明</td>
<td>
正常情况下默认选中的是第1个镜像文件。通过这个选项可以设置默认选中的镜像文件，一般和 VTOY_MENU_TIMEOUT 一起使用。<br/>
正常情况下默认选中的是第1个镜像文件。通过这个选项可以设置默认选中的镜像文件，一般和 HISO_MENU_TIMEOUT 一起使用。<br/>
可以设置为 WIM/VHD/IMG 等支持的文件，必须是以 / 开始的全路径，ListView模式和TreeView模式都支持。 <br/>
注意，当同时设置了 VTOY_DEFAULT_SEARCH_ROOT 以后，VTOY_DEFAULT_IMAGE 对应的文件必须位于 VTOY_DEFAULT_SEARCH_ROOT 对应的目录下，否则不会生效。
注意，当同时设置了 HISO_DEFAULT_SEARCH_ROOT 以后，HISO_DEFAULT_IMAGE 对应的文件必须位于 HISO_DEFAULT_SEARCH_ROOT 对应的目录下，否则不会生效。
</td>
</tr>
<tr id="tr_title_desc_en">
<td class="td_ctrl_col">Option Description</td>
<td>
Default selected image path. Normally used with VTOY_MENU_TIMEOUT. <br/>It can be ISO/WIM/VHD/IMG ... and supported in both ListView mode and TreeView mode.<br/>
Attention that, when VTOY_DEFAULT_SEARCH_ROOT is set, VTOY_DEFAULT_IMAGE must be in the directory (or sub-directory) of VTOY_DEFAULT_SEARCH_ROOT, otherwise it will not take effect.
Default selected image path. Normally used with HISO_MENU_TIMEOUT. <br/>It can be ISO/WIM/VHD/IMG ... and supported in both ListView mode and TreeView mode.<br/>
Attention that, when HISO_DEFAULT_SEARCH_ROOT is set, HISO_DEFAULT_IMAGE must be in the directory (or sub-directory) of HISO_DEFAULT_SEARCH_ROOT, otherwise it will not take effect.
</td>
</tr>
</table>
@@ -425,7 +425,7 @@
<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_MAX_SEARCH_LEVEL
<h3 class="box-title" style="font-size: 14px;font-weight: bold;">HISO_MAX_SEARCH_LEVEL
<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>
@@ -457,14 +457,14 @@
<td>
最大搜索子目录的层数，取值为：<code>max</code> <code>0</code> <code>1</code> <code>2</code> <code>3</code> <code>...</code>
&nbsp;&nbsp;&nbsp;默认值为：<code>max</code><br/>
默认Ventoy会递归搜索磁盘上的所有目录和子目录，不管目录结构有多深都会搜索到底。你可以通过这个参数来控制搜索时的路径深度。<br/><br/>
<code>max</code> : 最大层数，也就是搜索所有子目录的意思。这也是 Ventoy 的默认值。<br/>
默认Hiperiso会递归搜索磁盘上的所有目录和子目录，不管目录结构有多深都会搜索到底。你可以通过这个参数来控制搜索时的路径深度。<br/><br/>
<code>max</code> : 最大层数，也就是搜索所有子目录的意思。这也是 Hiperiso 的默认值。<br/>
<code>0</code> : 搜索0层子目录，只列出根目录下的文件，不去搜索任何一个子目录。<br/>
<code>1</code> : 搜索1层子目录，除了根目录下的文件以外，再搜索根目录下的1级子目录。但是不再搜索1级子目录下的子目录（2级子目录）。<br/>
<code>2</code> : 搜索2层子目录，除了根目录下的文件以外，再搜索根目录下的1级子目录以及1级子目录下的子目录（2级子目录）。<br/>
<code>3</code> : 搜索3层子目录，......<br/>
<code>...</code><br/><br/>
注意，如果 <code>VTOY_DEFAULT_SEARCH_ROOT</code> 参数也同时设置了的话，则就以 <code>VTOY_DEFAULT_SEARCH_ROOT</code> 指定的目录作为根目录开始计算。
注意，如果 <code>HISO_DEFAULT_SEARCH_ROOT</code> 参数也同时设置了的话，则就以 <code>HISO_DEFAULT_SEARCH_ROOT</code> 指定的目录作为根目录开始计算。
</td>
</tr>
<tr id="tr_title_desc_en">
@@ -472,15 +472,15 @@
<td>
Max subdirectory level when search for image files. It's value can be: <code>max</code> <code>0</code> <code>1</code> <code>2</code> <code>3</code> <code>...</code>
&nbsp;&nbsp;&nbsp;default is : <code>max</code><br/>
By default, Ventoy will search all the directories and sub directories recursively no matter how deep the directory level is.<br/>
By default, Hiperiso will search all the directories and sub directories recursively no matter how deep the directory level is.<br/>
You can use this parameter to set a max-depth for the search path.<br/><br/>
<code>max</code> : Maximum, search all the directories and subdirectories. This is Ventoy's default value.<br/>
<code>max</code> : Maximum, search all the directories and subdirectories. This is Hiperiso's default value.<br/>
<code>0</code> : Only search files in the root and don't search any subdirectories.<br/>
<code>1</code> : Search up to level 1 of subdirectories.<br/>
<code>2</code> : Search up to level 2 of subdirectories.<br/>
<code>3</code> : Search up to level 3 of subdirectories.<br/>
<code>...</code><br/><br/>
If <code>VTOY_DEFAULT_SEARCH_ROOT</code> is set at the same time. Then the level is counted from <code>VTOY_DEFAULT_SEARCH_ROOT</code> .
If <code>HISO_DEFAULT_SEARCH_ROOT</code> is set at the same time. Then the level is counted from <code>HISO_DEFAULT_SEARCH_ROOT</code> .
</td>
</tr>
</table>
@@ -491,7 +491,7 @@
<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_SECONDARY_BOOT_MENU
<h3 class="box-title" style="font-size: 14px;font-weight: bold;">HISO_SECONDARY_BOOT_MENU
<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>
@@ -521,7 +521,7 @@
<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_SHOW_PASSWORD_ASTERISK
<h3 class="box-title" style="font-size: 14px;font-weight: bold;">HISO_SHOW_PASSWORD_ASTERISK
<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>
@@ -552,7 +552,7 @@
<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_SECONDARY_TIMEOUT
<h3 class="box-title" style="font-size: 14px;font-weight: bold;">HISO_SECONDARY_TIMEOUT
<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>
@@ -571,7 +571,7 @@
<tr id="tr_title_desc_cn">
<td class="td_ctrl_col">选项说明</td>
<td>
二级菜单倒计时（秒）。只有当 <code>VTOY_SECONDARY_BOOT_MENU</code> 设置为1时才有效。<br/>
二级菜单倒计时（秒）。只有当 <code>HISO_SECONDARY_BOOT_MENU</code> 设置为1时才有效。<br/>
默认不设置，设置之后，比如设置为10，则在倒计时10秒之后，会自动选择第一项，即：<code>Boot in normal mode</code> <br/>
在倒计时的过程中按任意键会停止倒计时，等待用户操作。
</td>
@@ -579,7 +579,7 @@
<tr id="tr_title_desc_en">
<td class="td_ctrl_col">Option Description</td>
<td>
Timeout seconds for the secondary boot menu. Only take effect when <code>VTOY_SECONDARY_BOOT_MENU</code> is 1.<br/>
Timeout seconds for the secondary boot menu. Only take effect when <code>HISO_SECONDARY_BOOT_MENU</code> is 1.<br/>
By default no timeout is set. When you set it to 10 for example, the first entry (<code>Boot in normal mode</code>) will be selected an run after 10 seconds.
</td>
</tr>
@@ -592,7 +592,7 @@
<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_DEFAULT_KBD_LAYOUT
<h3 class="box-title" style="font-size: 14px;font-weight: bold;">HISO_DEFAULT_KBD_LAYOUT
<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>
@@ -648,7 +648,7 @@
<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_TREE_VIEW_MENU_STYLE
<h3 class="box-title" style="font-size: 14px;font-weight: bold;">HISO_TREE_VIEW_MENU_STYLE
<span id="id_span_desc_cn"> —— TreeView模式显示风格</span></h3>
<div class="box-tools pull-right">
<button class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
@@ -671,7 +671,7 @@
<td class="td_ctrl_col" id="td_title_desc">选项说明</td>
<td>TreeView模式下的菜单风格。
<code style="font-weight: bold;">0</code> 显示DIR和文件大小 &nbsp;&nbsp;&nbsp;
<code style="font-weight: bold;">1</code> 不显示DIR和文件大小。只在 VTOY_DEFAULT_MENU_MODE 为1时才有效。
<code style="font-weight: bold;">1</code> 不显示DIR和文件大小。只在 HISO_DEFAULT_MENU_MODE 为1时才有效。
</td>
</tr>
<tr id="tr_title_desc_en">
@@ -689,7 +689,7 @@
<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_FILT_DOT_UNDERSCORE_FILE
<h3 class="box-title" style="font-size: 14px;font-weight: bold;">HISO_FILT_DOT_UNDERSCORE_FILE
<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>
@@ -731,7 +731,7 @@
<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_SORT_CASE_SENSITIVE
<h3 class="box-title" style="font-size: 14px;font-weight: bold;">HISO_SORT_CASE_SENSITIVE
<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>
@@ -771,7 +771,7 @@
<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_VHD_NO_WARNING</h3>
<h3 class="box-title" style="font-size: 14px;font-weight: bold;">HISO_VHD_NO_WARNING</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 -->
@@ -814,7 +814,7 @@
<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_FILE_FLT_ISO
<h3 class="box-title" style="font-size: 14px;font-weight: bold;">HISO_FILE_FLT_ISO
<span id="id_span_desc_cn"> —— 过滤 .iso 文件</span></h3>
<div class="box-tools pull-right">
<button class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
@@ -856,7 +856,7 @@
<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_FILE_FLT_WIM
<h3 class="box-title" style="font-size: 14px;font-weight: bold;">HISO_FILE_FLT_WIM
<span id="id_span_desc_cn"> —— 过滤 .wim 文件</span></h3>
<div class="box-tools pull-right">
<button class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
@@ -899,7 +899,7 @@
<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_FILE_FLT_EFI
<h3 class="box-title" style="font-size: 14px;font-weight: bold;">HISO_FILE_FLT_EFI
<span id="id_span_desc_cn"> —— 过滤 .efi 文件</span></h3>
<div class="box-tools pull-right">
<button class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
@@ -942,7 +942,7 @@
<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_FILE_FLT_IMG
<h3 class="box-title" style="font-size: 14px;font-weight: bold;">HISO_FILE_FLT_IMG
<span id="id_span_desc_cn"> —— 过滤 .img 文件</span></h3>
<div class="box-tools pull-right">
<button class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
@@ -985,7 +985,7 @@
<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_FILE_FLT_VHD
<h3 class="box-title" style="font-size: 14px;font-weight: bold;">HISO_FILE_FLT_VHD
<span id="id_span_desc_cn"> —— 过滤 .vhd(x) 文件</span></h3>
<div class="box-tools pull-right">
<button class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
@@ -1028,8 +1028,8 @@
<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_FILE_FLT_VTOY
<span id="id_span_desc_cn"> —— 过滤 .vtoy 文件</span></h3>
<h3 class="box-title" style="font-size: 14px;font-weight: bold;">HISO_FILE_FLT_HISO
<span id="id_span_desc_cn"> —— 过滤 .hiso 文件</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 -->
@@ -1040,27 +1040,27 @@
<td class="td_ctrl_col" id="td_title_setting">选项设置</td>
<td>
<label class="radio-inline">
<input type="radio" id="id_ctrl_radio_filt_vtoy0" name="id_ctrl_radio_filt_vtoy" data-type="0" value="0" > <span style="font-weight:bold;">0</span>
<input type="radio" id="id_ctrl_radio_filt_hiso0" name="id_ctrl_radio_filt_hiso" data-type="0" value="0" > <span style="font-weight:bold;">0</span>
</label>&nbsp;&nbsp;&nbsp;&nbsp;
<label class="radio-inline">
<input type="radio" id="id_ctrl_radio_filt_vtoy1" name="id_ctrl_radio_filt_vtoy" data-type="1" value="1" > <span style="font-weight:bold;">1</span>
<input type="radio" id="id_ctrl_radio_filt_hiso1" name="id_ctrl_radio_filt_hiso" data-type="1" value="1" > <span style="font-weight:bold;">1</span>
</label>
</td>
</tr>
<tr id="tr_title_desc_cn">
<td class="td_ctrl_col" id="td_title_desc">选项说明</td>
<td>
<code style="font-weight: bold;">0</code> 不过滤 .vtoy 文件 &nbsp;&nbsp; &nbsp;&nbsp;
<code style="font-weight: bold;">1</code> 过滤掉 .vtoy 文件。&nbsp;&nbsp; &nbsp;&nbsp;
过滤之后 .vtoy 文件就不会显示在启动菜单中。
<code style="font-weight: bold;">0</code> 不过滤 .hiso 文件 &nbsp;&nbsp; &nbsp;&nbsp;
<code style="font-weight: bold;">1</code> 过滤掉 .hiso 文件。&nbsp;&nbsp; &nbsp;&nbsp;
过滤之后 .hiso 文件就不会显示在启动菜单中。
</td>
</tr>
<tr id="tr_title_desc_en">
<td class="td_ctrl_col" id="td_title_desc">Option Description</td>
<td>
<code style="font-weight: bold;">0</code> List .vtoy files. &nbsp;&nbsp;&nbsp;&nbsp;
<code style="font-weight: bold;">1</code> Filter .vtoy files. &nbsp;&nbsp;&nbsp;&nbsp;
The vtoy files will not be shown in the boot menu if set to 1.
<code style="font-weight: bold;">0</code> List .hiso files. &nbsp;&nbsp;&nbsp;&nbsp;
<code style="font-weight: bold;">1</code> Filter .hiso files. &nbsp;&nbsp;&nbsp;&nbsp;
The hiso files will not be shown in the boot menu if set to 1.
</td>
</tr>
</table>
@@ -1074,25 +1074,25 @@
</div>
<script type="text/javascript">
function VtoyPageLanguageChange(newlang) {
VtoyCommonChangeLanguage(newlang);
function HisoPageLanguageChange(newlang) {
HisoCommonChangeLanguage(newlang);
$('h1[id=id_h1_page_title]').text(g_vtoy_cur_language.STR_PLUG_CONTROL);
$('#id_ctrl_span_search_root_valid').text(g_vtoy_cur_language.STR_VALID);
$('#id_ctrl_span_search_root_invalid').text(g_vtoy_cur_language.STR_INVALID);
$('#id_ctrl_span_img_valid').text(g_vtoy_cur_language.STR_VALID);
$('#id_ctrl_span_img_invalid').text(g_vtoy_cur_language.STR_INVALID);
$('h1[id=id_h1_page_title]').text(g_hiso_cur_language.STR_PLUG_CONTROL);
$('#id_ctrl_span_search_root_valid').text(g_hiso_cur_language.STR_VALID);
$('#id_ctrl_span_search_root_invalid').text(g_hiso_cur_language.STR_INVALID);
$('#id_ctrl_span_img_valid').text(g_hiso_cur_language.STR_VALID);
$('#id_ctrl_span_img_invalid').text(g_hiso_cur_language.STR_INVALID);
$("span[id=id_span_edit]").each(function(){
$(this).text(' ' + g_vtoy_cur_language.STR_EDIT);
$(this).text(' ' + g_hiso_cur_language.STR_EDIT);
});
$("span[id=id_span_clear]").each(function(){
$(this).text(' ' + g_vtoy_cur_language.STR_CLEAR);
$(this).text(' ' + g_hiso_cur_language.STR_CLEAR);
});
}
function VtoyGetCurrentPageItem(data) {
function HisoGetCurrentPageItem(data) {
var level;
data.win11_bypass_check = parseInt($('input:radio[name=id_ctrl_bypass_win11_radio]:checked').val());
@@ -1127,22 +1127,22 @@
data.filter_efi = parseInt($('input:radio[name=id_ctrl_radio_filt_efi]:checked').val());
data.filter_img = parseInt($('input:radio[name=id_ctrl_radio_filt_img]: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_hiso = parseInt($('input:radio[name=id_ctrl_radio_filt_hiso]:checked').val());
data.menu_language = $('select[id=id_ctrl_sel_menu_lang').val();
}
function VtoyFillCurrentPageItem(data) {
//VTOY_WIN11_BYPASS_CHECK
function HisoFillCurrentPageItem(data) {
//HISO_WIN11_BYPASS_CHECK
$('input:radio[name=id_ctrl_bypass_win11_radio]')[data.win11_bypass_check].checked = true;
//VTOY_WIN11_BYPASS_NRO
//HISO_WIN11_BYPASS_NRO
$('input:radio[name=id_ctrl_bypass_nro_radio]')[data.win11_bypass_nro].checked = true;
$('input:radio[name=id_ctrl_secondary_radio]')[data.secondary_menu].checked = true;
$('input:radio[name=id_ctrl_uefi_res_lock_radio]')[data.uefi_res_lock].checked = true;
$('input:radio[name=id_ctrl_uefi_sb_policy_radio]')[data.uefi_sb_policy].checked = true;
$('input:radio[name=id_ctrl_asterisk_radio]')[data.password_asterisk].checked = true;
//VTOY_DEFAULT_SEARCH_ROOT
//HISO_DEFAULT_SEARCH_ROOT
$('input:text[id=id_ctrl_text_search_root]').val(data.default_search_root);
if (data.default_search_root.length === 0) {
$('div[id=id_ctrl_div_root_status]').hide();
@@ -1157,14 +1157,14 @@
}
}
//VTOY_MENU_TIMEOUT
//HISO_MENU_TIMEOUT
$('input:text[id=id_ctrl_text_timeout]').val(data.menu_timeout);
//VTOY_SECONDARY_TIMEOUT
//HISO_SECONDARY_TIMEOUT
$('input:text[id=id_ctrl_text_secondary_timeout]').val(data.secondary_menu_timeout);
//VTOY_DEFAULT_IMAGE
//HISO_DEFAULT_IMAGE
$('input:text[id=id_ctrl_text_default_img]').val(data.default_image);
if (data.default_image.length === 0) {
$('div[id=id_ctrl_div_img_status]').hide();
@@ -1179,52 +1179,52 @@
}
}
//VTOY_MAX_SEARCH_LEVEL
//HISO_MAX_SEARCH_LEVEL
if (data.max_search_level >=0 && data.max_search_level <= 10) {
$('select[id=id_ctrl_sel_max_depth').val(data.max_search_level);
} else {
$('select[id=id_ctrl_sel_max_depth').val('max');
}
//VTOY_DEFAULT_KBD_LAYOUT
//HISO_DEFAULT_KBD_LAYOUT
$('select[id=id_ctrl_sel_kbd').val(data.default_kbd_layout);
//VTOY_DEFAULT_MENU_MODE
//HISO_DEFAULT_MENU_MODE
$('input:radio[name=id_ctrl_radio_menu_mode]')[data.default_menu_mode].checked = true;
//VTOY_TREE_VIEW_MENU_STYLE
//HISO_TREE_VIEW_MENU_STYLE
$('input:radio[name=id_ctrl_radio_treestyle]')[data.treeview_style].checked = true;
//VTOY_FILT_DOT_UNDERSCORE_FILE
//HISO_FILT_DOT_UNDERSCORE_FILE
$('input:radio[name=id_ctrl_radio_underscore]')[data.filter_dot_underscore].checked = true;
//VTOY_SORT_CASE_SENSITIVE
//HISO_SORT_CASE_SENSITIVE
$('input:radio[name=id_ctrl_radio_casesensitive]')[data.sort_casesensitive].checked = true;
//VTOY_VHD_NO_WARNING
//HISO_VHD_NO_WARNING
$('input:radio[name=id_ctrl_radio_vhd_warning]')[data.vhd_no_warning].checked = true;
//VTOY_FILE_FLT_ISO
//HISO_FILE_FLT_ISO
$('input:radio[name=id_ctrl_radio_filt_iso]')[data.filter_iso].checked = true;
//VTOY_FILE_FLT_WIM
//HISO_FILE_FLT_WIM
$('input:radio[name=id_ctrl_radio_filt_wim]')[data.filter_wim].checked = true;
//VTOY_FILE_FLT_EFI
//HISO_FILE_FLT_EFI
$('input:radio[name=id_ctrl_radio_filt_efi]')[data.filter_efi].checked = true;
//VTOY_FILE_FLT_IMG
//HISO_FILE_FLT_IMG
$('input:radio[name=id_ctrl_radio_filt_img]')[data.filter_img].checked = true;
//VTOY_FILE_FLT_VHD
//HISO_FILE_FLT_VHD
$('input:radio[name=id_ctrl_radio_filt_vhd]')[data.filter_vhd].checked = true;
//VTOY_FILE_FLT_VTOY
$('input:radio[name=id_ctrl_radio_filt_vtoy]')[data.filter_vtoy].checked = true;
//HISO_FILE_FLT_HISO
$('input:radio[name=id_ctrl_radio_filt_hiso]')[data.filter_hiso].checked = true;
//VTOY_MENU_LANGUAGE
//HISO_MENU_LANGUAGE
if ($("select[id=id_ctrl_sel_menu_lang")[0].options.length === 0)
{
for (var i = 0; i < data.menu_list.length; i++) {
@@ -1236,11 +1236,11 @@
$('select[id=id_ctrl_sel_menu_lang').val(data.menu_language);
}
function VtoySaveCurrentPage() {
VtoyGetCurrentPageItem(m_data_control[current_tab_index]);
function HisoSaveCurrentPage() {
HisoGetCurrentPageItem(m_data_control[current_tab_index]);
var data = m_data_control[current_tab_index];
callVtoy({
callHiso({
method : 'save_control',
index: current_tab_index,
win11_bypass_check: data.win11_bypass_check,
@@ -1266,10 +1266,10 @@
filter_efi: data.filter_efi,
filter_img: data.filter_img,
filter_vhd: data.filter_vhd,
filter_vtoy: data.filter_vtoy,
filter_hiso: data.filter_hiso,
menu_language: data.menu_language
}, function(e) {
Message.success(g_vtoy_cur_language.STR_SAVE_SUCCESS);
Message.success(g_hiso_cur_language.STR_SAVE_SUCCESS);
});
}
@@ -1277,12 +1277,12 @@
var href = $(this).attr('href');
var index = parseInt(href.substr(5, 1));
if (index < 0 || index >= g_vtoy_data_default_index || current_tab_index === index) {
if (index < 0 || index >= g_hiso_data_default_index || current_tab_index === index) {
return;
}
current_tab_index = index;
VtoyFillCurrentPageItem(m_data_control[index]);
HisoFillCurrentPageItem(m_data_control[index]);
}
function OnSelectSearchRoot(root, extra) {
@@ -1295,7 +1295,7 @@
$('span[id=id_ctrl_span_search_root_valid]').show();
$('span[id=id_ctrl_span_search_root_invalid]').hide();
}
VtoySaveCurrentPage();
HisoSaveCurrentPage();
}
function OnSelectDefaultImage(root, valid, extra) {
@@ -1308,27 +1308,27 @@
$('span[id=id_ctrl_span_img_valid]').show();
$('span[id=id_ctrl_span_img_invalid]').hide();
}
VtoySaveCurrentPage();
HisoSaveCurrentPage();
}
//Main process
var m_data_control;
var current_tab_index = 0;
callVtoySync({method : 'get_control'}, function(data) {
callHisoSync({method : 'get_control'}, function(data) {
m_data_control = data;
});
$('#id_ctrl_btn_sel_root').click(function() {
var tip = (g_current_os === 'windows') ? '\\ISO\\Windows' : "/ISO/Linux";
var para = {
"title": g_vtoy_cur_language.STR_SET_SEARCH_ROOT,
"title": g_hiso_cur_language.STR_SET_SEARCH_ROOT,
"tip": g_current_dir + tip,
"tip3": '',
"extra": false,
"extra_title": ''
};
VtoySelectDirPath(OnSelectSearchRoot, para);
HisoSelectDirPath(OnSelectSearchRoot, para);
});
$('#id_ctrl_btn_clr_root').click(function() {
@@ -1336,14 +1336,14 @@
if (old.length != 0) {
$('input:text[id=id_ctrl_text_search_root]').val('');
$('div[id=id_ctrl_div_root_status]').hide();
VtoySaveCurrentPage();
HisoSaveCurrentPage();
}
});
$('#id_ctrl_btn_default_img').click(function() {
var tip = (g_current_os === 'windows') ? '\\ISO\\Windows10_en.iso' : "/ISO/Windows10_en.iso";
var para = {
"title": g_vtoy_cur_language.STR_SET_DEFAULT_IMAGE,
"title": g_hiso_cur_language.STR_SET_DEFAULT_IMAGE,
"fuzzy": 0,
"tip1": g_current_dir + tip,
"tip2": '',
@@ -1351,7 +1351,7 @@
"extra": false,
"extra_title": ''
};
VtoySelectFilePath(OnSelectDefaultImage, para);
HisoSelectFilePath(OnSelectDefaultImage, para);
});
$('#id_ctrl_btn_clr_default').click(function() {
@@ -1359,34 +1359,34 @@
if (old.length != 0) {
$('input:text[id=id_ctrl_text_default_img]').val('');
$('div[id=id_ctrl_div_img_status]').hide();
VtoySaveCurrentPage();
HisoSaveCurrentPage();
}
});
$('input[type=radio]').each(function(){
var id = $(this).attr('id');
if (typeof(id) != 'undefined' && id.startsWith('id_ctrl')) {
$(this).change(VtoySaveCurrentPage);
$(this).change(HisoSaveCurrentPage);
}
});
$('select[id=id_ctrl_sel_max_depth]').change(VtoySaveCurrentPage);
$('select[id=id_ctrl_sel_kbd]').change(VtoySaveCurrentPage);
$('select[id=id_ctrl_sel_menu_lang]').change(VtoySaveCurrentPage);
$('select[id=id_ctrl_sel_max_depth]').change(HisoSaveCurrentPage);
$('select[id=id_ctrl_sel_kbd]').change(HisoSaveCurrentPage);
$('select[id=id_ctrl_sel_menu_lang]').change(HisoSaveCurrentPage);
$('input[id=id_ctrl_text_timeout]').change(function() {
var value = $('input:text[id=id_ctrl_text_timeout]').val();
if (/^[0-9][0-9]*$/.test(value)) {
VtoySaveCurrentPage();
HisoSaveCurrentPage();
} else {
Message.error(g_vtoy_cur_language.STR_INVALID_TIMEOUT);
Message.error(g_hiso_cur_language.STR_INVALID_TIMEOUT);
$('input:text[id=id_ctrl_text_timeout]').val(m_data_control[current_tab_index].menu_timeout);
}
});
$('input[id=id_ctrl_text_secondary_timeout]').change(function() {
var value = $('input:text[id=id_ctrl_text_secondary_timeout]').val();
if (/^[0-9][0-9]*$/.test(value)) {
VtoySaveCurrentPage();
HisoSaveCurrentPage();
} else {
Message.error(g_vtoy_cur_language.STR_INVALID_TIMEOUT);
Message.error(g_hiso_cur_language.STR_INVALID_TIMEOUT);
$('input:text[id=id_ctrl_text_secondary_timeout]').val(m_data_control[current_tab_index].secondary_menu_timeout);
}
});
@@ -1404,15 +1404,15 @@
$('#id_btn_reset').click(function() {
Modal.confirm({msg:GetResetTabConfigTipMsg(current_tab_index, 'control')}).on(function(e) {
if (e) {
VtoyFillCurrentPageItem(m_data_control[g_vtoy_data_default_index]);
VtoySaveCurrentPage();
HisoFillCurrentPageItem(m_data_control[g_hiso_data_default_index]);
HisoSaveCurrentPage();
}
});
});
$('#id_tab_control a[href="#tab_0"]').tab('show');
VtoyFillCurrentPageItem(m_data_control[0]);
VtoyPageLanguageChange(g_current_language);
HisoFillCurrentPageItem(m_data_control[0]);
HisoPageLanguageChange(g_current_language);
$('button[id=id_btn_collapse]').click(function() {
$("button[data-widget='collapse'] i").each(function() {
src/plugson/www/plugson_donation.html
+8 -8
View File
@@ -10,7 +10,7 @@
<div id="id_donation_div_cn">
<p style="text-align:left;font-size:18px;color:#D01010;font-weight: bold;">
Ventoy是开源免费的，如果你愿意捐助来支持这个工具以及我的工作，我会非常感激。
Hiperiso是开源免费的，如果你愿意捐助来支持这个工具以及我的工作，我会非常感激。
</p>
<p style="text-align:left;font-size:16px;">
你可以选择使用支付宝或微信进行捐助。
@@ -23,12 +23,12 @@
<div id="id_donation_div_en">
<p style="text-align:left;font-size:18px;color:#D01010;font-weight: bold;">
It would be much appreciated if you want to make a small donation to support Ventoy!
It would be much appreciated if you want to make a small donation to support Hiperiso!
</p>
<p style="text-align:left;font-size:16px;">
PayPal and Bitcoin are avaliable for donation. You can chose any of them. <br/><br/>
<span style="font-weight:bold;">PayPal Link&nbsp;&nbsp;</span><a target="_blank" href="https://www.paypal.me/ventoy">https://www.paypal.me/ventoy</a><br/><br/>
<span style="font-weight:bold;">PayPal Account&nbsp;&nbsp;<span style="color:blue; font-weight:bold;"> admin@ventoy.net</span></span><br/><br/>
<span style="font-weight:bold;">PayPal Link&nbsp;&nbsp;</span><a target="_blank" href="https://www.paypal.me/hiperiso">https://www.paypal.me/hiperiso</a><br/><br/>
<span style="font-weight:bold;">PayPal Account&nbsp;&nbsp;<span style="color:blue; font-weight:bold;"> admin@hiperiso.net</span></span><br/><br/>
<span style="font-weight:bold;">Bitcoin Address&nbsp;</span> <span style="color:blue; font-weight:bold;"> 19mZDWzZgzkHCi9YX9H3fYCUuCHq3W6wfT </span><br/>
</p>
</div>
@@ -37,10 +37,10 @@
</div>
<script type="text/javascript">
function VtoyPageLanguageChange(newlang) {
VtoyCommonChangeLanguage(newlang);
function HisoPageLanguageChange(newlang) {
HisoCommonChangeLanguage(newlang);
$('h1[id=id_h1_page_title]').text(g_vtoy_cur_language.STR_PLUG_DONATION);
$('h1[id=id_h1_page_title]').text(g_hiso_cur_language.STR_PLUG_DONATION);
if (newlang === 'en') {
$('#id_donation_div_en').show();
@@ -52,6 +52,6 @@
}
//Main process
VtoyPageLanguageChange(g_current_language);
HisoPageLanguageChange(g_current_language);
</script>
src/plugson/www/plugson_dud.html
+46 -46
View File
@@ -8,7 +8,7 @@
<button id="id_btn_reset" class="btn btn-sm btn-danger btn-del"><i class="fa fa-trash"></i><span id="id_btn_span_reset">Reset</span></button>
</div>
<div class="col-sm-2" style="font-size:16px;padding-top:8px;">
<a id="id_a_official_doc" target="_blank" href="https://www.ventoy.net/en/plugin_dud.html"><span class="fa fa-link"></span><span id="id_span_official_doc">官网文档</span></a>
<a id="id_a_official_doc" target="_blank" href="https://www.hiperiso.net/en/plugin_dud.html"><span class="fa fa-link"></span><span id="id_span_official_doc">官网文档</span></a>
</div>
</div>
<legend></legend>
@@ -40,30 +40,30 @@
</div>
<script type="text/javascript">
function VtoyPageLanguageChange(newlang) {
VtoyCommonChangeLanguage(newlang);
$('h1[id=id_h1_page_title]').text(g_vtoy_cur_language.STR_PLUG_DUD);
function HisoPageLanguageChange(newlang) {
HisoCommonChangeLanguage(newlang);
$('h1[id=id_h1_page_title]').text(g_hiso_cur_language.STR_PLUG_DUD);
$("span[id=id_span_file_exist]").each(function(){
$(this).text(g_vtoy_cur_language.STR_FILE_EXIST);
$(this).text(g_hiso_cur_language.STR_FILE_EXIST);
});
$("span[id=id_span_file_nonexist]").each(function(){
$(this).text(g_vtoy_cur_language.STR_FILE_NONEXIST);
$(this).text(g_hiso_cur_language.STR_FILE_NONEXIST);
});
$("span[id=id_span_file_fuzzy]").each(function(){
$(this).text(g_vtoy_cur_language.STR_FILE_FUZZY);
$(this).text(g_hiso_cur_language.STR_FILE_FUZZY);
});
$("span[id=id_span_dir_exist]").each(function(){
$(this).text(g_vtoy_cur_language.STR_DIR_EXIST);
$(this).text(g_hiso_cur_language.STR_DIR_EXIST);
});
$("span[id=id_span_dir_nonexist]").each(function(){
$(this).text(g_vtoy_cur_language.STR_DIR_NONEXIST);
$(this).text(g_hiso_cur_language.STR_DIR_NONEXIST);
});
$("th[id=id_th_dud_dat]").each(function(){
$(this).text(g_vtoy_cur_language.STR_DUD_FILE);
$(this).text(g_hiso_cur_language.STR_DUD_FILE);
});
if (newlang === 'en') {
@@ -83,8 +83,8 @@
var tabid = '#tbl_inner_' + (i + 1);
var $inner_tbl = $(tabid + ' tbody');
var inaddbtn = ventoy_get_xslg_addbtn('DudInnerAddBtn');
var indelbtn = ventoy_get_xslg_delbtn('DudInnerDelBtn');
var inaddbtn = hiperiso_get_xslg_addbtn('DudInnerAddBtn');
var indelbtn = hiperiso_get_xslg_delbtn('DudInnerDelBtn');
$inner_tbl.empty();
@@ -92,7 +92,7 @@
var $tr;
td1 = '<td style="width: 5%;">'+(j+1)+'</td>';
td2 = '<td>'+inner[j].path+'</td>';
td3 = '<td style="width: 10%;">'+ventoy_get_status_line(0, inner[j].valid)+'</td>';
td3 = '<td style="width: 10%;">'+hiperiso_get_status_line(0, inner[j].valid)+'</td>';
td4 = '<td style="width: 10%;">' + indelbtn + '</td>';
$tr = $('<tr>' + td1 + td2 + td3 + td4 + '</tr>');
@@ -113,8 +113,8 @@
function FillDudTable(data) {
var td1, td2, td3, td4, td5;
var addbtn = ventoy_get_addbtn('DudAddBtn');
var delbtn = ventoy_get_delbtn('DudDelBtn');
var addbtn = hiperiso_get_addbtn('DudAddBtn');
var delbtn = hiperiso_get_delbtn('DudDelBtn');
var $tbl = $("#id_dud_tbl tbody");
$tbl.empty();
@@ -125,13 +125,13 @@
var tdtbl1 ='<table class="table table-condensed">'+
'<tbody><tr>'+
'<td style="width:90%;vertical-align: middle;">' + data[i].path + '</td>' +
'<td style="vertical-align: middle;">' + ventoy_get_status_line(data[i].type, data[i].valid) + '</td>' +
'<td style="vertical-align: middle;">' + hiperiso_get_status_line(data[i].type, data[i].valid) + '</td>' +
'</tr>'+
'<tr><td></td><td></td></tr>'+
'</tbody></table>';
var tdtbl2 = '<table class="table table-bordered" id="tbl_inner_' + (i+1) + '">'+
'<thead><tr><th>#</th><th id="id_th_dud_dat">'+g_vtoy_cur_language.STR_DUD_FILE+'</th><th id="id_th_status">'+g_vtoy_cur_language.STR_STATUS+'</th><th id="id_th_operation">'+g_vtoy_cur_language.STR_OPERATION+'</th></tr></thead><tbody></tbody></table>';
'<thead><tr><th>#</th><th id="id_th_dud_dat">'+g_hiso_cur_language.STR_DUD_FILE+'</th><th id="id_th_status">'+g_hiso_cur_language.STR_STATUS+'</th><th id="id_th_operation">'+g_hiso_cur_language.STR_OPERATION+'</th></tr></thead><tbody></tbody></table>';
td1 = '<td style="vertical-align: middle;">' + (i + 1) + '</td>';
td2 = '<td>' + tdtbl1 + tdtbl2 + '</td>';
@@ -150,7 +150,7 @@
}
}
function VtoyFillCurrentPageItem(data) {
function HisoFillCurrentPageItem(data) {
FillDudTable(data);
}
@@ -159,12 +159,12 @@
var href = $(this).attr('href');
var index = parseInt(href.substr(5, 1));
if (index < 0 || index >= g_vtoy_data_default_index || current_tab_index === index) {
if (index < 0 || index >= g_hiso_data_default_index || current_tab_index === index) {
return;
}
current_tab_index = index;
VtoyFillCurrentPageItem(m_data_dud[index]);
HisoFillCurrentPageItem(m_data_dud[index]);
}
function AddDudEntry(type, exist1, path1, path2) {
@@ -191,12 +191,12 @@
for (var i = 0; i < list.length; i++) {
if (list[i].path === data.path) {
Message.error(g_vtoy_cur_language.STR_DUPLICATE_PATH);
Message.error(g_hiso_cur_language.STR_DUPLICATE_PATH);
return;
}
}
callVtoy({
callHiso({
method : 'dud_add',
index: current_tab_index,
path: data.path,
@@ -206,9 +206,9 @@
if (e.result === 'success') {
list.push(data);
FillDudTable(list);
Message.success(g_vtoy_cur_language.STR_SAVE_SUCCESS);
Message.success(g_hiso_cur_language.STR_SAVE_SUCCESS);
} else if (e.result === 'duplicate') {
Message.error(g_vtoy_cur_language.STR_DUPLICATE_PATH);
Message.error(g_hiso_cur_language.STR_DUPLICATE_PATH);
}
});
}
@@ -220,28 +220,28 @@
function OnDudAddClick() {
var tip1 = (g_current_os === 'windows') ? '\\ISO\\rhel-server-7.4-x86_64.iso' : "/ISO/rhel-server-7.4-x86_64.iso";
var tip2 = (g_current_os === 'windows') ? '\\ISO\\rhel-server-7.*-x86_64.iso' : "/ISO/rhel-server-7.*-x86_64.iso";
var tip3 = (g_current_os === 'windows') ? '\\ventoy\\dd.iso' : "/ventoy/dd.iso";
var tip3 = (g_current_os === 'windows') ? '\\hiperiso\\dd.iso' : "/hiperiso/dd.iso";
var para = {
"title": g_vtoy_cur_language.STR_SET_DUD,
"label1": g_vtoy_cur_language.STR_FILE_PATH,
"label2": g_vtoy_cur_language.STR_SET_DUD_FILE,
"title": g_hiso_cur_language.STR_SET_DUD,
"label1": g_hiso_cur_language.STR_FILE_PATH,
"label2": g_hiso_cur_language.STR_SET_DUD_FILE,
"tip1": g_current_dir + tip1,
"tip2": g_current_dir + tip2,
"tip3": g_current_dir + tip3
};
VtoySetFileFile(OnAddImageDud, para);
HisoSetFileFile(OnAddImageDud, para);
}
function DudDelEntry(path, index) {
callVtoySync({
callHisoSync({
method : 'dud_del',
index: current_tab_index,
path: path
}, function(data) {
m_data_dud[current_tab_index].splice(index, 1);
FillDudTable(m_data_dud[current_tab_index]);
Message.success(g_vtoy_cur_language.STR_SAVE_SUCCESS);
Message.success(g_hiso_cur_language.STR_SAVE_SUCCESS);
});
}
@@ -262,12 +262,12 @@
for (var i = 0; i < data.list.length; i++) {
if (data.list[i].path === path) {
Message.error(g_vtoy_cur_language.STR_DUPLICATE_PATH);
Message.error(g_hiso_cur_language.STR_DUPLICATE_PATH);
return;
}
}
callVtoy({
callHiso({
method : 'dud_add_inner',
index: current_tab_index,
outpath: m_out_path,
@@ -281,7 +281,7 @@
data.list.push(node);
FillDudInnerTable(m_out_index, data);
Message.success(g_vtoy_cur_language.STR_SAVE_SUCCESS);
Message.success(g_hiso_cur_language.STR_SAVE_SUCCESS);
});
}
@@ -291,9 +291,9 @@
var outpath = $tr.data('outpath');
var outindex = $tr.data('outindex');
var tip = (g_current_os === 'windows') ? '\\ventoy\\dd.iso' : "/ventoy/dd.iso";
var tip = (g_current_os === 'windows') ? '\\hiperiso\\dd.iso' : "/hiperiso/dd.iso";
var para = {
"title": g_vtoy_cur_language.STR_ADD_DUD_FILE,
"title": g_hiso_cur_language.STR_ADD_DUD_FILE,
"fuzzy": 0,
"tip1": g_current_dir + tip,
"tip2": '',
@@ -304,11 +304,11 @@
m_out_index = outindex;
m_out_path = outpath;
VtoySelectFilePath(OnAddDudDatFile, para);
HisoSelectFilePath(OnAddDudDatFile, para);
}
function DudDelInnerEntry(outpath, outindex, path, index) {
callVtoy({
callHiso({
method : 'dud_del_inner',
index: current_tab_index,
outpath: outpath,
@@ -318,7 +318,7 @@
data.list.splice(index, 1);
FillDudInnerTable(outindex, m_data_dud[current_tab_index][outindex]);
Message.success(g_vtoy_cur_language.STR_SAVE_SUCCESS);
Message.success(g_hiso_cur_language.STR_SAVE_SUCCESS);
});
}
@@ -333,7 +333,7 @@
var list = m_data_dud[current_tab_index][outindex].list;
if (list.length === 1) {
ventoy_confirm(g_vtoy_cur_language.STR_DEL_LAST, DudDelEntry, outpath, outindex);
hiperiso_confirm(g_hiso_cur_language.STR_DEL_LAST, DudDelEntry, outpath, outindex);
} else {
DudDelInnerEntry(outpath, outindex, path, index);
}
@@ -346,7 +346,7 @@
//Main process
var m_data_dud;
var current_tab_index = 0;
callVtoySync({method : 'get_dud'}, function(data) {
callHisoSync({method : 'get_dud'}, function(data) {
m_data_dud = data;
});
@@ -367,7 +367,7 @@
$('#id_btn_reset').click(function() {
Modal.confirm({msg:GetResetTabConfigTipMsg(current_tab_index, 'dud')}).on(function(e) {
if (e) {
callVtoySync({
callHisoSync({
method : 'dud_del',
index: current_tab_index,
path: g_del_all_path
@@ -376,14 +376,14 @@
});
m_data_dud[current_tab_index].length = 0;
VtoyFillCurrentPageItem(m_data_dud[g_vtoy_data_default_index]);
Message.success(g_vtoy_cur_language.STR_SAVE_SUCCESS);
HisoFillCurrentPageItem(m_data_dud[g_hiso_data_default_index]);
Message.success(g_hiso_cur_language.STR_SAVE_SUCCESS);
}
});
});
$('#id_tab_dud a[href="#tab_0"]').tab('show');
VtoyFillCurrentPageItem(m_data_dud[0]);
VtoyPageLanguageChange(g_current_language);
HisoFillCurrentPageItem(m_data_dud[0]);
HisoPageLanguageChange(g_current_language);
</script>
src/plugson/www/plugson_image_list.html
+38 -38
View File
@@ -8,7 +8,7 @@
<button id="id_btn_reset" class="btn btn-sm btn-danger btn-del"><i class="fa fa-trash"></i><span id="id_btn_span_reset">Reset</span></button>
</div>
<div class="col-sm-2" style="font-size:16px;padding-top:8px;">
<a id="id_a_official_doc" target="_blank" href="https://www.ventoy.net/en/plugin_imagelist.html"><span class="fa fa-link"></span><span id="id_span_official_doc">官网文档</span></a>
<a id="id_a_official_doc" target="_blank" href="https://www.hiperiso.net/en/plugin_imagelist.html"><span class="fa fa-link"></span><span id="id_span_official_doc">官网文档</span></a>
</div>
</div>
<legend></legend>
@@ -52,18 +52,18 @@
<td class="td_ctrl_col" id="td_title_desc">选项说明</td>
<td>
<span style="font-weight: bold;">白名单模式</span><br/>
由用户自己列出文件列表，Ventoy 不再搜索而是直接使用你给出的文件列表。 同时 Ventoy 也不再对文件进行排序，而是直接按照列表给出的文件顺序来显示启动菜单。<br/>
由用户自己列出文件列表，Hiperiso 不再搜索而是直接使用你给出的文件列表。 同时 Hiperiso 也不再对文件进行排序，而是直接按照列表给出的文件顺序来显示启动菜单。<br/>
<span style="font-weight: bold;">黑名单模式</span><br/>
Ventoy 首先还是像原来一样搜索，最后再从搜索结果中剔除这个列表中的文件。<br/>
Hiperiso 首先还是像原来一样搜索，最后再从搜索结果中剔除这个列表中的文件。<br/>
</td>
</tr>
<tr id="tr_title_desc_en">
<td class="td_ctrl_col">Option Description</td>
<td>
<span style="font-weight: bold;">Permit Mode</span><br/>
Ventoy will no longer search for the files but just use your file list. Also, Ventoy will NOT sort these files anymore, but directly display the boot menu according to the order given in the list.<br/>
Hiperiso will no longer search for the files but just use your file list. Also, Hiperiso will NOT sort these files anymore, but directly display the boot menu according to the order given in the list.<br/>
<span style="font-weight: bold;">Deny Mode</span><br/>
Firstly, Ventoy will search as normal. And then remove the files in the blacklist from the search result.<br/>
Firstly, Hiperiso will search as normal. And then remove the files in the blacklist from the search result.<br/>
</td>
</tr>
</table>
@@ -99,18 +99,18 @@
</div>
<script type="text/javascript">
function VtoyPageLanguageChange(newlang) {
VtoyCommonChangeLanguage(newlang);
$('h1[id=id_h1_page_title]').text(g_vtoy_cur_language.STR_PLUG_IMAGELIST);
function HisoPageLanguageChange(newlang) {
HisoCommonChangeLanguage(newlang);
$('h1[id=id_h1_page_title]').text(g_hiso_cur_language.STR_PLUG_IMAGELIST);
$("span[id=id_span_file_exist]").each(function(){
$(this).text(g_vtoy_cur_language.STR_FILE_EXIST);
$(this).text(g_hiso_cur_language.STR_FILE_EXIST);
});
$("span[id=id_span_file_nonexist]").each(function(){
$(this).text(g_vtoy_cur_language.STR_FILE_NONEXIST);
$(this).text(g_hiso_cur_language.STR_FILE_NONEXIST);
});
$("span[id=id_span_file_fuzzy]").each(function(){
$(this).text(g_vtoy_cur_language.STR_FILE_FUZZY);
$(this).text(g_hiso_cur_language.STR_FILE_FUZZY);
});
if (newlang === 'en') {
@@ -129,12 +129,12 @@
}
function FillImageListTable(data) {
var fileexist = ventoy_get_status_line(0, 1);
var filenonexist = ventoy_get_status_line(0, 0);
var filenfuzzy = ventoy_get_status_line(0, -1);
var fileexist = hiperiso_get_status_line(0, 1);
var filenonexist = hiperiso_get_status_line(0, 0);
var filenfuzzy = hiperiso_get_status_line(0, -1);
var addbtn = ventoy_get_xslg_addbtn('ImageListAddBtn');
var delbtn = ventoy_get_xslg_delbtn('ImageListDelBtn');
var addbtn = hiperiso_get_xslg_addbtn('ImageListAddBtn');
var delbtn = hiperiso_get_xslg_delbtn('ImageListDelBtn');
var td1, td2, td3, td4;
var $tbl = $("#id_image_list_tbl tbody");
@@ -144,7 +144,7 @@
var $tr;
td1 = '<td>' + (i + 1) + '</td>';
td2 = '<td>' + data[i].path + '</td>';
td3 = '<td>' + ventoy_get_status_line(0, data[i].valid) + '</td>';
td3 = '<td>' + hiperiso_get_status_line(0, data[i].valid) + '</td>';
td4 = '<td>' + delbtn + '</td>';
$tr = $('<tr>' + td1 + td2 + td3 + td4 + '</tr>');
@@ -157,29 +157,29 @@
$tbl.append('<tr><td></td><td></td><td></td><td>' + addbtn + '</td></tr>');
}
function VtoyFillCurrentPageItem(data) {
function HisoFillCurrentPageItem(data) {
$('input:radio[name=id_image_list_type]')[data.type].checked = true;
FillImageListTable(data.list);
}
function VtoySaveCurrentPage() {
function HisoSaveCurrentPage() {
var data = m_data_imagelist[current_tab_index];
data.type = parseInt($('input:radio[name=id_image_list_type]:checked').val());
callVtoy({
callHiso({
method : 'save_image_list',
index: current_tab_index,
type: data.type
}, function(e) {
Message.success(g_vtoy_cur_language.STR_SAVE_SUCCESS);
Message.success(g_hiso_cur_language.STR_SAVE_SUCCESS);
});
}
$('input[type=radio]').each(function(){
var id = $(this).attr('id');
if (typeof(id) != 'undefined' && id.startsWith('id_image_list_type')) {
$(this).change(VtoySaveCurrentPage);
$(this).change(HisoSaveCurrentPage);
}
});
@@ -187,18 +187,18 @@
var href = $(this).attr('href');
var index = parseInt(href.substr(5, 1));
if (index < 0 || index >= g_vtoy_data_default_index || current_tab_index === index) {
if (index < 0 || index >= g_hiso_data_default_index || current_tab_index === index) {
return;
}
current_tab_index = index;
VtoyFillCurrentPageItem(m_data_imagelist[index]);
HisoFillCurrentPageItem(m_data_imagelist[index]);
}
//Main process
var m_data_imagelist;
var current_tab_index = 0;
callVtoySync({method : 'get_image_list'}, function(data) {
callHisoSync({method : 'get_image_list'}, function(data) {
m_data_imagelist = data;
});
@@ -211,12 +211,12 @@
for (var i = 0; i < list.length; i++) {
if (list[i].path === data.path) {
Message.error(g_vtoy_cur_language.STR_DUPLICATE_PATH);
Message.error(g_hiso_cur_language.STR_DUPLICATE_PATH);
return;
}
}
callVtoy({
callHiso({
method : 'image_list_add',
index: current_tab_index,
path: data.path,
@@ -224,9 +224,9 @@
if (e.result === 'success') {
list.push(data);
FillImageListTable(list);
Message.success(g_vtoy_cur_language.STR_SAVE_SUCCESS);
Message.success(g_hiso_cur_language.STR_SAVE_SUCCESS);
} else if (e.result === 'duplicate') {
Message.error(g_vtoy_cur_language.STR_DUPLICATE_PATH);
Message.error(g_hiso_cur_language.STR_DUPLICATE_PATH);
}
});
}
@@ -235,7 +235,7 @@
var tip1 = (g_current_os === 'windows') ? '\\ISO\\Windows11.iso' : "/ISO/Ubuntu-20.04-desktop-amd64.iso";
var tip2 = (g_current_os === 'windows') ? '\\ISO\\Windows**.iso' : "/ISO/Ubuntu-*****-desktop-amd64.iso";
var para = {
"title": g_vtoy_cur_language.STR_ADD_FILE_TO_LIST,
"title": g_hiso_cur_language.STR_ADD_FILE_TO_LIST,
"fuzzy": 1,
"tip1": g_current_dir + tip1,
"tip2": g_current_dir + tip2,
@@ -243,7 +243,7 @@
"extra": false,
"extra_title": ''
};
VtoySelectFilePath(OnAddImageList, para);
HisoSelectFilePath(OnAddImageList, para);
});
$("#id_image_list_tbl").on('click', '.ImageListDelBtn', function() {
@@ -251,14 +251,14 @@
var path = $tr.data('path');
var index = $tr.data('index');
callVtoySync({
callHisoSync({
method : 'image_list_del',
index: current_tab_index,
path: path
}, function(data) {
m_data_imagelist[current_tab_index].list.splice(index, 1);
FillImageListTable(m_data_imagelist[current_tab_index].list);
Message.success(g_vtoy_cur_language.STR_SAVE_SUCCESS);
Message.success(g_hiso_cur_language.STR_SAVE_SUCCESS);
});
});
@@ -274,7 +274,7 @@
$('#id_btn_reset').click(function() {
Modal.confirm({msg:GetResetTabConfigTipMsg(current_tab_index, 'image_list')}).on(function(e) {
if (e) {
callVtoySync({
callHisoSync({
method : 'image_list_del',
index: current_tab_index,
path: g_del_all_path
@@ -283,14 +283,14 @@
});
m_data_imagelist[current_tab_index].list.length = 0;
VtoyFillCurrentPageItem(m_data_imagelist[g_vtoy_data_default_index]);
VtoySaveCurrentPage();
HisoFillCurrentPageItem(m_data_imagelist[g_hiso_data_default_index]);
HisoSaveCurrentPage();
}
});
});
$('#id_tab_image_list a[href="#tab_0"]').tab('show');
VtoyFillCurrentPageItem(m_data_imagelist[0]);
VtoyPageLanguageChange(g_current_language);
HisoFillCurrentPageItem(m_data_imagelist[0]);
HisoPageLanguageChange(g_current_language);
</script>
src/plugson/www/plugson_injection.html
+37 -37
View File
@@ -8,7 +8,7 @@
<button id="id_btn_reset" class="btn btn-sm btn-danger btn-del"><i class="fa fa-trash"></i><span id="id_btn_span_reset">Reset</span></button>
</div>
<div class="col-sm-2" style="font-size:16px;padding-top:8px;">
<a id="id_a_official_doc" target="_blank" href="https://www.ventoy.net/en/plugin_injection.html"><span class="fa fa-link"></span><span id="id_span_official_doc">官网文档</span></a>
<a id="id_a_official_doc" target="_blank" href="https://www.hiperiso.net/en/plugin_injection.html"><span class="fa fa-link"></span><span id="id_span_official_doc">官网文档</span></a>
</div>
</div>
<legend></legend>
@@ -44,26 +44,26 @@
</div>
<script type="text/javascript">
function VtoyPageLanguageChange(newlang) {
VtoyCommonChangeLanguage(newlang);
$('h1[id=id_h1_page_title]').text(g_vtoy_cur_language.STR_PLUG_INJECTION);
function HisoPageLanguageChange(newlang) {
HisoCommonChangeLanguage(newlang);
$('h1[id=id_h1_page_title]').text(g_hiso_cur_language.STR_PLUG_INJECTION);
$("span[id=id_span_file_exist]").each(function(){
$(this).text(g_vtoy_cur_language.STR_FILE_EXIST);
$(this).text(g_hiso_cur_language.STR_FILE_EXIST);
});
$("span[id=id_span_file_nonexist]").each(function(){
$(this).text(g_vtoy_cur_language.STR_FILE_NONEXIST);
$(this).text(g_hiso_cur_language.STR_FILE_NONEXIST);
});
$("span[id=id_span_file_fuzzy]").each(function(){
$(this).text(g_vtoy_cur_language.STR_FILE_FUZZY);
$(this).text(g_hiso_cur_language.STR_FILE_FUZZY);
});
$("span[id=id_span_dir_exist]").each(function(){
$(this).text(g_vtoy_cur_language.STR_DIR_EXIST);
$(this).text(g_hiso_cur_language.STR_DIR_EXIST);
});
$("span[id=id_span_dir_nonexist]").each(function(){
$(this).text(g_vtoy_cur_language.STR_DIR_NONEXIST);
$(this).text(g_hiso_cur_language.STR_DIR_NONEXIST);
});
if (newlang === 'en') {
@@ -79,8 +79,8 @@
}
function FillInjectionTable(data) {
var addbtn = ventoy_get_xslg_addbtn('InjectionAddBtn');
var delbtn = ventoy_get_xslg_delbtn('InjectionDelBtn');
var addbtn = hiperiso_get_xslg_addbtn('InjectionAddBtn');
var delbtn = hiperiso_get_xslg_delbtn('InjectionDelBtn');
var td1, td2, td3, td4, td5, td6, td7;
var $tbl = $("#id_injection_tbl tbody");
@@ -91,9 +91,9 @@
td1 = '<td>' + (i + 1) + '</td>';
td2 = (data[i].type === 0) ? '<td>image</td>' : '<td>parent</td>';
td3 = '<td>' + data[i].path + '</td>';
td4 = '<td>' + ventoy_get_status_line(data[i].type, data[i].valid) + '</td>';
td4 = '<td>' + hiperiso_get_status_line(data[i].type, data[i].valid) + '</td>';
td5 = '<td>' + data[i].archive + '</td>';
td6 = '<td>' + ventoy_get_status_line(0, data[i].archive_valid) + '</td>';
td6 = '<td>' + hiperiso_get_status_line(0, data[i].archive_valid) + '</td>';
td7 = '<td>' + delbtn + '</td>';
$tr = $('<tr>' + td1 + td2 + td3 + td4 + td5 + td6 + td7 + '</tr>');
@@ -106,7 +106,7 @@
$tbl.append('<tr><td></td><td></td><td></td><td></td><td></td><td></td><td>' + addbtn + '</td></tr>');
}
function VtoyFillCurrentPageItem(data) {
function HisoFillCurrentPageItem(data) {
FillInjectionTable(data);
}
@@ -115,12 +115,12 @@
var href = $(this).attr('href');
var index = parseInt(href.substr(5, 1));
if (index < 0 || index >= g_vtoy_data_default_index || current_tab_index === index) {
if (index < 0 || index >= g_hiso_data_default_index || current_tab_index === index) {
return;
}
current_tab_index = index;
VtoyFillCurrentPageItem(m_data_injection[index]);
HisoFillCurrentPageItem(m_data_injection[index]);
}
//Main process
@@ -129,7 +129,7 @@
var m_injection_valid;
var m_data_injection;
var current_tab_index = 0;
callVtoySync({method : 'get_injection'}, function(data) {
callHisoSync({method : 'get_injection'}, function(data) {
m_data_injection = data;
});
@@ -146,12 +146,12 @@
for (var i = 0; i < list.length; i++) {
if (list[i].path === data.path) {
Message.error(g_vtoy_cur_language.STR_DUPLICATE_PATH);
Message.error(g_hiso_cur_language.STR_DUPLICATE_PATH);
return;
}
}
callVtoy({
callHiso({
method : 'injection_add',
index: current_tab_index,
path: data.path,
@@ -161,9 +161,9 @@
if (e.result === 'success') {
list.push(data);
FillInjectionTable(list);
Message.success(g_vtoy_cur_language.STR_SAVE_SUCCESS);
Message.success(g_hiso_cur_language.STR_SAVE_SUCCESS);
} else if (e.result === 'duplicate') {
Message.error(g_vtoy_cur_language.STR_DUPLICATE_PATH);
Message.error(g_hiso_cur_language.STR_DUPLICATE_PATH);
}
});
}
@@ -182,24 +182,24 @@
var tip1 = (g_current_os === 'windows') ? '\\ISO\\Windows11.iso' : "/ISO/Ubuntu-20.04-desktop-amd64.iso";
var tip2 = (g_current_os === 'windows') ? '\\ISO\\Windows**.iso' : "/ISO/Ubuntu-*****-desktop-amd64.iso";
var para = {
"title": g_vtoy_cur_language.STR_SET_INJECTION,
"label1": g_vtoy_cur_language.STR_FILE_PATH,
"title": g_hiso_cur_language.STR_SET_INJECTION,
"label1": g_hiso_cur_language.STR_FILE_PATH,
"label2": 'Archive',
"tip1": g_current_dir + tip1,
"tip2": g_current_dir + tip2,
"tip3": g_current_dir + tip3
};
VtoySetFileFile(OnAddImageInjection, para);
HisoSetFileFile(OnAddImageInjection, para);
} else {
var tip = (g_current_os === 'windows') ? '\\ISO\\Windows' : "/ISO/Linux";
var para = {
"title": g_vtoy_cur_language.STR_SET_INJECTION,
"label1": g_vtoy_cur_language.STR_DIR_PATH,
"title": g_hiso_cur_language.STR_SET_INJECTION,
"label1": g_hiso_cur_language.STR_DIR_PATH,
"label2": 'Archive',
"tip1": g_current_dir + tip,
"tip2": g_current_dir + tip3
};
VtoySetDirFile(OnAddDirInjection, para);
HisoSetDirFile(OnAddDirInjection, para);
}
}
@@ -207,15 +207,15 @@
var para = [
{
"selected": true,
"tip": g_vtoy_cur_language.STR_SET_INJECTION_FOR_FILE
"tip": g_hiso_cur_language.STR_SET_INJECTION_FOR_FILE
},
{
"selected": false,
"tip": g_vtoy_cur_language.STR_SET_INJECTION_FOR_DIR
"tip": g_hiso_cur_language.STR_SET_INJECTION_FOR_DIR
}
];
VtoySelectType(OnAddInjectionBtnClick, para);
HisoSelectType(OnAddInjectionBtnClick, para);
});
$("#id_injection_tbl").on('click', '.InjectionDelBtn', function() {
@@ -223,14 +223,14 @@
var path = $tr.data('path');
var index = $tr.data('index');
callVtoySync({
callHisoSync({
method : 'injection_del',
index: current_tab_index,
path: path
}, function(data) {
m_data_injection[current_tab_index].splice(index, 1);
FillInjectionTable(m_data_injection[current_tab_index]);
Message.success(g_vtoy_cur_language.STR_SAVE_SUCCESS);
Message.success(g_hiso_cur_language.STR_SAVE_SUCCESS);
});
});
@@ -249,7 +249,7 @@
$('#id_btn_reset').click(function() {
Modal.confirm({msg:GetResetTabConfigTipMsg(current_tab_index, 'injection')}).on(function(e) {
if (e) {
callVtoySync({
callHisoSync({
method : 'injection_del',
index: current_tab_index,
path: g_del_all_path
@@ -258,14 +258,14 @@
});
m_data_injection[current_tab_index].length = 0;
VtoyFillCurrentPageItem(m_data_injection[g_vtoy_data_default_index]);
Message.success(g_vtoy_cur_language.STR_SAVE_SUCCESS);
HisoFillCurrentPageItem(m_data_injection[g_hiso_data_default_index]);
Message.success(g_hiso_cur_language.STR_SAVE_SUCCESS);
}
});
});
$('#id_tab_injection a[href="#tab_0"]').tab('show');
VtoyFillCurrentPageItem(m_data_injection[0]);
VtoyPageLanguageChange(g_current_language);
HisoFillCurrentPageItem(m_data_injection[0]);
HisoPageLanguageChange(g_current_language);
</script>
src/plugson/www/plugson_main.html
+14 -14
View File
@@ -39,7 +39,7 @@
<div class="col-sm-4">
<div class="box box-primary box-solid">
<div class="box-header with-border">
<h3 class="box-title" style="font-size: 14px;font-weight: bold;" id="id_dev_lang4">设备内 Ventoy 信息</h3>
<h3 class="box-title" style="font-size: 14px;font-weight: bold;" id="id_dev_lang4">设备内 Hiperiso 信息</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 -->
@@ -48,8 +48,8 @@
<table class="table table-striped no-padding" id="custom-table" style="font-weight:bold;">
<tr >
<td id="id_dev_lang5">Ventoy</td>
<td id="id_ventoy_ver"></td>
<td id="id_dev_lang5">Hiperiso</td>
<td id="id_hiperiso_ver"></td>
</tr>
<tr>
<td id="id_dev_lang6"></td>
@@ -77,8 +77,8 @@
"设备名称",
"设备容量",
"文件系统",
"设备内 Ventoy 信息",
"Ventoy 版本号",
"设备内 Hiperiso 信息",
"Hiperiso 版本号",
"分区类型",
"安全启动支持"
];
@@ -89,16 +89,16 @@
"Device Name",
"Device Capacity",
"File System",
"Device Ventoy Information",
"Ventoy Version",
"Device Hiperiso Information",
"Hiperiso Version",
"Partition Style",
"Secure Boot Support"
];
function VtoyPageLanguageChange(newlang) {
VtoyCommonChangeLanguage(newlang);
function HisoPageLanguageChange(newlang) {
HisoCommonChangeLanguage(newlang);
$("h1[id=id_h1_page_title]").text(g_vtoy_cur_language.STR_PLUG_DEVICE);
$("h1[id=id_h1_page_title]").text(g_hiso_cur_language.STR_PLUG_DEVICE);
for (i = 0; i <= 7; i++) {
var id = '#id_dev_lang' + i;
@@ -111,17 +111,17 @@
}
//Main process
VtoyPageLanguageChange(g_current_language);
HisoPageLanguageChange(g_current_language);
callVtoySync({
callHisoSync({
method : 'device_info'
}, function(data) {
$('#id_dev_name').text(data.dev_name);
$('#id_dev_capacity').text(data.dev_capacity);
$('#id_dev_fs').text(data.dev_fs);
$('#id_ventoy_ver').text(data.ventoy_ver);
$('#id_hiperiso_ver').text(data.hiperiso_ver);
$('#id_part_style').text(data.part_style === 0 ? "MBR" : "GPT");
$('#id_secure_boot').text(data.secure_boot ? g_vtoy_cur_language.STR_SECURE_BOOT_ENABLE : g_vtoy_cur_language.STR_SECURE_BOOT_DISABLE);
$('#id_secure_boot').text(data.secure_boot ? g_hiso_cur_language.STR_SECURE_BOOT_ENABLE : g_hiso_cur_language.STR_SECURE_BOOT_DISABLE);
});
</script>
src/plugson/www/plugson_menu_alias.html
+36 -36
View File
@@ -8,7 +8,7 @@
<button id="id_btn_reset" class="btn btn-sm btn-danger btn-del"><i class="fa fa-trash"></i><span id="id_btn_span_reset">Reset</span></button>
</div>
<div class="col-sm-2" style="font-size:16px;padding-top:8px;">
<a id="id_a_official_doc" target="_blank" href="https://www.ventoy.net/en/plugin_menualias.html"><span class="fa fa-link"></span><span id="id_span_official_doc">官网文档</span></a>
<a id="id_a_official_doc" target="_blank" href="https://www.hiperiso.net/en/plugin_menualias.html"><span class="fa fa-link"></span><span id="id_span_official_doc">官网文档</span></a>
</div>
</div>
<legend></legend>
@@ -43,26 +43,26 @@
</div>
<script type="text/javascript">
function VtoyPageLanguageChange(newlang) {
VtoyCommonChangeLanguage(newlang);
$('h1[id=id_h1_page_title]').text(g_vtoy_cur_language.STR_PLUG_ALIAS);
function HisoPageLanguageChange(newlang) {
HisoCommonChangeLanguage(newlang);
$('h1[id=id_h1_page_title]').text(g_hiso_cur_language.STR_PLUG_ALIAS);
$("span[id=id_span_file_exist]").each(function(){
$(this).text(g_vtoy_cur_language.STR_FILE_EXIST);
$(this).text(g_hiso_cur_language.STR_FILE_EXIST);
});
$("span[id=id_span_file_nonexist]").each(function(){
$(this).text(g_vtoy_cur_language.STR_FILE_NONEXIST);
$(this).text(g_hiso_cur_language.STR_FILE_NONEXIST);
});
$("span[id=id_span_file_fuzzy]").each(function(){
$(this).text(g_vtoy_cur_language.STR_FILE_FUZZY);
$(this).text(g_hiso_cur_language.STR_FILE_FUZZY);
});
$("span[id=id_span_dir_exist]").each(function(){
$(this).text(g_vtoy_cur_language.STR_DIR_EXIST);
$(this).text(g_hiso_cur_language.STR_DIR_EXIST);
});
$("span[id=id_span_dir_nonexist]").each(function(){
$(this).text(g_vtoy_cur_language.STR_DIR_NONEXIST);
$(this).text(g_hiso_cur_language.STR_DIR_NONEXIST);
});
if (newlang === 'en') {
@@ -78,8 +78,8 @@
}
function FillAliasTable(data) {
var addbtn = ventoy_get_xslg_addbtn('AliasAddBtn');
var delbtn = ventoy_get_xslg_delbtn('AliasDelBtn');
var addbtn = hiperiso_get_xslg_addbtn('AliasAddBtn');
var delbtn = hiperiso_get_xslg_delbtn('AliasDelBtn');
var td1, td2, td3, td4, td5, td6;
var $tbl = $("#id_alisa_tbl tbody");
@@ -90,7 +90,7 @@
td1 = '<td>' + (i + 1) + '</td>';
td2 = (data[i].type === 0) ? '<td>image</td>' : '<td>dir</td>';
td3 = '<td>' + data[i].path + '</td>';
td4 = '<td>' + ventoy_get_status_line(data[i].type, data[i].valid) + '</td>';
td4 = '<td>' + hiperiso_get_status_line(data[i].type, data[i].valid) + '</td>';
td5 = '<td>' + data[i].alias + '</td>';
td6 = '<td>' + delbtn + '</td>';
@@ -104,7 +104,7 @@
$tbl.append('<tr><td></td><td></td><td></td><td></td><td></td><td>' + addbtn + '</td></tr>');
}
function VtoyFillCurrentPageItem(data) {
function HisoFillCurrentPageItem(data) {
FillAliasTable(data);
}
@@ -113,18 +113,18 @@
var href = $(this).attr('href');
var index = parseInt(href.substr(5, 1));
if (index < 0 || index >= g_vtoy_data_default_index || current_tab_index === index) {
if (index < 0 || index >= g_hiso_data_default_index || current_tab_index === index) {
return;
}
current_tab_index = index;
VtoyFillCurrentPageItem(m_data_alias[index]);
HisoFillCurrentPageItem(m_data_alias[index]);
}
//Main process
var m_data_alias;
var current_tab_index = 0;
callVtoySync({method : 'get_alias'}, function(data) {
callHisoSync({method : 'get_alias'}, function(data) {
m_data_alias = data;
});
@@ -140,12 +140,12 @@
for (var i = 0; i < list.length; i++) {
if (list[i].path === data.path) {
Message.error(g_vtoy_cur_language.STR_DUPLICATE_PATH);
Message.error(g_hiso_cur_language.STR_DUPLICATE_PATH);
return;
}
}
callVtoy({
callHiso({
method : 'alias_add',
index: current_tab_index,
path: data.path,
@@ -155,9 +155,9 @@
if (e.result === 'success') {
list.push(data);
FillAliasTable(list);
Message.success(g_vtoy_cur_language.STR_SAVE_SUCCESS);
Message.success(g_hiso_cur_language.STR_SAVE_SUCCESS);
} else if (e.result === 'duplicate') {
Message.error(g_vtoy_cur_language.STR_DUPLICATE_PATH);
Message.error(g_hiso_cur_language.STR_DUPLICATE_PATH);
}
});
}
@@ -175,25 +175,25 @@
var tip1 = (g_current_os === 'windows') ? '\\ISO\\Windows11.iso' : "/ISO/Ubuntu-20.04-desktop-amd64.iso";
var tip2 = (g_current_os === 'windows') ? '\\ISO\\Windows**.iso' : "/ISO/Ubuntu-*****-desktop-amd64.iso";
var para = {
"title": g_vtoy_cur_language.STR_SET_ALIAS,
"title": g_hiso_cur_language.STR_SET_ALIAS,
"fuzzy": 1,
"tip1": g_current_dir + tip1,
"tip2": g_current_dir + tip2,
"tip3": '',
"extra": true,
"extra_title": g_vtoy_cur_language.STR_ALIAS
"extra_title": g_hiso_cur_language.STR_ALIAS
};
VtoySelectFilePath(OnAddImageAlias, para);
HisoSelectFilePath(OnAddImageAlias, para);
} else {
var tip = (g_current_os === 'windows') ? '\\ISO\\Windows' : "/ISO/Linux";
var para = {
"title": g_vtoy_cur_language.STR_SET_ALIAS,
"title": g_hiso_cur_language.STR_SET_ALIAS,
"tip": g_current_dir + tip,
"tip3": '',
"extra": true,
"extra_title": g_vtoy_cur_language.STR_ALIAS
"extra_title": g_hiso_cur_language.STR_ALIAS
};
VtoySelectDirPath(OnAddDirAlias, para);
HisoSelectDirPath(OnAddDirAlias, para);
}
}
@@ -201,15 +201,15 @@
var para = [
{
"selected": true,
"tip": g_vtoy_cur_language.STR_SET_ALIAS_FOR_FILE
"tip": g_hiso_cur_language.STR_SET_ALIAS_FOR_FILE
},
{
"selected": false,
"tip": g_vtoy_cur_language.STR_SET_ALIAS_FOR_DIR
"tip": g_hiso_cur_language.STR_SET_ALIAS_FOR_DIR
}
];
VtoySelectType(OnAddAliasBtnClick, para);
HisoSelectType(OnAddAliasBtnClick, para);
});
$("#id_alisa_tbl").on('click', '.AliasDelBtn', function() {
@@ -217,14 +217,14 @@
var path = $tr.data('path');
var index = $tr.data('index');
callVtoySync({
callHisoSync({
method : 'alias_del',
index: current_tab_index,
path: path
}, function(data) {
m_data_alias[current_tab_index].splice(index, 1);
FillAliasTable(m_data_alias[current_tab_index]);
Message.success(g_vtoy_cur_language.STR_SAVE_SUCCESS);
Message.success(g_hiso_cur_language.STR_SAVE_SUCCESS);
});
});
@@ -244,7 +244,7 @@
$('#id_btn_reset').click(function() {
Modal.confirm({msg:GetResetTabConfigTipMsg(current_tab_index, 'menu_alias')}).on(function(e) {
if (e) {
callVtoySync({
callHisoSync({
method : 'alias_del',
index: current_tab_index,
path: g_del_all_path
@@ -253,14 +253,14 @@
});
m_data_alias[current_tab_index].length = 0;
VtoyFillCurrentPageItem(m_data_alias[g_vtoy_data_default_index]);
Message.success(g_vtoy_cur_language.STR_SAVE_SUCCESS);
HisoFillCurrentPageItem(m_data_alias[g_hiso_data_default_index]);
Message.success(g_hiso_cur_language.STR_SAVE_SUCCESS);
}
});
});
$('#id_tab_menu_alias a[href="#tab_0"]').tab('show');
VtoyFillCurrentPageItem(m_data_alias[0]);
VtoyPageLanguageChange(g_current_language);
HisoFillCurrentPageItem(m_data_alias[0]);
HisoPageLanguageChange(g_current_language);
</script>
src/plugson/www/plugson_menu_class.html
+40 -40
View File
@@ -8,7 +8,7 @@
<button id="id_btn_reset" class="btn btn-sm btn-danger btn-del"><i class="fa fa-trash"></i><span id="id_btn_span_reset">Reset</span></button>
</div>
<div class="col-sm-2" style="font-size:16px;padding-top:8px;">
<a id="id_a_official_doc" target="_blank" href="https://www.ventoy.net/en/plugin_menuclass.html"><span class="fa fa-link"></span><span id="id_span_official_doc">官网文档</span></a>
<a id="id_a_official_doc" target="_blank" href="https://www.hiperiso.net/en/plugin_menuclass.html"><span class="fa fa-link"></span><span id="id_span_official_doc">官网文档</span></a>
</div>
</div>
<legend></legend>
@@ -43,26 +43,26 @@
</div>
<script type="text/javascript">
function VtoyPageLanguageChange(newlang) {
VtoyCommonChangeLanguage(newlang);
$('h1[id=id_h1_page_title]').text(g_vtoy_cur_language.STR_PLUG_CLASS);
function HisoPageLanguageChange(newlang) {
HisoCommonChangeLanguage(newlang);
$('h1[id=id_h1_page_title]').text(g_hiso_cur_language.STR_PLUG_CLASS);
$("span[id=id_span_file_exist]").each(function(){
$(this).text(g_vtoy_cur_language.STR_FILE_EXIST);
$(this).text(g_hiso_cur_language.STR_FILE_EXIST);
});
$("span[id=id_span_file_nonexist]").each(function(){
$(this).text(g_vtoy_cur_language.STR_FILE_NONEXIST);
$(this).text(g_hiso_cur_language.STR_FILE_NONEXIST);
});
$("span[id=id_span_file_fuzzy]").each(function(){
$(this).text(g_vtoy_cur_language.STR_FILE_FUZZY);
$(this).text(g_hiso_cur_language.STR_FILE_FUZZY);
});
$("span[id=id_span_dir_exist]").each(function(){
$(this).text(g_vtoy_cur_language.STR_DIR_EXIST);
$(this).text(g_hiso_cur_language.STR_DIR_EXIST);
});
$("span[id=id_span_dir_nonexist]").each(function(){
$(this).text(g_vtoy_cur_language.STR_DIR_NONEXIST);
$(this).text(g_hiso_cur_language.STR_DIR_NONEXIST);
});
if (newlang === 'en') {
@@ -79,11 +79,11 @@
function FillClassTable(data) {
var direxist = ventoy_get_status_line(1, 1);
var dirnonexist = ventoy_get_status_line(1, 0);
var direxist = hiperiso_get_status_line(1, 1);
var dirnonexist = hiperiso_get_status_line(1, 0);
var addbtn = ventoy_get_xslg_addbtn('ClassAddBtn');
var delbtn = ventoy_get_xslg_delbtn('ClassDelBtn');
var addbtn = hiperiso_get_xslg_addbtn('ClassAddBtn');
var delbtn = hiperiso_get_xslg_delbtn('ClassDelBtn');
var td1, td2, td3, td4, td5, td6;
var $tbl = $("#id_class_tbl tbody");
@@ -124,7 +124,7 @@
$tbl.append('<tr><td></td><td></td><td></td><td></td><td></td><td>' + addbtn + '</td></tr>');
}
function VtoyFillCurrentPageItem(data) {
function HisoFillCurrentPageItem(data) {
FillClassTable(data);
}
@@ -133,18 +133,18 @@
var href = $(this).attr('href');
var index = parseInt(href.substr(5, 1));
if (index < 0 || index >= g_vtoy_data_default_index || current_tab_index === index) {
if (index < 0 || index >= g_hiso_data_default_index || current_tab_index === index) {
return;
}
current_tab_index = index;
VtoyFillCurrentPageItem(m_data_class[index]);
HisoFillCurrentPageItem(m_data_class[index]);
}
//Main process
var m_data_class;
var current_tab_index = 0;
callVtoySync({method : 'get_class'}, function(data) {
callHisoSync({method : 'get_class'}, function(data) {
m_data_class = data;
});
@@ -166,12 +166,12 @@
for (var i = 0; i < list.length; i++) {
if (list[i].path === data.path) {
Message.error(g_vtoy_cur_language.STR_DUPLICATE_PATH);
Message.error(g_hiso_cur_language.STR_DUPLICATE_PATH);
return;
}
}
callVtoy({
callHiso({
method : 'class_add',
index: current_tab_index,
path: data.path,
@@ -181,15 +181,15 @@
if (e.result === 'success') {
list.push(data);
FillClassTable(list);
Message.success(g_vtoy_cur_language.STR_SAVE_SUCCESS);
Message.success(g_hiso_cur_language.STR_SAVE_SUCCESS);
} else if (e.result === 'duplicate') {
Message.error(g_vtoy_cur_language.STR_DUPLICATE_PATH);
Message.error(g_hiso_cur_language.STR_DUPLICATE_PATH);
}
});
}
function OnAddKeyClass(key, value) {
if (!ventoy_check_file_name_char(key)) {
if (!hiperiso_check_file_name_char(key)) {
Message.error(g_current_language === 'en' ? "As part of file name, key can not include invalid characters!" : "作为文件名的一部分，key 中不能包含特殊的符号!");
return;
}
@@ -207,26 +207,26 @@
function OnAddClassBtnClick(sel) {
if (sel === 0) {
var para = {
"title": g_vtoy_cur_language.STR_SET_CLASS,
"title": g_hiso_cur_language.STR_SET_CLASS,
"title1": "Key",
"title2": g_vtoy_cur_language.STR_CLASS
"title2": g_hiso_cur_language.STR_CLASS
};
VtoySetKey(OnAddKeyClass, para);
HisoSetKey(OnAddKeyClass, para);
} else {
var tip = (g_current_os === 'windows') ? '\\ISO\\Windows' : "/ISO/Linux";
var para = {
"title": g_vtoy_cur_language.STR_SET_CLASS,
"title": g_hiso_cur_language.STR_SET_CLASS,
"tip": g_current_dir + tip,
"tip3": '',
"extra": true,
"extra_title": g_vtoy_cur_language.STR_CLASS
"extra_title": g_hiso_cur_language.STR_CLASS
};
if (sel === 1) {
VtoySelectDirPath(OnAddDirClassDir, para);
HisoSelectDirPath(OnAddDirClassDir, para);
} else {
VtoySelectDirPath(OnAddDirClassParent, para);
HisoSelectDirPath(OnAddDirClassParent, para);
}
}
@@ -236,19 +236,19 @@
var para = [
{
"selected": true,
"tip": g_vtoy_cur_language.STR_SET_CLASS_BY_KEY
"tip": g_hiso_cur_language.STR_SET_CLASS_BY_KEY
},
{
"selected": false,
"tip": g_vtoy_cur_language.STR_SET_CLASS_BY_DIR
"tip": g_hiso_cur_language.STR_SET_CLASS_BY_DIR
},
{
"selected": false,
"tip": g_vtoy_cur_language.STR_SET_CLASS_BY_PARENT
"tip": g_hiso_cur_language.STR_SET_CLASS_BY_PARENT
}
];
VtoySelectType(OnAddClassBtnClick, para);
HisoSelectType(OnAddClassBtnClick, para);
});
$("#id_class_tbl").on('click', '.ClassDelBtn', function() {
@@ -256,14 +256,14 @@
var path = $tr.data('path');
var index = $tr.data('index');
callVtoySync({
callHisoSync({
method : 'class_del',
index: current_tab_index,
path: path
}, function(data) {
m_data_class[current_tab_index].splice(index, 1);
FillClassTable(m_data_class[current_tab_index]);
Message.success(g_vtoy_cur_language.STR_SAVE_SUCCESS);
Message.success(g_hiso_cur_language.STR_SAVE_SUCCESS);
});
});
@@ -282,7 +282,7 @@
$('#id_btn_reset').click(function() {
Modal.confirm({msg:GetResetTabConfigTipMsg(current_tab_index, 'menu_class')}).on(function(e) {
if (e) {
callVtoySync({
callHisoSync({
method : 'class_del',
index: current_tab_index,
path: g_del_all_path
@@ -291,14 +291,14 @@
});
m_data_class[current_tab_index].length = 0;
VtoyFillCurrentPageItem(m_data_class[g_vtoy_data_default_index]);
Message.success(g_vtoy_cur_language.STR_SAVE_SUCCESS);
HisoFillCurrentPageItem(m_data_class[g_hiso_data_default_index]);
Message.success(g_hiso_cur_language.STR_SAVE_SUCCESS);
}
});
});
$('#id_tab_menu_class a[href="#tab_0"]').tab('show');
VtoyFillCurrentPageItem(m_data_class[0]);
VtoyPageLanguageChange(g_current_language);
HisoFillCurrentPageItem(m_data_class[0]);
HisoPageLanguageChange(g_current_language);
</script>
src/plugson/www/plugson_menu_tip.html
+51 -51
View File
@@ -8,7 +8,7 @@
<button id="id_btn_reset" class="btn btn-sm btn-danger btn-del"><i class="fa fa-trash"></i><span id="id_btn_span_reset">Reset</span></button>
</div>
<div class="col-sm-2" style="font-size:16px;padding-top:8px;">
<a id="id_a_official_doc" target="_blank" href="https://www.ventoy.net/en/plugin_menutip.html"><span class="fa fa-link"></span><span id="id_span_official_doc">官网文档</span></a>
<a id="id_a_official_doc" target="_blank" href="https://www.hiperiso.net/en/plugin_menutip.html"><span class="fa fa-link"></span><span id="id_span_official_doc">官网文档</span></a>
</div>
</div>
<legend></legend>
@@ -110,26 +110,26 @@
</div>
<script type="text/javascript">
function VtoyPageLanguageChange(newlang) {
VtoyCommonChangeLanguage(newlang);
$('h1[id=id_h1_page_title]').text(g_vtoy_cur_language.STR_PLUG_TIP);
function HisoPageLanguageChange(newlang) {
HisoCommonChangeLanguage(newlang);
$('h1[id=id_h1_page_title]').text(g_hiso_cur_language.STR_PLUG_TIP);
$("span[id=id_span_file_exist]").each(function(){
$(this).text(g_vtoy_cur_language.STR_FILE_EXIST);
$(this).text(g_hiso_cur_language.STR_FILE_EXIST);
});
$("span[id=id_span_file_nonexist]").each(function(){
$(this).text(g_vtoy_cur_language.STR_FILE_NONEXIST);
$(this).text(g_hiso_cur_language.STR_FILE_NONEXIST);
});
$("span[id=id_span_file_fuzzy]").each(function(){
$(this).text(g_vtoy_cur_language.STR_FILE_FUZZY);
$(this).text(g_hiso_cur_language.STR_FILE_FUZZY);
});
$("span[id=id_span_dir_exist]").each(function(){
$(this).text(g_vtoy_cur_language.STR_DIR_EXIST);
$(this).text(g_hiso_cur_language.STR_DIR_EXIST);
});
$("span[id=id_span_dir_nonexist]").each(function(){
$(this).text(g_vtoy_cur_language.STR_DIR_NONEXIST);
$(this).text(g_hiso_cur_language.STR_DIR_NONEXIST);
});
@@ -165,8 +165,8 @@
}
function FillTipTable(data) {
var addbtn = ventoy_get_xslg_addbtn('TipAddBtn');
var delbtn = ventoy_get_xslg_delbtn('TipDelBtn');
var addbtn = hiperiso_get_xslg_addbtn('TipAddBtn');
var delbtn = hiperiso_get_xslg_delbtn('TipDelBtn');
var td1, td2, td3, td4, td5, td6;
var $tbl = $("#id_tip_tbl tbody");
@@ -177,7 +177,7 @@
td1 = '<td>' + (i + 1) + '</td>';
td2 = (data[i].type === 0) ? '<td>image</td>' : '<td>dir</td>';
td3 = '<td>' + data[i].path + '</td>';
td4 = '<td>' + ventoy_get_status_line(data[i].type, data[i].valid) + '</td>';
td4 = '<td>' + hiperiso_get_status_line(data[i].type, data[i].valid) + '</td>';
td5 = '<td>' + data[i].tip + '</td>';
td6 = '<td>' + delbtn + '</td>';
@@ -191,7 +191,7 @@
$tbl.append('<tr><td></td><td></td><td></td><td></td><td></td><td>' + addbtn + '</td></tr>');
}
function VtoyFillCurrentPageItem(data) {
function HisoFillCurrentPageItem(data) {
$('input:text[id=id_tip_text_left]').val(data.left);
$('input:text[id=id_tip_text_top]').val(data.top);
@@ -205,18 +205,18 @@
var href = $(this).attr('href');
var index = parseInt(href.substr(5, 1));
if (index < 0 || index >= g_vtoy_data_default_index || current_tab_index === index) {
if (index < 0 || index >= g_hiso_data_default_index || current_tab_index === index) {
return;
}
current_tab_index = index;
VtoyFillCurrentPageItem(m_data_tip[index]);
HisoFillCurrentPageItem(m_data_tip[index]);
}
//Main process
var m_data_tip;
var current_tab_index = 0;
callVtoySync({method : 'get_tip'}, function(data) {
callHisoSync({method : 'get_tip'}, function(data) {
m_data_tip = data;
});
@@ -232,12 +232,12 @@
for (var i = 0; i < list.length; i++) {
if (list[i].path === data.path) {
Message.error(g_vtoy_cur_language.STR_DUPLICATE_PATH);
Message.error(g_hiso_cur_language.STR_DUPLICATE_PATH);
return;
}
}
callVtoy({
callHiso({
method : 'tip_add',
index: current_tab_index,
path: data.path,
@@ -247,9 +247,9 @@
if (e.result === 'success') {
list.push(data);
FillTipTable(list);
Message.success(g_vtoy_cur_language.STR_SAVE_SUCCESS);
Message.success(g_hiso_cur_language.STR_SAVE_SUCCESS);
} else if (e.result === 'duplicate') {
Message.error(g_vtoy_cur_language.STR_DUPLICATE_PATH);
Message.error(g_hiso_cur_language.STR_DUPLICATE_PATH);
}
});
}
@@ -267,25 +267,25 @@
var tip1 = (g_current_os === 'windows') ? '\\ISO\\Windows11.iso' : "/ISO/Ubuntu-20.04-desktop-amd64.iso";
var tip2 = (g_current_os === 'windows') ? '\\ISO\\Windows**.iso' : "/ISO/Ubuntu-*****-desktop-amd64.iso";
var para = {
"title": g_vtoy_cur_language.STR_SET_TIP,
"title": g_hiso_cur_language.STR_SET_TIP,
"fuzzy": 1,
"tip1": g_current_dir + tip1,
"tip2": g_current_dir + tip2,
"tip3": '',
"extra": true,
"extra_title": g_vtoy_cur_language.STR_TIP
"extra_title": g_hiso_cur_language.STR_TIP
};
VtoySelectFilePath(OnAddImageTip, para);
HisoSelectFilePath(OnAddImageTip, para);
} else {
var tip = (g_current_os === 'windows') ? '\\ISO\\Windows' : "/ISO/Linux";
var para = {
"title": g_vtoy_cur_language.STR_SET_TIP,
"title": g_hiso_cur_language.STR_SET_TIP,
"tip": g_current_dir + tip,
"tip3": '',
"extra": true,
"extra_title": g_vtoy_cur_language.STR_TIP
"extra_title": g_hiso_cur_language.STR_TIP
};
VtoySelectDirPath(OnAddDirTip, para);
HisoSelectDirPath(OnAddDirTip, para);
}
}
@@ -293,15 +293,15 @@
var para = [
{
"selected": true,
"tip": g_vtoy_cur_language.STR_SET_TIP_FOR_FILE
"tip": g_hiso_cur_language.STR_SET_TIP_FOR_FILE
},
{
"selected": false,
"tip": g_vtoy_cur_language.STR_SET_TIP_FOR_DIR
"tip": g_hiso_cur_language.STR_SET_TIP_FOR_DIR
}
];
VtoySelectType(OnAddTipBtnClick, para);
HisoSelectType(OnAddTipBtnClick, para);
});
$("#id_tip_tbl").on('click', '.TipDelBtn', function() {
@@ -309,61 +309,61 @@
var path = $tr.data('path');
var index = $tr.data('index');
callVtoySync({
callHisoSync({
method : 'tip_del',
index: current_tab_index,
path: path
}, function(data) {
m_data_tip[current_tab_index].tips.splice(index, 1);
FillTipTable(m_data_tip[current_tab_index].tips);
Message.success(g_vtoy_cur_language.STR_SAVE_SUCCESS);
Message.success(g_hiso_cur_language.STR_SAVE_SUCCESS);
});
});
function VtoySaveCurrentPage() {
function HisoSaveCurrentPage() {
var left = $('input:text[id=id_tip_text_left]').val();
var top = $('input:text[id=id_tip_text_top]').val();
var color = $('input:text[id=id_tip_text_color]').val();
callVtoy({
callHiso({
method : 'save_tip',
index: current_tab_index,
left: left,
top: top,
color: color
}, function(e) {
Message.success(g_vtoy_cur_language.STR_SAVE_SUCCESS);
Message.success(g_hiso_cur_language.STR_SAVE_SUCCESS);
});
}
$('input:text[id=id_tip_text_left]').change(function() {
var value = $('input:text[id=id_tip_text_left]').val();
if (ventoy_check_percent(value)) {
VtoySaveCurrentPage();
if (hiperiso_check_percent(value)) {
HisoSaveCurrentPage();
m_data_tip[current_tab_index].left = value;
} else {
Message.error(g_vtoy_cur_language.STR_INVALID_PERCENT);
Message.error(g_hiso_cur_language.STR_INVALID_PERCENT);
$('input:text[id=id_tip_text_left]').val(m_data_tip[current_tab_index].left);
}
});
$('input:text[id=id_tip_text_top]').change(function() {
var value = $('input:text[id=id_tip_text_top]').val();
if (ventoy_check_percent(value)) {
VtoySaveCurrentPage();
if (hiperiso_check_percent(value)) {
HisoSaveCurrentPage();
m_data_tip[current_tab_index].top = value;
} else {
Message.error(g_vtoy_cur_language.STR_INVALID_PERCENT);
Message.error(g_hiso_cur_language.STR_INVALID_PERCENT);
$('input:text[id=id_tip_text_top]').val(m_data_tip[current_tab_index].top);
}
});
$('input:text[id=id_tip_text_color]').change(function() {
var value = $('input:text[id=id_tip_text_color]').val();
if (value.length > 0) {
if (ventoy_check_color(value)) {
VtoySaveCurrentPage();
if (hiperiso_check_color(value)) {
HisoSaveCurrentPage();
m_data_tip[current_tab_index].color = value;
} else {
Message.error(g_vtoy_cur_language.STR_INVALID_COLOR);
Message.error(g_hiso_cur_language.STR_INVALID_COLOR);
$('input:text[id=id_tip_text_color]').val(m_data_tip[current_tab_index].color);
}
} else {
@@ -385,7 +385,7 @@
$('#id_btn_reset').click(function() {
Modal.confirm({msg:GetResetTabConfigTipMsg(current_tab_index, 'menu_tip')}).on(function(e) {
if (e) {
callVtoySync({
callHisoSync({
method : 'tip_del',
index: current_tab_index,
path: g_del_all_path
@@ -393,18 +393,18 @@
});
m_data_tip[current_tab_index].left = m_data_tip[g_vtoy_data_default_index].left;
m_data_tip[current_tab_index].top = m_data_tip[g_vtoy_data_default_index].top;
m_data_tip[current_tab_index].color = m_data_tip[g_vtoy_data_default_index].color;
m_data_tip[current_tab_index].left = m_data_tip[g_hiso_data_default_index].left;
m_data_tip[current_tab_index].top = m_data_tip[g_hiso_data_default_index].top;
m_data_tip[current_tab_index].color = m_data_tip[g_hiso_data_default_index].color;
m_data_tip[current_tab_index].tips.length = 0;
VtoyFillCurrentPageItem(m_data_tip[g_vtoy_data_default_index]);
VtoySaveCurrentPage();
HisoFillCurrentPageItem(m_data_tip[g_hiso_data_default_index]);
HisoSaveCurrentPage();
}
});
});
$('#id_tab_menu_tip a[href="#tab_0"]').tab('show');
VtoyFillCurrentPageItem(m_data_tip[0]);
VtoyPageLanguageChange(g_current_language);
HisoFillCurrentPageItem(m_data_tip[0]);
HisoPageLanguageChange(g_current_language);
</script>
src/plugson/www/plugson_password.html
+74 -74
View File
@@ -8,7 +8,7 @@
<button id="id_btn_reset" class="btn btn-sm btn-danger btn-del"><i class="fa fa-trash"></i><span id="id_btn_span_reset">Reset</span></button>
</div>
<div class="col-sm-2" style="font-size:16px;padding-top:8px;">
<a id="id_a_official_doc" target="_blank" href="https://www.ventoy.net/en/plugin_password.html"><span class="fa fa-link"></span><span id="id_span_official_doc">官网文档</span></a>
<a id="id_a_official_doc" target="_blank" href="https://www.hiperiso.net/en/plugin_password.html"><span class="fa fa-link"></span><span id="id_span_official_doc">官网文档</span></a>
</div>
</div>
<legend></legend>
@@ -83,34 +83,34 @@
</div>
<script type="text/javascript">
function VtoyPageLanguageChange(newlang) {
VtoyCommonChangeLanguage(newlang);
$('h1[id=id_h1_page_title]').text(g_vtoy_cur_language.STR_PLUG_PASSWORD);
function HisoPageLanguageChange(newlang) {
HisoCommonChangeLanguage(newlang);
$('h1[id=id_h1_page_title]').text(g_hiso_cur_language.STR_PLUG_PASSWORD);
$("span[id=id_span_file_exist]").each(function(){
$(this).text(g_vtoy_cur_language.STR_FILE_EXIST);
$(this).text(g_hiso_cur_language.STR_FILE_EXIST);
});
$("span[id=id_span_file_nonexist]").each(function(){
$(this).text(g_vtoy_cur_language.STR_FILE_NONEXIST);
$(this).text(g_hiso_cur_language.STR_FILE_NONEXIST);
});
$("span[id=id_span_file_fuzzy]").each(function(){
$(this).text(g_vtoy_cur_language.STR_FILE_FUZZY);
$(this).text(g_hiso_cur_language.STR_FILE_FUZZY);
});
$("span[id=id_span_dir_exist]").each(function(){
$(this).text(g_vtoy_cur_language.STR_DIR_EXIST);
$(this).text(g_hiso_cur_language.STR_DIR_EXIST);
});
$("span[id=id_span_dir_nonexist]").each(function(){
$(this).text(g_vtoy_cur_language.STR_DIR_NONEXIST);
$(this).text(g_hiso_cur_language.STR_DIR_NONEXIST);
});
$("span[id=id_span_edit]").each(function(){
$(this).text(' ' + g_vtoy_cur_language.STR_EDIT);
$(this).text(' ' + g_hiso_cur_language.STR_EDIT);
});
$("span[id=id_span_clear]").each(function(){
$(this).text(' ' + g_vtoy_cur_language.STR_CLEAR);
$(this).text(' ' + g_hiso_cur_language.STR_CLEAR);
});
if (newlang === 'en') {
@@ -154,9 +154,9 @@
var salt;
var rand = Math.round(Math.random() * 10);
if ((rand % 2) === 0) {
salt = ventoy_random_string(3);
salt = hiperiso_random_string(3);
} else {
salt = ventoy_random_string(4);
salt = hiperiso_random_string(4);
}
return 'md5#' + salt + '#' + md5(salt + pwd);
@@ -177,13 +177,13 @@
var $tbl = $("#id_common_pwd tbody");
$tbl.empty();
CommonPasswordEntry($tbl, 'bootpwd', '启动进入 Ventoy 时的密码。', 'Password when Ventoy is booting.');
CommonPasswordEntry($tbl, 'bootpwd', '启动进入 Hiperiso 时的密码。', 'Password when Hiperiso is booting.');
CommonPasswordEntry($tbl, 'isopwd', '所有 .iso 文件的默认密码。', 'Default password for all .iso files.');
CommonPasswordEntry($tbl, 'wimpwd', '所有 .wim 文件的默认密码。', 'Default password for all .wim files.');
CommonPasswordEntry($tbl, 'imgpwd', '所有 .img 文件的默认密码。', 'Default password for all .img files.');
CommonPasswordEntry($tbl, 'vhdpwd', '所有 .vhd(x) 文件的默认密码。', 'Default password for all .vhd(x) files.');
CommonPasswordEntry($tbl, 'efipwd', '所有 .efi 文件的默认密码。', 'Default password for all .efi files.');
CommonPasswordEntry($tbl, 'vtoypwd', '所有 .vtoy 文件的默认密码。', 'Default password for all .vtoy files.');
CommonPasswordEntry($tbl, 'hisopwd', '所有 .hiso 文件的默认密码。', 'Default password for all .hiso files.');
$('input:password[id=id_bootpwd]').val(data.bootpwd);
$('input:password[id=id_isopwd]').val(data.isopwd);
@@ -191,12 +191,12 @@
$('input:password[id=id_imgpwd]').val(data.imgpwd);
$('input:password[id=id_efipwd]').val(data.efipwd);
$('input:password[id=id_vhdpwd]').val(data.vhdpwd);
$('input:password[id=id_vtoypwd]').val(data.vtoypwd);
$('input:password[id=id_hisopwd]').val(data.hisopwd);
}
function FillMenuPwdTable(data) {
var addbtn = ventoy_get_xslg_addbtn('MenuPwdAddBtn');
var delbtn = ventoy_get_xslg_delbtn('MenuPwdDelBtn');
var addbtn = hiperiso_get_xslg_addbtn('MenuPwdAddBtn');
var delbtn = hiperiso_get_xslg_delbtn('MenuPwdDelBtn');
var td1, td2, td3, td4, td5, td6;
var $tbl = $("#id_pwd_tbl tbody");
@@ -207,7 +207,7 @@
td1 = '<td>' + (i + 1) + '</td>';
td2 = (data[i].type === 0) ? '<td>file</td>' : '<td>parent</td>';
td3 = '<td>' + data[i].path + '</td>';
td4 = '<td>' + ventoy_get_status_line(data[i].type, data[i].valid) + '</td>';
td4 = '<td>' + hiperiso_get_status_line(data[i].type, data[i].valid) + '</td>';
td5 = '<td>' + data[i].pwd + '</td>';
td6 = '<td>' + delbtn + '</td>';
@@ -221,7 +221,7 @@
$tbl.append('<tr><td></td><td></td><td></td><td></td><td></td><td>' + addbtn + '</td></tr>');
}
function VtoyFillCurrentPageItem(data) {
function HisoFillCurrentPageItem(data) {
FillCommonPassword(data);
FillMenuPwdTable(data.list);
}
@@ -231,29 +231,29 @@
var href = $(this).attr('href');
var index = parseInt(href.substr(5, 1));
if (index < 0 || index >= g_vtoy_data_default_index || current_tab_index === index) {
if (index < 0 || index >= g_hiso_data_default_index || current_tab_index === index) {
return;
}
current_tab_index = index;
VtoyFillCurrentPageItem(m_data_pwd[index]);
HisoFillCurrentPageItem(m_data_pwd[index]);
}
function VtoyGetCurrentPageItem(data) {
function HisoGetCurrentPageItem(data) {
data.bootpwd = $('input:password[id=id_bootpwd]').val();
data.isopwd = $('input:password[id=id_isopwd]').val();
data.wimpwd = $('input:password[id=id_wimpwd]').val();
data.imgpwd = $('input:password[id=id_imgpwd]').val();
data.efipwd = $('input:password[id=id_efipwd]').val();
data.vhdpwd = $('input:password[id=id_vhdpwd]').val();
data.vtoypwd = $('input:password[id=id_vtoypwd]').val();
data.hisopwd = $('input:password[id=id_hisopwd]').val();
}
function VtoySaveCurrentPage() {
VtoyGetCurrentPageItem(m_data_pwd[current_tab_index]);
function HisoSaveCurrentPage() {
HisoGetCurrentPageItem(m_data_pwd[current_tab_index]);
var data = m_data_pwd[current_tab_index];
callVtoy({
callHiso({
method : 'save_password',
index: current_tab_index,
bootpwd: data.bootpwd,
@@ -262,9 +262,9 @@
imgpwd: data.imgpwd,
efipwd: data.efipwd,
vhdpwd: data.vhdpwd,
vtoypwd: data.vtoypwd
hisopwd: data.hisopwd
}, function(e) {
Message.success(g_vtoy_cur_language.STR_SAVE_SUCCESS);
Message.success(g_hiso_cur_language.STR_SAVE_SUCCESS);
});
}
@@ -292,15 +292,15 @@
var type = parseInt($('input:radio[name=id_radio_pwd_type]:checked').val());
if (m_pwd_validator.settings.rules.PwdPath.required) {
path = ventoy_replace_slash(path);
path = hiperiso_replace_slash(path);
if (!ventoy_common_check_path(path)) {
Message.error(g_vtoy_cur_language.STR_INVALID_FILE_PATH);
if (!hiperiso_common_check_path(path)) {
Message.error(g_hiso_cur_language.STR_INVALID_FILE_PATH);
return;
}
if (path.indexOf("*") >= 0) {
callVtoySync({
callHisoSync({
method : 'check_fuzzy',
path: path
}, function(data) {
@@ -310,12 +310,12 @@
}
$("#SetPwdModal").modal('hide');
} else {
Message.error(g_vtoy_cur_language.STR_INVALID_FILE_PATH);
Message.error(g_hiso_cur_language.STR_INVALID_FILE_PATH);
}
});
} else {
callVtoySync({
callHisoSync({
method : 'check_path',
dir: m_pwd_file_or_dir,
path: path
@@ -326,7 +326,7 @@
}
$("#SetPwdModal").modal('hide');
} else {
Message.error(g_vtoy_cur_language.STR_INVALID_FILE_PATH);
Message.error(g_hiso_cur_language.STR_INVALID_FILE_PATH);
}
});
}
@@ -340,18 +340,18 @@
}
});
function VtoySetPassword(common, type, cb, data) {
function HisoSetPassword(common, type, cb, data) {
$('#SetPwdForm #SetPwdForm_title').text(g_vtoy_cur_language.STR_SET_PASSWORD);
$('#SetPwdForm #SetPwdForm_title').text(g_hiso_cur_language.STR_SET_PASSWORD);
if (type === 0) {
$('#SetPwdForm #SetPwdForm_path').text(g_vtoy_cur_language.STR_FILE_PATH);
$('#SetPwdForm #SetPwdForm_path').text(g_hiso_cur_language.STR_FILE_PATH);
} else {
$('#SetPwdForm #SetPwdForm_path').text(g_vtoy_cur_language.STR_DIR_PATH);
$('#SetPwdForm #SetPwdForm_path').text(g_hiso_cur_language.STR_DIR_PATH);
}
$('#SetPwdForm #SetPwdForm_pwd').text(g_vtoy_cur_language.STR_PASSWORD_VALUE);
$('#SetPwdForm #SetPwdForm_type').text(g_vtoy_cur_language.STR_PASSWORD_TYPE);
$('#SetPwdForm #SetPwdForm_pwd').text(g_hiso_cur_language.STR_PASSWORD_VALUE);
$('#SetPwdForm #SetPwdForm_type').text(g_hiso_cur_language.STR_PASSWORD_TYPE);
if (common) {
m_pwd_validator.settings.rules.PwdPath.required = false;
@@ -412,7 +412,7 @@ function VtoySetPassword(common, type, cb, data) {
//Main process
var m_data_pwd;
var current_tab_index = 0;
callVtoySync({method : 'get_password'}, function(data) {
callHisoSync({method : 'get_password'}, function(data) {
m_data_pwd = data;
});
@@ -421,13 +421,13 @@ function VtoySetPassword(common, type, cb, data) {
var value = format_password(pwd, type);
$(selector).val(value);
VtoySaveCurrentPage();
HisoSaveCurrentPage();
}
$("#id_common_pwd").on('click', '.CommPwdSetBtn', function() {
var id = $(this).attr('id');
//id_btn_set_
VtoySetPassword(1, 0, set_common_pwd_callback, id.substr(11));
HisoSetPassword(1, 0, set_common_pwd_callback, id.substr(11));
});
$("#id_common_pwd").on('click', '.CommPwdClearBtn', function() {
var id = $(this).attr('id');
@@ -435,7 +435,7 @@ function VtoySetPassword(common, type, cb, data) {
//id_btn_clr_
var selector = 'input:password[id=id_'+ id.substr(11) +']';
$(selector).val('');
VtoySaveCurrentPage();
HisoSaveCurrentPage();
});
function set_menu_pwd_callback(path, pwd, type, FileOrDir) {
@@ -452,12 +452,12 @@ function VtoySetPassword(common, type, cb, data) {
for (var i = 0; i < list.length; i++) {
if (list[i].path === data.path) {
Message.error(g_vtoy_cur_language.STR_DUPLICATE_PATH);
Message.error(g_hiso_cur_language.STR_DUPLICATE_PATH);
return;
}
}
callVtoy({
callHiso({
method : 'password_add',
index: current_tab_index,
type: data.type,
@@ -467,9 +467,9 @@ function VtoySetPassword(common, type, cb, data) {
if (e.result === 'success') {
list.push(data);
FillMenuPwdTable(list);
Message.success(g_vtoy_cur_language.STR_SAVE_SUCCESS);
Message.success(g_hiso_cur_language.STR_SAVE_SUCCESS);
} else if (e.result === 'duplicate') {
Message.error(g_vtoy_cur_language.STR_DUPLICATE_PATH);
Message.error(g_hiso_cur_language.STR_DUPLICATE_PATH);
}
});
@@ -482,13 +482,13 @@ function VtoySetPassword(common, type, cb, data) {
$('#SetPwdForm #id_span_pwdfile_tip1').text(g_current_dir + tip1);
$('#SetPwdForm #id_span_pwdfile_tip2').text(g_current_dir + tip2);
VtoySetPassword(0, 0, set_menu_pwd_callback, 0);
HisoSetPassword(0, 0, set_menu_pwd_callback, 0);
} else {
var tip = (g_current_os === 'windows') ? '\\ISO\\Windows' : "/ISO/Linux";
$('#SetPwdForm #id_span_pwddir_tip').text(g_current_dir + tip);
VtoySetPassword(0, 1, set_menu_pwd_callback, 1);
HisoSetPassword(0, 1, set_menu_pwd_callback, 1);
}
}
@@ -497,15 +497,15 @@ function VtoySetPassword(common, type, cb, data) {
var para = [
{
"selected": true,
"tip": g_vtoy_cur_language.STR_SET_PWD_FOR_FILE
"tip": g_hiso_cur_language.STR_SET_PWD_FOR_FILE
},
{
"selected": false,
"tip": g_vtoy_cur_language.STR_SET_PWD_FOR_DIR
"tip": g_hiso_cur_language.STR_SET_PWD_FOR_DIR
}
];
VtoySelectType(OnAddMenuPwdBtnClick, para);
HisoSelectType(OnAddMenuPwdBtnClick, para);
});
$("#id_pwd_tbl").on('click', '.MenuPwdDelBtn', function() {
@@ -513,27 +513,27 @@ function VtoySetPassword(common, type, cb, data) {
var path = $tr.data('path');
var index = $tr.data('index');
callVtoySync({
callHisoSync({
method : 'password_del',
index: current_tab_index,
path: path
}, function(data) {
m_data_pwd[current_tab_index].list.splice(index, 1);
FillMenuPwdTable(m_data_pwd[current_tab_index].list);
Message.success(g_vtoy_cur_language.STR_SAVE_SUCCESS);
Message.success(g_hiso_cur_language.STR_SAVE_SUCCESS);
});
});
function VtoySaveCurrentPage() {
function HisoSaveCurrentPage() {
var bootpwd = $('input:password[id=id_bootpwd]').val();
var isopwd = $('input:password[id=id_isopwd]').val();
var wimpwd = $('input:password[id=id_wimpwd]').val();
var imgpwd = $('input:password[id=id_imgpwd]').val();
var vhdpwd = $('input:password[id=id_vhdpwd]').val();
var efipwd = $('input:password[id=id_efipwd]').val();
var vtoypwd = $('input:password[id=id_vtoypwd]').val();
var hisopwd = $('input:password[id=id_hisopwd]').val();
callVtoy({
callHiso({
method : 'save_password',
index: current_tab_index,
bootpwd: bootpwd,
@@ -542,19 +542,19 @@ function VtoySetPassword(common, type, cb, data) {
imgpwd: imgpwd,
vhdpwd: vhdpwd,
efipwd: efipwd,
vtoypwd: vtoypwd
hisopwd: hisopwd
}, function(e) {
Message.success(g_vtoy_cur_language.STR_SAVE_SUCCESS);
Message.success(g_hiso_cur_language.STR_SAVE_SUCCESS);
});
}
$('input:password[id=id_bootpwd]').change(VtoySaveCurrentPage);
$('input:password[id=id_isopwd]').change(VtoySaveCurrentPage);
$('input:password[id=id_wimpwd]').change(VtoySaveCurrentPage);
$('input:password[id=id_imgpwd]').change(VtoySaveCurrentPage);
$('input:password[id=id_vhdpwd]').change(VtoySaveCurrentPage);
$('input:password[id=id_efipwd]').change(VtoySaveCurrentPage);
$('input:password[id=id_vtoypwd]').change(VtoySaveCurrentPage);
$('input:password[id=id_bootpwd]').change(HisoSaveCurrentPage);
$('input:password[id=id_isopwd]').change(HisoSaveCurrentPage);
$('input:password[id=id_wimpwd]').change(HisoSaveCurrentPage);
$('input:password[id=id_imgpwd]').change(HisoSaveCurrentPage);
$('input:password[id=id_vhdpwd]').change(HisoSaveCurrentPage);
$('input:password[id=id_efipwd]').change(HisoSaveCurrentPage);
$('input:password[id=id_hisopwd]').change(HisoSaveCurrentPage);
$('#id_tab_password a[href="#tab_0"]').click(OnClickMultiModeTab);
$('#id_tab_password a[href="#tab_1"]').click(OnClickMultiModeTab);
@@ -569,7 +569,7 @@ function VtoySetPassword(common, type, cb, data) {
$('#id_btn_reset').click(function() {
Modal.confirm({msg:GetResetTabConfigTipMsg(current_tab_index, 'password')}).on(function(e) {
if (e) {
callVtoySync({
callHisoSync({
method : 'password_del',
index: current_tab_index,
path: g_del_all_path
@@ -578,14 +578,14 @@ function VtoySetPassword(common, type, cb, data) {
});
m_data_pwd[current_tab_index].list.length = 0;
VtoyFillCurrentPageItem(m_data_pwd[g_vtoy_data_default_index]);
VtoySaveCurrentPage();
HisoFillCurrentPageItem(m_data_pwd[g_hiso_data_default_index]);
HisoSaveCurrentPage();
}
});
});
$('#id_tab_password a[href="#tab_0"]').tab('show');
VtoyFillCurrentPageItem(m_data_pwd[0]);
VtoyPageLanguageChange(g_current_language);
HisoFillCurrentPageItem(m_data_pwd[0]);
HisoPageLanguageChange(g_current_language);
</script>
src/plugson/www/plugson_persistence.html
+53 -53
View File
@@ -8,7 +8,7 @@
<button id="id_btn_reset" class="btn btn-sm btn-danger btn-del"><i class="fa fa-trash"></i><span id="id_btn_span_reset">Reset</span></button>
</div>
<div class="col-sm-2" style="font-size:16px;padding-top:8px;">
<a id="id_a_official_doc" target="_blank" href="https://www.ventoy.net/en/plugin_persistence.html"><span class="fa fa-link"></span><span id="id_span_official_doc">官网文档</span></a>
<a id="id_a_official_doc" target="_blank" href="https://www.hiperiso.net/en/plugin_persistence.html"><span class="fa fa-link"></span><span id="id_span_official_doc">官网文档</span></a>
</div>
</div>
<legend></legend>
@@ -40,30 +40,30 @@
</div>
<script type="text/javascript">
function VtoyPageLanguageChange(newlang) {
VtoyCommonChangeLanguage(newlang);
$('h1[id=id_h1_page_title]').text(g_vtoy_cur_language.STR_PLUG_PERSISTENCE);
function HisoPageLanguageChange(newlang) {
HisoCommonChangeLanguage(newlang);
$('h1[id=id_h1_page_title]').text(g_hiso_cur_language.STR_PLUG_PERSISTENCE);
$("span[id=id_span_file_exist]").each(function(){
$(this).text(g_vtoy_cur_language.STR_FILE_EXIST);
$(this).text(g_hiso_cur_language.STR_FILE_EXIST);
});
$("span[id=id_span_file_nonexist]").each(function(){
$(this).text(g_vtoy_cur_language.STR_FILE_NONEXIST);
$(this).text(g_hiso_cur_language.STR_FILE_NONEXIST);
});
$("span[id=id_span_file_fuzzy]").each(function(){
$(this).text(g_vtoy_cur_language.STR_FILE_FUZZY);
$(this).text(g_hiso_cur_language.STR_FILE_FUZZY);
});
$("span[id=id_span_dir_exist]").each(function(){
$(this).text(g_vtoy_cur_language.STR_DIR_EXIST);
$(this).text(g_hiso_cur_language.STR_DIR_EXIST);
});
$("span[id=id_span_dir_nonexist]").each(function(){
$(this).text(g_vtoy_cur_language.STR_DIR_NONEXIST);
$(this).text(g_hiso_cur_language.STR_DIR_NONEXIST);
});
$("th[id=id_th_persist_dat]").each(function(){
$(this).text(g_vtoy_cur_language.STR_PERSISTENCE_DAT);
$(this).text(g_hiso_cur_language.STR_PERSISTENCE_DAT);
});
if (newlang === 'en') {
@@ -76,7 +76,7 @@
}
}
function VtoySaveCurrentPage(index) {
function HisoSaveCurrentPage(index) {
var timeoutval = 0;
var autoselval = 1;
@@ -92,7 +92,7 @@
autoselval = parseInt($('#id_text_autosel_' + index).val());
}
callVtoy({
callHiso({
method : 'save_persistence',
index: current_tab_index,
id: index,
@@ -104,7 +104,7 @@
let data = m_data_persistence[current_tab_index][index];
data.timeout = timeoutval;
data.autosel = autoselval;
Message.success(g_vtoy_cur_language.STR_SAVE_SUCCESS);
Message.success(g_hiso_cur_language.STR_SAVE_SUCCESS);
});
}
@@ -126,15 +126,15 @@
if (id.startsWith('id_text_autosel_')) {
var list = m_data_persistence[current_tab_index][index].list;
if (intval > list.length) {
Message.error(g_vtoy_cur_language.STR_INVALID_AUTOSEL);
Message.error(g_hiso_cur_language.STR_INVALID_AUTOSEL);
$(this).val(data.autosel);
return;
}
}
VtoySaveCurrentPage(index);
HisoSaveCurrentPage(index);
} else {
Message.error(g_vtoy_cur_language.STR_INVALID_NUMBER);
Message.error(g_hiso_cur_language.STR_INVALID_NUMBER);
if (id.startsWith('id_text_timeout_')) {
$(this).val(data.timeout);
@@ -177,7 +177,7 @@
$(textid).val('');
}
VtoySaveCurrentPage(index);
HisoSaveCurrentPage(index);
}
@@ -187,8 +187,8 @@
var tabid = '#tbl_inner_' + (i + 1);
var $inner_tbl = $(tabid + ' tbody');
var inaddbtn = ventoy_get_xslg_addbtn('PersistenceInnerAddBtn');
var indelbtn = ventoy_get_xslg_delbtn('PersistenceInnerDelBtn');
var inaddbtn = hiperiso_get_xslg_addbtn('PersistenceInnerAddBtn');
var indelbtn = hiperiso_get_xslg_delbtn('PersistenceInnerDelBtn');
$inner_tbl.empty();
@@ -196,7 +196,7 @@
var $tr;
td1 = '<td style="width: 5%;">'+(j+1)+'</td>';
td2 = '<td>'+inner[j].path+'</td>';
td3 = '<td style="width: 10%;">'+ventoy_get_status_line(0, inner[j].valid)+'</td>';
td3 = '<td style="width: 10%;">'+hiperiso_get_status_line(0, inner[j].valid)+'</td>';
td4 = '<td style="width: 10%;">' + indelbtn + '</td>';
$tr = $('<tr>' + td1 + td2 + td3 + td4 + '</tr>');
@@ -217,8 +217,8 @@
function FillPersistenceTable(data) {
var td1, td2, td3, td4, td5;
var addbtn = ventoy_get_addbtn('PersistenceAddBtn');
var delbtn = ventoy_get_delbtn('PersistenceDelBtn');
var addbtn = hiperiso_get_addbtn('PersistenceAddBtn');
var delbtn = hiperiso_get_delbtn('PersistenceDelBtn');
var $tbl = $("#id_persistence_tbl tbody");
$tbl.empty();
@@ -260,7 +260,7 @@
'<tbody><tr>'+
'<td style="width:70%;vertical-align: middle;">' + data[i].path + '</td>' +
'<td style="vertical-align: middle;">' + ventoy_get_status_line(data[i].type, data[i].valid) + '</td>' +
'<td style="vertical-align: middle;">' + hiperiso_get_status_line(data[i].type, data[i].valid) + '</td>' +
'<td><div style="padding-left:0;" class="col-sm-8"><input type="text" '+timeoutdisable+' value="'+timeoutval+'" class="form-control" id="id_text_timeout_'+i+'"/></div></td>'+
'<td><div style="padding-left:0;" class="col-sm-8"><input type="text" '+autoseldisable+' value="'+autoselval+'" class="form-control" id="id_text_autosel_'+i+'"/></div></td></tr>'+
@@ -269,7 +269,7 @@
'</tbody></table>';
var tdtbl2 = '<table class="table table-bordered" id="tbl_inner_' + (i+1) + '">'+
'<thead><tr><th>#</th><th id="id_th_persist_dat">'+g_vtoy_cur_language.STR_PERSISTENCE_DAT+'</th><th id="id_th_status">'+g_vtoy_cur_language.STR_STATUS+'</th><th id="id_th_operation">'+g_vtoy_cur_language.STR_OPERATION+'</th></tr></thead><tbody></tbody></table>';
'<thead><tr><th>#</th><th id="id_th_persist_dat">'+g_hiso_cur_language.STR_PERSISTENCE_DAT+'</th><th id="id_th_status">'+g_hiso_cur_language.STR_STATUS+'</th><th id="id_th_operation">'+g_hiso_cur_language.STR_OPERATION+'</th></tr></thead><tbody></tbody></table>';
td1 = '<td style="vertical-align: middle;">' + (i + 1) + '</td>';
td2 = '<td>' + tdtbl1 + tdtbl2 + '</td>';
@@ -306,7 +306,7 @@
}
}
function VtoyFillCurrentPageItem(data) {
function HisoFillCurrentPageItem(data) {
FillPersistenceTable(data);
}
@@ -315,12 +315,12 @@
var href = $(this).attr('href');
var index = parseInt(href.substr(5, 1));
if (index < 0 || index >= g_vtoy_data_default_index || current_tab_index === index) {
if (index < 0 || index >= g_hiso_data_default_index || current_tab_index === index) {
return;
}
current_tab_index = index;
VtoyFillCurrentPageItem(m_data_persistence[index]);
HisoFillCurrentPageItem(m_data_persistence[index]);
}
function AddPersistenceEntry(type, exist1, path1, path2) {
@@ -349,12 +349,12 @@
for (var i = 0; i < list.length; i++) {
if (list[i].path === data.path) {
Message.error(g_vtoy_cur_language.STR_DUPLICATE_PATH);
Message.error(g_hiso_cur_language.STR_DUPLICATE_PATH);
return;
}
}
callVtoy({
callHiso({
method : 'persistence_add',
index: current_tab_index,
path: data.path,
@@ -364,9 +364,9 @@
if (e.result === 'success') {
list.push(data);
FillPersistenceTable(list);
Message.success(g_vtoy_cur_language.STR_SAVE_SUCCESS);
Message.success(g_hiso_cur_language.STR_SAVE_SUCCESS);
} else if (e.result === 'duplicate') {
Message.error(g_vtoy_cur_language.STR_DUPLICATE_PATH);
Message.error(g_hiso_cur_language.STR_DUPLICATE_PATH);
}
});
}
@@ -378,28 +378,28 @@
function OnPersistenceAddClick() {
var tip1 = (g_current_os === 'windows') ? '\\ISO\\ubuntu-20.04-desktop-amd64.iso' : "/ISO/ubuntu-20.04-desktop-amd64.iso";
var tip2 = (g_current_os === 'windows') ? '\\ISO\\ubuntu-*****-desktop-amd64.iso' : "/ISO/ubuntu-*****-desktop-amd64.iso";
var tip3 = (g_current_os === 'windows') ? '\\ventoy\\ubuntu_persistence.dat' : "/ventoy/ubuntu_persistence.dat";
var tip3 = (g_current_os === 'windows') ? '\\hiperiso\\ubuntu_persistence.dat' : "/hiperiso/ubuntu_persistence.dat";
var para = {
"title": g_vtoy_cur_language.STR_SET_PERSISTENCE,
"label1": g_vtoy_cur_language.STR_FILE_PATH,
"label2": g_vtoy_cur_language.STR_SET_PERSISTENCE_DAT,
"title": g_hiso_cur_language.STR_SET_PERSISTENCE,
"label1": g_hiso_cur_language.STR_FILE_PATH,
"label2": g_hiso_cur_language.STR_SET_PERSISTENCE_DAT,
"tip1": g_current_dir + tip1,
"tip2": g_current_dir + tip2,
"tip3": g_current_dir + tip3
};
VtoySetFileFile(OnAddImagePersistence, para);
HisoSetFileFile(OnAddImagePersistence, para);
}
function PersistenceDelEntry(path, index) {
callVtoySync({
callHisoSync({
method : 'persistence_del',
index: current_tab_index,
path: path
}, function(data) {
m_data_persistence[current_tab_index].splice(index, 1);
FillPersistenceTable(m_data_persistence[current_tab_index]);
Message.success(g_vtoy_cur_language.STR_SAVE_SUCCESS);
Message.success(g_hiso_cur_language.STR_SAVE_SUCCESS);
});
}
@@ -420,12 +420,12 @@
for (var i = 0; i < data.list.length; i++) {
if (data.list[i].path === path) {
Message.error(g_vtoy_cur_language.STR_DUPLICATE_PATH);
Message.error(g_hiso_cur_language.STR_DUPLICATE_PATH);
return;
}
}
callVtoy({
callHiso({
method : 'persistence_add_inner',
index: current_tab_index,
outpath: m_out_path,
@@ -439,7 +439,7 @@
data.list.push(node);
FillPersistenceInnerTable(m_out_index, data);
Message.success(g_vtoy_cur_language.STR_SAVE_SUCCESS);
Message.success(g_hiso_cur_language.STR_SAVE_SUCCESS);
});
}
@@ -449,9 +449,9 @@
var outpath = $tr.data('outpath');
var outindex = $tr.data('outindex');
var tip = (g_current_os === 'windows') ? '\\ventoy\\ubuntu_persistence.dat' : "/ventoy/ubuntu_persistence.dat";
var tip = (g_current_os === 'windows') ? '\\hiperiso\\ubuntu_persistence.dat' : "/hiperiso/ubuntu_persistence.dat";
var para = {
"title": g_vtoy_cur_language.STR_ADD_PERSISTENCE_DAT,
"title": g_hiso_cur_language.STR_ADD_PERSISTENCE_DAT,
"fuzzy": 0,
"tip1": g_current_dir + tip,
"tip2": '',
@@ -462,11 +462,11 @@
m_out_index = outindex;
m_out_path = outpath;
VtoySelectFilePath(OnAddPersistenceDatFile, para);
HisoSelectFilePath(OnAddPersistenceDatFile, para);
}
function PersistenceDelInnerEntry(outpath, outindex, path, index) {
callVtoy({
callHiso({
method : 'persistence_del_inner',
index: current_tab_index,
outpath: outpath,
@@ -476,7 +476,7 @@
data.list.splice(index, 1);
FillPersistenceInnerTable(outindex, m_data_persistence[current_tab_index][outindex]);
Message.success(g_vtoy_cur_language.STR_SAVE_SUCCESS);
Message.success(g_hiso_cur_language.STR_SAVE_SUCCESS);
});
}
@@ -491,7 +491,7 @@
var list = m_data_persistence[current_tab_index][outindex].list;
if (list.length === 1) {
ventoy_confirm(g_vtoy_cur_language.STR_DEL_LAST, PersistenceDelEntry, outpath, outindex);
hiperiso_confirm(g_hiso_cur_language.STR_DEL_LAST, PersistenceDelEntry, outpath, outindex);
} else {
PersistenceDelInnerEntry(outpath, outindex, path, index);
}
@@ -504,7 +504,7 @@
//Main process
var m_data_persistence;
var current_tab_index = 0;
callVtoySync({method : 'get_persistence'}, function(data) {
callHisoSync({method : 'get_persistence'}, function(data) {
m_data_persistence = data;
});
@@ -525,7 +525,7 @@
$('#id_btn_reset').click(function() {
Modal.confirm({msg:GetResetTabConfigTipMsg(current_tab_index, 'persistence')}).on(function(e) {
if (e) {
callVtoySync({
callHisoSync({
method : 'persistence_del',
index: current_tab_index,
path: g_del_all_path
@@ -534,14 +534,14 @@
});
m_data_persistence[current_tab_index].length = 0;
VtoyFillCurrentPageItem(m_data_persistence[g_vtoy_data_default_index]);
Message.success(g_vtoy_cur_language.STR_SAVE_SUCCESS);
HisoFillCurrentPageItem(m_data_persistence[g_hiso_data_default_index]);
Message.success(g_hiso_cur_language.STR_SAVE_SUCCESS);
}
});
});
$('#id_tab_persistence a[href="#tab_0"]').tab('show');
VtoyFillCurrentPageItem(m_data_persistence[0]);
VtoyPageLanguageChange(g_current_language);
HisoFillCurrentPageItem(m_data_persistence[0]);
HisoPageLanguageChange(g_current_language);
</script>
src/plugson/www/plugson_theme.html
+63 -63
View File
@@ -8,7 +8,7 @@
<button id="id_btn_reset" class="btn btn-sm btn-danger btn-del"><i class="fa fa-trash"></i><span id="id_btn_span_reset">Reset</span></button>
</div>
<div class="col-sm-2" style="font-size:16px;padding-top:8px;">
<a id="id_a_official_doc" target="_blank" href="https://www.ventoy.net/cn/plugin_theme.html"><span class="fa fa-link"></span><span id="id_span_official_doc">官网文档</span></a>
<a id="id_a_official_doc" target="_blank" href="https://www.hiperiso.net/cn/plugin_theme.html"><span class="fa fa-link"></span><span id="id_span_official_doc">官网文档</span></a>
</div>
</div>
<legend></legend>
@@ -99,7 +99,7 @@
<code style="font-weight: bold;">0</code> 不过滤 &nbsp;&nbsp;
<code style="font-weight: bold;">1</code> 过滤 <br/>
注意，这个选项必须在上面设置了多个主题配置文件，同时 "默认" 设置为 “随机选择” 时才有效，其他情况下均无效。<br/>
关于这个选项的详细解释，请参考 <a href="https://www.ventoy.net/cn/plugin_theme.html#vtoy_theme_res_fit">resolution_fit 选项说明</a>
关于这个选项的详细解释，请参考 <a href="https://www.hiperiso.net/cn/plugin_theme.html#hiso_theme_res_fit">resolution_fit 选项说明</a>
</td>
</tr>
<tr id="tr_title_desc_en">
@@ -108,7 +108,7 @@
Filter by current resolution when you set more than one themes. &nbsp;&nbsp;
<code style="font-weight: bold;">0</code> No filter &nbsp;&nbsp
<code style="font-weight: bold;">1</code> Filter <br/>
You can refer <a href="https://www.ventoy.net/en/plugin_theme.html#vtoy_theme_res_fit">About resolution_fit</a> for details about this option.
You can refer <a href="https://www.hiperiso.net/en/plugin_theme.html#hiso_theme_res_fit">About resolution_fit</a> for details about this option.
</td>
</tr>
</table>
@@ -140,7 +140,7 @@
<td class="td_ctrl_col">选项说明</td>
<td>
菜单显示模式，可以设置为 默认为 GUI 模式。GUI和CLI 分别对应图形模式和文本模式。<br/>
在有极个别的机器上Ventoy的背景菜单无法显示，或者显示后菜单移动极其缓慢，这种情况可以默认设置为文本模式。<br/>
在有极个别的机器上Hiperiso的背景菜单无法显示，或者显示后菜单移动极其缓慢，这种情况可以默认设置为文本模式。<br/>
不过，不管GUI还是CLI都是基于VGA显示设备的，如果你的机器上只有串口，你可以设置为 <code>serial</code> <br/>
当然，如果既有串口也有VGA设备，则也可以设置为 <code>serial_console</code> <br/>
<span style='color:red;font-weight:bold;'>注意：如果菜单名称（文件名）里有中文的话，在文本或serial模式下是无法显示的。</span>
@@ -150,7 +150,7 @@
<td class="td_ctrl_col">Option Description</td>
<td>
Boot menu display mode, default is <code>GUI</code>. <code>GUI</code> or <code>CLI</code> corresponding to the GUI mode and TEXT mode respectively.<br/>
On very few machines Ventoy's menu can't be shown or the cursor moves extremely slow. In this case you can set the default mode to "CLI". <br/>
On very few machines Hiperiso's menu can't be shown or the cursor moves extremely slow. In this case you can set the default mode to "CLI". <br/>
However, both "GUI" and "CLI" need a VGA device, if your machine only has serial, you can use <code>serial</code><br/>
Also you can use <code>serial_console</code> if you have both serial and VGA device. <br/>
<span style='color:red;font-weight:bold;'>Attention: Unicode characters will NOT be displayed normally in CLI or serial mode.</span>
@@ -233,13 +233,13 @@
<tr id="tr_title_desc_cn">
<td class="td_ctrl_col">选项说明</td>
<td>
字体文件的全路径。Ventoy在启动时会依次加载这些字体文件。
字体文件的全路径。Hiperiso在启动时会依次加载这些字体文件。
</td>
</tr>
<tr id="tr_title_desc_en">
<td class="td_ctrl_col">Option Description</td>
<td>
Full path of fonts file. Ventoy will load each of them when boot.
Full path of fonts file. Hiperiso will load each of them when boot.
</td>
</tr>
</table>
@@ -251,25 +251,25 @@
</div>
<script type="text/javascript">
function VtoyPageLanguageChange(newlang) {
VtoyCommonChangeLanguage(newlang);
function HisoPageLanguageChange(newlang) {
HisoCommonChangeLanguage(newlang);
$('h1[id=id_h1_page_title]').text(g_vtoy_cur_language.STR_PLUG_THEME);
$('h1[id=id_h1_page_title]').text(g_hiso_cur_language.STR_PLUG_THEME);
$("span[id=id_span_file_exist]").each(function(){
$(this).text(g_vtoy_cur_language.STR_FILE_EXIST);
$(this).text(g_hiso_cur_language.STR_FILE_EXIST);
});
$("span[id=id_span_file_nonexist]").each(function(){
$(this).text(g_vtoy_cur_language.STR_FILE_NONEXIST);
$(this).text(g_hiso_cur_language.STR_FILE_NONEXIST);
});
$("th[id=id_th_default]").text(g_vtoy_cur_language.STR_DEFAULT);
$("th[id=id_th_default]").text(g_hiso_cur_language.STR_DEFAULT);
$("span[id=id_span_random_sel]").text(g_vtoy_cur_language.STR_RANDOM_SEL);
$("span[id=id_span_default_sel]").text(g_vtoy_cur_language.STR_DEFAULT_SEL);
$("span[id=id_span_random_sel]").text(g_hiso_cur_language.STR_RANDOM_SEL);
$("span[id=id_span_default_sel]").text(g_hiso_cur_language.STR_DEFAULT_SEL);
}
function VtoyGetCurrentPageItem(data) {
function HisoGetCurrentPageItem(data) {
var mode;
data.gfxmode = $('select[id=id_theme_sel_gfxmode').val();
@@ -288,11 +288,11 @@
data.resolution_fit = parseInt($('input:radio[name=id_ctrl_radio_res_fit]:checked').val());
}
function VtoySaveCurrentPage() {
VtoyGetCurrentPageItem(m_data_theme[current_tab_index]);
function HisoSaveCurrentPage() {
HisoGetCurrentPageItem(m_data_theme[current_tab_index]);
var data = m_data_theme[current_tab_index];
callVtoy({
callHiso({
method : 'save_theme',
index: current_tab_index,
display_mode: data.display_mode,
@@ -300,19 +300,19 @@
gfxmode: data.gfxmode,
default_file: data.default_file
}, function(e) {
Message.success(g_vtoy_cur_language.STR_SAVE_SUCCESS);
Message.success(g_hiso_cur_language.STR_SAVE_SUCCESS);
});
}
function FillThemeFileTable(list, default_file) {
var id;
var exist = '<span id="id_span_file_exist" style="line-height: 1.5;" class="label pull-left bg-green">' + g_vtoy_cur_language.STR_FILE_EXIST + '</span>';
var nonexist = '<span id="id_span_file_nonexist" style="line-height: 1.5;" class="label pull-left bg-red">' + g_vtoy_cur_language.STR_FILE_NONEXIST + '</span>';
var addbtn = ventoy_get_xslg_addbtn('ThemeFileAddBtn');
var delbtn = ventoy_get_xslg_delbtn('ThemeFileDelBtn');
var exist = '<span id="id_span_file_exist" style="line-height: 1.5;" class="label pull-left bg-green">' + g_hiso_cur_language.STR_FILE_EXIST + '</span>';
var nonexist = '<span id="id_span_file_nonexist" style="line-height: 1.5;" class="label pull-left bg-red">' + g_hiso_cur_language.STR_FILE_NONEXIST + '</span>';
var addbtn = hiperiso_get_xslg_addbtn('ThemeFileAddBtn');
var delbtn = hiperiso_get_xslg_delbtn('ThemeFileDelBtn');
var default_random = '<label class="radio-inline"><input type="radio" id="id_theme_file_radio0" name="id_theme_file_radio" data-type="0" value="0"/><span id="id_span_random_sel">' + g_vtoy_cur_language.STR_RANDOM_SEL + '</span></label>';
var default_random = '<label class="radio-inline"><input type="radio" id="id_theme_file_radio0" name="id_theme_file_radio" data-type="0" value="0"/><span id="id_span_random_sel">' + g_hiso_cur_language.STR_RANDOM_SEL + '</span></label>';
var td1, td2, td3, td4, td5;
var $tbl = $("#id_theme_tbl_file tbody");
$tbl.empty();
@@ -330,7 +330,7 @@
id = i + 1;
var sel = '<label class="radio-inline"><input type="radio" id="id_theme_file_radio'+ id + '" name="id_theme_file_radio" data-type="'+
id + '" value="'+ id +'"/><span id="id_span_default_sel">' + g_vtoy_cur_language.STR_DEFAULT_SEL + '</span></label>';
id + '" value="'+ id +'"/><span id="id_span_default_sel">' + g_hiso_cur_language.STR_DEFAULT_SEL + '</span></label>';
td3 = '<td>' + sel + '</td>';
@@ -363,7 +363,7 @@
m_data_theme[current_tab_index].default_file = parseInt(id.substr(prelen));
}
VtoySaveCurrentPage();
HisoSaveCurrentPage();
});
}
});
@@ -379,10 +379,10 @@
}
function FillThemeFontTable(list) {
var exist = '<span id="id_span_file_exist" style="line-height: 1.5;" class="label pull-left bg-green">' + g_vtoy_cur_language.STR_FILE_EXIST + '</span>';
var nonexist = '<span id="id_span_file_nonexist" style="line-height: 1.5;" class="label pull-left bg-red">' + g_vtoy_cur_language.STR_FILE_NONEXIST + '</span>';
var addbtn = ventoy_get_xslg_addbtn('ThemeFontAddBtn');
var delbtn = ventoy_get_xslg_delbtn('ThemeFontDelBtn');
var exist = '<span id="id_span_file_exist" style="line-height: 1.5;" class="label pull-left bg-green">' + g_hiso_cur_language.STR_FILE_EXIST + '</span>';
var nonexist = '<span id="id_span_file_nonexist" style="line-height: 1.5;" class="label pull-left bg-red">' + g_hiso_cur_language.STR_FILE_NONEXIST + '</span>';
var addbtn = hiperiso_get_xslg_addbtn('ThemeFontAddBtn');
var delbtn = hiperiso_get_xslg_delbtn('ThemeFontDelBtn');
var td1, td2, td3, td4;
var $tbl = $("#id_theme_tbl_fonts tbody");
$tbl.empty();
@@ -411,7 +411,7 @@
$tbl.append('<tr><td></td><td></td><td></td><td>' + addbtn + '</td></tr>');
}
function VtoyFillCurrentPageItem(data) {
function HisoFillCurrentPageItem(data) {
$('select[id=id_theme_sel_gfxmode').val(data.gfxmode);
if (data.display_mode === 3) {
@@ -436,12 +436,12 @@
var href = $(this).attr('href');
var index = parseInt(href.substr(5, 1));
if (index < 0 || index >= g_vtoy_data_default_index || current_tab_index === index) {
if (index < 0 || index >= g_hiso_data_default_index || current_tab_index === index) {
return;
}
current_tab_index = index;
VtoyFillCurrentPageItem(m_data_theme[index]);
HisoFillCurrentPageItem(m_data_theme[index]);
}
@@ -454,12 +454,12 @@
for (var i = 0; i < list.length; i++) {
if (list[i].path === data.path) {
Message.error(g_vtoy_cur_language.STR_DUPLICATE_PATH);
Message.error(g_hiso_cur_language.STR_DUPLICATE_PATH);
return;
}
}
callVtoy({
callHiso({
method : 'theme_add_file',
index: current_tab_index,
path: data.path
@@ -467,9 +467,9 @@
if (e.result === 'success') {
list.push(data);
FillThemeFileTable(list, m_data_theme[current_tab_index].default_file);
Message.success(g_vtoy_cur_language.STR_SAVE_SUCCESS);
Message.success(g_hiso_cur_language.STR_SAVE_SUCCESS);
} else if (e.result === 'duplicate') {
Message.error(g_vtoy_cur_language.STR_DUPLICATE_PATH);
Message.error(g_hiso_cur_language.STR_DUPLICATE_PATH);
}
});
}
@@ -483,12 +483,12 @@
for (var i = 0; i < list.length; i++) {
if (list[i].path === data.path) {
Message.error(g_vtoy_cur_language.STR_DUPLICATE_PATH);
Message.error(g_hiso_cur_language.STR_DUPLICATE_PATH);
return;
}
}
callVtoy({
callHiso({
method : 'theme_add_font',
index: current_tab_index,
path: data.path
@@ -496,9 +496,9 @@
if (e.result === 'success') {
list.push(data);
FillThemeFontTable(list);
Message.success(g_vtoy_cur_language.STR_SAVE_SUCCESS);
Message.success(g_hiso_cur_language.STR_SAVE_SUCCESS);
} else if (e.result === 'duplicate') {
Message.error(g_vtoy_cur_language.STR_DUPLICATE_PATH);
Message.error(g_hiso_cur_language.STR_DUPLICATE_PATH);
}
});
}
@@ -508,14 +508,14 @@
var m_data_theme;
var current_tab_index = 0;
callVtoySync({method : 'get_theme'}, function(data) {
callHisoSync({method : 'get_theme'}, function(data) {
m_data_theme = data;
});
$("#theme_file_table").on('click', '.ThemeFileAddBtn', function() {
var tip = (g_current_os === 'windows') ? '\\ventoy\\themes\\test\\theme.txt' : "/ventoy/themes/test/theme.txt";
var tip = (g_current_os === 'windows') ? '\\hiperiso\\themes\\test\\theme.txt' : "/hiperiso/themes/test/theme.txt";
var para = {
"title": g_vtoy_cur_language.STR_ADD_THEME,
"title": g_hiso_cur_language.STR_ADD_THEME,
"fuzzy": 0,
"tip1": g_current_dir + tip,
"tip2": '',
@@ -524,7 +524,7 @@
"extra_title": ''
};
VtoySelectFilePath(OnAddThemeFile, para);
HisoSelectFilePath(OnAddThemeFile, para);
});
$("#theme_file_table").on('click', '.ThemeFileDelBtn', function() {
@@ -532,21 +532,21 @@
var path = $tr.data('path');
var index = $tr.data('index');
callVtoySync({
callHisoSync({
method : 'theme_del_file',
index: current_tab_index,
path: path
}, function(data) {
m_data_theme[current_tab_index].filelist.splice(index, 1);
FillThemeFileTable(m_data_theme[current_tab_index].filelist, m_data_theme[current_tab_index].default_file);
Message.success(g_vtoy_cur_language.STR_SAVE_SUCCESS);
Message.success(g_hiso_cur_language.STR_SAVE_SUCCESS);
});
});
$("#id_theme_tbl_fonts").on('click', '.ThemeFontAddBtn', function() {
var tip = (g_current_os === 'windows') ? '\\ventoy\\themes\\blur\\Hack-12.pf2' : "/ventoy/themes/blur/Hack-12.pf2";
var tip = (g_current_os === 'windows') ? '\\hiperiso\\themes\\blur\\Hack-12.pf2' : "/hiperiso/themes/blur/Hack-12.pf2";
var para = {
"title": g_vtoy_cur_language.STR_ADD_FONT,
"title": g_hiso_cur_language.STR_ADD_FONT,
"fuzzy": 0,
"tip1": g_current_dir + tip,
"tip2": '',
@@ -555,7 +555,7 @@
"extra_title": ''
};
VtoySelectFilePath(OnAddThemeFont, para);
HisoSelectFilePath(OnAddThemeFont, para);
});
$("#id_theme_tbl_fonts").on('click', '.ThemeFontDelBtn', function() {
@@ -563,21 +563,21 @@
var path = $tr.data('path');
var index = $tr.data('index');
callVtoySync({
callHisoSync({
method : 'theme_del_font',
index: current_tab_index,
path: path
}, function(data) {
m_data_theme[current_tab_index].fontslist.splice(index, 1);
FillThemeFontTable(m_data_theme[current_tab_index].fontslist);
Message.success(g_vtoy_cur_language.STR_SAVE_SUCCESS);
Message.success(g_hiso_cur_language.STR_SAVE_SUCCESS);
});
});
$('select[id=id_theme_sel_gfxmode]').change(VtoySaveCurrentPage);
$('select[id=id_theme_sel_dismode]').change(VtoySaveCurrentPage);
$('#id_ctrl_radio_res_fit0').change(VtoySaveCurrentPage);
$('#id_ctrl_radio_res_fit1').change(VtoySaveCurrentPage);
$('select[id=id_theme_sel_gfxmode]').change(HisoSaveCurrentPage);
$('select[id=id_theme_sel_dismode]').change(HisoSaveCurrentPage);
$('#id_ctrl_radio_res_fit0').change(HisoSaveCurrentPage);
$('#id_ctrl_radio_res_fit1').change(HisoSaveCurrentPage);
$('#id_tab_theme a[href="#tab_0"]').click(OnClickMultiModeTab);
$('#id_tab_theme a[href="#tab_1"]').click(OnClickMultiModeTab);
@@ -592,7 +592,7 @@
$('#id_btn_reset').click(function() {
Modal.confirm({msg:GetResetTabConfigTipMsg(current_tab_index, 'theme')}).on(function(e) {
if (e) {
callVtoySync({
callHisoSync({
method : 'theme_del_file',
index: current_tab_index,
path: g_del_all_path
@@ -600,7 +600,7 @@
});
callVtoySync({
callHisoSync({
method : 'theme_del_font',
index: current_tab_index,
path: g_del_all_path
@@ -610,14 +610,14 @@
m_data_theme[current_tab_index].filelist.length = 0;
m_data_theme[current_tab_index].fontslist.length = 0;
VtoyFillCurrentPageItem(m_data_theme[g_vtoy_data_default_index]);
VtoySaveCurrentPage();
HisoFillCurrentPageItem(m_data_theme[g_hiso_data_default_index]);
HisoSaveCurrentPage();
}
});
});
$('#id_tab_theme a[href="#tab_0"]').tab('show');
VtoyFillCurrentPageItem(m_data_theme[0]);
VtoyPageLanguageChange(g_current_language);
HisoFillCurrentPageItem(m_data_theme[0]);
HisoPageLanguageChange(g_current_language);
</script>
src/plugson/www/static/css/vtoy.css
+11 -11
View File
@@ -141,15 +141,15 @@
}
}
/*vtoy server is running*/
#vtoy-main .loading {
/*hiso server is running*/
#hiso-main .loading {
width: 100%;
position: relative;
top:0;
left:0;
background-color: rgba(0, 0, 0, 0);
}
#vtoy-main .loading .title {
#hiso-main .loading .title {
width: 300px;
text-align: center;
margin: 250px auto 0px;
@@ -157,19 +157,19 @@
font-weight: 900;
font-size: 24px;
}
#vtoy-main .loading .rectbox {
#hiso-main .loading .rectbox {
width: 120px;
height: 40px;
margin: 10px auto;
}
#vtoy-main .loading .rectbox .title {
#hiso-main .loading .rectbox .title {
font-size: 14px;
font-family: 'Microsoft YaHei';
font-weight: 900;
text-align: center;
color: rgba(68, 149, 57, 1);
}
#vtoy-main .loading .rectbox .rect {
#hiso-main .loading .rectbox .rect {
width: 25px;
height: 25px;
background-color: rgba(68, 149, 57, 1);
@@ -179,34 +179,34 @@
-o-animation: loading 0.48s infinite ease-in-out;
animation: loading 0.48s infinite ease-in-out;
}
#vtoy-main .loading .rectbox .rect1 {
#hiso-main .loading .rectbox .rect1 {
-webkit-animation-delay: 0s;
-moz-animation-delay: 0s;
-o-animation-delay: 0s;
animation-delay: 0s;
}
#vtoy-main .loading .rectbox .rect2 {
#hiso-main .loading .rectbox .rect2 {
-webkit-animation-delay: 0.36s;
-moz-animation-delay: 0.12s;
-o-animation-delay: 0.12s;
animation-delay: 0.12s;
background-color: rgba(68, 149, 57, 0.2);
}
#vtoy-main .loading .rectbox .rect3 {
#hiso-main .loading .rectbox .rect3 {
-webkit-animation-delay: 0.72s;
-moz-animation-delay: 0.24s;
-o-animation-delay: 0.24s;
animation-delay: 0.24s;
background-color: rgba(68, 149, 57, 0.4);
}
#vtoy-main .loading .rectbox .rect4 {
#hiso-main .loading .rectbox .rect4 {
-webkit-animation-delay: 1.08s;
-moz-animation-delay: 0.36s;
-o-animation-delay: 0.36s;
animation-delay: 0.36s;
background-color: rgba(68, 149, 57, 0.6);
}
#vtoy-main .loading .rectbox .rect5 {
#hiso-main .loading .rectbox .rect5 {
-webkit-animation-delay: 1.44s;
-moz-animation-delay: 0.48s;
-o-animation-delay: 0.48s;
src/plugson/www/static/js/jquery.validate.vtoymethods.js
+3 -3
View File
@@ -1,4 +1,4 @@
function ventoy_check_file_name_char(path) {
function hiperiso_check_file_name_char(path) {
for (var i = 0; i < path.length; i++) {
var cc = path[i];
if (cc === '/' || cc === '\\' || cc === '*' || cc === '?' || cc === '"' || cc === '<' || cc === '>' || cc === '|')
@@ -45,7 +45,7 @@ function ventoy_check_file_name_char(path) {
return true;
}
if (ventoy_get_ulen(value) > 250) {
if (hiperiso_get_ulen(value) > 250) {
return false;
}
@@ -81,7 +81,7 @@ function ventoy_check_file_name_char(path) {
return true;
}
return ventoy_check_file_name_char(value);
return hiperiso_check_file_name_char(value);
}, 'Invalid characters');
src/plugson/www/static/js/jquery.vtoy.alert.js
+6 -6
View File
@@ -93,9 +93,9 @@
var _dialog = function(options) {
var ops = {
msg : '',
title : g_vtoy_cur_language.STR_INFO,
btnok : g_vtoy_cur_language.STR_BTN_OK,
btncl : g_vtoy_cur_language.STR_BTN_CANCEL,
title : g_hiso_cur_language.STR_INFO,
btnok : g_hiso_cur_language.STR_BTN_OK,
btncl : g_hiso_cur_language.STR_BTN_CANCEL,
userDefined : ""
};
@@ -124,7 +124,7 @@
defaultTime = time;
}
var $proc;
$proc = $("#vtoy_proc");
$proc = $("#hiso_proc");
if('hide' === showOrHide) {
$proc.remove();
} else if ('show' === showOrHide) {
@@ -132,10 +132,10 @@
return;
}
$(document).find(":focus").blur();
$proc = $('<div id="vtoy_proc" class="loading"></div>');
$proc = $('<div id="hiso_proc" class="loading"></div>');
$("body").append($proc);
setTimeout(function() {
$proc.replaceWith('<div id="vtoy_proc" class="loading" style="background-color: rgba(0, 0, 0, 0.2);"><div class="rectbox"><div class="title">DATA</div><div class="rect rect1"></div><div class="rect rect2"></div><div class="rect rect3"></div><div class="rect rect4"></div><div class="rect rect5"></div></div></div>');
$proc.replaceWith('<div id="hiso_proc" class="loading" style="background-color: rgba(0, 0, 0, 0.2);"><div class="rectbox"><div class="title">DATA</div><div class="rect rect1"></div><div class="rect rect2"></div><div class="rect rect3"></div><div class="rect rect4"></div><div class="rect rect5"></div></div></div>');
}, $.isNumeric(time) ? time : 100);
} else {
alert("Modal.process参数必须为show/hide");
src/plugson/www/static/js/vtoy.js
+137 -137
View File
@@ -1,5 +1,5 @@
function VtoyUTF16HexToAscii(hex) {
function HisoUTF16HexToAscii(hex) {
var str = "";
for (var i = 0; i < hex.length; i += 4) {
str += String.fromCharCode(parseInt(hex.substring(i, i + 4), 16));
@@ -8,7 +8,7 @@ function VtoyUTF16HexToAscii(hex) {
return str;
}
function ventoy_replace_slash(str) {
function hiperiso_replace_slash(str) {
var str1 = str.replace(/\\/g, '/');
var str2 = str1.replace(/\/\//g, '/');
@@ -22,7 +22,7 @@ function ventoy_replace_slash(str) {
}
function ventoy_get_ulen(str) {
function hiperiso_get_ulen(str) {
var c, b = 0, l = str.length;
while(l) {
c = str.charCodeAt(--l);
@@ -32,7 +32,7 @@ function ventoy_get_ulen(str) {
}
function ventoy_common_check_path(path) {
function hiperiso_common_check_path(path) {
var curdir
if (path.indexOf('//') >= 0) {
@@ -64,8 +64,8 @@ function loadContent(page) {
}
// 包装ajax请求
function callVtoyCatchErr(p1, p2, p3) {
var url = '/vtoy/json';
function callHisoCatchErr(p1, p2, p3) {
var url = '/hiso/json';
var data = {};
var func = function(data) {};
var errfunc = function(xmlHttpRequest, textStatus, errorThrown) {};
@@ -84,7 +84,7 @@ function callVtoyCatchErr(p1, p2, p3) {
errfunc = p3;
}
//vtoy.debug('callVtoy:\t\t\t\t' + JSON.stringify(data));
//hiso.debug('callHiso:\t\t\t\t' + JSON.stringify(data));
$.ajax({
url: url,
type: 'post',
@@ -94,14 +94,14 @@ function callVtoyCatchErr(p1, p2, p3) {
success: func,
error: errfunc,
complete: function(data) {
//vtoy.debug('callVtoy\'s resp:\t\t' + data.responseText);
//hiso.debug('callHiso\'s resp:\t\t' + data.responseText);
}
});
}
// 包装ajax请求
function callVtoy(p1, p2, p3) {
var url = '/vtoy/json';
function callHiso(p1, p2, p3) {
var url = '/hiso/json';
var data = {};
var func = function(data) {};
@@ -119,7 +119,7 @@ function callVtoy(p1, p2, p3) {
func = p3;
}
//vtoy.debug('callVtoy:\t\t\t\t' + JSON.stringify(data));
//hiso.debug('callHiso:\t\t\t\t' + JSON.stringify(data));
$.ajax({
url: url,
type: 'post',
@@ -131,7 +131,7 @@ function callVtoy(p1, p2, p3) {
if(undefined === errorThrown)
{
Message.error(g_vtoy_cur_language.STR_WEB_REMOTE_ABNORMAL);
Message.error(g_hiso_cur_language.STR_WEB_REMOTE_ABNORMAL);
}
else if(undefined === errorThrown.length)
{
@@ -146,12 +146,12 @@ function callVtoy(p1, p2, p3) {
{
case 'timeout':
{
Message.error(g_vtoy_cur_language.STR_WEB_REQUEST_TIMEOUT);
Message.error(g_hiso_cur_language.STR_WEB_REQUEST_TIMEOUT);
break;
}
case 'Service Unavailable':
{
Message.error(g_vtoy_cur_language.STR_WEB_SERVICE_UNAVAILABLE);
Message.error(g_hiso_cur_language.STR_WEB_SERVICE_UNAVAILABLE);
break;
}
case 'abort':
@@ -160,21 +160,21 @@ function callVtoy(p1, p2, p3) {
}
default:
{
Message.error(g_vtoy_cur_language.STR_WEB_COMMUNICATION_ERR + errorThrown);
Message.error(g_hiso_cur_language.STR_WEB_COMMUNICATION_ERR + errorThrown);
break;
}
}
}
},
complete: function(data) {
//vtoy.debug('callVtoy\'s resp:\t\t' + data.responseText);
//hiso.debug('callHiso\'s resp:\t\t' + data.responseText);
}
});
}
function callVtoyASyncTimeout(time, data, func) {
function callHisoASyncTimeout(time, data, func) {
$.ajax({
url: '/vtoy/json',
url: '/hiso/json',
type: 'post',
cache: false,
dataType: 'json',
@@ -199,7 +199,7 @@ function callVtoyASyncTimeout(time, data, func) {
{
case 'timeout':
{
callVtoyASyncTimeout(time, data, func);
callHisoASyncTimeout(time, data, func);
break;
}
case 'Service Unavailable':
@@ -218,25 +218,25 @@ function callVtoyASyncTimeout(time, data, func) {
}
},
complete: function(data) {
//vtoy.debug('callVtoyASyncTimeout\'s resp:\t' + JSON.stringify(data));
//hiso.debug('callHisoASyncTimeout\'s resp:\t' + JSON.stringify(data));
}
});
}
function callVtoySync(data, func) {
//vtoy.debug('callVtoySync:\t\t\t' + JSON.stringify(data));
function callHisoSync(data, func) {
//hiso.debug('callHisoSync:\t\t\t' + JSON.stringify(data));
$.ajax({
url: '/vtoy/json',
url: '/hiso/json',
type: 'post',
cache: false,
dataType: 'json',
async: false,
data: JSON.stringify(data),
success: function VtoyCallFuncWrapper(data) {
success: function HisoCallFuncWrapper(data) {
if (data.result === 'busy') {
var titlestr = '<span class="fa fa-check-circle" style="color:green; font-weight:bold;"> ' + g_vtoy_cur_language.STR_INFO + '</span>';
var msgstr = '<span style="font-size:14px; font-weight:bold;"> ' + g_vtoy_cur_language.STR_WEB_SERVICE_BUSY + '</span>';
Modal.alert({title:titlestr, msg:msgstr, btnok:g_vtoy_cur_language.STR_BTN_OK });
var titlestr = '<span class="fa fa-check-circle" style="color:green; font-weight:bold;"> ' + g_hiso_cur_language.STR_INFO + '</span>';
var msgstr = '<span style="font-size:14px; font-weight:bold;"> ' + g_hiso_cur_language.STR_WEB_SERVICE_BUSY + '</span>';
Modal.alert({title:titlestr, msg:msgstr, btnok:g_hiso_cur_language.STR_BTN_OK });
}else {
func(data);
}
@@ -244,7 +244,7 @@ function callVtoySync(data, func) {
error: function(xmlHttpRequest, textStatus, errorThrown) {
if(undefined === errorThrown)
{
Message.error(g_vtoy_cur_language.STR_WEB_REMOTE_ABNORMAL);
Message.error(g_hiso_cur_language.STR_WEB_REMOTE_ABNORMAL);
}
else if(undefined === errorThrown.length)
{
@@ -259,12 +259,12 @@ function callVtoySync(data, func) {
{
case 'timeout':
{
Message.error(g_vtoy_cur_language.STR_WEB_REQUEST_TIMEOUT);
Message.error(g_hiso_cur_language.STR_WEB_REQUEST_TIMEOUT);
break;
}
case 'Service Unavailable':
{
Message.error(g_vtoy_cur_language.STR_WEB_SERVICE_UNAVAILABLE);
Message.error(g_hiso_cur_language.STR_WEB_SERVICE_UNAVAILABLE);
break;
}
case 'abort':
@@ -273,19 +273,19 @@ function callVtoySync(data, func) {
}
default:
{
Message.error(g_vtoy_cur_language.STR_WEB_COMMUNICATION_ERR + errorThrown);
Message.error(g_hiso_cur_language.STR_WEB_COMMUNICATION_ERR + errorThrown);
break;
}
}
}
},
complete: function(data) {
//vtoy.debug('callVtoySync\'s resp:\t' + JSON.stringify(data));
//hiso.debug('callHisoSync\'s resp:\t' + JSON.stringify(data));
}
});
}
var vtoy = {
var hiso = {
baseurl : '',
status: '',
scan: {
@@ -305,7 +305,7 @@ String.prototype.endsWith = function(str) {
}
var g_vtoy_cur_language_en =
var g_hiso_cur_language_en =
{
"STR_INFO": "Info",
"STR_BTN_OK": "OK",
@@ -438,9 +438,9 @@ var g_vtoy_cur_language_en =
"STR_CLOSE_TIP": "Service unavailable, the page will close!",
"STR_SECURE_BOOT_ENABLE": "Enable",
"STR_SECURE_BOOT_DISABLE": "Disable",
"STR_SYNTAX_ERROR_TIP": "Syntax error detected in ventoy.json, so the configuration is not loaded!",
"STR_INVALID_CONFIG_TIP": "Invalid configuration detected in ventoy.json, so the configuration is not loaded!",
"STR_CONFIG_SAVE_ERROR_TIP": "Failed to write ventoy.json file. Check VentoyPlugson.log for more details!",
"STR_SYNTAX_ERROR_TIP": "Syntax error detected in hiperiso.json, so the configuration is not loaded!",
"STR_INVALID_CONFIG_TIP": "Invalid configuration detected in hiperiso.json, so the configuration is not loaded!",
"STR_CONFIG_SAVE_ERROR_TIP": "Failed to write hiperiso.json file. Check HiperisoPlugson.log for more details!",
"STR_JSON_PREVIEW": "JSON Preview",
"STR_JSON_COPY_SUCCESS": "JSON Copy Success",
@@ -449,7 +449,7 @@ var g_vtoy_cur_language_en =
"STR_XXX": "xxx"
};
var g_vtoy_cur_language_cn =
var g_hiso_cur_language_cn =
{
"STR_INFO": "提醒",
"STR_BTN_OK": "确定",
@@ -580,9 +580,9 @@ var g_vtoy_cur_language_cn =
"STR_CLOSE_TIP": "后台服务不可用，页面即将关闭！",
"STR_SECURE_BOOT_ENABLE": "开启",
"STR_SECURE_BOOT_DISABLE": "未开启",
"STR_SYNTAX_ERROR_TIP": "ventoy.json 文件中存在语法错误，配置未加载!",
"STR_INVALID_CONFIG_TIP": "ventoy.json 文件中存在错误配置，配置未加载!",
"STR_CONFIG_SAVE_ERROR_TIP": "ventoy.json 文件写入失败，详细信息请参考 VentoyPlugson.log 文件!",
"STR_SYNTAX_ERROR_TIP": "hiperiso.json 文件中存在语法错误，配置未加载!",
"STR_INVALID_CONFIG_TIP": "hiperiso.json 文件中存在错误配置，配置未加载!",
"STR_CONFIG_SAVE_ERROR_TIP": "hiperiso.json 文件写入失败，详细信息请参考 HiperisoPlugson.log 文件!",
"STR_JSON_PREVIEW": "JSON 预览",
"STR_JSON_COPY_SUCCESS": "JSON 内容复制成功",
@@ -594,8 +594,8 @@ var g_vtoy_cur_language_cn =
var g_current_dir;
var g_current_os;
var g_current_language = 'cn';
var g_vtoy_cur_language = g_vtoy_cur_language_cn;
var g_vtoy_data_default_index = 6;
var g_hiso_cur_language = g_hiso_cur_language_cn;
var g_hiso_data_default_index = 6;
var g_bios_postfix = [ "", "_legacy", "_uefi", "_ia32", "_aa64", "_mips" ];
var g_del_all_path = '4119ae33-98ea-448e-b9c0-569aafcf1fb4';
@@ -619,7 +619,7 @@ function GetResetTabConfigTipMsg(index, name) {
function CommonUpdateTabTitleIcon(exists, id, name) {
var exspan = " <span id='tab_0_icon' class='fa fa-circle' style='color:red;'></span>";
for (var i = 0; i < g_vtoy_data_default_index; i++) {
for (var i = 0; i < g_hiso_data_default_index; i++) {
var fid = id + i + '"]';
var oldhtml = $(fid).html();
var newhtml;
@@ -636,7 +636,7 @@ function CommonUpdateTabTitleIcon(exists, id, name) {
}
}
function ventoy_file_submit(form, extra) {
function hiperiso_file_submit(form, extra) {
var filepath = $("#FilePath").val();
var fileextra = $("#FileExtra").val();
@@ -650,15 +650,15 @@ function ventoy_file_submit(form, extra) {
}
}
filepath = ventoy_replace_slash(filepath);
filepath = hiperiso_replace_slash(filepath);
if (!ventoy_common_check_path(filepath)) {
Message.error(g_vtoy_cur_language.STR_INVALID_FILE_PATH);
if (!hiperiso_common_check_path(filepath)) {
Message.error(g_hiso_cur_language.STR_INVALID_FILE_PATH);
return;
}
if (g_file_fuzzy_match && filepath.indexOf("*") >= 0) {
callVtoySync({
callHisoSync({
method : 'check_fuzzy',
path: filepath
}, function(data) {
@@ -668,11 +668,11 @@ function ventoy_file_submit(form, extra) {
}
$("#SetFileModal").modal('hide');
} else {
Message.error(g_vtoy_cur_language.STR_INVALID_FILE_PATH);
Message.error(g_hiso_cur_language.STR_INVALID_FILE_PATH);
}
});
} else {
callVtoySync({
callHisoSync({
method : 'check_path',
dir: 0,
path: filepath
@@ -683,7 +683,7 @@ function ventoy_file_submit(form, extra) {
}
$("#SetFileModal").modal('hide');
} else {
Message.error(g_vtoy_cur_language.STR_INVALID_FILE_PATH);
Message.error(g_hiso_cur_language.STR_INVALID_FILE_PATH);
}
});
}
@@ -703,7 +703,7 @@ var g_filepath_validator = $("#SetFileForm").validate({
}
},
submitHandler: function(form) {
ventoy_file_submit(form, g_file_with_extra);
hiperiso_file_submit(form, g_file_with_extra);
}
});
@@ -733,18 +733,18 @@ var g_dirpath_validator = $("#SetDirForm").validate({
}
}
dirpath = ventoy_replace_slash(dirpath);
dirpath = hiperiso_replace_slash(dirpath);
if (dirpath.length > 0 && dirpath.charCodeAt(dirpath.length - 1) === 47) {
dirpath = dirpath.substring(0, dirpath.length - 1);
}
if (!ventoy_common_check_path(dirpath)) {
Message.error(g_vtoy_cur_language.STR_INVALID_DIR_PATH);
if (!hiperiso_common_check_path(dirpath)) {
Message.error(g_hiso_cur_language.STR_INVALID_DIR_PATH);
return;
}
callVtoySync({
callHisoSync({
method : 'check_path',
dir: 1,
path: dirpath
@@ -755,13 +755,13 @@ var g_dirpath_validator = $("#SetDirForm").validate({
}
$("#SetDirModal").modal('hide');
} else {
Message.error(g_vtoy_cur_language.STR_INVALID_DIR_PATH);
Message.error(g_hiso_cur_language.STR_INVALID_DIR_PATH);
}
});
}
});
function VtoySelectFilePath(cb, para) {
function HisoSelectFilePath(cb, para) {
g_file_fuzzy_match = para.fuzzy;
if (para.extra) {
@@ -827,7 +827,7 @@ function VtoySelectFilePath(cb, para) {
}
function VtoySelectDirPath(cb, para) {
function HisoSelectDirPath(cb, para) {
$('span[id=id_span_dirpath_tip]').each(function(){
$(this).text(para.tip);
});
@@ -886,9 +886,9 @@ function VtoySelectDirPath(cb, para) {
$("#SetDirModal").modal();
}
function VtoyCommonChangeLanguage(newlang) {
function HisoCommonChangeLanguage(newlang) {
if (newlang === 'en') {
g_vtoy_cur_language = g_vtoy_cur_language_en;
g_hiso_cur_language = g_hiso_cur_language_en;
;$.extend($.validator.messages, {
required: "This field is required",
remote: "Please modify this field",
@@ -939,7 +939,7 @@ function VtoyCommonChangeLanguage(newlang) {
});
} else {
g_vtoy_cur_language = g_vtoy_cur_language_cn;
g_hiso_cur_language = g_hiso_cur_language_cn;
;$.extend($.validator.messages, {
required: "这是必填字段",
remote: "请修正此字段",
@@ -991,76 +991,76 @@ function VtoyCommonChangeLanguage(newlang) {
});
}
$("span[id=id_span_menu_device]").text(g_vtoy_cur_language.STR_PLUG_DEVICE);
$("span[id=id_span_menu_control]").text(g_vtoy_cur_language.STR_PLUG_CONTROL);
$("span[id=id_span_menu_theme]").text(g_vtoy_cur_language.STR_PLUG_THEME);
$("span[id=id_span_menu_alias]").text(g_vtoy_cur_language.STR_PLUG_ALIAS);
$("span[id=id_span_menu_tip]").text(g_vtoy_cur_language.STR_PLUG_TIP);
$("span[id=id_span_menu_class]").text(g_vtoy_cur_language.STR_PLUG_CLASS);
$("span[id=id_span_menu_auto_install]").text(g_vtoy_cur_language.STR_PLUG_AUTO_INSTALL);
$("span[id=id_span_menu_persistence]").text(g_vtoy_cur_language.STR_PLUG_PERSISTENCE);
$("span[id=id_span_menu_injection]").text(g_vtoy_cur_language.STR_PLUG_INJECTION);
$("span[id=id_span_menu_conf_replace]").text(g_vtoy_cur_language.STR_PLUG_CONF_REPLACE);
$("span[id=id_span_menu_password]").text(g_vtoy_cur_language.STR_PLUG_PASSWORD);
$("span[id=id_span_menu_imagelist]").text(g_vtoy_cur_language.STR_PLUG_IMAGELIST);
$("span[id=id_span_menu_auto_memdisk]").text(g_vtoy_cur_language.STR_PLUG_AUTO_MEMDISK);
$("span[id=id_span_menu_dud]").text(g_vtoy_cur_language.STR_PLUG_DUD);
$('#id_span_save').text(g_vtoy_cur_language.STR_SAVE);
$('#id_span_reset').text(g_vtoy_cur_language.STR_RESET);
$('#id_span_donation').text(g_vtoy_cur_language.STR_PLUG_DONATION);
$("span[id=id_span_menu_device]").text(g_hiso_cur_language.STR_PLUG_DEVICE);
$("span[id=id_span_menu_control]").text(g_hiso_cur_language.STR_PLUG_CONTROL);
$("span[id=id_span_menu_theme]").text(g_hiso_cur_language.STR_PLUG_THEME);
$("span[id=id_span_menu_alias]").text(g_hiso_cur_language.STR_PLUG_ALIAS);
$("span[id=id_span_menu_tip]").text(g_hiso_cur_language.STR_PLUG_TIP);
$("span[id=id_span_menu_class]").text(g_hiso_cur_language.STR_PLUG_CLASS);
$("span[id=id_span_menu_auto_install]").text(g_hiso_cur_language.STR_PLUG_AUTO_INSTALL);
$("span[id=id_span_menu_persistence]").text(g_hiso_cur_language.STR_PLUG_PERSISTENCE);
$("span[id=id_span_menu_injection]").text(g_hiso_cur_language.STR_PLUG_INJECTION);
$("span[id=id_span_menu_conf_replace]").text(g_hiso_cur_language.STR_PLUG_CONF_REPLACE);
$("span[id=id_span_menu_password]").text(g_hiso_cur_language.STR_PLUG_PASSWORD);
$("span[id=id_span_menu_imagelist]").text(g_hiso_cur_language.STR_PLUG_IMAGELIST);
$("span[id=id_span_menu_auto_memdisk]").text(g_hiso_cur_language.STR_PLUG_AUTO_MEMDISK);
$("span[id=id_span_menu_dud]").text(g_hiso_cur_language.STR_PLUG_DUD);
$('#id_span_save').text(g_hiso_cur_language.STR_SAVE);
$('#id_span_reset').text(g_hiso_cur_language.STR_RESET);
$('#id_span_donation').text(g_hiso_cur_language.STR_PLUG_DONATION);
$('span[id=id_btn_span_reset]').each(function(){
$(this).text(' ' + g_vtoy_cur_language.STR_RESET);
$(this).text(' ' + g_hiso_cur_language.STR_RESET);
});
$("span[id=id_span_btn_add]").each(function(){
$(this).text(g_vtoy_cur_language.STR_ADD);
$(this).text(g_hiso_cur_language.STR_ADD);
});
$("span[id=id_span_btn_del]").each(function(){
$(this).text(g_vtoy_cur_language.STR_DEL_SHORT);
$(this).text(g_hiso_cur_language.STR_DEL_SHORT);
});
$("span[id=id_span_enable]").each(function(){
$(this).text(g_vtoy_cur_language.STR_ENABLE);
$(this).text(g_hiso_cur_language.STR_ENABLE);
});
$("th[id=id_th_operation]").each(function(){
$(this).text(g_vtoy_cur_language.STR_OPERATION);
$(this).text(g_hiso_cur_language.STR_OPERATION);
});
$("th[id=id_th_status]").each(function(){
$(this).text(g_vtoy_cur_language.STR_STATUS);
$(this).text(g_hiso_cur_language.STR_STATUS);
});
$('span [id=id_span_valid').each(function(){
$(this).text(g_vtoy_cur_language.STR_VALID);
$(this).text(g_hiso_cur_language.STR_VALID);
});
$('span [id=id_span_invalid').each(function(){
$(this).text(g_vtoy_cur_language.STR_INVALID);
$(this).text(g_hiso_cur_language.STR_INVALID);
});
$("td[id=td_title_desc]").each(function(){
$(this).text(g_vtoy_cur_language.STR_OPT_DESC);
$(this).text(g_hiso_cur_language.STR_OPT_DESC);
});
$("td[id=td_title_setting]").each(function(){
$(this).text(g_vtoy_cur_language.STR_OPT_SETTING);
$(this).text(g_hiso_cur_language.STR_OPT_SETTING);
});
}
function ventoy_get_status_line(dir, exist) {
function hiperiso_get_status_line(dir, exist) {
if (dir) {
if (exist === 0) {
return '<span id="id_span_dir_nonexist" style="line-height: 1.5;" class="label pull-left bg-red">' + g_vtoy_cur_language.STR_DIR_NONEXIST + '</span>';
return '<span id="id_span_dir_nonexist" style="line-height: 1.5;" class="label pull-left bg-red">' + g_hiso_cur_language.STR_DIR_NONEXIST + '</span>';
} else {
return '<span id="id_span_dir_exist" style="line-height: 1.5;" class="label pull-left bg-green">' + g_vtoy_cur_language.STR_DIR_EXIST + '</span>';
return '<span id="id_span_dir_exist" style="line-height: 1.5;" class="label pull-left bg-green">' + g_hiso_cur_language.STR_DIR_EXIST + '</span>';
}
} else {
if (exist === -1) {
return '<span id="id_span_file_fuzzy" style="line-height: 1.5;" class="label pull-left bg-yellow">' + g_vtoy_cur_language.STR_FILE_FUZZY + '</span>';
return '<span id="id_span_file_fuzzy" style="line-height: 1.5;" class="label pull-left bg-yellow">' + g_hiso_cur_language.STR_FILE_FUZZY + '</span>';
} else if (exist === 1) {
return '<span id="id_span_file_exist" style="line-height: 1.5;" class="label pull-left bg-green">' + g_vtoy_cur_language.STR_FILE_EXIST + '</span>';
return '<span id="id_span_file_exist" style="line-height: 1.5;" class="label pull-left bg-green">' + g_hiso_cur_language.STR_FILE_EXIST + '</span>';
} else {
return '<span id="id_span_file_nonexist" style="line-height: 1.5;" class="label pull-left bg-red">' + g_vtoy_cur_language.STR_FILE_NONEXIST + '</span>';
return '<span id="id_span_file_nonexist" style="line-height: 1.5;" class="label pull-left bg-red">' + g_hiso_cur_language.STR_FILE_NONEXIST + '</span>';
}
}
}
@@ -1080,9 +1080,9 @@ var g_type_select_validator = $("#TypeSelectForm").validate({
}
});
function VtoySelectType(cb, para) {
function HisoSelectType(cb, para) {
$('#TypeSelectForm #TypeSelForm_lang_1').text(g_vtoy_cur_language.STR_SELECT);
$('#TypeSelectForm #TypeSelForm_lang_1').text(g_hiso_cur_language.STR_SELECT);
if (g_current_language === 'en') {
$('#TypeSelectForm #TypeSelForm_lang_2').text(" OK");
@@ -1145,7 +1145,7 @@ var g_set_key_validator = $("#SetKeyForm").validate({
}
});
function VtoySetKey(cb, para) {
function HisoSetKey(cb, para) {
$('#SetKeyForm #SetKeyForm_lang_1').text(para.title);
$('#SetKeyForm #SetKeyForm_lang_2').text(para.title1);
@@ -1183,7 +1183,7 @@ var g_valid_color_name = [
"white"
];
function ventoy_check_color(color) {
function hiperiso_check_color(color) {
if (/^#[0-9A-Fa-f][0-9A-Fa-f][0-9A-Fa-f][0-9A-Fa-f][0-9A-Fa-f][0-9A-Fa-f]$/.test(color)) {
return true;
} else {
@@ -1197,7 +1197,7 @@ function ventoy_check_color(color) {
return false;
}
function ventoy_check_percent(percent) {
function hiperiso_check_percent(percent) {
if (percent.length > 0) {
return true;
} else {
@@ -1206,9 +1206,9 @@ function ventoy_check_percent(percent) {
}
function ventoy_check_file_path(isopath, fuzzy, cb) {
function hiperiso_check_file_path(isopath, fuzzy, cb) {
if (fuzzy && isopath.indexOf("*") >= 0) {
callVtoySync({
callHisoSync({
method : 'check_fuzzy',
path: isopath
}, function(data) {
@@ -1217,11 +1217,11 @@ function ventoy_check_file_path(isopath, fuzzy, cb) {
cb(data.exist);
}
} else {
Message.error(g_vtoy_cur_language.STR_INVALID_FILE_PATH);
Message.error(g_hiso_cur_language.STR_INVALID_FILE_PATH);
}
});
} else {
callVtoySync({
callHisoSync({
method : 'check_path',
dir: 0,
path: isopath
@@ -1231,13 +1231,13 @@ function ventoy_check_file_path(isopath, fuzzy, cb) {
cb(data.exist);
}
} else {
Message.error(g_vtoy_cur_language.STR_INVALID_FILE_PATH);
Message.error(g_hiso_cur_language.STR_INVALID_FILE_PATH);
}
});
}
}
function ventoy_random_string(e) { 
function hiperiso_random_string(e) { 
var t = "abcdefhijkmnprstwxyz2345678";
var a = t.length;
var n = "";
@@ -1271,21 +1271,21 @@ var g_set_filefile_validator = $("#SetFileFileForm").validate({
return;
}
path1 = ventoy_replace_slash(path1);
path1 = hiperiso_replace_slash(path1);
if (!ventoy_common_check_path(path1)) {
Message.error(g_vtoy_cur_language.STR_INVALID_FILE_PATH1);
if (!hiperiso_common_check_path(path1)) {
Message.error(g_hiso_cur_language.STR_INVALID_FILE_PATH1);
return;
}
path2 = ventoy_replace_slash(path2);
path2 = hiperiso_replace_slash(path2);
if (!ventoy_common_check_path(path2)) {
Message.error(g_vtoy_cur_language.STR_INVALID_FILE_PATH2);
if (!hiperiso_common_check_path(path2)) {
Message.error(g_hiso_cur_language.STR_INVALID_FILE_PATH2);
return;
}
callVtoy({
callHiso({
method : 'check_path2',
dir1: 0,
fuzzy1: 1,
@@ -1301,15 +1301,15 @@ var g_set_filefile_validator = $("#SetFileFileForm").validate({
$("#SetFileFileModal").modal('hide');
} else if (retdata.exist1 === 0) {
Message.error(g_vtoy_cur_language.STR_INVALID_FILE_PATH1);
Message.error(g_hiso_cur_language.STR_INVALID_FILE_PATH1);
} else {
Message.error(g_vtoy_cur_language.STR_INVALID_FILE_PATH2);
Message.error(g_hiso_cur_language.STR_INVALID_FILE_PATH2);
}
});
}
});
function VtoySetFileFile(cb, para) {
function HisoSetFileFile(cb, para) {
$('#SetFileFileForm #SetFileFileForm_title').text(para.title);
$('#SetFileFileForm #SetFileFileForm_label1').text(para.label1);
@@ -1369,21 +1369,21 @@ var g_set_dirfile_validator = $("#SetDirFileForm").validate({
return;
}
path1 = ventoy_replace_slash(path1);
path1 = hiperiso_replace_slash(path1);
if (!ventoy_common_check_path(path1)) {
Message.error(g_vtoy_cur_language.STR_INVALID_FILE_PATH1);
if (!hiperiso_common_check_path(path1)) {
Message.error(g_hiso_cur_language.STR_INVALID_FILE_PATH1);
return;
}
path2 = ventoy_replace_slash(path2);
path2 = hiperiso_replace_slash(path2);
if (!ventoy_common_check_path(path2)) {
Message.error(g_vtoy_cur_language.STR_INVALID_FILE_PATH2);
if (!hiperiso_common_check_path(path2)) {
Message.error(g_hiso_cur_language.STR_INVALID_FILE_PATH2);
return;
}
callVtoy({
callHiso({
method : 'check_path2',
dir1: 1,
fuzzy1: 0,
@@ -1399,15 +1399,15 @@ var g_set_dirfile_validator = $("#SetDirFileForm").validate({
$("#SetDirFileModal").modal('hide');
} else if (retdata.exist1 === 0) {
Message.error(g_vtoy_cur_language.STR_INVALID_DIR_PATH);
Message.error(g_hiso_cur_language.STR_INVALID_DIR_PATH);
} else {
Message.error(g_vtoy_cur_language.STR_INVALID_FILE_PATH2);
Message.error(g_hiso_cur_language.STR_INVALID_FILE_PATH2);
}
});
}
});
function VtoySetDirFile(cb, para) {
function HisoSetDirFile(cb, para) {
$('#SetDirFileModal #SetDirFileForm_title').text(para.title);
$('#SetDirFileModal #SetDirFileForm_label1').text(para.label1);
@@ -1440,24 +1440,24 @@ function VtoySetDirFile(cb, para) {
$("#SetDirFileModal").modal();
}
function ventoy_get_xslg_addbtn(mclass) {
return '<button class="btn btn-xs btn-lg btn-success btn-add ' + mclass + '"><span class="fa fa-plus">&nbsp;&nbsp;</span><span id="id_span_btn_add">'+g_vtoy_cur_language.STR_ADD+'</span></button>';
function hiperiso_get_xslg_addbtn(mclass) {
return '<button class="btn btn-xs btn-lg btn-success btn-add ' + mclass + '"><span class="fa fa-plus">&nbsp;&nbsp;</span><span id="id_span_btn_add">'+g_hiso_cur_language.STR_ADD+'</span></button>';
}
function ventoy_get_xslg_delbtn(mclass) {
return '<button class="btn btn-xs btn-lg btn-danger btn-del '+mclass+'"><span class="fa fa-trash">&nbsp;&nbsp;</span><span id="id_span_btn_del">'+g_vtoy_cur_language.STR_DEL_SHORT+'</span></button>';
function hiperiso_get_xslg_delbtn(mclass) {
return '<button class="btn btn-xs btn-lg btn-danger btn-del '+mclass+'"><span class="fa fa-trash">&nbsp;&nbsp;</span><span id="id_span_btn_del">'+g_hiso_cur_language.STR_DEL_SHORT+'</span></button>';
}
function ventoy_get_addbtn(mclass) {
return '<button class="btn btn-success btn-add ' + mclass + '"><span class="fa fa-plus">&nbsp;&nbsp;</span><span id="id_span_btn_add">'+g_vtoy_cur_language.STR_ADD+'</span></button>';
function hiperiso_get_addbtn(mclass) {
return '<button class="btn btn-success btn-add ' + mclass + '"><span class="fa fa-plus">&nbsp;&nbsp;</span><span id="id_span_btn_add">'+g_hiso_cur_language.STR_ADD+'</span></button>';
}
function ventoy_get_delbtn(mclass) {
return '<button class="btn btn-danger btn-del '+mclass+'"><span class="fa fa-trash">&nbsp;&nbsp;</span><span id="id_span_btn_del">'+g_vtoy_cur_language.STR_DEL_SHORT+'</span></button>';
function hiperiso_get_delbtn(mclass) {
return '<button class="btn btn-danger btn-del '+mclass+'"><span class="fa fa-trash">&nbsp;&nbsp;</span><span id="id_span_btn_del">'+g_hiso_cur_language.STR_DEL_SHORT+'</span></button>';
}
function ventoy_confirm(title, cb, data1, data2) {
Modal.confirm({msg:g_vtoy_cur_language.STR_DEL_LAST}).on(function(e) {
function hiperiso_confirm(title, cb, data1, data2) {
Modal.confirm({msg:g_hiso_cur_language.STR_DEL_LAST}).on(function(e) {
if (e) {
if (typeof(cb) === 'function') {
cb(data1, data2);