Visual updates; Localisation updates; Fixes

gresource.xml

@@ -27,23 +27,6 @@
     <file>ubinstall-gtk.css</file>
   </gresource>
   <gresource prefix="/com/ublinux/images">
-    <file>map-time-zone.png</file>
-    <file>keyboard.png</file>
-    <file>keyboard-ru.png</file>
-    <file>slide-0.png</file>
-    <file>slide-1.png</file>
-    <file>slide-2.png</file>
-    <file>slide-3.png</file>
-    <file>slide-4.png</file>
-    <file>slide-5.png</file>
-    <file>slide-6.png</file>
-    <file>slide-7.png</file>
-    <file>slide-8.png</file>
-    <file>slide-9.png</file>
-    <file>slide-10.png</file>
-    <file>slide-11.png</file>
-    <file>slide-12.png</file>
-    <file>language.png</file>
     <file>install_type_custom_normal.png</file>
     <file>install_type_data_only_normal.png</file>
     <file>install_type_fast_normal.png</file>

locale/groups-list.pot

@@ -0,0 +1,152 @@
+msgid "Docker and webmanager and utils"
+msgstr ""
+
+msgid "Containerization"
+msgstr ""
+
+msgid "Podman and webmanager and utils"
+msgstr ""
+
+msgid "Brother printer drivers"
+msgstr ""
+
+msgid "Canon CAPT Printer Driver"
+msgstr ""
+
+msgid "Canon UFR II LIPSLX CARPS2 printer driver"
+msgstr ""
+
+msgid "Epson printer drivers"
+msgstr ""
+
+msgid "Kyocera printer drivers"
+msgstr ""
+
+msgid "Lexmark drivers"
+msgstr ""
+
+msgid "Pantum printer drivers"
+msgstr ""
+
+msgid "hplip, gutenprint, foomatic printers drivers"
+msgstr ""
+
+msgid "Printer"
+msgstr ""
+
+msgid "Ricoh drivers"
+msgstr ""
+
+msgid "Samsung drivers"
+msgstr ""
+
+msgid "Drivers"
+msgstr ""
+
+msgid "Xerox drivers"
+msgstr ""
+
+msgid "Education"
+msgstr ""
+
+msgid "soft collection"
+msgstr ""
+
+msgid "Multimedia"
+msgstr ""
+
+msgid "Collection"
+msgstr ""
+
+msgid "Multimedia soft collection"
+msgstr ""
+
+msgid "Blender and utilities"
+msgstr ""
+
+msgid "AnyDesk"
+msgstr ""
+
+msgid "Realvnc viewer and server"
+msgstr ""
+
+msgid "Rustdesk"
+msgstr ""
+
+msgid "Remote desktop"
+msgstr ""
+
+msgid "Rustdesk gateway server"
+msgstr ""
+
+msgid "Chat"
+msgstr ""
+
+msgid "Telegram"
+msgstr ""
+
+msgid "Web servers"
+msgstr ""
+
+msgid "Webmin and Usermin"
+msgstr ""
+
+msgid "Network"
+msgstr ""
+
+msgid "Managment"
+msgstr ""
+
+msgid "UBPile Workflow"
+msgstr ""
+
+msgid "Kingsoft Office (WPS Office) - an office productivity suite"
+msgstr ""
+
+msgid "OnlyOffice suite"
+msgstr ""
+
+msgid "LibreOffice"
+msgstr ""
+
+msgid "Chromium and some plugins"
+msgstr ""
+
+msgid "Chromium and some plugins"
+msgstr ""
+
+msgid "Office"
+msgstr ""
+
+msgid "Browser"
+msgstr ""
+
+msgid "Firefox and some plugins"
+msgstr ""
+
+msgid "ubm"
+msgstr ""
+
+msgid "Yandex Browser and some utils"
+msgstr ""
+
+msgid "QEMU"
+msgstr ""
+
+msgid "QEMU, manager and utils"
+msgstr ""
+
+msgid "VirtualBox"
+msgstr ""
+
+msgid "VirtualBox and extension packs"
+msgstr ""
+
+msgid "Virtualization"
+msgstr ""
+
+msgid "Vmware"
+msgstr ""
+
+msgid "Vmware Workstation 17
+msgstr ""

locale/groups-list_ru.po

@@ -0,0 +1,168 @@
+# Language translations for ubinstal package.
+# Copyright (C) 2022, UBTech LLC
+# This file is distributed under the same license as the ubinstal package.
+# UBLinux Team <info@ublinux.com>, 2022
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: ubinstal 1.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-05-22 16:12+0600\n"
+"PO-Revision-Date: \n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid "Docker and webmanager and utils"
+msgstr "Docker, веб-менеджер и утилиты"
+
+msgid "Containerization"
+msgstr "Контейнеризация"
+
+msgid "Podman and webmanager and utils"
+msgstr "Podman, веб-менеджер и утилиты"
+
+msgid "Brother printer drivers"
+msgstr "Драйверы принтеров Brother"
+
+msgid "Canon CAPT Printer Driver"
+msgstr "Драйвер принтера Canon CAPT"
+
+msgid "Canon UFR II LIPSLX CARPS2 printer driver"
+msgstr "Драйвер принтера Canon UFR II LIPSLX CARPS2"
+
+msgid "Epson printer drivers"
+msgstr "Драйверы принтеров Epson"
+
+msgid "Kyocera printer drivers"
+msgstr "Драйверы принтеров Kyocera"
+
+msgid "Lexmark drivers"
+msgstr "Драйверы Lexmark"
+
+msgid "Pantum printer drivers"
+msgstr "Драйверы принтеров Pantum"
+
+msgid "hplip, gutenprint, foomatic printers drivers"
+msgstr "Драйверы принтеров hplip, gutenprint, foomatic"
+
+msgid "Printer"
+msgstr "Принтер"
+
+msgid "Ricoh drivers"
+msgstr "Драйверы Ricoh"
+
+msgid "Samsung drivers"
+msgstr "Драйверы Samsung"
+
+msgid "Drivers"
+msgstr "Драйверы"
+
+msgid "Xerox drivers"
+msgstr "Драйверы Xerox"
+
+msgid "Education"
+msgstr "Образование"
+
+msgid "soft collection"
+msgstr "Коллекция программного обеспечения"
+
+msgid "Multimedia"
+msgstr "Мультимедиа"
+
+msgid "Collection"
+msgstr "Коллекция"
+
+msgid "Multimedia soft collection"
+msgstr "Мультимедийная коллекция программного обеспечения"
+
+msgid "Blender and utilities"
+msgstr "Blender и утилиты"
+
+msgid "AnyDesk"
+msgstr "AnyDesk"
+
+msgid "Realvnc viewer and server"
+msgstr "Просмотрщик и сервер Realvnc"
+
+msgid "Rustdesk"
+msgstr "Rustdesk"
+
+msgid "Remote desktop"
+msgstr "Удаленный рабочий стол"
+
+msgid "Rustdesk gateway server"
+msgstr "Сервер шлюза Rustdesk"
+
+msgid "Chat"
+msgstr "Чат"
+
+msgid "Telegram"
+msgstr "Telegram"
+
+msgid "Web servers"
+msgstr "Веб-серверы"
+
+msgid "Webmin and Usermin"
+msgstr "Webmin и Usermin"
+
+msgid "Network"
+msgstr "Сеть"
+
+msgid "Managment"
+msgstr "Управление"
+
+msgid "UBPile Workflow"
+msgstr "Рабочий процесс UBPile"
+
+msgid "Kingsoft Office (WPS Office) - an office productivity suite"
+msgstr "Kingsoft Office (WPS Office) - офисный пакет"
+
+msgid "OnlyOffice suite"
+msgstr "Пакет OnlyOffice"
+
+msgid "LibreOffice"
+msgstr "LibreOffice"
+
+msgid "Chromium and some plugins"
+msgstr "Chromium и некоторые другие плагины"
+
+msgid "Office"
+msgstr "Office"
+
+msgid "Browser"
+msgstr "Браузер"
+
+msgid "Firefox and some plugins"
+msgstr "Firefox и некоторые плагины"
+
+msgid "ubm"
+msgstr "ubm"
+
+msgid "Yandex Browser and some utils"
+msgstr "Браузер Yandex и некоторые утилиты"
+
+msgid "QEMU"
+msgstr "QEMU"
+
+msgid "QEMU, manager and utils"
+msgstr "QEMU, менеджер и утилиты"
+
+msgid "VirtualBox"
+msgstr "VirtualBox"
+
+msgid "VirtualBox and extension packs"
+msgstr "VirtualBox и пакеты расширений"
+
+msgid "Virtualization"
+msgstr "Виртуализация"
+
+msgid "Vmware"
+msgstr "VMware"
+
+msgid "Vmware Workstation 17"
+msgstr "VMware Workstation 17"

locale/kernel-list-addon_ru.po

@@ -19,48 +19,48 @@ msgstr ""
 
 #: ./kernel-list-addon.csv:2
 msgid "The Linux kernel headers v5.15"
-msgstr ""
+msgstr "Заголовочные файлы ядра Linux версии 5.15"
 
 #: ./kernel-list-addon.csv:3
 msgid "The Linux kernel docs v5.15"
-msgstr ""
+msgstr "Документация ядра Linux версии 5.15"
 
 #: ./kernel-list-addon.csv:4
 msgid "The Linux kernel DKMS modules v5.15 : v4l2loopback, rtl88x2bu, r8125, rtl8192eu"
-msgstr ""
+msgstr "Модули DKMS ядра Linux версии 5.15: v4l2loopback, rtl88x2bu, r8125, rtl8192eu"
 
 #: ./kernel-list-addon.csv:5
 msgid "The Linux kernel DKMS modules v5.15 : r8168-8136"
-msgstr ""
+msgstr "Модули DKMS ядра Linux версии 5.15: r8168-8136"
 
 #: ./kernel-list-addon.csv:6
 msgid "The Linux kernel headers v6.1"
-msgstr ""
+msgstr "Заголовочные файлы ядра Linux версии 6.1"
 
 #: ./kernel-list-addon.csv:7
 msgid "The Linux kernel docs v6.1"
-msgstr ""
+msgstr "Документация ядра Linux версии 6.1"
 
 #: ./kernel-list-addon.csv:8
 msgid "The Linux kernel DKMS modules v6.1 : v4l2loopback, rtl88x2bu, r8125, rtl8192eu"
-msgstr ""
+msgstr "Модули DKMS ядра Linux версии 6.1: v4l2loopback, rtl88x2bu, r8125, rtl8192eu"
 
 #: ./kernel-list-addon.csv:9
 msgid "The Linux kernel DKMS modules v6.1 : r8168-8136"
-msgstr ""
+msgstr "Модули DKMS ядра Linux версии 6.1: r8168-8136"
 
 #: ./kernel-list-addon.csv:10
 msgid "The Linux kernel headers v6.6"
-msgstr ""
+msgstr "Заголовочные файлы ядра Linux версии 6.6"
 
 #: ./kernel-list-addon.csv:11
 msgid "The Linux kernel docs v6.6"
-msgstr ""
+msgstr "Документация ядра Linux версии 6.6"
 
 #: ./kernel-list-addon.csv:12
 msgid "The Linux kernel DKMS modules v6.6 : v4l2loopback, rtl88x2bu, r8125, rtl8192eu"
-msgstr ""
+msgstr "Модули DKMS ядра Linux версии 6.6: v4l2loopback, rtl88x2bu, r8125, rtl8192eu"
 
 #: ./kernel-list-addon.csv:13
 msgid "The Linux kernel DKMS modules v6.6 : r8168-8136"
-msgstr ""
+msgstr "Модули DKMS ядра Linux версии 6.6: r8168-8136"

source/CMakeLists.txt

@@ -36,24 +36,6 @@ find_program(GLIB_COMPILE_RESOURCES NAMES glib-compile-resources REQUIRED)
 add_custom_target(GLADE ubinstall-gtk.glade)
 
 set(DEPENDFILES 
-                ../images/keyboard.png
-                ../images/keyboard-ru.png
-                ../images/map-time-zone.png
-                ../images/slide-0.png
-                ../images/slide-1.png
-                ../images/slide-2.png
-                ../images/slide-3.png
-                ../images/slide-4.png
-                ../images/slide-5.png
-                ../images/slide-6.png
-                ../images/slide-7.png
-                ../images/slide-8.png
-                ../images/slide-9.png
-                ../images/slide-10.png
-                ../images/slide-11.png
-                ../images/slide-12.png
-                ../images/slide-12.png
-                ../images/language.png
                 ../ubinstall-gtk.glade
                 ../ubinstall-gtk-language.glade
                 ../ubinstall-gtk-keyboard.glade

source/ubinstall-gtk-components.c

@@ -31,7 +31,6 @@ int yon_kernel_save(main_window *widgets){
 }
 
 int yon_kernel_addon_save(main_window *widgets){
-    // yon_kernel_save(widgets);
     char *parameter = config(modules_extra_parameter);
     GList *list = gtk_container_get_children(GTK_CONTAINER(widgets->KernelAddonListBox));
     char *install_modules = yon_char_new(parameter);

source/ubinstall-gtk-config-hub.c

@@ -182,7 +182,6 @@ void yon_configuration_hub_init(main_window *widgets){
     yon_configuration_hub_add(GTK_FLOW_BOX(widgets->HubPackagesListBox),SOFTWARE_LABEL,"com.ublinux.ubl-settings-update",YON_PAGE_SOFTWARE);
     yon_configuration_hub_add(GTK_FLOW_BOX(widgets->HubPackagesListBox),PACMAN_SOFTWARE_LABEL,"com.ublinux.ubl-settings-repomanager",YON_PAGE_PACMAN_SOFTWARE);
     yon_configuration_hub_add(GTK_FLOW_BOX(widgets->HubPackagesListBox),PACKAGES_SECTION_LABEL,"com.ublinux.ubl-settings-repomanager",YON_PAGE_PACKAGES);
-    // yon_configuration_hub_add(GTK_FLOW_BOX(widgets->HubPackagesListBox),KERNEL_ADDON_LABEL,icon_path,YON_PAGE_KERNEL_ADDON);
     yon_configuration_hub_add(GTK_FLOW_BOX(widgets->HubPersonalListBox),REGION_ICON_LABEL,"com.ublinux.ubl-settings-system",YON_PAGE_REGION);
     yon_configuration_hub_add(GTK_FLOW_BOX(widgets->HubPersonalListBox),LOCALE_LANGUAGE_LABEL,"com.ublinux.ubl-settings-system",YON_PAGE_LANGUAGE);
     yon_configuration_hub_add(GTK_FLOW_BOX(widgets->HubPersonalListBox),KEYBOARD_TAB_LABEL,"com.ublinux.ubl-settings-keyboard",YON_PAGE_KEYBOARD);

source/ubinstall-gtk-configuration-mode.c

@@ -53,7 +53,14 @@ void on_path_choose(GtkWidget *,configuration_window *window){
 
 void on_configuration_exit(GtkWidget *,configuration_window *window){
     main_window *widgets = g_object_get_data(G_OBJECT(window->Window),"widgets");
-    gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(widgets->ConfigurationModeMenuItem),0);
+    
+    GList *box = gtk_container_get_children(GTK_CONTAINER(widgets->ConfigurationModeMenuItem));
+    GList *children = gtk_container_get_children(GTK_CONTAINER(box->data));
+
+    GtkWidget *Check = GTK_WIDGET(g_list_nth_data(children,1));
+    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(Check),0);
+    g_list_free(box);
+    g_list_free(children);
     gtk_widget_destroy(window->Window);
     if (getuid()){
         gtk_main_quit();
@@ -61,7 +68,13 @@ void on_configuration_exit(GtkWidget *,configuration_window *window){
 }
 
 void on_configuration_mode_switch(GtkWidget *self,main_window *widgets){
-    if (gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(self))){
+
+    GList *box = gtk_container_get_children(GTK_CONTAINER(self));
+    GList *children = gtk_container_get_children(GTK_CONTAINER(box->data));
+
+    GtkWidget *Check = GTK_WIDGET(g_list_nth_data(children,1));
+    int active = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(Check));
+    if (!gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(Check))){
         GtkBuilder *builder = gtk_builder_new_from_resource(glade_path_configuration_mode);
         configuration_window *window = malloc(sizeof(configuration_window));
         window->Window = yon_gtk_builder_get_widget(builder,"MainWindow");
@@ -100,7 +113,6 @@ void on_configuration_mode_switch(GtkWidget *self,main_window *widgets){
             main_config.configure_mode = 1;
         }
         gtk_widget_destroy(window->Window);
-        return;
 
     } else {
         yon_ubl_status_box_despawn_infinite(GTK_CONTAINER(widgets->StatusBox));
@@ -110,4 +122,8 @@ void on_configuration_mode_switch(GtkWidget *self,main_window *widgets){
         main_config.configure_mode = 0;
 
     }
+    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(Check),!active);
+    g_list_free(box);
+    g_list_free(children);
+
 }

source/ubinstall-gtk-decorations.c

@@ -15,11 +15,13 @@ gboolean on_install_slider_hover_highlight_end(GtkWidget *, GdkEvent *, main_win
 
 void on_install_slider_next(GtkWidget* ,GdkEventButton *,main_window *widgets){
     main_config.chosen_slide=main_config.chosen_slide->next?main_config.chosen_slide->next:g_list_first(main_config.chosen_slide);
+    widgets->slider_stop=1;
     yon_install_slider_update(widgets);
 }
 
 void on_install_slider_prev(GtkWidget* ,GdkEventButton *,main_window *widgets){
     main_config.chosen_slide=main_config.chosen_slide->prev?main_config.chosen_slide->prev:g_list_last(main_config.chosen_slide);
+    widgets->slider_stop=1;
     yon_install_slider_update(widgets);
 }
 
@@ -135,8 +137,19 @@ void yon_install_slider_init(main_window *widgets){
     yon_install_slider_update(widgets);
     gtk_overlay_add_overlay(GTK_OVERLAY(widgets->InstallationSliderArrowsOverlay),widgets->NextInstallationSliderImage);
     gtk_overlay_add_overlay(GTK_OVERLAY(widgets->InstallationSliderArrowsOverlay),widgets->PrevInstallationSliderImage);
+    g_timeout_add_seconds(10,(GSourceFunc)on_install_slider_slide,widgets);
 }
 
-// void *on_install_slider_slide(){
+gboolean on_install_slider_slide_proceed(main_window *widgets){
+    main_config.chosen_slide=main_config.chosen_slide->next?main_config.chosen_slide->next:g_list_first(main_config.chosen_slide);
+    yon_install_slider_update(widgets);
+    return G_SOURCE_REMOVE;
+}
 
-// }
+gboolean on_install_slider_slide(main_window *widgets){
+    if (!widgets->slider_stop){
+        g_idle_add((GSourceFunc)on_install_slider_slide_proceed,widgets);
+        return G_SOURCE_CONTINUE;
+    }
+    return G_SOURCE_REMOVE;
+}

source/ubinstall-gtk-installation.c

@@ -225,60 +225,6 @@ int yon_advanced_sections_save(dictionary *dict){
     return 1;
 }
 
-// int yon_install_advanced_save(main_window *widgets){
-
-//     GtkTreeModel *model;
-//     GtkTreeIter iter;
-//     if (!gtk_tree_selection_get_selected(gtk_tree_view_get_selection(GTK_TREE_VIEW(widgets->AdvancedDeviceTree)),&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->AdvancedDeviceTree));
-//         return 0;
-//     }
-//     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->AdvancedPartitionTree)),&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->AdvancedPartitionTree));
-//         return 0;
-//     }
-//     yon_config_remove_by_key(part_size_parameter);
-//     char *part;
-//     gtk_tree_model_get(model,&iter,0,&part,-1);
-
-//     if (!yon_advanced_sections_save(widgets->advanced_sections)){
-//         return 0;
-//     }
-
-//     if (gtk_switch_get_active(GTK_SWITCH(widgets->AdvancedSwapSwitch))){
-//         if (gtk_switch_get_active(GTK_SWITCH(widgets->AdvancedSwapAutoSwitch))){
-//             yon_config_register(swap_parameter,swap_parameter_command,"auto");
-//         } else if (gtk_switch_get_active(GTK_SWITCH(widgets->AdvancedSwapRamSwitch))){
-//             yon_config_register(swap_parameter,swap_parameter_command,"yes");
-//             yon_config_register(swap_size_parameter,swap_size_parameter_command,"ram");
-//         } else {
-//             yon_config_register(swap_parameter,swap_parameter_command,"yes");
-//             char *swap = g_strdup_printf("%d%s",gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(widgets->AdvancedSwapFixedSpin)),yon_size_get_mod(gtk_combo_box_get_active(GTK_COMBO_BOX(widgets->AdvancedSwapFixedSizeSwitch))+1));
-//             yon_config_register(swap_size_parameter,swap_size_parameter_command,swap);
-//         }
-//     }
-//     const char *device_typevfs = gtk_combo_box_get_active_id(GTK_COMBO_BOX(widgets->AdvancedVirtualDeviceCombo));
-//     if (!yon_char_is_empty(device_typevfs)){
-//         yon_config_register(device_typevfs_parameter,device_typevfs_parameter_command,(char*)device_typevfs);
-//     } else {
-//         yon_config_remove_by_key(device_typevfs_parameter);
-//     }
-//     if (gtk_switch_get_active(GTK_SWITCH(widgets->AdvancedLoadTypeSwitch))){
-//         char *bios = gtk_switch_get_active(GTK_SWITCH(widgets->AdvancedBiosSectorSwitch))?"bios":"";
-//         char *efi = gtk_switch_get_active(GTK_SWITCH(widgets->AdvancedEFISwitch))?"efi":NULL;
-//         char *boot = yon_char_unite(bios,!yon_char_is_empty(bios)&&!yon_char_is_empty(efi)?"+":"",efi,NULL);
-//         yon_config_register(boot_parameter,boot_parameter_command,boot);
-//     } else {
-//         yon_config_register(boot_parameter,boot_parameter_command,"none");
-//     }
-
-//     return 1;
-// }
-
 void yon_set_max_size_from_partition(GtkTreeView *table, GtkSpinButton *spin_button, GtkComboBox *spin_combo){
     GtkTreeModel *model;
     GtkTreeIter iter;

source/ubinstall-gtk-kernel.c

@@ -115,7 +115,6 @@ void yon_kernel_row_setup(kernel_row *row, char *name, char *modules,char *packa
 void yon_kernel_resize(main_window *widgets){
     GList *list = gtk_container_get_children(GTK_CONTAINER(widgets->KernelListBox));
     GList *iter = list;
-    // gtk_widget_realize(widgets->KernelListBox);
     int install_size=0;
     int enable_size=0;
     int name_size=0;
@@ -150,7 +149,6 @@ void yon_kernel_resize(main_window *widgets){
 void yon_kernel_addon_resize(main_window *widgets){
     GList *list = gtk_container_get_children(GTK_CONTAINER(widgets->KernelAddonListBox));
     GList *iter = list;
-    // gtk_widget_realize(widgets->KernelListBox);
     int install_size=0;
     int name_size=0;
     int modules_size=0;
@@ -307,12 +305,14 @@ void yon_kernel_addon_row_setup(kernel_addon_row *row, char *name, char *modules
     row->modules = yon_char_new(modules);
     row->package = yon_char_new(package);
 
-    char *description_full = yon_char_new(_(description));
+    char *description_full = NULL;
     if (strlen(description)>100){
         guint size;
-        config_str description_wrapped = yon_char_wrap_to_lines(description,3,&size);
+        config_str description_wrapped = yon_char_wrap_to_lines(_(description),3,&size);
         description_full = yon_char_parsed_to_string(description_wrapped,size,"\n");
         yon_char_parsed_free(description_wrapped,size);
+    } else {
+        description_full = yon_char_new(_(description));
     }
 
     char *package_label = NULL;
@@ -378,7 +378,6 @@ void yon_kernel_addon_setup(main_window *widgets){
         } else {
             gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(row->InstallCheck),0);
         }
-        // yon_char_parsed_free(parsed,parsed_size);
     }
     yon_kernel_addon_resize(widgets);
 

source/ubinstall-gtk-keyboard.c

@@ -34,7 +34,6 @@ void yon_keyboard_init(main_window *widgets){
     }
     yon_char_parsed_free(models,size);
 
-    // g_signal_handlers_block_by_func(G_OBJECT(widgets->TTYLayoutCombo),G_CALLBACK(on_tty_changed),widgets);
 
     gtk_combo_box_set_active(GTK_COMBO_BOX(widgets->KeyboardModelCombo),0);
     gtk_combo_box_set_active(GTK_COMBO_BOX(widgets->KeyboardNumLockCombo),0);

source/ubinstall-gtk-language.c

@@ -206,7 +206,6 @@ void on_locale_toggled(GtkCellRenderer *, gchar *path, main_window *widgets){
     char *target;
     gtk_tree_model_get(model,&fiter,3,&target,-1);
     gtk_list_store_set(GTK_LIST_STORE(model),&fiter,0,1,-1);
-    // yon_config_register(lang_parameter,lang_parameter_command,target);
 }
 
 int yon_language_save(main_window *widgets){

source/ubinstall-gtk-packages.c

@@ -65,20 +65,26 @@ void yon_packages_tab_init(main_window *widgets){
                 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,0,1,parsed[2],2,parsed[3],3,1,-1);
+                    char *full_string = yon_char_unite("<b>",parsed[2],"</b>\n",_(parsed[3]),NULL);
+                    gtk_tree_store_set(widgets->PackagesList,&package_iter,0,0,1,parsed[2],2,full_string,3,1,-1);
+                    free(full_string);
                     gtk_tree_iter_free(subcategory_iter);
                 } else {
                 GtkTreeIter subcatiter;
                     GtkTreeIter package_iter;
                     gtk_tree_store_append(widgets->PackagesList,&subcatiter,category_iter);
-                    gtk_tree_store_set(widgets->PackagesList,&subcatiter,1,parsed[1],2,parsed[3],3,0,-1);
+                    gtk_tree_store_set(widgets->PackagesList,&subcatiter,1,parsed[1],2,_(parsed[3]),3,0,-1);
                     gtk_tree_store_append(widgets->PackagesList,&package_iter,&subcatiter);
-                    gtk_tree_store_set(widgets->PackagesList,&package_iter,0,0,1,parsed[2],2,parsed[3],3,1,-1);
+                    char *full_string = yon_char_unite("<b>",parsed[2],"</b>\n",_(parsed[3]),NULL);
+                    gtk_tree_store_set(widgets->PackagesList,&package_iter,0,0,1,parsed[2],2,full_string,3,1,-1);
+                    free(full_string);
                 }
             } else {
                     GtkTreeIter package_iter;
                     gtk_tree_store_append(widgets->PackagesList,&package_iter,category_iter);
-                    gtk_tree_store_set(widgets->PackagesList,&package_iter,0,0,1,parsed[2],2,parsed[3],3,1,-1);
+                    char *full_string = yon_char_unite("<b>",parsed[2],"</b>\n",_(parsed[3]),NULL);
+                    gtk_tree_store_set(widgets->PackagesList,&package_iter,0,0,1,parsed[2],2,full_string,3,1,-1);
+                    free(full_string);
             }
             gtk_tree_iter_free(category_iter);
         } else {
@@ -87,18 +93,22 @@ void yon_packages_tab_init(main_window *widgets){
                 GtkTreeIter catiter;
                 GtkTreeIter package_iter;
                 gtk_tree_store_append(widgets->PackagesList,&catiter,NULL);
-                gtk_tree_store_set(widgets->PackagesList,&catiter,1,parsed[0],2,parsed[3],3,0,-1);
+                gtk_tree_store_set(widgets->PackagesList,&catiter,1,parsed[0],2,_(parsed[3]),3,0,-1);
                 gtk_tree_store_append(widgets->PackagesList,&subcategory_iter,&catiter);
-                gtk_tree_store_set(widgets->PackagesList,&subcategory_iter,1,parsed[1],2,parsed[3],3,0,-1);
+                gtk_tree_store_set(widgets->PackagesList,&subcategory_iter,1,parsed[1],2,_(parsed[3]),3,0,-1);
                 gtk_tree_store_append(widgets->PackagesList,&package_iter,&subcategory_iter);
-                gtk_tree_store_set(widgets->PackagesList,&package_iter,1,parsed[2],2,parsed[3],3,1,-1);
+                char *full_string = yon_char_unite("<b>",parsed[2],"</b>\n",_(parsed[3]),NULL);
+                gtk_tree_store_set(widgets->PackagesList,&package_iter,1,parsed[2],2,full_string,3,1,-1);
+                free(full_string);
             } else {
                 GtkTreeIter package_iter;
                 GtkTreeIter catiter;
                 gtk_tree_store_append(widgets->PackagesList,&catiter,NULL);
-                gtk_tree_store_set(widgets->PackagesList,&catiter,1,parsed[0],2,parsed[3],3,0,-1);
+                gtk_tree_store_set(widgets->PackagesList,&catiter,1,parsed[0],2,_(parsed[3]),3,0,-1);
                 gtk_tree_store_append(widgets->PackagesList,&package_iter,&catiter);
-                gtk_tree_store_set(widgets->PackagesList,&package_iter,0,0,1,parsed[2],2,parsed[3],3,1,-1);
+                char *full_string = yon_char_unite("<b>",parsed[2],"</b>\n",_(parsed[3]),NULL);
+                gtk_tree_store_set(widgets->PackagesList,&package_iter,0,0,1,parsed[2],2,full_string,3,1,-1);
+                free(full_string);
             }
         }
     }

source/ubinstall-gtk-page-switch.c

@@ -8,7 +8,7 @@ enum YON_PAGES yon_page_get_next(main_window *widgets, enum YON_PAGES page){
         case YON_PAGE_WELCOME: return YON_PAGE_LICENCE; break;
         case YON_PAGE_LICENCE: return YON_PAGE_SECTIONS; break;
         case YON_PAGE_SECTIONS: return yon_sections_get_next_page(widgets); break;
-        case YON_PAGE_OS_COMPONENTS: return YON_PAGE_CONFIG_HUB; break;
+        case YON_PAGE_OS_COMPONENTS: return YON_PAGE_INSTALLATION_BEGIN; break;
         case YON_PAGE_SOFTWARE: return YON_PAGE_CONFIG_HUB; break;
         case YON_PAGE_INSTALLATION_BEGIN: return YON_PAGE_CONFIG_HUB; break;
         case YON_PAGE_CONFIG_HUB: return YON_PAGE_INSTALLATION; break;
@@ -267,47 +267,41 @@ void yon_switch_page_render(main_window *widgets){
         case YON_PAGE_INSTALL_ADVANCED:
         case YON_PAGE_INSTALL_RECOVERY:
         case YON_PAGE_INSTALLATION_BEGIN:
-        case YON_PAGE_CONFIG_HUB:
-        case YON_PAGE_KERNEL:
-        case YON_PAGE_KERNEL_ADDON:
-        case YON_PAGE_SOFTWARE:
-        case YON_PAGE_PACMAN_SOFTWARE:
         case YON_PAGE_RECOVERY_GRUB_INSTALL:
         case YON_PAGE_RECOVERY_GRUB_UPDATE:
         case YON_PAGE_RECOVERY_OS_ONLY:
         case YON_PAGE_RECOVERY_USRDATA_ONLY:
             page = 2;
             break;
+        case YON_PAGE_CONFIG_HUB:
+        case YON_PAGE_KERNEL:
+        case YON_PAGE_KERNEL_ADDON:
+        case YON_PAGE_SOFTWARE:
+        case YON_PAGE_PACMAN_SOFTWARE:
         case YON_PAGE_REGION:
-            page = 3;
-            break;
         case YON_PAGE_LANGUAGE:
         case YON_PAGE_KEYBOARD:
-            page = 4;
-            break;
         case YON_PAGE_USERS:
-            page = 5;
-            break;
         case YON_PAGE_BOOTLOADER:
         case YON_PAGE_STARTUP:
         case YON_PAGE_NETWORK:
         case YON_PAGE_PACKAGES:
-            page = 6;
+            page = 3;
             break;
         case YON_PAGE_INSTALLATION:
-            page = 7;
+            page = 4;
             break;
         case YON_PAGE_COMPLETED:
         case YON_PAGE_COMPLETION:
         case YON_PAGE_INSTALL_ERROR:
         case YON_PAGE_CONFIGURE_END:
         case YON_PAGE_CONFIGURE_SAVE:
-            page=8;
+            page=5;
             break;
     }
 
     if (widgets){};
-    GtkContainer *parent = GTK_CONTAINER(gtk_widget_get_parent(widgets->UsersToggle));
+    GtkContainer *parent = GTK_CONTAINER(gtk_widget_get_parent(widgets->WelcomeToggle));
     GList *list = gtk_container_get_children(parent);
     for (guint i=0;i<g_list_length(list);i++){
         if (i!=(guint)page){
@@ -485,25 +479,6 @@ void on_page_cancel_clicked(GtkWidget *, main_window *widgets){
     }
 }
 
-void on_system_setup_pass(GtkWidget *, main_window *widgets){
-    main_config.save_configured=1;
-    if (main_config.configure_mode){
-        gtk_notebook_set_current_page(GTK_NOTEBOOK(widgets->Notebook),YON_PAGE_CONFIGURE_END);
-    } else {
-        if (main_config.install_complete) {
-            gtk_notebook_set_current_page(GTK_NOTEBOOK(widgets->Notebook),YON_PAGE_COMPLETION);
-            yon_page_init(widgets,YON_PAGE_COMPLETION);
-            yon_page_update(widgets);
-        } else {
-            gtk_notebook_set_current_page(GTK_NOTEBOOK(widgets->Notebook),YON_PAGE_INSTALLATION);
-                yon_page_init(widgets,YON_PAGE_INSTALLATION);
-                yon_page_update(widgets);
-
-        }
-    }
-    yon_page_update(widgets);
-}
-
 void on_additional_page_clicked(GtkWidget *, main_window *widgets){
     gtk_notebook_set_current_page(GTK_NOTEBOOK(widgets->Notebook),YON_PAGE_SOFTWARE);
     yon_page_init(widgets,YON_PAGE_SOFTWARE);

source/ubinstall-gtk-region.c

@@ -24,21 +24,6 @@ int yon_region_save(main_window *widgets){
         yon_config_register(locale_parameter,locale_parameter_command,languages);
         free(languages);
     }
-    if (gtk_combo_box_get_active(GTK_COMBO_BOX(widgets->LanguagesCombo))==-1){
-        yon_config_remove_by_key(lang_parameter);
-    } else {
-        char *language = (char*)gtk_combo_box_get_active_id(GTK_COMBO_BOX(widgets->LanguagesCombo));
-        yon_config_register(lang_parameter,lang_parameter_command,language);
-    }
-    if (gtk_switch_get_active(GTK_SWITCH(widgets->RegionSensitiveSwitch))){
-        char *region = (char*)gtk_combo_box_get_active_id(GTK_COMBO_BOX(widgets->RegionCombo));
-        char *zone = (char*)gtk_combo_box_get_active_id(GTK_COMBO_BOX(widgets->ZoneCombo));
-        yon_debug_output("%s",region);
-        yon_debug_output("/%s\n\n",zone);
-        yon_config_register(zone_parameter,zone_parameter_command,yon_char_unite(region,"/",zone,NULL));
-    } else {
-        yon_config_remove_by_key(zone_parameter);
-    }
     return 1;
 }
 
@@ -97,8 +82,6 @@ void yon_region_init(main_window *widgets){
     gtk_tree_model_filter_refilter(GTK_TREE_MODEL_FILTER(widgets->LanguagesFilter));
     
     char *zone = yon_char_new(config(zone_parameter));
-    char *locale = config(locale_parameter);
-    char *lang_param = config(lang_parameter);
 
     if (!yon_char_is_empty(zone)){
         char *timezone = yon_char_divide_search(zone,"/",-1);
@@ -112,29 +95,4 @@ void yon_region_init(main_window *widgets){
         gtk_combo_box_set_active(GTK_COMBO_BOX(widgets->ZoneCombo),0);
         gtk_switch_set_active(GTK_SWITCH(widgets->RegionSensitiveSwitch),0);
     }
-
-    if (!yon_char_is_empty(locale)){
-        char *parameters_list = "";
-        config_str parsed = yon_char_parse(locale,&size,",");
-        GtkTreeModel *model = GTK_TREE_MODEL(widgets->LanguagesList);
-        for_iter(model,&iter){
-            char *target, *id;
-            gtk_tree_model_get(model,&iter,1,&target,2,&id,-1);
-            if (yon_char_parsed_check_exist(parsed,size,id)>-1){
-                gtk_list_store_set(widgets->LanguagesList,&iter,0,1,-1);
-                char *temp = yon_char_unite(parameters_list,!yon_char_is_empty(parameters_list)?",":"",target,NULL);
-                if (!yon_char_is_empty(parameters_list)) free(parameters_list);
-                parameters_list=temp;
-            } else {
-                gtk_list_store_set(widgets->LanguagesList,&iter,0,0,-1);
-            }
-        }
-        gtk_entry_set_text(GTK_ENTRY(widgets->AvailableLanguagesEntry),parameters_list);
-        if(!yon_char_is_empty(parameters_list)) free(parameters_list);
-
-    }
-
-    if (!yon_char_is_empty(lang_param)){
-        gtk_combo_box_set_active_id(GTK_COMBO_BOX(widgets->LanguagesCombo),lang_param);
-    }
 }

source/ubinstall-gtk.c

@@ -169,11 +169,18 @@ void yon_fs_type_setup(GtkComboBoxText *target){
 }
 
 void on_vnc_toggled(GtkWidget *self, main_window *){
-    if (gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(self))){
+    GList *box = gtk_container_get_children(GTK_CONTAINER(self));
+    GList *children = gtk_container_get_children(GTK_CONTAINER(box->data));
+
+    int active = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(g_list_nth_data(children,1)));
+    if (!active){
         yon_launch(enable_vnc_command);
     } else {
         yon_launch(disable_vnc_command);
     }
+    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(g_list_nth_data(children,1)),!active);
+    g_list_free(box);
+    g_list_free(children);
 }
 
 void on_pacman_software_all_toggled(GtkWidget *, char *path, main_window *widgets){
@@ -823,7 +830,6 @@ void yon_main_window_create(main_window *widgets){
         widgets->LicenseAgreeRadio = yon_gtk_builder_get_widget(builder,"LicenseAgreeRadio");
         widgets->LicenseDisgreeRadio = yon_gtk_builder_get_widget(builder,"LicenseDisgreeRadio");
 
-        widgets->EnableVNCMenuItem = yon_gtk_builder_get_widget(builder,"EnableVNCMenuItem");
         widgets->DocumentationMenuItem = yon_ubl_menu_item_documentation_new(DOCUMENTATION_LABEL);
         widgets->AboutMenuItem = yon_ubl_menu_item_about_new(ABOUT_LABEL);
 
@@ -831,18 +837,12 @@ void yon_main_window_create(main_window *widgets){
         widgets->LoadLocalConfigurationMenuItem = yon_gtk_builder_get_widget(builder,"LoadLocalConfigurationMenuItem");
         widgets->LoadExternalConfigurationMenuItem = yon_gtk_builder_get_widget(builder,"LoadExternalConfigurationMenuItem");
 
-        widgets->SaveGlobalLocalConfigurationMenuItem = yon_gtk_builder_get_widget(builder,"SaveGlobalLocalConfigurationMenuItem");
-        widgets->SaveGlobalConfigurationMenuItem = yon_gtk_builder_get_widget(builder,"SaveGlobalConfigurationMenuItem");
-        widgets->SaveLocalConfigurationMenuItem = yon_gtk_builder_get_widget(builder,"SaveLocalConfigurationMenuItem");
-        widgets->SaveExternalConfigurationMenuItem = yon_gtk_builder_get_widget(builder,"SaveExternalConfigurationMenuItem");
-
         widgets->SlidesImage = yon_gtk_builder_get_widget(builder,"SlidesImage");
 
         widgets->LicenceLabel = yon_gtk_builder_get_widget(builder,"LicenceLabel");
 
         widgets->menu1=yon_gtk_builder_get_widget(builder,"menu1");
         widgets->menu2=yon_gtk_builder_get_widget(builder,"menu2");
-        widgets->ConfigurationModeMenuItem = yon_gtk_builder_get_widget(builder,"ConfigurationModeMenuItem");
 
         widgets->CancelInstallButton=yon_gtk_builder_get_widget(builder,"CancelInstallButton");
         widgets->BackButton=yon_gtk_builder_get_widget(builder,"BackButton");
@@ -850,12 +850,10 @@ void yon_main_window_create(main_window *widgets){
 
         widgets->WelcomeToggle=yon_gtk_builder_get_widget(builder,"WelcomeToggle");
         widgets->LicenceToggle=yon_gtk_builder_get_widget(builder,"LicenceToggle");
-        widgets->LocationToggle=yon_gtk_builder_get_widget(builder,"LocationToggle");
+        widgets->PreparationToggle=yon_gtk_builder_get_widget(builder,"PreparationToggle");
-        widgets->SectionsToggle=yon_gtk_builder_get_widget(builder,"SectionsToggle");
+        widgets->ConfigurationToggle=yon_gtk_builder_get_widget(builder,"ConfigurationToggle");
-        widgets->UsersToggle=yon_gtk_builder_get_widget(builder,"UsersToggle");
-        widgets->SummaryToggle=yon_gtk_builder_get_widget(builder,"SummaryToggle");
-        widgets->CompletionToggle=yon_gtk_builder_get_widget(builder,"CompletionToggle");
         widgets->InstallationToggle=yon_gtk_builder_get_widget(builder,"InstallationToggle");
+        widgets->CompletionToggle=yon_gtk_builder_get_widget(builder,"CompletionToggle");
 
         widgets->StartScenarioButton=yon_gtk_builder_get_widget(builder,"StartScenarioButton");
 
@@ -964,13 +962,6 @@ void yon_main_window_create(main_window *widgets){
         // widgets->LanguageCombo=yon_gtk_builder_get_widget(builder,"LanguageCombo");
         widgets->RegionCombo=yon_gtk_builder_get_widget(builder,"RegionCombo");
         widgets->ZoneCombo=yon_gtk_builder_get_widget(builder,"ZoneCombo");
-        widgets->AvailableLanguagesEntry=yon_gtk_builder_get_widget(builder,"AvailableLanguagesEntry");
-        widgets->AvailableLanguagesButton=yon_gtk_builder_get_widget(builder,"AvailableLanguagesButton");
-        widgets->LanguagesCombo=yon_gtk_builder_get_widget(builder,"LanguagesCombo");
-        widgets->LayoutBindingCombo=yon_gtk_builder_get_widget(builder,"LayoutBindingCombo");
-        widgets->LayoutTree=yon_gtk_builder_get_widget(builder,"LayoutTree");
-        widgets->AddButton=yon_gtk_builder_get_widget(builder,"AddButton");
-        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");
@@ -992,9 +983,6 @@ 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->RegionBox = yon_gtk_builder_get_widget(builder,"RegionBox");
-        widgets->RegionAspect = yon_gtk_builder_get_widget(builder,"RegionAspect");
         
         widgets->KeyboardModelCombo = yon_gtk_builder_get_widget(builder,"KeyboardModelCombo");
         widgets->KeyboardDefaultLayoutsSwitch = yon_gtk_builder_get_widget(builder,"KeyboardDefaultLayoutsSwitch");
@@ -1119,7 +1107,6 @@ void yon_main_window_create(main_window *widgets){
     g_signal_connect(G_OBJECT(widgets->LoadLocalConfigurationMenuItem),"activate",G_CALLBACK(on_config_local_load),widgets);
     g_signal_connect(G_OBJECT(widgets->LoadExternalConfigurationMenuItem),"activate",G_CALLBACK(on_config_custom_load),widgets);
 
-    g_signal_connect(G_OBJECT(widgets->EnableVNCMenuItem),"activate",G_CALLBACK(on_vnc_toggled),widgets);
 
     g_signal_connect(G_OBJECT(widgets->ReadFullLogButton),"clicked",G_CALLBACK(on_process_log_view),widgets);
     g_signal_connect(G_OBJECT(widgets->ReadShortLogButton),"clicked",G_CALLBACK(on_summary_log_view),widgets);
@@ -1161,7 +1148,6 @@ void yon_main_window_create(main_window *widgets){
     g_signal_connect(G_OBJECT(widgets->UserdataDevicesTree),"cursor-changed",G_CALLBACK(on_device_selection_changed),widgets);
     g_signal_connect(G_OBJECT(widgets->OSDevicesTree),"cursor-changed",G_CALLBACK(on_device_selection_changed),widgets);
 
-    g_signal_connect(G_OBJECT(widgets->ConfigurationModeMenuItem),"toggled",G_CALLBACK(on_configuration_mode_switch),widgets);
 
     g_signal_connect(G_OBJECT(widgets->SamePlacePartTree),"cursor-changed",G_CALLBACK(on_partition_changed),widgets);
     g_signal_connect(G_OBJECT(widgets->NextInstallationSysSectionTree),"cursor-changed",G_CALLBACK(on_partition_changed),widgets);
@@ -1219,14 +1205,9 @@ void yon_main_window_create(main_window *widgets){
     g_signal_connect(G_OBJECT(widgets->AdvancedSwapFixedSwitch),"state-set",G_CALLBACK(yon_gtk_widget_set_sensitive_from_switch),widgets->AdvancedSwapFixedSpin);
     g_signal_connect(G_OBJECT(widgets->AdvancedSwapFixedSwitch),"state-set",G_CALLBACK(yon_gtk_widget_set_sensitive_from_switch),widgets->AdvancedSwapFixedSizeSwitch);
 
-    // g_signal_connect(G_OBJECT(widgets->AdvancedAddButton),"clicked",G_CALLBACK(on_install_advanced_add_new),widgets);
     g_signal_connect(G_OBJECT(widgets->AdvancedDeviceChosenCell),"toggled",G_CALLBACK(on_install_advanced_device_chosen),widgets);
-    // g_signal_connect(G_OBJECT(widgets->AdvancedPartChosenCell),"toggled",G_CALLBACK(on_install_advanced_partition_chosen),widgets);
-    // g_signal_connect(G_OBJECT(widgets->AdvancedPartitionAddBox),"add",G_CALLBACK(on_advanced_parts_added),widgets);
-    // g_signal_connect(G_OBJECT(widgets->AdvancedPartitionAddBox),"remove",G_CALLBACK(on_advanced_parts_removed),widgets);
     g_signal_connect(G_OBJECT(widgets->StartScenarioButton),"clicked",G_CALLBACK(yon_quick_install),widgets);
     g_signal_connect(G_OBJECT(widgets->SourceButton),"clicked",G_CALLBACK(on_source_clicked),widgets);
-    // g_signal_connect(G_OBJECT(widgets->SkipInstallationButton),"clicked",G_CALLBACK(on_system_setup_pass),widgets);
     g_signal_connect(G_OBJECT(widgets->AdvancedAddButton),"clicked",G_CALLBACK(on_advanced_partition_create),widgets);
     g_signal_connect(G_OBJECT(widgets->AdvancedPartChosenCell),"toggled",G_CALLBACK(on_install_advanced_partition_chosen),widgets);
     g_signal_connect(G_OBJECT(widgets->AdvancedVirtualDeviceCombo),"changed",G_CALLBACK(on_advanced_virtual_device_changed),widgets);
@@ -1254,19 +1235,38 @@ void yon_main_window_create(main_window *widgets){
     g_signal_connect(G_OBJECT(widgets->DocumentationMenuItem),"activate",G_CALLBACK(on_open_documentation_confirmation),WIKI_LINK);
 
     gtk_tree_model_filter_set_visible_func(GTK_TREE_MODEL_FILTER(widgets->InstallerCountryFilter),(GtkTreeModelFilterVisibleFunc)on_country_filter,widgets,NULL);
+    
+    {
+        widgets->EnableVNCMenuItem = gtk_menu_item_new();
+        GtkWidget *Box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL,5);
+        GtkWidget *Label = gtk_label_new(ENABLE_VNC_LABEL);
+        GtkWidget *Check = gtk_check_button_new();
+        gtk_box_pack_start(GTK_BOX(Box),Label,0,0,0);
+        gtk_box_pack_start(GTK_BOX(Box),Check,0,0,0);
+        gtk_container_add(GTK_CONTAINER(widgets->EnableVNCMenuItem),Box);
+        g_signal_connect(G_OBJECT(widgets->EnableVNCMenuItem),"activate",G_CALLBACK(on_vnc_toggled),widgets);
+        gtk_style_context_add_class(gtk_widget_get_style_context(widgets->EnableVNCMenuItem),"menuitemmiddle");
+        gtk_widget_show_all(widgets->EnableVNCMenuItem);
+        gtk_menu_shell_prepend(GTK_MENU_SHELL(widgets->menu2),widgets->EnableVNCMenuItem);
+    }
+    {
+        widgets->ConfigurationModeMenuItem = gtk_menu_item_new();
+        GtkWidget *Box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL,5);
+        GtkWidget *Label = gtk_label_new(CONFIGURATION_MODE_LABEL);
+        GtkWidget *Check = gtk_check_button_new();
+        gtk_box_pack_start(GTK_BOX(Box),Label,0,0,0);
+        gtk_box_pack_start(GTK_BOX(Box),Check,0,0,0);
+        gtk_container_add(GTK_CONTAINER(widgets->ConfigurationModeMenuItem),Box);
+        g_signal_connect(G_OBJECT(widgets->ConfigurationModeMenuItem),"activate",G_CALLBACK(on_configuration_mode_switch),widgets);
+        gtk_style_context_add_class(gtk_widget_get_style_context(widgets->ConfigurationModeMenuItem),"menuitemmiddle");
+        gtk_widget_show_all(widgets->ConfigurationModeMenuItem);
+        gtk_menu_shell_prepend(GTK_MENU_SHELL(widgets->menu2),widgets->ConfigurationModeMenuItem);
+    }
     {
 
         if (main_config.lock_load_global == 1){
             gtk_widget_set_sensitive(widgets->LoadGlobalConfigurationMenuItem,0);
         }
-        if (main_config.lock_save_global == 1){
-            gtk_widget_set_sensitive(widgets->SaveGlobalConfigurationMenuItem,0);
-            gtk_widget_set_sensitive(widgets->SaveGlobalLocalConfigurationMenuItem,0);
-        }
-        if (main_config.lock_save_local == 1){
-            gtk_widget_set_sensitive(widgets->SaveLocalConfigurationMenuItem,0);
-            gtk_widget_set_sensitive(widgets->SaveGlobalLocalConfigurationMenuItem,0);
-        }
         if (getuid()){
             gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(widgets->ConfigurationModeMenuItem),1);
         }
@@ -1343,7 +1343,8 @@ void *yon_maximize(main_window *widgets){
 */ 
 main_window *yon_main_window_complete(){ 
     main_window *widgets=NULL;
-    widgets = yon_remalloc(widgets,sizeof(main_window)); 
+    widgets = yon_remalloc(widgets,sizeof(main_window));
+    memset(widgets,0,sizeof(main_window));
     yon_main_window_create(widgets);
     yon_window_config_setup(GTK_WINDOW(widgets->MainWindow));
     // yon_window_config_custom_window_setup(GTK_WINDOW(widgets->MainWindow),"MainWindow");
@@ -1383,6 +1384,12 @@ int main(int argc, char *argv[]){
     if (widgets){}; 
     int fullscreen = 0;
     widgets = yon_main_window_complete();
+    GtkWidget *root_button = yon_root_button_new(argv,argc);
+    gtk_style_context_add_class(gtk_widget_get_style_context(root_button),"menuitemtop");
+    
+    gtk_menu_shell_prepend(GTK_MENU_SHELL(gtk_widget_get_parent(widgets->AboutMenuItem)),root_button);
+    
+    yon_root_button_init(root_button,GTK_WINDOW(widgets->MainWindow));
     on_config_global_load(NULL,widgets);
     char *path = yon_char_unite(yon_ubl_user_get_home_directory(),"/.config/",LocaleName,"/",LocaleName,".conf",NULL);
     if (access(path,F_OK)){

source/ubinstall-gtk.h

@@ -461,11 +461,6 @@ typedef struct {
 	GtkWidget *LoadLocalConfigurationMenuItem;
 	GtkWidget *LoadExternalConfigurationMenuItem;
 
-	GtkWidget *SaveGlobalLocalConfigurationMenuItem;
-	GtkWidget *SaveGlobalConfigurationMenuItem;
-	GtkWidget *SaveLocalConfigurationMenuItem;
-	GtkWidget *SaveExternalConfigurationMenuItem;
-
 	GtkWidget *MainWindow;
 
 	GtkWidget *LicenseAgreeRadio;
@@ -480,12 +475,10 @@ typedef struct {
 	GtkWidget *StatusBox2;
 	GtkWidget *WelcomeToggle;
 	GtkWidget *LicenceToggle;
-	GtkWidget *LocationToggle;
+	GtkWidget *PreparationToggle;
-	GtkWidget *SectionsToggle;
+	GtkWidget *ConfigurationToggle;
-	GtkWidget *UsersToggle;
-	GtkWidget *SummaryToggle;
-	GtkWidget *CompletionToggle;
 	GtkWidget *InstallationToggle;
+	GtkWidget *CompletionToggle;
 	GtkWidget *LanguagesTree;
 	GtkWidget *CountryLanguagesTree;
 	GtkListStore *InstallerCountryList;
@@ -494,13 +487,6 @@ typedef struct {
 	// GtkWidget *LanguageCombo;
 	GtkWidget *RegionCombo;
 	GtkWidget *ZoneCombo;
-	GtkWidget *AvailableLanguagesEntry;
-	GtkWidget *AvailableLanguagesButton;
-	GtkWidget *LanguagesCombo;
-	GtkWidget *LayoutBindingCombo;
-	GtkWidget *LayoutTree;
-	GtkWidget *AddButton;
-	GtkWidget *RemoveButton;
 
 	GtkWidget *InstallationRadio;
 	GtkWidget *InstallationNearRadio;
@@ -534,9 +520,6 @@ typedef struct {
     GtkCellRenderer *LocaleCell;
     GtkListStore *LanguageList;
 
-	// GtkWidget *RegionImage;
-	GtkWidget *RegionBox;
-	GtkWidget *RegionAspect;
 
 	GtkWidget *KeyboardModelCombo;
 	GtkWidget *KeyboardDefaultLayoutsSwitch;
@@ -763,6 +746,8 @@ typedef struct {
 	GFile *install_info_file;
 	GFileMonitor *install_info_monitor;
 
+	gboolean slider_stop;
+
 } main_window; 
  
 enum ADVANCED_PART_TYPE {
@@ -1316,8 +1301,6 @@ void on_source_add(GtkWidget *,source_window *window);
 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 on_vnc_toggled(GtkWidget *self, main_window *widgets);
 void yon_main_window_create(main_window *widgets);
 void set_locales_list(main_window *widgets);
@@ -1412,4 +1395,6 @@ void yon_configuration_hub_resize(main_window *widgets);
 void on_configuration_hub_selected(GtkWidget* self, main_window *widgets);
 gboolean yon_software_insert(struct row_data *row_input);
 int yon_configuration_hub_save(main_window *widgets);
-int yon_packages_tab_save(main_window *widgets);
+int yon_packages_tab_save(main_window *widgets);
+gboolean on_install_slider_slide_proceed(main_window *widgets);
+gboolean on_install_slider_slide(main_window *widgets);

source/ubl-strings.h

@@ -1,4 +1,3 @@
-
 #define TITLE_LABEL _("System installation")
 
 #define WELCOME_LABEL _("Welcome to system installation")
@@ -25,7 +24,6 @@ NULL)
 #define LOCATION_TAB_LABEL _("Location")
 #define KEYBOARD_TAB_LABEL _("Keyboard")
 #define USERS_TAB_LABEL _("Users")
-#define COMPLETION_TAB_LABEL _("Installation completion")
 #define COMMON_INSTALL_INFO_LABEL _("Deleting all data on the selected disk and then installing the system")
 #define NEAR_INSTALL_LABEL _("Installation next to another system")
 #define NEAR_INSTALL_INFO_LABEL _("Shrinking a partition and creating a new one for installing OS")
@@ -56,8 +54,6 @@ NULL)
 #define COMPUTER_NAME_LABEL _("Host name:")
 #define AUTOMATICALLY_LABEL _("Automatically")
 #define USER_LABEL _("User")
-#define COMPLETION_LABEL _("Installation completion")
-#define INSTALLATION_COMPLETION_LABEL _("Installation completion")
 #define SELECT_DEVICE_LABEL _("Select device:")
 #define CHOOSE_SECTION_LABEL _("Choose a section:")
 #define ATTENSION_LABEL _("<b>Attention!</b> The selected partition will be modified: the size will be reduced. In the resulting free space, a partition will be created into which the system will be\ninstalled.")
@@ -220,8 +216,8 @@ NULL)
 #define SAVE_AND_EXIT_LABEL _("Save and exit")
 #define NO_LABEL _("No")
 
-#define PARITY_INVALID_LABEL(target) yon_char_unite(_("Cu"),target,NULL)
+#define PARITY_INVALID_LABEL(target) yon_char_unite("Cu",target,NULL)
-#define COUNT_INVALID_LABEL(target) yon_char_unite(_("Cues"),target,NULL)
+#define COUNT_INVALID_LABEL(target) yon_char_unite("Cues",target,NULL)
 
 #define ABOUT_TITLE_LABEL _("About system installation")
 #define VALUE_REPEAT_LABEL _("Repeating values")
@@ -281,6 +277,7 @@ NULL)
 #define STARTUP_LABEL _("Startup services")
 #define BOOTLOADER_LABEL _("Boot load")
 #define NETWORK_LABEL _("Network")
+#define ENABLE_VNC_LABEL _("Enable VNC server")
 
 // #define _LABEL _("<i><b>Package:</b></i>")
 // #define _LABEL _("<i><b>Module:</b></i>")
@@ -337,7 +334,6 @@ NULL)
 // #define _LABEL _("Fixed size:")
 // #define _LABEL _("<b>Attention!</b> The system will be installed on the selected partition with OS already installed. All user data will be saved.")
 // #define _LABEL _("<b>Attention!</b> The selected system components will be installed\nseparately into the selected partition.")
-// #define _LABEL _("Enable VNC server")
 // #define _LABEL _("Preparation")
 // #define _LABEL _("Additional")
 // #define _LABEL _("Completion")
@@ -393,9 +389,40 @@ NULL)
 // #define _LABEL _("Source")
 // #define _LABEL _("Skip configuration")
 
+// #define _LABEL _("You are now in the system setup program. This program will ask you a few questions and help you install the system.")
+// #define _LABEL _("Licence agreement")
+// #define _LABEL _("Please read the license agreement before continuing the installation.")
+// #define _LABEL _("Please specify what type of installation you want to perform")
+// #define _LABEL _("Selection of main components")
+// #define _LABEL _("Select modules found on the sources to be installed")
+// #define _LABEL _("Configuring the system")
+// #define _LABEL _("Configuring the parameters of the installed system")
+// #define _LABEL _("Selecting the system kernel")
+// #define _LABEL _("Selecting kernels for installation in the system and selecting the default kernel. Internet access is required to install additional kernels")
+// #define _LABEL _("Selecting additional system kernel components")
+// #define _LABEL _("Selecting additional kernel modules from the repository via the Internet")
+// #define _LABEL _("Selecting additional installation components")
+// #define _LABEL _("Selecting additional components and software")
+// #define _LABEL _("Search and select the software you need to install by package name. Internet access required")
+// #define _LABEL _("Chosen packages")
+// #define _LABEL _("Enter your time zone")
+// #define _LABEL _("System language")
+// #define _LABEL _("Specify your preferred system languages")
+// #define _LABEL _("Setting up system users")
+// #define _LABEL _("Startup")
+// #define _LABEL _("Configuring startup services")
+// #define _LABEL _("Starting the system")
+// #define _LABEL _("Setting up system boot")
+// #define _LABEL _("Setting up network access")
+// #define _LABEL _("Additional system components")
+// #define _LABEL _("Configuring the installation of additional components")
+// #define _LABEL _("Wait for the system to finish loading")
+// #define _LABEL _("Selecting software from the installation media")
+
 #define slide_1_title _("Product ecosystem")
 #define slide_1_text _("Developed by a team of professionals and successfully presented on the market.\n\
 Includes:\n\
+\n\
 - modern versions of the Linux kernel,\n\
 - wide range of software,\n\
 - IT infrastructure management system,\n\
@@ -405,7 +432,7 @@ Includes:\n\
 #define slide_2_text _("It has been successfully used in both government agencies and commercial companies of various sizes.")
 
 #define slide_3_title _("System Editions")
-#define slide_3_text _("- UBLinux Desktop Enterprise for workstations (PCs, laptops, thin clients, dashboards, including interactive touchscreens, industrial computers, and hardware and software systems),\n\
+#define slide_3_text _("- UBLinux Desktop Enterprise for workstations (PCs, laptops, thin clients, dashboards, including interactive touchscreens and Multi-touch, industrial computers, hardware and software complex),\n\
 - UBLinux Server for server hardware and storage systems,\n\
 - UBLinux Network for network equipment,\n\
 - UBLinux Education for educational institutions,\n\
@@ -414,13 +441,13 @@ Includes:\n\
 #define slide_4_title _("Device Support")
 #define slide_4_text _("A wide range of devices is supported: printing equipment, scanners, webcams, etc.\n\
 \n\
-Support for multitouch input systems with detection of up to 20 simultaneous touch points")
+Support for Multi-touch input systems with detection of up to 20 simultaneous touch points")
 
 #define slide_5_title _("Modular secure architecture")
-#define slide_5_text _("- each OS component is represented by a separate module with signature and integrity control\n\
+#define slide_5_text _("- each OS component is represented by a separate module with a digital signature and integrity control\n\
-- connecting and disconnecting modules does not require stopping the system\n\
+- there is no need to stop the system to connect and disconnect modules\n\
 - allows flexible adaptation of the system to the customer's workflows\n\
-- ensures high performance")
+- ensures high performance and reliability of the system")
 
 #define slide_6_title _("Flexible Adaptation")
 #define slide_6_text _("By changing the system's modules, its capabilities are tailored to the needs of each user.\n\
@@ -428,33 +455,31 @@ Support for multitouch input systems with detection of up to 20 simultaneous tou
 From a minimal configuration (a thin client that only allows remote connection to the server) to a configuration that includes the full range of system capabilities.")
 
 #define slide_7_title _("Domain architecture support")
-#define slide_7_text _("A UBLinux-based domain controller allows you to:\n\
+#define slide_7_text _("A domain controller allows you to:\n\
-- use group policies,\n\
-- centralized software deployment across your fleet,\n\
-- organize network resources and provide flexible access to them\n\
 \n\
+use group policies,\n\
+centralized software deployment across your fleet,\n\
+organize network resources and provide flexible access to them\n\
 Allows you to integrate your workstation with Microsoft Active Directory, FreeIPA, and Samba DC, applying the necessary domain settings to your workstation.")
 
-#define slide_8_title _("Native compatibility with Windows applications")
+#define slide_8_title _("Compatibility with Windows applications")
 #define slide_8_text _("Using Wine or the Winix integration module, you can launch and work with most Windows applications.")
 
 #define slide_9_title _("High level of optimization")
-#define slide_9_text _("The system is lightweight. This allows for comfortable operation when booting from USB drives, on diskless workstations, and on thin clients. It also allows for the use of workstations with low performance.")
+#define slide_9_text _("The system is lightweight. This allows for comfortable operation when booting from USB drives, on diskless workstations, and on thin clients. It also allows for the use of obsolete workstations with low performance")
 
 #define slide_10_title _("Intuitive interface")
-#define slide_10_text _("Support for XFCE, KDE Plasma, GNOME, MATE, LXQt, and other graphical environments allows you to choose and flexibly customize the most convenient desktop environment.\n\
+#define slide_10_text _("Support for XFCE, KDE Plasma, GNOME, MATE, LXQt, and other graphical environments allows you to choose and flexibly customize the most convenient desktop environment.")
-\n\
-This allows users to easily get started with the system, including when switching from Windows.")
 
 #define slide_11_title _("Multi-workstation (multi-seat)")
 #define slide_11_text _("The ability for multiple users to work simultaneously at a single workstation.\n\
 \n\
-Each user has a separate profile (desktop), monitor, and keyboard/mouse. This can be implemented using the built-in video outputs without the need for a separate graphics card.")
+Each user has a separate profile (desktop), monitor, and keyboard/mouse. This can be implemented using the built-in video outputs without the need for a separate graphics card")
 
 #define slide_12_title _("Application Software")
-#define slide_12_text _("The system comes with a comprehensive set of software out of the box to solve most common problems.\n\
+#define slide_12_text _("The system comes with a comprehensive set of software out of the box to performing most common tasks.\n\
 \n\
-The graphical package manager allows for quick and intuitive installation of additional software and hardware drivers.")
+The graphical package manager allows for quick and intuitive installation of additional software and hardware drivers")
 
 #define slide_13_title _("Corporate Services")
 #define slide_13_text _("The system allows you to deploy and manage or connect to a variety of centralized corporate services: email, group chats, video conferencing, collaboration systems, etc.")
@@ -465,11 +490,9 @@ The graphical package manager allows for quick and intuitive installation of add
 Sandbox modes protect the workstation from failures and incorrect operations. Upon reboot, the system will return to its default state.")
 
 #define slide_15_title _("Custom repositories")
-#define slide_15_text _("- repositories are developed and maintained by the system developer,\n\
+#define slide_15_text _("- repositories are developed and maintained by the operating system developer,\n\
-- hosted within the Russian Federation,\n\
+- contain the most popular and modern software tools.\n\
-- contain the most popular and modern software tools\n\
+The creation of custom repositories is also supported, which users can create and adapt to their needs")
-\n\
-The creation of service repositories is also supported, which users can create and adapt to their needs.")
 
 #define slide_16_title _("Quick deployment")
 #define slide_16_text _("- System installation on modern hardware takes 3-5 minutes.\n\
@@ -492,12 +515,12 @@ Used to automate deployment and configuration of workstations and servers, as we
 - Backup, data protection, and VDI mechanisms.")
 
 #define slide_20_title _("Professional technical support")
-#define slide_20_text _("You can choose the most appropriate level of system support for your situation.\n\
+#define slide_20_text _("You can choose the level of technical support for the system that most appropriate for your needs.\n\
 \n\
-For more information, visit our website ublinux.ru in the \"Support Levels\" section.")
+For more information, visit our website the \"Support Levels\" section.")
 
 #define slide_21_title _("Interactive Knowledge Base")
-#define slide_21_text _("Continuously evolving and clearly describes the installation and configuration of the system, as well as the use of its features. Located at wiki.ublinux.ru")
+#define slide_21_text _("Continuously evolving and clearly describes the installation and configuration of the system, as well as the use of its features. Located at https://wiki.ublinux.com")
 
 #define slide_22_title _("Network Boot")
 #define slide_22_text _("Allows system booting for diskless and standard workstations over a local network or the Internet (even over slow connection channels).")