Applications
/
ubl-settings-logging
7
0
Fork 1
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Merge pull request 'master' (#101) from YanTheKaller/ubl-settings-logging:master into master

Browse Source 
Reviewed-on: #101
pull/139/head v2.4
Dmitry Razumov 2 years ago
parent e070301f81 c2d0323173
commit 7c265868e5
7 changed files with 92 additions and 60 deletions
Show Stats Download Patch File Download Diff File

14
source/ubl-settings-logging.c
Unescape View File

@ -80,6 +80,13 @@ void on_save_parameters(GtkWidget *self, saving_window *window){
free(final_command); 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) if (window->type == YON_CONFIG_GLOBAL)
yon_ubl_status_box_render(GLOBAL_SAVE_SUCCESS_LABEL,BACKGROUND_IMAGE_SUCCESS_TYPE); yon_ubl_status_box_render(GLOBAL_SAVE_SUCCESS_LABEL,BACKGROUND_IMAGE_SUCCESS_TYPE);
else if (window->type == YON_CONFIG_LOCAL) 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) { else if (type==YON_CONFIG_BOTH) {
if (main_config.load_mode==1){ if (main_config.load_mode==1){
config_to_save="global"; config_to_save="global";
yon_config_save_registered("system");
} else if (main_config.load_mode==0){ } else if (main_config.load_mode==0){
config_to_save="system"; config_to_save="system";
yon_config_save_registered("global");
} }
} }
config_str config_compare=NULL; config_str config_compare=NULL;
@ -636,7 +641,7 @@ void on_inspector_update(GtkWidget *self, inspector_window *window){
dictionary *dict=NULL; dictionary *dict=NULL;
for_dictionaries (dict,window->terminals){ for_dictionaries (dict,window->terminals){
GtkWidget *terminal = (GtkWidget*)dict->data; 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);
} }
} }
} }
@ -2825,7 +2830,7 @@ void on_start_stop_clicked(GtkButton *self, main_window *widgets){
yon_launch(start_command); yon_launch(start_command);
gtk_list_store_set(widgets->ServicesList,&iter,0,1,-1); 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_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);
} }
} }
} }
@ -3218,7 +3223,6 @@ int main(int argc, char *argv[], char **envp){
exit(0); exit(0);
} }
} }
if (getuid()!=0){ if (getuid()!=0){
main_config.lock_load_global=1; main_config.lock_load_global=1;
main_config.lock_save_global=1; main_config.lock_save_global=1;

4
source/ubl-strings.h
Unescape View File

@ -206,6 +206,10 @@
#define TABLE_TITLE_LABEL _("Logs and events - logrotate table") #define TABLE_TITLE_LABEL _("Logs and events - logrotate table")
#define SYSTEM_CONFIGURATION_LABEL _("System configuration") #define SYSTEM_CONFIGURATION_LABEL _("System configuration")
#define APPLITATIONS_CONFIGURATION_LABEL _("Applications 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 //ubl-settings-logging-add.glade
#define MONITOR_TITLE_LABEL _("Logs and events - journal configuration") #define MONITOR_TITLE_LABEL _("Logs and events - journal configuration")

4
ubl-settings-logging-logrotate-table.glade
Unescape View File

@ -110,6 +110,7 @@
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">True</property> <property name="can-focus">True</property>
<property name="receives-default">True</property> <property name="receives-default">True</property>
<property name="tooltip-text" translatable="yes">Add log configuration</property>
<property name="image">image5</property> <property name="image">image5</property>
<style> <style>
<class name="thin"/> <class name="thin"/>
@ -127,6 +128,7 @@
<property name="sensitive">False</property> <property name="sensitive">False</property>
<property name="can-focus">True</property> <property name="can-focus">True</property>
<property name="receives-default">True</property> <property name="receives-default">True</property>
<property name="tooltip-text" translatable="yes">Remove log configuration</property>
<property name="image">image4</property> <property name="image">image4</property>
<style> <style>
<class name="thin"/> <class name="thin"/>
@ -144,6 +146,7 @@
<property name="sensitive">False</property> <property name="sensitive">False</property>
<property name="can-focus">True</property> <property name="can-focus">True</property>
<property name="receives-default">True</property> <property name="receives-default">True</property>
<property name="tooltip-text" translatable="yes">Configure log</property>
<property name="image">image3</property> <property name="image">image3</property>
<style> <style>
<class name="thin"/> <class name="thin"/>
@ -251,6 +254,7 @@
<property name="sensitive">False</property> <property name="sensitive">False</property>
<property name="can-focus">True</property> <property name="can-focus">True</property>
<property name="receives-default">True</property> <property name="receives-default">True</property>
<property name="tooltip-text" translatable="yes">Import log configuration</property>
<property name="image">image8</property> <property name="image">image8</property>
<style> <style>
<class name="thin"/> <class name="thin"/>

2
ubl-settings-logging-logrotate.glade
Unescape View File

@ -2137,7 +2137,7 @@
<property name="margin-start">5</property> <property name="margin-start">5</property>
<property name="margin-end">5</property> <property name="margin-end">5</property>
<property name="margin-bottom">2</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> <attributes>
<attribute name="weight" value="bold"/> <attribute name="weight" value="bold"/>
</attributes> </attributes>

4
ubl-settings-logging.glade
Unescape View File

@ -874,7 +874,7 @@ translated and supported by community.</property>
<property name="sensitive">False</property> <property name="sensitive">False</property>
<property name="can-focus">True</property> <property name="can-focus">True</property>
<property name="receives-default">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> <property name="image">image5</property>
<style> <style>
<class name="thin"/> <class name="thin"/>
@ -892,7 +892,7 @@ translated and supported by community.</property>
<property name="sensitive">False</property> <property name="sensitive">False</property>
<property name="can-focus">True</property> <property name="can-focus">True</property>
<property name="receives-default">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> <property name="image">image6</property>
<style> <style>
<class name="thin"/> <class name="thin"/>

60
ubl-settings-logging.pot
Unescape View File

@ -209,7 +209,7 @@ msgstr ""
msgid "Inspect log" msgid "Inspect log"
msgstr "" msgstr ""
#: source/ubl-strings.h:49 #: source/ubl-strings.h:49 source/ubl-strings.h:212
msgid "Configure log" msgid "Configure log"
msgstr "" msgstr ""
@ -803,82 +803,102 @@ msgstr ""
msgid "Applications configuration" msgid "Applications configuration"
msgstr "" 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 #: source/ubl-strings.h:211
msgid "Remove log configuration"
msgstr ""
#: source/ubl-strings.h:215
msgid "Logs and events - journal configuration" msgid "Logs and events - journal configuration"
msgstr "" msgstr ""
#: source/ubl-strings.h:212 #: source/ubl-strings.h:216
msgid "Path (-s):" msgid "Path (-s):"
msgstr "" msgstr ""
#: source/ubl-strings.h:213 #: source/ubl-strings.h:217
msgid "Control:" msgid "Control:"
msgstr "" msgstr ""
#: source/ubl-strings.h:214 #: source/ubl-strings.h:218
msgid "Log file" msgid "Log file"
msgstr "" msgstr ""
#: source/ubl-strings.h:215 #: source/ubl-strings.h:219
msgid "Name:" msgid "Name:"
msgstr "" msgstr ""
#: source/ubl-strings.h:216 #: source/ubl-strings.h:220
msgid "Log size:" msgid "Log size:"
msgstr "" msgstr ""
#: source/ubl-strings.h:219 #: source/ubl-strings.h:223
msgid "Logs and events - rules" msgid "Logs and events - rules"
msgstr "" msgstr ""
#: source/ubl-strings.h:220 #: source/ubl-strings.h:224
msgid "Owner rules" msgid "Owner rules"
msgstr "" msgstr ""
#: source/ubl-strings.h:221 #: source/ubl-strings.h:225
msgid "Group rules" msgid "Group rules"
msgstr "" msgstr ""
#: source/ubl-strings.h:222 #: source/ubl-strings.h:226
msgid "Public rules" msgid "Public rules"
msgstr "" msgstr ""
#: source/ubl-strings.h:223 #: source/ubl-strings.h:227
msgid "Read" msgid "Read"
msgstr "" msgstr ""
#: source/ubl-strings.h:224 #: source/ubl-strings.h:228
msgid "Write" msgid "Write"
msgstr "" msgstr ""
#: source/ubl-strings.h:225 #: source/ubl-strings.h:229
msgid "Execute" msgid "Execute"
msgstr "" msgstr ""
#: source/ubl-strings.h:226 #: source/ubl-strings.h:230
msgid "Value:" msgid "Value:"
msgstr "" msgstr ""
#: source/ubl-strings.h:229 #: source/ubl-strings.h:233
msgid ": no such file(s)" msgid ": no such file(s)"
msgstr "" msgstr ""
#: source/ubl-strings.h:230 #: source/ubl-strings.h:234
msgid "Parameter" msgid "Parameter"
msgstr "" msgstr ""
#: source/ubl-strings.h:231 #: source/ubl-strings.h:235
msgid "Old value" msgid "Old value"
msgstr "" msgstr ""
#: source/ubl-strings.h:232 #: source/ubl-strings.h:236
msgid "New value" msgid "New value"
msgstr "" msgstr ""
#: source/ubl-strings.h:234 #: source/ubl-strings.h:238
msgid "Logs and events - choose a path" msgid "Logs and events - choose a path"
msgstr "" msgstr ""
#: source/ubl-strings.h:235 #: source/ubl-strings.h:239
msgid "Logs and events - saving" msgid "Logs and events - saving"
msgstr "" msgstr ""
msgid "System event log rotation service"
msgstr "Служба ротации системных журналов событий"
msgid ""
"Service for collecting messages from system events of active network "
"devices"
msgstr "Сервис сбора сообщений системных событий активных сетевых устройств"

64
ubl-settings-logging_ru.po
Unescape View File

@ -213,7 +213,7 @@ msgstr "Описание"
msgid "Inspect log" msgid "Inspect log"
msgstr "Просмотреть лог" msgstr "Просмотреть лог"
#: source/ubl-strings.h:49 #: source/ubl-strings.h:49 source/ubl-strings.h:212
msgid "Configure log" msgid "Configure log"
msgstr "Настроить лог" msgstr "Настроить лог"
@ -310,7 +310,6 @@ msgid "Graphics X session log"
msgstr "Журнал сеансов графической системы X" msgstr "Журнал сеансов графической системы X"
#: source/ubl-strings.h:75 #: source/ubl-strings.h:75
#, fuzzy
msgid "Logs and events - log inspector" msgid "Logs and events - log inspector"
msgstr "Логи и журналы событий - просмотр журнала" msgstr "Логи и журналы событий - просмотр журнала"
@ -367,7 +366,6 @@ msgid "Log"
msgstr "Запись лога" msgstr "Запись лога"
#: source/ubl-strings.h:90 #: source/ubl-strings.h:90
#, fuzzy
msgid "Logs and events - journald configuration" msgid "Logs and events - journald configuration"
msgstr "Логи и журналы событий - конфигурация сервиса journald" msgstr "Логи и журналы событий - конфигурация сервиса journald"
@ -452,7 +450,6 @@ msgid "Drive"
msgstr "Диск" msgstr "Диск"
#: source/ubl-strings.h:112 #: source/ubl-strings.h:112
#, fuzzy
msgid "Auto" msgid "Auto"
msgstr "Автоматически" msgstr "Автоматически"
@ -497,7 +494,6 @@ msgid "Days"
msgstr "Дней" msgstr "Дней"
#: source/ubl-strings.h:123 #: source/ubl-strings.h:123
#, fuzzy
msgid "Weeks" msgid "Weeks"
msgstr "Недель" msgstr "Недель"
@ -510,7 +506,6 @@ msgid "Reset"
msgstr "По умолчанию" msgstr "По умолчанию"
#: source/ubl-strings.h:128 #: source/ubl-strings.h:128
#, fuzzy
msgid "Logs and events - logrotate configuration" msgid "Logs and events - logrotate configuration"
msgstr "Логи и журналы событий - конфигурация сервиса logrotate" msgstr "Логи и журналы событий - конфигурация сервиса logrotate"
@ -744,7 +739,6 @@ msgid "Endwork command:"
msgstr "Команда перед удалением файла журнала:" msgstr "Команда перед удалением файла журнала:"
#: source/ubl-strings.h:188 #: source/ubl-strings.h:188
#, fuzzy
msgid "Hourly" msgid "Hourly"
msgstr "Час" msgstr "Час"
@ -805,12 +799,10 @@ msgid "Repeating paths"
msgstr "Повторяющиеся пути" msgstr "Повторяющиеся пути"
#: source/ubl-strings.h:203 #: source/ubl-strings.h:203
#, fuzzy
msgid "Write down all important fields" msgid "Write down all important fields"
msgstr "Введите все необходимые поля" msgstr "Введите все необходимые поля"
#: source/ubl-strings.h:206 #: source/ubl-strings.h:206
#, fuzzy
msgid "Logs and events - logrotate table" msgid "Logs and events - logrotate table"
msgstr "Логи и журналы событий - таблица журналов logrotate" msgstr "Логи и журналы событий - таблица журналов logrotate"
@ -822,87 +814,95 @@ msgstr "Настройки системы"
msgid "Applications configuration" msgid "Applications configuration"
msgstr "Настройки приложений" 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 #: source/ubl-strings.h:211
#, fuzzy msgid "Remove log configuration"
msgstr "Удалить конфигурацию лога"
#: source/ubl-strings.h:215
msgid "Logs and events - journal configuration" msgid "Logs and events - journal configuration"
msgstr "Логи и журналы событий - конфигурация журнала" msgstr "Логи и журналы событий - конфигурация журнала"
#: source/ubl-strings.h:212 #: source/ubl-strings.h:216
msgid "Path (-s):" msgid "Path (-s):"
msgstr "Путь (-и):" msgstr "Путь (-и):"
#: source/ubl-strings.h:213 #: source/ubl-strings.h:217
msgid "Control:" msgid "Control:"
msgstr "Управление:" msgstr "Управление:"
#: source/ubl-strings.h:214 #: source/ubl-strings.h:218
msgid "Log file" msgid "Log file"
msgstr "Файл лога" msgstr "Файл лога"
#: source/ubl-strings.h:215 #: source/ubl-strings.h:219
msgid "Name:" msgid "Name:"
msgstr "Имя:" msgstr "Имя:"
#: source/ubl-strings.h:216 #: source/ubl-strings.h:220
msgid "Log size:" msgid "Log size:"
msgstr "Размер лога:" msgstr "Размер лога:"
#: source/ubl-strings.h:219 #: source/ubl-strings.h:223
#, fuzzy
msgid "Logs and events - rules" msgid "Logs and events - rules"
msgstr "Логи и журналы событий - правила" msgstr "Логи и журналы событий - правила"
#: source/ubl-strings.h:220 #: source/ubl-strings.h:224
msgid "Owner rules" msgid "Owner rules"
msgstr "Правила владельца" msgstr "Правила владельца"
#: source/ubl-strings.h:221 #: source/ubl-strings.h:225
msgid "Group rules" msgid "Group rules"
msgstr "Правила группы" msgstr "Правила группы"
#: source/ubl-strings.h:222 #: source/ubl-strings.h:226
msgid "Public rules" msgid "Public rules"
msgstr "Правила остальных" msgstr "Правила остальных"
#: source/ubl-strings.h:223 #: source/ubl-strings.h:227
msgid "Read" msgid "Read"
msgstr "Чтение" msgstr "Чтение"
#: source/ubl-strings.h:224 #: source/ubl-strings.h:228
msgid "Write" msgid "Write"
msgstr "Запись" msgstr "Запись"
#: source/ubl-strings.h:225 #: source/ubl-strings.h:229
msgid "Execute" msgid "Execute"
msgstr "Исполнение" msgstr "Исполнение"
#: source/ubl-strings.h:226 #: source/ubl-strings.h:230
msgid "Value:" msgid "Value:"
msgstr "Значение:" msgstr "Значение:"
#: source/ubl-strings.h:229 #: source/ubl-strings.h:233
msgid ": no such file(s)" msgid ": no such file(s)"
msgstr ": файл(ы) не найден(ы)" msgstr ": файл(ы) не найден(ы)"
#: source/ubl-strings.h:230 #: source/ubl-strings.h:234
msgid "Parameter" msgid "Parameter"
msgstr "Параметр" msgstr "Параметр"
#: source/ubl-strings.h:231 #: source/ubl-strings.h:235
msgid "Old value" msgid "Old value"
msgstr "Старое значение" msgstr "Старое значение"
#: source/ubl-strings.h:232 #: source/ubl-strings.h:236
msgid "New value" msgid "New value"
msgstr "Новое значение" msgstr "Новое значение"
#: source/ubl-strings.h:234 #: source/ubl-strings.h:238
#, fuzzy
msgid "Logs and events - choose a path" msgid "Logs and events - choose a path"
msgstr "Логи и журналы событий - Выбор пути" msgstr "Логи и журналы событий - Выбор пути"
#: source/ubl-strings.h:235 #: source/ubl-strings.h:239
#, fuzzy
msgid "Logs and events - saving" msgid "Logs and events - saving"
msgstr "Логи и журналы событий - сохранение" msgstr "Логи и журналы событий - сохранение"

Write Preview
Loading…
Cancel
Save