[PATCH 2/2] Use constant for default keyboard layout
Vratislav Podzimek
vpodzime at redhat.com
Thu Sep 12 12:25:33 UTC 2013
Signed-off-by: Vratislav Podzimek <vpodzime at redhat.com>
---
pyanaconda/constants.py | 2 ++
pyanaconda/keyboard.py | 14 +++++++-------
pyanaconda/ui/gui/spokes/keyboard.py | 11 ++++++-----
pyanaconda/ui/gui/spokes/welcome.py | 12 ++++++------
4 files changed, 21 insertions(+), 18 deletions(-)
diff --git a/pyanaconda/constants.py b/pyanaconda/constants.py
index d4d8708..6ef6948 100644
--- a/pyanaconda/constants.py
+++ b/pyanaconda/constants.py
@@ -77,6 +77,8 @@ DEFAULT_LANG = "en_US.UTF-8"
DEFAULT_VC_FONT = "latarcyrheb-sun16"
+DEFAULT_KEYBOARD = "us"
+
DRACUT_SHUTDOWN_EJECT = "/run/initramfs/usr/lib/dracut/hooks/shutdown/99anaconda-eject.sh"
# VNC questions
diff --git a/pyanaconda/keyboard.py b/pyanaconda/keyboard.py
index b5c35b3..651525d 100644
--- a/pyanaconda/keyboard.py
+++ b/pyanaconda/keyboard.py
@@ -41,7 +41,7 @@ from pyanaconda import iutil
from pyanaconda import flags
from pyanaconda.safe_dbus import dbus_call_safe_sync, dbus_get_property_safe_sync
from pyanaconda.safe_dbus import DBUS_SYSTEM_BUS_ADDR, DBusPropertyError
-from pyanaconda.constants import DEFAULT_VC_FONT
+from pyanaconda.constants import DEFAULT_VC_FONT, DEFAULT_KEYBOARD
from gi.repository import Xkl, Gio, GLib
@@ -143,7 +143,7 @@ def populate_missing_items(keyboard):
keyboard.vc_keymap = localed.set_and_convert_layout(keyboard.x_layouts[0])
if not keyboard.vc_keymap:
- keyboard.vc_keymap = "us"
+ keyboard.vc_keymap = DEFAULT_KEYBOARD
if not keyboard.x_layouts:
c_lay_var = localed.set_and_convert_keymap(keyboard.vc_keymap)
@@ -225,7 +225,7 @@ def write_keyboard_config(keyboard, root, convert=True):
log.error("Failed to write out config file: %s", ilvs)
# try default
- keyboard.x_layouts = ["us"]
+ keyboard.x_layouts = [DEFAULT_KEYBOARD]
localed_wrapper.set_layouts(keyboard.x_layouts,
keyboard.switch_options)
@@ -421,13 +421,13 @@ class XklWrapper(object):
self._rec.layouts,
self._rec.variants))
log.error("Failed to activate layouts: '%s', "
- "falling back to default 'us'", lay_var_str)
- self._rec.set_layouts(["us"])
+ "falling back to default %s", lay_var_str, DEFAULT_KEYBOARD)
+ self._rec.set_layouts([DEFAULT_KEYBOARD])
self._rec.set_variants([""])
if not self._rec.activate(self._engine):
- # failed to activate even the default "us" layout, something
- # is really wrong
+ # failed to activate even the default layout, something is
+ # really wrong
raise XklWrapperError("Failed to initialize layouts")
#needed also for Gkbd.KeyboardDrawingDialog
diff --git a/pyanaconda/ui/gui/spokes/keyboard.py b/pyanaconda/ui/gui/spokes/keyboard.py
index 0cc8e48..0538b67 100644
--- a/pyanaconda/ui/gui/spokes/keyboard.py
+++ b/pyanaconda/ui/gui/spokes/keyboard.py
@@ -29,6 +29,7 @@ from pyanaconda.ui.gui.utils import enlightbox, gtk_call_once
from pyanaconda import keyboard
from pyanaconda import flags
from pyanaconda.i18n import _, N_
+from pyanaconda.constants import DEFAULT_KEYBOARD
import logging
log = logging.getLogger("anaconda")
@@ -550,8 +551,8 @@ class KeyboardSpoke(NormalSpoke):
def _add_data_layouts(self):
if not self.data.keyboard.x_layouts:
- # nothing specified, just add the default 'us'
- self._addLayout(self._store, "us")
+ # nothing specified, just add the default
+ self._addLayout(self._store, DEFAULT_KEYBOARD)
return
valid_layouts = []
@@ -563,9 +564,9 @@ class KeyboardSpoke(NormalSpoke):
log.error("Failed to add layout '%s'", layout)
if not valid_layouts:
- log.error("No valid layout given, falling back to default 'us'")
- self._addLayout(self._store, "us")
- self.data.keyboard.x_layouts = ["us"]
+ log.error("No valid layout given, falling back to default %s", DEFAULT_KEYBOARD)
+ self._addLayout(self._store, DEFAULT_KEYBOARD)
+ self.data.keyboard.x_layouts = [DEFAULT_KEYBOARD]
def _flush_layouts_to_X(self):
layouts_list = list()
diff --git a/pyanaconda/ui/gui/spokes/welcome.py b/pyanaconda/ui/gui/spokes/welcome.py
index 79efdd2..872cd62 100644
--- a/pyanaconda/ui/gui/spokes/welcome.py
+++ b/pyanaconda/ui/gui/spokes/welcome.py
@@ -36,7 +36,7 @@ from pyanaconda import flags
from pyanaconda import geoloc
from pyanaconda.i18n import _
from pyanaconda.iutil import is_unsupported_hw
-from pyanaconda.constants import DEFAULT_LANG
+from pyanaconda.constants import DEFAULT_LANG, DEFAULT_KEYBOARD
import logging
log = logging.getLogger("anaconda")
@@ -114,11 +114,11 @@ class WelcomeLanguageSpoke(LangLocaleHandler, StandaloneSpoke):
# store it normalized
new_layouts = [keyboard.normalize_layout_variant(layouts[0])]
if not langtable.supports_ascii(layouts[0]):
- # does not support typing ASCII chars, append the 'us' layout
- new_layouts.append("us")
+ # does not support typing ASCII chars, append the default layout
+ new_layouts.append(DEFAULT_KEYBOARD)
else:
log.error("Failed to get layout for chosen locale '%s'", locale)
- new_layouts = ["us"]
+ new_layouts = [DEFAULT_KEYBOARD]
self.data.keyboard.x_layouts = new_layouts
if flags.can_touch_runtime_system("replace runtime X layouts", touch_live=True):
@@ -130,8 +130,8 @@ class WelcomeLanguageSpoke(LangLocaleHandler, StandaloneSpoke):
if flags.can_touch_runtime_system("init layout switching", touch_live=True):
self._xklwrapper.set_switching_options(["grp:alt_shift_toggle"])
- # activate the first (language-default) layout instead of the
- # 'us' one
+ # activate the language-default layout instead of the additional
+ # one
self._xklwrapper.activate_default_layout()
@property
--
1.7.11.7
More information about the anaconda-patches
mailing list