From 77c46ef2a684f4ee67b842db1df4faf6739c66c0 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Wed, 18 Jun 2025 04:32:15 +0000 Subject: [PATCH] Added install cancel button --- source/ubl-settings-kernel.c | 7 +++++++ source/ubl-settings-kernel.h | 5 ++++- ubl-settings-kernel.glade | 13 +++++++++++++ 3 files changed, 24 insertions(+), 1 deletion(-) diff --git a/source/ubl-settings-kernel.c b/source/ubl-settings-kernel.c index 8411b50..50ee7dd 100644 --- a/source/ubl-settings-kernel.c +++ b/source/ubl-settings-kernel.c @@ -1481,6 +1481,11 @@ void on_boot_toggled(GtkWidget *, char *path, main_window *widgets){ } +void on_terminal_cancel(GtkWidget *,main_window *widgets){ + vte_terminal_feed_child(VTE_TERMINAL(widgets->InstallTerminal), "\x03", 1); + vte_terminal_reset(VTE_TERMINAL(widgets->InstallTerminal),1,1); +} + void on_terminal_revealer_open(GtkWidget *, main_window *widgets){ int opened = gtk_widget_get_visible(widgets->TerminalPaned); switch (opened){ @@ -1543,6 +1548,7 @@ void yon_main_window_complete(main_window *widgets){ widgets->AdditionsUpperTree = yon_gtk_builder_get_widget(builder, "AdditionsUpperTree"); widgets->AdditionsTree = yon_gtk_builder_get_widget(builder, "TestListBox"); widgets->MainRevealer = yon_gtk_builder_get_widget(builder, "MainRevealer"); + widgets->CancelButton = yon_gtk_builder_get_widget(builder, "CancelButton"); widgets->MoreButton = yon_gtk_builder_get_widget(builder, "MoreButton"); widgets->InstallationProgress = yon_gtk_builder_get_widget(builder, "InstallationProgress"); widgets->InstallTerminal = yon_gtk_builder_get_widget(builder, "InstallTerminal"); @@ -1564,6 +1570,7 @@ void yon_main_window_complete(main_window *widgets){ g_signal_connect(G_OBJECT(widgets->UpdateButton),"clicked",G_CALLBACK(on_update_clicked),widgets); g_signal_connect(G_OBJECT(widgets->BuildingButton),"clicked",G_CALLBACK(on_building_clicked),widgets); g_signal_connect(G_OBJECT(widgets->MoreButton),"clicked",G_CALLBACK(on_terminal_revealer_open),widgets); + g_signal_connect(G_OBJECT(widgets->CancelButton),"clicked",G_CALLBACK(on_terminal_cancel),widgets); g_signal_connect(G_OBJECT(widgets->InstallTerminal),"child-exited",G_CALLBACK(on_command_execute_success),widgets); g_signal_connect(G_OBJECT(widgets->SaveMenuItem),"activate",G_CALLBACK(on_config_save),widgets); diff --git a/source/ubl-settings-kernel.h b/source/ubl-settings-kernel.h index f4ad367..edadf24 100644 --- a/source/ubl-settings-kernel.h +++ b/source/ubl-settings-kernel.h @@ -129,6 +129,7 @@ typedef struct { GtkWidget *TerminalRevealer; GtkWidget *InstallTerminal; GtkWidget *InstallationProgress; + GtkWidget *CancelButton; GtkWidget *MoreButton; GtkWidget *TerminalPaned; GtkWidget *TerminalScroll; @@ -306,4 +307,6 @@ void on_terminal_revealer_open(GtkWidget *, main_window *widgets); void on_basic_toggled(GtkSwitch *self,int state, install_window *window); info_window *yon_info_window_new(); -install_window *yon_install_window_new(); \ No newline at end of file +install_window *yon_install_window_new(); + +void on_terminal_cancel(GtkWidget *,main_window *widgets); \ No newline at end of file diff --git a/ubl-settings-kernel.glade b/ubl-settings-kernel.glade index b0c8d7d..9db2aea 100644 --- a/ubl-settings-kernel.glade +++ b/ubl-settings-kernel.glade @@ -361,6 +361,19 @@ 0 + + + Cancel + True + True + True + + + False + True + 1 + + More -- 2.35.1