diff --git a/gresource.xml b/gresource.xml index 5bc7a35..cfd08bd 100644 --- a/gresource.xml +++ b/gresource.xml @@ -25,6 +25,10 @@ slide-10.png slide-11.png slide-12.png + near_install_disk.png + language.png + in_part_install_disk.png + clear_install_disk.png modules.csv diff --git a/modules.csv b/modules.csv index 087c648..c2f0af1 100644 --- a/modules.csv +++ b/modules.csv @@ -1,19 +1,109 @@ -UBM_NAME|DESCRIPTION -ubm-001-linux|UBLinux module the kernel and modules -ubm-010-core|UBLinux module includes the core components -ubm-025-xorg-gl|UBLinux module includes graphics accelerators -ubm-036-xorg-qt6|UBLinux module includes QT6 libs -ubm-050-xorg-gtk-app|UBLinux module includes GTK applications -ubm-070-dm-lightdm|UBLinux module includes Lightdm display manager -ubm-002-linux-headers|UBLinux module headers and scripts for building modules for the Meta UBlinux kernel, modules, headers and documentation -ubm-020-xorg-base|UBLinux module includes basic components Xorg -ubm-030-xorg-gtk|UBLinux module includes GTK libs -ubm-040-xorg-xfce|UBLinux module includes Xfce applications -ubm-055-xorg-qt-app|UBLinux module includes QT applications -ubm-080-multimedia|UBLinux module includes multimedia applications -ubm-004-linux-firmware|UBLinux module firmwares -ubm-021-xorg-fonts|UBLinux module includes basic fonts -ubm-035-xorg-qt5|UBLinux module includes QT5 libs -ubm-041-xorg-plasma|UBLinux module includes KDE Plasma applications -ubm-060-xorg-theme|UBLinux module includes GTK and icons themes -ubm-100-ublinux|UBLinux module include system utilites \ No newline at end of file +UBM_NAME|UBM_TAG|UBM_DECRIPTION +001-linux-5.17.6-2-x86_64.ubm|base|UBLinux module the kernel and modules +001-linux515-5.15.157-1-x86_64.ubm|base|UBLinux module the kernel and modules +001-linux61-6.1.92-1-x86_64.ubm|base|UBLinux module the kernel and modules +001-linux66-6.6.30-1-x86_64.ubm|base|UBLinux module the kernel and modules +002-linux-headers-5.17.6-2-x86_64.ubm|base|UBLinux module headers and scripts for building modules +002-linux515-headers-5.15.157-1-x86_64.ubm|base|UBLinux module headers and scripts for building modules +002-linux61-headers-6.1.92-1-x86_64.ubm|base|UBLinux module headers and scripts for building modules +002-linux66-headers-6.6.30-1-x86_64.ubm|base|UBLinux module headers and scripts for building modules +003-linux-docs-5.17.6-2-x86_64.ubm|base|UBLinux module documentation for the UBLinux kernel +003-linux515-docs-5.15.157-1-x86_64.ubm|base|UBLinux module documentation for the UBLinux kernel +003-linux61-docs-6.1.92-1-x86_64.ubm|base|UBLinux module documentation for the UBLinux kernel +003-linux66-docs-6.6.30-1-x86_64.ubm|base|UBLinux module documentation for the UBLinux kernel +004-linux-firmware-2204-4-x86_64.ubm|base|UBLinux module firmwares +010-core-2204-2-x86_64.ubm|base|UBLinux module includes the core components +010-core-devel-2204-1-x86_64.ubm|base|UBLinux module includes the core developer components +020-xorg-base-2204-2-x86_64.ubm|base|UBLinux module includes basic components Xorg +021-xorg-fonts-2204-2-x86_64.ubm|base|UBLinux module includes basic fonts +025-xorg-gl-2204-1-x86_64.ubm|base|UBLinux module includes graphics accelerators +030-xorg-gtk-2204-2-x86_64.ubm|base|UBLinux module includes GTK libs +035-xorg-qt5-2204-2-x86_64.ubm|base|UBLinux module includes QT5 libs +036-xorg-qt6-2204-1-x86_64.ubm|base|UBLinux module includes QT6 libs +040-xorg-xfce-2204-2-x86_64.ubm|base|UBLinux module includes Xfce applications +041-xorg-plasma-2204-2-x86_64.ubm|base|UBLinux module includes KDE Plasma applications +042-xorg-gnome-2204-1-x86_64.ubm|base|UBLinux module includes GNOME next generation desktop shell +043-xorg-mate-2204-2-x86_64.ubm|base|UBLinux module includes MATE desktop shell +045-xorg-pantheon-2204-1-x86_64.ubm|base|UBLinux module includes Pantheon desktop shell +049-xorg-liquidshell-2204-1-x86_64.ubm|base|UBLinux module includes Liquidshell basic desktop shell using QtWidgets +050-xorg-gtk-app-2204-4-x86_64.ubm|base|UBLinux module includes GTK applications +055-xorg-qt-app-2204-2-x86_64.ubm|base|UBLinux module includes QT applications +060-xorg-theme-2204-1-x86_64.ubm|base|UBLinux module includes GTK and icons themes +070-dm-lightdm-2204-1-x86_64.ubm|base|UBLinux module includes Lightdm display manager +080-multimedia-2204-1-x86_64.ubm|base|UBLinux module includes multimedia applications +100-ublinux-2204-113-x86_64.ubm|base|UBLinux module include system utilites +amdgpu-pro-23.40-1-x86_64.ubm|extra|UBLinux module includes AMDGRU PRO driver and utilities +backgrounds-1.0-1-x86_64.ubm|extra|UBLinux module include desktop backgrounds +chromium-2204-1-x86_64.ubm|extra|UBLinux module includes Chromium and some plugins +chromium-gost-122.0.6261.58-1-x86_64.ubm|extra|UBLinux module includes Chromium and some plugins +database-2204-1-x86_64.ubm|extra|UBLinux module includes postgresql, mariadb database and utilities +drv-brother-2204-1-x86_64.ubm|extra|UBLinux module include Brother printer drivers +drv-canon-capt-2204-1-x86_64.ubm|extra|UBLinux module include Canon CAPT Printer Driver +drv-canon-ufrii-2204-2-x86_64.ubm|extra|UBLinux module include Canon UFR II LIPSLX CARPS2 printer driver +drv-epson-2204-1-x86_64.ubm|extra|UBLinux module include Epson printer drivers +drv-kyocera-2204-1-x86_64.ubm|extra|UBLinux module include Kyocera printer drivers +drv-lexmark-2204-1-x86_64.ubm|extra|UBLinux module include Lexmark drivers +drv-pantum-2204-1-x86_64.ubm|extra|UBLinux module include Pantum printer drivers +drv-printer-2204-1-x86_64.ubm|extra|UBLinux module include hplip, gutenprint, foomatic +drv-ricoh-2204-1-x86_64.ubm|extra|UBLinux module include Ricoh drivers +drv-samsung-2204-1-x86_64.ubm|extra|UBLinux module include Samsung drivers +drv-xerox-2204-2-x86_64.ubm|extra|UBLinux module include Xerox drivers +firefox-2204-1-x86_64.ubm|extra|UBLinux module includes Firefox and some plugins +game-hedgewars-1.0.0-298-x86_64.ubm|extra|UBLinux module include Hedgewars game similiar to Worms +game-warfork-2.14-1-x86_64.ubm|extra|UBLinux module include Hedgewars game similiar to Worms +gitea-1.18.1-1-x86_64.ubm|extra|UBLinux module includes Gitea and MemCached +gitlab-15.0.2-1-x86_64.ubm|extra|UBLinux module include GitLab and GitLab CI runner +gitlab-cli-2204-1-x86_64.ubm|extra|UBLinux module include Gitlab CLI tools +java11-openjfx-2204-1-x86_64.ubm|extra|UBLinux module include Java OpenJFX 11 client application platform +java17-openjfx-2204-1-x86_64.ubm|extra|UBLinux module include Java OpenJFX 17 client application platform +jdk11-2204-1-x86_64.ubm|extra|UBLinux module includes OpenJDK Java 11 development kit +jdk17-2204-1-x86_64.ubm|extra|UBLinux module includes OpenJDK Java 17 development kit +jdk8-2204-1-x86_64.ubm|extra|UBLinux module includes OpenJDK Java 8 development kit +lazarus-gtk2-2204-1-x86_64.ubm|extra|UBLinux module include Free Pascal and Lazarus GTK2 +lazarus-qt5-2204-1-x86_64.ubm|extra|UBLinux module include Free Pascal and Lazarus QT5 +lib32-2204-1-x86_64.ubm|extra|UBLinux module includes some library 32-bit +libreoffice-7.3.2-1-x86_64.ubm|extra|UBLinux module include LibreOffice +linux-dkms-5.17.6-7-x86_64.ubm|extra|UBLinux module includes dkms additionals modules +linux515-dkms-5.15.157-1-x86_64.ubm|extra|UBLinux module includes dkms additionals modules +linux61-dkms-6.1.92-1-x86_64.ubm|extra|UBLinux module includes dkms additionals modules +nvidia-340-5.17.6-2-x86_64.ubm|extra|UBLinux module includes NVIDIA 340xx driver and utilities +nvidia-390-5.17.6-2-x86_64.ubm|extra|UBLinux module includes NVIDIA 390xx driver and utilities +nvidia-470-5.17.6-2-x86_64.ubm|extra|UBLinux module includes NVIDIA 470xx driver and utilities +nvidia-510-5.17.6-2-x86_64.ubm|extra|UBLinux module includes NVIDIA 510xx driver and utilities +nvidia-515-5.17.6-2-x86_64.ubm|extra|UBLinux module includes NVIDIA 515xx driver and utilities +linux61-nvidia-390xx-390.157-90-x86_64.ubm|extra|UBLinux module includes NVIDIA 390xx driver and utilities +linux61-nvidia-470xx-470.239.06-10-x86_64.ubm|extra|UBLinux module includes NVIDIA 470xx driver and utilities +linux61-nvidia-550.78-3-x86_64.ubm|extra|UBLinux module includes NVIDIA 550xx driver and utilities +linux66-dkms-6.6.30-1-x86_64.ubm|extra|UBLinux module includes dkms additionals modules +nvidia-optimus-2204-1-x86_64.ubm|extra|UBLinux module includes NVIDIA Optimus +lsi-megaraid-2204-1-x86_64.ubm|extra|UBLinux module includes LSI MegaRaid SM, StorCLI, MegaCLI and utils +onlyoffice-7.3.3-1-x86_64.ubm|extra|UBLinux module includes OnlyOffice suite +onlyoffice-documentserver-7.3.3-1-x86_64.ubm|extra|UBLinux module includes OnlyOffice DocumentServer suite +opera-2204-1-x86_64.ubm|extra|UBLinux module includes Opera and some plugins +patch-2204-21-x86_64.ubm|extra|UBLinux module include apps patch +podman-2204-1-x86_64.ubm|extra|UBLinux module includes podman and webmanager and utils +qemu-2204-2-x86_64.ubm|extra|UBLinux module includes QEMU, manager and utils +qemu-headless-2204-1-x86_64.ubm|extra|UBLinux module includes QEMU headless and utils +qt4-2204-1-x86_64.ubm|extra|UBLinux module include QT4 +realvnc-2204-2-x86_64.ubm|extra|UBLinux module includes realvnc viewer and server +rustdesk-1.2.3-1-x86_64.ubm|extra|UBLinux module includes rustdesk +rustdesk-server-1.1.9-1-x86_64.ubm|extra|UBLinux module include rustdesk-server +skype-2204-1-x86_64.ubm|extra|UBLinux module include Skype +telegram-2204-2-x86_64.ubm|extra|UBLinux module includes Telegram +tor-2204-1-x86_64.ubm|extra|UBLinux module include Tor utils and browser +ubpile-2.15.10-1-x86_64.ubm|extra|Simple management of corporate network nodes using the WEB interface with the executor Node.js +virtual-guest-2204-2-x86_64.ubm|extra|UBLinux module includes agents for Linux guest +virtual-guest-nox-2204-2-x86_64.ubm|extra|UBLinux module includes agents for Linux guest without X support +virtualbox-host-2204-1-x86_64.ubm|extra|UBLinux module includes VirtualBox and extension packs +virtualbox-host-headless-2204-1-x86_64.ubm|extra|UBLinux module includes VirtualBox headless and extension packs +virtualbox-web-2204-1-x86_64.ubm|extra|UBLinux module includes phpvirtualbox for VirtualBox +vivaldi-2204-1-x86_64.ubm|extra|UBLinux module include Vivaldi browser +web-2204-1-x86_64.ubm|extra|UBLinux module includes HTTP server and utilities +webmin-1.994-1-x86_64.ubm|extra|UBLinux module includes Webmin and Usermin +wiki-js-2.5.294-1-x86_64.ubm|extra|UBLinux module include Wiki.js +winbox-2204-1-x86_64.ubm|extra|UBLinux module include Winbox +wine-2204-2-x86_64.ubm|extra|UBLinux module includes wine and utilities +wps-office-11.1.0.11698-1-x86_64.ubm|extra|UBLinux module include Kingsoft Office (WPS Office) - an office productivity suite +xremote-2204-1-x86_64.ubm|extra|UBLinux module include X11 remote utils +yay-2204-1-x86_64.ubm|extra|Yet another yogurt. Pacman wrapper and AUR helper written in go. +zoom-5.14.0-1-x86_64.ubm|extra|UBLinux module include Zoom \ No newline at end of file diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt index c7d96ac..ff57779 100644 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt @@ -52,6 +52,11 @@ set(DEPENDFILES ../images/slide-10.png ../images/slide-11.png ../images/slide-12.png + ../images/slide-12.png + ../images/near_install_disk.png + ../images/in_part_install_disk.png + ../images/clear_install_disk.png + ../images/language.png ../ubinstall-gtk.glade ../ubinstall-gtk-language.glade ../ubinstall-gtk-keyboard.glade diff --git a/source/ubinstall-gtk.c b/source/ubinstall-gtk.c index cb0a406..cb38358 100644 --- a/source/ubinstall-gtk.c +++ b/source/ubinstall-gtk.c @@ -242,7 +242,7 @@ gboolean on_image_slide(void *data){ void on_page_changed(GtkWidget *,GtkWidget *,int page, main_window *widgets); void on_page_changed(GtkWidget *,GtkWidget *,int page, main_window *widgets){ - yon_switch_page_render(widgets,page>3?page-1:page); + yon_switch_page_render(widgets,page>3?page-2:page); switch(page){ case YON_PAGE_WELCOME: { gtk_widget_hide(widgets->CancelInstallButton); @@ -283,14 +283,14 @@ void on_page_navigation_clicked(GtkWidget *self, main_window *widgets){ int active_id=-1; if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widgets->InstallationRadio))) active_id=0; - else if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widgets->InstallationRadio))) + else if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widgets->InstallationNearRadio))) active_id=1; - else if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widgets->InstallationRadio))) + else if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widgets->InstallationLinuxRadio))) active_id=2; - else if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widgets->InstallationRadio))) - active_id=3; - else if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widgets->InstallationRadio))) - active_id=4; + // else if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widgets->InstallationRadio))) + // active_id=3; + // else if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widgets->InstallationRadio))) + // active_id=4; main_config.install_mode=active_id; switch (active_id){ case 0:{ // normal installation @@ -356,7 +356,7 @@ void on_page_navigation_clicked(GtkWidget *self, main_window *widgets){ } char *device; gtk_tree_model_get(model,&iter,0,&device,-1); - yon_config_register(AUTOINSTALL_TYPE_INSTALL,AUTOINSTALL_TYPE_INSTALL,"fast"); + yon_config_register(AUTOINSTALL_TYPE_INSTALL,AUTOINSTALL_TYPE_INSTALL_command,"fast"); yon_config_register(AUTOINSTALL_TYPE_INSTALL,AUTOINSTALL_DEVICE_command,device); gtk_notebook_set_current_page(GTK_NOTEBOOK(widgets->Notebook),3); @@ -381,9 +381,9 @@ void on_page_navigation_clicked(GtkWidget *self, main_window *widgets){ } char *part; gtk_tree_model_get(model,&iter,0,&part,-1); - yon_config_register(AUTOINSTALL_TYPE_INSTALL,AUTOINSTALL_TYPE_INSTALL,"near"); + yon_config_register(AUTOINSTALL_TYPE_INSTALL,AUTOINSTALL_TYPE_INSTALL_command,"near"); yon_config_register(AUTOINSTALL_TYPE_INSTALL,AUTOINSTALL_DEVICE_command,device); - yon_config_register(AUTOINSTALL_TYPE_INSTALL,AUTOSTART_PARTS,part); + yon_config_register(AUTOINSTALL_TYPE_INSTALL,AUTOSTART_PARTS_command,part); gtk_notebook_set_current_page(GTK_NOTEBOOK(widgets->Notebook),3); if (!main_config.slider_thread) @@ -394,23 +394,23 @@ void on_page_navigation_clicked(GtkWidget *self, main_window *widgets){ { GtkTreeModel *model; GtkTreeIter iter; - if (!gtk_tree_selection_get_selected(gtk_tree_view_get_selection(GTK_TREE_VIEW(widgets->InstallationNearSysDevicesTree)),&model,&iter)){ + if (!gtk_tree_selection_get_selected(gtk_tree_view_get_selection(GTK_TREE_VIEW(widgets->SamePlaceDeviceTree)),&model,&iter)){ yon_ubl_status_box_spawn(GTK_CONTAINER(widgets->StatusBox),NO_DEVICE_CHOSEN_LABEL,5,BACKGROUND_IMAGE_FAIL_TYPE); yon_ubl_status_highlight_incorrect(gtk_widget_get_parent(widgets->CommonInstallationDevicesTree)); return; } char *device; gtk_tree_model_get(model,&iter,0,&device,-1); - if (!gtk_tree_selection_get_selected(gtk_tree_view_get_selection(GTK_TREE_VIEW(widgets->InstallationNearSysSectionTree)),&model,&iter)){ + if (!gtk_tree_selection_get_selected(gtk_tree_view_get_selection(GTK_TREE_VIEW(widgets->SamePlacePartTree)),&model,&iter)){ yon_ubl_status_box_spawn(GTK_CONTAINER(widgets->StatusBox),NO_DEVICE_CHOSEN_LABEL,5,BACKGROUND_IMAGE_FAIL_TYPE); yon_ubl_status_highlight_incorrect(gtk_widget_get_parent(widgets->CommonInstallationDevicesTree)); return; } char *part; gtk_tree_model_get(model,&iter,0,&part,-1); - yon_config_register(AUTOINSTALL_TYPE_INSTALL,AUTOINSTALL_TYPE_INSTALL,"near"); + yon_config_register(AUTOINSTALL_TYPE_INSTALL,AUTOINSTALL_TYPE_INSTALL_command,"near"); yon_config_register(AUTOINSTALL_TYPE_INSTALL,AUTOINSTALL_DEVICE_command,device); - yon_config_register(AUTOINSTALL_TYPE_INSTALL,AUTOSTART_PARTS,part); + yon_config_register(AUTOINSTALL_TYPE_INSTALL,AUTOSTART_PARTS_command,part); gtk_notebook_set_current_page(GTK_NOTEBOOK(widgets->Notebook),3); if (!main_config.slider_thread) @@ -470,6 +470,84 @@ void on_additional_software_toggled(){ } +void on_near_installation_device_changed(GtkWidget *, main_window *widgets); +void on_near_installation_device_changed(GtkWidget *, main_window *widgets){ + gtk_list_store_clear(widgets->PartitionsList); + GtkTreeIter iter; + GtkTreeModel *model; + if (gtk_tree_selection_get_selected(gtk_tree_view_get_selection(GTK_TREE_VIEW(widgets->InstallationNearSysDevicesTree)),&model,&iter)){ + char *disk_path=""; + gtk_tree_model_get(model,&iter,0,&disk_path,-1); + int size; + config_str parsed; + parsed = yon_config_load(get_parts_and_devices_command,&size); + char *string = yon_char_parsed_to_string(parsed,size,""); + struct json_object *root; + struct json_object *blockdevices; + root = json_tokener_parse(string); + json_object_object_get_ex(root, "blockdevices", &blockdevices); + for (long unsigned int i = 0; i < json_object_array_length(blockdevices); i++) { + struct json_object *device = json_object_array_get_idx(blockdevices, i); + struct json_object *type, *path, *size, *model, *vendor, *serial; + + json_object_object_get_ex(device, "type", &type); + if (strcmp("part",json_object_get_string(type))) + continue; + json_object_object_get_ex(device, "path", &path); + if (!strstr(json_object_get_string(path),disk_path)){ + continue; + } + json_object_object_get_ex(device, "size", &size); + json_object_object_get_ex(device, "model", &model); + json_object_object_get_ex(device, "vendor", &vendor); + json_object_object_get_ex(device, "serial", &serial); + + gtk_list_store_append(widgets->PartitionsList,&iter); + gtk_list_store_set(widgets->PartitionsList,&iter,0,json_object_get_string(path),1,json_object_get_string(model),2,json_object_get_string(serial),3,json_object_get_string(size),4,json_object_get_string(vendor),-1); + } + yon_char_parsed_free(parsed,size); + } +} + +void on_same_installation_device_changed(GtkWidget *, main_window *widgets); +void on_same_installation_device_changed(GtkWidget *, main_window *widgets){ + gtk_list_store_clear(widgets->PartitionsList); + GtkTreeIter iter; + GtkTreeModel *model; + if (gtk_tree_selection_get_selected(gtk_tree_view_get_selection(GTK_TREE_VIEW(widgets->SamePlaceDeviceTree)),&model,&iter)){ + char *disk_path=""; + gtk_tree_model_get(model,&iter,0,&disk_path,-1); + int size; + config_str parsed; + parsed = yon_config_load(get_parts_and_devices_command,&size); + char *string = yon_char_parsed_to_string(parsed,size,""); + struct json_object *root; + struct json_object *blockdevices; + root = json_tokener_parse(string); + json_object_object_get_ex(root, "blockdevices", &blockdevices); + for (long unsigned int i = 0; i < json_object_array_length(blockdevices); i++) { + struct json_object *device = json_object_array_get_idx(blockdevices, i); + struct json_object *type, *path, *size, *model, *vendor, *serial; + + json_object_object_get_ex(device, "type", &type); + if (strcmp("part",json_object_get_string(type))) + continue; + json_object_object_get_ex(device, "path", &path); + if (!strstr(json_object_get_string(path),disk_path)){ + continue; + } + json_object_object_get_ex(device, "size", &size); + json_object_object_get_ex(device, "model", &model); + json_object_object_get_ex(device, "vendor", &vendor); + json_object_object_get_ex(device, "serial", &serial); + + gtk_list_store_append(widgets->PartitionsList,&iter); + gtk_list_store_set(widgets->PartitionsList,&iter,0,json_object_get_string(path),1,json_object_get_string(model),2,json_object_get_string(serial),3,json_object_get_string(size),4,json_object_get_string(vendor),-1); + } + yon_char_parsed_free(parsed,size); + } +} + /**yon_main_window_complete(main_window *widgets) * [EN] * @@ -539,6 +617,21 @@ main_window *yon_main_window_complete(){ widgets->CommonInstallationDevicesTree = yon_gtk_builder_get_widget(builder,"CommonInstallationDevicesTree"); widgets->AdditionalSoftwareTree = yon_gtk_builder_get_widget(builder,"AdditionalSoftwareTree"); + widgets->SamePlaceDeviceTree = yon_gtk_builder_get_widget(builder,"SamePlaceDeviceTree"); + widgets->SamePlacePartTree = yon_gtk_builder_get_widget(builder,"SamePlacePartTree"); + widgets->SamePlaceSizeSpin = yon_gtk_builder_get_widget(builder,"SamePlaceSizeSpin"); + widgets->SamePlaceSizeTypeSpin = yon_gtk_builder_get_widget(builder,"SamePlaceSizeTypeSpin"); + + widgets->InstallationNearSysDevicesTree = yon_gtk_builder_get_widget(builder,"InstallationNearSysDevicesTree"); + widgets->InstallationNearSysSectionTree = yon_gtk_builder_get_widget(builder,"InstallationNearSysSectionTree"); + widgets->InstallationNearSizeSpin = yon_gtk_builder_get_widget(builder,"InstallationNearSizeSpin"); + widgets->InstallationNearSizeTypeSpin = yon_gtk_builder_get_widget(builder,"InstallationNearSizeTypeSpin"); + + widgets->InstallationProgress = yon_gtk_builder_get_widget(builder,"InstallationProgress"); + widgets->InstallationLabel = yon_gtk_builder_get_widget(builder,"InstallationLabel"); + widgets->PackageInstallationProgress = yon_gtk_builder_get_widget(builder,"PackageInstallationProgress"); + widgets->PackageInstallationLabel = yon_gtk_builder_get_widget(builder,"PackageInstallationLabel"); + widgets->StatusBox = yon_gtk_builder_get_widget(builder,"StatusBox"); widgets->AdditionalSoftwareCell = GTK_CELL_RENDERER(gtk_builder_get_object(builder,"AdditionalSoftwareCell")); @@ -546,6 +639,7 @@ main_window *yon_main_window_complete(){ widgets->LanguagesFilter = GTK_TREE_MODEL(gtk_builder_get_object(builder,"LanguagesFilter")); widgets->LayoutList = GTK_TREE_STORE(gtk_builder_get_object(builder,"LayoutList")); widgets->AdditionalSoftwareList = GTK_LIST_STORE(gtk_builder_get_object(builder,"AdditionalSoftwareList")); + widgets->PartitionsList = GTK_LIST_STORE(gtk_builder_get_object(builder,"PartitionsList")); g_signal_connect(G_OBJECT(widgets->Notebook),"switch-page",G_CALLBACK(on_page_changed),widgets); g_signal_connect(G_OBJECT(widgets->MainWindow),"check-resize",G_CALLBACK(on_region_resized),widgets); @@ -563,6 +657,7 @@ main_window *yon_main_window_complete(){ g_signal_connect(G_OBJECT(widgets->LocationToggle),"toggled",G_CALLBACK(on_toggle_block),NULL); g_signal_connect(G_OBJECT(widgets->SectionsToggle),"toggled",G_CALLBACK(on_toggle_block),NULL); g_signal_connect(G_OBJECT(widgets->InstallationToggle),"toggled",G_CALLBACK(on_toggle_block),NULL); + g_signal_connect(G_OBJECT(widgets->InstallationNearSysDevicesTree),"cursor-changed",G_CALLBACK(on_near_installation_device_changed),widgets); g_signal_connect(G_OBJECT(widgets->LanguageCombo),"changed",G_CALLBACK(on_locale_changed),widgets); g_signal_connect(G_OBJECT(widgets->AdditionalSoftwareCell),"toggled",G_CALLBACK(on_additional_software_toggled),widgets); @@ -648,26 +743,29 @@ main_window *yon_main_window_complete(){ } } yon_char_parsed_free(parsed,size); - parsed = yon_config_load(get_devices_command,&size); - char *string = yon_char_parsed_to_string(parsed,size,""); - struct json_object *root; - struct json_object *blockdevices; - root = json_tokener_parse(string); - json_object_object_get_ex(root, "blockdevices", &blockdevices); - for (long unsigned int i = 0; i < json_object_array_length(blockdevices); i++) { - struct json_object *device = json_object_array_get_idx(blockdevices, i); - struct json_object *path, *size, *model, *vendor, *serial; - - json_object_object_get_ex(device, "path", &path); - json_object_object_get_ex(device, "size", &size); - json_object_object_get_ex(device, "model", &model); - json_object_object_get_ex(device, "vendor", &vendor); - json_object_object_get_ex(device, "serial", &serial); - - gtk_list_store_append(widgets->DevicesList,&iter); - gtk_list_store_set(widgets->DevicesList,&iter,0,json_object_get_string(path),1,json_object_get_string(model),2,json_object_get_string(serial),3,json_object_get_string(size),4,json_object_get_string(vendor),-1); + { + parsed = yon_config_load(get_devices_command,&size); + char *string = yon_char_parsed_to_string(parsed,size,""); + struct json_object *root; + struct json_object *blockdevices; + root = json_tokener_parse(string); + json_object_object_get_ex(root, "blockdevices", &blockdevices); + for (long unsigned int i = 0; i < json_object_array_length(blockdevices); i++) { + struct json_object *device = json_object_array_get_idx(blockdevices, i); + struct json_object *path, *size, *model, *vendor, *serial; + + json_object_object_get_ex(device, "path", &path); + json_object_object_get_ex(device, "size", &size); + json_object_object_get_ex(device, "model", &model); + json_object_object_get_ex(device, "vendor", &vendor); + json_object_object_get_ex(device, "serial", &serial); + + gtk_list_store_append(widgets->DevicesList,&iter); + gtk_list_store_set(widgets->DevicesList,&iter,0,json_object_get_string(path),1,json_object_get_string(model),2,json_object_get_string(serial),3,json_object_get_string(size),4,json_object_get_string(vendor),-1); + } + yon_char_parsed_free(parsed,size); } - yon_char_parsed_free(parsed,size); + parsed = yon_resource_open_file(additional_software_path,&size); for (int i=1;i + + + + + + + + + + + + + + 100 1 @@ -124,7 +138,6 @@ False com.ublinux.ubinstall-gtk.arrow-right-symbolic - True False @@ -406,7 +419,7 @@ and help you install UBLinux on your computer True False 128 - com.ublinux.libublsettingsui-gtk3 + /com/ublinux/images/language.png False @@ -563,7 +576,7 @@ and help you install UBLinux on your computer True False - gtk-missing-image + /com/ublinux/images/clear_install_disk.png False @@ -638,7 +651,7 @@ and help you install UBLinux on your computer True False - gtk-missing-image + /com/ublinux/images/near_install_disk.png False @@ -713,7 +726,7 @@ and help you install UBLinux on your computer True False - gtk-missing-image + /com/ublinux/images/in_part_install_disk.png False @@ -981,55 +994,62 @@ and help you install UBLinux on your computer 5 5 - + True True - AdditionalSoftwareList - 0 - - - + in - - Chosen + + True + True + AdditionalSoftwareList + 0 + + + - - - 0 - + + Chosen + + + + 0 + + + - - - - - Module name - - - 1 - + + Module name + + + + 1 + + + - - - - - Tag - - - 2 - + + Tag + + + + 2 + + + - - - - - Description - - - 3 - + + Description + + + + 3 + + + @@ -1105,55 +1125,62 @@ and help you install UBLinux on your computer 5 5 - + True True - AdditionalSoftwareList - 0 - - - + in - - Chosen + + True + True + AdditionalSoftwareList + 0 + + + - - - 0 - + + Chosen + + + + 0 + + + - - - - - Module name - - - 1 - + + Module name + + + + 1 + + + - - - - - Tag - - - 2 - + + Tag + + + + 2 + + + - - - - - Description - - - 3 - + + Description + + + + 3 + + + @@ -2296,13 +2323,12 @@ and help you install UBLinux on your computer True False - center 5 True False - gtk-missing-image + /com/ublinux/images/clear_install_disk.png False @@ -2512,7 +2538,7 @@ and help you install UBLinux on your computer True False - gtk-missing-image + /com/ublinux/images/near_install_disk.png False @@ -2624,7 +2650,6 @@ installed. - True True True image36 @@ -2760,7 +2785,7 @@ installed. True True - liststore2 + PartitionsList @@ -2769,6 +2794,9 @@ installed. Section + + 0 + @@ -2777,6 +2805,9 @@ installed. Capacity + + 1 + @@ -2785,14 +2816,31 @@ installed. Free space + + 2 + - System + File system + + + + 3 + + + + + + + Mark + + 4 + @@ -2830,7 +2878,7 @@ installed. - + True True 0 @@ -2843,7 +2891,7 @@ installed. - + True False @@ -2926,7 +2974,7 @@ installed. True False - gtk-missing-image + /com/ublinux/images/in_part_install_disk.png False @@ -3037,7 +3085,6 @@ installed. - True True True image1 @@ -3079,6 +3126,9 @@ installed. Device + + 0 + @@ -3087,6 +3137,9 @@ installed. Mark + + 1 + @@ -3095,6 +3148,9 @@ installed. Capacity + + 2 + @@ -3103,6 +3159,9 @@ installed. Location + + 3 + @@ -3150,7 +3209,7 @@ installed. True True - liststore2 + PartitionsList @@ -3159,6 +3218,9 @@ installed. Section + + 0 + @@ -3167,6 +3229,9 @@ installed. Capacity + + 1 + @@ -3175,14 +3240,31 @@ installed. Free space + + 2 + - System + File system + + 3 + + + + + + + Mark + + + + 4 + @@ -3220,7 +3302,7 @@ installed. - + True True 0 @@ -3233,7 +3315,7 @@ installed. - + True False @@ -3428,7 +3510,6 @@ installed. - True True True image2 @@ -3541,7 +3622,7 @@ installed. True True - liststore2 + PartitionsList @@ -4839,7 +4920,7 @@ separately into the selected partition. True True - liststore2 + PartitionsList @@ -5179,7 +5260,7 @@ separately into the selected partition. True True - liststore2 + PartitionsList @@ -5327,7 +5408,7 @@ separately into the selected partition. vertical 5 - + True False @@ -5343,7 +5424,7 @@ separately into the selected partition. False 5 - + True False label @@ -5357,7 +5438,6 @@ separately into the selected partition. button - True True True @@ -5376,7 +5456,7 @@ separately into the selected partition. - + True False @@ -5392,7 +5472,7 @@ separately into the selected partition. False 5 - + True False label @@ -5406,7 +5486,6 @@ separately into the selected partition. button - True True True