Applications
/
ubl-settings-repomanager
10
0
Fork 1
Code Issues 6 Pull Requests Packages Projects Releases Wiki Activity

Added new status messages

Browse Source
pull/41/head
Ivan Dmitrievich Yartsev 1 year ago
parent 31cd1069d3
commit 166f06f9b5
4 changed files with 111 additions and 84 deletions
Show Stats Download Patch File Download Diff File

16
source/ubl-settings-repomanager.c
Unescape View File

@ -25,12 +25,6 @@ void on_repo_removed(GtkWidget *self,storage_config_window *window){
} }
} }
yon_storage_config_update(window); yon_storage_config_update(window);
// gtk_combo_box_get_active_iter(GTK_COMBO_BOX(window->StoragePathCombo),&iter);
// gtk_tree_model_filter_convert_iter_to_child_iter(GTK_TREE_MODEL_FILTER(window->StorageFilter),&itar,&iter);
// if (yon_gtk_tree_store_find_full(GTK_TREE_MODEL(window->storages_copy),&itar,2,repo)){
// gtk_tree_store_remove(GTK_TREE_STORE(window->storages_copy),&itar);
// yon_storage_config_update(window);
// }
} }
void on_repo_sign_changed(GtkWidget *self, storage_config_window *window){ void on_repo_sign_changed(GtkWidget *self, storage_config_window *window){
@ -299,6 +293,7 @@ void on_storage_accept(GtkWidget *self, dictionary *dict){
yon_gtk_tree_store_copy_full(window->storages_copy,main_config.tree_store); yon_gtk_tree_store_copy_full(window->storages_copy,main_config.tree_store);
gtk_tree_view_set_model(GTK_TREE_VIEW(widgets->ReposTree),GTK_TREE_MODEL(main_config.tree_store)); gtk_tree_view_set_model(GTK_TREE_VIEW(widgets->ReposTree),GTK_TREE_MODEL(main_config.tree_store));
on_subwindow_close(self); on_subwindow_close(self);
yon_ubl_status_box_render(STORAGES_SAVED_LABEL,BACKGROUND_IMAGE_SUCCESS_TYPE);
} }
gboolean yon_storage_filter_func(GtkTreeModel *model, gboolean yon_storage_filter_func(GtkTreeModel *model,
@ -1223,14 +1218,19 @@ void on_key_generate_accept(GtkWidget *self, key_creation_window* window){
} }
const char *password = gtk_entry_get_text(GTK_ENTRY(window->PasswordEntry)); const char *password = gtk_entry_get_text(GTK_ENTRY(window->PasswordEntry));
const char *password_confirm = gtk_entry_get_text(GTK_ENTRY(window->PasswordConfirmationEntry)); const char *password_confirm = gtk_entry_get_text(GTK_ENTRY(window->PasswordConfirmationEntry));
int ex_status=0;
if (yon_char_is_empty(password)&&yon_char_is_empty(password_confirm)){ if (yon_char_is_empty(password)&&yon_char_is_empty(password_confirm)){
system(yon_generate_key_no_password_command(type,name,email,strength,comment,expire,password)); ex_status = system(yon_generate_key_no_password_command(type,name,email,strength,comment,expire,password));
} else if (!strcmp(password,password_confirm)){ } else if (!strcmp(password,password_confirm)){
system(yon_generate_key_command(type,name,email,strength,comment,expire,password)); ex_status = system(yon_generate_key_command(type,name,email,strength,comment,expire,password));
} else { } else {
yon_ubl_status_box_spawn(GTK_CONTAINER(window->StatusBox),PASSWORD_INCORRECT_LABEL,5,BACKGROUND_IMAGE_FAIL_TYPE); yon_ubl_status_box_spawn(GTK_CONTAINER(window->StatusBox),PASSWORD_INCORRECT_LABEL,5,BACKGROUND_IMAGE_FAIL_TYPE);
return; return;
} }
if (!ex_status)
yon_ubl_status_box_render(KEY_CREATION_SUCCESS_LABEL,BACKGROUND_IMAGE_SUCCESS_TYPE);
else
yon_ubl_status_box_render(KEY_CREATION_FAILURE_LABEL,BACKGROUND_IMAGE_SUCCESS_TYPE);
gtk_widget_destroy(window->Window); gtk_widget_destroy(window->Window);
yon_sign_list_update(); yon_sign_list_update();
} }

3
source/ubl-strings.h
Unescape View File

@ -82,6 +82,9 @@
#define PACKAGES_ADD_SUCCESS_LABEL _("Packages were added successfully") #define PACKAGES_ADD_SUCCESS_LABEL _("Packages were added successfully")
#define PACKAGES_REMOVE_SUCCESS_LABEL _("Packages were removed successfully") #define PACKAGES_REMOVE_SUCCESS_LABEL _("Packages were removed successfully")
#define PACKAGES_MOVE_SUCCESS_LABEL _("Packages were moved successfully") #define PACKAGES_MOVE_SUCCESS_LABEL _("Packages were moved successfully")
#define STORAGES_SAVED_LABEL _("Storages were saved")
#define KEY_CREATION_SUCCESS_LABEL _("Key was successfully created")
#define KEY_CREATION_FAILURE_LABEL _("Key creation failed")
#define CHOOSE_LABEL _("Choose") #define CHOOSE_LABEL _("Choose")
#define CANCEL_LABEL _("Cancel") #define CANCEL_LABEL _("Cancel")

88
ubl-settings-repomanager.pot
Unescape View File

@ -267,11 +267,11 @@ msgstr ""
msgid "Path" msgid "Path"
msgstr "" msgstr ""
#: source/ubl-strings.h:77 source/ubl-strings.h:98 #: source/ubl-strings.h:77 source/ubl-strings.h:101
msgid "Remove package" msgid "Remove package"
msgstr "" msgstr ""
#: source/ubl-strings.h:78 source/ubl-strings.h:97 #: source/ubl-strings.h:78 source/ubl-strings.h:100
msgid "Add package" msgid "Add package"
msgstr "" msgstr ""
@ -295,152 +295,164 @@ msgstr ""
msgid "Packages were moved successfully" msgid "Packages were moved successfully"
msgstr "" msgstr ""
#: source/ubl-strings.h:85
msgid "Storages were saved"
msgstr ""
#: source/ubl-strings.h:86 #: source/ubl-strings.h:86
msgid "Choose" msgid "Key was successfully created"
msgstr "" msgstr ""
#: source/ubl-strings.h:87 #: source/ubl-strings.h:87
msgid "Cancel" msgid "Key creation failed"
msgstr "" msgstr ""
#: source/ubl-strings.h:89 #: source/ubl-strings.h:89
msgid "Open or create repository" msgid "Choose"
msgstr "" msgstr ""
#: source/ubl-strings.h:90 #: source/ubl-strings.h:90
msgid "Cancel"
msgstr ""
#: source/ubl-strings.h:92
msgid "Open or create repository"
msgstr ""
#: source/ubl-strings.h:93
msgid "Open existing repository" msgid "Open existing repository"
msgstr "" msgstr ""
#: source/ubl-strings.h:91 #: source/ubl-strings.h:94
msgid "Configure repository" msgid "Configure repository"
msgstr "" msgstr ""
#: source/ubl-strings.h:92 #: source/ubl-strings.h:95
msgid "Delete repository" msgid "Delete repository"
msgstr "" msgstr ""
#: source/ubl-strings.h:93 #: source/ubl-strings.h:96
msgid "" msgid ""
"Add/Remove repository from\n" "Add/Remove repository from\n"
"local package sources" "local package sources"
msgstr "" msgstr ""
#: source/ubl-strings.h:94 #: source/ubl-strings.h:97
msgid "Enable/disable repository publish" msgid "Enable/disable repository publish"
msgstr "" msgstr ""
#: source/ubl-strings.h:95 #: source/ubl-strings.h:98
msgid "Check dependences" msgid "Check dependences"
msgstr "" msgstr ""
#: source/ubl-strings.h:96 #: source/ubl-strings.h:99
msgid "Sign ripository" msgid "Sign ripository"
msgstr "" msgstr ""
#: source/ubl-strings.h:99 #: source/ubl-strings.h:102
msgid "Open" msgid "Open"
msgstr "" msgstr ""
#: source/ubl-strings.h:101 #: source/ubl-strings.h:104
msgid "Operation done" msgid "Operation done"
msgstr "" msgstr ""
#: source/ubl-strings.h:103 #: source/ubl-strings.h:106
msgid "Choose branch or pack in branch to add file!" msgid "Choose branch or pack in branch to add file!"
msgstr "" msgstr ""
#: source/ubl-strings.h:104 #: source/ubl-strings.h:107
msgid "Choose repository or branch!" msgid "Choose repository or branch!"
msgstr "" msgstr ""
#: source/ubl-strings.h:105 #: source/ubl-strings.h:108
msgid "Choose pack to delete!" msgid "Choose pack to delete!"
msgstr "" msgstr ""
#: source/ubl-strings.h:106 #: source/ubl-strings.h:109
msgid "Choose repository to delete!" msgid "Choose repository to delete!"
msgstr "" msgstr ""
#: source/ubl-strings.h:107 #: source/ubl-strings.h:110
msgid "Choose repository or package to sign" msgid "Choose repository or package to sign"
msgstr "" msgstr ""
#: source/ubl-strings.h:109 #: source/ubl-strings.h:112
msgid "Name:" msgid "Name:"
msgstr "" msgstr ""
#: source/ubl-strings.h:110 #: source/ubl-strings.h:113
msgid "Branches:" msgid "Branches:"
msgstr "" msgstr ""
#: source/ubl-strings.h:111 #: source/ubl-strings.h:114
msgid "< Type branch name >" msgid "< Type branch name >"
msgstr "" msgstr ""
#: source/ubl-strings.h:112 #: source/ubl-strings.h:115
msgid "Name must be filled!" msgid "Name must be filled!"
msgstr "" msgstr ""
#: source/ubl-strings.h:113 #: source/ubl-strings.h:116
msgid "Choose path for new repository" msgid "Choose path for new repository"
msgstr "" msgstr ""
#: source/ubl-strings.h:115 #: source/ubl-strings.h:118
msgid "Choose repository folder" msgid "Choose repository folder"
msgstr "" msgstr ""
#: source/ubl-strings.h:116 #: source/ubl-strings.h:119
msgid "Choose repository" msgid "Choose repository"
msgstr "" msgstr ""
#: source/ubl-strings.h:118 #: source/ubl-strings.h:121
msgid "Absent" msgid "Absent"
msgstr "" msgstr ""
#: source/ubl-strings.h:119 #: source/ubl-strings.h:122
msgid "Dependences:" msgid "Dependences:"
msgstr "" msgstr ""
#: source/ubl-strings.h:120 #: source/ubl-strings.h:123
msgid "Digital signature" msgid "Digital signature"
msgstr "" msgstr ""
#: source/ubl-strings.h:122 #: source/ubl-strings.h:125
msgid "package" msgid "package"
msgstr "" msgstr ""
#: source/ubl-strings.h:123 #: source/ubl-strings.h:126
msgid "repository" msgid "repository"
msgstr "" msgstr ""
#: source/ubl-strings.h:124 #: source/ubl-strings.h:127
msgid "This package already exists in that repository" msgid "This package already exists in that repository"
msgstr "" msgstr ""
#: source/ubl-strings.h:125 #: source/ubl-strings.h:128
msgid "This repository has already been added" msgid "This repository has already been added"
msgstr "" msgstr ""
#: source/ubl-strings.h:127 #: source/ubl-strings.h:130
msgid "Close" msgid "Close"
msgstr "" msgstr ""
#: source/ubl-strings.h:129 #: source/ubl-strings.h:132
msgid "Are you sure want to disable?" msgid "Are you sure want to disable?"
msgstr "" msgstr ""
#: source/ubl-strings.h:131 #: source/ubl-strings.h:134
msgid "Are you sure want to remove?" msgid "Are you sure want to remove?"
msgstr "" msgstr ""
#: source/ubl-strings.h:133 #: source/ubl-strings.h:136
msgid "Do not sign" msgid "Do not sign"
msgstr "" msgstr ""
#: source/ubl-strings.h:135 #: source/ubl-strings.h:138
msgid "Package name error - package has incorrect name pattern" msgid "Package name error - package has incorrect name pattern"
msgstr "" msgstr ""
#: source/ubl-strings.h:137 #: source/ubl-strings.h:140
msgid "Passwords do not match" msgid "Passwords do not match"
msgstr "" msgstr ""

88
ubl-settings-repomanager_ru.po
Unescape View File

@ -269,11 +269,11 @@ msgstr "Имя"
msgid "Path" msgid "Path"
msgstr "Путь" msgstr "Путь"
#: source/ubl-strings.h:77 source/ubl-strings.h:98 #: source/ubl-strings.h:77 source/ubl-strings.h:101
msgid "Remove package" msgid "Remove package"
msgstr "Удалить пакет" msgstr "Удалить пакет"
#: source/ubl-strings.h:78 source/ubl-strings.h:97 #: source/ubl-strings.h:78 source/ubl-strings.h:100
msgid "Add package" msgid "Add package"
msgstr "Добавить пакет" msgstr "Добавить пакет"
@ -297,31 +297,43 @@ msgstr "Пакеты успешно удалены"
msgid "Packages were moved successfully" msgid "Packages were moved successfully"
msgstr "Пакеты успешно перемещены" msgstr "Пакеты успешно перемещены"
#: source/ubl-strings.h:85
msgid "Storages were saved"
msgstr "Сохранено"
#: source/ubl-strings.h:86 #: source/ubl-strings.h:86
msgid "Key was successfully created"
msgstr "Ключ был успешно создан"
#: source/ubl-strings.h:87
msgid "Key creation failed"
msgstr "Ошибка создания ключа"
#: source/ubl-strings.h:89
msgid "Choose" msgid "Choose"
msgstr "Выбрать" msgstr "Выбрать"
#: source/ubl-strings.h:87 #: source/ubl-strings.h:90
msgid "Cancel" msgid "Cancel"
msgstr "Отмена" msgstr "Отмена"
#: source/ubl-strings.h:89 #: source/ubl-strings.h:92
msgid "Open or create repository" msgid "Open or create repository"
msgstr "Открыть или создать репозиторий" msgstr "Открыть или создать репозиторий"
#: source/ubl-strings.h:90 #: source/ubl-strings.h:93
msgid "Open existing repository" msgid "Open existing repository"
msgstr "Открыть и добавить репозиторий" msgstr "Открыть и добавить репозиторий"
#: source/ubl-strings.h:91 #: source/ubl-strings.h:94
msgid "Configure repository" msgid "Configure repository"
msgstr "Редактировать репозиторий" msgstr "Редактировать репозиторий"
#: source/ubl-strings.h:92 #: source/ubl-strings.h:95
msgid "Delete repository" msgid "Delete repository"
msgstr "Удалить репозиторий" msgstr "Удалить репозиторий"
#: source/ubl-strings.h:93 #: source/ubl-strings.h:96
msgid "" msgid ""
"Add/Remove repository from\n" "Add/Remove repository from\n"
"local package sources" "local package sources"
@ -329,107 +341,107 @@ msgstr ""
"Добавить/удалить репу из\n" "Добавить/удалить репу из\n"
" локальных источников пакетов" " локальных источников пакетов"
#: source/ubl-strings.h:94 #: source/ubl-strings.h:97
msgid "Enable/disable repository publish" msgid "Enable/disable repository publish"
msgstr "Включить/отключить публикацию" msgstr "Включить/отключить публикацию"
#: source/ubl-strings.h:95 #: source/ubl-strings.h:98
msgid "Check dependences" msgid "Check dependences"
msgstr "Проверить на битые зависимости" msgstr "Проверить на битые зависимости"
#: source/ubl-strings.h:96 #: source/ubl-strings.h:99
msgid "Sign ripository" msgid "Sign ripository"
msgstr "Подпись пакетов" msgstr "Подпись пакетов"
#: source/ubl-strings.h:99 #: source/ubl-strings.h:102
msgid "Open" msgid "Open"
msgstr "Открыть" msgstr "Открыть"
#: source/ubl-strings.h:101 #: source/ubl-strings.h:104
msgid "Operation done" msgid "Operation done"
msgstr "Операция завершена" msgstr "Операция завершена"
#: source/ubl-strings.h:103 #: source/ubl-strings.h:106
msgid "Choose branch or pack in branch to add file!" msgid "Choose branch or pack in branch to add file!"
msgstr "Выберите ветку чтобы добавить пакет!" msgstr "Выберите ветку чтобы добавить пакет!"
#: source/ubl-strings.h:104 #: source/ubl-strings.h:107
msgid "Choose repository or branch!" msgid "Choose repository or branch!"
msgstr "Выберите репозиторий!" msgstr "Выберите репозиторий!"
#: source/ubl-strings.h:105 #: source/ubl-strings.h:108
msgid "Choose pack to delete!" msgid "Choose pack to delete!"
msgstr "Выберите пакет для удаления!" msgstr "Выберите пакет для удаления!"
#: source/ubl-strings.h:106 #: source/ubl-strings.h:109
msgid "Choose repository to delete!" msgid "Choose repository to delete!"
msgstr "Выберите репозиторий для удаления!" msgstr "Выберите репозиторий для удаления!"
#: source/ubl-strings.h:107 #: source/ubl-strings.h:110
msgid "Choose repository or package to sign" msgid "Choose repository or package to sign"
msgstr "Выберите репозиторий или пакет для подписи" msgstr "Выберите репозиторий или пакет для подписи"
#: source/ubl-strings.h:109 #: source/ubl-strings.h:112
msgid "Name:" msgid "Name:"
msgstr "Название:" msgstr "Название:"
#: source/ubl-strings.h:110 #: source/ubl-strings.h:113
msgid "Branches:" msgid "Branches:"
msgstr "Ветки:" msgstr "Ветки:"
#: source/ubl-strings.h:111 #: source/ubl-strings.h:114
msgid "< Type branch name >" msgid "< Type branch name >"
msgstr "< Введите название ветки >" msgstr "< Введите название ветки >"
#: source/ubl-strings.h:112 #: source/ubl-strings.h:115
msgid "Name must be filled!" msgid "Name must be filled!"
msgstr "Введите название!" msgstr "Введите название!"
#: source/ubl-strings.h:113 #: source/ubl-strings.h:116
msgid "Choose path for new repository" msgid "Choose path for new repository"
msgstr "Выбрать расположение нового репозитория" msgstr "Выбрать расположение нового репозитория"
#: source/ubl-strings.h:115 #: source/ubl-strings.h:118
msgid "Choose repository folder" msgid "Choose repository folder"
msgstr "Выбрать директорию для репозитория" msgstr "Выбрать директорию для репозитория"
#: source/ubl-strings.h:116 #: source/ubl-strings.h:119
msgid "Choose repository" msgid "Choose repository"
msgstr "Выбрать репозиторий" msgstr "Выбрать репозиторий"
#: source/ubl-strings.h:118 #: source/ubl-strings.h:121
msgid "Absent" msgid "Absent"
msgstr "Отсутствует" msgstr "Отсутствует"
#: source/ubl-strings.h:119 #: source/ubl-strings.h:122
msgid "Dependences:" msgid "Dependences:"
msgstr "Зависит от:" msgstr "Зависит от:"
#: source/ubl-strings.h:120 #: source/ubl-strings.h:123
msgid "Digital signature" msgid "Digital signature"
msgstr "Цифровая подпись" msgstr "Цифровая подпись"
#: source/ubl-strings.h:122 #: source/ubl-strings.h:125
msgid "package" msgid "package"
msgstr "пакет" msgstr "пакет"
#: source/ubl-strings.h:123 #: source/ubl-strings.h:126
msgid "repository" msgid "repository"
msgstr "репозиторий" msgstr "репозиторий"
#: source/ubl-strings.h:124 #: source/ubl-strings.h:127
msgid "This package already exists in that repository" msgid "This package already exists in that repository"
msgstr "Этот пакет уже присутствует в выбранном репозитории" msgstr "Этот пакет уже присутствует в выбранном репозитории"
#: source/ubl-strings.h:125 #: source/ubl-strings.h:128
msgid "This repository has already been added" msgid "This repository has already been added"
msgstr "Этот репозиторий уже был добавлен" msgstr "Этот репозиторий уже был добавлен"
#: source/ubl-strings.h:127 #: source/ubl-strings.h:130
msgid "Close" msgid "Close"
msgstr "Закрыть" msgstr "Закрыть"
#: source/ubl-strings.h:129 #: source/ubl-strings.h:132
msgid "Are you sure want to disable?" msgid "Are you sure want to disable?"
msgstr "" msgstr ""
"Внимание! Вы хотите отключить хранилище от управления менеджером " "Внимание! Вы хотите отключить хранилище от управления менеджером "
@ -439,20 +451,20 @@ msgstr ""
"Примечание: в дальнейшем Вы можете заново подключить хранилище и управлять " "Примечание: в дальнейшем Вы можете заново подключить хранилище и управлять "
"им." "им."
#: source/ubl-strings.h:131 #: source/ubl-strings.h:134
msgid "Are you sure want to remove?" msgid "Are you sure want to remove?"
msgstr "" msgstr ""
"Внимание! Вы ходите удалить хранилище При этом хранилище и вложенные " "Внимание! Вы ходите удалить хранилище При этом хранилище и вложенные "
"репозитории будут безвозвратно удалены!" "репозитории будут безвозвратно удалены!"
#: source/ubl-strings.h:133 #: source/ubl-strings.h:136
msgid "Do not sign" msgid "Do not sign"
msgstr "Не подписывать" msgstr "Не подписывать"
#: source/ubl-strings.h:135 #: source/ubl-strings.h:138
msgid "Package name error - package has incorrect name pattern" msgid "Package name error - package has incorrect name pattern"
msgstr "Ошибка имени пакета - некорректное имя пакета" msgstr "Ошибка имени пакета - некорректное имя пакета"
#: source/ubl-strings.h:137 #: source/ubl-strings.h:140
msgid "Passwords do not match" msgid "Passwords do not match"
msgstr "Пароли не совпадают" msgstr "Пароли не совпадают"

Write Preview
Loading…
Cancel
Save