From 05cd35a8434d42dead25a5ab03bb48aad23a686e Mon Sep 17 00:00:00 2001
From: Ivan Yarcev <yarcev.id@ublinux.ru>
Date: Wed, 9 Aug 2023 14:47:20 +0600
Subject: [PATCH] Added more status messages

---
 source/ubl-settings-repomanager.c |  34 ++++-----
 source/ubl-strings.h              |  17 +----
 ubl-settings-repomanager.pot      | 106 ++++++++++++----------------
 ubl-settings-repomanager_ru.po    | 113 +++++++++++++-----------------
 4 files changed, 110 insertions(+), 160 deletions(-)

diff --git a/source/ubl-settings-repomanager.c b/source/ubl-settings-repomanager.c
index 60d3d3e..a034ed1 100644
--- a/source/ubl-settings-repomanager.c
+++ b/source/ubl-settings-repomanager.c
@@ -275,9 +275,12 @@ void on_save(){
             }
             if (!add_packages&&!signed_packages&&!remove_packages&&repostatus==1) 
                 add_command = yon_char_unite(command, " add -d \"",origin_flagged,"\" -r \"",name_flagged,sign_flagged ? yon_char_append("\" --sign-repo ",sign_flagged):"\"" ,NULL);
-            if (add_signed_command){/*printf("%s\n",add_signed_command);*/ system(add_signed_command);}
-            if (add_command) {/*printf("%s\n",add_command);*/system(add_command);}
-            if (remove_command) {/*printf("%s\n",remove_command);*/system(remove_command);}
+            if (add_signed_command){/*printf("%s\n",add_signed_command);*/ system(add_signed_command);
+                yon_ubl_status_box_render(OPERATION_DONE_LABEL,BACKGROUND_IMAGE_SUCCESS_TYPE);}
+            if (add_command) {/*printf("%s\n",add_command);*/system(add_command);
+                yon_ubl_status_box_render(OPERATION_DONE_LABEL,BACKGROUND_IMAGE_SUCCESS_TYPE);}
+            if (remove_command) {/*printf("%s\n",remove_command);*/system(remove_command);
+                yon_ubl_status_box_render(OPERATION_DONE_LABEL,BACKGROUND_IMAGE_SUCCESS_TYPE);}
             if (pack_groups){
                 dictionary *dct;
                 for_dictionaries(dct,pack_groups){
@@ -319,6 +322,7 @@ void on_search(GtkCellEditable *self, main_window *widgets){
         }
         gtk_tree_view_expand_row(GTK_TREE_VIEW(widgets->RepoTree),gtk_tree_model_get_path(GTK_TREE_MODEL(main_config.tree_store),&iter),0);
     }
+    yon_ubl_status_box_render(OPERATION_DONE_LABEL,BACKGROUND_IMAGE_SUCCESS_TYPE);
 }
 
 void on_tree_selection_changed(GtkWidget *self,main_window *widgets){
@@ -362,8 +366,6 @@ void on_tree_selection_changed(GtkWidget *self,main_window *widgets){
     }
 }
 
-
-
 void on_repo_add_new(GtkWidget *self, dictionary *dict){
     main_window *widgets = yon_dictionary_get_data(dict->first,main_window*);
     repo_create_window *window = yon_dictionary_get_data(dict->first->next,repo_create_window*);
@@ -380,20 +382,6 @@ void on_repo_add_new(GtkWidget *self, dictionary *dict){
     }
 }
 
-void on_branch_add(GtkCellRendererText *self, char*path,char *new_text, repo_create_window *window){
-    if (new_text&&strcmp(new_text,"")!=0){
-        GtkTreeIter iter;
-        gboolean used, use=1;
-        gtk_tree_model_get_iter_from_string(GTK_TREE_MODEL(window->BranchesListStore),&iter,path);
-        gtk_tree_model_get(GTK_TREE_MODEL(window->BranchesListStore),&iter,1,&used,-1);
-        used;
-        gtk_list_store_set(window->BranchesListStore,&iter,0,new_text,1,&use,-1);
-        if (used==0)
-            gtk_list_store_append(window->BranchesListStore,&iter);
-
-    }
-}
-
 char *on_choose_repo_folder(GtkWidget *self,repo_create_window *window){
     GtkWidget *chooser = gtk_file_chooser_dialog_new(ADD_REPO_LABEL,NULL,GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER,CANCEL_LABEL,GTK_RESPONSE_CANCEL,OPEN_LABEL,GTK_RESPONSE_ACCEPT,NULL);
     gtk_window_set_icon_name(GTK_WINDOW(chooser),icon_path);
@@ -413,6 +401,7 @@ void on_repo_new (GtkWidget *self, main_window *widgets){
     dictionary *dict = yon_dictionary_new_with_data("",widgets);
     dict = yon_dictionary_append_with_data(dict,"",window);
     on_repo_add_new(self,dict);
+    yon_ubl_status_box_render(OPERATION_DONE_LABEL,BACKGROUND_IMAGE_SUCCESS_TYPE);
 }
 
 void on_repo_add_file(GtkWidget *self, main_window *widgets){
@@ -437,6 +426,7 @@ void on_sign_save(GtkWidget *self, dictionary *dict){
         gtk_tree_store_set(main_config.tree_store,&iter,13,key,14,1,-1);
     }
     on_tree_selection_changed(self,widgets);
+    yon_ubl_status_box_render(OPERATION_DONE_LABEL,BACKGROUND_IMAGE_SUCCESS_TYPE);
     on_close_subwindow(self);
 }
 
@@ -512,6 +502,7 @@ void on_repo_configure_done(GtkWidget *self, dictionary *dict){
         else if (status==1)
             gtk_tree_store_set(main_config.tree_store,&iter,1,name,-1);
     }
+    yon_ubl_status_box_render(OPERATION_DONE_LABEL,BACKGROUND_IMAGE_SUCCESS_TYPE);
     on_close_subwindow(self);
 }
 
@@ -656,7 +647,8 @@ void yon_add_file(main_window *widgets){
 
     }
     on_tree_selection_changed(NULL,widgets);
-        on_close_subwindow(chooser);
+    yon_ubl_status_box_render(OPERATION_DONE_LABEL,BACKGROUND_IMAGE_SUCCESS_TYPE);
+    on_close_subwindow(chooser);
 
 
 }
@@ -886,7 +878,7 @@ int main(int argc, char *argv[]){
     main_window *widgets = setup_window();
     yon_ubl_header_setup_resource(widgets->HeadOverlay,widgets->HeadBox,widgets->HeadImage,banner_path);
     yon_ubl_status_box_setup(widgets->StatusIcon,widgets->StatusBox,widgets->StatusLabel);
-    yon_ubl_status_box_render(LOCAL_LOAD_SUCCESS_LABEL,BACKGROUND_IMAGE_SUCCESS_TYPE);
+    yon_ubl_status_box_render(LOAD_SUCCESS_LABEL,BACKGROUND_IMAGE_SUCCESS_TYPE);
     yon_ubl_setup_sockets(widgets->PlugBox,widgets->LeftBox,widgets->RightBox,main_config.socket_id,main_config.load_socket_id,main_config.save_socket_id);
     yon_window_config_setup(GTK_WINDOW(widgets->Window));
     yon_window_config_load(config_path);
diff --git a/source/ubl-strings.h b/source/ubl-strings.h
index 144d300..b7cd232 100644
--- a/source/ubl-strings.h
+++ b/source/ubl-strings.h
@@ -28,20 +28,9 @@
 #define PROJECT_HOME_LABEL _("Project Home Page")
 #define NOTHING_CHOSEN_LABEL _("Nothing were chosen")
 
-#define GLOBAL_LOAD_SUCCESS_LABEL _("Global configuration loading succseeded.")
-#define LOCAL_LOAD_SUCCESS_LABEL _("Local configuration loading succseeded.")
-#define LOAD_FAILED_LABEL _("Config loading failed")
-
-#define GLOBAL_LOCAL_SAVE_SUCCESS_LABEL _("Local and global configuration saving succseeded.")
-#define GLOBAL_SAVE_SUCCESS_LABEL _("Global configuration saving succseeded.")
-#define LOCAL_SAVE_SUCCESS_LABEL _("Local configuration saving succseeded.")
-#define SAVE_FAILED_LABEL
-#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.")
+#define LOAD_SUCCESS_LABEL _("Repository data has been loaded successfully")
+
+#define SAVE_SUCCESS_LABEL _("Saving has succseeded")
 
 #define GENERAL_TAB_LABEL _("General")
 #define PUBLICATION_TAB_LABEL _("Publication")
diff --git a/ubl-settings-repomanager.pot b/ubl-settings-repomanager.pot
index 7fc224b..059b661 100644
--- a/ubl-settings-repomanager.pot
+++ b/ubl-settings-repomanager.pot
@@ -149,196 +149,180 @@ msgstr ""
 msgid "Nothing were chosen"
 msgstr ""
 
-#: source/ubl-strings.h:31 source/ubl-strings.h:39
-msgid "Global configuration loading succseeded."
-msgstr ""
-
-#: source/ubl-strings.h:32 source/ubl-strings.h:40
-msgid "Local configuration loading succseeded."
+#: source/ubl-strings.h:31
+msgid "Repository data has been loaded successfully"
 msgstr ""
 
 #: source/ubl-strings.h:33
-msgid "Config loading failed"
-msgstr ""
-
-#: source/ubl-strings.h:35 source/ubl-strings.h:42
-msgid "Local and global configuration saving succseeded."
-msgstr ""
-
-#: source/ubl-strings.h:36 source/ubl-strings.h:43
-msgid "Global configuration saving succseeded."
-msgstr ""
-
-#: source/ubl-strings.h:37 source/ubl-strings.h:44
-msgid "Local configuration saving succseeded."
+msgid "Saving has succseeded"
 msgstr ""
 
-#: source/ubl-strings.h:46
+#: source/ubl-strings.h:35
 msgid "General"
 msgstr ""
 
-#: source/ubl-strings.h:47
+#: source/ubl-strings.h:36
 msgid "Publication"
 msgstr ""
 
-#: source/ubl-strings.h:48
+#: source/ubl-strings.h:37
 msgid "Trusted repository"
 msgstr ""
 
-#: source/ubl-strings.h:49
+#: source/ubl-strings.h:38
 msgid "Server type:"
 msgstr ""
 
-#: source/ubl-strings.h:50
+#: source/ubl-strings.h:39
 msgid "IP adress:"
 msgstr ""
 
-#: source/ubl-strings.h:51
+#: source/ubl-strings.h:40
 msgid "Port:"
 msgstr ""
 
-#: source/ubl-strings.h:52
+#: source/ubl-strings.h:41
 msgid "Publish"
 msgstr ""
 
-#: source/ubl-strings.h:53
+#: source/ubl-strings.h:42
 msgid "Code name:"
 msgstr ""
 
-#: source/ubl-strings.h:54
+#: source/ubl-strings.h:43
 msgid "Branch:"
 msgstr ""
 
-#: source/ubl-strings.h:55
+#: source/ubl-strings.h:44
 msgid "Architecture:"
 msgstr ""
 
-#: source/ubl-strings.h:56
+#: source/ubl-strings.h:45
 msgid "Components:"
 msgstr ""
 
-#: source/ubl-strings.h:57
+#: source/ubl-strings.h:46
 msgid "Signature:"
 msgstr ""
 
-#: source/ubl-strings.h:58
+#: source/ubl-strings.h:47
 msgid "Sign"
 msgstr ""
 
-#: source/ubl-strings.h:60
+#: source/ubl-strings.h:49
 msgid "Create repository"
 msgstr ""
 
-#: source/ubl-strings.h:61
+#: source/ubl-strings.h:50
 msgid "Open existing repository"
 msgstr ""
 
-#: source/ubl-strings.h:62
+#: source/ubl-strings.h:51
 msgid "Configure repository"
 msgstr ""
 
-#: source/ubl-strings.h:63
+#: source/ubl-strings.h:52
 msgid "Delete repository"
 msgstr ""
 
-#: source/ubl-strings.h:64
+#: source/ubl-strings.h:53
 msgid ""
 "Add/Remove repository from\n"
 "local package sources"
 msgstr ""
 
-#: source/ubl-strings.h:65
+#: source/ubl-strings.h:54
 msgid "Enable/disable repository publish"
 msgstr ""
 
-#: source/ubl-strings.h:66
+#: source/ubl-strings.h:55
 msgid "Check dependences"
 msgstr ""
 
-#: source/ubl-strings.h:67
+#: source/ubl-strings.h:56
 msgid "Sign ripository"
 msgstr ""
 
-#: source/ubl-strings.h:68
+#: source/ubl-strings.h:57
 msgid "Add package"
 msgstr ""
 
-#: source/ubl-strings.h:69
+#: source/ubl-strings.h:58
 msgid "Remove package"
 msgstr ""
 
-#: source/ubl-strings.h:70
+#: source/ubl-strings.h:59
 msgid "Open"
 msgstr ""
 
-#: source/ubl-strings.h:72
+#: source/ubl-strings.h:61
 msgid "Operation done"
 msgstr ""
 
-#: source/ubl-strings.h:74
+#: source/ubl-strings.h:63
 msgid "Choose branch or pack in branch to add file!"
 msgstr ""
 
-#: source/ubl-strings.h:75
+#: source/ubl-strings.h:64
 msgid "Choose repository or branch!"
 msgstr ""
 
-#: source/ubl-strings.h:76
+#: source/ubl-strings.h:65
 msgid "Choose pack to delete!"
 msgstr ""
 
-#: source/ubl-strings.h:77
+#: source/ubl-strings.h:66
 msgid "Choose repository to delete!"
 msgstr ""
 
-#: source/ubl-strings.h:78
+#: source/ubl-strings.h:67
 msgid "Choose repository or package to sign"
 msgstr ""
 
-#: source/ubl-strings.h:80
+#: source/ubl-strings.h:69
 msgid "Name:"
 msgstr ""
 
-#: source/ubl-strings.h:81
+#: source/ubl-strings.h:70
 msgid "Branches:"
 msgstr ""
 
-#: source/ubl-strings.h:82
+#: source/ubl-strings.h:71
 msgid "< Type branch name >"
 msgstr ""
 
-#: source/ubl-strings.h:83
+#: source/ubl-strings.h:72
 msgid "Name must be filled!"
 msgstr ""
 
-#: source/ubl-strings.h:84
+#: source/ubl-strings.h:73
 msgid "Choose path for new repository"
 msgstr ""
 
-#: source/ubl-strings.h:86
+#: source/ubl-strings.h:75
 msgid "Choose repository folder"
 msgstr ""
 
-#: source/ubl-strings.h:87
+#: source/ubl-strings.h:76
 msgid "Choose repository"
 msgstr ""
 
-#: source/ubl-strings.h:89
+#: source/ubl-strings.h:78
 msgid "Absent"
 msgstr ""
 
-#: source/ubl-strings.h:90
+#: source/ubl-strings.h:79
 msgid "Dependences:"
 msgstr ""
 
-#: source/ubl-strings.h:91
+#: source/ubl-strings.h:80
 msgid "Digital signature"
 msgstr ""
 
-#: source/ubl-strings.h:93
+#: source/ubl-strings.h:82
 msgid "package"
 msgstr ""
 
-#: source/ubl-strings.h:94
+#: source/ubl-strings.h:83
 msgid "repository"
 msgstr ""
diff --git a/ubl-settings-repomanager_ru.po b/ubl-settings-repomanager_ru.po
index a1a02a9..3ef037e 100644
--- a/ubl-settings-repomanager_ru.po
+++ b/ubl-settings-repomanager_ru.po
@@ -153,99 +153,84 @@ msgstr "Домашняя страница проекта"
 msgid "Nothing were chosen"
 msgstr "Ничего не было выбрано"
 
-#: source/ubl-strings.h:31 source/ubl-strings.h:39
-msgid "Global configuration loading succseeded."
-msgstr "Успешно загружена глобальная конфигурация"
-
-#: source/ubl-strings.h:32 source/ubl-strings.h:40
-msgid "Local configuration loading succseeded."
-msgstr "Успешно загружена локальная конфигурация"
+#: source/ubl-strings.h:31
+msgid "Repository data has been loaded successfully"
+msgstr "Информация о пакетах успешно загружена"
 
 #: source/ubl-strings.h:33
-msgid "Config loading failed"
-msgstr ""
-
-#: source/ubl-strings.h:35 source/ubl-strings.h:42
-msgid "Local and global configuration saving succseeded."
-msgstr "Успешно записаны локальная и глобальная конфигурация"
-
-#: source/ubl-strings.h:36 source/ubl-strings.h:43
-msgid "Global configuration saving succseeded."
-msgstr "Успешно записана глобальная конфигурация"
-
-#: source/ubl-strings.h:37 source/ubl-strings.h:44
-msgid "Local configuration saving succseeded."
-msgstr "Успешно записана локальная конфигурация"
+#, fuzzy
+msgid "Saving has succseeded"
+msgstr "Успешно сохранено"
 
-#: source/ubl-strings.h:46
+#: source/ubl-strings.h:35
 msgid "General"
 msgstr "Общие"
 
-#: source/ubl-strings.h:47
+#: source/ubl-strings.h:36
 msgid "Publication"
 msgstr "Публикация"
 
-#: source/ubl-strings.h:48
+#: source/ubl-strings.h:37
 msgid "Trusted repository"
 msgstr "Доверенный репозиторий"
 
-#: source/ubl-strings.h:49
+#: source/ubl-strings.h:38
 msgid "Server type:"
 msgstr "Тип сервера:"
 
-#: source/ubl-strings.h:50
+#: source/ubl-strings.h:39
 msgid "IP adress:"
 msgstr "IP-адрес:"
 
-#: source/ubl-strings.h:51
+#: source/ubl-strings.h:40
 msgid "Port:"
 msgstr "Порт:"
 
-#: source/ubl-strings.h:52
+#: source/ubl-strings.h:41
 msgid "Publish"
 msgstr "Опубликовать"
 
-#: source/ubl-strings.h:53
+#: source/ubl-strings.h:42
 msgid "Code name:"
 msgstr "Кодовое имя:"
 
-#: source/ubl-strings.h:54
+#: source/ubl-strings.h:43
 msgid "Branch:"
 msgstr "Ветка:"
 
-#: source/ubl-strings.h:55
+#: source/ubl-strings.h:44
 msgid "Architecture:"
 msgstr "Архитектура:"
 
-#: source/ubl-strings.h:56
+#: source/ubl-strings.h:45
 msgid "Components:"
 msgstr "Компоненты"
 
-#: source/ubl-strings.h:57
+#: source/ubl-strings.h:46
 msgid "Signature:"
 msgstr "Подпись:"
 
-#: source/ubl-strings.h:58
+#: source/ubl-strings.h:47
 msgid "Sign"
 msgstr "Подписать"
 
-#: source/ubl-strings.h:60
+#: source/ubl-strings.h:49
 msgid "Create repository"
 msgstr "Создать репозиторий"
 
-#: source/ubl-strings.h:61
+#: source/ubl-strings.h:50
 msgid "Open existing repository"
 msgstr "Открыть и добавить репозиторий"
 
-#: source/ubl-strings.h:62
+#: source/ubl-strings.h:51
 msgid "Configure repository"
 msgstr "Редактировать репозиторий"
 
-#: source/ubl-strings.h:63
+#: source/ubl-strings.h:52
 msgid "Delete repository"
 msgstr "Удалить репозиторий"
 
-#: source/ubl-strings.h:64
+#: source/ubl-strings.h:53
 msgid ""
 "Add/Remove repository from\n"
 "local package sources"
@@ -253,98 +238,98 @@ msgstr ""
 "Добавить/удалить репу из\n"
 " локальных источников пакетов"
 
-#: source/ubl-strings.h:65
+#: source/ubl-strings.h:54
 msgid "Enable/disable repository publish"
 msgstr "Включить/отключить публикацию"
 
-#: source/ubl-strings.h:66
+#: source/ubl-strings.h:55
 msgid "Check dependences"
 msgstr "Проверить на битые зависимости"
 
-#: source/ubl-strings.h:67
+#: source/ubl-strings.h:56
 msgid "Sign ripository"
 msgstr "Подпись пакетов"
 
-#: source/ubl-strings.h:68
+#: source/ubl-strings.h:57
 msgid "Add package"
 msgstr "Добавить пакет"
 
-#: source/ubl-strings.h:69
+#: source/ubl-strings.h:58
 msgid "Remove package"
 msgstr "Удалить пакет"
 
-#: source/ubl-strings.h:70
+#: source/ubl-strings.h:59
 msgid "Open"
 msgstr "Открыть"
 
-#: source/ubl-strings.h:72
+#: source/ubl-strings.h:61
 msgid "Operation done"
 msgstr "Операция завершена"
 
-#: source/ubl-strings.h:74
+#: source/ubl-strings.h:63
 msgid "Choose branch or pack in branch to add file!"
 msgstr "Выберите ветку чтобы добавить пакет!"
 
-#: source/ubl-strings.h:75
+#: source/ubl-strings.h:64
 msgid "Choose repository or branch!"
 msgstr "Выберите репозиторий!"
 
-#: source/ubl-strings.h:76
+#: source/ubl-strings.h:65
 msgid "Choose pack to delete!"
 msgstr "Выберите пакет для удаления!"
 
-#: source/ubl-strings.h:77
+#: source/ubl-strings.h:66
 msgid "Choose repository to delete!"
 msgstr "Выберите репозиторий для удаления!"
 
-#: source/ubl-strings.h:78
+#: source/ubl-strings.h:67
 msgid "Choose repository or package to sign"
 msgstr "Выберите репозиторий или пакет для подписи"
 
-#: source/ubl-strings.h:80
+#: source/ubl-strings.h:69
 msgid "Name:"
 msgstr "Название:"
 
-#: source/ubl-strings.h:81
+#: source/ubl-strings.h:70
 msgid "Branches:"
 msgstr "Ветки:"
 
-#: source/ubl-strings.h:82
+#: source/ubl-strings.h:71
 msgid "< Type branch name >"
 msgstr "< Введите название ветки >"
 
-#: source/ubl-strings.h:83
+#: source/ubl-strings.h:72
 msgid "Name must be filled!"
 msgstr "Введите название!"
 
-#: source/ubl-strings.h:84
+#: source/ubl-strings.h:73
 msgid "Choose path for new repository"
 msgstr "Выбрать расположение нового репозитория"
 
-#: source/ubl-strings.h:86
+#: source/ubl-strings.h:75
 msgid "Choose repository folder"
 msgstr "Выбрать директорию для репозитория"
 
-#: source/ubl-strings.h:87
+#: source/ubl-strings.h:76
 msgid "Choose repository"
 msgstr "Выбрать репозиторий"
 
-#: source/ubl-strings.h:89
+#: source/ubl-strings.h:78
 msgid "Absent"
 msgstr "Отсутствует"
 
-#: source/ubl-strings.h:90
+#: source/ubl-strings.h:79
 msgid "Dependences:"
 msgstr "Зависит от:"
 
-#: source/ubl-strings.h:91
+#: source/ubl-strings.h:80
 msgid "Digital signature"
 msgstr "Цифровая подпись"
 
-#: source/ubl-strings.h:93
+#: source/ubl-strings.h:82
 msgid "package"
 msgstr "пакет"
 
-#: source/ubl-strings.h:94
+#: source/ubl-strings.h:83
 msgid "repository"
-msgstr "репозиторий"
+msgstr "репозиторий"
\ No newline at end of file