From 378c4950b5b04c045d2b10a2ce17fc1028e9ffd8 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Mon, 8 Jul 2024 10:06:57 +0600 Subject: [PATCH 1/4] Test fix for package copying progress bar visibility --- source/ubinstall-gtk.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/source/ubinstall-gtk.c b/source/ubinstall-gtk.c index 6e3dec2..207219f 100644 --- a/source/ubinstall-gtk.c +++ b/source/ubinstall-gtk.c @@ -375,8 +375,8 @@ gboolean yon_installation_progress_update(void *data){ gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(widgets->PackageInstallationProgress),0); gtk_label_set_text(GTK_LABEL(widgets->PackageInstallationLabel),""); } else { - gtk_widget_show(widgets->PackageInstallationProgress); - gtk_widget_show(widgets->PackageInstallationLabel); + gtk_widget_show(gtk_widget_get_parent(widgets->PackageInstallationProgress)); + int size; config_str parsed = yon_char_parse(current_copy,&size," "); double fraction = atof(parsed[3])/100; @@ -450,7 +450,7 @@ void on_page_changed(GtkWidget *,GtkWidget *,int page, main_window *widgets){ case YON_PAGE_COMPLETION:{ gtk_widget_set_sensitive(widgets->BackButton,0); gtk_widget_hide(widgets->InstallationProgress); - gtk_widget_hide(widgets->PackageInstallationProgress); + gtk_widget_hide(gtk_widget_get_parent(widgets->PackageInstallationProgress)); gtk_widget_hide(widgets->InstallationLabel); gtk_widget_hide(widgets->PackageInstallationLabel); gtk_widget_set_sensitive(widgets->NextButton,1); From 6ac4184dbee95c4f63054ec6ef376a613a28e6e9 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Mon, 8 Jul 2024 10:18:16 +0600 Subject: [PATCH 2/4] Test fix for package copying progress bar fraction --- source/ubinstall-gtk.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/source/ubinstall-gtk.c b/source/ubinstall-gtk.c index 207219f..ad8b89a 100644 --- a/source/ubinstall-gtk.c +++ b/source/ubinstall-gtk.c @@ -379,8 +379,8 @@ gboolean yon_installation_progress_update(void *data){ int size; config_str parsed = yon_char_parse(current_copy,&size," "); - double fraction = atof(parsed[3])/100; - gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(widgets->PackageInstallationProgress),fraction/100); + double fraction = atof(parsed[2])/100; + gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(widgets->PackageInstallationProgress),fraction); gtk_label_set_text(GTK_LABEL(widgets->PackageInstallationLabel),yon_char_parsed_to_string(parsed,size," ")); yon_char_parsed_free(parsed,size); } @@ -449,7 +449,6 @@ void on_page_changed(GtkWidget *,GtkWidget *,int page, main_window *widgets){ break; case YON_PAGE_COMPLETION:{ gtk_widget_set_sensitive(widgets->BackButton,0); - gtk_widget_hide(widgets->InstallationProgress); gtk_widget_hide(gtk_widget_get_parent(widgets->PackageInstallationProgress)); gtk_widget_hide(widgets->InstallationLabel); gtk_widget_hide(widgets->PackageInstallationLabel); From 14a36fa06df5bcd5f609e22afbbbc7d1ca96b1f6 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Mon, 8 Jul 2024 10:59:35 +0600 Subject: [PATCH 3/4] 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 True False + 5 5 vertical From d864c82fa95bf3d49c4f9f7254a036244ccfb7a7 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Mon, 8 Jul 2024 11:27:35 +0600 Subject: [PATCH 4/4] Fixed unsensitiveness of buttons at completion page --- source/ubinstall-gtk.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/source/ubinstall-gtk.c b/source/ubinstall-gtk.c index 28e062b..bf2cbf8 100644 --- a/source/ubinstall-gtk.c +++ b/source/ubinstall-gtk.c @@ -819,9 +819,11 @@ void on_page_navigation_clicked(GtkWidget *self, main_window *widgets){ yon_debug_output("Install state: %s\n",yon_char_from_int(main_config.install_complete)); if (main_config.install_complete) gtk_notebook_set_current_page(GTK_NOTEBOOK(widgets->Notebook),YON_PAGE_COMPLETION); - gtk_widget_set_sensitive(widgets->CancelInstallButton,0); - gtk_widget_set_sensitive(widgets->NextButton,0); - gtk_widget_set_sensitive(widgets->BackButton,0); + else { + gtk_widget_set_sensitive(widgets->CancelInstallButton,0); + gtk_widget_set_sensitive(widgets->NextButton,0); + gtk_widget_set_sensitive(widgets->BackButton,0); + } }break; case YON_PAGE_INSTALLATION_BEGIN:{ pthread_t tid;