diff --git a/source/ubinstall-gtk.c b/source/ubinstall-gtk.c index 697503e..58b1a49 100644 --- a/source/ubinstall-gtk.c +++ b/source/ubinstall-gtk.c @@ -234,8 +234,8 @@ int yon_image_resize_from_container(GtkImage *target, GdkPixbuf *pixbuf_unscaled int width = gtk_widget_get_allocated_width(gtk_widget_get_parent(gtk_widget_get_parent(GTK_WIDGET(target)))); int height = gtk_widget_get_allocated_height(gtk_widget_get_parent(gtk_widget_get_parent(GTK_WIDGET(target)))); - int newImgWidthDef = (width <= 50) ? width : width - 50; - int newImgHeightDef = (height <= 50) ? height : height - 30; + int newImgWidthDef = (width <= 217) ? width : width - 30; + int newImgHeightDef = (height <= 120) ? height : height - 217; GdkPixbuf *pixBuf = pixbuf_unscaled; int newImgHeight = (int)(gdk_pixbuf_get_height(pixBuf) / ((double) gdk_pixbuf_get_width(pixBuf) / newImgWidthDef)); if (newImgHeight > newImgHeightDef) { diff --git a/ubinstall-gtk.glade b/ubinstall-gtk.glade index 399d6ee..e8c9147 100644 --- a/ubinstall-gtk.glade +++ b/ubinstall-gtk.glade @@ -673,6 +673,7 @@ and help you install UBLinux on your computer True False Installation + True 0 @@ -748,6 +749,7 @@ and help you install UBLinux on your computer True False Installation next to another system + True 0 @@ -823,6 +825,7 @@ and help you install UBLinux on your computer True False Installation on the same partition as another system + True 0 @@ -896,7 +899,8 @@ and help you install UBLinux on your computer True False - Installation next to Windows system + Advanced installation mode + True 0 @@ -912,7 +916,7 @@ and help you install UBLinux on your computer True False - Shrinking a partition and creating a new one to install UBLinux next to Windows + Installing OS files, user data on different partitions, creating RAID, etc. 0 @@ -970,7 +974,8 @@ and help you install UBLinux on your computer True False - Additional installation options + Recovery + True 0 @@ -986,7 +991,7 @@ and help you install UBLinux on your computer True False - Separate installation of bootloader, system files, user data, etc. + Recovering bootloader, OS files, user data 0 @@ -1082,9 +1087,6 @@ and help you install UBLinux on your computer True AdditionalSoftwareList 0 - - - Chosen @@ -1213,9 +1215,6 @@ and help you install UBLinux on your computer True AdditionalSoftwareList 0 - - - Chosen @@ -1416,7 +1415,6 @@ and help you install UBLinux on your computer none - 680 True False @@ -1867,9 +1865,6 @@ and help you install UBLinux on your computer True LayoutsFilter 0 - - - Layout @@ -2013,7 +2008,7 @@ and help you install UBLinux on your computer False - True + False True 1 @@ -2482,28 +2477,13 @@ or continue working in the UBLinux Live environment. - + True - False - vertical - 5 + True - + True False - 5 - - - True - False - /com/ublinux/images/clear_install_disk.png - - - False - True - 0 - - True @@ -2511,14 +2491,195 @@ or continue working in the UBLinux Live environment. vertical 5 - + True False - Installation - 0 - - - + vertical + 5 + + + True + False + 5 + + + True + False + /com/ublinux/images/clear_install_disk.png + + + False + True + 0 + + + + + True + False + vertical + 5 + + + True + False + Installation + 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 + True + 0 + + + + + True + False + 5 + + + True + False + Select device: + 0 + + + False + True + 0 + + + + + True + True + True + image5 + + + + False + True + end + 1 + + + + + False + True + 1 + + + + + True + True + in + 128 + + + True + True + DevicesList + 0 + + + Device + + + + 0 + + + + + + + Description + + + + 1 + + + + + + + Mark + + + + 2 + + + + + + + Size + + + + 3 + + + + + + + Free + + + + 4 + + + + + + + + + False + True + 2 + + False @@ -2527,11 +2688,45 @@ or continue working in the UBLinux Live environment. - + True False - Deleting all data on the selected disk and then installing the UBLinux system - 0 + 5 + + + True + False + Choose file system type for the section: + + + False + True + 0 + + + + + True + False + 1 + + ext3 + ext4 + fat16 + fat32 + exfat + riserfs + udf + xfs + zfs + + + + True + True + 1 + + False @@ -2539,230 +2734,52 @@ or continue working in the UBLinux Live environment. 1 - - - True - True - 1 - - - - - False - True - 0 - - - - - True - False - 5 - - - True - False - Select device: - 0 - - - False - True - 0 - - - - - True - True - True - image5 - - - - False - True - end - 1 - - - - - False - True - 1 - - - - - True - True - in - 128 - - - True - True - DevicesList - 0 - - - - - - Device - - - - 0 - - - - - - - Description - - - - 1 - - - - - - - Mark - - - - 2 - - - - - - Size + + True + False + 5 - - - 3 - + + True + False + Section name: + + + False + True + 0 + - - - - - Free - - - 4 - + + True + True + + + True + True + 1 + + + False + True + 2 + - - False - True - 2 - - False + True True 1 - - - True - False - 5 - - - True - False - Choose file system type for the section: - - - False - True - 0 - - - - - True - False - 1 - - ext3 - ext4 - fat16 - fat32 - exfat - riserfs - udf - xfs - zfs - - - - True - True - 1 - - - - - False - True - 2 - - - - - True - False - 5 - - - True - False - Section name: - - - False - True - 0 - - - - - True - True - - - True - True - 1 - - - - - False - True - 3 - - 12 @@ -2786,110 +2803,15 @@ or continue working in the UBLinux Live environment. vertical 5 - + True False - vertical - 5 - - - True - False - Installation parameters - - - - - - - - False - True - 0 - - - - - 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 - 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 - - + Installation parameters + + + + + False @@ -2898,28 +2820,107 @@ installed. - + True - False - vertical - 5 + True - + True False - vertical - 5 True False + vertical 5 - + True False - Select device: - 0 + vertical + 5 + + + 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 + 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 @@ -2928,375 +2929,411 @@ installed. - - True - True - True - image36 - - - - False - True - end - 1 - - - - - False - True - 0 - - - - - True - True - in - 128 - - + True - True - DevicesList - 0 - - - + False + vertical + 5 - - Device + + True + False + vertical + 5 - - - 0 - + + True + False + 5 + + + True + False + Select device: + 0 + + + False + True + 0 + + + + + True + True + True + image36 + + + + False + True + end + 1 + + + + + False + True + 0 + - - - - - Description - - - 1 - + + True + True + in + 128 + + + True + True + DevicesList + 0 + + + Device + + + + 0 + + + + + + + Description + + + + 1 + + + + + + + Mark + + + + 2 + + + + + + + Size + + + + 3 + + + + + + + Serial + + + + 4 + + + + + + + + + False + True + 1 + + + False + True + 0 + - - Mark + + True + False + vertical - - - 2 - + + True + False + Choose a section: + 0 + + + False + True + 0 + - - - - - Size - - - 3 - + + True + True + in + 128 + + + True + True + PartitionsList + 0 + + + Section + + + + 0 + + + + + + + Capacity + + + + 1 + + + + + + + Free space + + + + 2 + + + + + + + File system + + + + 3 + + + + + + + Mark + + + + 4 + + + + + + + + + False + True + 1 + + + False + True + 1 + - - Serial + + True + False + 5 - - - 4 - + + True + False + Specify the size of the new partition for UBLinux OS: + + + 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 - - - 0 - + + True + True + 0,0 + adjustment1 + 1 + + + False + True + 1 + - - - - - Capacity - - - 1 - + + True + False + 1 + + Mb + Gb + Tb + + + + False + True + 2 + + + False + True + 2 + + + + False + True + 1 + + + + + True + False + 5 - - Free space - - - - 2 - - + + True + False + Choose file system type for the section: + + False + True + 0 + - - File system - - - - 3 - - + + True + False + 1 + + ext3 + ext4 + fat16 + fat32 + exfat + riserfs + udf + xfs + zfs + + + True + True + 1 + - - Mark - - - - 4 - - + + Format + True + True + False + True + True + + False + True + 2 + + + False + True + 2 + - - - 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 - 1 - - - False - True - 1 - - - - - True - False - 1 - - Mb - Gb - Tb - - - - False - True - 2 - - - - - False - True - 2 - - - - - False - True - 1 - - - - - True - False - 5 - - - True - False - Choose file system type for the section: - - - False - True - 0 - - - - - True - False - 1 - - ext3 - ext4 - fat16 - fat32 - exfat - riserfs - udf - xfs - zfs - - - - True - True - 1 - - - - - Format - True - True - False - True - True - - - False - True - 2 - - - - - False - True - 2 - - - - - True - False - 5 - - - True - False - Section name: - - - False - True - 0 - - - - - True - True + + + True + False + 5 + + + True + False + Section name: + + + False + True + 0 + + + + + True + True + + + True + True + 1 + + + + + False + True + 3 + + + + - - True - True - 1 - - False + True True - 3 + 4 @@ -3322,109 +3359,15 @@ installed. vertical 5 - + True False - vertical - 5 - - - True - False - Installation parameters - - - - - - - - False - True - 0 - - - - - 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 - 0 - - - - - - False - True - 0 - - - - - True - False - Unpacking the UBLinux file system into an existing system - 0 - - - False - True - 1 - - - - - True - True - 1 - - - - - False - True - 1 - - - - - True - False - Attention! The UBLinux OS will be installed on the selected partition with OS already installed. All user data will be saved. - True - 0 - 0 - - - False - True - 2 - - + Installation parameters + + + + + False @@ -3433,28 +3376,106 @@ installed. - + True - False - vertical - 5 + True - + True False - vertical - 5 True False + vertical 5 - + True False - Select device: - 0 + vertical + 5 + + + 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 + 0 + + + + + + False + True + 0 + + + + + True + False + Unpacking the UBLinux file system into an existing system + 0 + + + False + True + 1 + + + + + True + True + 1 + + + + + False + True + 1 + + + + + True + False + Attention! The UBLinux OS will be installed on the selected partition with OS already installed. All user data will be saved. + True + 0 + 0 + + + False + True + 2 + + False @@ -3463,307 +3484,343 @@ installed. - - True - True - True - image1 - - - - False - True - end - 1 - - - - - False - True - 0 - - - - - True - True - in - 128 - - + True - True - DevicesList - 0 - - - - - - Device - - - - 0 - - - - + False + vertical + 5 - - Mark + + True + False + vertical + 5 - - - 1 - + + True + False + 5 + + + True + False + Select device: + 0 + + + False + True + 0 + + + + + True + True + True + image1 + + + + False + True + end + 1 + + + + + False + True + 0 + - - - - - Capacity - - - 2 - + + True + True + in + 128 + + + True + True + DevicesList + 0 + + + Device + + + + 0 + + + + + + + Mark + + + + 1 + + + + + + + Capacity + + + + 2 + + + + + + + Location + + + + 3 + + + + + + + + + False + True + 1 + + + False + True + 0 + - - Location + + True + False + vertical - - - 3 - + + True + False + Choose a section: + 0 + + + False + True + 0 + + + + + True + True + in + 128 + + + True + True + PartitionsList + 0 + + + Section + + + + 0 + + + + + + + Capacity + + + + 1 + + + + + + + Free space + + + + 2 + + + + + + + File system + + + + 3 + + + + + + + Mark + + + + 4 + + + + + + + + + False + True + 1 + + + False + True + 1 + + + False + True + 1 + - - - 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 - - - + False + 5 - - Section - - - - 0 - - + + True + False + Choose file system type for the section: + + False + True + 0 + - - Capacity - - - - 1 - - + + True + False + 1 + + ext3 + ext4 + fat16 + fat32 + exfat + riserfs + udf + xfs + zfs + + + True + True + 1 + - - Free space - - - - 2 - - + + Format + True + True + False + True + True + + False + True + 2 + + + + False + True + 2 + + + + + True + False + 5 - - File system - - - - 3 - - + + True + False + Section name: + + False + True + 0 + - - Mark - - - - 4 - - + + True + True + + True + True + 1 + + + False + True + 3 + - - False - True - 1 - - - False - True - 1 - - - - - False - True - 1 - - - - - True - False - 5 - - - True - False - Choose file system type for the section: - - - False - True - 0 - - - - - True - False - 1 - - ext3 - ext4 - fat16 - fat32 - exfat - riserfs - udf - xfs - zfs - - - - True - True - 1 - - - - - Format - True - True - False - True - True - - - False - True - 2 - - - - - False - True - 2 - - - - - True - False - 5 - - - True - False - Section name: - - - False - True - 0 - - - - - True - True - - - True - True - 1 - - False + True True 3 @@ -3967,9 +4024,6 @@ installed. True DevicesList 0 - - - Device @@ -4047,9 +4101,6 @@ installed. True True PartitionsList - - - Section @@ -4822,9 +4873,6 @@ separately into the selected partition. True DevicesList 0 - - - Device @@ -5012,9 +5060,6 @@ separately into the selected partition. True DevicesList 0 - - - Device @@ -5265,9 +5310,6 @@ separately into the selected partition. True DevicesList 0 - - - Device @@ -5345,9 +5387,6 @@ separately into the selected partition. True True PartitionsList - - - Section @@ -5605,9 +5644,6 @@ separately into the selected partition. True DevicesList 0 - - - Device @@ -5685,9 +5721,6 @@ separately into the selected partition. True True PartitionsList - - - Section