|
|
|
@ -428,13 +428,6 @@ class fillVars(glob_attr):
|
|
|
|
|
return ""
|
|
|
|
|
return ",".join(networks)
|
|
|
|
|
|
|
|
|
|
def get_os_locale_xkbname(self):
|
|
|
|
|
"""названия используемых раскладок клавиатуры для X"""
|
|
|
|
|
localeXkb = self.Get("os_locale_xkb")
|
|
|
|
|
if localeXkb:
|
|
|
|
|
return localeXkb.split("(")[0]
|
|
|
|
|
return ""
|
|
|
|
|
|
|
|
|
|
def get_os_arch_machine(self):
|
|
|
|
|
"""архитектура процессора"""
|
|
|
|
|
march = self._runos("uname -m")
|
|
|
|
@ -560,47 +553,18 @@ class fillVars(glob_attr):
|
|
|
|
|
locale = clLocale()
|
|
|
|
|
return locale.getFieldByLang("language",self.Get('os_locale_lang'))
|
|
|
|
|
|
|
|
|
|
def get_os_locale_consolefont(self):
|
|
|
|
|
"""consolefont"""
|
|
|
|
|
locale = clLocale()
|
|
|
|
|
return locale.getFieldByLang("consolefont",self.Get('os_locale_lang'))
|
|
|
|
|
|
|
|
|
|
def get_os_locale_xkb(self):
|
|
|
|
|
"""xkb layouts (example: en,ru)"""
|
|
|
|
|
locale = clLocale()
|
|
|
|
|
# is specified keymap support by locale hash
|
|
|
|
|
if self.Get('os_locale_keymap') in locale.getFields('keymap'):
|
|
|
|
|
return locale.getFieldByKeymap("xkblayout",
|
|
|
|
|
self.Get('os_locale_keymap'))
|
|
|
|
|
else:
|
|
|
|
|
return locale.getFieldByLang("xkblayout",
|
|
|
|
|
self.Get('os_locale_lang'))
|
|
|
|
|
return locale.getFieldByLang("xkblayout",
|
|
|
|
|
self.Get('os_locale_lang'))
|
|
|
|
|
|
|
|
|
|
def get_os_locale_keymap(self):
|
|
|
|
|
"""keymap of locale (used for /etc/conf.d/keymaps)"""
|
|
|
|
|
locale = clLocale()
|
|
|
|
|
# get keymap from boot calculate param (keymap specified
|
|
|
|
|
# by lang)
|
|
|
|
|
keymapConfd = '/etc/conf.d/keymaps'
|
|
|
|
|
keymap = self.getValueFromCmdLine("calculate",1)
|
|
|
|
|
if locale.isLangExists(keymap):
|
|
|
|
|
return locale.getFieldByLang('keymap',keymap)
|
|
|
|
|
# get keymap by os_locale_lang
|
|
|
|
|
keymap = self.getValueFromConfig(keymapConfd,'KEYMAP')
|
|
|
|
|
if keymap:
|
|
|
|
|
return keymap
|
|
|
|
|
return locale.getFieldByLang("keymap",self.Get("os_locale_lang"))
|
|
|
|
|
|
|
|
|
|
def get_os_locale_dumpkeys(self):
|
|
|
|
|
"""dumpkeys charset for keymap"""
|
|
|
|
|
locale = clLocale()
|
|
|
|
|
# is specified keymap support by locale hash
|
|
|
|
|
if self.Get('os_locale_keymap') in locale.getFields('keymap'):
|
|
|
|
|
return locale.getFieldByKeymap("dumpkeys_charset",
|
|
|
|
|
self.Get('os_locale_keymap'))
|
|
|
|
|
else:
|
|
|
|
|
return locale.getFieldByLang("dumpkeys_charset",
|
|
|
|
|
self.Get('os_locale_lang'))
|
|
|
|
|
def get_os_locale_xkbname(self):
|
|
|
|
|
"""названия используемых раскладок клавиатуры для X"""
|
|
|
|
|
localeXkb = self.Get("os_locale_xkb")
|
|
|
|
|
if localeXkb:
|
|
|
|
|
return localeXkb.split("(")[0]
|
|
|
|
|
return ""
|
|
|
|
|
|
|
|
|
|
def get_ur_login(self):
|
|
|
|
|
"""Имя пользователя"""
|
|
|
|
@ -781,7 +745,8 @@ class fillVars(glob_attr):
|
|
|
|
|
return "1024"
|
|
|
|
|
|
|
|
|
|
def get_os_x11_standart(self):
|
|
|
|
|
"""Получить ближайший стандартный размер изображения к текущему разрешению"""
|
|
|
|
|
"""Get the nearest standard size of image relative current
|
|
|
|
|
screen resolution"""
|
|
|
|
|
#Стандартные разрешения
|
|
|
|
|
widthVal = self.Get('os_x11_width')
|
|
|
|
|
heightVal = self.Get('os_x11_height')
|
|
|
|
|