diff --git a/locale/ubl-settings-keyboard.pot b/locale/ubl-settings-keyboard.pot
index d58bcb3..d9599fa 100644
--- a/locale/ubl-settings-keyboard.pot
+++ b/locale/ubl-settings-keyboard.pot
@@ -155,7 +155,7 @@ msgid "Options:"
msgstr ""
#: source/ubl-strings.h:20
-msgid "Second keyboard layout:"
+msgid "Additional key layout for the keyboard:"
msgstr ""
#: source/ubl-strings.h:20
@@ -167,7 +167,7 @@ msgid "Group"
msgstr ""
#: source/ubl-strings.h:20
-msgid "Second keyboard layout"
+msgid "Additional key layout for the keyboard"
msgstr ""
#: source/ubl-strings.h:20
diff --git a/locale/ubl-settings-keyboard_ru.po b/locale/ubl-settings-keyboard_ru.po
index 0284af2..9479fb9 100644
--- a/locale/ubl-settings-keyboard_ru.po
+++ b/locale/ubl-settings-keyboard_ru.po
@@ -157,8 +157,8 @@ msgid "Options:"
msgstr "Опции:"
#: source/ubl-strings.h:20
-msgid "Second keyboard layout:"
-msgstr "Вторая раскладка клавиш для клавиатуры:"
+msgid "Additional key layout for the keyboard:"
+msgstr "Дополнительная раскладка клавиш для клавиатуры:"
#: source/ubl-strings.h:20
msgid "Font:"
@@ -169,8 +169,8 @@ msgid "Group"
msgstr "Группа"
#: source/ubl-strings.h:20
-msgid "Second keyboard layout"
-msgstr "Вторая раскладка клавиш для клавиатуры"
+msgid "Additional key layout for the keyboard"
+msgstr "Дополнительная раскладка клавиш для клавиатуры"
#: source/ubl-strings.h:20
msgid "Font"
diff --git a/source/ubl-settings-keyboard.c b/source/ubl-settings-keyboard.c
index 4b8b262..d3eebc8 100644
--- a/source/ubl-settings-keyboard.c
+++ b/source/ubl-settings-keyboard.c
@@ -93,6 +93,29 @@ gboolean yon_interface_update(main_window *widgets){
}
}
+ {
+ char *tty_layout = config(console_keymap_parameter);
+ if (!yon_char_is_empty(tty_layout)){
+ gtk_entry_set_text(GTK_ENTRY(widgets->TTYLayoutEntry),tty_layout);
+ } else {
+ gtk_entry_set_text(GTK_ENTRY(widgets->TTYLayoutEntry),"");
+ }
+
+ char *tty_keymap = config(console_keymap_toggle_parameter);
+ if (!yon_char_is_empty(tty_keymap)){
+ gtk_entry_set_text(GTK_ENTRY(widgets->TTYSecondLayoutEntry),tty_keymap);
+ } else {
+ gtk_entry_set_text(GTK_ENTRY(widgets->TTYSecondLayoutEntry),"");
+ }
+
+ char *tty_font = config(console_font_parameter);
+ if (!yon_char_is_empty(tty_font)){
+ gtk_entry_set_text(GTK_ENTRY(widgets->TTYFontEntry),tty_font);
+ } else {
+ gtk_entry_set_text(GTK_ENTRY(widgets->TTYFontEntry),"");
+ }
+ }
+
g_signal_handlers_unblock_by_func(G_OBJECT(widgets->KeyboardModelCombo),G_CALLBACK(on_model_changed),widgets);
g_signal_handlers_unblock_by_func(G_OBJECT(widgets->OptionsEditButton),G_CALLBACK(on_options_open),widgets);
g_signal_handlers_unblock_by_func(G_OBJECT(widgets->NumLockCombo),G_CALLBACK(on_num_lock_changed),widgets);
diff --git a/source/ubl-settings-keyboard.h b/source/ubl-settings-keyboard.h
index ebbee16..b6e16e3 100644
--- a/source/ubl-settings-keyboard.h
+++ b/source/ubl-settings-keyboard.h
@@ -44,15 +44,17 @@
#define console_keymap_parameter "CONSOLE_KEYMAP"
#define console_keymap_parameter_command "ubconfig --source global get [keyboard] CONSOLE_KEYMAP"
+
#define console_keymap_toggle_parameter "CONSOLE_KEYMAP_TOGGLE"
#define console_keymap_toggle_parameter_command "ubconfig --source global get [keyboard] CONSOLE_KEYMAP_TOGGLE"
+
#define console_font_parameter "CONSOLE_FONT"
#define console_font_parameter_command "ubconfig --source global get [locale] CONSOLE_FONT"
-#define yon_config_get_custom_command(target) yon_char_unite("ubconfig --source ",target," get keyboard XKBMODEL XKBLAYOUT XKBOPTIONS NUMLOCK",NULL)
-#define config_get_local_command "ubconfig --source system get keyboard XKBMODEL XKBLAYOUT XKBOPTIONS NUMLOCK"
-#define config_get_global_command "ubconfig --source global get keyboard XKBMODEL XKBLAYOUT XKBOPTIONS NUMLOCK"
-#define config_get_default_command ""
+#define yon_config_get_custom_command(target) yon_char_unite("ubconfig --source ",target," -ea get [keyboard] XKBMODEL XKBLAYOUT XKBOPTIONS NUMLOCK CONSOLE_KEYMAP CONSOLE_KEYMAP_TOGGLE -- [locale] CONSOLE_FONT",NULL)
+#define config_get_local_command "ubconfig --source system -ea get [keyboard] XKBMODEL XKBLAYOUT XKBOPTIONS NUMLOCK CONSOLE_KEYMAP CONSOLE_KEYMAP_TOGGLE -- [locale] CONSOLE_FONT"
+#define config_get_global_command "ubconfig --source global -ea get [keyboard] XKBMODEL XKBLAYOUT XKBOPTIONS NUMLOCK CONSOLE_KEYMAP CONSOLE_KEYMAP_TOGGLE -- [locale] CONSOLE_FONT"
+#define config_get_default_command "ubconfig --source default -ea get [keyboard] XKBMODEL XKBLAYOUT XKBOPTIONS NUMLOCK CONSOLE_KEYMAP CONSOLE_KEYMAP_TOGGLE -- [locale] CONSOLE_FONT"
#define config_get_global_only_parameters ""
#define config_get_local_only_parameters ""
diff --git a/source/ubl-strings.h b/source/ubl-strings.h
index 2b265c5..9b3f49a 100644
--- a/source/ubl-strings.h
+++ b/source/ubl-strings.h
@@ -39,9 +39,9 @@
#define NAME_LABEL _("Name")
#define DESCRIPTION_LABEL _("Description")
#define OPTIONS_LABEL _("Options:")
-#define KEYMAP_LABEL _("Second keyboard layout:")
+#define KEYMAP_LABEL _("Additional key layout for the keyboard:")
#define FONT_LABEL _("Font:")
#define GROUP_LABEL _("Group")
-#define KEYMAP_TITLE_LABEL _("Second keyboard layout")
+#define KEYMAP_TITLE_LABEL _("Additional key layout for the keyboard")
#define FONT_TITLE_LABEL _("Font")
\ No newline at end of file
diff --git a/ubl-settings-keyboard.glade b/ubl-settings-keyboard.glade
index 4c5cb4f..6cc890b 100644
--- a/ubl-settings-keyboard.glade
+++ b/ubl-settings-keyboard.glade
@@ -841,7 +841,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.