From 1c48378634d61769da6ec51e87d0826501100ce3 Mon Sep 17 00:00:00 2001
From: Ivan Yarcev <yarcev.id@ublinux.ru>
Date: Tue, 26 Dec 2023 09:38:07 +0600
Subject: [PATCH 1/4] Added tooltips on logrotate table window; Localisation
 fix for logrotate window hat

---
 source/ubl-strings.h                       |  4 ++
 ubl-settings-logging-logrotate-table.glade |  4 ++
 ubl-settings-logging-logrotate.glade       |  2 +-
 ubl-settings-logging.pot                   | 52 +++++++++------
 ubl-settings-logging_ru.po                 | 76 +++++++++++-----------
 5 files changed, 79 insertions(+), 59 deletions(-)

diff --git a/source/ubl-strings.h b/source/ubl-strings.h
index 19adcda..0b865a6 100644
--- a/source/ubl-strings.h
+++ b/source/ubl-strings.h
@@ -206,6 +206,10 @@
 #define TABLE_TITLE_LABEL _("Logs and events - logrotate table")
 #define SYSTEM_CONFIGURATION_LABEL _("System configuration")
 #define APPLITATIONS_CONFIGURATION_LABEL _("Applications configuration")
+#define IMPORT_CONFIGURATION_LABEL _("Import log configuration")
+#define ADD_CONFIGURATION_LABEL _("Add log configuration")
+#define REMOVE_CONFIGURATION_LABEL _("Remove log configuration")
+#define CONFIGURE_CONFIGURATION_LABEL _("Configure log")
 
 //ubl-settings-logging-add.glade
 #define MONITOR_TITLE_LABEL _("Logs and events - journal configuration")
diff --git a/ubl-settings-logging-logrotate-table.glade b/ubl-settings-logging-logrotate-table.glade
index 9e5aa4d..bbc41e5 100644
--- a/ubl-settings-logging-logrotate-table.glade
+++ b/ubl-settings-logging-logrotate-table.glade
@@ -110,6 +110,7 @@
                             <property name="visible">True</property>
                             <property name="can-focus">True</property>
                             <property name="receives-default">True</property>
+                            <property name="tooltip-text" translatable="yes">Add log configuration</property>
                             <property name="image">image5</property>
                             <style>
                               <class name="thin"/>
@@ -127,6 +128,7 @@
                             <property name="sensitive">False</property>
                             <property name="can-focus">True</property>
                             <property name="receives-default">True</property>
+                            <property name="tooltip-text" translatable="yes">Remove log configuration</property>
                             <property name="image">image4</property>
                             <style>
                               <class name="thin"/>
@@ -144,6 +146,7 @@
                             <property name="sensitive">False</property>
                             <property name="can-focus">True</property>
                             <property name="receives-default">True</property>
+                            <property name="tooltip-text" translatable="yes">Configure log</property>
                             <property name="image">image3</property>
                             <style>
                               <class name="thin"/>
@@ -251,6 +254,7 @@
                             <property name="sensitive">False</property>
                             <property name="can-focus">True</property>
                             <property name="receives-default">True</property>
+                            <property name="tooltip-text" translatable="yes">Import log configuration</property>
                             <property name="image">image8</property>
                             <style>
                               <class name="thin"/>
diff --git a/ubl-settings-logging-logrotate.glade b/ubl-settings-logging-logrotate.glade
index 568721a..30ff5a1 100644
--- a/ubl-settings-logging-logrotate.glade
+++ b/ubl-settings-logging-logrotate.glade
@@ -2137,7 +2137,7 @@
             <property name="margin-start">5</property>
             <property name="margin-end">5</property>
             <property name="margin-bottom">2</property>
-            <property name="label" translatable="yes">Logs and events- logrotate configuration</property>
+            <property name="label" translatable="yes">Logs and events - logrotate configuration</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
diff --git a/ubl-settings-logging.pot b/ubl-settings-logging.pot
index 6fd30fb..47b6f30 100644
--- a/ubl-settings-logging.pot
+++ b/ubl-settings-logging.pot
@@ -209,7 +209,7 @@ msgstr ""
 msgid "Inspect log"
 msgstr ""
 
-#: source/ubl-strings.h:49
+#: source/ubl-strings.h:49 source/ubl-strings.h:212
 msgid "Configure log"
 msgstr ""
 
@@ -803,82 +803,94 @@ msgstr ""
 msgid "Applications configuration"
 msgstr ""
 
+#: source/ubl-strings.h:209
+msgid "Import log configuration"
+msgstr ""
+
+#: source/ubl-strings.h:210
+msgid "Add log configuration"
+msgstr ""
+
 #: source/ubl-strings.h:211
+msgid "Remove log configuration"
+msgstr ""
+
+#: source/ubl-strings.h:215
 msgid "Logs and events - journal configuration"
 msgstr ""
 
-#: source/ubl-strings.h:212
+#: source/ubl-strings.h:216
 msgid "Path (-s):"
 msgstr ""
 
-#: source/ubl-strings.h:213
+#: source/ubl-strings.h:217
 msgid "Control:"
 msgstr ""
 
-#: source/ubl-strings.h:214
+#: source/ubl-strings.h:218
 msgid "Log file"
 msgstr ""
 
-#: source/ubl-strings.h:215
+#: source/ubl-strings.h:219
 msgid "Name:"
 msgstr ""
 
-#: source/ubl-strings.h:216
+#: source/ubl-strings.h:220
 msgid "Log size:"
 msgstr ""
 
-#: source/ubl-strings.h:219
+#: source/ubl-strings.h:223
 msgid "Logs and events - rules"
 msgstr ""
 
-#: source/ubl-strings.h:220
+#: source/ubl-strings.h:224
 msgid "Owner rules"
 msgstr ""
 
-#: source/ubl-strings.h:221
+#: source/ubl-strings.h:225
 msgid "Group rules"
 msgstr ""
 
-#: source/ubl-strings.h:222
+#: source/ubl-strings.h:226
 msgid "Public rules"
 msgstr ""
 
-#: source/ubl-strings.h:223
+#: source/ubl-strings.h:227
 msgid "Read"
 msgstr ""
 
-#: source/ubl-strings.h:224
+#: source/ubl-strings.h:228
 msgid "Write"
 msgstr ""
 
-#: source/ubl-strings.h:225
+#: source/ubl-strings.h:229
 msgid "Execute"
 msgstr ""
 
-#: source/ubl-strings.h:226
+#: source/ubl-strings.h:230
 msgid "Value:"
 msgstr ""
 
-#: source/ubl-strings.h:229
+#: source/ubl-strings.h:233
 msgid ": no such file(s)"
 msgstr ""
 
-#: source/ubl-strings.h:230
+#: source/ubl-strings.h:234
 msgid "Parameter"
 msgstr ""
 
-#: source/ubl-strings.h:231
+#: source/ubl-strings.h:235
 msgid "Old value"
 msgstr ""
 
-#: source/ubl-strings.h:232
+#: source/ubl-strings.h:236
 msgid "New value"
 msgstr ""
 
-#: source/ubl-strings.h:234
+#: source/ubl-strings.h:238
 msgid "Logs and events - choose a path"
 msgstr ""
 
-#: source/ubl-strings.h:235
+#: source/ubl-strings.h:239
 msgid "Logs and events - saving"
 msgstr ""
diff --git a/ubl-settings-logging_ru.po b/ubl-settings-logging_ru.po
index dbfd447..dcafabd 100644
--- a/ubl-settings-logging_ru.po
+++ b/ubl-settings-logging_ru.po
@@ -213,7 +213,7 @@ msgstr "Описание"
 msgid "Inspect log"
 msgstr "Просмотреть лог"
 
-#: source/ubl-strings.h:49
+#: source/ubl-strings.h:49 source/ubl-strings.h:212
 msgid "Configure log"
 msgstr "Настроить лог"
 
@@ -310,7 +310,6 @@ msgid "Graphics X session log"
 msgstr "Журнал сеансов графической системы X"
 
 #: source/ubl-strings.h:75
-#, fuzzy
 msgid "Logs and events - log inspector"
 msgstr "Логи и журналы событий - просмотр журнала"
 
@@ -367,7 +366,6 @@ msgid "Log"
 msgstr "Запись лога"
 
 #: source/ubl-strings.h:90
-#, fuzzy
 msgid "Logs and events - journald configuration"
 msgstr "Логи и журналы событий - конфигурация сервиса journald"
 
@@ -452,7 +450,6 @@ msgid "Drive"
 msgstr "Диск"
 
 #: source/ubl-strings.h:112
-#, fuzzy
 msgid "Auto"
 msgstr "Автоматически"
 
@@ -497,7 +494,6 @@ msgid "Days"
 msgstr "Дней"
 
 #: source/ubl-strings.h:123
-#, fuzzy
 msgid "Weeks"
 msgstr "Недель"
 
@@ -510,7 +506,6 @@ msgid "Reset"
 msgstr "По умолчанию"
 
 #: source/ubl-strings.h:128
-#, fuzzy
 msgid "Logs and events - logrotate configuration"
 msgstr "Логи и журналы событий - конфигурация сервиса logrotate"
 
@@ -744,7 +739,6 @@ msgid "Endwork command:"
 msgstr "Команда перед удалением файла журнала:"
 
 #: source/ubl-strings.h:188
-#, fuzzy
 msgid "Hourly"
 msgstr "Час"
 
@@ -805,12 +799,10 @@ msgid "Repeating paths"
 msgstr "Повторяющиеся пути"
 
 #: source/ubl-strings.h:203
-#, fuzzy
 msgid "Write down all important fields"
 msgstr "Введите все необходимые поля"
 
 #: source/ubl-strings.h:206
-#, fuzzy
 msgid "Logs and events - logrotate table"
 msgstr "Логи и журналы событий - таблица журналов logrotate"
 
@@ -822,94 +814,102 @@ msgstr "Настройки системы"
 msgid "Applications configuration"
 msgstr "Настройки приложений"
 
+#: source/ubl-strings.h:209
+msgid "Import log configuration"
+msgstr "Импортировать конфигурацию лога"
+
+#: source/ubl-strings.h:210
+msgid "Add log configuration"
+msgstr "Добавить конфигурацию лога"
+
 #: source/ubl-strings.h:211
-#, fuzzy
+msgid "Remove log configuration"
+msgstr "Удалить конфигурацию лога"
+
+#: source/ubl-strings.h:215
 msgid "Logs and events - journal configuration"
 msgstr "Логи и журналы событий - конфигурация журнала"
 
-#: source/ubl-strings.h:212
+#: source/ubl-strings.h:216
 msgid "Path (-s):"
 msgstr "Путь (-и):"
 
-#: source/ubl-strings.h:213
+#: source/ubl-strings.h:217
 msgid "Control:"
 msgstr "Управление:"
 
-#: source/ubl-strings.h:214
+#: source/ubl-strings.h:218
 msgid "Log file"
 msgstr "Файл лога"
 
-#: source/ubl-strings.h:215
+#: source/ubl-strings.h:219
 msgid "Name:"
 msgstr "Имя:"
 
-#: source/ubl-strings.h:216
+#: source/ubl-strings.h:220
 msgid "Log size:"
 msgstr "Размер лога:"
 
-#: source/ubl-strings.h:219
-#, fuzzy
+#: source/ubl-strings.h:223
 msgid "Logs and events - rules"
 msgstr "Логи и журналы событий - правила"
 
-#: source/ubl-strings.h:220
+#: source/ubl-strings.h:224
 msgid "Owner rules"
 msgstr "Правила владельца"
 
-#: source/ubl-strings.h:221
+#: source/ubl-strings.h:225
 msgid "Group rules"
 msgstr "Правила группы"
 
-#: source/ubl-strings.h:222
+#: source/ubl-strings.h:226
 msgid "Public rules"
 msgstr "Правила остальных"
 
-#: source/ubl-strings.h:223
+#: source/ubl-strings.h:227
 msgid "Read"
 msgstr "Чтение"
 
-#: source/ubl-strings.h:224
+#: source/ubl-strings.h:228
 msgid "Write"
 msgstr "Запись"
 
-#: source/ubl-strings.h:225
+#: source/ubl-strings.h:229
 msgid "Execute"
 msgstr "Исполнение"
 
-#: source/ubl-strings.h:226
+#: source/ubl-strings.h:230
 msgid "Value:"
 msgstr "Значение:"
 
-#: source/ubl-strings.h:229
+#: source/ubl-strings.h:233
 msgid ": no such file(s)"
 msgstr ": файл(ы) не найден(ы)"
 
-#: source/ubl-strings.h:230
+#: source/ubl-strings.h:234
 msgid "Parameter"
 msgstr "Параметр"
 
-#: source/ubl-strings.h:231
+#: source/ubl-strings.h:235
 msgid "Old value"
 msgstr "Старое значение"
 
-#: source/ubl-strings.h:232
+#: source/ubl-strings.h:236
 msgid "New value"
 msgstr "Новое значение"
 
-#: source/ubl-strings.h:234
-#, fuzzy
+#: source/ubl-strings.h:238
 msgid "Logs and events - choose a path"
 msgstr "Логи и журналы событий - Выбор пути"
 
-#: source/ubl-strings.h:235
-#, fuzzy
+#: source/ubl-strings.h:239
 msgid "Logs and events - saving"
 msgstr "Логи и журналы событий - сохранение"
 
-msgid "System event log rotation service"
-msgstr "Служба ротации системных журналов событий"
+#~ msgid "System event log rotation service"
+#~ msgstr "Служба ротации системных журналов событий"
 
-msgid ""
-"Service for collecting messages from system events of active network "
-"devices"
-msgstr "Сервис сбора сообщений системных событий активных сетевых устройств"
+#~ msgid ""
+#~ "Service for collecting messages from system events of active network "
+#~ "devices"
+#~ msgstr "Сервис сбора сообщений системных событий активных сетевых устройств"

From 22a38541353ec2d803489672d57ee37c30e47098 Mon Sep 17 00:00:00 2001
From: Ivan Yarcev <yarcev.id@ublinux.ru>
Date: Tue, 26 Dec 2023 10:23:33 +0600
Subject: [PATCH 2/4] Removed colors from logrotate outputs

---
 source/ubl-settings-logging.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/source/ubl-settings-logging.c b/source/ubl-settings-logging.c
index d4fbee4..cda31cd 100644
--- a/source/ubl-settings-logging.c
+++ b/source/ubl-settings-logging.c
@@ -636,7 +636,7 @@ void on_inspector_update(GtkWidget *self, inspector_window *window){
             dictionary *dict=NULL;
             for_dictionaries (dict,window->terminals){
                 GtkWidget *terminal = (GtkWidget*)dict->data;
-                yon_terminal_integrated_start(terminal,yon_char_unite("cat ",dict->key,NULL),NULL,NULL);
+                yon_terminal_integrated_start(terminal,yon_char_unite("cat ",dict->key," | sed -r \"s/\\x1B\\[([0-9]{1,3}(;[0-9]{1,2};?)?)?[mGK]//g\"",NULL),NULL,NULL);
             }
         }
     }
@@ -3218,7 +3218,6 @@ int main(int argc, char *argv[], char **envp){
             exit(0);
             }
     }
-    
     if (getuid()!=0){
         main_config.lock_load_global=1;
         main_config.lock_save_global=1;

From 7ccfddcae982092da30ed0e4e48f0175f80b5b8f Mon Sep 17 00:00:00 2001
From: Ivan Yarcev <yarcev.id@ublinux.ru>
Date: Tue, 26 Dec 2023 10:29:20 +0600
Subject: [PATCH 3/4] Saving of global and local config were fixed

---
 source/ubl-settings-logging.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/source/ubl-settings-logging.c b/source/ubl-settings-logging.c
index cda31cd..e03a6d8 100644
--- a/source/ubl-settings-logging.c
+++ b/source/ubl-settings-logging.c
@@ -80,6 +80,13 @@ void on_save_parameters(GtkWidget *self, saving_window *window){
             free(final_command);
         }
     }
+    if (window->type==YON_CONFIG_BOTH) {
+            if (main_config.load_mode==1){ 
+                yon_config_save_registered("system");
+            } else if (main_config.load_mode==0){ 
+                yon_config_save_registered("global");
+            }
+        }
     if (window->type == YON_CONFIG_GLOBAL)
         yon_ubl_status_box_render(GLOBAL_SAVE_SUCCESS_LABEL,BACKGROUND_IMAGE_SUCCESS_TYPE);
     else if (window->type == YON_CONFIG_LOCAL)
@@ -108,10 +115,8 @@ saving_window *yon_save_proceed(char *path,YON_CONFIG_TYPE type, ...){
         else if (type==YON_CONFIG_BOTH) {
             if (main_config.load_mode==1){ 
                 config_to_save="global";
-                yon_config_save_registered("system");
             } else if (main_config.load_mode==0){ 
                 config_to_save="system";
-                yon_config_save_registered("global");
             }
         }
         config_str config_compare=NULL;

From c2d03231737f6db32257404aeac17bd627ba8f0b Mon Sep 17 00:00:00 2001
From: Ivan Yarcev <yarcev.id@ublinux.ru>
Date: Tue, 26 Dec 2023 11:07:09 +0600
Subject: [PATCH 4/4] Localisation fixes, tooltips fiexes

---
 source/ubl-settings-logging.c |  2 +-
 ubl-settings-logging.glade    |  4 ++--
 ubl-settings-logging.pot      |  8 ++++++++
 ubl-settings-logging_ru.po    | 12 ++++++------
 4 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/source/ubl-settings-logging.c b/source/ubl-settings-logging.c
index e03a6d8..31c5e13 100644
--- a/source/ubl-settings-logging.c
+++ b/source/ubl-settings-logging.c
@@ -2830,7 +2830,7 @@ void on_start_stop_clicked(GtkButton *self, main_window *widgets){
             yon_launch(start_command);
             gtk_list_store_set(widgets->ServicesList,&iter,0,1,-1);
             gtk_image_set_from_icon_name(GTK_IMAGE(gtk_button_get_image(self)),stop_icon_name,GTK_ICON_SIZE_BUTTON);
-            gtk_widget_set_tooltip_text(widgets->ServicesEnableDisableButton,STOP_SERVICE_LABEL);
+            gtk_widget_set_tooltip_text(widgets->ServicesStartStopButton,STOP_SERVICE_LABEL);
         }
     }
 }
diff --git a/ubl-settings-logging.glade b/ubl-settings-logging.glade
index ac75bca..c489b60 100644
--- a/ubl-settings-logging.glade
+++ b/ubl-settings-logging.glade
@@ -874,7 +874,7 @@ translated and supported by community.</property>
                                 <property name="sensitive">False</property>
                                 <property name="can-focus">True</property>
                                 <property name="receives-default">True</property>
-                                <property name="tooltip-text" translatable="yes">Stop service</property>
+                                <property name="tooltip-text" translatable="yes">Start service</property>
                                 <property name="image">image5</property>
                                 <style>
                                   <class name="thin"/>
@@ -892,7 +892,7 @@ translated and supported by community.</property>
                                 <property name="sensitive">False</property>
                                 <property name="can-focus">True</property>
                                 <property name="receives-default">True</property>
-                                <property name="tooltip-text" translatable="yes">Switch autostart off</property>
+                                <property name="tooltip-text" translatable="yes">Switch autostart on</property>
                                 <property name="image">image6</property>
                                 <style>
                                   <class name="thin"/>
diff --git a/ubl-settings-logging.pot b/ubl-settings-logging.pot
index 47b6f30..768cfad 100644
--- a/ubl-settings-logging.pot
+++ b/ubl-settings-logging.pot
@@ -894,3 +894,11 @@ msgstr ""
 #: source/ubl-strings.h:239
 msgid "Logs and events - saving"
 msgstr ""
+
+msgid "System event log rotation service"
+msgstr "Служба ротации системных журналов событий"
+
+msgid ""
+"Service for collecting messages from system events of active network "
+"devices"
+msgstr "Сервис сбора сообщений системных событий активных сетевых устройств"
diff --git a/ubl-settings-logging_ru.po b/ubl-settings-logging_ru.po
index dcafabd..5f21509 100644
--- a/ubl-settings-logging_ru.po
+++ b/ubl-settings-logging_ru.po
@@ -906,10 +906,10 @@ msgstr "Логи и журналы событий - Выбор пути"
 msgid "Logs and events - saving"
 msgstr "Логи и журналы событий - сохранение"
 
-#~ msgid "System event log rotation service"
-#~ msgstr "Служба ротации системных журналов событий"
+msgid "System event log rotation service"
+msgstr "Служба ротации системных журналов событий"
 
-#~ msgid ""
-#~ "Service for collecting messages from system events of active network "
-#~ "devices"
-#~ msgstr "Сервис сбора сообщений системных событий активных сетевых устройств"
+msgid ""
+"Service for collecting messages from system events of active network "
+"devices"
+msgstr "Сервис сбора сообщений системных событий активных сетевых устройств"