diff --git a/source/ubl-settings-logging.c b/source/ubl-settings-logging.c index 821dff2..efbd7a2 100644 --- a/source/ubl-settings-logging.c +++ b/source/ubl-settings-logging.c @@ -716,6 +716,7 @@ void on_logrotate_save(GtkWidget *self, dictionary *dict){ yon_ubl_status_box_spawn(GTK_CONTAINER(window->StatusBox),EMPTY_IMPORTANT_LABEL,5,BACKGROUND_IMAGE_FAIL_TYPE); return; } + GtkTreeIter *lastiter; for (;valid;valid=gtk_tree_model_iter_next(GTK_TREE_MODEL(window->list),&iter)){ char *cur_path; gtk_tree_model_get(GTK_TREE_MODEL(window->list),&iter,0,&cur_path,-1); @@ -724,10 +725,11 @@ void on_logrotate_save(GtkWidget *self, dictionary *dict){ } path_amount++; paths = yon_char_unite(paths,strcmp(paths,"") ? "," : "", cur_path,NULL); + lastiter=gtk_tree_iter_copy(&iter); } if(!window->paths) { if (matched==path_amount) { - yon_ubl_status_highlight_incorrect(gtk_widget_get_parent(window->LogPathsTree)); + yon_ubl_status_list_store_highlight_incorrect(window->list,lastiter); yon_ubl_status_box_spawn(GTK_CONTAINER(window->StatusBox),REPEATED_PATHS_LABEL,5,BACKGROUND_IMAGE_FAIL_TYPE); return; } @@ -1797,7 +1799,7 @@ void on_log_save(GtkWidget *self, dictionary *dict){ } gtk_list_store_set(widgets->list,&iter,0,name,1,pathse,2,&desc ? desc : "",-1); } else { - yon_ubl_status_box_spawn(GTK_CONTAINER(window->StatusBox),EMPTY_IMPORTANT_LABEL,5,BACKGROUND_IMAGE_FAIL_TYPE); + yon_ubl_status_box_spawn(GTK_CONTAINER(window->StatusBox),WRITE_IMPORTANT_LABEL,5,BACKGROUND_IMAGE_FAIL_TYPE); yon_ubl_status_highlight_incorrect(window->NameEntry); return; } diff --git a/source/ubl-strings.h b/source/ubl-strings.h index 51f82b8..95126f1 100644 --- a/source/ubl-strings.h +++ b/source/ubl-strings.h @@ -178,6 +178,7 @@ #define REPEATED_PATHS_LABEL _("Same record already exists") #define EMPTY_IMPORTANT_LABEL _("Empty important field") #define REPEAT_PATHS_LABEL _("Repeating paths") +#define WRITE_IMPORTANT_LABEL _("Write down all important fields") //ubl-settings-logging-logrotate-table.glade #define SYSTEM_CONFIGURATION_LABEL _("System configuration") diff --git a/ubl-settings-logging-logrotate.glade b/ubl-settings-logging-logrotate.glade index 23fbfb5..c292f61 100644 --- a/ubl-settings-logging-logrotate.glade +++ b/ubl-settings-logging-logrotate.glade @@ -92,6 +92,10 @@ + + + + @@ -327,6 +331,8 @@ + 2 + 1 0 diff --git a/ubl-settings-logging.pot b/ubl-settings-logging.pot index 6f16734..689c007 100644 --- a/ubl-settings-logging.pot +++ b/ubl-settings-logging.pot @@ -703,59 +703,63 @@ msgstr "" msgid "Repeating paths" msgstr "" -#: source/ubl-strings.h:183 -msgid "System configuration" +#: source/ubl-strings.h:181 +msgid "Write down all important fields" msgstr "" #: source/ubl-strings.h:184 +msgid "System configuration" +msgstr "" + +#: source/ubl-strings.h:185 msgid "Applications configuration" msgstr "" -#: source/ubl-strings.h:187 +#: source/ubl-strings.h:188 msgid "Path (-s):" msgstr "" -#: source/ubl-strings.h:188 +#: source/ubl-strings.h:189 msgid "Control:" msgstr "" -#: source/ubl-strings.h:189 +#: source/ubl-strings.h:190 msgid "Log file" msgstr "" -#: source/ubl-strings.h:190 +#: source/ubl-strings.h:191 msgid "Name:" msgstr "" -#: source/ubl-strings.h:193 +#: source/ubl-strings.h:194 msgid "Owner rules" msgstr "" -#: source/ubl-strings.h:194 +#: source/ubl-strings.h:195 msgid "Group rules" msgstr "" -#: source/ubl-strings.h:195 +#: source/ubl-strings.h:196 msgid "Public rules" msgstr "" -#: source/ubl-strings.h:196 +#: source/ubl-strings.h:197 msgid "Read" msgstr "" -#: source/ubl-strings.h:197 +#: source/ubl-strings.h:198 msgid "Write" msgstr "" -#: source/ubl-strings.h:198 +#: source/ubl-strings.h:199 msgid "Execute" msgstr "" -#: source/ubl-strings.h:199 +#: source/ubl-strings.h:200 msgid "Value:" msgstr "" -#: source/ubl-strings.h:202 +#: source/ubl-strings.h:203 msgid ": no such file(s)" msgstr "" diff --git a/ubl-settings-logging_ru.po b/ubl-settings-logging_ru.po index b4a5675..908cb52 100644 --- a/ubl-settings-logging_ru.po +++ b/ubl-settings-logging_ru.po @@ -717,59 +717,64 @@ msgstr "Важное поле не заполнено" msgid "Repeating paths" msgstr "Повторяющиеся пути" -#: source/ubl-strings.h:183 +#: source/ubl-strings.h:181 +#, fuzzy +msgid "Write down all important fields" +msgstr "Введите все необходимые поля" + +#: source/ubl-strings.h:184 msgid "System configuration" msgstr "Настройки системы" -#: source/ubl-strings.h:184 +#: source/ubl-strings.h:185 msgid "Applications configuration" msgstr "Настройки приложений" -#: source/ubl-strings.h:187 +#: source/ubl-strings.h:188 msgid "Path (-s):" msgstr "Путь (-и):" -#: source/ubl-strings.h:188 +#: source/ubl-strings.h:189 msgid "Control:" msgstr "Управление:" -#: source/ubl-strings.h:189 +#: source/ubl-strings.h:190 msgid "Log file" msgstr "Файл лога" -#: source/ubl-strings.h:190 +#: source/ubl-strings.h:191 msgid "Name:" msgstr "Имя:" -#: source/ubl-strings.h:193 +#: source/ubl-strings.h:194 msgid "Owner rules" msgstr "Правила владельца" -#: source/ubl-strings.h:194 +#: source/ubl-strings.h:195 msgid "Group rules" msgstr "Правила группы" -#: source/ubl-strings.h:195 +#: source/ubl-strings.h:196 msgid "Public rules" msgstr "Правила остальных" -#: source/ubl-strings.h:196 +#: source/ubl-strings.h:197 msgid "Read" msgstr "Чтение" -#: source/ubl-strings.h:197 +#: source/ubl-strings.h:198 msgid "Write" msgstr "Запись" -#: source/ubl-strings.h:198 +#: source/ubl-strings.h:199 msgid "Execute" msgstr "Исполнение" -#: source/ubl-strings.h:199 +#: source/ubl-strings.h:200 msgid "Value:" msgstr "Значение:" -#: source/ubl-strings.h:202 +#: source/ubl-strings.h:203 msgid ": no such file(s)" msgstr ": файл(ы) не найден(ы)"