diff --git a/groups-list.csv b/groups-list.csv new file mode 100644 index 0000000..e683605 --- /dev/null +++ b/groups-list.csv @@ -0,0 +1,35 @@ +GROUP_NAME;SUBGROUP_NAME;PACKAGES;DESCRIPTION +Containerization;ubm-docker;Docker and webmanager and utils +Containerization;ubm-podman;Podman and webmanager and utils +Drivers;Printer;ubm-drv-brother;Brother printer drivers +Drivers;Printer;ubm-drv-canon-capt;Canon CAPT Printer Driver +Drivers;Printer;ubm-drv-canon-ufrii;Canon UFR II LIPSLX CARPS2 printer driver +Drivers;Printer;ubm-drv-epson;Epson printer drivers +Drivers;Printer;ubm-drv-kyocera;Kyocera printer drivers +Drivers;Printer;ubm-drv-lexmark;Lexmark drivers +Drivers;Printer;ubm-drv-pantum;Pantum printer drivers +Drivers;Printer;ubm-drv-printer;hplip, gutenprint, foomatic printers drivers +Drivers;Printer;ubm-drv-ricoh;Ricoh drivers +Drivers;Printer;ubm-drv-samsung;Samsung drivers +Drivers;Printer;ubm-drv-xerox;Xerox drivers +Education;;ubm-education;Education soft collection +Multimedia;Collection;ubm-080-multimedia;Multimedia soft collection +Multimedia;Blender;ubm-blender;Blender and utilities +Network;Remote desktop;ubm-anydesk;AnyDesk +Network;Remote desktop;ubm-realvnc;Realvnc viewer and server +Network;Remote desktop;ubm-rustdesk;Rustdesk +Network;Remote desktop;ubm-rustdesk-server;Rustdesk gateway server +Network;Chat;ubm-telegram;Telegram +Network;Web servers;ubm-web;Web servers +Network;Managment;ubm-webmin;Webmin and Usermin +Network;Managment;ubm-ubpile-workflow;UBPile Workflow +Office;Office packet;ubm-wps-office;Kingsoft Office (WPS Office) - an office productivity suite +Office;Office packet;ubm-onlyoffice;OnlyOffice suite +Office;Office packet;ubm-libreoffice;LibreOffice +Office;Browser;ubm-chromium-gost;Chromium and some plugins +Office;Browser;ubm-chromium;Chromium and some plugins +Office;Browser;ubm-firefox;Firefox and some plugins +Office;Browser;ubm-yandex-browser;Yandex Browser and some utils +Virtualization;QEMU;ubm-qemu;QEMU, manager and utils +Virtualization;VirtualBox;ubm-virtualbox-host;VirtualBox and extension packs +Virtualization;Vmware Workstation;ubm-vmware-workstation17;Vmware Workstation 17 \ No newline at end of file diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt index eb5a90b..91569dc 100644 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt @@ -143,7 +143,7 @@ set(SOURCE_FILES ubinstall-gtk-configuration-mode.c ubinstall-gtk-decorations.c ubinstall-gtk-log.c - ubinstall-gtk-password.c + # ubinstall-gtk-password.c ubinstall-gtk-saving.c ubinstall-gtk-standard.c ubinstall-gtk-install-start.c diff --git a/source/ubinstall-gtk-decorations.c b/source/ubinstall-gtk-decorations.c index 603f6d8..19e4060 100644 --- a/source/ubinstall-gtk-decorations.c +++ b/source/ubinstall-gtk-decorations.c @@ -1,106 +1,106 @@ #include "ubinstall-gtk.h" -void yon_resize_images_update(main_window *widgets){ - enum YON_PAGES page = gtk_notebook_get_current_page(GTK_NOTEBOOK(widgets->Notebook)); - gtk_widget_hide(widgets->BootloaderImage); - gtk_widget_hide(widgets->RegionImage); - gtk_widget_hide(widgets->UserImage); - gtk_widget_hide(widgets->StartupImage); - gtk_widget_hide(widgets->NetworkImage); +// void yon_resize_images_update(main_window *widgets){ +// enum YON_PAGES page = gtk_notebook_get_current_page(GTK_NOTEBOOK(widgets->Notebook)); +// gtk_widget_hide(widgets->BootloaderImage); +// gtk_widget_hide(widgets->RegionImage); +// gtk_widget_hide(widgets->UserImage); +// gtk_widget_hide(widgets->StartupImage); +// gtk_widget_hide(widgets->NetworkImage); - switch(page){ - case YON_PAGE_BOOTLOADER: - gtk_widget_show(widgets->BootloaderImage); - break; - case YON_PAGE_REGION: - gtk_widget_show(widgets->RegionImage); - break; - case YON_PAGE_USERS: - gtk_widget_show(widgets->UserImage); - break; - case YON_PAGE_STARTUP: - gtk_widget_show(widgets->StartupImage); - break; - case YON_PAGE_NETWORK: - gtk_widget_show(widgets->NetworkImage); - break; - case YON_PAGE_INSTALLATION: - gtk_widget_show(widgets->SlidesImage); - g_timeout_add(7000,on_image_slide,widgets); +// switch(page){ +// case YON_PAGE_BOOTLOADER: +// gtk_widget_show(widgets->BootloaderImage); +// break; +// case YON_PAGE_REGION: +// gtk_widget_show(widgets->RegionImage); +// break; +// case YON_PAGE_USERS: +// gtk_widget_show(widgets->UserImage); +// break; +// case YON_PAGE_STARTUP: +// gtk_widget_show(widgets->StartupImage); +// break; +// case YON_PAGE_NETWORK: +// gtk_widget_show(widgets->NetworkImage); +// break; +// case YON_PAGE_INSTALLATION: +// gtk_widget_show(widgets->SlidesImage); +// g_timeout_add(7000,on_image_slide,widgets); - break; - default: - break; - } -} +// break; +// default: +// break; +// } +// } -void on_region_resized(GtkWidget *,main_window *widgets){ - enum YON_PAGES page = gtk_notebook_get_current_page(GTK_NOTEBOOK(widgets->Notebook)); - GtkImage *target = NULL; - GdkPixbuf *pixbuf = NULL; - switch (page){ - case YON_PAGE_BOOTLOADER: - target = GTK_IMAGE(widgets->BootloaderImage); - pixbuf = widgets->bootloader_original; - break; - case YON_PAGE_REGION: - target = GTK_IMAGE(widgets->RegionImage); - pixbuf = widgets->region_original; +// void on_region_resized(GtkWidget *,main_window *widgets){ +// enum YON_PAGES page = gtk_notebook_get_current_page(GTK_NOTEBOOK(widgets->Notebook)); +// GtkImage *target = NULL; +// GdkPixbuf *pixbuf = NULL; +// switch (page){ +// case YON_PAGE_BOOTLOADER: +// target = GTK_IMAGE(widgets->BootloaderImage); +// pixbuf = widgets->bootloader_original; +// break; +// case YON_PAGE_REGION: +// target = GTK_IMAGE(widgets->RegionImage); +// pixbuf = widgets->region_original; - break; - case YON_PAGE_USERS: - target = GTK_IMAGE(widgets->UserImage); - pixbuf = widgets->user_original; +// break; +// case YON_PAGE_USERS: +// target = GTK_IMAGE(widgets->UserImage); +// pixbuf = widgets->user_original; - break; - case YON_PAGE_STARTUP: - target = GTK_IMAGE(widgets->StartupImage); - pixbuf = widgets->startup_original; +// break; +// case YON_PAGE_STARTUP: +// target = GTK_IMAGE(widgets->StartupImage); +// pixbuf = widgets->startup_original; - break; - case YON_PAGE_NETWORK: - target = GTK_IMAGE(widgets->NetworkImage); - pixbuf = widgets->network_original; +// break; +// case YON_PAGE_NETWORK: +// target = GTK_IMAGE(widgets->NetworkImage); +// pixbuf = widgets->network_original; - break; - case YON_PAGE_INSTALLATION: - target = GTK_IMAGE(widgets->SlidesImage); - pixbuf = g_list_nth_data(widgets->slides_original,main_config.cur_slide); +// break; +// case YON_PAGE_INSTALLATION: +// target = GTK_IMAGE(widgets->SlidesImage); +// pixbuf = g_list_nth_data(widgets->slides_original,main_config.cur_slide); - break; - default: - break; - } - if (target){ - yon_image_resize_from_container(target,pixbuf); - } -} +// break; +// default: +// break; +// } +// if (target){ +// yon_image_resize_from_container(target,pixbuf); +// } +// } -int yon_image_resize_from_container(GtkImage *target, GdkPixbuf *pixbuf_unscaled){ - int width = gtk_widget_get_allocated_width((gtk_widget_get_parent(GTK_WIDGET(target)))); - int height = gtk_widget_get_allocated_height((gtk_widget_get_parent(GTK_WIDGET(target)))); +// int yon_image_resize_from_container(GtkImage *target, GdkPixbuf *pixbuf_unscaled){ +// int width = gtk_widget_get_allocated_width((gtk_widget_get_parent(GTK_WIDGET(target)))); +// int height = gtk_widget_get_allocated_height((gtk_widget_get_parent(GTK_WIDGET(target)))); - int newImgWidthDef = (width <= 217) ? width : width - 30; - int newImgHeightDef = (height <= 120) ? height : height - 80; +// int newImgWidthDef = (width <= 217) ? width : width - 30; +// int newImgHeightDef = (height <= 120) ? height : height - 80; - int originalWidth = gdk_pixbuf_get_width(pixbuf_unscaled); - int originalHeight = gdk_pixbuf_get_height(pixbuf_unscaled); - int newImgHeight = (int)(originalHeight / ((double) originalWidth / newImgWidthDef)); +// int originalWidth = gdk_pixbuf_get_width(pixbuf_unscaled); +// int originalHeight = gdk_pixbuf_get_height(pixbuf_unscaled); +// int newImgHeight = (int)(originalHeight / ((double) originalWidth / newImgWidthDef)); - if (newImgHeight > newImgHeightDef) { - newImgHeight = newImgHeightDef; - newImgWidthDef = (int)(originalWidth / ((double) originalHeight / newImgHeight)); - } - int newImageWidth = (int)(originalWidth / ((double) originalHeight / newImgHeight)); +// if (newImgHeight > newImgHeightDef) { +// newImgHeight = newImgHeightDef; +// newImgWidthDef = (int)(originalWidth / ((double) originalHeight / newImgHeight)); +// } +// int newImageWidth = (int)(originalWidth / ((double) originalHeight / newImgHeight)); - GdkPixbuf *scaledPixBuf = gdk_pixbuf_scale_simple(pixbuf_unscaled, newImageWidth, newImgHeight, GDK_INTERP_BILINEAR); - gtk_image_set_from_pixbuf(target, scaledPixBuf); +// GdkPixbuf *scaledPixBuf = gdk_pixbuf_scale_simple(pixbuf_unscaled, newImageWidth, newImgHeight, GDK_INTERP_BILINEAR); +// gtk_image_set_from_pixbuf(target, scaledPixBuf); - g_object_unref(scaledPixBuf); +// g_object_unref(scaledPixBuf); - return 1; -} +// return 1; +// } gboolean on_image_slide(void *data){ main_window *widgets = (main_window*)data; diff --git a/source/ubinstall-gtk-installation.c b/source/ubinstall-gtk-installation.c index ac6c95c..1af685f 100644 --- a/source/ubinstall-gtk-installation.c +++ b/source/ubinstall-gtk-installation.c @@ -590,5 +590,4 @@ void yon_install_init(main_window *widgets, enum YON_PAGES page){ gtk_switch_set_active(GTK_SWITCH(format_switch),0); } } - } \ No newline at end of file diff --git a/source/ubinstall-gtk-packages.c b/source/ubinstall-gtk-packages.c new file mode 100644 index 0000000..5390f1a --- /dev/null +++ b/source/ubinstall-gtk-packages.c @@ -0,0 +1,71 @@ +#include "ubinstall-gtk.h" + +GtkTreeIter *yon_category_check(GtkTreeStore *target,char *category){ + GtkTreeIter iter; + GtkTreeIter *ret_iter = NULL; + for_iter(target,&iter){ + char *cur_category; + gtk_tree_model_get(GTK_TREE_MODEL(target),&iter,0,&cur_category,-1); + if (!strcmp(cur_category,category)){ + ret_iter = gtk_tree_iter_copy(&iter); + } + } + return ret_iter; +} + +GtkTreeIter *yon_subcategory_check(GtkTreeStore *target, GtkTreeIter *parent_iter, char *category){ + GtkTreeIter iter; + GtkTreeIter *ret_iter = NULL; + gtk_tree_model_iter_children(GTK_TREE_MODEL(target),&iter,parent_iter); + for(int valid = 1; valid; valid = gtk_tree_model_iter_next(GTK_TREE_MODEL(target),&iter)){ + char *cur_category; + gtk_tree_model_get(GTK_TREE_MODEL(target),&iter,0,&cur_category,-1); + if (!strcmp(cur_category,category)){ + ret_iter = gtk_tree_iter_copy(&iter); + } + } + return ret_iter; +} + +void yon_packages_tab_init(main_window *widgets){ + GHashTable *category = g_hash_table_new(g_str_hash,g_str_equal); + GHashTable *subcategory = g_hash_table_new(g_str_hash,g_str_equal); + int size; + config_str packages = yon_resource_open_file(groups_list_path,&size); + for (int i=0;iPackagesList,parsed[0]); + if (category_iter){ + GtkTreeIter *subcategory_iter = yon_subcategory_check(widgets->PackagesList,category_iter,parsed[0]); + if (subcategory_iter){ + GtkTreeIter package_iter; + gtk_tree_store_append(widgets->PackagesList,&package_iter,subcategory_iter); + gtk_tree_store_set(widgets->PackagesList,&package_iter,0,packages[2],1,packages[3],-1); + gtk_tree_iter_free(subcategory_iter); + } + gtk_tree_iter_free(category_iter); + } + } +} + +void yon_on_packages_chosen(GtkTreeStore *, char *path, main_window *widgets){ + GtkTreeIter iter, chiter; + gtk_tree_model_get_iter_from_string(GTK_TREE_MODEL(widgets->PackagesList),&iter,path); + GtkTreePath *cur_path = gtk_tree_model_get_path(GTK_TREE_MODEL(widgets->PackagesList),&iter); + int depth = gtk_tree_path_get_depth(cur_path); + if (depth<2){ + GtkTreeIter *cur_parent, *cur_iter; + cur_parent = gtk_tree_iter_copy(&iter); + cur_iter = gtk_tree_iter_copy(&chiter); + switch(depth){ + case 0: + gtk_tree_model_iter_children(GTK_TREE_MODEL(widgets->PackagesList),cur_iter,&iter); + __attribute__((fallthrough)); + case 1: + gtk_tree_model_iter_children(GTK_TREE_MODEL(widgets->PackagesList),cur_iter,cur_parent); + + } + + } +} \ No newline at end of file diff --git a/source/ubinstall-gtk-page-switch.c b/source/ubinstall-gtk-page-switch.c index ba60189..bedf2a1 100644 --- a/source/ubinstall-gtk-page-switch.c +++ b/source/ubinstall-gtk-page-switch.c @@ -314,7 +314,7 @@ void yon_configuration_mode_check(main_window *widgets){ } void yon_page_update(main_window *widgets){ - yon_resize_images_update(widgets); + // yon_resize_images_update(widgets); yon_navigation_buttons_set_sensetiveness(widgets); yon_switch_page_render(widgets); yon_configuration_mode_check(widgets); diff --git a/source/ubinstall-gtk-password.c b/source/ubinstall-gtk-password.c deleted file mode 100644 index dfdd045..0000000 --- a/source/ubinstall-gtk-password.c +++ /dev/null @@ -1 +0,0 @@ -#include "ubinstall-gtk.h" diff --git a/source/ubinstall-gtk.c b/source/ubinstall-gtk.c index 5d0f8f5..b0bd584 100644 --- a/source/ubinstall-gtk.c +++ b/source/ubinstall-gtk.c @@ -971,7 +971,7 @@ void yon_main_window_create(main_window *widgets){ widgets->RemoveButton=yon_gtk_builder_get_widget(builder,"RemoveButton"); widgets->RegionSensitiveSwitch = yon_gtk_builder_get_widget(builder,"RegionSensitiveSwitch"); - widgets->UserImage=yon_gtk_builder_get_widget(builder,"UserImage"); + // widgets->UserImage=yon_gtk_builder_get_widget(builder,"UserImage"); widgets->UserRootNameEntry=yon_gtk_builder_get_widget(builder,"UserRootNameEntry"); widgets->UserRootLoginEntry=yon_gtk_builder_get_widget(builder,"UserRootLoginEntry"); widgets->UserRootPasswordCombo=yon_gtk_builder_get_widget(builder,"UserRootPasswordCombo"); @@ -990,7 +990,7 @@ void yon_main_window_create(main_window *widgets){ widgets->HotnameEntry=yon_gtk_builder_get_widget(builder,"HotnameEntry"); widgets->mainSettingsButton=yon_gtk_builder_get_widget(builder,"mainSettingsButton"); - widgets->RegionImage = yon_gtk_builder_get_widget(builder,"RegionImage"); + // widgets->RegionImage = yon_gtk_builder_get_widget(builder,"RegionImage"); widgets->RegionBox = yon_gtk_builder_get_widget(builder,"RegionBox"); widgets->RegionAspect = yon_gtk_builder_get_widget(builder,"RegionAspect"); @@ -1050,7 +1050,7 @@ void yon_main_window_create(main_window *widgets){ widgets->PacmanSoftwareChosenList = GTK_LIST_STORE(gtk_builder_get_object(builder,"PacmanSoftwareChosenList")); widgets->PacmanSoftwareChosenCell = GTK_CELL_RENDERER(gtk_builder_get_object(builder,"PacmanSoftwareChosenCell")); - widgets->StartupImage = yon_gtk_builder_get_widget(builder,"StartupImage"); + // widgets->StartupImage = yon_gtk_builder_get_widget(builder,"StartupImage"); widgets->StartupServicesTree = yon_gtk_builder_get_widget(builder,"StartupServicesTree"); widgets->StartupServicesAddButton = yon_gtk_builder_get_widget(builder,"StartupServicesAddButton"); widgets->StartupServicesEditButton = yon_gtk_builder_get_widget(builder,"StartupServicesEditButton"); @@ -1058,7 +1058,7 @@ void yon_main_window_create(main_window *widgets){ widgets->StartupChosenCell = GTK_CELL_RENDERER(gtk_builder_get_object(builder,"StartupChosenCell")); widgets->StartupList = GTK_LIST_STORE(gtk_builder_get_object(builder,"StartupList")); - widgets->BootloaderImage = yon_gtk_builder_get_widget(builder,"BootloaderImage"); + // widgets->BootloaderImage = yon_gtk_builder_get_widget(builder,"BootloaderImage"); widgets->BootloadTimerSwitch = yon_gtk_builder_get_widget(builder,"BootloadTimerSwitch"); widgets->BootloadTimerSpin = yon_gtk_builder_get_widget(builder,"BootloadTimerSpin"); widgets->BootloadDefaultOSEntry = yon_gtk_builder_get_widget(builder,"BootloadDefaultOSEntry"); @@ -1069,7 +1069,7 @@ void yon_main_window_create(main_window *widgets){ widgets->BootloadUserRemoveButton = yon_gtk_builder_get_widget(builder,"BootloadUserRemoveButton"); widgets->BootloadUsersList = GTK_LIST_STORE(gtk_builder_get_object(builder,"BootloadUsersList")); - widgets->NetworkImage = yon_gtk_builder_get_widget(builder,"NetworkImage"); + // widgets->NetworkImage = yon_gtk_builder_get_widget(builder,"NetworkImage"); widgets->NetworkDomainSwitch = yon_gtk_builder_get_widget(builder,"NetworkDomainSwitch"); widgets->NetworkDomainNameEntry = yon_gtk_builder_get_widget(builder,"NetworkDomainNameEntry"); widgets->NetworkDomainAdminEntry = yon_gtk_builder_get_widget(builder,"NetworkDomainAdminEntry"); @@ -1109,7 +1109,7 @@ void yon_main_window_create(main_window *widgets){ g_signal_connect(G_OBJECT(widgets->GpartedSameButton),"clicked",G_CALLBACK(on_gparted_open),NULL); g_signal_connect(G_OBJECT(widgets->GpartedNextInstallationButton),"clicked",G_CALLBACK(on_gparted_open),NULL); - g_signal_connect(G_OBJECT(widgets->MainWindow),"check-resize",G_CALLBACK(on_region_resized),widgets); + // g_signal_connect(G_OBJECT(widgets->MainWindow),"check-resize",G_CALLBACK(on_region_resized),widgets); g_signal_connect(G_OBJECT(widgets->NextButton),"clicked",G_CALLBACK(on_page_next_clicked),widgets); g_signal_connect(G_OBJECT(widgets->BackButton),"clicked",G_CALLBACK(on_page_prev_clicked),widgets); diff --git a/source/ubinstall-gtk.h b/source/ubinstall-gtk.h index 71d3ee1..a464ab1 100755 --- a/source/ubinstall-gtk.h +++ b/source/ubinstall-gtk.h @@ -75,6 +75,7 @@ #define network_path "resource:///com/ublinux/csv/network-list.csv" #define fs_types_path "resource:///com/ublinux/csv/filesystems-format-list.csv" #define vfs_list_path "resource:///com/ublinux/csv/vfs-list.csv" +#define groups_list_path "resource:///com/ublinux/csv/groups-list.csv" #define encryptions_list "luks1","luks2" @@ -495,7 +496,7 @@ typedef struct { GtkWidget *InstallationWindowsRadio; GtkWidget *InstallationOptionsRadio; - GtkWidget *UserImage; + // GtkWidget *UserImage; GtkWidget *UserRootNameEntry; GtkWidget *UserRootLoginEntry; GtkWidget *UserRootPasswordCombo; @@ -521,7 +522,7 @@ typedef struct { GtkCellRenderer *LocaleCell; GtkListStore *LanguageList; - GtkWidget *RegionImage; + // GtkWidget *RegionImage; GtkWidget *RegionBox; GtkWidget *RegionAspect; @@ -673,7 +674,7 @@ typedef struct { GtkListStore *PacmanSoftwareChosenList; GtkCellRenderer *PacmanSoftwareChosenCell; - GtkWidget *StartupImage; + // GtkWidget *StartupImage; GtkWidget *StartupServicesTree; GtkWidget *StartupServicesAddButton; GtkWidget *StartupServicesEditButton; @@ -681,7 +682,7 @@ typedef struct { GtkCellRenderer *StartupChosenCell; GtkListStore *StartupList; - GtkWidget *BootloaderImage; + // GtkWidget *BootloaderImage; GtkWidget *BootloadTimerSwitch; GtkWidget *BootloadTimerSpin; GtkWidget *BootloadDefaultOSEntry; @@ -692,7 +693,7 @@ typedef struct { GtkWidget *BootloadUserTree; GtkListStore *BootloadUsersList; - GtkWidget *NetworkImage; + // GtkWidget *NetworkImage; GtkWidget *NetworkDomainSwitch; GtkWidget *NetworkDomainNameEntry; GtkWidget *NetworkDomainAdminEntry; @@ -726,6 +727,8 @@ typedef struct { dictionary *advanced_sections; GSequence *advanced_partition_order; + GtkTreeStore *PackagesList; + GFile *install_progress_file; GFileMonitor *install_progress_monitor; @@ -1123,8 +1126,8 @@ void yon_installation_progress_update(GFileMonitor *,GFile *,GFile *,GFileMonito void *on_config_save(void *data); void *on_setup_system_configuration(void * data); gboolean on_image_slide(void *data); -void on_region_resized(GtkWidget *,main_window *widgets); -int yon_image_resize_from_container(GtkImage *target, GdkPixbuf *pixbuf_unscaled); +// void on_region_resized(GtkWidget *,main_window *widgets); +// int yon_image_resize_from_container(GtkImage *target, GdkPixbuf *pixbuf_unscaled); void on_configuration_mode_switch(GtkWidget *self,main_window *widgets); double yon_size_long_convert_automatic(unsigned long bytes, char *size); double yon_size_long_convert_to_mod(double size, char mod); @@ -1261,7 +1264,7 @@ void yon_source_update(source_window *window); void yon_source_element_add(char *key,void*,source_window *window); source_element *yon_source_element_new(); void on_system_setup_pass(GtkWidget *, main_window *widgets); -void yon_resize_images_update(main_window *widgets); +// void yon_resize_images_update(main_window *widgets); void on_vnc_toggled(GtkWidget *self, main_window *widgets); void yon_main_window_create(main_window *widgets); void set_locales_list(main_window *widgets); diff --git a/ubinstall-gtk.glade b/ubinstall-gtk.glade index 5c7c0fc..33e8e88 100644 --- a/ubinstall-gtk.glade +++ b/ubinstall-gtk.glade @@ -153,6 +153,7 @@ True False + @@ -1155,14 +1156,12 @@ agreement - + Yes, I agree to the License Agreement True True False - True True - LicenseDisgreeRadio False @@ -1170,21 +1169,6 @@ agreement 2 - - - No, I do not agree - True - True - False - True - True - - - False - True - 3 - - 1 @@ -2566,23 +2550,6 @@ agreement False vertical 5 - - - True - False - Choose additional components - - - - - - - - False - True - 0 - - True @@ -2621,7 +2588,7 @@ agreement True False - Choose system kernel + Choose additional components True 0 @@ -2798,23 +2765,6 @@ agreement False vertical 5 - - - True - False - Choose additional components - - - - - - - - False - True - 0 - - True @@ -2853,7 +2803,7 @@ agreement True False - Choose system kernel + Choose additional components True 0 @@ -3239,24 +3189,6 @@ agreement False vertical 5 - - - True - False - Location - - - - - - - - - False - True - 0 - - True @@ -3361,30 +3293,6 @@ agreement 1 - - - True - False - 0 - none - - - 1 - 1 - True - False - - - - - - - - True - True - 2 - - True @@ -4643,48 +4551,6 @@ agreement 0 - - - True - False - Settings - - - - - - - - - False - True - 1 - - - - - True - False - 0 - none - - - 1 - 1 - True - False - - - - - - - - True - True - 2 - - True @@ -4999,24 +4865,6 @@ agreement False vertical 5 - - - True - False - Startup services - - - - - - - - - False - True - 0 - - True @@ -5055,7 +4903,7 @@ agreement True False - Choose system kernel + Startup services True 0 @@ -5121,30 +4969,6 @@ agreement 1 - - - True - False - 0 - none - - - 1 - 1 - True - False - - - - - - - - True - True - 2 - - True @@ -5297,24 +5121,6 @@ agreement False vertical 5 - - - True - False - Boot load - - - - - - - - - False - True - 0 - - True @@ -5353,7 +5159,7 @@ agreement True False - Choose system kernel + Boot load True 0 @@ -5419,30 +5225,6 @@ agreement 1 - - - True - False - 0 - none - - - 1 - 1 - True - False - - - - - - - - True - True - 2 - - True @@ -5763,24 +5545,6 @@ agreement False vertical 5 - - - True - False - Network - - - - - - - - - False - True - 0 - - True @@ -5819,7 +5583,7 @@ agreement True False - Choose system kernel + Network True 0 @@ -5885,28 +5649,6 @@ agreement 1 - - - True - False - 0 - none - - - True - False - - - - - - - - True - True - 2 - - 350 @@ -6391,8 +6133,8 @@ agreement - - button + + Go to True True True @@ -6449,8 +6191,8 @@ agreement - - button + + Go to True True True @@ -6507,8 +6249,8 @@ agreement - - button + + Go to True True True @@ -6565,8 +6307,8 @@ agreement - - button + + Go to True True True @@ -6595,6 +6337,27 @@ agreement 4 + + + True + True + + + True + True + Packages + + + + + + + + True + True + 5 + + 16 @@ -7000,7 +6763,7 @@ or continue working in the environment, booted from the Live image. True False - Choose system kernel + Completion True 0 @@ -7066,24 +6829,6 @@ or continue working in the environment, booted from the Live image. 0 - - - True - False - Completion - - - - - - - - - False - True - 1 - - False @@ -7189,7 +6934,7 @@ or continue working in the environment, booted from the Live image. True False - Choose system kernel + Installation error True 0 @@ -7255,24 +7000,6 @@ or continue working in the environment, booted from the Live image. 0 - - - True - False - Installation error - - - - - - - - - False - True - 1 - - False @@ -7378,7 +7105,7 @@ or continue working in the environment, booted from the Live image. True False - Choose system kernel + Configuration True 0 @@ -7444,24 +7171,6 @@ or continue working in the environment, booted from the Live image. 0 - - - True - False - Configuration - - - - - - - - - False - True - 1 - - False @@ -7567,7 +7276,7 @@ or continue working in the environment, booted from the Live image. True False - Choose system kernel + Configuration True 0 @@ -7633,24 +7342,6 @@ or continue working in the environment, booted from the Live image. 0 - - - True - False - Configuration - - - - - - - - - False - True - 1 - - False @@ -11262,7 +10953,7 @@ separately into the selected partition. - Free + Serial @@ -11658,7 +11349,7 @@ separately into the selected partition. - Free + Serial @@ -12047,7 +11738,7 @@ separately into the selected partition. - Free + Serial @@ -12680,72 +12371,6 @@ separately into the selected partition. False vertical 5 - - - True - False - 5 - - - True - False - /com/ublinux/images/install_type_data_only_normal.png - - - 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 - 0 - - True @@ -12849,7 +12474,7 @@ separately into the selected partition. - Free + Serial