Kaydet (Commit) e9be858b authored tarafından sulincix's avatar sulincix

fix bişey

üst 4cd28660
......@@ -304,6 +304,8 @@ class InstallerWindow:
self.builder.get_object("button_next").set_label(("Next"))
# Welcome page
self.builder.get_object("img_distro").set_from_file(
"./resources/distro.svg")
self.builder.get_object("label_welcome1").set_text(
("Welcome to the Sulin Installer."))
self.builder.get_object("label_welcome2").set_text(
......@@ -671,15 +673,6 @@ class InstallerWindow:
if iter is not None:
self.setup.language = model.get_value(iter, 3)
self.setup.print_setup()
gettext.translation('live-installer', "/usr/share/locale",
languages=[self.setup.language, self.setup.language.split('_')[
0]],
fallback=True).install() # Try e.g. zh_CN, zh, or fallback to hardcoded English
try:
self.i18n()
except:
# Best effort. Fails the first time as self.column1 doesn't exist yet.
pass
def assign_login_options(self, checkbox, data=None):
self.setup.autologin = self.builder.get_object(
......@@ -789,10 +782,10 @@ class InstallerWindow:
img = self.builder.get_object("progress_%d" % i)
if i <= index:
img.set_from_file(
"/usr/share/icons/live-installer-progress-dot-on.png")
"./icons/live-installer-progress-dot-on.png")
else:
img.set_from_file(
"/usr/share/icons/live-installer-progress-dot-off.png")
"./icons/live-installer-progress-dot-off.png")
help_text = (self.wizard_pages[index].help_text)
self.builder.get_object("help_label").set_markup(
"<big><b>%s</b></big>" % help_text)
......
This diff is collapsed.
......@@ -430,13 +430,11 @@ class InstallerEngine:
our_current += 1
self.update_progress(our_current, our_total, False,
False, ("Setting locale"))
os.system("echo \"%s.UTF-8 UTF-8\" >> /target/etc/locale.gen" %
os.system("echo \"LC_COLLATE=C\" > /target/etc/env.d/02locale" %
self.setup.language)
self.do_run_in_chroot("locale-gen")
os.system("echo \"\" > /target/etc/default/locale")
self.do_run_in_chroot(
"update-locale LANG=\"%s.UTF-8\"" % self.setup.language)
self.do_run_in_chroot("update-locale LANG=%s.UTF-8" %
os.system("echo \"LC_ALL=%s.UTF-8\" >> /target/etc/env.d/02locale" %
self.setup.language)
os.system("echo \"LANG=%s.UTF-8\" >> /target/etc/env.d/02locale" %
self.setup.language)
# set the timezone
......@@ -451,13 +449,25 @@ class InstallerEngine:
our_current += 1
self.update_progress(our_current, our_total, False,
False, ("Setting keyboard options"))
#TODO:keyboard layout support openrc
#newconsolefh = open("/etc/conf.d/keymaps", "w")
#newconsolefh.write("XKBMODEL=\"%s\"\n" % self.setup.keyboard_model)
#newconsolefh.write("keymap=\"%s\"\n" % self.setup.keyboard_layout)
#if(self.setup.keyboard_variant is not None and self.setup.keyboard_variant != ""):
# newconsolefh.write("extended_keymaps=\"%s\"\n" % self.setup.keyboard_variant)
#newconsolefh.close()
#Keyboard settings openrc
newconsolefh = open("/etc/conf.d/keymaps", "w")
if not self.setup.keyboard_layout:
self.setup.keyboard_layout="en"
if not self.setup.keyboard_variant:
self.setup.keyboard_variant=""
newconsolefh.write("keymap=\"%s%s\"\n" % self.setup.keyboard_layout,self.setup.keyboard_variant)
newconsolefh.close()
#Keyboard settings X11
newconsolefh = open("/etc/X11/xorg.conf.d/00-keyboard.conf", "w")
newconsolefh.write('Section "InputClass"')
newconsolefh.write('Identifier "system-keyboard"')
newconsolefh.write('MatchIsKeyboard "on"')
newconsolefh.write('Option "XkbLayout" "{}"'.format(self.setup.keyboard_layout))
newconsolefh.write('Option "XkbModel" "{}"'.format(self.setup.keyboard_model))
newconsolefh.write('Option "XkbVariant" "{}"'.format(self.setup.keyboard_variant))
newconsolefh.write('#Option "XkbOptions" "grp:alt_shift_toggle"')
newconsolefh.write('EndSection')
newconsolefh.close()
# write MBR (grub)
print(" --> Configuring Grub")
......
This diff is collapsed.
This diff is collapsed.
......@@ -247,7 +247,7 @@
<property name="orientation">vertical</property>
<property name="spacing">15</property>
<child>
<object class="GtkImage">
<object class="GtkImage" id="img_distro">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="pixel_size">80</property>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment