From c17ffc5d4ad2eb08e58fc89d9b26abe62e770f2d Mon Sep 17 00:00:00 2001 From: Ivan Dmitrievich Yartsev Date: Thu, 19 Mar 2026 15:45:48 +0600 Subject: [PATCH] On sections page cancel button replaced with exit button --- source/ubinstall-gtk-page-switch.c | 11 +++++++---- source/ubinstall-gtk.h | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/source/ubinstall-gtk-page-switch.c b/source/ubinstall-gtk-page-switch.c index 64ba4b9..c579673 100644 --- a/source/ubinstall-gtk-page-switch.c +++ b/source/ubinstall-gtk-page-switch.c @@ -53,7 +53,7 @@ enum YON_PAGES yon_page_get_next(main_window *widgets, enum YON_PAGES page){ return -1; } -enum YON_PAGES yon_page_get_prev(enum YON_PAGES page){ +enum YON_PAGES yon_page_get_prev(main_window *,enum YON_PAGES page){ switch (page){ case YON_PAGE_WELCOME: return YON_PAGE_WELCOME; break; case YON_PAGE_LICENCE: return YON_PAGE_WELCOME; break; @@ -92,7 +92,6 @@ enum YON_PAGES yon_page_get_prev(enum YON_PAGES page){ } break; case YON_PAGE_INSTALLATION_BEGIN: return YON_PAGE_OS_COMPONENTS; break; case YON_PAGE_SOFTWARE: return YON_PAGE_CONFIG_HUB; break; - case YON_PAGE_CONFIG_HUB: return YON_PAGE_CONFIG_HUB; break; case YON_PAGE_KERNEL: return YON_PAGE_CONFIG_HUB; break; case YON_PAGE_KERNEL_ADDON: return YON_PAGE_CONFIG_HUB; break; case YON_PAGE_PACMAN_SOFTWARE: return YON_PAGE_CONFIG_HUB; break; @@ -177,10 +176,11 @@ void yon_navigation_buttons_set_sensetiveness(main_window *widgets){ break; case YON_PAGE_SECTIONS: gtk_widget_show(widgets->SourceButton); - gtk_widget_show(widgets->BackButton); + gtk_widget_show(widgets->BackButton); gtk_widget_set_sensitive(widgets->BackButton,1); gtk_widget_set_sensitive(widgets->NextButton,1); gtk_widget_set_sensitive(widgets->CancelInstallButton,1); + gtk_button_set_label(GTK_BUTTON(widgets->CancelInstallButton),EXIT_LABEL); if (!yon_char_is_empty(config(AUTOINSTALL_TYPE_INSTALL))&&!main_config.configure_mode){ gtk_widget_show(widgets->StartScenarioButton); } else { @@ -507,7 +507,7 @@ void on_page_next_clicked(GtkWidget *, main_window *widgets){ void on_page_prev_clicked(GtkWidget *, main_window *widgets){ enum YON_PAGES page = gtk_notebook_get_current_page(GTK_NOTEBOOK(widgets->Notebook)); - page = yon_page_get_prev(page); + page = yon_page_get_prev(widgets,page); if ((int)page!=-1){ gtk_notebook_set_current_page(GTK_NOTEBOOK(widgets->Notebook),page); } @@ -529,6 +529,9 @@ void on_page_cancel_clicked(GtkWidget *, main_window *widgets){ gtk_main_quit(); break; + case YON_PAGE_SECTIONS: + on_yon_exit(NULL,NULL,widgets); + break; default: { if (main_config.install_thread){ dialog_confirmation_data *data = yon_confirmation_dialog_data_new(); diff --git a/source/ubinstall-gtk.h b/source/ubinstall-gtk.h index 107d78f..af6e80e 100755 --- a/source/ubinstall-gtk.h +++ b/source/ubinstall-gtk.h @@ -1281,7 +1281,7 @@ void on_page_prev_clicked(GtkWidget *, main_window *widgets); void yon_load_proceed(YON_CONFIG_TYPE type); void _yon_saving_threaded(char *final_command); enum YON_PAGES yon_page_get_next(main_window *widgets, enum YON_PAGES page); -enum YON_PAGES yon_page_get_prev(enum YON_PAGES page); +enum YON_PAGES yon_page_get_prev(main_window *widgets,enum YON_PAGES page); enum YON_PAGES yon_sections_get_next_page(main_window *widgets); enum YON_PAGES yon_recovery_get_next(main_window *widgets); enum YON_PAGES yon_page_get_current(GtkNotebook *target);