Applications
/
ubl-settings-bootloader
10
0
Fork 2
Code Issues 3 Pull Requests Packages Projects Releases Wiki Activity

Localisation changes; Added default item at OS menu

Browse Source
pull/83/head
Ivan Dmitrievich Yartsev 8 months ago
parent 08c81072d5
commit ef03544061
5 changed files with 128 additions and 93 deletions
Show Stats Download Patch File Download Diff File

19
source/ubl-settings-bootloader-menu.c
Unescape View File

@ -3,7 +3,11 @@
void on_menu_chosen(GtkWidget *, yon_menu_item *item){ void on_menu_chosen(GtkWidget *, yon_menu_item *item){
gtk_entry_set_text(GTK_ENTRY(item->widgets->OSDefaultEntry),item->target); if (strcmp(item->target,DEFAULT_MENU_ITEM_LABEL)){
gtk_entry_set_text(GTK_ENTRY(item->widgets->OSDefaultEntry),item->target);
} else {
gtk_entry_set_text(GTK_ENTRY(item->widgets->OSDefaultEntry),DEFAULT_MENU_ITEM_LABEL);
}
GdkDisplay *display = gdk_display_get_default(); GdkDisplay *display = gdk_display_get_default();
GdkSeat *seat = gdk_display_get_default_seat(display); GdkSeat *seat = gdk_display_get_default_seat(display);
if (item->window->seat_grab) if (item->window->seat_grab)
@ -37,6 +41,19 @@ void on_submenu_open(GtkWidget *,yon_menu_item *item){
yon_menu_window *yon_menu_window_open(GtkWidget *, main_window *widgets){ yon_menu_window *yon_menu_window_open(GtkWidget *, main_window *widgets){
yon_menu_window *window = yon_menu_window_new(); yon_menu_window *window = yon_menu_window_new();
gtk_window_set_transient_for(GTK_WINDOW(window->MenuWindow),GTK_WINDOW(widgets->Window)); gtk_window_set_transient_for(GTK_WINDOW(window->MenuWindow),GTK_WINDOW(widgets->Window));
{
yon_menu_item *item = yon_menu_item_new();
item->widgets=widgets;
item->window=window;
item->children=NULL;
gtk_label_set_text(GTK_LABEL(item->MenuTextLabel),DEFAULT_MENU_ITEM_LABEL);
item->target=yon_char_new(DEFAULT_MENU_ITEM_LABEL);
gtk_list_box_insert(GTK_LIST_BOX(window->ItemsListBox),item->MenuItemBox,-1);
yon_dictionary_add_or_create_if_exists_with_data(window->menu_items,DEFAULT_MENU_ITEM_LABEL,item);
gtk_widget_show(item->MenuItemBox);
gtk_widget_hide(item->NextIconButton);
g_signal_connect(G_OBJECT(item->MenuButton),"clicked",G_CALLBACK(on_menu_chosen),item);
}
int size; int size;
config_str parsed = yon_config_load(get_menus_entry_command,&size); config_str parsed = yon_config_load(get_menus_entry_command,&size);
for (int i=0;i<size;i++){ for (int i=0;i<size;i++){

2
source/ubl-settings-bootloader.c
Unescape View File

@ -425,7 +425,7 @@ void on_parameter_changed(GtkWidget *self,main_window *widgets){
} }
} else if (self == widgets->OSDefaultEntry){ } else if (self == widgets->OSDefaultEntry){
char *os = (char*)gtk_entry_get_text(GTK_ENTRY(widgets->OSDefaultEntry)); char *os = (char*)gtk_entry_get_text(GTK_ENTRY(widgets->OSDefaultEntry));
if (!yon_char_is_empty(os)){ if (!yon_char_is_empty(os)&&strcmp(os,DEFAULT_MENU_ITEM_LABEL)){
yon_config_register(GRUB_DEFAULT_parameter,GRUB_DEFAULT_command,os); yon_config_register(GRUB_DEFAULT_parameter,GRUB_DEFAULT_command,os);
} else { } else {
yon_config_remove_by_key(GRUB_DEFAULT_parameter); yon_config_remove_by_key(GRUB_DEFAULT_parameter);

2
source/ubl-strings.h
Unescape View File

@ -5,6 +5,7 @@
#define BOOT_MENU_LABEL _("Boot menu") #define BOOT_MENU_LABEL _("Boot menu")
#define BOOT_SELECTION_LABEL _("Boot selection menu timer:") #define BOOT_SELECTION_LABEL _("Boot selection menu timer:")
#define SECONDS_LABEL _("seconds") #define SECONDS_LABEL _("seconds")
#define DEFAULT_LABEL _("Default")
#define DEFAULT_OS_LABEL _("Default OS:") #define DEFAULT_OS_LABEL _("Default OS:")
#define LOAD_DISPLAY_MODE_LABEL _("Load screen display mode:") #define LOAD_DISPLAY_MODE_LABEL _("Load screen display mode:")
#define BOOT_USERS_LABEL _("Boot Menu Users") #define BOOT_USERS_LABEL _("Boot Menu Users")
@ -34,6 +35,7 @@
#define NO_BOOT_LOG_LABEL _("No boot animation with log") #define NO_BOOT_LOG_LABEL _("No boot animation with log")
#define NO_BOOT_NO_LOG_LABEL _("No boot animation with shortened log") #define NO_BOOT_NO_LOG_LABEL _("No boot animation with shortened log")
#define BACK_LABEL _("Back") #define BACK_LABEL _("Back")
#define DEFAULT_MENU_ITEM_LABEL _("Default (Use last succeeded)")
#define PASSWORD_TITLE_LABEL _("Password input") #define PASSWORD_TITLE_LABEL _("Password input")
#define PASSWORD_REPEAT_LABEL _("Repeat password:") #define PASSWORD_REPEAT_LABEL _("Repeat password:")

100
ubl-settings-bootloader.pot
Unescape View File

@ -38,189 +38,197 @@ msgid "seconds"
msgstr "" msgstr ""
#: source/ubl-strings.h:8 #: source/ubl-strings.h:8
msgid "Default OS:" msgid "Default"
msgstr "" msgstr ""
#: source/ubl-strings.h:9 #: source/ubl-strings.h:9
msgid "Load screen display mode:" msgid "Default OS:"
msgstr "" msgstr ""
#: source/ubl-strings.h:10 #: source/ubl-strings.h:10
msgid "Boot Menu Users" msgid "Load screen display mode:"
msgstr "" msgstr ""
#: source/ubl-strings.h:11 #: source/ubl-strings.h:11
msgid "Startup ringtone" msgid "Boot Menu Users"
msgstr "" msgstr ""
#: source/ubl-strings.h:12 #: source/ubl-strings.h:12
msgid "Parameters passed to the kernel" msgid "Startup ringtone"
msgstr "" msgstr ""
#: source/ubl-strings.h:13 #: source/ubl-strings.h:13
msgid "Command line parameters:" msgid "Parameters passed to the kernel"
msgstr "" msgstr ""
#: source/ubl-strings.h:14 #: source/ubl-strings.h:14
msgid "Input terminal" msgid "Command line parameters:"
msgstr "" msgstr ""
#: source/ubl-strings.h:15 #: source/ubl-strings.h:15
msgid "Input terminal"
msgstr ""
#: source/ubl-strings.h:16
msgid "Output terminal" msgid "Output terminal"
msgstr "" msgstr ""
#: source/ubl-strings.h:17 source/ubl-strings.h:53 #: source/ubl-strings.h:18 source/ubl-strings.h:55
msgid "Administrator" msgid "Administrator"
msgstr "" msgstr ""
#: source/ubl-strings.h:18 #: source/ubl-strings.h:19
msgid "Name" msgid "Name"
msgstr "" msgstr ""
#: source/ubl-strings.h:19 #: source/ubl-strings.h:20
msgid "User" msgid "User"
msgstr "" msgstr ""
#: source/ubl-strings.h:20 #: source/ubl-strings.h:21
msgid "Password" msgid "Password"
msgstr "" msgstr ""
#: source/ubl-strings.h:21 #: source/ubl-strings.h:22
msgid "Melody code" msgid "Melody code"
msgstr "" msgstr ""
#: source/ubl-strings.h:22 #: source/ubl-strings.h:23
msgid "Option" msgid "Option"
msgstr "" msgstr ""
#: source/ubl-strings.h:23 #: source/ubl-strings.h:24
msgid "Description" msgid "Description"
msgstr "" msgstr ""
#: source/ubl-strings.h:25 #: source/ubl-strings.h:26
msgid "Add" msgid "Add"
msgstr "" msgstr ""
#: source/ubl-strings.h:26 #: source/ubl-strings.h:27
msgid "Edit" msgid "Edit"
msgstr "" msgstr ""
#: source/ubl-strings.h:27 #: source/ubl-strings.h:28
msgid "Remove" msgid "Remove"
msgstr "" msgstr ""
#: source/ubl-strings.h:29 #: source/ubl-strings.h:30
msgid "Accept" msgid "Accept"
msgstr "" msgstr ""
#: source/ubl-strings.h:30 #: source/ubl-strings.h:31
msgid "Cancel" msgid "Cancel"
msgstr "" msgstr ""
#: source/ubl-strings.h:32 #: source/ubl-strings.h:33
msgid "Boot animation with log" msgid "Boot animation with log"
msgstr "" msgstr ""
#: source/ubl-strings.h:33 #: source/ubl-strings.h:34
msgid "Boot animation without log" msgid "Boot animation without log"
msgstr "" msgstr ""
#: source/ubl-strings.h:34 #: source/ubl-strings.h:35
msgid "No boot animation with log" msgid "No boot animation with log"
msgstr "" msgstr ""
#: source/ubl-strings.h:35 #: source/ubl-strings.h:36
msgid "No boot animation without log" msgid "No boot animation with shortened log"
msgstr "" msgstr ""
#: source/ubl-strings.h:36 #: source/ubl-strings.h:37
msgid "Back" msgid "Back"
msgstr "" msgstr ""
#: source/ubl-strings.h:38 #: source/ubl-strings.h:38
msgid "Default (Use last succeeded)"
msgstr ""
#: source/ubl-strings.h:40
msgid "Password input" msgid "Password input"
msgstr "" msgstr ""
#: source/ubl-strings.h:39 source/ubl-strings.h:46 #: source/ubl-strings.h:41 source/ubl-strings.h:48
msgid "Repeat password:" msgid "Repeat password:"
msgstr "" msgstr ""
#: source/ubl-strings.h:40 source/ubl-strings.h:48 #: source/ubl-strings.h:42 source/ubl-strings.h:50
msgid "Password hash:" msgid "Password hash:"
msgstr "" msgstr ""
#: source/ubl-strings.h:41 source/ubl-strings.h:47 #: source/ubl-strings.h:43 source/ubl-strings.h:49
msgid "Do not encrypt password" msgid "Do not encrypt password"
msgstr "" msgstr ""
#: source/ubl-strings.h:42 #: source/ubl-strings.h:44
msgid "Password contain special symbols" msgid "Password contain special symbols"
msgstr "" msgstr ""
#: source/ubl-strings.h:43 #: source/ubl-strings.h:45
msgid "Empty important field" msgid "Empty important field"
msgstr "" msgstr ""
#: source/ubl-strings.h:44 #: source/ubl-strings.h:46
msgid "Password mismatch" msgid "Password mismatch"
msgstr "" msgstr ""
#: source/ubl-strings.h:45 #: source/ubl-strings.h:47
msgid "Password:" msgid "Password:"
msgstr "" msgstr ""
#: source/ubl-strings.h:49 #: source/ubl-strings.h:51
msgid "Password must be at least" msgid "Password must be at least"
msgstr "" msgstr ""
#: source/ubl-strings.h:49 #: source/ubl-strings.h:51
msgid "characters" msgid "characters"
msgstr "" msgstr ""
#: source/ubl-strings.h:51 #: source/ubl-strings.h:53
msgid "Add user" msgid "Add user"
msgstr "" msgstr ""
#: source/ubl-strings.h:52 #: source/ubl-strings.h:54
msgid "Edit user" msgid "Edit user"
msgstr "" msgstr ""
#: source/ubl-strings.h:54 #: source/ubl-strings.h:56
msgid "User name:" msgid "User name:"
msgstr "" msgstr ""
#: source/ubl-strings.h:55 #: source/ubl-strings.h:57
msgid "User password:" msgid "User password:"
msgstr "" msgstr ""
#: source/ubl-strings.h:56 #: source/ubl-strings.h:58
msgid "Are you sure you want to remove user" msgid "Are you sure you want to remove user"
msgstr "" msgstr ""
#: source/ubl-strings.h:56 #: source/ubl-strings.h:58
msgid "from boot menu users" msgid "from boot menu users"
msgstr "" msgstr ""
#: source/ubl-strings.h:58 #: source/ubl-strings.h:60
msgid "Add ringtone" msgid "Add ringtone"
msgstr "" msgstr ""
#: source/ubl-strings.h:59 #: source/ubl-strings.h:61
msgid "Edit ringtone" msgid "Edit ringtone"
msgstr "" msgstr ""
#: source/ubl-strings.h:60 #: source/ubl-strings.h:62
msgid "Chosen" msgid "Chosen"
msgstr "" msgstr ""
#: source/ubl-strings.h:61 #: source/ubl-strings.h:63
msgid "Name:" msgid "Name:"
msgstr "" msgstr ""
#: source/ubl-strings.h:62 #: source/ubl-strings.h:64
msgid "Melody code:" msgid "Melody code:"
msgstr "" msgstr ""
#: source/ubl-strings.h:63 #: source/ubl-strings.h:65
msgid "Are you sure you want to remove ringtone" msgid "Are you sure you want to remove ringtone"
msgstr "" msgstr ""

98
ubl-settings-bootloader_ru.po
Unescape View File

@ -38,190 +38,198 @@ msgid "seconds"
msgstr "секунд" msgstr "секунд"
#: source/ubl-strings.h:8 #: source/ubl-strings.h:8
msgid "Default"
msgstr "По умлочанию"
#: source/ubl-strings.h:9
msgid "Default OS:" msgid "Default OS:"
msgstr "Загрузка по умлочанию:" msgstr "Загрузка по умлочанию:"
#: source/ubl-strings.h:9 #: source/ubl-strings.h:10
msgid "Load screen display mode:" msgid "Load screen display mode:"
msgstr "Режим отображения экрана загрузки:" msgstr "Режим отображения экрана загрузки:"
#: source/ubl-strings.h:10 #: source/ubl-strings.h:11
msgid "Boot Menu Users" msgid "Boot Menu Users"
msgstr "Пользователи меню загрузчика" msgstr "Пользователи меню загрузчика"
#: source/ubl-strings.h:11 #: source/ubl-strings.h:12
msgid "Startup ringtone" msgid "Startup ringtone"
msgstr "Мелодия при запуске" msgstr "Мелодия при запуске"
#: source/ubl-strings.h:12 #: source/ubl-strings.h:13
msgid "Parameters passed to the kernel" msgid "Parameters passed to the kernel"
msgstr "Параметры, передаваемые ядру" msgstr "Параметры, передаваемые ядру"
#: source/ubl-strings.h:13 #: source/ubl-strings.h:14
msgid "Command line parameters:" msgid "Command line parameters:"
msgstr "Параметры командной строки:" msgstr "Параметры командной строки:"
#: source/ubl-strings.h:14 #: source/ubl-strings.h:15
msgid "Input terminal" msgid "Input terminal"
msgstr "Терминал для ввода" msgstr "Терминал для ввода"
#: source/ubl-strings.h:15 #: source/ubl-strings.h:16
msgid "Output terminal" msgid "Output terminal"
msgstr "Терминал для вывода" msgstr "Терминал для вывода"
#: source/ubl-strings.h:17 source/ubl-strings.h:53 #: source/ubl-strings.h:18 source/ubl-strings.h:55
msgid "Administrator" msgid "Administrator"
msgstr "Администратор" msgstr "Администратор"
#: source/ubl-strings.h:18 #: source/ubl-strings.h:19
msgid "Name" msgid "Name"
msgstr "Название" msgstr "Название"
#: source/ubl-strings.h:19 #: source/ubl-strings.h:20
msgid "User" msgid "User"
msgstr "Пользователь" msgstr "Пользователь"
#: source/ubl-strings.h:20 #: source/ubl-strings.h:21
msgid "Password" msgid "Password"
msgstr "Пароль" msgstr "Пароль"
#: source/ubl-strings.h:21 #: source/ubl-strings.h:22
msgid "Melody code" msgid "Melody code"
msgstr "Код мелодии" msgstr "Код мелодии"
#: source/ubl-strings.h:22 #: source/ubl-strings.h:23
msgid "Option" msgid "Option"
msgstr "Опция" msgstr "Опция"
#: source/ubl-strings.h:23 #: source/ubl-strings.h:24
msgid "Description" msgid "Description"
msgstr "Описание" msgstr "Описание"
#: source/ubl-strings.h:25 #: source/ubl-strings.h:26
msgid "Add" msgid "Add"
msgstr "Добавить" msgstr "Добавить"
#: source/ubl-strings.h:26 #: source/ubl-strings.h:27
msgid "Edit" msgid "Edit"
msgstr "Редактировать" msgstr "Редактировать"
#: source/ubl-strings.h:27 #: source/ubl-strings.h:28
msgid "Remove" msgid "Remove"
msgstr "Удалить" msgstr "Удалить"
#: source/ubl-strings.h:29 #: source/ubl-strings.h:30
msgid "Accept" msgid "Accept"
msgstr "Принять" msgstr "Принять"
#: source/ubl-strings.h:30 #: source/ubl-strings.h:31
msgid "Cancel" msgid "Cancel"
msgstr "Отменить" msgstr "Отменить"
#: source/ubl-strings.h:32 #: source/ubl-strings.h:33
msgid "Boot animation with log" msgid "Boot animation with log"
msgstr "Анимация загрузки с журналом" msgstr "Анимация загрузки с журналом"
#: source/ubl-strings.h:33 #: source/ubl-strings.h:34
msgid "Boot animation without log" msgid "Boot animation without log"
msgstr "Анимация загрузки без журнала" msgstr "Анимация загрузки без журнала"
#: source/ubl-strings.h:34 #: source/ubl-strings.h:35
msgid "No boot animation with log" msgid "No boot animation with log"
msgstr "Отсутствие анимации загрузки с выводом журнала" msgstr "Отсутствие анимации загрузки с выводом журнала"
#: source/ubl-strings.h:35 #: source/ubl-strings.h:36
msgid "No boot animation with shortened log" msgid "No boot animation with shortened log"
msgstr "Отсутствие анимации загрузки б выводом сокращённого журнала" msgstr "Отсутствие анимации загрузки б выводом сокращённого журнала"
#: source/ubl-strings.h:36 #: source/ubl-strings.h:37
msgid "Back" msgid "Back"
msgstr "Назад" msgstr "Назад"
#: source/ubl-strings.h:38 #: source/ubl-strings.h:38
msgid "Default (Use last succeeded)"
msgstr "По умолчанию (Последняя удачная загрузка)"
#: source/ubl-strings.h:40
msgid "Password input" msgid "Password input"
msgstr "Ввод пароля" msgstr "Ввод пароля"
#: source/ubl-strings.h:39 source/ubl-strings.h:46 #: source/ubl-strings.h:41 source/ubl-strings.h:48
msgid "Repeat password:" msgid "Repeat password:"
msgstr "Подтвердите ввод пароля:" msgstr "Подтвердите ввод пароля:"
#: source/ubl-strings.h:40 source/ubl-strings.h:48 #: source/ubl-strings.h:42 source/ubl-strings.h:50
msgid "Password hash:" msgid "Password hash:"
msgstr "Хэш пароля" msgstr "Хэш пароля"
#: source/ubl-strings.h:41 source/ubl-strings.h:47 #: source/ubl-strings.h:43 source/ubl-strings.h:49
msgid "Do not encrypt password" msgid "Do not encrypt password"
msgstr "Не шифровать пароль" msgstr "Не шифровать пароль"
#: source/ubl-strings.h:42 #: source/ubl-strings.h:44
msgid "Password contain special symbols" msgid "Password contain special symbols"
msgstr "Пароль содержит специальные символы" msgstr "Пароль содержит специальные символы"
#: source/ubl-strings.h:43 #: source/ubl-strings.h:45
msgid "Empty important field" msgid "Empty important field"
msgstr "Пустое важное поле" msgstr "Пустое важное поле"
#: source/ubl-strings.h:44 #: source/ubl-strings.h:46
msgid "Password mismatch" msgid "Password mismatch"
msgstr "Пароли не совпадают" msgstr "Пароли не совпадают"
#: source/ubl-strings.h:45 #: source/ubl-strings.h:47
msgid "Password:" msgid "Password:"
msgstr "Пароль:" msgstr "Пароль:"
#: source/ubl-strings.h:49 #: source/ubl-strings.h:51
msgid "Password must be at least" msgid "Password must be at least"
msgstr "Пароль состоять из по крайней мере" msgstr "Пароль состоять из по крайней мере"
#: source/ubl-strings.h:49 #: source/ubl-strings.h:51
msgid "characters" msgid "characters"
msgstr "символов" msgstr "символов"
#: source/ubl-strings.h:51 #: source/ubl-strings.h:53
msgid "Add user" msgid "Add user"
msgstr "Добавить пользователя" msgstr "Добавить пользователя"
#: source/ubl-strings.h:52 #: source/ubl-strings.h:54
msgid "Edit user" msgid "Edit user"
msgstr "Редактировать пользователя" msgstr "Редактировать пользователя"
#: source/ubl-strings.h:54 #: source/ubl-strings.h:56
msgid "User name:" msgid "User name:"
msgstr "Имя пользователя:" msgstr "Имя пользователя:"
#: source/ubl-strings.h:55 #: source/ubl-strings.h:57
msgid "User password:" msgid "User password:"
msgstr "Пароль пользователя:" msgstr "Пароль пользователя:"
#: source/ubl-strings.h:56 #: source/ubl-strings.h:58
msgid "Are you sure you want to remove user" msgid "Are you sure you want to remove user"
msgstr "Вы уверены что хотите удалить пользователя" msgstr "Вы уверены что хотите удалить пользователя"
#: source/ubl-strings.h:56 #: source/ubl-strings.h:58
msgid "from boot menu users" msgid "from boot menu users"
msgstr "из пользователей меню загрузчика" msgstr "из пользователей меню загрузчика"
#: source/ubl-strings.h:58 #: source/ubl-strings.h:60
msgid "Add ringtone" msgid "Add ringtone"
msgstr "Добавить мелодию" msgstr "Добавить мелодию"
#: source/ubl-strings.h:59 #: source/ubl-strings.h:61
msgid "Edit ringtone" msgid "Edit ringtone"
msgstr "Изменение мелодии" msgstr "Изменение мелодии"
#: source/ubl-strings.h:60 #: source/ubl-strings.h:62
msgid "Chosen" msgid "Chosen"
msgstr "Выбран" msgstr "Выбран"
#: source/ubl-strings.h:61 #: source/ubl-strings.h:63
msgid "Name:" msgid "Name:"
msgstr "Название:" msgstr "Название:"
#: source/ubl-strings.h:62 #: source/ubl-strings.h:64
msgid "Melody code:" msgid "Melody code:"
msgstr "Код мелодии:" msgstr "Код мелодии:"
#: source/ubl-strings.h:63 #: source/ubl-strings.h:65
msgid "Are you sure you want to remove ringtone" msgid "Are you sure you want to remove ringtone"
msgstr "Вы уверены что хотите удалить мелодию" msgstr "Вы уверены что хотите удалить мелодию"

Write Preview
Loading…
Cancel
Save