Application moved on library; few parameters are moved to new config section

source/CMakeLists.txt

@@ -8,26 +8,15 @@ include_directories(${GTK_INCLUDE_DIRS})
 link_directories(${GTK_LIBRARY_DIRS})
 add_definitions(${GTK_CFLAGS_OTHER})
 
-#pkg_check_modules(VTE291 REQUIRED vte-2.91)
-#include_directories(${VTE291_INCLUDE_DIRS})
-#link_directories(${VTE291_LIBRARY_DIRS})
-#add_definitions(${VTE291_CFLAGS_OTHER})
-
 find_library(WEBKIT_LIBRARIES_FOUND webkit2gtk-4.0 webkit2gtk-web-extension-4.0)
 
-option(WEBKIT_FOUND "No" OFF)
 if(WEBKIT_LIBRARIES_FOUND)
-        option(WEBKIT_FOUND "Yes" ON)
         PKG_CHECK_MODULES(WEBKIT REQUIRED webkit2gtk-4.0 webkit2gtk-web-extension-4.0)
         include_directories(${WEBKIT_INCLUDE_DIRS})
         link_directories(${WEBKIT_LIBRARY_DIRS})
         add_definitions(${WEBKIT_CFLAGS_OTHER})
 endif()
 
-configure_file(ubl-cmake.in ubl-cmake.h)
-
-file(COPY ${CMAKE_CURRENT_BINARY_DIR}/ubl-cmake.h DESTINATION ./)
-
 set(GRESOURCE_C   resources.c)
 set(GRESOURCE_XML gresource.xml)
 
@@ -62,9 +51,7 @@ add_custom_target(
         DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${GRESOURCE_C}
 )
 
-#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic -Wall -Wextra -Werror -Wmissing-declarations -fdiagnostics-color=always -std=c++2a")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Werror -Wmissing-declarations -fdiagnostics-color=always \
-#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic -Wall -Wextra -Werror -Wmissing-declarations -fdiagnostics-color=always -lm")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic -Wall -Wextra -Werror -Wmissing-declarations -fdiagnostics-color=always \
         -O2 -pipe -fno-plt -fexceptions \
         -Wp,-D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security \
         -fstack-clash-protection -fcf-protection")
@@ -74,16 +61,14 @@ set(SOURCE_FILES
         ubl-settings-system.c
         ubl-settings-system.h
         ubl-strings.h
-        ubl-utils.h
-        ubl-utils.c
-        ${CMAKE_CURRENT_BINARY_DIR}/ubl-cmake.h
         )
 
 set(LIBRARIES
         ${GTK_LIBRARIES}
-        ${WEBKIT_LIBRARIES}
+        pthread
-#        ${VTE291_LIBRARIES}
+        ublsettings
-        pthread)
+        ublsettings-gtk3
+        ublsettingsui-gtk3)
 
 
 add_executable(${PROJECT_NAME} ${SOURCE_FILES} ${CMAKE_CURRENT_BINARY_DIR}/${GRESOURCE_C})

source/ubl-settings-system.c

@@ -2,110 +2,15 @@
 
 config main_config;
 
-//signal emmit handlers - no header initialization
-
-/**on_close_subwindow(GtkWidget *self)
- * [EN]
- * Closes window in which [self] is contained.
- * [RU]
- * Закрывает окно, в котором расположен виджет [self].
-*/
-void on_close_subwindow(GtkWidget *self){
-    gtk_widget_destroy(gtk_widget_get_toplevel(self));
-}
-
-/**yon_open_browser(GtkWidget *self, char *link)
- * [EN]
- * Opens browser with [link] link.
- * [RU]
- * Открывает браузер с [link] ссылкой.
-*/
-void yon_open_browser(GtkWidget *self, char *link){
-    yon_ubl_browser_window_open(link,TITLE_LABEL);
-}
-
-/**on_open_documentation_confirmation(GtkWidget *self, char *link)
- * [EN]
- * Opens confirmation window for [link] link.
- * [RU]
- * Открывает окно подтверждение перехода по ссылке [link].
-*/
-void on_open_documentation_confirmation(GtkWidget *self, char *link){
-    if (main_config.always_open_documentation==0){
-        GtkBuilder *builder = gtk_builder_new_from_resource(glade_path);
-        documentation_confirmation_window *widgets = malloc(sizeof(documentation_confirmation_window));
-        widgets->Window = yon_gtk_builder_get_widget(builder,"helpConfirmationWindow");
-        widgets->AcceptButton = yon_gtk_builder_get_widget(builder,"ReadHelpButton");
-        widgets->CloseButton = yon_gtk_builder_get_widget(builder,"CancelHelpButton");
-        widgets->HatText = yon_gtk_builder_get_widget(builder,"webHeaderNameLabel");
-        widgets->HeaderText = yon_gtk_builder_get_widget(builder,"helpHeader");
-        widgets->InfoText = yon_gtk_builder_get_widget(builder,"helpText");
-        widgets->AlwaysOpenCheck = yon_gtk_builder_get_widget(builder,"AlwaysOpenDocumentationCheckbox");
-        gtk_label_set_text(GTK_LABEL(widgets->HatText),TITLE_LABEL);
-        gtk_label_set_text(GTK_LABEL(widgets->HeaderText),HELP_TITLE_LABEL);
-        gtk_label_set_text(GTK_LABEL(widgets->InfoText),HELP_INFO_LABEL);
-        gtk_button_set_label(GTK_BUTTON(widgets->AcceptButton),OPEN_HELP_LABEL);
-        gtk_button_set_label(GTK_BUTTON(widgets->AlwaysOpenCheck),HELP_ALWAYS_OPEN_LABEL);
-        gtk_button_set_label(GTK_BUTTON(widgets->CloseButton),CANCEL_LABEL);
-        gtk_widget_show_all(widgets->Window);
-        g_signal_connect(G_OBJECT(widgets->CloseButton),"clicked",G_CALLBACK(on_close_subwindow),NULL);
-        g_signal_connect(G_OBJECT(widgets->AcceptButton),"clicked",G_CALLBACK(yon_open_browser),yon_char_new(link));
-        g_signal_connect(G_OBJECT(widgets->AcceptButton),"clicked",G_CALLBACK(on_close_subwindow),NULL);
-        
-        
-    } else {
-        yon_open_browser(self,link);
-    }
-}
-
-/**on_link(GtkWidget *self, char* uri, gpointer user_data)
- * [EN]
- * Signal for hadnling AboutDialog links.
- * Connect to "activate-link" signal.
- * [self] is AboutDialog window;
- * [uri] is activated link;
- * [user_data] is pointer for user data, hasn't used in standard handler;
- * [RU]
- * Функция для обработки сигнала нажатия на ссылку окна AboutDialog.
- * Присоединять к сигналу "activate-link".
- * [self] - окно AboutDialog;
- * [uri] - ссылка, по которой совершается переход;
- * [user_data] - указатель на любые другие данные, не используется в стандартном обработчике;
-*/
-void on_link(GtkWidget *self, char* uri, gpointer user_data){
-    gtk_widget_destroy(self);
-    on_open_documentation_confirmation(self,uri);
-}
-
-/**on_about()
- * [EN]
- * Function for setting up and showing AboutDialog.
- * Connect it to "activate" signal of Documentation MenuItem.
- * [RU]
- * Функиця для настройки и показа окна AboutDialog.
- * Присоединять к сигналу "activate" кнопки справки типа MenuItem.
-*/
-void on_about(){
-    GtkBuilder *builder=gtk_builder_new_from_resource(glade_path);
-    GtkWidget *window=yon_gtk_builder_get_widget(builder,"AboutWindow");
-    GtkWidget *title=yon_gtk_builder_get_widget(builder,"headerAboutTopic");
-    GtkWidget *hideButtonBox=yon_gtk_builder_get_widget(builder,"buttonBoxHide");
-    gtk_about_dialog_set_version(GTK_ABOUT_DIALOG(window),version_application);
-    gtk_about_dialog_set_website_label(GTK_ABOUT_DIALOG(window),PROJECT_HOME_LABEL);
-    gtk_about_dialog_set_comments(GTK_ABOUT_DIALOG(window),TITLE_LABEL);
-    gtk_label_set_text(GTK_LABEL(title),TITLE_LABEL);
-    g_signal_connect(G_OBJECT(window),"activate-link",G_CALLBACK(on_link),NULL);
-    gtk_widget_set_visible(hideButtonBox,0);
-    gtk_widget_destroy(hideButtonBox);
-    gtk_widget_show(window);
-}
-
 //functions
 
 void yon_load_proceed(YON_CONFIG_TYPE type){
     if (yon_config_load_register(type,hostname_section,hostname_parameter,id_section,id_parameter,console_font_section,console_font_parameter,locale_section,locale_parameter,language_section,language_parameter,NULL)){}
-    else
+    else{
+        textdomain(template_ui_LocaleName);
         yon_ubl_status_box_render(LOAD_FAILED_LABEL,BACKGROUND_IMAGE_FAIL_TYPE);
+        textdomain(LocaleName);
+    }
     
 }
 
@@ -123,7 +28,8 @@ void yon_config_local_load(GtkWidget *self, main_window *widgets){
     gtk_combo_box_set_active(GTK_COMBO_BOX(widgets->LanguageCombo),0);
     yon_load_proceed(YON_CONFIG_LOCAL);
     gtk_entry_set_text(GTK_ENTRY(widgets->HostnameEntry),yon_config_get_by_key(hostname_parameter));
-    for_iter(GTK_TREE_MODEL(widgets->languagelist),&iter){
+    int valid = gtk_tree_model_get_iter_first(GTK_TREE_MODEL(widgets->languagelist),&iter);
+    for(;valid;valid=gtk_tree_model_iter_next(GTK_TREE_MODEL(widgets->languagelist),&iter)){
         gtk_list_store_set(widgets->languagelist,&iter,2,0,-1);
     }
     char *id = yon_config_get_by_key(id_parameter);
@@ -168,8 +74,12 @@ void yon_config_local_load(GtkWidget *self, main_window *widgets){
         if (strcmp(locale_string,"")) gtk_entry_set_text(GTK_ENTRY(widgets->LocaleEntry),locale_string);
     }
     g_signal_handlers_unblock_by_func(G_OBJECT(widgets->IDEntry),G_CALLBACK(on_id_changed),widgets);
-    if (getuid()==0)
+    if (getuid()==0){
+        textdomain(template_ui_LocaleName);
         yon_ubl_status_box_render(LOCAL_LOAD_SUCCESS_LABEL,BACKGROUND_IMAGE_SUCCESS_TYPE);
+        textdomain(LocaleName);
+    }
+	main_config.load_mode=1;
 }
 
 void yon_config_global_load(GtkWidget *self, main_window *widgets){
@@ -186,7 +96,8 @@ void yon_config_global_load(GtkWidget *self, main_window *widgets){
     gtk_combo_box_set_active(GTK_COMBO_BOX(widgets->LanguageCombo),0);
     yon_load_proceed(YON_CONFIG_GLOBAL);
     gtk_entry_set_text(GTK_ENTRY(widgets->HostnameEntry),yon_config_get_by_key(hostname_parameter));
-    for_iter(GTK_TREE_MODEL(widgets->languagelist),&iter){
+    int valid = gtk_tree_model_get_iter_first(GTK_TREE_MODEL(widgets->languagelist),&iter);
+    for(;valid;valid=gtk_tree_model_iter_next(GTK_TREE_MODEL(widgets->languagelist),&iter)){
         gtk_list_store_set(widgets->languagelist,&iter,2,0,-1);
     }
     char *id = yon_config_get_by_key(id_parameter);
@@ -194,7 +105,7 @@ void yon_config_global_load(GtkWidget *self, main_window *widgets){
         gtk_combo_box_set_active(GTK_COMBO_BOX(widgets->IDCombo),1);
     else if (!strcmp(id,"hardware"))
         gtk_combo_box_set_active(GTK_COMBO_BOX(widgets->IDCombo),2);
-    else{
+    else {
         gtk_entry_set_text(GTK_ENTRY(widgets->IDEntry),id);
         gtk_combo_box_set_active(GTK_COMBO_BOX(widgets->IDCombo),3);
     }
@@ -231,24 +142,54 @@ void yon_config_global_load(GtkWidget *self, main_window *widgets){
         if (strcmp(locale_string,"")) gtk_entry_set_text(GTK_ENTRY(widgets->LocaleEntry),locale_string);
     }
     g_signal_handlers_unblock_by_func(G_OBJECT(widgets->IDEntry),G_CALLBACK(on_id_changed),widgets);
-    if (getuid()==0)
+    if (getuid()==0){
+        textdomain(template_ui_LocaleName);
         yon_ubl_status_box_render(GLOBAL_LOAD_SUCCESS_LABEL,BACKGROUND_IMAGE_SUCCESS_TYPE);
+        textdomain(LocaleName);
+    }
+	main_config.load_mode=0;
 }
 
 void yon_config_global_local_save(){
-    yon_config_save_registered(NULL);
+    int changed = yon_config_get_status(id_parameter)==1;
-    yon_ubl_status_box_render(yon_char_unite(GLOBAL_LOCAL_SAVE_SUCCESS_LABEL,"\n", SAVE_WARNING_LABEL,NULL),BACKGROUND_IMAGE_SUCCESS_TYPE);
+    template_saving_window *window = yon_save_proceed(NULL,YON_CONFIG_BOTH,hostname_section,hostname_parameter,id_section,id_parameter,console_font_section,console_font_parameter,locale_section,locale_parameter,language_section,language_parameter,NULL);
+    if (window){
+        if (changed){
+            yon_ubl_status_box_spawn_infinite(GTK_CONTAINER(window->StatusBox),SAVE_WARNING_LABEL,BACKGROUND_IMAGE_SUCCESS_TYPE);
+        }
+    } else {
+        yon_ubl_status_box_render(SAVE_WARNING_LABEL,BACKGROUND_IMAGE_SUCCESS_TYPE);
+    }
+        // yon_ubl_status_box_render(yon_char_unite(SAVE_SUCCESS,"\n", SAVE_WARNING_LABEL,NULL),BACKGROUND_IMAGE_SUCCESS_TYPE);
 
 }
 
 void yon_config_local_save(){
-    yon_config_save_registered("system");
+    int changed = yon_config_get_status(id_parameter)==1;
-    yon_ubl_status_box_render(yon_char_unite(LOCAL_SAVE_SUCCESS_LABEL,"\n", SAVE_WARNING_LABEL,NULL),BACKGROUND_IMAGE_SUCCESS_TYPE);
+    template_saving_window *window = yon_save_proceed("system",YON_CONFIG_LOCAL,hostname_section,hostname_parameter,id_section,id_parameter,console_font_section,console_font_parameter,locale_section,locale_parameter,language_section,language_parameter,NULL);
+    if (window){
+        if (changed){
+            yon_ubl_status_box_spawn_infinite(GTK_CONTAINER(window->StatusBox),SAVE_WARNING_LABEL,BACKGROUND_IMAGE_SUCCESS_TYPE);
+        }
+    } else {
+        yon_ubl_status_box_render(SAVE_WARNING_LABEL,BACKGROUND_IMAGE_SUCCESS_TYPE);
+    }
+        // yon_ubl_status_box_render(yon_char_unite(LOCAL_SAVE_SUCCESS,"\n", SAVE_WARNING_LABEL,NULL),BACKGROUND_IMAGE_SUCCESS_TYPE);
+
 }
 
 void yon_config_global_save(){
-    yon_config_save_registered("global");
+    int changed = yon_config_get_status(id_parameter)==1;
-    yon_ubl_status_box_render(yon_char_unite(GLOBAL_SAVE_SUCCESS_LABEL,"\n", SAVE_WARNING_LABEL,NULL),BACKGROUND_IMAGE_SUCCESS_TYPE);
+    template_saving_window *window = yon_save_proceed("global",YON_CONFIG_GLOBAL,hostname_section,hostname_parameter,id_section,id_parameter,console_font_section,console_font_parameter,locale_section,locale_parameter,language_section,language_parameter,NULL);
+    if (window){
+        if (changed){
+            yon_ubl_status_box_spawn_infinite(GTK_CONTAINER(window->StatusBox),SAVE_WARNING_LABEL,BACKGROUND_IMAGE_SUCCESS_TYPE);
+        }
+    } else {
+        yon_ubl_status_box_render(SAVE_WARNING_LABEL,BACKGROUND_IMAGE_SUCCESS_TYPE);
+    }
+        // yon_ubl_status_box_render(yon_char_unite(GLOBAL_SAVE_SUCCESS,"\n", SAVE_WARNING_LABEL,NULL),BACKGROUND_IMAGE_SUCCESS_TYPE);
+
 
 }
 
@@ -280,7 +221,7 @@ void on_locale_accept(GtkWidget *self, dictionary *dict){
     gtk_entry_set_text(GTK_ENTRY(widgets->LocaleEntry),final_string);
     if (yon_config_get_by_key("LOCALE")) yon_config_set("LOCALE",final_ids);
     else yon_config_register("LOCALE",locale_section,final_ids);
-    on_close_subwindow(self);
+    on_subwindow_close(self);
 }
 
 void on_locale_open(GtkWidget *self, main_window *widgets){
@@ -297,7 +238,7 @@ void on_locale_open(GtkWidget *self, main_window *widgets){
     yon_dictionary_add_or_create_if_exists_with_data(dict,"widgets",widgets);
     yon_dictionary_add_or_create_if_exists_with_data(dict,"window",window);
 
-    g_signal_connect(G_OBJECT(window->CloseButton),"clicked",G_CALLBACK(on_close_subwindow),NULL);
+    g_signal_connect(G_OBJECT(window->CloseButton),"clicked",G_CALLBACK(on_subwindow_close),NULL);
     g_signal_connect(G_OBJECT(window->AcceptButton),"clicked",G_CALLBACK(on_locale_accept),dict);
     g_signal_connect(G_OBJECT(window->MainTree),"row-activated",G_CALLBACK(on_locale_toggle),window);
     gtk_dialog_run(GTK_DIALOG(window->Window));
@@ -397,10 +338,6 @@ void on_language_changed(GtkComboBox *self, main_window *widgets){
 
 void config_init(){
     main_config.always_open_documentation=0;
-    main_config.win_height=0;
-    main_config.win_width=0;
-    main_config.win_pos_x=0;
-    main_config.win_pos_y=0;
     main_config.socket_id=-1;
     main_config.save_socket_id=-1;
     main_config.load_socket_id=-1;
@@ -411,34 +348,11 @@ void config_init(){
     main_config.lock_save_local=0;
 }
 
-main_window *setup_window(){
+main_window *yon_main_window_complete(main_window *widgets){
     /* Widgets getting | Получение виджетов */
-    main_window *widgets = malloc(sizeof(main_window));
+    widgets = yon_remalloc(widgets,sizeof(main_window)); 
     GtkBuilder *builder = gtk_builder_new_from_resource(glade_path);
-    widgets->Window = yon_gtk_builder_get_widget(builder,"MainWindow");
+    gtk_box_pack_start(GTK_BOX(widgets->InterfaceBox),yon_gtk_builder_get_widget(builder,"BoxMain"),1,1,0);
-    widgets->HatLabel = yon_gtk_builder_get_widget(builder,"headerTopic");
-    widgets->PlugBox = yon_gtk_builder_get_widget(builder,"plugBox");
-
-    widgets->HeadOverlay = yon_gtk_builder_get_widget(builder,"HeadOverlay");
-    widgets->HeadImage = yon_gtk_builder_get_widget(builder,"HeadBackgroundImage");
-    widgets->HeadBox = yon_gtk_builder_get_widget(builder,"HeaderBox");
-    widgets->HeadTitleLabel = yon_gtk_builder_get_widget(builder,"HeaderTitleLabel");
-    widgets->HeadInfoLabel = yon_gtk_builder_get_widget(builder,"HeaderInfoLabel");
-    
-    widgets->StatusBox = yon_gtk_builder_get_widget(builder,"mainStatusBox");
-    widgets->StatusIcon = yon_gtk_builder_get_widget(builder,"mainStatusIcon");
-    widgets->StatusLabel = yon_gtk_builder_get_widget(builder,"mainStatusLabel");
-
-    widgets->SaveLabel = yon_gtk_builder_get_widget(builder,"headerSaveConfigLabel");
-    widgets->SaveMenuItem = yon_gtk_builder_get_widget(builder,"SaveGlobalLocalConfigurationMenuItem");
-    widgets->SaveGlobalMenuItem = yon_gtk_builder_get_widget(builder,"SaveGlobalConfigurationMenuItem");
-    widgets->SaveLocalMenuItem = yon_gtk_builder_get_widget(builder,"SaveLocalConfigurationMenuItem");
-    widgets->RightBox = yon_gtk_builder_get_widget(builder,"HeaderRightBox");
-
-    widgets->LoadLabel = yon_gtk_builder_get_widget(builder,"headerLoadConfigLabel");
-    widgets->LoadGlobalMenuItem = yon_gtk_builder_get_widget(builder,"LoadGlobalConfigurationMenuItem");
-    widgets->LoadLocalMenuItem = yon_gtk_builder_get_widget(builder,"LoadLocalConfigurationMenuItem");
-    widgets->LeftBox = yon_gtk_builder_get_widget(builder,"HeaderLeftBox");
 
     widgets->HostnameEntry = yon_gtk_builder_get_widget(builder,"HostnameEntry");
     widgets->IDCombo = yon_gtk_builder_get_widget(builder,"IDCombo");
@@ -514,6 +428,7 @@ main_window *setup_window(){
         gtk_widget_set_sensitive(widgets->SaveMenuItem,0);
     }
     gtk_widget_show(widgets->Window);
+    yon_config_local_load(NULL,widgets);
     return widgets;
 }
 
@@ -536,12 +451,11 @@ int main(int argc, char *argv[]){
                 {"socket-id", 1, 0, 's'},
                 {"socket-ext-id", 1,0, 'e'},
                 {"socket-trd-id", 1,0, 't'},
-                {"debug", 0,0, 'd'},
+                {"clear-config", 0,0, 'c'},
-                {"clean-config", 0,0, 'c'},
                 { NULL, 0, NULL, 0 }
         };
         for (int i=0;i<argc;i++){
-            int argument=getopt_long(argc,argv,"hVvs:e:t:d",long_options,&option_index);
+            int argument=getopt_long(argc,argv,"hVvs:e:t:c",long_options,&option_index);
             switch(argument){
                 case 'h':
                     show_help=1;
@@ -563,7 +477,7 @@ int main(int argc, char *argv[]){
                     if(optarg)
                         main_config.load_socket_id=atoi(optarg);
                     break;
-                case 'c': rmdir(yon_char_unite(yon_ubl_user_get_home_directory(),"/",LocaleName,"/",LocaleName,".conf",NULL));
+                case 'c': system(yon_char_unite("rm -rfd ", yon_ubl_user_get_home_directory(),"/.config/",LocaleName,"/",NULL));
                     break;
                 case 1:
                     main_config.lock_help=1;
@@ -597,21 +511,24 @@ int main(int argc, char *argv[]){
     gtk_init(&argc,&argv);
     
 
-    main_window *widgets = setup_window();
+    yon_ubl_connect_config((_template_config*)&main_config); 
-    yon_ubl_header_setup_resource(widgets->HeadOverlay,widgets->HeadBox,widgets->HeadImage,banner_path);
+    yon_ubl_window_init(TITLE_LABEL,TITLE_INFO_LABEL,LocaleName,CssPath,LocaleName,version_application,WIKI_LINK); 
-    
+    template_main_window *widgets = yon_ubl_window_setup(); 
-    yon_ubl_status_box_setup(widgets->StatusIcon,widgets->StatusBox,widgets->StatusLabel);
+    yon_main_window_complete((main_window*)widgets);
-    if (getuid()!=0)
+    
-        yon_ubl_status_box_render(ROOT_WARNING_LABEL,BACKGROUND_IMAGE_FAIL_TYPE);
+    // if (getuid()!=0){
-    yon_ubl_setup_sockets(widgets->PlugBox,widgets->LeftBox,widgets->RightBox,main_config.socket_id,main_config.load_socket_id,main_config.save_socket_id);
+    //     textdomain(template_ui_LocaleName);
-    yon_window_config_setup(GTK_WINDOW(widgets->Window));
+    //     yon_ubl_status_box_render(ROOT_WARNING_LABEL,BACKGROUND_IMAGE_FAIL_TYPE);
-    yon_window_config_load(config_path);
+    //     textdomain(LocaleName);
-    yon_config_local_load(NULL,widgets);
+    // }
-
+    // yon_ubl_setup_sockets(widgets->PlugBox,widgets->LeftBox,widgets->RightBox,main_config.socket_id,main_config.load_socket_id,main_config.save_socket_id);
-    GtkCssProvider *css=gtk_css_provider_new();
+    // yon_window_config_setup(GTK_WINDOW(widgets->Window));
-    gtk_css_provider_load_from_resource(css,CssPath);
+    // yon_window_config_load(config_path);
-    gtk_style_context_add_provider_for_screen(gdk_screen_get_default(),
+
-                            GTK_STYLE_PROVIDER(css),
+    // GtkCssProvider *css=gtk_css_provider_new();
-                            -1);
+    // gtk_css_provider_load_from_resource(css,CssPath);
+    // gtk_style_context_add_provider_for_screen(gdk_screen_get_default(),
+    //                         GTK_STYLE_PROVIDER(css),
+    //                         -1);
     gtk_main();
 }

source/ubl-settings-system.h

@@ -1,6 +1,8 @@
 #include <gtk/gtk.h>
 #include <gtk/gtkx.h>
-#include "ubl-utils.h"
+#include <libublsettings.h>
+#include <libublsettings-gtk3.h>
+#include <libublsettingsui-gtk3.h>
 #include <locale.h>
 #include <stdio.h>
 #include <unistd.h>
@@ -8,7 +10,6 @@
 #include <libintl.h>
 #include <getopt.h>
 #include <libintl.h>
-#include "../compile/ubl-cmake.h"
 #ifdef WEBKIT_FOUND
     #include <webkit2/webkit2.h>
 #endif 
@@ -37,9 +38,9 @@
 // #define get_fonts_command "ls /usr/share/kbd/consolefonts/ |grep -v \"README\"|grep -oE \"^[-a-zA-Z0-9_]{3,}.psf\"|sed -e 's/\\.psf//g'"
 
 #define hostname_parameter "HOSTNAME"
-#define hostname_section "config"
+#define hostname_section "users"
 #define id_parameter "MACHINEID"
-#define id_section "config"
+#define id_section "users"
 #define keyboard_layout_parameter "XKBLAYOUT"
 #define keyboard_section "keyboard"
 #define console_font_parameter "CONSOLE_FONT"
@@ -57,12 +58,7 @@ string version_application;
 char *local;
 
 typedef struct {
-    int always_open_documentation;
+//      Standard config. DO NOT EDIT - MUST BE SAME AS ublsettings-ui's template_config STRUCT {
-    int win_pos_x;
-    int win_pos_y;
-    int win_width;
-    int win_height;
-
     int socket_id;
     int load_socket_id;
     int save_socket_id;
@@ -71,13 +67,20 @@ typedef struct {
     int lock_save_local;
     int lock_save_global;
     int lock_load_global;
+
+    int load_mode;
+
+    int always_open_documentation;
+// }    Standard config. DO NOT EDIT - MUST BE SAME AS ublsettings-ui's template_config STRUCT
+//      Type custom parameters below:
+
     GtkListStore *localeslist;
 } config;
 
 typedef struct {
-    //Standard
+//      Standard widgets. DO NOT EDIT - MUST BE SAME AS ublsettings-ui's template_main_window STRUCT {
     GtkWidget *Window;
-    GtkWidget *HatLabel;
+    GtkWidget *HeadLabel;
     GtkWidget *PlugBox;
 
     GtkWidget *HeadOverlay;
@@ -90,19 +93,21 @@ typedef struct {
     GtkWidget *StatusIcon;
     GtkWidget *StatusLabel;
 
-    GtkWidget *SaveLabel;
     GtkWidget *SaveMenuItem;
     GtkWidget *SaveGlobalMenuItem;
     GtkWidget *SaveLocalMenuItem;
     GtkWidget *RightBox;
 
-    GtkWidget *LoadLabel;
     GtkWidget *LoadGlobalMenuItem;
     GtkWidget *LoadLocalMenuItem;
     GtkWidget *LeftBox;
 
     GtkWidget *DocumentationMenuItem;
     GtkWidget *AboutMenuItem;
+
+    GtkWidget *InterfaceBox;
+// }    Standard widgets. DO NOT EDIT - MUST BE SAME AS ublsettings-ui's template_main_window STRUCT
+//      Type custom parameters below:
     // Custom 
     GtkWidget *HostnameEntry;
     GtkWidget *IDCombo;

source/ubl-strings.h

@@ -4,38 +4,9 @@
 #define TITLE_LABEL _("System configuration")
 #define TITLE_INFO_LABEL _("System basic parameters configuration")
 
-#define SUCCESS_LABEL _("Operation succeeded")
+#define SAVE_SUCCESS _("Local and global configuration saving succeeded")
-#define ROOT_WARNING_LABEL _("Warning! Application was launched without root - root-dependent actions are locked")
+#define LOCAL_SAVE_SUCCESS _("Local configuration saving succeeded")
-
+#define GLOBAL_SAVE_SUCCESS _("Global configuration saving succeeded")
-#define ABOUT_LABEL _("About")
-#define DOCUMENTATION_LABEL _("Documentation")
-
-#define SAVE_LOCAL_LABEL _("Save to local configuration")
-#define SAVE_GLOBAL_LABEL _("Save to global configuration")
-#define SAVE_CONFIGURATION_LABEL _("Save configuration")
-#define SAVE_LABEL _("Save")
-
-#define LOAD_LOCAL_LABEL _("Load local configuration")
-#define LOAD_GLOBAL_LABEL _("Load global configuration")
-#define LOAD_LABEL _("Load")
-
-#define CANCEL_LABEL _("Cancel")
-
-#define HELP_TITLE_LABEL _("Would you like to read documentation in the Web?")
-#define HELP_INFO_LABEL _("You will be redirected to documentation website where documentation is\ntranslated and supported by community.")
-#define HELP_ALWAYS_OPEN_LABEL _("Always redirect to online documentation")
-#define OPEN_HELP_LABEL _("Open documentation")
-#define PROJECT_HOME_LABEL _("Project Home Page")
-#define NOTHING_CHOSEN_LABEL _("Nothing were chosen")
-
-
-#define GLOBAL_LOAD_SUCCESS_LABEL _("Global configuration loading succeeded")
-#define LOCAL_LOAD_SUCCESS_LABEL _("Local configuration loading succeeded")
-#define LOAD_FAILED_LABEL _("Config loading failed")
-
-#define GLOBAL_LOCAL_SAVE_SUCCESS_LABEL _("Local and global configuration saving succeeded")
-#define GLOBAL_SAVE_SUCCESS_LABEL _("Global configuration saving succeeded")
-#define LOCAL_SAVE_SUCCESS_LABEL _("Local configuration saving succeeded")
 #define SAVE_WARNING_LABEL _("Warning! New machine ID will apply after system reboot")
 
 #define HOSTNAME_LABEL _("Hostname:")

source/ubl-utils.h

@@ -1,382 +0,0 @@
-#ifndef UBL_UTILS
-#define UBL_UTILS
-#include <pthread.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <pthread.h>
-#include <string.h>
-#include <dirent.h>
-#include <unistd.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <pwd.h>
-#include <locale.h>
-#include <gtk/gtk.h>
-#include <gtk/gtkx.h>
-
-#include "../compile/ubl-cmake.h"
-#ifdef WEBKIT_FOUND
-    #include <webkit2/webkit2.h>
-#endif 
-#define DesktopPath "/usr/share/applications/"
-
-#define for_dictionaries(obj, obj1) for (obj = obj1->first; obj != NULL; obj = obj->next)
-#define for_iter(model,iter) for (int valid = gtk_tree_model_get_iter_first(model,iter);valid;valid=gtk_tree_model_iter_next(model,iter))
-
-#define new(type) malloc(sizeof(type))
-#define new_arr(type,size) malloc(sizeof(type)*size)
-
-#define get_home_dir_command yon_char_unite("getent passwd \"",yon_ubl_root_user_get(),"\" | cut -d: -f6",NULL)
-
-typedef enum
-{
-    #ifdef __GTK_H__
-    DICTIONARY_GTK_WIDGETS_TYPE,
-    #endif
-    DICTIONARY_OTHER_TYPE=0,
-    DICTIONARY_CHAR_TYPE,
-    DICTIONARY_INT_TYPE,
-    DICTIONARY_BOOL_TYPE,
-
-} DICT_TYPE;
-
-typedef struct dictionary
-{
-    char *key;
-    void *data;
-    struct dictionary *next;
-    struct dictionary *prev;
-    struct dictionary *first;
-    DICT_TYPE data_type;
-} dictionary;
-
-
-
-
-typedef struct apps
-{
-    char *Name;
-    int Type;
-    char *Categories;
-    char *Exec;
-    char *Icon;
-    int Pluggable;
-    int DualPluggable;
-} apps;
-
-typedef char** config_str;
-
-#define config(key) yon_config_get_by_key(key) 
-
-#define yon_remalloc(pointer, size) (!pointer) ? malloc(size) : realloc(pointer, size)
-// dictionary functions
-
-/**yon_dictionary_get_data(dictionary, type)
- * [EN]
- * Gets data from dictionary.
- * [dictionary] is dictionary, from which data should be extracted;
- * [type] is type of data, [dictionary] contains.
- * [RU]
- * Возвращает данные из словаря.
- * [dictionary] - словарь из которого достаются данные.
- * [type] - тип данных, хранящихся в словаре [dictionary].
-*/
-#define yon_dictionary_get_data(dictionary, type) ((type)dictionary->data)
-
-/**yon_dictionary_add_or_create_if_exists_with_data(dict,key,data)
- * [EN]
- * 
- * [RU]
- * Добавляет элемент словаря в конец словаря [dict] c ключом [key] и данными [data].
- * Если словарь не существует, создаёт его 
-*/
-#define yon_dictionary_add_or_create_if_exists_with_data(dict,key,data) {if (!dict) dict=yon_dictionary_new_with_data(key,data); \
-                                                                        else dict=yon_dictionary_append_with_data(dict,key,data);}
-
-dictionary *yon_dictionary_new();
-
-dictionary *yon_dictionary_append(dictionary *targetdict);
-
-dictionary *yon_dictionary_get_last(dictionary *dict);
-
-dictionary *yon_dictionary_swap(dictionary *dict, int aim);
-
-void yon_dictionary_make_first(dictionary *dict);
-
-void yon_dictionary_make_nth(dictionary *dict, int nth);
-
-dictionary *yon_dictionary_new_with_data(char *key, void *data);
-
-dictionary *yon_dictionary_append_with_data(dictionary *dict, char *key, void *data);
-
-dictionary *yon_dictionary_connect(dictionary *old, dictionary *toconnect);
-
-dictionary *yon_dictionary_get(dictionary **dict, char *key);
-
-dictionary *yon_dictionary_rip(dictionary *dict);
-
-dictionary *yon_dictionary_get_nth(dictionary *dict, int place);
-
-void *yon_dictionary_free_all(dictionary *dictionary,void (data_manipulation)(void*));
-
-// char functions
-
-int yon_char_find_last(char *source, char find);
-
-char *yon_char_append(char *source, char *append);
-
-char *yon_char_new(char *chr);
-
-char *yon_char_unite(char *source, ...);
-
-char *yon_cut(char *source, int size, int startpos);
-
-char *yon_char_divide(char *source, int dividepos);
-
-char *yon_char_divide_search(char *source, char *dividepos, int delete_divider);
-
-char *yon_char_from_int(int int_to_convert);
-
-char *yon_char_replace(char *source, char *find, char*replace);
-
-char **yon_char_parse(char *parameters, int *size, char *divider);
-
-char **yon_char_parsed_rip(char **char_string, int *size, int item_to_delete);
-
-int yon_char_parsed_check_exist(char **parameters, int size, char *param);
-
-int yon_char_find_count(char *source, char *find);
-
-int yon_char_parsed_includes_char_parsed (config_str source, config_str to_check, int source_size, int check_size);
-
-config_str yon_char_parsed_new (int *size, ...);
-
-void yon_char_parsed_copy(config_str *source, config_str *to_copy);
-
-config_str yon_char_parsed_append(config_str parsed, int *size, char *string);
-
-int yon_ubl_check_root();
-
-char *yon_ubl_root_user_get();
-
-char *yon_ubl_user_get_home_directory();
-
-// parsing functions
-
-config_str philos_list_user(int* size);
-
-apps *yon_apps_scan_and_parse_desktops(int *sizef);
-
-void yon_apps_sort(apps *applist, int size);
-
-apps *yon_apps_get_by_name(apps *applist, char *name, int size);
-
-config_str yon_file_open(char *file_path, int *size);
-
-//config functions
-
-#define ubconfig_save_command "ubconfig"
-#define ubconfig_load_command "ubconfig --source"
-
-typedef enum {
-    YON_CONFIG_LOCAL=0,
-    YON_CONFIG_GLOBAL,
-    YON_CONFIG_BOTH
-} YON_CONFIG_TYPE;
-
-config_str yon_config_load(char *command, int *str_len);
-
-int yon_config_save_registered(char *path);
-
-char *yon_config_get_parameter(config_str parameters, int size, char *param);
-
-int yon_config_load_register(YON_CONFIG_TYPE config_type,char *section,char *parameter, ...);
-
-int yon_config_remove_by_key(char *key);
-
-int yon_config_remove_by_data(void *data);
-
-int yon_config_remove_element(char *key, char *deleted);
-
-void *yon_config_get_by_key(char *key);
-
-char *yon_config_get_key_by_data(char *data);
-
-int yon_config_set(char *key, void *data);
-
-int yon_config_clean();
-
-void yon_config_register(char *key, char* config_section, void *data);
-
-config_str yon_config_get_all();
-
-// terminal-using functions
-
-int yon_launch_app_with_arguments(char *name, char *args);
-
-void yon_launch(char *command);
-
-// Gtk functions
-
-#ifdef __GTK_H__
-#ifdef VTE_TERMINAL
-void yon_terminal_integrated_launch(GtkWidget *place_to_show, char* command, void *endwork_function, void* endwork_function_argument);
-
-void yon_terminal_integrated_start(GtkWidget *terminal, char* command, void *endwork_function, void* endwork_function_argument);
-
-#endif
-
-enum YON_TYPE{
-    YON_TYPE_STRING,
-    YON_TYPE_STRING_LIST,
-    YON_TYPE_INT,
-    YON_TYPE_BOOLEAN,
-    YON_TYPE_OTHER
-};
-
-GtkWidget *yon_ubl_menu_item_about_new(char *buttonname);
-GtkWidget *yon_ubl_menu_item_documentation_new(char *buttonname);
-
-/**yon_gtk_builder_get_widget(builder, widget_name)
- * [EN]
- * Returns GtkWidget from GtkBuilder *[builder].
- * [builder] is GtkBuilder*;
- * [widget_name] is id of widget;
-*/
-#define yon_gtk_builder_get_widget(builder, widget_name) GTK_WIDGET(gtk_builder_get_object(builder, widget_name))
-
-typedef struct
-{
-    GtkWidget *Icon;
-    GtkWidget *Label;
-    GtkWidget *IconView;
-    GtkListStore *List;
-} expander_icon_view;
-
-void yon_window_config_setup(GtkWindow *window);
-
-int yon_window_config_load(char *path);
-
-config_str yon_window_config_get_section(char *section, gsize *size);
-
-void yon_window_config_add_listener(GtkWidget *widget, char *param_name, char *widget_property, enum YON_TYPE val_type);
-
-void yon_window_config_add_custom_parameter(char *param_name, char *section, void *tracked_value, enum YON_TYPE val_type);
-
-void yon_window_config_erase_custom_parameter(char *param_name, char *section);
-
-int yon_window_config_get_parameter(char *section, char *config_parameter, void *return_value, enum YON_TYPE type);
-
-int yon_gtk_combo_box_fill(GtkWidget *combo, char **parameters,int size);
-
-int yon_gtk_combo_box_text_find(GtkWidget *combo_box, char *text_to_find);
-
-int yon_gtk_icon_view_hide_empty(dictionary *icon_view_segment);
-
-int yon_dictionary_gtk_pack_start_multiple_widgets(GtkBox *destination, gboolean expand, gboolean fill, int padding, ...);
-
-int yon_dictionary_gtk_pack_end_multiple_widgets(GtkBox *destination, gboolean expand, gboolean fill, int padding, ...);
-
-
-void yon_gtk_widget_set_sensitive_from_toggle_button(GtkToggleButton *toggle, GtkWidget *target);
-void yon_gtk_widget_set_sensitive_from_toggle_button_inversed(GtkToggleButton *toggle, GtkWidget *target);
-void yon_gtk_widget_set_sensitive_from_combo_box(GtkComboBox *toggle, GtkWidget *target);
-void yon_gtk_widget_set_sensitive_from_combo_box_inversed(GtkComboBox *toggle, GtkWidget *target);
-
-typedef enum
-{
-    BACKGROUND_IMAGE_SUCCESS_TYPE,
-    BACKGROUND_IMAGE_FAIL_TYPE
-} BACKGROUND_IMAGE_TYPE;
-
-typedef struct {
-    BACKGROUND_IMAGE_TYPE type;
-    GtkWidget *icon;
-    GtkWidget *box;
-    GtkWidget *label;
-    char* text_to_render;
-} render_data;
-
-
-/**yon_ubl_status_box_setup(render,icon,box,label)
- * [EN]
- * Sets up [render] structure of type render_data.
- * [icon] is GtkImage widget of status box for showing status icons;
- * [box] is GtkBox widget of status box for showing status color;
- * [label] is GtkLabel widget of status box for showing status text;
- * [RU]
- * Настраивает структуру [render] типа render_data.
- * [icon] - виджет типа GtkIcon в котором будут отображаться статусные иконки;
- * [box] - виджет типа GtkBox в котором будет отображаться цвет статуса;
- * [label] - виджет типа GtkLabel в котором будет отображаться текст статусного сообщения;
-*/
-int yon_ubl_status_box_setup(GtkWidget *icon, GtkWidget *box, GtkWidget *label);
-
-/**yon_ubl_status_box_render(render,text,type)
- * [EN]
- * Renders message in status box;
- * [render] is render_data structure of status box;
- * [text] is text to be shown in status box;
- * [type] if type of message. Can be BACKGROUND_IMAGE_FAIL_TYPE or BACKGROUND_IMAGE_SUCCESS_TYPE
- * [RU]
- * Отображает сообщение в статусном окне.
- * [render] - структура типа render_data для нужного статусного окна;
- * [text] - текст, отображаемый в статусном окне;
- * [type] - тип сообщения. Может быть:
- * BACKGROUND_IMAGE_FAIL_TYPE (красный фон,иконка - восклицательный знак)
- * или
- * BACKGROUND_IMAGE_SUCCESS_TYPE (Жёлтный фон, иконка - галка)
-*/
-void yon_ubl_status_box_render(char *text, BACKGROUND_IMAGE_TYPE type);
-
-#ifdef __cplusplus
-
-/**yon_ubl_header_setup(overlay, head, image, imag_path)
- * [EN]
- * Sets up header of app.
- * [overlay] is overlay for app header;
- * [head] is box of header, which connects to [overlay]
- * [image] is header background image;
- * [imag_path] is path of image, shown in [image] 
- * [RU]
- * Настраивает заголовок приложения.
- * [overlay] - оверлей заголовка приложения;
- * [head] - шапка заголовка, присоединяемая к [overlay]
- * [image] - виджет картинки для заднего фона;
- * [imag_path] - путь до картинки, загружаемой в [image] 
-*/
-#define yon_ubl_header_setup(overlay, head, image, imag_path) _yon_ubl_header_setup(GTK_WIDGET(overlay.gobj()), GTK_WIDGET(head.gobj()), GTK_WIDGET(image.gobj()), (char *)imag_path)
-#else
-
-/**yon_ubl_header_setup(overlay, head, image, imag_path)
- * [EN]
- * Sets up header of app.
- * [overlay] is overlay for app header;
- * [head] is box of header, which connects to [overlay]
- * [image] is header background image;
- * [imag_path] is path of image, shown in [image] 
- * [RU]
- * Настраивает заголовок приложения.
- * [overlay] - оверлей заголовка приложения;
- * [head] - шапка заголовка, присоединяемая к [overlay]
- * [image] - виджет картинки для заднего фона;
- * [imag_path] - путь до картинки, загружаемой в [image] 
-*/
-#define yon_ubl_header_setup(overlay, head, image, imag_path) _yon_ubl_header_setup(GTK_WIDGET(overlay), GTK_WIDGET(head), GTK_WIDGET(image), (char *)imag_path)
-#define yon_ubl_header_setup_resource(overlay, head, image, imag_path) _yon_ubl_header_setup_resource(GTK_WIDGET(overlay), GTK_WIDGET(head), GTK_WIDGET(image), (char *)imag_path)
-#endif
-
-void _yon_ubl_header_setup(GtkWidget *Overlay, GtkWidget *Head, GtkWidget *Image, char *image_path);
-
-void _yon_ubl_header_setup_resource(GtkWidget *Overlay, GtkWidget *Head, GtkWidget *Image, char *image_path);
-
-void yon_ubl_setup_sockets(GtkWidget *main_window, GtkWidget *left_window, GtkWidget *right_window, int socket_main_id, int socket_left_id, int socket_right_id);
-#ifdef WEBKIT_FOUND
-
-void yon_ubl_browser_window_open(char *link, char *browser_window_name);
-#else
-void yon_ubl_browser_window_open(char *link,  char *browser_window_name);
-#endif
-#endif
-#endif

ubl-settings-system.glade

@@ -25,587 +25,43 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
   <!-- interface-license-type gplv2 -->
   <!-- interface-name ubl-settings-system -->
   <!-- interface-copyright UBGroup -->
-  <object class="GtkAboutDialog" id="AboutWindow">
+  <object class="GtkListStore" id="fontlist">
-    <property name="can-focus">False</property>
+    <columns>
-    <property name="resizable">False</property>
+      <!-- column-name LocaleName -->
-    <property name="modal">True</property>
+      <column type="gchararray"/>
-    <property name="window-position">center</property>
+      <!-- column-name FontCode -->
-    <property name="icon-name">com.ublinux.ubl-settings-system</property>
+      <column type="gchararray"/>
-    <property name="type-hint">dialog</property>
+    </columns>
-    <property name="urgency-hint">True</property>
+    <data>
-    <property name="program-name">ubl-settings-system</property>
+      <row>
-    <property name="version">1.1</property>
+        <col id="0" translatable="yes">Default</col>
-    <property name="copyright" translatable="yes">Copyright © 2022 - 2023, UBSoft LLC</property>
+        <col id="1" translatable="yes"> </col>
-    <property name="comments" translatable="yes">System configuration</property>
+      </row>
-    <property name="website">https://wiki.ublinux.ru/ru/Программное_обеспечение/Программы_и_утилиты/Все/ubl-settings-system</property>
+    </data>
-    <property name="website-label" translatable="yes">Project Home Page</property>
-    <property name="license" translatable="yes">Это приложение распространяется без каких-либо гарантий.
-Подробнее в &lt;a href="https://www.gnu.org/licenses/old-licenses/gpl-2.0.html"&gt;GNU General Public License, версии 2 или позднее&lt;/a&gt;.</property>
-    <property name="authors">UBGroup</property>
-    <property name="artists">UBGroup</property>
-    <property name="logo-icon-name">com.ublinux.ubl-settings-system</property>
-    <property name="wrap-license">True</property>
-    <property name="license-type">gpl-2-0</property>
-    <child internal-child="vbox">
-      <object class="GtkBox">
-        <property name="visible">True</property>
-        <property name="can-focus">False</property>
-        <property name="orientation">vertical</property>
-        <property name="spacing">2</property>
-        <child internal-child="action_area">
-          <object class="GtkButtonBox" id="buttonBoxHide">
-            <property name="can-focus">False</property>
-            <property name="layout-style">end</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">False</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-    <child type="titlebar">
-      <object class="GtkHeaderBar">
-        <property name="visible">True</property>
-        <property name="can-focus">False</property>
-        <property name="show-close-button">True</property>
-        <child type="title">
-          <object class="GtkLabel" id="headerAboutTopic">
-            <property name="visible">True</property>
-            <property name="can-focus">False</property>
-            <property name="margin-left">5</property>
-            <property name="margin-right">5</property>
-            <property name="margin-start">5</property>
-            <property name="margin-end">5</property>
-            <property name="margin-bottom">2</property>
-            <property name="label" translatable="yes">System configuration</property>
-            <attributes>
-              <attribute name="weight" value="bold"/>
-            </attributes>
-          </object>
-        </child>
-      </object>
-    </child>
-  </object>
-  <object class="GtkBox" id="HeaderBox">
-    <property name="visible">True</property>
-    <property name="can-focus">False</property>
-    <property name="valign">center</property>
-    <child>
-      <object class="GtkImage">
-        <property name="width-request">90</property>
-        <property name="visible">True</property>
-        <property name="can-focus">False</property>
-        <property name="margin-left">5</property>
-        <property name="margin-right">5</property>
-        <property name="margin-start">5</property>
-        <property name="margin-end">5</property>
-        <property name="margin-top">6</property>
-        <property name="margin-bottom">6</property>
-        <property name="pixel-size">69</property>
-        <property name="icon-name">com.ublinux.ubl-settings-system</property>
-      </object>
-      <packing>
-        <property name="expand">False</property>
-        <property name="fill">True</property>
-        <property name="position">0</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkBox">
-        <property name="visible">True</property>
-        <property name="can-focus">False</property>
-        <child>
-          <object class="GtkBox">
-            <property name="visible">True</property>
-            <property name="can-focus">False</property>
-            <child>
-              <object class="GtkBox">
-                <property name="visible">True</property>
-                <property name="can-focus">False</property>
-                <property name="valign">center</property>
-                <property name="orientation">vertical</property>
-                <child>
-                  <object class="GtkLabel" id="HeaderTitleLabel">
-                    <property name="width-request">255</property>
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property name="valign">end</property>
-                    <property name="label" translatable="yes">System configuration</property>
-                    <property name="xalign">0</property>
-                    <attributes>
-                      <attribute name="weight" value="bold"/>
-                      <attribute name="size" value="15360"/>
-                    </attributes>
-                    <style>
-                      <class name="textHead"/>
-                    </style>
-                  </object>
-                  <packing>
-                    <property name="expand">True</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="HeaderInfoLabel">
-                    <property name="width-request">255</property>
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property name="valign">start</property>
-                    <property name="label" translatable="yes">System basic parameters configuration</property>
-                    <property name="xalign">0</property>
-                    <attributes>
-                      <attribute name="weight" value="bold"/>
-                      <attribute name="size" value="12288"/>
-                    </attributes>
-                    <style>
-                      <class name="textHead"/>
-                    </style>
-                  </object>
-                  <packing>
-                    <property name="expand">True</property>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">True</property>
-            <property name="fill">True</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-      </object>
-      <packing>
-        <property name="expand">True</property>
-        <property name="fill">True</property>
-        <property name="position">1</property>
-      </packing>
-    </child>
-  </object>
-  <object class="GtkListStore" id="fontlist">
-    <columns>
-      <!-- column-name LocaleName -->
-      <column type="gchararray"/>
-      <!-- column-name FontCode -->
-      <column type="gchararray"/>
-    </columns>
-    <data>
-      <row>
-        <col id="0" translatable="yes">Default</col>
-        <col id="1" translatable="yes"> </col>
-      </row>
-    </data>
-  </object>
-  <object class="GtkImage" id="image1">
-    <property name="visible">True</property>
-    <property name="can-focus">False</property>
-    <property name="icon-name">edit-copy-symbolic</property>
-  </object>
-  <object class="GtkImage" id="image2">
-    <property name="visible">True</property>
-    <property name="can-focus">False</property>
-    <property name="icon-name">document-edit-symbolic</property>
-  </object>
-  <object class="GtkImage" id="image8">
-    <property name="visible">True</property>
-    <property name="can-focus">False</property>
-    <property name="icon-name">process-stop-symbolic</property>
-  </object>
-  <object class="GtkImage" id="image9">
-    <property name="visible">True</property>
-    <property name="can-focus">False</property>
-    <property name="icon-name">emblem-ok-symbolic</property>
-  </object>
-  <object class="GtkApplicationWindow" id="helpConfirmationWindow">
-    <property name="width-request">450</property>
-    <property name="can-focus">False</property>
-    <property name="resizable">False</property>
-    <property name="default-width">450</property>
-    <property name="icon-name">dialog-question-symbolic</property>
-    <child>
-      <object class="GtkBox">
-        <property name="visible">True</property>
-        <property name="can-focus">False</property>
-        <property name="margin-start">5</property>
-        <property name="margin-end">5</property>
-        <property name="margin-top">5</property>
-        <property name="margin-bottom">5</property>
-        <property name="orientation">vertical</property>
-        <property name="spacing">10</property>
-        <child>
-          <object class="GtkBox">
-            <property name="visible">True</property>
-            <property name="can-focus">False</property>
-            <child>
-              <object class="GtkImage">
-                <property name="visible">True</property>
-                <property name="can-focus">False</property>
-                <property name="valign">start</property>
-                <property name="xpad">20</property>
-                <property name="ypad">20</property>
-                <property name="icon-name">dialog-question-symbolic</property>
-                <property name="icon_size">6</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkBox">
-                <property name="visible">True</property>
-                <property name="can-focus">False</property>
-                <property name="orientation">vertical</property>
-                <child>
-                  <object class="GtkLabel" id="helpHeader">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property name="halign">start</property>
-                    <property name="margin-top">10</property>
-                    <property name="margin-bottom">5</property>
-                    <property name="label" translatable="yes">Would you like to read documentation in the Web?</property>
-                    <property name="wrap">True</property>
-                    <property name="xalign">0</property>
-                    <attributes>
-                      <attribute name="weight" value="bold"/>
-                    </attributes>
-                    <style>
-                      <class name="fgnb"/>
-                    </style>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="helpText">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property name="halign">start</property>
-                    <property name="valign">start</property>
-                    <property name="margin-right">10</property>
-                    <property name="margin-end">10</property>
-                    <property name="label" translatable="yes">You will be redirected to documentation website where documentation is
-translated and supported by community.</property>
-                    <property name="wrap">True</property>
-                    <property name="xalign">0</property>
-                    <style>
-                      <class name="fgnb"/>
-                    </style>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkCheckButton" id="AlwaysOpenDocumentationCheckbox">
-                    <property name="label" translatable="yes">Always redirect to online documentation</property>
-                    <property name="visible">True</property>
-                    <property name="can-focus">True</property>
-                    <property name="receives-default">False</property>
-                    <property name="halign">end</property>
-                    <property name="draw-indicator">True</property>
-                    <style>
-                      <class name="label"/>
-                    </style>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="pack-type">end</property>
-                    <property name="position">2</property>
-                  </packing>
-                </child>
-                <style>
-                  <class name="fgnb"/>
-                </style>
-              </object>
-              <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-            <style>
-              <class name="fgnb"/>
-            </style>
-          </object>
-          <packing>
-            <property name="expand">True</property>
-            <property name="fill">True</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkBox">
-            <property name="visible">True</property>
-            <property name="can-focus">False</property>
-            <property name="spacing">30</property>
-            <property name="homogeneous">True</property>
-            <child>
-              <object class="GtkButton" id="CancelHelpButton">
-                <property name="label" translatable="yes">Cancel</property>
-                <property name="visible">True</property>
-                <property name="can-focus">True</property>
-                <property name="receives-default">True</property>
-                <property name="image">image8</property>
-                <style>
-                  <class name="button"/>
-                </style>
-              </object>
-              <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" id="ReadHelpButton">
-                <property name="label" translatable="yes">Open documentation</property>
-                <property name="visible">True</property>
-                <property name="can-focus">True</property>
-                <property name="receives-default">True</property>
-                <property name="image">image9</property>
-                <style>
-                  <class name="button"/>
-                </style>
-              </object>
-              <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-    <child type="titlebar">
-      <object class="GtkHeaderBar" id="SettingsBar">
-        <property name="visible">True</property>
-        <property name="can-focus">False</property>
-        <property name="show-close-button">True</property>
-        <child type="title">
-          <object class="GtkLabel" id="webHeaderNameLabel">
-            <property name="visible">True</property>
-            <property name="can-focus">False</property>
-            <property name="label" translatable="yes">System configuration</property>
-            <attributes>
-              <attribute name="weight" value="bold"/>
-            </attributes>
-          </object>
-        </child>
-      </object>
-    </child>
-  </object>
-  <object class="GtkListStore" id="languagelist">
-    <columns>
-      <!-- column-name LocaleName -->
-      <column type="gchararray"/>
-      <!-- column-name LanguageCode -->
-      <column type="gchararray"/>
-      <!-- column-name gboolean1 -->
-      <column type="gboolean"/>
-    </columns>
-  </object>
-  <object class="GtkMenu" id="menu1">
-    <property name="visible">True</property>
-    <property name="can-focus">False</property>
-    <property name="reserve-toggle-size">False</property>
-    <child>
-      <object class="GtkMenuItem" id="LoadGlobalConfigurationMenuItem">
-        <property name="visible">True</property>
-        <property name="can-focus">False</property>
-        <property name="label" translatable="yes">Load global configuration</property>
-        <style>
-          <class name="menuitemtop"/>
-        </style>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="LoadLocalConfigurationMenuItem">
-        <property name="visible">True</property>
-        <property name="can-focus">False</property>
-        <property name="label" translatable="yes">Load local configuration</property>
-        <style>
-          <class name="menuitembottom"/>
-        </style>
-      </object>
-    </child>
-  </object>
-  <object class="GtkMenu" id="menu2">
-    <property name="visible">True</property>
-    <property name="can-focus">False</property>
-    <property name="take-focus">False</property>
-    <property name="reserve-toggle-size">False</property>
-  </object>
-  <object class="GtkMenu" id="menu3">
-    <property name="visible">True</property>
-    <property name="can-focus">False</property>
-    <property name="reserve-toggle-size">False</property>
-    <child>
-      <object class="GtkMenuItem" id="SaveGlobalLocalConfigurationMenuItem">
-        <property name="visible">True</property>
-        <property name="can-focus">False</property>
-        <property name="label" translatable="yes">Save configuration</property>
-        <style>
-          <class name="menuitemtop"/>
-        </style>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="SaveGlobalConfigurationMenuItem">
-        <property name="visible">True</property>
-        <property name="can-focus">False</property>
-        <property name="label" translatable="yes">Save to global configuration</property>
-        <style>
-          <class name="menuitemmiddle"/>
-        </style>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="SaveLocalConfigurationMenuItem">
-        <property name="visible">True</property>
-        <property name="can-focus">False</property>
-        <property name="label" translatable="yes">Save to local configuration</property>
-        <style>
-          <class name="menuitembottom"/>
-        </style>
-      </object>
-    </child>
-  </object>
-  <object class="GtkWindow" id="MainWindow">
-    <property name="width-request">800</property>
-    <property name="can-focus">False</property>
-    <property name="icon-name">com.ublinux.ubl-settings-system</property>
-    <child>
-      <object class="GtkBox" id="plugBox">
-        <property name="visible">True</property>
-        <property name="can-focus">False</property>
-        <property name="orientation">vertical</property>
-        <child>
-          <object class="GtkBox">
-            <property name="visible">True</property>
-            <property name="can-focus">False</property>
-            <property name="orientation">vertical</property>
-            <child>
-              <object class="GtkBox" id="mainStatusBox">
-                <property name="visible">True</property>
-                <property name="can-focus">False</property>
-                <child>
-                  <object class="GtkImage" id="mainStatusIcon">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property name="margin-left">5</property>
-                    <property name="margin-right">5</property>
-                    <property name="margin-start">5</property>
-                    <property name="margin-end">5</property>
-                    <property name="margin-top">5</property>
-                    <property name="margin-bottom">5</property>
-                    <property name="pixel-size">25</property>
   </object>
-                  <packing>
+  <object class="GtkImage" id="image1">
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="mainStatusLabel">
     <property name="visible">True</property>
     <property name="can-focus">False</property>
-                    <property name="halign">start</property>
+    <property name="icon-name">edit-copy-symbolic</property>
-                    <property name="margin-left">5</property>
-                    <property name="margin-right">5</property>
-                    <property name="margin-start">5</property>
-                    <property name="margin-end">5</property>
-                    <property name="margin-top">6</property>
-                    <property name="margin-bottom">6</property>
-                    <property name="wrap">True</property>
-                    <attributes>
-                      <attribute name="weight" value="bold"/>
-                      <attribute name="foreground" value="#4d4d4d4d4d4d"/>
-                    </attributes>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
   </object>
-              <packing>
+  <object class="GtkImage" id="image2">
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkBox" id="standartHead">
-                <property name="visible">True</property>
-                <property name="can-focus">False</property>
-                <property name="orientation">vertical</property>
-                <child>
-                  <object class="GtkOverlay" id="HeadOverlay">
-                    <property name="height-request">81</property>
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <child>
-                      <object class="GtkImage" id="HeadBackgroundImage">
     <property name="visible">True</property>
     <property name="can-focus">False</property>
-                        <property name="halign">start</property>
+    <property name="icon-name">document-edit-symbolic</property>
-                      </object>
-                      <packing>
-                        <property name="index">-1</property>
-                      </packing>
-                    </child>
   </object>
-                  <packing>
+  <object class="GtkListStore" id="languagelist">
-                    <property name="expand">False</property>
+    <columns>
-                    <property name="fill">True</property>
+      <!-- column-name LocaleName -->
-                    <property name="position">0</property>
+      <column type="gchararray"/>
-                  </packing>
+      <!-- column-name LanguageCode -->
-                </child>
+      <column type="gchararray"/>
+      <!-- column-name gboolean1 -->
+      <column type="gboolean"/>
+    </columns>
   </object>
-              <packing>
+  <object class="GtkBox" id="BoxMain">
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkBox">
     <property name="visible">True</property>
     <property name="can-focus">False</property>
-                <property name="margin-left">5</property>
-                <property name="margin-right">5</property>
-                <property name="margin-start">5</property>
-                <property name="margin-end">5</property>
-                <property name="margin-top">5</property>
-                <property name="margin-bottom">5</property>
-                <property name="hexpand">True</property>
-                <property name="vexpand">True</property>
     <property name="orientation">vertical</property>
     <property name="spacing">5</property>
     <child>
@@ -983,199 +439,80 @@ translated and supported by community.</property>
       </packing>
     </child>
   </object>
-              <packing>
+  <object class="GtkSizeGroup">
-                <property name="expand">False</property>
+    <widgets>
-                <property name="fill">True</property>
+      <widget name="label1"/>
-                <property name="position">2</property>
+      <widget name="label2"/>
-              </packing>
+      <widget name="label4"/>
-            </child>
+      <widget name="label6"/>
-          </object>
+      <widget name="label3"/>
-          <packing>
+      <widget name="label6"/>
-            <property name="expand">True</property>
+    </widgets>
-            <property name="fill">True</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
   </object>
-    </child>
+  <object class="GtkMenu" id="menu1">
-    <child type="titlebar">
-      <object class="GtkHeaderBar" id="headerBar">
     <property name="visible">True</property>
     <property name="can-focus">False</property>
-        <property name="show-close-button">True</property>
+    <property name="reserve-toggle-size">False</property>
-        <child type="title">
+    <child>
-          <object class="GtkLabel" id="headerTopic">
+      <object class="GtkMenuItem" id="LoadGlobalConfigurationMenuItem">
         <property name="visible">True</property>
         <property name="can-focus">False</property>
-            <property name="margin-left">5</property>
+        <property name="label" translatable="yes">Load global configuration</property>
-            <property name="margin-right">5</property>
+        <style>
-            <property name="margin-start">5</property>
+          <class name="menuitemtop"/>
-            <property name="margin-end">5</property>
+        </style>
-            <property name="margin-bottom">2</property>
-            <property name="label" translatable="yes">System configuration</property>
-            <attributes>
-              <attribute name="weight" value="bold"/>
-            </attributes>
       </object>
     </child>
     <child>
-          <object class="GtkImage">
+      <object class="GtkMenuItem" id="LoadLocalConfigurationMenuItem">
         <property name="visible">True</property>
         <property name="can-focus">False</property>
-            <property name="margin-left">5</property>
+        <property name="label" translatable="yes">Load local configuration</property>
-            <property name="margin-right">5</property>
+        <style>
-            <property name="margin-start">5</property>
+          <class name="menuitembottom"/>
-            <property name="margin-end">5</property>
+        </style>
-            <property name="margin-top">6</property>
-            <property name="margin-bottom">6</property>
-            <property name="pixel-size">32</property>
-            <property name="icon-name">com.ublinux.ubl-settings-system</property>
       </object>
     </child>
-        <child>
+  </object>
-          <object class="GtkBox" id="HeaderRightBox">
+  <object class="GtkMenu" id="menu2">
-            <property name="visible">True</property>
-            <property name="can-focus">False</property>
-            <child>
-              <object class="GtkMenuButton">
-                <property name="visible">True</property>
-                <property name="can-focus">True</property>
-                <property name="focus-on-click">False</property>
-                <property name="receives-default">True</property>
-                <property name="popup">menu3</property>
-                <child>
-                  <object class="GtkBox">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <child>
-                      <object class="GtkLabel" id="headerSaveConfigLabel">
     <property name="visible">True</property>
     <property name="can-focus">False</property>
-                        <property name="label" translatable="yes">Save</property>
+    <property name="take-focus">False</property>
+    <property name="reserve-toggle-size">False</property>
   </object>
-                      <packing>
+  <object class="GtkMenu" id="menu3">
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkImage">
     <property name="visible">True</property>
     <property name="can-focus">False</property>
-                        <property name="icon-name">pan-down-symbolic</property>
+    <property name="reserve-toggle-size">False</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                  </object>
-                </child>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
     <child>
-              <object class="GtkMenuButton" id="mainSettingsButton">
+      <object class="GtkMenuItem" id="SaveGlobalLocalConfigurationMenuItem">
         <property name="visible">True</property>
-                <property name="app-paintable">True</property>
+        <property name="can-focus">False</property>
-                <property name="can-focus">True</property>
+        <property name="label" translatable="yes">Save configuration</property>
-                <property name="focus-on-click">False</property>
-                <property name="receives-default">True</property>
-                <property name="draw-indicator">True</property>
-                <property name="popup">menu2</property>
-                <property name="direction">none</property>
-                <child>
-                  <placeholder/>
-                </child>
         <style>
-                  <class name="noborder"/>
+          <class name="menuitemtop"/>
         </style>
       </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="pack-type">end</property>
-            <property name="position">1</property>
-          </packing>
     </child>
     <child>
-          <object class="GtkBox" id="HeaderLeftBox">
+      <object class="GtkMenuItem" id="SaveGlobalConfigurationMenuItem">
-            <property name="visible">True</property>
-            <property name="can-focus">False</property>
-            <child>
-              <object class="GtkMenuButton">
-                <property name="visible">True</property>
-                <property name="can-focus">True</property>
-                <property name="focus-on-click">False</property>
-                <property name="receives-default">True</property>
-                <property name="popup">menu1</property>
-                <child>
-                  <object class="GtkBox">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <child>
-                      <object class="GtkLabel" id="headerLoadConfigLabel">
         <property name="visible">True</property>
         <property name="can-focus">False</property>
-                        <property name="label" translatable="yes">Load</property>
+        <property name="label" translatable="yes">Save to global configuration</property>
+        <style>
+          <class name="menuitemmiddle"/>
+        </style>
       </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">0</property>
-                      </packing>
     </child>
     <child>
-                      <object class="GtkImage">
+      <object class="GtkMenuItem" id="SaveLocalConfigurationMenuItem">
         <property name="visible">True</property>
         <property name="can-focus">False</property>
-                        <property name="icon-name">pan-down-symbolic</property>
+        <property name="label" translatable="yes">Save to local configuration</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                  </object>
-                </child>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="position">2</property>
-          </packing>
-        </child>
         <style>
-          <class name="toolbar"/>
+          <class name="menuitembottom"/>
         </style>
       </object>
     </child>
   </object>
-  <object class="GtkSizeGroup">
-    <widgets>
-      <widget name="label1"/>
-      <widget name="label2"/>
-      <widget name="label4"/>
-      <widget name="label6"/>
-      <widget name="label3"/>
-      <widget name="label6"/>
-    </widgets>
-  </object>
 </interface>