diff --git a/source/ubl-settings-logging.c b/source/ubl-settings-logging.c
index d4fbee4..31c5e13 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;
@@ -636,7 +641,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);
}
}
}
@@ -2825,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);
}
}
}
@@ -3218,7 +3223,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;
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 @@
True
True
True
+ Add log configuration
image5