diff --git a/source/ubl-settings-services.c b/source/ubl-settings-services.c
index 1cc6ff6..5ec877e 100644
--- a/source/ubl-settings-services.c
+++ b/source/ubl-settings-services.c
@@ -30,7 +30,9 @@ void on_save_done(main_window *widgets, config_str output, int size){
}
void yon_load_proceed(YON_CONFIG_TYPE type){
- yon_config_clean();
+ if (type!=YON_CONFIG_CUSTOM){
+ yon_config_clean();
+ }
if (!yon_char_is_empty(config_get_default_command))
yon_config_load_config(YON_CONFIG_DEFAULT,config_get_default_command,NULL);
if (type==YON_CONFIG_GLOBAL){
@@ -59,6 +61,7 @@ void yon_load_proceed(YON_CONFIG_TYPE type){
} else {
gtk_widget_destroy(dialog);
}
+ yon_config_clean();
char *command = yon_config_get_custom_command(path);
yon_config_load_config(type,command,NULL);
}
@@ -425,7 +428,7 @@ gboolean yon_filter(GtkTreeModel* model, GtkTreeIter *iter, main_window *widgets
int filter_active = gtk_combo_box_get_active(GTK_COMBO_BOX(combo));
if (filter_active>0){
if (filter_active>3){
- char *text = (char*)gtk_combo_box_text_get_active_text(GTK_COMBO_BOX_TEXT(combo));
+ char *text = (char*)gtk_combo_box_get_active_id(GTK_COMBO_BOX(combo));
if (yon_get_unit_type(text)!=(enum YON_UNIT_TYPE)type) type_filter = 0;
} else {
switch (filter_active){
@@ -964,9 +967,9 @@ void on_config_log_save(GtkWidget *self, log_window *window){
char *text = gtk_text_buffer_get_text(buffer,&start,&end,1);
if (text){
if (yon_file_save(window->target,text)){
- yon_ubl_status_box_render(SAVED_LABEL,BACKGROUND_IMAGE_SUCCESS_TYPE);
+ yon_ubl_status_box_spawn(GTK_CONTAINER(window->StatusBox),SAVED_LABEL,5,BACKGROUND_IMAGE_SUCCESS_TYPE);
} else {
- yon_ubl_status_box_render(ERROR_LABEL,BACKGROUND_IMAGE_FAIL_TYPE);
+ yon_ubl_status_box_spawn(GTK_CONTAINER(window->StatusBox),ERROR_LABEL,5,BACKGROUND_IMAGE_FAIL_TYPE);
}
}
}
diff --git a/source/ubl-strings.h b/source/ubl-strings.h
index 511cc7a..479e0b4 100644
--- a/source/ubl-strings.h
+++ b/source/ubl-strings.h
@@ -138,7 +138,7 @@
#define STATE_ABANDONED_LABEL _("abandoned")
#define SERVICE_STATE_TITLE_LABEL(target) yon_char_append(_("State of "),target)
-#define SERVICE_LOG_TITLE_LABEL(target) yon_char_unite(_("View")," ",target," ",_("log"),NULL)
+#define SERVICE_LOG_TITLE_LABEL(target) yon_char_unite(_("View log")," ",target,NULL)
#define SERVICE_UNIT_EDIT_TITLE_LABEL _("Edit unit file")
#define SYSTEMD_REEXEC_ERROR_LABEL _("Failed to re-execute systemd")
diff --git a/ubl-settings-services.glade b/ubl-settings-services.glade
index 5246171..d80920c 100644
--- a/ubl-settings-services.glade
+++ b/ubl-settings-services.glade
@@ -574,22 +574,22 @@
@@ -1179,22 +1179,22 @@
diff --git a/ubl-settings-services.pot b/ubl-settings-services.pot
index da932a2..7039a8e 100644
--- a/ubl-settings-services.pot
+++ b/ubl-settings-services.pot
@@ -459,7 +459,7 @@ msgid "State of "
msgstr ""
#: source/ubl-strings.h:141
-msgid "View"
+msgid "View log"
msgstr ""
#: source/ubl-strings.h:141
diff --git a/ubl-settings-services_ru.po b/ubl-settings-services_ru.po
index 02a6d10..0907abe 100644
--- a/ubl-settings-services_ru.po
+++ b/ubl-settings-services_ru.po
@@ -143,7 +143,7 @@ msgstr "Описание:"
#: source/ubl-strings.h:41
msgid "Service"
-msgstr "Сервис"
+msgstr "Служба"
#: source/ubl-strings.h:47
msgid "Service list is loading"
@@ -459,11 +459,11 @@ msgstr "заброшен"
#: source/ubl-strings.h:140
msgid "State of "
-msgstr "Состояние сервиса "
+msgstr "Состояние "
#: source/ubl-strings.h:141
-msgid "View"
-msgstr "Просмотр"
+msgid "View log"
+msgstr "Просмотр лога"
#: source/ubl-strings.h:141
msgid "log"