From 14a36fa06df5bcd5f609e22afbbbc7d1ca96b1f6 Mon Sep 17 00:00:00 2001
From: Ivan Yarcev <yarcev.id@ublinux.ru>
Date: Mon, 8 Jul 2024 10:59:35 +0600
Subject: [PATCH] Fix for completion page close icon; Fix for progress bars
 padding

---
 source/ubinstall-gtk.c | 5 ++++-
 ubinstall-gtk.glade    | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/source/ubinstall-gtk.c b/source/ubinstall-gtk.c
index ad8b89a..28e062b 100644
--- a/source/ubinstall-gtk.c
+++ b/source/ubinstall-gtk.c
@@ -459,7 +459,7 @@ void on_page_changed(GtkWidget *,GtkWidget *,int page, main_window *widgets){
             gtk_button_set_label(GTK_BUTTON(widgets->NextButton),RESTART_LABEL);
             gtk_button_set_label(GTK_BUTTON(widgets->CancelInstallButton),EXIT_LABEL);
             gtk_image_set_from_icon_name(GTK_IMAGE(gtk_button_get_image(GTK_BUTTON(widgets->NextButton))),"com.ublinux.libublsettingsui-gtk3.sync-symbolic",GTK_ICON_SIZE_BUTTON);
-            gtk_image_set_from_icon_name(GTK_IMAGE(gtk_button_get_image(GTK_BUTTON(widgets->CancelInstallButton))),"com.ublinux.libublsettingsui-gtk3.reset-symbolic",GTK_ICON_SIZE_BUTTON);
+            // gtk_image_set_from_icon_name(GTK_IMAGE(gtk_button_get_image(GTK_BUTTON(widgets->CancelInstallButton))),"com.ublinux.libublsettingsui-gtk3.reset-symbolic",GTK_ICON_SIZE_BUTTON);
             
                 // pthread_t tid;
                 // pthread_create(&tid,NULL,on_config_save,widgets);
@@ -855,6 +855,9 @@ void on_page_navigation_clicked(GtkWidget *self, main_window *widgets){
         } break;
         case -2: { // Cancel/repeat
             switch (page){
+                case YON_PAGE_COMPLETION:{
+                    gtk_main_quit();
+                    }break;
                 default:{
                     gtk_notebook_set_current_page(GTK_NOTEBOOK(widgets->Notebook),0);
                 }
diff --git a/ubinstall-gtk.glade b/ubinstall-gtk.glade
index 217046e..399d6ee 100644
--- a/ubinstall-gtk.glade
+++ b/ubinstall-gtk.glade
@@ -434,6 +434,7 @@ agreement</property>
               <object class="GtkBox">
                 <property name="visible">True</property>
                 <property name="can-focus">False</property>
+                <property name="margin-end">5</property>
                 <property name="margin-bottom">5</property>
                 <property name="orientation">vertical</property>
                 <child>