]> glassweightruler.freedombox.rocks Git - Ventoy.git/commitdiff
Optimization for GUI LiveCD
authorlongpanda <admin@ventoy.net>
Wed, 29 Sep 2021 23:37:49 +0000 (07:37 +0800)
committerlongpanda <admin@ventoy.net>
Wed, 29 Sep 2021 23:37:49 +0000 (07:37 +0800)
INSTALL/tool/aarch64/Ventoy2Disk.gtk3
INSTALL/tool/i386/Ventoy2Disk.gtk2
INSTALL/tool/i386/Ventoy2Disk.gtk3
INSTALL/tool/mips64el/Ventoy2Disk.gtk3
INSTALL/tool/x86_64/Ventoy2Disk.gtk2
INSTALL/tool/x86_64/Ventoy2Disk.gtk3
LinuxGUI/Ventoy2Disk/GTK/ventoy_gtk.c
LinuxGUI/Ventoy2Disk/main_gtk.c

index 9ab248e4ec5aa1b1bd4cb916c4b8f995fb03259d..c513b25a17212a6b2611e005f6f15a9a6ed2aacf 100644 (file)
Binary files a/INSTALL/tool/aarch64/Ventoy2Disk.gtk3 and b/INSTALL/tool/aarch64/Ventoy2Disk.gtk3 differ
index 32f4e9d817dd5c738ff7209f40a01187c786b6bb..16a87d4965507fc21f29ec3b94f27ff1ad6054c7 100644 (file)
Binary files a/INSTALL/tool/i386/Ventoy2Disk.gtk2 and b/INSTALL/tool/i386/Ventoy2Disk.gtk2 differ
index 1a1ba58e93e3eaaf83b1e048a3484d7aa51d0e7c..49d18beef1e2d491e51e548aa2a58c0fe539dc81 100644 (file)
Binary files a/INSTALL/tool/i386/Ventoy2Disk.gtk3 and b/INSTALL/tool/i386/Ventoy2Disk.gtk3 differ
index c4109a450c1109b540ecc5c46b301b3a17a4a3b1..f8e32876cd6d5bc0687f2658a9e717a605d4b17b 100644 (file)
Binary files a/INSTALL/tool/mips64el/Ventoy2Disk.gtk3 and b/INSTALL/tool/mips64el/Ventoy2Disk.gtk3 differ
index ff9cc6b086e06c515aea5d98c415f2488128cacd..371f1e34012164a88a9b70fd8e57d9dc14421f8d 100644 (file)
Binary files a/INSTALL/tool/x86_64/Ventoy2Disk.gtk2 and b/INSTALL/tool/x86_64/Ventoy2Disk.gtk2 differ
index 38ca766be4f8d1dc67f4b4bd0f0ac08ee660e96a..493e8aa0892f4251519275668e5ba8b18eeda470 100644 (file)
Binary files a/INSTALL/tool/x86_64/Ventoy2Disk.gtk3 and b/INSTALL/tool/x86_64/Ventoy2Disk.gtk3 differ
index 8a97b2d55e1418e7c6e298401e8689dc4a1a1983..b86d4fbc9acf8d840586fe6672b39a71ca55f19c 100644 (file)
@@ -202,8 +202,6 @@ void on_secure_boot_toggled(GtkMenuItem *menuItem, gpointer data)
 {
     g_secure_boot_support = 1 - g_secure_boot_support;
 
-vlog("on_secure_boot_toggled %d\n",g_secure_boot_support );
-
     if (g_secure_boot_support)
     {
         gtk_widget_show((GtkWidget *)g_image_secure_local);        
index 4f1d8a0989d1427b955bd54b7a02da650b0713d8..a2b96aa5d055fda0675c1ad33a81d842926a8d9b 100644 (file)
@@ -15,6 +15,7 @@
 #include <ventoy_util.h>\r
 #include "ventoy_gtk.h"\r
 \r
+static int g_kiosk_mode = 0;\r
 char g_log_file[PATH_MAX];\r
 char g_ini_file[PATH_MAX];\r
 \r
@@ -130,6 +131,15 @@ int main(int argc, char *argv[])
         return 1;\r
     }\r
 \r
+    for (i = 0; i < argc; i++)\r
+    {\r
+        if (argv[i] && strcmp(argv[i], "--kiosk") == 0)\r
+        {\r
+            g_kiosk_mode = 1;\r
+            break;\r
+        }\r
+    }\r
+    \r
     snprintf(g_log_file, sizeof(g_log_file), "log.txt");\r
     snprintf(g_ini_file, sizeof(g_ini_file), "./Ventoy2Disk.ini");\r
     for (i = 0; i < argc; i++)
@@ -179,12 +189,20 @@ int main(int argc, char *argv[])
         return 1;\r
     }\r
 \r
-    pData = get_refresh_icon_raw_data(&len);\r
-    set_image_from_pixbuf(pBuilder, "image_refresh", pData, len);\r
-    \r
-    pData = get_secure_icon_raw_data(&len);\r
-    set_image_from_pixbuf(pBuilder, "image_secure_local", pData, len);\r
-    set_image_from_pixbuf(pBuilder, "image_secure_dev", pData, len);\r
+    if (g_kiosk_mode)\r
+    {\r
+        gtk_image_set_from_file((GtkImage *)gtk_builder_get_object(pBuilder, "image_refresh"), "/ventoy/refresh.png");        \r
+        gtk_image_set_from_file((GtkImage *)gtk_builder_get_object(pBuilder, "image_secure_local"), "/ventoy/secure.png");        \r
+        gtk_image_set_from_file((GtkImage *)gtk_builder_get_object(pBuilder, "image_secure_dev"), "/ventoy/secure.png");        \r
+    }\r
+    else\r
+    {\r
+        pData = get_refresh_icon_raw_data(&len);\r
+        set_image_from_pixbuf(pBuilder, "image_refresh", pData, len);        \r
+        pData = get_secure_icon_raw_data(&len);\r
+        set_image_from_pixbuf(pBuilder, "image_secure_local", pData, len);\r
+        set_image_from_pixbuf(pBuilder, "image_secure_dev", pData, len);\r
+    }\r
 \r
     pWidget = GTK_WIDGET(gtk_builder_get_object(pBuilder, "window"));\r
     gtk_widget_show_all(pWidget);\r