Version 1.0 is done

.gitignore

@@ -3,3 +3,4 @@ ubl-settings-update.glade~
 ubl-settings-update
 ubl-settings-update_ru.po~
 build/
+compile/

Makefile

@@ -88,6 +88,7 @@ uninstall:
 	@$(RM) "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps/com.ublinux.${PKGNAME}.svg"
 	@$(RM) -rd "${DESTDIR}${PREFIX}/share/${PKGNAME}/images/${PKGNAME}-banner.png"
 	@$(RM) -rd "${DESTDIR}${PREFIX}/share/${PKGNAME}"
+	@$(RM) "${DESTDIR}${PREFIX}/share/polkit-1/actions/com.ublinux.${PKGNAME}.policy"
 	@if [ -z ${DESTDIR} ]; then \
 	    [ -d "${DESTDIR}${PREFIX}/share/icons/hicolor/" ] && gtk-update-icon-cache -fiq "${DESTDIR}${PREFIX}/share/icons/hicolor/" &>/dev/null || true; \
 	    update-desktop-database --quiet &>/dev/null || true; \
@@ -111,6 +112,8 @@ install: check uninstall
 	done
 	@install -dm755 "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps"
 	@install -Dm644 -t "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps/" "com.ublinux.${PKGNAME}.svg"
+	@install -dm755 "${DESTDIR}${PREFIX}/share/polkit-1/actions"
+	@install -Dm644 -t "${DESTDIR}${PREFIX}/share/polkit-1/actions/" "com.ublinux.${PKGNAME}.policy"
 	@install -Dm755 -t "${DESTDIR}${PREFIX}/bin/" "${CMAKE_BUILD_DIR}/${PKGNAME}"
 	@install -dm755 "${DESTDIR}/etc/xdg"
 	@install -dm755 "${DESTDIR}${PREFIX}/share/applications"

com.ublinux.ubl-settings-update.policy

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE policyconfig PUBLIC
+ "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/PolicyKit/1/policyconfig.dtd">
+<policyconfig>
+
+  <vendor>UBLinux</vendor>
+  <vendor_url>https://ublinux.ru</vendor_url>
+
+  <action id="com.ublinux.ubl-settings-update.run">
+    <description>Run ubl-settings-update as root</description>
+    <description xml:lang="ru">Запуск утилиты ubl-settings-update с правами root</description>
+    <message>Authentication is required to run ubl-settings-update</message>
+    <message xml:lang="ru">Требуется авторизация для запуска утилиты ubl-settings-update с правами root</message>
+    <defaults>
+      <allow_any>auth_admin</allow_any>
+      <allow_inactive>auth_admin</allow_inactive>
+      <allow_active>auth_admin</allow_active>
+    </defaults>
+    <annotate key="org.freedesktop.policykit.exec.path">/usr/bin/ubl-settings-update</annotate>
+    <annotate key="org.freedesktop.policykit.exec.allow_gui">true</annotate>
+  </action>
+
+</policyconfig>

source/CMakeLists.txt

@@ -8,23 +8,41 @@ include_directories(${GTK_INCLUDE_DIRS})
 link_directories(${GTK_LIBRARY_DIRS})
 add_definitions(${GTK_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-settings-update.h.in ubl-settings-cmake.h)
+
+
 #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} -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")
+        -fstack-clash-protection -fcf-protection -g")
 
 set(SOURCE_FILES
         ubl-settings-update.c
         ubl-settings-update.h
-        ubl-utils.c)
+        ubl-utils.h
+        ubl-utils.c
+        ubl-settings-cmake.h)
 
 set(LIBRARIES
         ${GTK_LIBRARIES}
+        ${WEBKIT_LIBRARIES}
         pthread)
 
 
-add_executable(ubl-settings-update ${SOURCE_FILES})
+add_executable(${PROJECT_NAME} ${SOURCE_FILES})
-target_link_libraries(ubl-settings-update ${LIBRARIES})
+target_link_libraries(${PROJECT_NAME} PUBLIC ${LIBRARIES})
+target_include_directories(${PROJECT_NAME} PUBLIC ${PROJECT_BINARY_DIR})
 install(TARGETS ubl-settings-update DESTINATION bin)

source/ubl-settings-update-strings.h

@@ -1,4 +1,7 @@
+#define VERSION_LABEL yon_char_unite(_("Version:")," ",version_application,"\n",NULL)
+#define HELP_LABEL yon_char_unite(_("ubl-settings-update version:")," ", version_application,"\n",_("update settings"),"\n",_("Usage:"), " ubl-settings-update ",_("[OPTIONS]"),"\n",_("Options:"),"\n\t--help, -h\t\t\t",_("Show this help"),"\n\t--version, -V\t\t\t",_("Show package version"),"\n\t--lock-help\t\t\t",_("Lock this help menu"),"\n\t--lock-save\t\t\t",_("Lock configuration saving"),"\n\t--lock-save-local\t\t",_("Lock local configration saving"),"\n\t--lock-save-global\t\t",_("Lock global configration saving"),"\n\t--lock-load-global\t\t",_("Lock global configration loading"),"\n",NULL)
 #define TITLE_LABEL _("System update")
+#define TITLE_INFO_LABEL _("System update settings management")
 #define CHECK_FOR_UPDATES_LABEL _("Check for updates")
 #define ABOUT_LABEL _("About")
 #define DOCUMENTATION_LABEL _("Documentation")
@@ -15,6 +18,7 @@
 #define PACKAGE_MANAGER_LABEL _("Package manager: ")
 #define URI_LABEL _("URI")
 #define ENABLED_LABEL _("Enabled")
+#define DISTIBUTION_LABEL _("Distribution")
 #define UBUR_LABEL _("Activate UBUR")
 #define AUR_LABEL _("Activate AUR")
 #define EVERY_3_HOURS_LABEL _("Every 3 hours")
@@ -30,3 +34,16 @@
 #define DISTRIBUTION_LABEL _("Distribution: ")
 #define CANCEL_LABEL _("Cancel")
 #define SAVE_LABEL _("Save")
+#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 _("Global configuration loading succseeded.")
+#define LOCAL_LOAD_SUCCESS _("Local configuration loading succseeded.")
+
+#define GLOBAL_LOCAL_SAVE_SUCCESS _("Local and global configuration saving succseeded.")
+#define GLOBAL_SAVE_SUCCESS _("Global configuration saving succseeded.")
+#define LOCAL_SAVE_SUCCESS _("Local configuration saving succseeded.")

source/ubl-settings-update.c

@@ -1,41 +1,153 @@
-#include <gtk/gtk.h>
 #include "ubl-settings-update.h"
 
-void on_repo_window_open(GtkWidget *self){
+config main_config;
-    repo_window *widgets=setup_repo_window();
+render_data render;
-}
 
 void on_close_subwindow(GtkWidget *self){
     gtk_widget_destroy(gtk_widget_get_toplevel(self));
 }
 
+void yon_open_browser(GtkWidget *self, char *link){
+    yon_ubl_browser_window_open(link,TITLE_LABEL);
+}
+
+void on_open_documentation_confirmation(GtkWidget *self, char *link){
+    if (main_config.always_open_documentation==0){
+        GtkBuilder *builder = gtk_builder_new_from_file(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);
+    }
+}
+
+void on_link(GtkWidget *self, char* uri, gpointer user_data){
+    gtk_widget_destroy(self);
+    on_open_documentation_confirmation(self,uri);
+}
+
 void on_about(){
     GtkBuilder *builder=gtk_builder_new_from_file(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_program_name(GTK_ABOUT_DIALOG(window),_("UBlinux System update"));
     gtk_about_dialog_set_version(GTK_ABOUT_DIALOG(window),version_application);
-    gtk_about_dialog_set_website_label(GTK_ABOUT_DIALOG(window),_("Project Home Page"));
+    gtk_about_dialog_set_website_label(GTK_ABOUT_DIALOG(window),PROJECT_HOME_LABEL);
-    gtk_about_dialog_set_comments(GTK_ABOUT_DIALOG(window),_("Update configurator"));
+    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);
 }
 
-repo_window *setup_repo_window(){
+void on_repos_add(GtkWidget *self, repo_window *repo){
+    char *distr = yon_char_new((char*)gtk_entry_get_text(GTK_ENTRY(repo->repoDistributionEntry)));
+    char *address = yon_char_new((char*)gtk_entry_get_text(GTK_ENTRY(repo->repoTypeEntry)));
+    if ((distr&&address)||(strcmp(distr,"")!=0&&strcmp(address,"")!=0)){
+        GtkTreeIter iter;
+        gtk_list_store_append(main_config.list,&iter);
+        gtk_list_store_set(main_config.list,&iter,1,address,2,distr,-1);
+    }
+}
+
+void on_repos_delete(GtkWidget *self, GtkWidget *tree){
+    GtkTreeIter iter;
+    GtkTreeModel *model = GTK_TREE_MODEL(main_config.list); 
+    if (gtk_tree_selection_get_selected(gtk_tree_view_get_selection(GTK_TREE_VIEW(tree)),&model,&iter)){
+        gtk_list_store_remove(main_config.list,&iter);
+    } else {
+        yon_ubl_status_box_render(render,NOTHING_CHOSEN_LABEL,BACKGROUND_IMAGE_FAIL_TYPE);
+    }
+}
+
+void on_repos_edit(GtkWidget *self, repo_window *widgets){
+    GtkTreeIter iter;
+    GtkTreeModel *model=GTK_TREE_MODEL(main_config.list);
+    if (gtk_tree_selection_get_selected(gtk_tree_view_get_selection(GTK_TREE_VIEW(widgets->tree)),&model,&iter)){
+        char *adress=yon_char_new((char*)gtk_entry_get_text(GTK_ENTRY(widgets->repoTypeEntry)));
+        char *distro=yon_char_new((char*)gtk_entry_get_text(GTK_ENTRY(widgets->repoDistributionEntry)));
+        if ((distro&&adress)||(strcmp(distro,"")!=0&&strcmp(adress,"")!=0))
+            gtk_list_store_set(main_config.list,&iter,1,adress,2,distro,-1);
+    }
+}
+
+void on_repo_window_open_edit(GtkWidget *self, GtkWidget *tree){
+    GtkTreeIter iter;
+    GtkTreeModel *model=GTK_TREE_MODEL(main_config.list);
+    if (gtk_tree_selection_get_selected(gtk_tree_view_get_selection(GTK_TREE_VIEW(tree)),&model,&iter)){
         repo_window *widgets=NULL;
         widgets=malloc(sizeof(repo_window));
         widgets->builder= gtk_builder_new_from_file(glade_path);
         widgets->window=yon_gtk_builder_get_widget(widgets->builder, "RepoWindow");
 
-    widgets->repoTypeLabel=yon_gtk_builder_get_widget(widgets->builder, "repoTypeLabel");
+        widgets->repoTypeLabel=yon_gtk_builder_get_widget(widgets->builder, "repoAdressLabel");
-    widgets->repoTypeEntry=yon_gtk_builder_get_widget(widgets->builder, "repoTypeEntry");
+        widgets->repoTypeEntry=yon_gtk_builder_get_widget(widgets->builder, "repoAdressEntry");
         widgets->repoDistributionLabel=yon_gtk_builder_get_widget(widgets->builder, "repoDistributionLabel");
         widgets->repoDistributionEntry=yon_gtk_builder_get_widget(widgets->builder, "repoDistributionEntry");
 
         widgets->repoCancelButton=yon_gtk_builder_get_widget(widgets->builder, "repoCancelButton");
         widgets->repoAcceptButton=yon_gtk_builder_get_widget(widgets->builder, "repoAcceptButton");
+        widgets->tree=tree;
 
         g_signal_connect(G_OBJECT(widgets->repoCancelButton), "clicked", G_CALLBACK(on_close_subwindow), NULL);
+        g_signal_connect(G_OBJECT(widgets->repoAcceptButton), "clicked", G_CALLBACK(on_repos_edit), widgets);
+        g_signal_connect(G_OBJECT(widgets->repoAcceptButton), "clicked", G_CALLBACK(on_close_subwindow), NULL);
+        char *adress = NULL;
+        char *distro = NULL;
+        gtk_tree_model_get(GTK_TREE_MODEL(main_config.list),&iter,1,&adress,2,&distro,-1);
+        gtk_entry_set_text(GTK_ENTRY(widgets->repoTypeEntry),adress);
+        gtk_entry_set_text(GTK_ENTRY(widgets->repoDistributionEntry),distro);
+
+        gtk_window_set_title(GTK_WINDOW(widgets->window),TITLE_LABEL);
+
+        gtk_label_set_text(GTK_LABEL(widgets->repoTypeLabel),ADRESS_LABEL);
+        gtk_label_set_text(GTK_LABEL(widgets->repoDistributionLabel),DISTRIBUTION_LABEL);
+
+        gtk_button_set_label(GTK_BUTTON(widgets->repoCancelButton),CANCEL_LABEL);
+        gtk_button_set_label(GTK_BUTTON(widgets->repoAcceptButton),SAVE_LABEL);
+        gtk_widget_show_all(widgets->window);
+    } else {
+        yon_ubl_status_box_render(render,NOTHING_CHOSEN_LABEL,BACKGROUND_IMAGE_FAIL_TYPE);
+    }
+    
+
+}
+
+repo_window *on_repo_window_open_create(GtkWidget *self){
+    repo_window *widgets=NULL;
+    widgets=malloc(sizeof(repo_window));
+    widgets->builder= gtk_builder_new_from_file(glade_path);
+    widgets->window=yon_gtk_builder_get_widget(widgets->builder, "RepoWindow");
+
+    widgets->repoTypeLabel=yon_gtk_builder_get_widget(widgets->builder, "repoAdressLabel");
+    widgets->repoTypeEntry=yon_gtk_builder_get_widget(widgets->builder, "repoAdressEntry");
+    widgets->repoDistributionLabel=yon_gtk_builder_get_widget(widgets->builder, "repoDistributionLabel");
+    widgets->repoDistributionEntry=yon_gtk_builder_get_widget(widgets->builder, "repoDistributionEntry");
+
+    widgets->repoCancelButton=yon_gtk_builder_get_widget(widgets->builder, "repoCancelButton");
+    widgets->repoAcceptButton=yon_gtk_builder_get_widget(widgets->builder, "repoAcceptButton");
+
+    g_signal_connect(G_OBJECT(widgets->repoCancelButton), "clicked", G_CALLBACK(on_close_subwindow), NULL);
+    g_signal_connect(G_OBJECT(widgets->repoAcceptButton), "clicked", G_CALLBACK(on_repos_add), widgets);
     g_signal_connect(G_OBJECT(widgets->repoAcceptButton), "clicked", G_CALLBACK(on_close_subwindow), NULL);
 
 
@@ -49,6 +161,23 @@ repo_window *setup_repo_window(){
     gtk_widget_show_all(widgets->window);
 }
 
+void init(GtkListStore *list){
+    main_config.always_open_documentation=0;
+    main_config.win_height=600;
+    main_config.win_width=800;
+    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;
+    main_config.lock_help=0;
+    main_config.lock_help=0;
+    main_config.lock_load_global=0;
+    main_config.lock_save_global=0;
+    main_config.lock_save_local=0;
+    main_config.list=list;
+}
+
 main_window *setup_window(){
     main_window *widgets=NULL;
     widgets=malloc(sizeof(main_window));
@@ -57,6 +186,10 @@ main_window *setup_window(){
 
     widgets->HeaderTopic=yon_gtk_builder_get_widget(widgets->builder,"headerTopic");
 
+    widgets->PlugBox=yon_gtk_builder_get_widget(widgets->builder,"plugBox");
+    widgets->RightBox=yon_gtk_builder_get_widget(widgets->builder,"LeftBox");
+    widgets->LeftBox=yon_gtk_builder_get_widget(widgets->builder,"RightBox");
+
     widgets->generalSettingsTabLabel=yon_gtk_builder_get_widget(widgets->builder,"generalTabLabel");
     widgets->repositoriesSettingsTabLabel=yon_gtk_builder_get_widget(widgets->builder,"repositoriesTabLabel");
     widgets->extraSettingsTabLabel=yon_gtk_builder_get_widget(widgets->builder,"extraTabLabel");
@@ -76,6 +209,7 @@ main_window *setup_window(){
     widgets->repositoriesSettingsRepositoriesTreeView=yon_gtk_builder_get_widget(widgets->builder,"RepositoriesTreeView");
     widgets->repositoriesSettingsEnabledColumn=GTK_TREE_VIEW_COLUMN(gtk_builder_get_object(widgets->builder,"EnabledColumn"));
     widgets->repositoriesSettingsURIColumn=GTK_TREE_VIEW_COLUMN(gtk_builder_get_object(widgets->builder,"URIColumn"));
+    widgets->repositoriesSettingsDistributionColumn=GTK_TREE_VIEW_COLUMN(gtk_builder_get_object(widgets->builder,"DistributionColumn"));
 
     widgets->extraSettingsPackageManagerLabel=yon_gtk_builder_get_widget(widgets->builder,"PackageManagerLabel");
     widgets->extraSettingsPackageManagerEntry=yon_gtk_builder_get_widget(widgets->builder,"PackageManagerEntry");
@@ -99,6 +233,25 @@ main_window *setup_window(){
 
     widgets->mainCheckForUpdatesButton=yon_gtk_builder_get_widget(widgets->builder,"checkForUpdatesButton");
 
+    widgets->mainCheckForUpdatesButton = yon_gtk_builder_get_widget(widgets->builder,"checkForUpdatesButton");
+    widgets->statusBox = yon_gtk_builder_get_widget(widgets->builder,"mainStatusBox");
+    widgets->statusIcon = yon_gtk_builder_get_widget(widgets->builder,"mainStatusIcon");
+    widgets->statusLabel = yon_gtk_builder_get_widget(widgets->builder,"mainStatusLabel");
+
+    main_config.list=GTK_LIST_STORE(gtk_builder_get_object(widgets->builder,"liststore1"));
+
+    if (main_config.lock_load_global == 1){
+        gtk_widget_set_sensitive(widgets->headerLoadGlobalConfigButton,0);
+    }
+    if (main_config.lock_save_global == 1){
+        gtk_widget_set_sensitive(widgets->headerSaveGlobalConfigButton,0);
+        gtk_widget_set_sensitive(widgets->headerSaveGlobalLocalConfigButton,0);
+    }
+    if (main_config.lock_save_local == 1){
+        gtk_widget_set_sensitive(widgets->headerSaveLocalConfigButton,0);
+        gtk_widget_set_sensitive(widgets->headerSaveGlobalLocalConfigButton,0);
+    }
+
     gtk_window_set_title(GTK_WINDOW(widgets->window),TITLE_LABEL);
 
     gtk_label_set_text(GTK_LABEL(widgets->HeaderTopic),TITLE_LABEL);
@@ -121,6 +274,7 @@ main_window *setup_window(){
     // gtk_button_set_label(GTK_BUTTON(widgets->repositoriesSettingsDeleteButton),_("Delete"));
     gtk_tree_view_column_set_title(GTK_TREE_VIEW_COLUMN(widgets->repositoriesSettingsEnabledColumn),ENABLED_LABEL);
     gtk_tree_view_column_set_title(GTK_TREE_VIEW_COLUMN(widgets->repositoriesSettingsURIColumn),URI_LABEL);
+    gtk_tree_view_column_set_title(GTK_TREE_VIEW_COLUMN(widgets->repositoriesSettingsDistributionColumn),DISTIBUTION_LABEL);
 
     gtk_label_set_text(GTK_LABEL(widgets->extraSettingsPackageManagerLabel),PACKAGE_MANAGER_LABEL);
     gtk_label_set_text(GTK_LABEL(widgets->extraSettingsUpdateCommandLabel),UPDATE_COMMAND_LABEL);
@@ -149,29 +303,100 @@ main_window *setup_window(){
     GtkWidget *Overlay = yon_gtk_builder_get_widget(widgets->builder,"HeadOverlay");
 
     GtkWidget *UnderNoteOverlay = yon_gtk_builder_get_widget(widgets->builder,"UnderNoteOverlay");
-    GtkWidget *checkForUpdatesButton = yon_gtk_builder_get_widget(widgets->builder,"checkForUpdatesButton");
     GtkWidget *headLabel = yon_gtk_builder_get_widget(widgets->builder,"headLabel");
+    GtkWidget *headInfoLabel = yon_gtk_builder_get_widget(widgets->builder,"headInfoLabel");
     yon_ubl_header_setup(Overlay,Header,Image,image_path);
-    gtk_overlay_add_overlay(GTK_OVERLAY(UnderNoteOverlay),checkForUpdatesButton);
+    gtk_overlay_add_overlay(GTK_OVERLAY(UnderNoteOverlay),widgets->mainCheckForUpdatesButton);
 
     gtk_label_set_text(GTK_LABEL(headLabel),TITLE_LABEL);
+    gtk_label_set_text(GTK_LABEL(headInfoLabel),TITLE_INFO_LABEL);
     gtk_widget_show_all(widgets->window);
 
+    render.box=widgets->statusBox;
+    render.icon=widgets->statusIcon;
+    render.label=widgets->statusLabel;
+    yon_ubl_setup_sockets(widgets->PlugBox,widgets->LeftBox,widgets->RightBox,main_config.socket_id,main_config.load_socket_id,main_config.save_socket_id);
 
-    g_signal_connect(G_OBJECT(widgets->repositoriesSettingsCreateButton), "clicked", G_CALLBACK(on_repo_window_open), NULL);
+    g_signal_connect(G_OBJECT(widgets->repositoriesSettingsCreateButton), "clicked", G_CALLBACK(on_repo_window_open_create), NULL);
-    g_signal_connect(G_OBJECT(widgets->repositoriesSettingsEditButton), "clicked", G_CALLBACK(on_repo_window_open), NULL);
+    g_signal_connect(G_OBJECT(widgets->repositoriesSettingsEditButton), "clicked", G_CALLBACK(on_repo_window_open_edit), widgets->repositoriesSettingsRepositoriesTreeView);
+    g_signal_connect(G_OBJECT(widgets->repositoriesSettingsDeleteButton), "clicked", G_CALLBACK(on_repos_delete), widgets->repositoriesSettingsRepositoriesTreeView);
 
     g_signal_connect(G_OBJECT(widgets->headerAboutButton), "activate", G_CALLBACK(on_about), NULL);
 
     g_signal_connect(G_OBJECT(widgets->window), "destroy", G_CALLBACK(gtk_main_quit), NULL);
+    g_signal_connect(G_OBJECT(widgets->headerDocumentationButton), "activate", G_CALLBACK(on_open_documentation_confirmation), WIKI_LINK);
 }
 
 
 int main(int argc, char *argv[]){
     local=setlocale(LC_ALL, "");
     textdomain (LocaleName);
+    init(NULL);
+    int option_index=0;
+    int show_help=0;
+    {
+        struct option long_options[] = {
+                {"help", 0, 0, 'h'},
+                {"version", 0, 0, 'V'},
+                {"lock-help", 0,0, 1},
+                {"lock-save", 0,0, 2},
+                {"lock-save-local", 0,0, 3},
+                {"lock-save-global", 0,0, 4},
+                {"lock-load-global", 0,0, 5},
+                {"socket-id", 1, 0, 's'},
+                {"socket-ext-id", 1,0, 'e'},
+                {"socket-trd-id", 1,0, 't'},
+                { NULL, 0, NULL, 0 }
+        };
+        for (int i=0;i<argc;i++){
+            int argument=getopt_long(argc,argv,"hVvs:e:t:",long_options,&option_index);
+            switch(argument){
+                case 'h':
+                    show_help=1;
+                    break;
+                case 'v':
+                case 'V':
+                    printf("%s\n",VERSION_LABEL);
+                    exit(0);
+                    break;
+                case 's':
+                    if(optarg)
+                        main_config.socket_id=atoi(optarg);
+                    break;
+                case 'e':
+                    if(optarg)
+                        main_config.load_socket_id=atoi(optarg);
+                    break;
+                case 't':
+                    if(optarg)
+                        main_config.save_socket_id=atoi(optarg);
+                    break;
+                case 1:
+                    main_config.lock_help=1;
+                    break;
+                case 2:
+                    main_config.lock_save_local=1;
+                    main_config.lock_save_global=1;
+                    break;
+                case 3:
+                    main_config.lock_save_local=1;
+                    break;
+                case 4:
+                    main_config.lock_save_global=1;
+                    break;
+                case 5:
+                    main_config.lock_load_global=1;
+                    break;
+            }
+        }
+        if (show_help==1&&main_config.lock_help!=1){
+            printf("%s\n",HELP_LABEL);
+            exit(0);
+            }
+    }
     gtk_init(&argc,&argv);
     main_window *widgets = setup_window();
+    yon_ubl_status_box_render(render,LOCAL_LOAD_SUCCESS,BACKGROUND_IMAGE_SUCCESS_TYPE);
     GtkCssProvider *css=gtk_css_provider_new();
     gtk_css_provider_load_from_path(css,CssPath,NULL);
     gtk_style_context_add_provider_for_screen(gdk_screen_get_default(),

source/ubl-settings-update.h

@@ -1,12 +1,21 @@
-
+#include <gtk/gtk.h>
+#include <gtk/gtkx.h>
 #include "ubl-utils.h"
 #include <locale.h>
 #include <stdio.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <libintl.h>
+#include <getopt.h>
+#include <libintl.h>
+#include "ubl-settings-cmake.h"
+#ifdef WEBKIT_FOUND
+    #include <webkit2/webkit2.h>
+#endif 
 #include "ubl-settings-update-strings.h"
 
+#define WIKI_LINK "https://wiki.ublinux.ru/ru/Программное_обеспечение/Программы_и_утилиты/Все/ubl-settings-update"
+
 #define _(String) gettext(String)
 
 #define glade_path "/usr/share/ubl-settings-update/ui/ubl-settings-update.glade"
@@ -20,12 +29,35 @@ string version_application = "1.2";
 
 char *local;
 
+typedef struct {
+    int always_open_documentation;
+    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;
+    
+    int lock_help;
+    int lock_save_local;
+    int lock_save_global;
+    int lock_load_global;
+
+    GtkListStore *list;
+} config;
+
 typedef struct {
     GtkWidget *window;
     GtkBuilder *builder;
 
     GtkWidget *HeaderTopic;
 
+    GtkWidget *PlugBox;
+    GtkWidget *LeftBox;
+    GtkWidget *RightBox;
+
     GtkWidget *generalSettingsTabLabel;
     GtkWidget *repositoriesSettingsTabLabel;
     GtkWidget *extraSettingsTabLabel;
@@ -45,6 +77,7 @@ typedef struct {
     GtkWidget *repositoriesSettingsRepositoriesTreeView;
     GtkTreeViewColumn *repositoriesSettingsEnabledColumn;
     GtkTreeViewColumn *repositoriesSettingsURIColumn;
+    GtkTreeViewColumn *repositoriesSettingsDistributionColumn;
 
     GtkWidget *extraSettingsPackageManagerLabel;
     GtkWidget *extraSettingsPackageManagerEntry;
@@ -68,11 +101,16 @@ typedef struct {
 
     GtkWidget *mainCheckForUpdatesButton;
 
+    GtkWidget *statusBox;
+    GtkWidget *statusIcon;
+    GtkWidget *statusLabel;
+
 } main_window;
 
 typedef struct {
     GtkWidget *window;
     GtkBuilder *builder;
+    GtkListStore *list;
 
     GtkWidget *repoTypeLabel;
     GtkWidget *repoTypeEntry;
@@ -81,9 +119,23 @@ typedef struct {
 
     GtkWidget *repoCancelButton;
     GtkWidget *repoAcceptButton;
+    GtkWidget *tree;
 } repo_window;
 
+typedef struct {
+    GtkWidget *Window;
+
+    GtkWidget *HatText;
+    GtkWidget *HeaderText;
+    GtkWidget *InfoText;
+    GtkWidget *AlwaysOpenCheck;
+
+    GtkWidget *CloseButton;
+    GtkWidget *AcceptButton;
+} documentation_confirmation_window;
+
 void on_repo_window_open(GtkWidget *self);
 
+void on_repo_window_open_edit(GtkWidget *self, GtkWidget *tree);
+repo_window *on_repo_window_open_create(GtkWidget *self);
 main_window *setup_window();
-repo_window *setup_repo_window();

source/ubl-settings-update.h.in

@@ -0,0 +1 @@
+#cmakedefine WEBKIT_FOUND

source/ubl-utils.h

@@ -3,6 +3,7 @@
 #include <pthread.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <stdarg.h>
 #include <pthread.h>
 #include <string.h>
 #include <dirent.h>
@@ -12,22 +13,36 @@
 
 #define DesktopPath "/usr/share/applications/"
 
-#define for_dictionaries(obj,obj1) for(obj=obj1->first;obj!=NULL;obj=obj->next)
+#define for_dictionaries(obj, obj1) for (obj = obj1->first; obj != NULL; obj = obj->next)
 
-typedef enum {
+#define new(type) malloc(sizeof(type))
-    DICTIONARY_ACTION_WIDGETS_TYPE,
+#define new_arr(type,size) malloc(sizeof(type)*size)
-    DICTIONARY_IVGRAPHICALS_TYPE,
+
+#define yon_ubl_set_config_save_data_pointer(command) config_commands.config_save_data = command
+
+#define yon_ubl_load_global_config(command, size_pointer) yon_config_load(command, size_pointer)
+#define yon_ubl_load_local_config(command, size_pointer) yon_config_load(command, size_pointer)
+#define yon_ubl_save_global_config(command) yon_config_save(command)
+#define yon_ubl_save_local_config(command) yon_config_save(command)
+
+typedef enum
+{
+    #ifdef __GTK_H__
+    DICTIONARY_GTK_WIDGETS_TYPE,
+    #endif
     DICTIONARY_OTHER_TYPE
 
 } DICT_TYPE;
 
-
+typedef struct
-typedef struct {
+{
     char *command;
     int *exitcode;
 } thread_output;
 
-typedef struct dictionary {
+
+typedef struct dictionary
+{
     char *key;
     void *data;
     struct dictionary *next;
@@ -36,7 +51,8 @@ typedef struct dictionary {
     DICT_TYPE data_type;
 } dictionary;
 
-typedef struct apps{
+typedef struct apps
+{
     char *Name;
     int Type;
     char *Categories;
@@ -44,18 +60,32 @@ typedef struct apps{
     char *Icon;
     int Pluggable;
     int DualPluggable;
-    } apps;
+} apps;
-
+
-
+typedef char** config_str;
-//dictionary functions
+// 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)
+#define yon_dictionary_add_or_create_if_exists_with_data(dict,key,data) {if (!dict) dict=yon_dictionary_create_with_data(key,data); \
+                                                                        else dict=yon_dictionary_create_with_data_connected(dict,key,data);}
 
 dictionary *yon_dictionary_create_empty();
 
-dictionary * yon_dictionary_create_conneced(dictionary *targetdict);
+dictionary *yon_dictionary_create_conneced(dictionary *targetdict);
 
 dictionary *yon_dictionary_get_last(dictionary *dict);
 
-dictionary *yon_dictionary_switch_places(dictionary *dict,int aim);
+dictionary *yon_dictionary_switch_places(dictionary *dict, int aim);
 
 void yon_dictionary_make_first(dictionary *dict);
 
@@ -73,92 +103,195 @@ dictionary *yon_dictionary_rip(dictionary *dict);
 
 dictionary *yon_dictionary_get_nth(dictionary *dict, int place);
 
-//char functions
+void *yon_dictionary_free_all(dictionary *dictionary,void (data_manipulation)(void*));
+
+// char functions
 
 char *yon_char_get_augumented(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_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);
 
-//parsing functions
+char **yon_char_parsed_shrink(char **char_string, int *size, int item_to_delete);
 
-apps *yon_apps_scan_and_parse_desktops(int *sizef);
+int yon_char_parsed_check_exist(char **parameters, int size, char *param);
 
+int yon_char_find_count(char *source, char *find);
 
-void yon_apps_sort(apps *applist,int size);
+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 (config_str old, int *old_size, ...);
 
-apps *yon_apps_get_by_name(apps *applist,char *name, int size);
+// parsing functions
 
+apps *yon_apps_scan_and_parse_desktops(int *sizef);
 
-//terminal-using functions
+void yon_apps_sort(apps *applist, int size);
 
+apps *yon_apps_get_by_name(apps *applist, char *name, int size);
 
+config_str yon_config_load(char *command, int *str_len);
 
-int yon_launch_app(char *name);
+int yon_config_save(char *command);
 
+char *yon_config_get_parameter(config_str parameters, int size, char *param);
 
-int yon_launch_app_with_arguments(char *name, char *args);
+char *yon_config_make_save_parameter_with_multiple_arguments(char *parameter_string, char *config_parameter, char *divider);
+
+// terminal-using functions
 
+int yon_launch_app(char *name);
+
+int yon_launch_app_with_arguments(char *name, char *args);
 
 int yon_launch(thread_output *thread);
 
-//Gtk functions
+// Gtk functions
 
 #ifdef __GTK_H__
+#ifdef VTE_TERMINAL
 
-#define yon_gtk_builder_get_widget(obj,obj2) GTK_WIDGET(gtk_builder_get_object(obj,obj2))
+/**
+ * 
+*/
+void yon_terminal_integrated_launch(GtkWidget *place_to_show, char* command, void *endwork_function, void* endwork_function_argument);
+#endif
 
+/**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 {
+typedef struct
+{
     GtkWidget *Icon;
     GtkWidget *Label;
     GtkWidget *IconView;
     GtkListStore *List;
 } expander_icon_view;
 
-
 // GtkWidget *yon_gtk_app_chooser_apps_create();
 
 // dictionary *yon_gtk_app_chooser_create();
 
 // expander_icon_view yon_gtk_icon_view_expander_create(GtkWidget *pack, ...);
 
-GtkWidget *yon_gtk_socket_create_new_with_connect(GtkWidget *container, gpointer data);
+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(dictionary *dict, GtkWidget *destination, gboolean expand, gboolean fill, int padding);
 int yon_dictionary_gtk_pack_end_multiple_widgets(dictionary *dict, GtkWidget *destination, gboolean expand, gboolean fill, int padding);
 
-//uninitialised
-
-void yon_on_plug_added(GtkSocket* self, gpointer user_data);
-void yon_on_plug_removed(GtkSocket* self, gpointer user_data);
 
 
-#endif
+typedef enum
-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 в котором будет отображаться текст статусного сообщения;
+*/
+#define yon_ubl_status_box_setup(render,icon,box,label) {render.icon=GTK_WIDGET(icon); render.box=GTK_WIDGET(box); render.label=GTK_WIDGET(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 (Жёлтный фон, иконка - галка)
+*/
+#define yon_ubl_status_box_render(render,text,m_type) {render.text_to_render=text; render.type=m_type; pthread_attr_t attr; pthread_attr_init(&attr); pthread_t tid; pthread_create(&tid,&attr,(void*)_yon_ubl_status_box_render,((void*)&render)); }
+
 #ifdef __cplusplus
-#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)
+
-#define yon_ubl_status_box_render(statusbox, statusicon, statuslabel, iconname, statustext, backgroundclass) _yon_ubl_status_box_render(GTK_WIDGET(statusbox.gobj()), GTK_WIDGET(statusicon.gobj()), GTK_WIDGET(statuslabel.gobj()), (char*)iconname, (char*)statustext, backgroundclass)
+/**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
-#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_status_box_render(statusbox, statusicon, statuslabel, iconname, statustext, backgroundclass) _yon_ubl_status_box_render(statusbox, statusicon, statuslabel, iconname, statustext, backgroundclass)
+/**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)
 #endif
 
 void _yon_ubl_header_setup(GtkWidget *Overlay, GtkWidget *Head, GtkWidget *Image, char *image_path);
-void _yon_ubl_status_box_render(GtkWidget *StatusBox, GtkWidget *StatusIcon, GtkWidget *StatusLabel, char *IconName, char* StatusText, BACKGROUND_IMAGE_TYPE BackgroundClass);
+void _yon_ubl_status_box_render(render_data *datav);
+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-update.css

@@ -12,3 +12,97 @@ background:transparent;
 .nobackground:active {
 background:transparent;
 }
+.textHead{
+    text-shadow: 2px 2px @theme_bg_color;
+	color: @theme_text_color;
+}
+
+.inherited>* {
+	border:none;
+	background:inherit;
+}
+.workingbg {
+	background:@theme_base_color;
+}
+.menuitembottom{
+	margin-top:0px;
+	margin-bottom:3px;
+	border-color:inherit;
+	border-left-width:inherit;
+	border-right-width:inherit;
+  }
+  .menuitemmiddle{
+	margin-top:0px;
+	margin-bottom:0px;
+	border-color:inherit;
+	border-left-width:inherit;
+	border-right-width:inherit;
+  }
+  
+  .menuitemtop{
+	margin-bottom:0px;
+	border-color:inherit;
+	border-top-width:inherit;
+	border-left-width:inherit;
+	border-right-width:inherit;
+  }
+  .menuitemtop *{
+	margin:2px 2px 0 2px;
+	padding: 5px 10px 3px 5px;
+	border:transparent;
+  }
+  .menuitemmiddle *{
+	margin:0 2px 0 2px;
+	padding: 3px 10px 3px 5px;
+	border:transparent;
+  }
+  .menuitembottom *{
+	margin:0 2px 2px 2px;
+	padding: 3px 10px 5px 5px;
+  }
+  .menuitemtop:hover {
+	background:@theme_bg_color;
+	border-color:inherit;
+	border-top-width:inherit;
+	border-left-width:inherit;
+	border-right-width:inherit;
+  }
+  .menuitemmiddle:hover {
+	background:@theme_bg_color;
+	border-color:inherit;
+	border-left-width:inherit;
+	border-right-width:inherit;
+  }
+  .menuitembottom:hover {
+	background:@theme_bg_color;
+	border-color:inherit;
+	border-bottom-width:0px;
+	border-left-width:inherit;
+	border-right-width:inherit;
+	
+  }
+  .menuitemtop:hover* {
+	margin:2px 2px 0 2px;
+	padding: 5px 10px 3px 5px;
+	background:@theme_selected_bg_color;
+	border-radius:2px;
+  }
+  .menuitemmiddle:hover* {
+	margin:0 2px 0 2px;
+	padding: 3px 10px 3px 5px;
+	background:@theme_selected_bg_color;
+	border-radius:2px;
+  }
+  .menuitembottom:hover* {
+	margin:0 2px 2px 2px;
+	padding: 3px 10px 5px 5px;
+	background:@theme_selected_bg_color;
+	border-radius:2px;
+  }
+  .boxInfoMessError{
+    background-color: #ea9999;
+}
+
+.boxInfoMessOK{
+    background-color: #f3f0ac;
+}

ubl-settings-update.desktop

@@ -2,8 +2,8 @@
 Encoding=UTF-8
 Name=ubl-settings-update
 Name[ru]=Обновление системы
-GenericName=ubl-settings-quotas
+GenericName=ubl-settings-update
-GenericName[ru]=Обвноление системы
+GenericName[ru]=Обновление системы
 Comment=ubl-settings-update
 Comment[ru]=Приложение для управления настройками обновлений
 Type=Application

ubl-settings-update.glade

@@ -1,8 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.38.2 -->
+<!-- Generated with glade 3.38.2 
-<interface>
+
+ubl-settings-update - 
+Copyright (C) UBGroup
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+-->
+<interface domain="/usr/share/locale/">
   <requires lib="gtk+" version="3.24"/>
   <!-- interface-css-provider-path ubl-settings-update.css -->
+  <!-- interface-license-type gplv2 -->
+  <!-- interface-name ubl-settings-update -->
+  <!-- interface-copyright UBGroup -->
   <object class="GtkAboutDialog" id="AboutWindow">
     <property name="can-focus">False</property>
     <property name="resizable">False</property>
@@ -11,7 +33,7 @@
     <property name="icon-name">com.ublinux.ubl-settings-update</property>
     <property name="type-hint">dialog</property>
     <property name="urgency-hint">True</property>
-    <property name="program-name">Update</property>
+    <property name="program-name">ubl-settings-update</property>
     <property name="version">1.1</property>
     <property name="copyright" translatable="yes">Copyright © 2022 - 2023, UBSoft LLC</property>
     <property name="comments" translatable="yes">Update confugurator</property>
@@ -108,7 +130,9 @@
                     <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 update parameter configuration</property>
+                    <property name="xalign">0</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                       <attribute name="size" value="15360"/>
@@ -123,6 +147,28 @@
                     <property name="position">0</property>
                   </packing>
                 </child>
+                <child>
+                  <object class="GtkLabel" id="headInfoLabel">
+                    <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">hsrdtfhbfn</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>
@@ -158,6 +204,7 @@
   <object class="GtkWindow" id="RepoWindow">
     <property name="can-focus">False</property>
     <property name="title" translatable="yes">System update</property>
+    <property name="resizable">False</property>
     <property name="modal">True</property>
     <property name="icon-name">com.ublinux.ubl-settings-update</property>
     <child>
@@ -176,10 +223,10 @@
             <property name="can-focus">False</property>
             <property name="spacing">5</property>
             <child>
-              <object class="GtkLabel" id="repoTypeLabel">
+              <object class="GtkLabel" id="repoAdressLabel">
                 <property name="visible">True</property>
                 <property name="can-focus">False</property>
-                <property name="label" translatable="yes">Type:</property>
+                <property name="label" translatable="yes">Adress:</property>
                 <property name="xalign">0</property>
               </object>
               <packing>
@@ -189,7 +236,7 @@
               </packing>
             </child>
             <child>
-              <object class="GtkEntry" id="repoTypeEntry">
+              <object class="GtkEntry" id="repoAdressEntry">
                 <property name="visible">True</property>
                 <property name="can-focus">True</property>
               </object>
@@ -231,7 +278,7 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkEntry">
+                  <object class="GtkEntry" id="repoDistributionEntry">
                     <property name="visible">True</property>
                     <property name="can-focus">True</property>
                   </object>
@@ -325,7 +372,7 @@
   </object>
   <object class="GtkSizeGroup">
     <widgets>
-      <widget name="repoTypeLabel"/>
+      <widget name="repoAdressLabel"/>
       <widget name="repoDistributionLabel"/>
     </widgets>
   </object>
@@ -364,81 +411,217 @@
     <property name="can-focus">False</property>
     <property name="icon-name">user-trash-symbolic</property>
   </object>
-  <object class="GtkListStore" id="liststore1">
+  <object class="GtkImage" id="image8">
-    <columns>
+    <property name="visible">True</property>
-      <!-- column-name gboolean1 -->
+    <property name="can-focus">False</property>
-      <column type="gboolean"/>
+    <property name="icon-name">process-stop-symbolic</property>
-      <!-- column-name gchararray1 -->
-      <column type="gchararray"/>
-    </columns>
   </object>
-  <object class="GtkMenu" id="menu1">
+  <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="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="GtkMenuItem" id="LoadGlobalConfigurationMenuItem">
+      <object class="GtkBox">
         <property name="visible">True</property>
         <property name="can-focus">False</property>
-        <property name="label" translatable="yes">Load from global configuration</property>
+        <property name="margin-start">5</property>
-      </object>
+        <property name="margin-end">5</property>
-    </child>
+        <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="GtkMenuItem" id="LoadLocalConfigurationMenuItem">
+          <object class="GtkBox">
             <property name="visible">True</property>
             <property name="can-focus">False</property>
-        <property name="label" translatable="yes">Load from local configuration</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>
-  </object>
+            <child>
-  <object class="GtkMenu" id="menu2">
+              <object class="GtkBox">
                 <property name="visible">True</property>
                 <property name="can-focus">False</property>
-    <property name="take-focus">False</property>
+                <property name="orientation">vertical</property>
-    <property name="reserve-toggle-size">False</property>
                 <child>
-      <object class="GtkMenuItem" id="DocumentationMenuItem">
+                  <object class="GtkLabel" id="helpHeader">
                     <property name="visible">True</property>
                     <property name="can-focus">False</property>
-        <property name="label" translatable="yes">Documentation</property>
+                    <property name="halign">start</property>
-        <property name="use-underline">True</property>
+                    <property name="margin-top">10</property>
+                    <property name="margin-bottom">5</property>
+                    <property name="label" translatable="yes" context="Would you like to read documentation in the Net?" comments="Would you like to read documentation in the Net?">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="GtkMenuItem" id="AboutMenuItem">
+                  <object class="GtkLabel" id="helpText">
                     <property name="visible">True</property>
                     <property name="can-focus">False</property>
-        <property name="label" translatable="yes">About</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" context="You will be redirected to documentation web site, where documentation are translated and supported by community." comments="You will be redirected to documentation web site, where documentation are translated and supported by community.">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="menuitemsolo"/>
+                      <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>
-  <object class="GtkMenu" id="menu3">
+              <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="GtkMenuItem" id="SaveGlobalLocalConfigurationMenuItem">
+              <object class="GtkButton" id="CancelHelpButton">
+                <property name="label" translatable="yes">Cancel</property>
                 <property name="visible">True</property>
-        <property name="can-focus">False</property>
+                <property name="can-focus">True</property>
-        <property name="label" translatable="yes">Save to global and local documentation</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="GtkMenuItem" id="SaveGlobalConfigurationMenuItem">
+              <object class="GtkButton" id="ReadHelpButton">
+                <property name="label" translatable="yes">Read Online</property>
                 <property name="visible">True</property>
-        <property name="can-focus">False</property>
+                <property name="can-focus">True</property>
-        <property name="label" translatable="yes">Save to global configuration</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>
-    <child>
+          </object>
-      <object class="GtkMenuItem" id="SaveLocalConfigurationMenuItem">
+          <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="label" translatable="yes">Save to local configuration</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">UBLinux Settings</property>
+            <attributes>
+              <attribute name="weight" value="bold"/>
+            </attributes>
+          </object>
+        </child>
       </object>
     </child>
   </object>
+  <object class="GtkListStore" id="liststore1">
+    <columns>
+      <!-- column-name gboolean1 -->
+      <column type="gboolean"/>
+      <!-- column-name gchararray1 -->
+      <column type="gchararray"/>
+      <!-- column-name gchararray2 -->
+      <column type="gchararray"/>
+    </columns>
+  </object>
   <object class="GtkWindow" id="MainWindow">
     <property name="width-request">800</property>
     <property name="height-request">600</property>
@@ -456,6 +639,57 @@
             <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>
+                    <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="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>
+                    <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>
+                <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>
@@ -471,7 +705,6 @@
                         <property name="visible">True</property>
                         <property name="can-focus">False</property>
                         <property name="halign">start</property>
-                        <property name="stock">gtk-missing-image</property>
                       </object>
                       <packing>
                         <property name="index">-1</property>
@@ -560,6 +793,7 @@
                                   <object class="GtkComboBoxText" id="UpdateCheckFreqCombo">
                                     <property name="visible">True</property>
                                     <property name="can-focus">False</property>
+                                    <property name="active">0</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
@@ -671,9 +905,6 @@
                                         <property name="title" translatable="yes">Enabled</property>
                                         <child>
                                           <object class="GtkCellRendererToggle"/>
-                                          <attributes>
-                                            <attribute name="active">0</attribute>
-                                          </attributes>
                                         </child>
                                       </object>
                                     </child>
@@ -683,7 +914,18 @@
                                         <child>
                                           <object class="GtkCellRendererText"/>
                                           <attributes>
-                                            <attribute name="text">0</attribute>
+                                            <attribute name="text">1</attribute>
+                                          </attributes>
+                                        </child>
+                                      </object>
+                                    </child>
+                                    <child>
+                                      <object class="GtkTreeViewColumn" id="DistributionColumn">
+                                        <property name="title" translatable="yes">Distribution</property>
+                                        <child>
+                                          <object class="GtkCellRendererText"/>
+                                          <attributes>
+                                            <attribute name="text">2</attribute>
                                           </attributes>
                                         </child>
                                       </object>
@@ -1070,27 +1312,9 @@
           </object>
         </child>
         <child>
-          <object class="GtkMenuButton" id="mainSettingsButton">
+          <object class="GtkBox" id="LeftBox">
             <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="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"/>
-            </style>
-          </object>
-          <packing>
-            <property name="pack-type">end</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
             <child>
               <object class="GtkMenuButton">
                 <property name="visible">True</property>
@@ -1129,10 +1353,21 @@
                   </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>
+        <child>
+          <object class="GtkBox" id="RightBox">
+            <property name="visible">True</property>
+            <property name="can-focus">False</property>
             <child>
               <object class="GtkMenuButton">
                 <property name="visible">True</property>
@@ -1171,6 +1406,36 @@
                   </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">
+                <property name="visible">True</property>
+                <property name="app-paintable">True</property>
+                <property name="can-focus">True</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"/>
+                </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">3</property>
@@ -1189,4 +1454,92 @@
       <widget name="CleanCommandLabel"/>
     </widgets>
   </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 from 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 from 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>
+    <child>
+      <object class="GtkMenuItem" id="DocumentationMenuItem">
+        <property name="visible">True</property>
+        <property name="can-focus">False</property>
+        <property name="label" translatable="yes">Documentation</property>
+        <property name="use-underline">True</property>
+        <style>
+          <class name="menuitemtop"/>
+        </style>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="AboutMenuItem">
+        <property name="visible">True</property>
+        <property name="can-focus">False</property>
+        <property name="label" translatable="yes">About</property>
+        <style>
+          <class name="menuitemsolo"/>
+          <class name="menuitembottom"/>
+        </style>
+      </object>
+    </child>
+  </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 to global and local documentation</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>
 </interface>

ubl-settings-update.pot

@@ -1,184 +1,249 @@
-# language translations for ubl-settings-manager package.
+# Language translations for ubl-settings-update package.
 # Copyright (C) 2022, UBTech LLC
-# This file is distributed under the same license as the ubl-settings-manager package.
+# This file is distributed under the same license as the ubl-settings-update package.
 # UBLinux Team <info@ublinux.com>, 2022
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: ubl-settings-manager 1.0\n"
+"Project-Id-Version: ubl-settings-update 1.0\n"
-"Report-Msgid-Bugs-To: info@ublinux.com\n"
+"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-04-21 12:33+0000\n"
+"POT-Creation-Date: 2023-05-22 17:22+0600\n"
-"PO-Revision-Date: 2023-01-01 00:00+0600\n"
+"PO-Revision-Date: \n"
-"Last-Translator: UBLinux Team <info@ublinux.com>\n"
+"Last-Translator: \n"
-"Language-Team: Russian - UBLinux Team <info@ublinux.com>\n"
+"Language-Team: \n"
-"Language: Russian\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: source/ubl-settings-update.c:16
+#: source/ubl-settings-update-strings.h:1
-msgid "UBlinux System update"
+msgid "Version:"
 msgstr ""
 
-#: source/ubl-settings-update.c:18
+#: source/ubl-settings-update-strings.h:2
-msgid "Project Home Page"
+msgid "ubl-settings-update version:"
+msgstr ""
+
+#: source/ubl-settings-update-strings.h:2
+msgid "update settings"
+msgstr ""
+
+#: source/ubl-settings-update-strings.h:2
+msgid "Usage:"
+msgstr ""
+
+#: source/ubl-settings-update-strings.h:2
+msgid "[OPTIONS]"
+msgstr ""
+
+#: source/ubl-settings-update-strings.h:2
+msgid "Options:"
+msgstr ""
+
+#: source/ubl-settings-update-strings.h:2
+msgid "Show this help"
 msgstr ""
 
-#: source/ubl-settings-update.c:19
+#: source/ubl-settings-update-strings.h:2
-msgid "Update configurator"
+msgid "Show package version"
 msgstr ""
 
-#: source/ubl-settings-update.c:46 source/ubl-settings-update.c:111
+#: source/ubl-settings-update-strings.h:2
-#: source/ubl-settings-update.c:113
+msgid "Lock this help menu"
+msgstr ""
+
+#: source/ubl-settings-update-strings.h:2
+msgid "Lock configuration saving"
+msgstr ""
+
+#: source/ubl-settings-update-strings.h:2
+msgid "Lock local configration saving"
+msgstr ""
+
+#: source/ubl-settings-update-strings.h:2
+msgid "Lock global configration saving"
+msgstr ""
+
+#: source/ubl-settings-update-strings.h:2
+msgid "Lock global configration loading"
+msgstr ""
+
+#: source/ubl-settings-update-strings.h:3
 msgid "System update"
 msgstr ""
 
-#: source/ubl-settings-update.c:48
+#: source/ubl-settings-update-strings.h:4
-msgid "Type: "
+msgid "System update settings management"
+msgstr ""
+
+#: source/ubl-settings-update-strings.h:5
+msgid "Check for updates"
 msgstr ""
 
-#: source/ubl-settings-update.c:49
+#: source/ubl-settings-update-strings.h:6
-msgid "URI: "
+msgid "About"
 msgstr ""
 
-#: source/ubl-settings-update.c:50 source/ubl-settings-update.c:52
+#: source/ubl-settings-update-strings.h:7
-#: source/ubl-settings-update.c:54
+msgid "Documentation"
-msgid " "
 msgstr ""
 
-#: source/ubl-settings-update.c:51
+#: source/ubl-settings-update-strings.h:8
-msgid "Distribution: "
+msgid "Save to local configuration"
 msgstr ""
 
-#: source/ubl-settings-update.c:53
+#: source/ubl-settings-update-strings.h:9
-msgid "Sections: "
+msgid "Save to global configuration"
 msgstr ""
 
-#: source/ubl-settings-update.c:56
+#: source/ubl-settings-update-strings.h:10
-msgid "Cancel"
+msgid "Save configuration"
 msgstr ""
 
-#: source/ubl-settings-update.c:57 source/ubl-settings-update.c:143
+#: source/ubl-settings-update-strings.h:11
+#: source/ubl-settings-update-strings.h:36
 msgid "Save"
 msgstr ""
 
-#: source/ubl-settings-update.c:115
+#: source/ubl-settings-update-strings.h:12
-msgid "General"
+msgid "Load local configuration"
 msgstr ""
 
-#: source/ubl-settings-update.c:116
+#: source/ubl-settings-update-strings.h:13
-msgid "Repositories"
+msgid "Load global configuration"
 msgstr ""
 
-#: source/ubl-settings-update.c:117
+#: source/ubl-settings-update-strings.h:14
-msgid "Extra"
+msgid "load"
 msgstr ""
 
-#: source/ubl-settings-update.c:119
+#: source/ubl-settings-update-strings.h:15
-msgid "Update checking frequency"
+msgid "Launch package manager"
 msgstr ""
 
-#: source/ubl-settings-update.c:120
+#: source/ubl-settings-update-strings.h:16
-msgid "Hide icon of no updates found"
+msgid "Cache clean command: "
 msgstr ""
 
-#: source/ubl-settings-update.c:121
+#: source/ubl-settings-update-strings.h:17
-msgid "Download updates automatically"
+msgid "Update command: "
 msgstr ""
 
-#: source/ubl-settings-update.c:122
+#: source/ubl-settings-update-strings.h:18
-msgid "Every 1 hour"
+msgid "Package manager: "
 msgstr ""
 
-#: source/ubl-settings-update.c:123
+#: source/ubl-settings-update-strings.h:19
-msgid "Every 2 hours"
+msgid "URI"
 msgstr ""
 
-#: source/ubl-settings-update.c:124
+#: source/ubl-settings-update-strings.h:20
-msgid "Every 3 hours"
+msgid "Enabled"
 msgstr ""
 
-#: source/ubl-settings-update.c:126
+#: source/ubl-settings-update-strings.h:21
-msgid "Activate AUR"
+msgid "Distribution"
 msgstr ""
 
-#: source/ubl-settings-update.c:127
+#: source/ubl-settings-update-strings.h:22
 msgid "Activate UBUR"
 msgstr ""
 
-#: source/ubl-settings-update.c:128
+#: source/ubl-settings-update-strings.h:23
-msgid "Create"
+msgid "Activate AUR"
 msgstr ""
 
-#: source/ubl-settings-update.c:129
+#: source/ubl-settings-update-strings.h:24
-msgid "Edit"
+msgid "Every 3 hours"
 msgstr ""
 
-#: source/ubl-settings-update.c:130
+#: source/ubl-settings-update-strings.h:25
-msgid "Delete"
+msgid "Every 2 hours"
 msgstr ""
 
-#: source/ubl-settings-update.c:131
+#: source/ubl-settings-update-strings.h:26
-msgid "Enabled"
+msgid "Every 1 hour"
 msgstr ""
 
-#: source/ubl-settings-update.c:132
+#: source/ubl-settings-update-strings.h:27
-msgid "URI"
+msgid "Download updates automatically"
 msgstr ""
 
-#: source/ubl-settings-update.c:134
+#: source/ubl-settings-update-strings.h:28
-msgid "Package manager: "
+msgid "Hide icon of no updates found"
 msgstr ""
 
-#: source/ubl-settings-update.c:135
+#: source/ubl-settings-update-strings.h:29
-msgid "Update command: "
+msgid "Update checking frequency"
 msgstr ""
 
-#: source/ubl-settings-update.c:136
+#: source/ubl-settings-update-strings.h:30
-msgid "Cache clean command: "
+msgid "Extra"
 msgstr ""
 
-#: source/ubl-settings-update.c:137
+#: source/ubl-settings-update-strings.h:31
-msgid "Launch package manager"
+msgid "Repositories"
 msgstr ""
 
-#: source/ubl-settings-update.c:139
+#: source/ubl-settings-update-strings.h:32
-msgid "load"
+msgid "General"
 msgstr ""
 
-#: source/ubl-settings-update.c:140
+#: source/ubl-settings-update-strings.h:33
-msgid "Load global configuration"
+msgid "Adress: "
 msgstr ""
 
-#: source/ubl-settings-update.c:141
+#: source/ubl-settings-update-strings.h:34
-msgid "Load local configuration"
+msgid "Distribution: "
 msgstr ""
 
-#: source/ubl-settings-update.c:144
+#: source/ubl-settings-update-strings.h:35
-msgid "Save to global and local configuration"
+msgid "Cancel"
 msgstr ""
 
-#: source/ubl-settings-update.c:145
+#: source/ubl-settings-update-strings.h:37
-msgid "Save to global configuration"
+msgid "Would you like to read documentation in the Web?"
 msgstr ""
 
-#: source/ubl-settings-update.c:146
+#: source/ubl-settings-update-strings.h:38
-msgid "Save to local configuration"
+msgid ""
+"You will be redirected to documentation website where documentation is\n"
+"translated and supported by community."
 msgstr ""
 
-#: source/ubl-settings-update.c:148
+#: source/ubl-settings-update-strings.h:39
-msgid "Documentation"
+msgid "Always redirect to online documentation"
 msgstr ""
 
-#: source/ubl-settings-update.c:149
+#: source/ubl-settings-update-strings.h:40
-msgid "About"
+msgid "Open documentation"
 msgstr ""
 
-#: source/ubl-settings-update.c:151
+#: source/ubl-settings-update-strings.h:41
-msgid "Check for updates"
+msgid "Project Home Page"
+msgstr ""
+
+#: source/ubl-settings-update-strings.h:42
+msgid "Nothing were chosen"
+msgstr ""
+
+#: source/ubl-settings-update-strings.h:44
+msgid "Global configuration loading succseeded."
+msgstr ""
+
+#: source/ubl-settings-update-strings.h:45
+msgid "Local configuration loading succseeded."
+msgstr ""
+
+#: source/ubl-settings-update-strings.h:47
+msgid "Local and global configuration saving succseeded."
+msgstr ""
+
+#: source/ubl-settings-update-strings.h:48
+msgid "Global configuration saving succseeded."
 msgstr ""
 
-#: source/ubl-settings-update.c:166
+#: source/ubl-settings-update-strings.h:49
-msgid "System update parameter configuration"
+msgid "Local configuration saving succseeded."
 msgstr ""

ubl-settings-update_ru.po

@@ -1,14 +1,14 @@
-# Russian translations for ubl-settings-manager package.
+# Russian translations for ubl-settings-update package.
 # Copyright (C) 2022, UBTech LLC
-# This file is distributed under the same license as the ubl-settings-manager package.
+# This file is distributed under the same license as the ubl-settings-update package.
 # UBLinux Team <info@ublinux.com>, 2022
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: ubl-settings-manager 1.0\n"
+"Project-Id-Version: ubl-settings-update 1.0\n"
-"Report-Msgid-Bugs-To: info@ublinux.com\n"
+"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-04-21 12:33+0000\n"
+"POT-Creation-Date: 2023-05-22 17:22+0600\n"
 "PO-Revision-Date: 2023-01-01 00:00+0600\n"
 "Last-Translator: UBLinux Team <info@ublinux.com>\n"
 "Language-Team: Russian - UBLinux Team <info@ublinux.com>\n"
@@ -17,173 +17,236 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: source/ubl-settings-update.c:16
+#: source/ubl-settings-update-strings.h:1
-#, fuzzy
+msgid "Version:"
-msgid "UBlinux System update"
+msgstr "Версия:"
-msgstr "Обновление системы"
 
-#: source/ubl-settings-update.c:18
+#: source/ubl-settings-update-strings.h:2
-#, fuzzy
+msgid "ubl-settings-update version:"
-msgid "Project Home Page"
+msgstr "Версия ubl-settings-update: "
-msgstr "Домашняя страница проекта"
 
-#: source/ubl-settings-update.c:19
+#: source/ubl-settings-update-strings.h:2
-#, fuzzy
+msgid "update settings"
-msgid "Update configurator"
+msgstr "Настройки обновлений"
-msgstr "Загрузить локальную конфигурацию"
+
+#: source/ubl-settings-update-strings.h:2
+msgid "Usage:"
+msgstr "Использование:"
+
+#: source/ubl-settings-update-strings.h:2
+msgid "[OPTIONS]"
+msgstr "[АРГУМЕНТЫ]"
+
+#: source/ubl-settings-update-strings.h:2
+msgid "Options:"
+msgstr "Аргументы:"
+
+#: source/ubl-settings-update-strings.h:2
+msgid "Show this help"
+msgstr "Показать параметры справки"
+
+#: source/ubl-settings-update-strings.h:2
+msgid "Show package version"
+msgstr "Показать текущую версию"
+
+#: source/ubl-settings-update-strings.h:2
+msgid "Lock this help menu"
+msgstr "Блокировка вызова справки"
+
+#: source/ubl-settings-update-strings.h:2
+msgid "Lock configuration saving"
+msgstr "Блокировка сохранения локальной и глобальной конфигурации"
+
+#: source/ubl-settings-update-strings.h:2
+msgid "Lock local configration saving"
+msgstr "Блокировка сохранения локальной конфигурации"
+
+#: source/ubl-settings-update-strings.h:2
+msgid "Lock global configration saving"
+msgstr "Блокировка сохранения глобальной конфигурации"
+
+#: source/ubl-settings-update-strings.h:2
+msgid "Lock global configration loading"
+msgstr "Блокировка загрузки глобальной конфигурации"
 
-#: source/ubl-settings-update.c:46 source/ubl-settings-update.c:111
+#: source/ubl-settings-update-strings.h:3
-#: source/ubl-settings-update.c:113
 msgid "System update"
 msgstr "Обновление системы"
 
-#: source/ubl-settings-update.c:48
+#: source/ubl-settings-update-strings.h:4
-msgid "Type: "
+msgid "System update settings management"
-msgstr "Тип: "
+msgstr "Настройка параметров обновления системы"
 
-#: source/ubl-settings-update.c:49
+#: source/ubl-settings-update-strings.h:5
-msgid "URI: "
+msgid "Check for updates"
-msgstr "URI: "
+msgstr "Проверить обновления"
 
-#: source/ubl-settings-update.c:50 source/ubl-settings-update.c:52
+#: source/ubl-settings-update-strings.h:6
-#: source/ubl-settings-update.c:54
+msgid "About"
-msgid " "
+msgstr "О программе"
-msgstr " "
 
-#: source/ubl-settings-update.c:51
+#: source/ubl-settings-update-strings.h:7
-msgid "Distribution: "
+msgid "Documentation"
-msgstr "Дистрибутив: "
+msgstr "Справка"
 
-#: source/ubl-settings-update.c:53
+#: source/ubl-settings-update-strings.h:8
-msgid "Sections: "
+msgid "Save to local configuration"
-msgstr "Разделы: "
+msgstr "Сохранить в локальную конфигурацию"
 
-#: source/ubl-settings-update.c:56
+#: source/ubl-settings-update-strings.h:9
-msgid "Cancel"
+msgid "Save to global configuration"
-msgstr "Отмена"
+msgstr "Сохранить в глобальную конфигурацию"
+
+#: source/ubl-settings-update-strings.h:10
+msgid "Save configuration"
+msgstr "Сохранить в конфигурацию"
 
-#: source/ubl-settings-update.c:57 source/ubl-settings-update.c:143
+#: source/ubl-settings-update-strings.h:11
+#: source/ubl-settings-update-strings.h:36
 msgid "Save"
 msgstr "Сохранить"
 
-#: source/ubl-settings-update.c:115
+#: source/ubl-settings-update-strings.h:12
-msgid "General"
+msgid "Load local configuration"
-msgstr "Общие настройки"
+msgstr "Загрузить локальную конфигурацию"
 
-#: source/ubl-settings-update.c:116
+#: source/ubl-settings-update-strings.h:13
-msgid "Repositories"
+msgid "Load global configuration"
-msgstr "Репозитории"
+msgstr "Загрузить глобальную конфигурацию"
 
-#: source/ubl-settings-update.c:117
+#: source/ubl-settings-update-strings.h:14
-msgid "Extra"
+msgid "load"
-msgstr "Дополнительно"
+msgstr "Загрузить"
 
-#: source/ubl-settings-update.c:119
+#: source/ubl-settings-update-strings.h:15
-msgid "Update checking frequency"
+msgid "Launch package manager"
-msgstr "Частота проверки обновлений"
+msgstr "Запустить менеджер пакетов"
 
-#: source/ubl-settings-update.c:120
+#: source/ubl-settings-update-strings.h:16
-msgid "Hide icon of no updates found"
+msgid "Cache clean command: "
-msgstr "Скрыть значок в трее при отсутствии обновлений"
+msgstr "Команда очистки кеша пакетов: "
 
-#: source/ubl-settings-update.c:121
+#: source/ubl-settings-update-strings.h:17
-msgid "Download updates automatically"
+msgid "Update command: "
-msgstr "Автоматически скачивать обновления"
+msgstr "Команда обновления: "
 
-#: source/ubl-settings-update.c:122
+#: source/ubl-settings-update-strings.h:18
-msgid "Every 1 hour"
+msgid "Package manager: "
-msgstr "Каждый час"
+msgstr "Менеджер пакетов: "
 
-#: source/ubl-settings-update.c:123
+#: source/ubl-settings-update-strings.h:19
-msgid "Every 2 hours"
+msgid "URI"
-msgstr "Каждые 2 часа"
+msgstr "URI"
 
-#: source/ubl-settings-update.c:124
+#: source/ubl-settings-update-strings.h:20
-msgid "Every 3 hours"
+msgid "Enabled"
-msgstr "Каждые 3 часа"
+msgstr "Включен"
 
-#: source/ubl-settings-update.c:126
+#: source/ubl-settings-update-strings.h:21
-msgid "Activate AUR"
+msgid "Distribution"
-msgstr "Активировать AUR"
+msgstr "Дистрибутив"
 
-#: source/ubl-settings-update.c:127
+#: source/ubl-settings-update-strings.h:22
 msgid "Activate UBUR"
 msgstr "Активировать UBUR"
 
-#: source/ubl-settings-update.c:128
+#: source/ubl-settings-update-strings.h:23
-msgid "Create"
+msgid "Activate AUR"
-msgstr "Создать"
+msgstr "Активировать AUR"
 
-#: source/ubl-settings-update.c:129
+#: source/ubl-settings-update-strings.h:24
-msgid "Edit"
+msgid "Every 3 hours"
-msgstr "Изменить"
+msgstr "Каждые 3 часа"
 
-#: source/ubl-settings-update.c:130
+#: source/ubl-settings-update-strings.h:25
-msgid "Delete"
+msgid "Every 2 hours"
-msgstr "Удалить"
+msgstr "Каждые 2 часа"
 
-#: source/ubl-settings-update.c:131
+#: source/ubl-settings-update-strings.h:26
-msgid "Enabled"
+msgid "Every 1 hour"
-msgstr "Включен"
+msgstr "Каждый час"
 
-#: source/ubl-settings-update.c:132
+#: source/ubl-settings-update-strings.h:27
-#, fuzzy
+msgid "Download updates automatically"
-msgid "URI"
+msgstr "Автоматически скачивать обновления"
-msgstr "URI"
 
-#: source/ubl-settings-update.c:134
+#: source/ubl-settings-update-strings.h:28
-msgid "Package manager: "
+msgid "Hide icon of no updates found"
-msgstr "Менеджер пакетов: "
+msgstr "Скрыть значок в трее при отсутствии обновлений"
 
-#: source/ubl-settings-update.c:135
+#: source/ubl-settings-update-strings.h:29
-msgid "Update command: "
+msgid "Update checking frequency"
-msgstr "Команда обновления: "
+msgstr "Частота проверки обновлений"
 
-#: source/ubl-settings-update.c:136
+#: source/ubl-settings-update-strings.h:30
-msgid "Cache clean command: "
+msgid "Extra"
-msgstr "Команда очистки кеша пакетов: "
+msgstr "Дополнительно"
 
-#: source/ubl-settings-update.c:137
+#: source/ubl-settings-update-strings.h:31
-msgid "Launch package manager"
+msgid "Repositories"
-msgstr "Запустить менеджер пакетов"
+msgstr "Репозитории"
 
-#: source/ubl-settings-update.c:139
+#: source/ubl-settings-update-strings.h:32
-msgid "load"
+msgid "General"
-msgstr "Загрузить"
+msgstr "Общие настройки"
 
-#: source/ubl-settings-update.c:140
+#: source/ubl-settings-update-strings.h:33
-msgid "Load global configuration"
+msgid "Adress: "
-msgstr "Загрузить глобальную конфигурацию"
+msgstr "Адрес: "
 
-#: source/ubl-settings-update.c:141
+#: source/ubl-settings-update-strings.h:34
-msgid "Load local configuration"
+msgid "Distribution: "
-msgstr "Загрузить локальную конфигурацию"
+msgstr "Дистрибутив: "
 
-#: source/ubl-settings-update.c:144
+#: source/ubl-settings-update-strings.h:35
-msgid "Save to global and local configuration"
+msgid "Cancel"
-msgstr "Сохранить в глобальную и локальную конфигурацию"
+msgstr "Отмена"
 
-#: source/ubl-settings-update.c:145
+#: source/ubl-settings-update-strings.h:37
-msgid "Save to global configuration"
+msgid "Would you like to read documentation in the Web?"
-msgstr "Сохранить в глобальную конфигурацию"
+msgstr "Вы хотите прочитать справку в Сети?"
 
-#: source/ubl-settings-update.c:146
+#: source/ubl-settings-update-strings.h:38
-msgid "Save to local configuration"
+msgid ""
-msgstr "Сохранить в локальную конфигурацию"
+"You will be redirected to documentation website where documentation is\n"
+"translated and supported by community."
+msgstr ""
+"Вы будете перенаправлены на сайт с документацией где страницы помощи\n"
+"переводятся и поддерживаются сообществом."
 
-#: source/ubl-settings-update.c:148
+#: source/ubl-settings-update-strings.h:39
-msgid "Documentation"
+msgid "Always redirect to online documentation"
+msgstr "Всегда перенаправлять"
+
+#: source/ubl-settings-update-strings.h:40
+msgid "Open documentation"
 msgstr "Справка"
 
-#: source/ubl-settings-update.c:149
+#: source/ubl-settings-update-strings.h:41
-msgid "About"
+msgid "Project Home Page"
-msgstr "О программе"
+msgstr "Домашняя страница проекта"
 
-#: source/ubl-settings-update.c:151
+#: source/ubl-settings-update-strings.h:42
-msgid "Check for updates"
+msgid "Nothing were chosen"
-msgstr "Проверить обновления"
+msgstr "Ничего не выбрано"
+
+#: source/ubl-settings-update-strings.h:44
+msgid "Global configuration loading succseeded."
+msgstr "Успешно загружена глобальная конфигурация"
+
+#: source/ubl-settings-update-strings.h:45
+msgid "Local configuration loading succseeded."
+msgstr "Успешно загружена локальная конфигурация"
+
+#: source/ubl-settings-update-strings.h:47
+msgid "Local and global configuration saving succseeded."
+msgstr "Успешно записаны локальная и глобальная конфигурация"
+
+#: source/ubl-settings-update-strings.h:48
+msgid "Global configuration saving succseeded."
+msgstr "Успешно записана глобальная конфигурация"
+
+#: source/ubl-settings-update-strings.h:49
+msgid "Local configuration saving succseeded."
+msgstr "Успешно записана локальная конфигурация"
 
-#: source/ubl-settings-update.c:166
-#, fuzzy
-msgid "System update parameter configuration"
-msgstr "настройка параметров обновления системы"