diff --git a/source/ubinstall-gtk.c b/source/ubinstall-gtk.c index 34621c5..c3de631 100644 --- a/source/ubinstall-gtk.c +++ b/source/ubinstall-gtk.c @@ -801,6 +801,7 @@ void on_language_clicked(GtkWidget *, main_window *widgets){ yon_dictionary_add_or_create_if_exists_with_data(dict,"window",window); g_signal_connect(G_OBJECT(window->SaveButton),"clicked",G_CALLBACK(on_language_window_accept),dict); gtk_widget_show(window->MainWindow); + } /**config_init() @@ -1129,6 +1130,13 @@ void on_page_changed(GtkWidget *,GtkWidget *,int page, main_window *widgets){ } } +void *on_install_success(main_window *widgets){ + gtk_label_set_text(GTK_LABEL(widgets->InstallationLabel),""); + gtk_notebook_set_current_page(GTK_NOTEBOOK(widgets->Notebook),YON_PAGE_COMPLETION); + + return NULL; +} + void *on_setup_system_configuration(void *data); void *on_setup_system_configuration(void * data){ main_window *widgets = (main_window*)data; @@ -1157,6 +1165,7 @@ void *on_setup_system_configuration(void * data){ free(command); if (parameter_string) free(parameter_string); } + g_thread_new("success func",(GThreadFunc)on_install_success,widgets); return NULL; } @@ -1678,6 +1687,7 @@ void on_page_navigation_clicked(GtkWidget *self, main_window *widgets){ gtk_notebook_set_current_page(GTK_NOTEBOOK(widgets->Notebook),YON_PAGE_INSTALLATION); } if (gtk_progress_bar_get_fraction(GTK_PROGRESS_BAR(widgets->InstallationProgress))>0.9){ + gtk_label_set_text(GTK_LABEL(widgets->InstallationLabel),CONFIGURATION_LABEL); pthread_t tid; pthread_create(&tid,NULL,on_setup_system_configuration,widgets); yon_debug_output("%s\n","installation ending configuration startup"); @@ -1691,8 +1701,7 @@ 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); - } else { + gtk_notebook_set_current_page(GTK_NOTEBOOK(widgets->Notebook),YON_PAGE_INSTALLATION); printf("still deactivated\n"); gtk_widget_set_sensitive(widgets->CancelInstallButton,0); gtk_widget_set_sensitive(widgets->NextButton,0); diff --git a/source/ubinstall-gtk.h b/source/ubinstall-gtk.h index 8cfba08..372dda6 100755 --- a/source/ubinstall-gtk.h +++ b/source/ubinstall-gtk.h @@ -463,4 +463,6 @@ void on_toggle_button_switch_on(GtkWidget *, GtkToggleButton *toggle); void on_autohostname_sensitiveness_check(GtkWidget *, main_window *widgets); void on_autohostname_check(GtkWidget *, main_window *widgets); -void on_hostname_entry_changed (GtkWidget *, main_window *widgets); \ No newline at end of file +void on_hostname_entry_changed (GtkWidget *, main_window *widgets); + +void *on_install_success(main_window *widgets); \ No newline at end of file diff --git a/source/ubl-strings.h b/source/ubl-strings.h index fb8f6a6..8068786 100644 --- a/source/ubl-strings.h +++ b/source/ubl-strings.h @@ -179,4 +179,6 @@ #define INSTALL_LOG_LABEL _("Installation log") #define ADD_LAYOUT_LABEL _("Add layouts") -#define REMOVE_LAYOUT_LABEL _("Remove layout") \ No newline at end of file +#define REMOVE_LAYOUT_LABEL _("Remove layout") + +#define CONFIGURATION_LABEL _("System configuration...") \ No newline at end of file