diff --git a/source/ubinstall-gtk.c b/source/ubinstall-gtk.c index 58b1a49..15168cc 100644 --- a/source/ubinstall-gtk.c +++ b/source/ubinstall-gtk.c @@ -322,7 +322,8 @@ void *on_config_save(void *data){ fclose(file); char *command = save_config_command(yon_char_parsed_to_string(parameters,size," ")); if (system(command)){ - yon_ubl_status_box_spawn(GTK_CONTAINER(widgets->StatusBox),INSTALLATION_ERROR,5,BACKGROUND_IMAGE_FAIL_TYPE); + gtk_notebook_set_current_page(GTK_NOTEBOOK(widgets->Notebook),YON_PAGE_INSTALL_ERROR); + // yon_ubl_status_box_spawn(GTK_CONTAINER(widgets->StatusBox),INSTALLATION_ERROR,5,BACKGROUND_IMAGE_FAIL_TYPE); }; main_config.install_thread=NULL; main_config.install_complete=1; @@ -437,6 +438,7 @@ void on_page_changed(GtkWidget *,GtkWidget *,int page, main_window *widgets){ case YON_PAGE_USERS: gtk_widget_set_sensitive(widgets->NextButton,1); break; + case YON_PAGE_INSTALL_ERROR: case YON_PAGE_COMPLETION:{ gtk_widget_set_sensitive(widgets->BackButton,0); gtk_widget_hide(gtk_widget_get_parent(widgets->PackageInstallationProgress)); @@ -449,10 +451,6 @@ 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); - - // pthread_t tid; - // pthread_create(&tid,NULL,on_config_save,widgets); } break; case YON_PAGE_INSTALL_COMMON: diff --git a/source/ubinstall-gtk.h b/source/ubinstall-gtk.h index b81f2c3..707b82e 100755 --- a/source/ubinstall-gtk.h +++ b/source/ubinstall-gtk.h @@ -150,7 +150,13 @@ enum YON_PAGES { YON_PAGE_COMPLETED, YON_PAGE_INSTALL_COMMON, YON_PAGE_INSTALL_SEPARATE, - YON_PAGE_INSTALL_SAME_PARTITION + YON_PAGE_INSTALL_SAME_PARTITION, + YON_PAGE_INSTALL_OPTIONS, + YON_PAGE_OPTIONS_GRUB_INSTALL, + YON_PAGE_OPTIONS_GRUB_UPDATE, + YON_PAGE_OPTIONS_SEPARATE, + YON_PAGE_OPTIONS_OS_ONLY, + YON_PAGE_INSTALL_ERROR }; typedef struct { diff --git a/ubinstall-gtk.glade b/ubinstall-gtk.glade index e8c9147..877c6dc 100644 --- a/ubinstall-gtk.glade +++ b/ubinstall-gtk.glade @@ -91,26 +91,11 @@ False com.ublinux.libublsettingsui-gtk3.trash-symbolic - - True - False - com.ublinux.libublsettingsui-gtk3.properties-symbolic - - - True - False - com.ublinux.libublsettingsui-gtk3.properties-symbolic - True False com.ublinux.libublsettingsui-gtk3.properties-symbolic - - True - False - com.ublinux.libublsettingsui-gtk3.properties-symbolic - True False @@ -446,7 +431,6 @@ agreement 5 5 left - False True @@ -633,51 +617,95 @@ and help you install UBLinux on your computer - + True - False - vertical - 15 + True - + True - True - False - True - True + False + 5 True False + vertical 5 - - - True - False - /com/ublinux/images/clear_install_disk.png - - - False - True - 0 - - True False vertical - 5 + 15 - + True - False - Installation - True - 0 - - - + True + False + True + True + + + True + False + 5 + + + True + False + /com/ublinux/images/clear_install_disk.png + + + False + True + 0 + + + + + True + False + vertical + 5 + + + True + False + Installation + True + 0 + + + + + + False + True + 0 + + + + + True + False + Deleting all data on the selected disk and then installing the UBLinux system + 0 + + + False + True + 1 + + + + + True + True + 1 + + + + False @@ -686,11 +714,74 @@ and help you install UBLinux on your computer - + True - False - Deleting all data on the selected disk and then installing the UBLinux system - 0 + True + False + True + InstallationRadio + + + True + False + 5 + + + True + False + /com/ublinux/images/near_install_disk.png + + + False + True + 0 + + + + + True + False + vertical + 5 + + + True + False + Installation next to another system + True + 0 + + + + + + False + True + 0 + + + + + True + False + Shrinking a partition and creating a new one for installing UBLinux + 0 + + + False + True + 1 + + + + + True + True + 1 + + + + False @@ -698,329 +789,248 @@ and help you install UBLinux on your computer 1 - - - True - True - 1 - - - - - - - False - True - 0 - - - - - True - True - False - True - InstallationRadio - - - True - False - 5 - - - True - False - /com/ublinux/images/near_install_disk.png - - - False - True - 0 - - - - - True - False - vertical - 5 - + True - False - Installation next to another system - True - 0 - - - + True + False + True + InstallationRadio + + + True + False + 5 + + + True + False + /com/ublinux/images/in_part_install_disk.png + + + False + True + 0 + + + + + True + False + vertical + 5 + + + True + False + Installation on the same partition as another system + True + 0 + + + + + + False + True + 0 + + + + + True + False + Unpacking the UBLinux file system into an existing system + 0 + + + False + True + 1 + + + + + True + True + 1 + + + + False True - 0 + 2 - - True - False - Shrinking a partition and creating a new one for installing UBLinux - 0 + + True + False + True + InstallationRadio + + + True + False + 5 + + + True + False + gtk-missing-image + + + False + True + 0 + + + + + True + False + vertical + 5 + + + True + False + Advanced installation mode + True + 0 + + + + + + False + True + 0 + + + + + True + False + Installing OS files, user data on different partitions, creating RAID, etc. + 0 + + + False + True + 1 + + + + + True + True + 1 + + + + False True - 1 + 3 - - - True - True - 1 - - - - - - - False - True - 1 - - - - - True - True - False - True - InstallationRadio - - - True - False - 5 - - - True - False - /com/ublinux/images/in_part_install_disk.png - - - False - True - 0 - - - - - True - False - vertical - 5 - - - True - False - Installation on the same partition as another system - True - 0 - - - - - - False - True - 0 - - - - - True - False - Unpacking the UBLinux file system into an existing system - 0 - - - False - True - 1 - - - - - True - True - 1 - - - - - - - False - True - 2 - - - - - True - False - True - InstallationRadio - - - True - False - 5 - - - True - False - gtk-missing-image - - - False - True - 0 - - - - - True - False - vertical - 5 - - True - False - Advanced installation mode - True - 0 - - - - - - False - True - 0 - - - - - True - False - Installing OS files, user data on different partitions, creating RAID, etc. - 0 + + True + False + True + InstallationRadio + + + True + False + 5 + + + True + False + gtk-missing-image + + + False + True + 0 + + + + + True + False + vertical + 5 + + + True + False + Recovery + True + 0 + + + + + + False + True + 0 + + + + + True + False + Recovering bootloader, OS files, user data + 0 + + + False + True + 1 + + + + + True + True + 1 + + + + False True - 1 + 4 - - True - True - 1 - - - - - - - False - True - 3 - - - - - True - False - True - InstallationRadio - - - True - False - 5 - - - True - False - gtk-missing-image - False True - 0 - - - - - True - False - vertical - 5 - - - True - False - Recovery - True - 0 - - - - - - False - True - 0 - - - - - True - False - Recovering bootloader, OS files, user data - 0 - - - False - True - 1 - - - - - True - True 1 - - False - True - 4 - - False + True True - 1 + 2 @@ -3834,7 +3844,7 @@ installed. True False - Installation with Linux + Installation on same partition 14 @@ -3848,1613 +3858,588 @@ installed. vertical 5 - + True False - vertical - 5 - - - True - False - Installation parameters - - - - - - - - False - True - 0 - - + Installation options + + + + + + + + False + True + 0 + + + + + True + True + in - + True False - 5 - - True - False - gtk-missing-image - - - False - True - 0 - - - - + True False vertical - 5 - - - True - False - Installation next to another system - 0 - - - - - - False - True - 0 - - - - - True - False - Shrinking a partition and creating a new one for installing UBLinux - 0 - - - False - True - 1 - - - - - True - True - 1 - - - - - False - True - 1 - - - - - True - False - Attention! The selected partition will be modified: the size will be reduced. In the resulting free space, a partition will be created into which the UBLinux OS will be -installed. - True - 0 - 0 - - - False - True - 2 - - - - - False - True - 0 - - - - - True - False - vertical - 5 - - - True - False - vertical - 5 - - - True - False - 5 - + True False - Select device: - 0 - - - False - True - 0 - - - - - True - True - image2 - - - - False - True - end - 1 - - - - - False - True - 0 - - - - - True - True - in - 128 - - - True - True - DevicesList - 0 - - - Device - - - - - - - - Mark - - - - - - - - Capacity - - - - - + vertical + 5 - - Location + + True + False + 5 - + + True + False + gtk-missing-image + + + False + True + 0 + - - - - - - - False - True - 1 - - - - - False - True - 0 - - - - - True - False - vertical - - - True - False - Choose a section: - 0 - - - False - True - 0 - - - - - True - True - in - 128 - - - True - True - PartitionsList - - - Section - + + True + False + vertical + 5 + + + True + False + Additional installation options + 0 + + + + + + False + True + 0 + + + + + True + False + Separate installation of bootloader, system files, user data, etc. + 0 + + + False + True + 1 + + + + + True + True + 1 + + + False + True + 0 + - - Capacity - - - + + True + False + Attention! The selected OC UBLinux components will be installed +separately into the selected partition. + 0 + + False + True + 1 + - - - Free space - - - - - - - - System - - - - - - - - - - False - True - 1 - - - - - False - True - 1 - - - - - True - False - 5 - - - True - False - Specify the size of the new partition for UBLinux OS: - - - False - True - 0 - - - - - True - True - 0 - adjustment1 - - - False - True - 1 - - - - - True - False - - Mb - Gb - Tb - - - - False - True - 2 - - - - - False - True - 2 - - - - - False - True - 1 - - - - - 15 - - - - - True - False - Installation with Windows - - - 15 - False - - - - - True - False - vertical - 5 - - - True - False - Installation options - - - - - - - - False - True - 0 - - - - - True - False - vertical - 5 - - - True - False - 5 - - - True - False - gtk-missing-image - - - False - True - 0 - - - - - True - False - vertical - 5 - - - True - False - Additional installation options - 0 - - - - - - False - True - 0 - - - - - True - False - Separate installation of bootloader, system files, user data, etc. - 0 - - - False - True - 1 - - - - - True - True - 1 - - - - - False - True - 0 - - - - - True - False - Attention! The selected OC UBLinux components will be installed -separately into the selected partition. - 0 - - - False - True - 1 - - - - - False - True - 1 - - - - - True - False - vertical - 5 - - - True - True - False - True - True - - - True - False - 5 - - - True - False - gtk-missing-image - - - False - True - 0 - - - - - True - False - vertical - 5 - - - True - False - Installing GRUB - 0 - - - - - - - False - True - 0 - - - - - True - False - Install the GRUB bootloader - 0 - - - False - True - 1 - - - - - True - True - 1 - - - - - - - False - True - 0 - - - - - True - True - False - True - True - - - True - False - 5 - - - True - False - gtk-missing-image - - - False - True - 0 - - - - - True - False - vertical - 5 - - - True - False - GRUB update - 0 - - - - - - - False - True - 0 - - - - - True - False - Update (reinstall) the GRUB bootloader - 0 - - - False - True - 1 - - - - - True - True - 1 - - - - - - - False - True - 1 - - - - - True - True - False - True - True - - - True - False - 5 - - - True - False - gtk-missing-image - - - False - True - 0 - - - - - True - False - vertical - 5 - - - True - False - Separate installation - 0 - - - - - - - False - True - 0 - - - - - True - False - Installing OS components and user data on different disk partitions - 0 - - - False - True - 1 - - - - - True - True - 1 - - - - - - - False - True - 2 - - - - - True - True - False - True - True - - - True - False - 5 - - - True - False - gtk-missing-image - - - False - True - 0 - - - - - True - False - vertical - 5 - - - True - False - OS only - 0 - - - - - - - False - True - 0 - - - - - True - False - Installing only OS components without user data - 0 - - - False - True - 1 - - - - - True - True - 1 - - - - - - - False - True - 3 - - - - - True - True - False - True - True - - - True - False - 5 - - - True - False - gtk-missing-image - - - False - True - 0 - - - - - True - False - vertical - 5 - - - True - False - User data only - 0 - - - - - - - False - True - 0 - - - - - True - False - Installing only user data without OS components - 0 - - - False - True - 1 - - - - - True - True - 1 - - - - - - - False - True - 4 - - - - - False - True - 2 - - - - - 16 - - - - - True - False - Install with more options - - - 16 - False - - - - - True - False - vertical - 5 - - - True - False - Installation parameters - - - - - - - - False - True - 0 - - - - - True - False - vertical - 5 - - - True - False - 5 - 10 - 5 - - - True - False - gtk-missing-image - - - False - True - 0 - - - - - True - False - vertical - 5 - - - True - False - Installing GRUB - 0 - - - - - - - False - True - 0 - - - - - True - False - Install the GRUB bootloader - 0 - - - False - True - 1 - - - - - True - True - 1 - - - - - False - True - 0 - - - - - True - False - Choose device: - 0 - - - False - True - 1 - - - - - True - True - in - 128 - - - True - True - DevicesList - 0 - - - Device - - - - - - - - Mark - - - - - - - - Capacity - - - - - - - - Location - - - - - - - - - - False - True - 2 - - - - - False - True - 1 - - - - - 17 - - - - - True - False - GRUB install - - - 17 - False - - - - - True - False - vertical - 5 - - - True - False - Installation parameters - - - - - - - - False - True - 0 - - - - - True - False - vertical - 5 - - - True - False - 5 - 10 - 5 - - - True - False - gtk-missing-image - - - False - True - 0 - - - - - True - False - vertical - 5 - - - True - False - GRUB update - 0 - - - - - - - False - True - 0 - - - - - True - False - Update (reinstall) the GRUB bootloader - 0 - - - False - True - 1 - - - - - True - True - 1 - - - - - False - True - 0 - - - - - True - False - Choose device: - 0 - - - False - True - 1 - - - - - True - True - in - 128 - - - True - True - DevicesList - 0 - - - Device - - - - - - - - Mark - - - - - - - - Capacity - - - - - - - - Location - - - - - - - - - - False - True - 2 - - - - - False - True - 1 - - - - - 18 - - - - - True - False - GRUB update - - - 18 - False - - - - - True - False - vertical - 5 - - - True - False - vertical - 5 - - - True - False - Installation parameters - - - - - - - - False - True - 0 - - - - - True - False - 5 - 10 - 5 - - - True - False - gtk-missing-image - - - False - True - 0 - - - - - True - False - vertical - 5 - - - True - False - Separate installation - 0 - - - - - - - False - True - 0 - - - - - True - False - Installing OS components and user data on different disk partitions - 0 - - - False - True - 1 - - - - - True - True - 1 - - - - - False - True - 1 - - - - - True - False - Attention! The UBLinux OS will be installed on the selected partition with Linux OS already installed. All user data will be saved. - True - 0 - 0 - - - False - True - 2 - - - - - False - True - 0 - - - - - True - False - vertical - 5 - - - True - False - vertical - 5 - - - True - False - 5 - - - True - False - Select device: - 0 - - - False - True - 0 - - - - - True - True - True - image3 - False True - end 1 - - - False - True - 0 - - - - - True - True - in - 128 - + True - True - DevicesList - 0 - - - Device - - - - - - - - Mark - - - - - - - - Capacity - - - - - + False + vertical + 5 - - Location + + True + True + False + True + True - + + True + False + 5 + + + True + False + gtk-missing-image + + + False + True + 0 + + + + + True + False + vertical + 5 + + + True + False + Installing GRUB + 0 + + + + + + + False + True + 0 + + + + + True + False + Install the GRUB bootloader + 0 + + + False + True + 1 + + + + + True + True + 1 + + + + + False + True + 0 + - - - - - False - True - 1 - - - - - False - True - 0 - - - - - True - False - vertical - - - True - False - Choose a section: - 0 - - - False - True - 0 - - - - - True - True - in - 128 - - - True - True - PartitionsList - - Section + + True + True + False + True + True - + + True + False + 5 + + + True + False + gtk-missing-image + + + False + True + 0 + + + + + True + False + vertical + 5 + + + True + False + GRUB update + 0 + + + + + + + False + True + 0 + + + + + True + False + Update (reinstall) the GRUB bootloader + 0 + + + False + True + 1 + + + + + True + True + 1 + + + + + False + True + 1 + - - Capacity + + True + True + False + True + True - + + True + False + 5 + + + True + False + gtk-missing-image + + + False + True + 0 + + + + + True + False + vertical + 5 + + + True + False + Separate installation + 0 + + + + + + + False + True + 0 + + + + + True + False + Installing OS components and user data on different disk partitions + 0 + + + False + True + 1 + + + + + True + True + 1 + + + + + False + True + 2 + - - Free space + + True + True + False + True + True - + + True + False + 5 + + + True + False + gtk-missing-image + + + False + True + 0 + + + + + True + False + vertical + 5 + + + True + False + OS only + 0 + + + + + + + False + True + 0 + + + + + True + False + Installing only OS components without user data + 0 + + + False + True + 1 + + + + + True + True + 1 + + + + + False + True + 3 + - - System + + True + True + False + True + True - + + True + False + 5 + + + True + False + gtk-missing-image + + + False + True + 0 + + + + + True + False + vertical + 5 + + + True + False + User data only + 0 + + + + + + + False + True + 0 + + + + + True + False + Installing only user data without OS components + 0 + + + False + True + 1 + + + + + True + True + 1 + + + + + False + True + 4 + + + False + True + 2 + - - False - True - 1 - - - False - True - 1 - + + True + True + 3 + + + + + 15 + + + + + True + False + Install with more options + + + 15 + False + + + + + True + False + vertical + 5 + + + True + False + Installation parameters + + + + + + False True - 1 + 0 + + + - 19 + 16 True False - Separate installation + GRUB install - 19 + 16 False @@ -5465,112 +4450,102 @@ separately into the selected partition. vertical 5 - + True False - vertical - 5 - - - True - False - Installation parameters - - - - - - - - False - True - 0 - - - - - True - False - 5 - 10 - 5 - - - True - False - gtk-missing-image - - - False - True - 0 - - - - - True - False - vertical - 5 - - - True - False - OS only - 0 - - - - - - - False - True - 0 - - - - - True - False - Installing only OS components without user data - 0 - - - False - True - 1 - - - - - True - True - 1 - - - - - False - True - 1 - - - - - True - False - Attention! The UBLinux OS will be installed on the selected partition with Linux OS already installed. All user data will be saved. - True - 0 - 0 - - - False - True - 2 - - + Installation parameters + + + + + + + + False + True + 0 + + + + + + + + + + + 17 + + + + + True + False + GRUB update + + + 17 + False + + + + + True + False + vertical + 5 + + + True + False + Installation parameters + + + + + + + + False + True + 0 + + + + + + + + 18 + + + + + True + False + Separate installation + + + 18 + False + + + + + True + False + vertical + 5 + + + True + False + Installation parameters + + + + + False @@ -5579,196 +4554,51 @@ separately into the selected partition. - + + + + + 19 + + + + + True + False + OS only + + + 19 + False + + + + + True + False + vertical + 5 + + True False - vertical - 5 - - - True - False - vertical - 5 - - - True - False - 5 - - - True - False - Select device: - 0 - - - False - True - 0 - - - - - True - True - True - image4 - - - - False - True - end - 1 - - - - - False - True - 0 - - - - - True - True - in - 128 - - - True - True - DevicesList - 0 - - - Device - - - - - - - - Mark - - - - - - - - Capacity - - - - - - - - Location - - - - - - - - - - False - True - 1 - - - - - False - True - 0 - - - - - True - False - vertical - - - True - False - Choose a section: - 0 - - - False - True - 0 - - - - - True - True - in - 128 - - - True - True - PartitionsList - - - Section - - - - - - - - Capacity - - - - - - - - Free space - - - - - - - - System - - - - - - - - - - False - True - 1 - - - - - False - True - 1 - - + Installation error + + + + + + + + + False + True + 0 + + + + + False False @@ -5776,6 +4606,41 @@ separately into the selected partition. 1 + + + True + False + end + Error + + + + + + + True + True + 2 + + + + + True + False + start + Error has occured while installation process + center + True + + + + + + True + True + 3 + + 20 @@ -5785,7 +4650,7 @@ separately into the selected partition. True False - OS only + Installation error 20