From ca587223cc4343718537511dd110f09a0eb69e1d Mon Sep 17 00:00:00 2001
From: Ivan Yarcev <yarcev.id@ublinux.ru>
Date: Wed, 18 Jun 2025 04:09:53 +0000
Subject: [PATCH] Added cancel button

---
 source/ubl-settings-video.c       |  6 ++++++
 source/ubl-settings-video.h       |  3 +++
 ubl-settings-video-terminal.glade | 26 +++++++++++++++++++-------
 3 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/source/ubl-settings-video.c b/source/ubl-settings-video.c
index 90d331a..4ae67cf 100644
--- a/source/ubl-settings-video.c
+++ b/source/ubl-settings-video.c
@@ -90,6 +90,10 @@ gboolean on_terminal_check_progress(main_window *widgets){
     return G_SOURCE_CONTINUE;
 }
 
+void on_command_cancel(GtkWidget *,main_window *widgets){
+    gtk_widget_destroy(widgets->TerminalRevealer);
+}
+
 void yon_terminal_start(main_window *widgets, char *usr_command){
     char **command=new_arr(char*,2);
     gchar **envp = g_get_environ();
@@ -103,12 +107,14 @@ void yon_terminal_start(main_window *widgets, char *usr_command){
     widgets->TerminalBox = yon_gtk_builder_get_widget(builder, "TerminalBox");
     widgets->TerminalRevealer = yon_gtk_builder_get_widget(builder, "TerminalRevealer");
     widgets->TerminalMoreRevieler = yon_gtk_builder_get_widget(builder, "TerminalMoreRevieler");
+    widgets->TerminalCancelButton = yon_gtk_builder_get_widget(builder, "TerminalCancelButton");
     widgets->TerminalMoreButton = yon_gtk_builder_get_widget(builder, "TerminalMoreButton");
     widgets->TerminalScroll = yon_gtk_builder_get_widget(builder, "TerminalScroll");
     widgets->TerminalInfoLabel = yon_gtk_builder_get_widget(builder, "TerminalInfoLabel");
 
     widgets->terminal = yon_gtk_builder_get_widget(builder, "TerminalTerminal");
         g_signal_connect(G_OBJECT(widgets->terminal),"child-exited",G_CALLBACK(on_command_execute_success),widgets);
+        g_signal_connect(G_OBJECT(widgets->TerminalCancelButton),"clicked",G_CALLBACK(on_command_cancel),widgets);
 
     gtk_button_set_label(GTK_BUTTON(widgets->TerminalMoreButton),MORE_LABEL);
     vte_terminal_set_size(VTE_TERMINAL(widgets->terminal),10,15);
diff --git a/source/ubl-settings-video.h b/source/ubl-settings-video.h
index f815c83..ecf0041 100644
--- a/source/ubl-settings-video.h
+++ b/source/ubl-settings-video.h
@@ -196,6 +196,7 @@ typedef struct
     GtkWidget *TerminalRevealer;
     GtkWidget *TerminalInfoLabel;
     GtkWidget *TerminalMoreButton;
+    GtkWidget *TerminalCancelButton;
     GtkWidget *TerminalScroll;
     GtkWidget *TerminalMoreRevieler;
     GtkWidget *DriversLoadingOverlay;
@@ -398,4 +399,6 @@ gboolean yon_proprietary_disconnect(main_window *widgets);
 gboolean yon_proprietary_connect(main_window *widgets);
 void on_app_chooser_open(GtkWidget *self, main_window *widgets);
 gpointer yon_driver_info_launch(void *command);
+void on_command_cancel(GtkWidget *,main_window *widgets);
+
 #endif
\ No newline at end of file
diff --git a/ubl-settings-video-terminal.glade b/ubl-settings-video-terminal.glade
index d76c8b6..64f442f 100644
--- a/ubl-settings-video-terminal.glade
+++ b/ubl-settings-video-terminal.glade
@@ -4,11 +4,15 @@
   <requires lib="gtk+" version="3.24"/>
   <requires lib="vte-2.91" version="0.76"/>
   <!-- interface-css-provider-path ubl-settings-video.css -->
+  <object class="GtkAdjustment" id="adjustment1">
+    <property name="upper">300</property>
+    <property name="step-increment">1</property>
+    <property name="page-increment">10</property>
+  </object>
   <object class="GtkRevealer" id="TerminalRevealer">
     <property name="visible">True</property>
     <property name="app-paintable">True</property>
     <property name="can-focus">False</property>
-    <property name="valign">end</property>
     <property name="reveal-child">True</property>
     <child>
       <object class="GtkFrame" id="TerminalFrame">
@@ -50,6 +54,19 @@
                         <property name="position">0</property>
                       </packing>
                     </child>
+                    <child>
+                      <object class="GtkButton" id="TerminalCancelButton">
+                        <property name="label" translatable="yes">Cancel</property>
+                        <property name="visible">True</property>
+                        <property name="can-focus">True</property>
+                        <property name="receives-default">True</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
                     <child>
                       <object class="GtkButton" id="TerminalMoreButton">
                         <property name="label" translatable="yes">More</property>
@@ -61,7 +78,7 @@
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">True</property>
-                        <property name="position">1</property>
+                        <property name="position">2</property>
                       </packing>
                     </child>
                   </object>
@@ -155,9 +172,4 @@
       <class name="borders"/>
     </style>
   </object>
-  <object class="GtkAdjustment" id="adjustment1">
-    <property name="upper">300</property>
-    <property name="step-increment">1</property>
-    <property name="page-increment">10</property>
-  </object>
 </interface>