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

Added new console settings; localisation update

Browse Source
pull/17/head
Ivan Dmitrievich Yartsev 1 month ago
parent 6183fafafc
commit 9e5138c82e
No known key found for this signature in database
GPG Key ID: FF1D842BF4DDE92B
6 changed files with 55 additions and 32 deletions
Show Stats Download Patch File Download Diff File

6
locale/ubl-settings-keyboard.pot
Unescape View File

@ -119,7 +119,7 @@ msgid "Scroll Lock indication when switching layouts"
msgstr ""
#: source/ubl-strings.h:32
msgid "Numlock:"
msgid "NumLock:"
msgstr ""
#: source/ubl-strings.h:33
@ -127,7 +127,7 @@ msgid "Setting up TTY VT"
msgstr ""
#: source/ubl-strings.h:34
msgid "Secondary layout:"
msgid "Keyboard layout:"
msgstr ""
#: source/ubl-strings.h:35
@ -155,7 +155,7 @@ msgid "Options:"
msgstr ""
#: source/ubl-strings.h:20
msgid "Keymap and layout change:"
msgid "Second keyboard layout:"
msgstr ""
#: source/ubl-strings.h:20

10
locale/ubl-settings-keyboard_ru.po
Unescape View File

@ -121,7 +121,7 @@ msgid "Scroll Lock indication when switching layouts"
msgstr "Индикация Scroll Lock при переключении раскладки"
#: source/ubl-strings.h:32
msgid "Numlock:"
msgid "NumLock:"
msgstr "NumLock:"
#: source/ubl-strings.h:33
@ -129,8 +129,8 @@ msgid "Setting up TTY VT"
msgstr "Настройка TTY VT"
#: source/ubl-strings.h:34
msgid "Secondary layout:"
msgstr "Вторичная раскладка:"
msgid "Keyboard layout:"
msgstr "Раскладка клавиш для клавиатуры:"
#: source/ubl-strings.h:35
msgid "Keyboard layout"
@ -157,8 +157,8 @@ msgid "Options:"
msgstr "Опции:"
#: source/ubl-strings.h:20
msgid "Keymap and layout change:"
msgstr "Карта клавиш и смена раскладки:"
msgid "Second keyboard layout:"
msgstr "Вторая раскладка клавиш для клавиатуры:"
#: source/ubl-strings.h:20
msgid "Font:"

19
source/ubl-settings-keyboard.c
Unescape View File

@ -336,11 +336,28 @@ void yon_main_window_complete(main_window *widgets){
yon_char_parsed_free(models,size);
{
config_str parsed = yon_config_load(tty_keymaps_command,&size);
config_str parsed = yon_config_load(tty_layout_command,&size);
for (int i=0;i<size;i++){
yon_char_remove_last_symbol(parsed[i],'\n');
gtk_combo_box_text_append(GTK_COMBO_BOX_TEXT(widgets->TTYLayoutCombo),parsed[i],parsed[i]);
}
yon_char_parsed_free(parsed,size);
}
{
config_str parsed = yon_config_load(tty_keymap_command,&size);
for (int i=0;i<size;i++){
yon_char_remove_last_symbol(parsed[i],'\n');
gtk_combo_box_text_append(GTK_COMBO_BOX_TEXT(widgets->TTYKeymapCombo),parsed[i],parsed[i]);
}
yon_char_parsed_free(parsed,size);
}
{
config_str parsed = yon_config_load(tty_font_command,&size);
for (int i=0;i<size;i++){
yon_char_remove_last_symbol(parsed[i],'\n');
gtk_combo_box_text_append(GTK_COMBO_BOX_TEXT(widgets->TTYFontCombo),parsed[i],parsed[i]);
}
yon_char_parsed_free(parsed,size);
}
yon_root_button_setup((template_main_window*)widgets,main_config.launch_arguments,main_config.launch_size);
yon_save_window_set_postsave_function(on_save_done,widgets);

4
source/ubl-settings-keyboard.h
Unescape View File

@ -119,7 +119,9 @@
// terminate : Key sequence to kill the X server
#define terminate_options_command "sed -En '/^! option$/,/^ *$/!d;s/[[:blank:]]+(terminate:[^ ]+)[[:blank:]]+(.*)/\\1|\\2/p' /usr/share/X11/xkb/rules/evdev.lst"
#define tty_keymaps_command "find /usr/share/kbd/keymaps/ -type f -name \"*.map.*\" | sed -E \"s:.*/(.*)\\..*\\..*:\\1:g\" | sort -u"
#define tty_layout_command "find /usr/share/kbd/keymaps/ -type f -name \"*.map.*\" | sed -En \"s:.*/(.*)\\..*\\..*:\\1:p\" | sort -ufV"
#define tty_keymap_command "find /usr/share/kbd/keymaps/ -type f -name \"*.map.*\" | sed -En \"s:.*/(.*)\\..*\\..*:\\1:p\" | sort -ufV"
#define tty_font_command "find /usr/share/kbd/consolefonts -maxdepth 1 -type f -name \"*.gz\" | sed -En \"s:.*/(.*)(\\.psf\\.gz|\\.psfu\\.gz)$:\\1:p\" | sort -ufV"
typedef char* string;

6
source/ubl-strings.h
Unescape View File

@ -30,14 +30,14 @@
#define SCROLL_LOCK_LABEL _("Scroll Lock indication when switching layouts")
#define ON_LABEL _("On")
#define OFF_LABEL _("Off")
#define NUMLOCK_LABEL _("Numlock:")
#define NUMLOCK_LABEL _("NumLock:")
#define TTY_LAYOUT_LABEL _("Setting up TTY VT")
#define SECONDARY_LAYOUT_LABEL _("Secondary layout:")
#define SECONDARY_LAYOUT_LABEL _("Keyboard layout:")
#define KEYBOARD_LAYOUT_LABEL _("Keyboard layout")
#define DESIGNATION_LABEL _("Designation")
#define VARIANT_LABEL _("Variant")
#define NAME_LABEL _("Name")
#define DESCRIPTION_LABEL _("Description")
#define OPTIONS_LABEL _("Options:")
#define KEYMAP_LABEL _("Keymap and layout change:")
#define KEYMAP_LABEL _("Second keyboard layout:")
#define FONT_LABEL _("Font:")

42
ubl-settings-keyboard.glade
Unescape View File

@ -43,7 +43,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
<column type="gchararray"/>
</columns>
</object>
<object class="GtkSizeGroup"/>
<object class="GtkImage" id="image1">
<property name="visible">True</property>
<property name="can-focus">False</property>
@ -467,6 +466,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
<property name="can-focus">True</property>
<property name="model">OptionsList</property>
<property name="enable-grid-lines">both</property>
<child internal-child="selection">
<object class="GtkTreeSelection"/>
</child>
<child>
<object class="GtkTreeViewColumn">
<property name="title" translatable="yes">Name</property>
@ -681,7 +683,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Numlock:</property>
<property name="label" translatable="yes">NumLock:</property>
<property name="xalign">1</property>
</object>
<packing>
@ -757,11 +759,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
<property name="can-focus">False</property>
<property name="spacing">5</property>
<child>
<object class="GtkLabel" id="label1">
<object class="GtkLabel" id="label10">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Secondary layout:</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">Keyboard layout:</property>
<property name="xalign">0</property>
</object>
<packing>
<property name="expand">False</property>
@ -770,18 +772,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
</packing>
</child>
<child>
<object class="GtkComboBox" id="TTYLayoutCombo">
<object class="GtkComboBoxText" id="TTYLayoutCombo">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="model">LayoutsList</property>
<property name="active">0</property>
<property name="id-column">0</property>
<child>
<object class="GtkCellRendererText"/>
<attributes>
<attribute name="text">2</attribute>
</attributes>
</child>
<items>
<item translatable="yes">Default</item>
</items>
</object>
<packing>
<property name="expand">True</property>
@ -805,8 +802,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
<object class="GtkLabel" id="label3">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Keymap and layout change:</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">Second keyboard layout:</property>
<property name="xalign">0</property>
</object>
<packing>
<property name="expand">False</property>
@ -833,7 +830,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
<property name="position">2</property>
</packing>
</child>
<child>
@ -846,7 +843,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Font:</property>
<property name="xalign">1</property>
<property name="xalign">0</property>
</object>
<packing>
<property name="expand">False</property>
@ -873,7 +870,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">2</property>
<property name="position">3</property>
</packing>
</child>
</object>
@ -906,6 +903,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
</packing>
</child>
</object>
<object class="GtkSizeGroup">
<widgets>
<widget name="label10"/>
<widget name="label3"/>
<widget name="label9"/>
</widgets>
</object>
<object class="GtkListStore" id="liststore1">
<columns>
<!-- column-name gchararray1 -->

Write Preview
Loading…
Cancel
Save