]> glassweightruler.freedombox.rocks Git - Ventoy.git/commitdiff
Add /F option for VentoyPlugson.exe to use the system default browser.
authorlongpanda <admin@ventoy.net>
Sat, 7 Jan 2023 07:35:47 +0000 (15:35 +0800)
committerlongpanda <admin@ventoy.net>
Sat, 7 Jan 2023 07:35:47 +0000 (15:35 +0800)
By default it will firstly try to use Google Chrome if possible.

Plugson/src/main_windows.c
Plugson/vs/VentoyPlugson/Release/VentoyPlugson.exe
Plugson/vs/VentoyPlugson/x64/Release/VentoyPlugson_X64.exe
Plugson/www/helplist
Plugson/www/index.html
Plugson/www/menulist
Plugson/www/plugson_theme.html

index 6f74d2b713e9fde402ed426afd7368f936a2db4f..7eea97624762c9e92ff12ecdf5d7d7f7618993aa 100644 (file)
@@ -12,6 +12,7 @@
 \r
 char g_ventoy_dir[MAX_PATH];\r
 \r
+static BOOL g_ChromeFirst = TRUE;\r
 static BOOL g_running = FALSE;\r
 static HWND g_refresh_button;\r
 static HWND g_start_button;\r
@@ -118,14 +119,17 @@ static void OpenURL(void)
 \r
        sprintf_s(url, sizeof(url), "http://%s:%s/index.html", g_sysinfo.ip, g_sysinfo.port);\r
 \r
-    for (i = 0; Browsers[i] != NULL; i++)\r
-    {\r
-        if (ventoy_is_file_exist("%s", Browsers[i]))\r
-        {\r
-            ShellExecuteA(NULL, "open", Browsers[i], url, NULL, SW_SHOW);\r
-            return;\r
-        }\r
-    }\r
+       if (g_ChromeFirst)\r
+       {\r
+               for (i = 0; Browsers[i] != NULL; i++)\r
+               {\r
+                       if (ventoy_is_file_exist("%s", Browsers[i]))\r
+                       {\r
+                               ShellExecuteA(NULL, "open", Browsers[i], url, NULL, SW_SHOW);\r
+                               return;\r
+                       }\r
+               }\r
+       }\r
 \r
     ShellExecuteA(NULL, "open", url, NULL, NULL, SW_SHOW);\r
 }\r
@@ -521,12 +525,22 @@ static void DllProtect(void)
 \r
 int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, INT nCmdShow)\r
 {\r
+       int i;\r
     int rc;\r
        HANDLE hMutex;\r
        WCHAR CurDir[MAX_PATH];\r
 \r
     UNREFERENCED_PARAMETER(hPrevInstance);\r
 \r
+       for (i = 0; i < __argc; i++)\r
+       {\r
+               if (__argv[i] && _stricmp(__argv[i], "/F") == 0)\r
+               {\r
+                       g_ChromeFirst = FALSE;\r
+                       break;\r
+               }\r
+       }\r
+\r
        DllProtect();\r
 \r
     if (GetUserDefaultUILanguage() == 0x0804)\r
index da86c027b28b252129b6f3ab047610dbf149035d..6495195e3e1ad545e4f1351f5bc0f94f217edfe8 100644 (file)
Binary files a/Plugson/vs/VentoyPlugson/Release/VentoyPlugson.exe and b/Plugson/vs/VentoyPlugson/Release/VentoyPlugson.exe differ
index 567658348aa28ce9884efbe43697c648f71bcdc2..7f8067315da798351ddc274a2441e96fb275fa55 100644 (file)
Binary files a/Plugson/vs/VentoyPlugson/x64/Release/VentoyPlugson_X64.exe and b/Plugson/vs/VentoyPlugson/x64/Release/VentoyPlugson_X64.exe differ
index a3c78091edb7df6ca41effe25ddc7c63223ec233..f0b1cf0c1caac6009c43c1ea820cd8f1999fb4e9 100644 (file)
@@ -1 +1 @@
-ar_ARbn_BNde_DEen_USfr_FRhi_HIhr_HRhu_HUid_IDja_JPka_GEko_KRpl_PLpt_PTru_RUsr_RSta_INtr_TRzh_CNzh_TW
\ No newline at end of file
+ar_ARbn_BNde_DEen_USes_ESfr_FRhi_HIhr_HRhu_HUid_IDja_JPka_GEko_KRpl_PLpt_PTru_RUsr_RSta_INtr_TRzh_CNzh_TW
\ No newline at end of file
index 7ddf280b55c95138d5a468c17e14ef3ee6f811f8..f3018ee3f91dc1ef120e0bdc6dff6da579539fb4 100644 (file)
     <script src="/static/js/jQuery-2.1.4.min.js"></script>\r
     <!-- jquery validate -->\r
     <script src="/static/js/jquery.validate.min.js"></script>    \r
-    <script src="/static/js/jquery.validate.vtoymethods.js?v=109"></script>\r
+    <script src="/static/js/jquery.validate.vtoymethods.js?v=142"></script>\r
 \r
-    <script src="/static/js/jquery.vtoy.alert.js?v=109"></script>\r
-    <script src="/static/js/vtoy.js?v=109"></script>\r
+    <script src="/static/js/jquery.vtoy.alert.js?v=142"></script>\r
+    <script src="/static/js/vtoy.js?v=142"></script>\r
     <script src="/static/js/md5.min.js"></script>\r
 \r
     <!-- Bootstrap 3.3.5 -->\r
index a3c78091edb7df6ca41effe25ddc7c63223ec233..f0b1cf0c1caac6009c43c1ea820cd8f1999fb4e9 100644 (file)
@@ -1 +1 @@
-ar_ARbn_BNde_DEen_USfr_FRhi_HIhr_HRhu_HUid_IDja_JPka_GEko_KRpl_PLpt_PTru_RUsr_RSta_INtr_TRzh_CNzh_TW
\ No newline at end of file
+ar_ARbn_BNde_DEen_USes_ESfr_FRhi_HIhr_HRhu_HUid_IDja_JPka_GEko_KRpl_PLpt_PTru_RUsr_RSta_INtr_TRzh_CNzh_TW
\ No newline at end of file
index 89f069fa93e64a8914ebcf6391a8eb26246f69ca..c59a58087b1bc536e39b1a7ac64b113bc8522896 100644 (file)
                       <td class="td_ctrl_col" id="td_title_setting">选项设置</td>\r
                       <td>\r
                         <select id="id_theme_sel_gfxmode" name="name_theme_sel_gfxmode" class="form-control">\r
+                            <option title="max">max</option>\r
                             <option title="1920x1080">1920x1080</option>\r
                             <option title="1680x1050">1680x1050</option>\r
                             <option title="1600x900">1600x900</option>\r