Merge pull request 'Added install cancel button' (#75) from YanTheKaller/ubl-settings-kernel:master into master

Reviewed-on: #75

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);

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();
+install_window *yon_install_window_new();
+
+void on_terminal_cancel(GtkWidget *,main_window *widgets);

ubl-settings-kernel.glade

@@ -361,6 +361,19 @@
                                     <property name="position">0</property>
                                   </packing>
                                 </child>
+                                <child>
+                                  <object class="GtkButton" id="CancelButton">
+                                    <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="MoreButton">
                                     <property name="label" translatable="yes">More</property>