diff --git a/icons/emblems/com.ublinux.ubinstall-gtk.configure-complete.svg b/icons/emblems/com.ublinux.ubinstall-gtk.configure-complete.svg new file mode 100644 index 0000000..0dfb650 --- /dev/null +++ b/icons/emblems/com.ublinux.ubinstall-gtk.configure-complete.svg @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/icons/emblems/com.ublinux.ubinstall-gtk.install-complete.svg b/icons/emblems/com.ublinux.ubinstall-gtk.install-complete.svg new file mode 100644 index 0000000..f7b2864 --- /dev/null +++ b/icons/emblems/com.ublinux.ubinstall-gtk.install-complete.svg @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/icons/emblems/com.ublinux.ubinstall-gtk.install-error.svg b/icons/emblems/com.ublinux.ubinstall-gtk.install-error.svg new file mode 100644 index 0000000..c676eeb --- /dev/null +++ b/icons/emblems/com.ublinux.ubinstall-gtk.install-error.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + diff --git a/icons/emblems/com.ublinux.ubinstall-gtk.recovery-complete.svg b/icons/emblems/com.ublinux.ubinstall-gtk.recovery-complete.svg new file mode 100644 index 0000000..6931c68 --- /dev/null +++ b/icons/emblems/com.ublinux.ubinstall-gtk.recovery-complete.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + diff --git a/icons/emblems/com.ublinux.ubinstall-gtk.settings-complete.svg b/icons/emblems/com.ublinux.ubinstall-gtk.settings-complete.svg new file mode 100644 index 0000000..47e38d9 --- /dev/null +++ b/icons/emblems/com.ublinux.ubinstall-gtk.settings-complete.svg @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/source/ubinstall-gtk-bootloader.c b/source/ubinstall-gtk-bootloader.c index c780787..0c664e5 100644 --- a/source/ubinstall-gtk-bootloader.c +++ b/source/ubinstall-gtk-bootloader.c @@ -495,4 +495,16 @@ void yon_bootloader_init(main_window *widgets){ } yon_char_parsed_free(admins_parsed,admins_size); } +} + +void on_bootloader_selected(GtkTreeView *,main_window *widgets){ + GtkTreeModel *model = NULL; + GtkTreeIter iter; + if (gtk_tree_selection_get_selected(gtk_tree_view_get_selection(GTK_TREE_VIEW(widgets->BootloadUserTree)),&model,&iter)){ + gtk_widget_set_sensitive(widgets->BootloadUserRemoveButton,1); + gtk_widget_set_sensitive(widgets->BootloadUserEditButton,1); + } else { + gtk_widget_set_sensitive(widgets->BootloadUserRemoveButton,0); + gtk_widget_set_sensitive(widgets->BootloadUserEditButton,0); + } } \ No newline at end of file diff --git a/source/ubinstall-gtk-configuration-mode.c b/source/ubinstall-gtk-configuration-mode.c index 4d02b01..cc3c2cc 100644 --- a/source/ubinstall-gtk-configuration-mode.c +++ b/source/ubinstall-gtk-configuration-mode.c @@ -83,6 +83,24 @@ void on_configuration_exit(GtkWidget *,configuration_window *window){ } } +void yon_config_mode_start(main_window *widgets){ + if (main_config.config_save_path){ + yon_ubl_status_box_spawn(GTK_CONTAINER(widgets->StatusBox),CONFIGURATION_MODE_STATUS_LABEL,0,BACKGROUND_IMAGE_INFO_TYPE); + yon_ubl_status_box_spawn(GTK_CONTAINER(widgets->StatusBox2),CONFIG_PATH_LABEL(main_config.config_save_path),0,BACKGROUND_IMAGE_INFO_TYPE); + GList *revealerlist = gtk_container_get_children(GTK_CONTAINER(widgets->StatusBox2)); + GList *list = gtk_container_get_children(GTK_CONTAINER(g_list_nth_data(revealerlist,0))); + GtkWidget *box = GTK_WIDGET(list->data); + + g_list_free(revealerlist); + g_list_free(list); + + gtk_style_context_remove_class(gtk_widget_get_style_context(box),"boxInfoMessOK"); + gtk_style_context_add_class(gtk_widget_get_style_context(box),"boxInfoMessGray"); + main_config.configure_mode = 1; + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widgets->ConfigurationModeCheck),1); + } +} + void on_configuration_mode_switch(GtkWidget *,main_window *widgets){ int active = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widgets->ConfigurationModeCheck)); if (!active){ @@ -113,21 +131,7 @@ void on_configuration_mode_switch(GtkWidget *,main_window *widgets){ } gtk_widget_show(window->Window); gtk_main(); - - if (main_config.config_save_path){ - yon_ubl_status_box_spawn(GTK_CONTAINER(widgets->StatusBox),CONFIGURATION_MODE_STATUS_LABEL,0,BACKGROUND_IMAGE_INFO_TYPE); - yon_ubl_status_box_spawn(GTK_CONTAINER(widgets->StatusBox2),CONFIG_PATH_LABEL(main_config.config_save_path),0,BACKGROUND_IMAGE_INFO_TYPE); - GList *revealerlist = gtk_container_get_children(GTK_CONTAINER(widgets->StatusBox2)); - GList *list = gtk_container_get_children(GTK_CONTAINER(g_list_nth_data(revealerlist,0))); - GtkWidget *box = GTK_WIDGET(list->data); - - g_list_free(revealerlist); - g_list_free(list); - - gtk_style_context_remove_class(gtk_widget_get_style_context(box),"boxInfoMessOK"); - gtk_style_context_add_class(gtk_widget_get_style_context(box),"boxInfoMessGray"); - main_config.configure_mode = 1; - } + yon_config_mode_start(widgets); gtk_widget_destroy(window->Window); } else { diff --git a/source/ubinstall-gtk-network.c b/source/ubinstall-gtk-network.c index 49702b1..4eb212f 100644 --- a/source/ubinstall-gtk-network.c +++ b/source/ubinstall-gtk-network.c @@ -360,6 +360,10 @@ void yon_network_init(main_window *widgets){ gtk_entry_set_text(GTK_ENTRY(widgets->NetworkDomainAdminEntry),domain_admin); gtk_entry_set_text(GTK_ENTRY(widgets->NetworkDomainPasswordEntry),domain_password); } + } else { + gtk_entry_set_text(GTK_ENTRY(widgets->NetworkDomainNameEntry),""); + gtk_entry_set_text(GTK_ENTRY(widgets->NetworkDomainPasswordEntry),""); + gtk_entry_set_text(GTK_ENTRY(widgets->NetworkDomainAdminEntry),""); } { gtk_combo_box_text_remove_all(GTK_COMBO_BOX_TEXT(widgets->NetworkNTPCombo)); @@ -395,13 +399,17 @@ void yon_network_init(main_window *widgets){ } gtk_entry_set_text(GTK_ENTRY(widgets->HotnameEntry),""); if (!yon_char_is_empty(hostname)){ - gtk_switch_set_active(GTK_SWITCH(widgets->HostnameSensitiveSwitch),1); if (!strcmp(hostname,"auto")){ + gtk_switch_set_active(GTK_SWITCH(widgets->HostnameSensitiveSwitch),1); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widgets->AutoHostnameCheck),1); } else { + gtk_switch_set_active(GTK_SWITCH(widgets->HostnameSensitiveSwitch),0); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widgets->AutoHostnameCheck),0); gtk_entry_set_text(GTK_ENTRY(widgets->HotnameEntry),hostname); } + } else { + gtk_switch_set_active(GTK_SWITCH(widgets->HostnameSensitiveSwitch),0); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widgets->AutoHostnameCheck),0); } config_str parameters = yon_config_get_all_by_key(NETWORK_parameter_search,&size); for (int i=0;iBootloadUserEditButton),"clicked",G_CALLBACK(on_bootloader_user_edit),widgets); g_signal_connect(G_OBJECT(widgets->BootloadAdminCheckCell),"toggled",G_CALLBACK(on_bootloader_admin_toggled),widgets); g_signal_connect(G_OBJECT(widgets->BootloadUserRemoveButton),"clicked",G_CALLBACK(on_bootloader_user_remove),widgets); + g_signal_connect(G_OBJECT(widgets->BootloadUserTree),"cursor-changed",G_CALLBACK(on_bootloader_selected),widgets); g_signal_connect(G_OBJECT(widgets->BootloadTimerSwitch),"state-set",G_CALLBACK(yon_gtk_widget_set_sensitive_from_switch),widgets->BootloadTimerSpin); @@ -982,6 +983,7 @@ void yon_main_window_create(main_window *widgets){ if (!yon_configuration_path_check(main_config.config_save_path)){ exit (1); } + yon_config_mode_start(widgets); } { char *command = yon_config_parameter_prepare_command(part_size_parameter_command,"default",NULL,NULL); diff --git a/source/ubinstall-gtk.h b/source/ubinstall-gtk.h index 4c02b9a..6f7b099 100755 --- a/source/ubinstall-gtk.h +++ b/source/ubinstall-gtk.h @@ -1624,4 +1624,6 @@ void yon_gtk_label_set_font(GtkLabel *label); void on_kernel_info(GtkWidget *, char *link, kernel_row *row); gboolean on_os_components_info(GtkWidget *, GdkEventButton *, os_row *row); void on_software_info(GtkWidget*, main_window *widgets); -void yon_packages_remove_empty_groups(main_window *widgets); \ No newline at end of file +void yon_packages_remove_empty_groups(main_window *widgets); +void yon_config_mode_start(main_window *widgets); +void on_bootloader_selected(GtkTreeView *,main_window *widgets); \ No newline at end of file diff --git a/ubinstall-gtk-configuration-mode.glade b/ubinstall-gtk-configuration-mode.glade index 676b330..fa67475 100644 --- a/ubinstall-gtk-configuration-mode.glade +++ b/ubinstall-gtk-configuration-mode.glade @@ -47,7 +47,7 @@ True False start - com.ublinux.ubinstall-gtk + com.ublinux.ubinstall-gtk.configuration 6 diff --git a/ubinstall-gtk-service-window.glade b/ubinstall-gtk-service-window.glade index 007c3f2..e2fa23d 100644 --- a/ubinstall-gtk-service-window.glade +++ b/ubinstall-gtk-service-window.glade @@ -18,6 +18,7 @@ 500 167 False + False True diff --git a/ubinstall-gtk.glade b/ubinstall-gtk.glade index c4193a7..fe4b481 100644 --- a/ubinstall-gtk.glade +++ b/ubinstall-gtk.glade @@ -976,8 +976,7 @@ agreement True False - 10 - 10 + 5 5 @@ -1242,10 +1241,8 @@ agreement True False - 10 - 10 - 10 - 10 + 5 + 5 5 @@ -1415,10 +1412,8 @@ agreement True False - 10 - 10 - 10 - 10 + 5 + 5 5 @@ -1974,10 +1969,8 @@ agreement True False - 10 - 10 - 10 - 10 + 5 + 5 5 @@ -2231,6 +2224,20 @@ Select a different installation sources. False vertical 5 + + + True + False + end + 256 + com.ublinux.ubinstall-gtk.configure-complete + + + True + True + 0 + + True @@ -2244,7 +2251,7 @@ Select a different installation sources. - True + False True 1 @@ -2288,6 +2295,20 @@ Select a different installation sources. False vertical 5 + + + True + False + end + 256 + com.ublinux.ubinstall-gtk.recovery-complete + + + True + True + 0 + + True @@ -2301,7 +2322,7 @@ Select a different installation sources. - True + False True 1 @@ -2355,10 +2376,10 @@ Select a different installation sources. True False - 10 - 10 - 10 - 10 + 5 + 5 + 5 + 5 5 @@ -2678,6 +2699,7 @@ Select a different installation sources. 5 + 70 True False vertical @@ -2686,10 +2708,10 @@ Select a different installation sources. True False - 10 - 10 - 10 - 10 + 5 + 5 + 5 + 5 5 @@ -3068,6 +3090,7 @@ Select a different installation sources. 5 + 70 True False vertical @@ -3076,10 +3099,8 @@ Select a different installation sources. True False - 10 - 10 - 10 - 10 + 5 + 5 5 @@ -3300,10 +3321,8 @@ Select a different installation sources. True False - 10 - 10 - 10 - 10 + 5 + 5 5 @@ -3622,10 +3641,8 @@ Select a different installation sources. True False - 10 - 10 - 10 - 10 + 5 + 5 5 @@ -4185,10 +4202,8 @@ Select a different installation sources. True False - 10 - 10 - 10 - 10 + 5 + 5 5 @@ -4468,10 +4483,8 @@ Select a different installation sources. True False - 10 - 10 - 10 - 10 + 5 + 5 5 @@ -4772,10 +4785,8 @@ Select a different installation sources. True False - 10 - 10 - 10 - 10 + 5 + 5 5 @@ -5363,10 +5374,8 @@ Select a different installation sources. True False - 10 - 10 - 10 - 10 + 5 + 5 5 @@ -5781,10 +5790,8 @@ Select a different installation sources. True False - 10 - 10 - 10 - 10 + 5 + 5 5 @@ -6056,10 +6063,8 @@ Select a different installation sources. True False - 10 - 10 - 10 - 10 + 5 + 5 5 @@ -6332,10 +6337,8 @@ Select a different installation sources. True False - 10 - 10 - 10 - 10 + 5 + 5 5 @@ -6677,6 +6680,7 @@ Select a different installation sources. True + False True True Edit user @@ -6694,6 +6698,7 @@ Select a different installation sources. True + False True True image18 @@ -6771,10 +6776,8 @@ Select a different installation sources. True False - 10 - 10 - 10 - 10 + 5 + 5 5 @@ -7252,10 +7255,8 @@ Select a different installation sources. True False - 10 - 10 - 10 - 10 + 5 + 5 5 @@ -7487,10 +7488,8 @@ Select a different installation sources. True False - 10 - 10 - 10 - 10 + 5 + 5 5 @@ -7746,6 +7745,20 @@ Select a different installation sources. False vertical 5 + + + True + False + end + 256 + com.ublinux.ubinstall-gtk.install-complete + + + True + True + 0 + + True @@ -7758,7 +7771,7 @@ Select a different installation sources. - True + False True 3 @@ -7805,6 +7818,20 @@ or continue working in the system Live environment. False vertical 5 + + + True + False + end + 256 + com.ublinux.ubinstall-gtk.install-complete + + + True + True + 0 + + True @@ -7818,7 +7845,7 @@ or continue working in the system Live environment. - True + False True 1 @@ -7862,6 +7889,20 @@ or continue working in the system Live environment. False vertical 5 + + + True + False + end + 256 + com.ublinux.ubinstall-gtk.configure-complete + + + True + True + 0 + + True @@ -7874,7 +7915,7 @@ or continue working in the system Live environment. - True + False True 3 @@ -7919,6 +7960,20 @@ or continue working in the system Live environment. False vertical 5 + + + True + False + end + 256 + com.ublinux.ubinstall-gtk.install-error + + + True + True + 0 + + True @@ -7931,7 +7986,7 @@ or continue working in the system Live environment. - True + False True 3 @@ -7977,38 +8032,64 @@ or continue working in the system Live environment. vertical 5 - - True - False - end - Installer configuration has been finished - - - - - - - True - True - 3 - - - - + True False - start - Choose a save option on the header bar - center - True - - - + center + vertical + + + True + False + 256 + com.ublinux.ubinstall-gtk.configure-complete + + + False + True + 0 + + + + + True + False + end + Installer configuration has been finished + + + + + + + False + True + 1 + + + + + True + False + Choose a save option on the header bar + center + True + 0 + + + + + + True + True + 2 + + True True - 4 + 1 @@ -8033,6 +8114,20 @@ or continue working in the system Live environment. False vertical 5 + + + True + False + end + 256 + com.ublinux.ubinstall-gtk.configure-complete + + + True + True + 0 + + True @@ -8045,7 +8140,7 @@ or continue working in the system Live environment. - True + False True 3 @@ -8114,10 +8209,8 @@ or continue working in the system Live environment. True False - 10 - 10 - 10 - 10 + 5 + 5 5 @@ -8600,10 +8693,8 @@ or continue working in the system Live environment. True False - 10 - 10 - 10 - 10 + 5 + 5 5 @@ -9358,10 +9449,8 @@ or continue working in the system Live environment. True False - 10 - 10 - 10 - 10 + 5 + 5 5 @@ -10049,10 +10138,8 @@ or continue working in the system Live environment. True False - 10 - 10 - 10 - 10 + 5 + 5 5 @@ -11176,10 +11263,8 @@ separately into the selected partition. True False - 10 - 10 - 10 - 10 + 5 + 5 5 @@ -11647,10 +11732,8 @@ separately into the selected partition. True False - 10 - 10 - 10 - 10 + 5 + 5 5 @@ -12106,10 +12189,8 @@ separately into the selected partition. True False - 10 - 10 - 10 - 10 + 5 + 5 5 @@ -12559,10 +12640,8 @@ separately into the selected partition. True False - 10 - 10 - 10 - 10 + 5 + 5 5 @@ -13415,10 +13494,8 @@ separately into the selected partition. True False - 10 - 10 - 10 - 10 + 5 + 5 5