MyFavMirrors
/
Ventoy
mirror of https://github.com/ventoy/Ventoy.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Optimization for GUI LiveCD

This commit is contained in:
longpanda 2021-09-30 13:40:48 +08:00
parent 47797f0285
commit 72d0fd0dd4
8 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
INSTALL/tool/VentoyGTK.glade
View File

@ -344,6 +344,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="has_default">True</property>
<property name="image">image_refresh</property>
</object>
<packing>
@ -540,7 +541,7 @@
<property name="width_request">100</property>
<property name="height_request">40</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
</object>
<packing>

BIN
INSTALL/tool/aarch64/Ventoy2Disk.gtk3
View File

Binary file not shown.

BIN
INSTALL/tool/i386/Ventoy2Disk.gtk2
View File

Binary file not shown.

BIN
INSTALL/tool/i386/Ventoy2Disk.gtk3
View File

Binary file not shown.

BIN
INSTALL/tool/mips64el/Ventoy2Disk.gtk3
View File

Binary file not shown.

BIN
INSTALL/tool/x86_64/Ventoy2Disk.gtk2
View File

Binary file not shown.

BIN
INSTALL/tool/x86_64/Ventoy2Disk.gtk3
View File

Binary file not shown.

25
LinuxGUI/Ventoy2Disk/GTK/ventoy_gtk.c
View File

@ -35,6 +35,7 @@
#include <ventoy_http.h>
#include <gtk/gtk.h>
#include <gdk/gdkkeysyms.h>
#include "ventoy_gtk.h"
int g_secure_boot_support = 0;
@ -494,12 +495,12 @@ void on_clear_ventoy(GtkMenuItem *menuItem, gpointer data)
return;
}
if (GTK_RESPONSE_CANCEL == msgbox(GTK_MESSAGE_WARNING, GTK_BUTTONS_OK_CANCEL, "STR_INSTALL_TIP"))
if (GTK_RESPONSE_OK != msgbox(GTK_MESSAGE_WARNING, GTK_BUTTONS_OK_CANCEL, "STR_INSTALL_TIP"))
{
return;
}
if (GTK_RESPONSE_CANCEL == msgbox(GTK_MESSAGE_WARNING, GTK_BUTTONS_OK_CANCEL, "STR_INSTALL_TIP2"))
if (GTK_RESPONSE_OK != msgbox(GTK_MESSAGE_WARNING, GTK_BUTTONS_OK_CANCEL, "STR_INSTALL_TIP2"))
{
return;
}
@ -687,12 +688,12 @@ void on_button_install_clicked(GtkWidget *widget, gpointer data)
}
}
if (GTK_RESPONSE_CANCEL == msgbox(GTK_MESSAGE_WARNING, GTK_BUTTONS_OK_CANCEL, "STR_INSTALL_TIP"))
if (GTK_RESPONSE_OK != msgbox(GTK_MESSAGE_WARNING, GTK_BUTTONS_OK_CANCEL, "STR_INSTALL_TIP"))
{
return;
}
if (GTK_RESPONSE_CANCEL == msgbox(GTK_MESSAGE_WARNING, GTK_BUTTONS_OK_CANCEL, "STR_INSTALL_TIP2"))
if (GTK_RESPONSE_OK != msgbox(GTK_MESSAGE_WARNING, GTK_BUTTONS_OK_CANCEL, "STR_INSTALL_TIP2"))
{
return;
}
@ -788,7 +789,7 @@ void on_button_update_clicked(GtkWidget *widget, gpointer data)
return;
}
if (GTK_RESPONSE_CANCEL == msgbox(GTK_MESSAGE_INFO, GTK_BUTTONS_OK_CANCEL, "STR_UPDATE_TIP"))
if (GTK_RESPONSE_OK != msgbox(GTK_MESSAGE_INFO, GTK_BUTTONS_OK_CANCEL, "STR_UPDATE_TIP"))
{
return;
}
@ -1020,9 +1021,16 @@ static void init_part_cfg_window(GtkBuilder *pBuilder)
SIGNAL("part_cfg_dlg", "delete_event", on_part_cfg_close);
}
static void add_accelerator(GtkAccelGroup *agMain, void *widget, const char *signal, guint accel_key)
{
gtk_widget_add_accelerator(GTK_WIDGET(widget), signal, agMain, accel_key, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE);
gtk_widget_add_accelerator(GTK_WIDGET(widget), signal, agMain, accel_key, GDK_SHIFT_MASK | GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE);
}
void on_init_window(GtkBuilder *pBuilder)
{
GSList *pGroup = NULL;
GtkAccelGroup *agMain = NULL;
char version[512];
vlog("on_init_window ...\n");
@ -1096,6 +1104,13 @@ void on_init_window(GtkBuilder *pBuilder)
SIGNAL("menu_item_part_cfg", "activate", on_part_config);
SIGNAL("menu_item_clear", "activate", on_clear_ventoy);
agMain = gtk_accel_group_new();
gtk_window_add_accel_group(GTK_WINDOW(g_topWindow), agMain);
add_accelerator(agMain, g_dev_combobox, "popup", GDK_KEY_d);
add_accelerator(agMain, g_install_button, "clicked", GDK_KEY_i);
add_accelerator(agMain, g_update_button, "clicked", GDK_KEY_u);
add_accelerator(agMain, g_refresh_button, "clicked", GDK_KEY_r);
fill_dev_list(NULL);
return;