Skip to content

L
live-installer
Kaydet (Commit) 8b5126e2 authored tarafından root's avatar root
Dosyalara gözat
Seçenekler

²@ή¥₺€Û¶ÎÂû®₺”×¢û»“¢₺

üst 17faa65a
Show whitespace changes
Inline Side-by-side
Showing with 17 additions and 282 deletions
live-installer/frontend/gtk_interface.py
Dosyayı görüntüle @ 8b5126e2
......@@ -240,6 +240,9 @@ class InstallerWindow:
# install page
self.builder.get_object("label_install_progress").set_text(
("Calculating file indexes ..."))
self.builder.get_object("install_image").set_from_file(
"./resources/install.png")
# i18n
self.i18n()
......@@ -305,7 +308,7 @@ class InstallerWindow:
# Welcome page
self.builder.get_object("img_distro").set_from_file(
"./resources/distro.svg")
"./resources/distro.png")
self.builder.get_object("label_welcome1").set_text(
("Welcome to the Sulin Installer."))
self.builder.get_object("label_welcome2").set_text(
......
live-installer/installer.py
Dosyayı görüntüle @ 8b5126e2
......@@ -70,7 +70,7 @@ class InstallerEngine:
# Transfer the files
SOURCE = "/source/"
DEST = "/target/"
EXCLUDE_DIRS = "home/* dev/* proc/* sys/* tmp/* run/* mnt/* media/* lost+found source target".split()
EXCLUDE_DIRS = "data/* dev/* proc/* sys/* tmp/* run/* lost+found source target".split()
our_current = 0
# (Valid) assumption: num-of-files-to-copy ~= num-of-used-inodes-on-/
our_total = int(subprocess.getoutput(
......@@ -459,15 +459,15 @@ class InstallerEngine:
self.update_progress(our_current, our_total, False,
False, ("Settings X11 keyboard options"))
newconsolefh = open("/target/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 = open("/target/etc/X11/xorg.conf.d/10-keyboard.conf", "w")
newconsolefh.write('Section "InputClass"\n')
newconsolefh.write('Identifier "system-keyboard"\n')
newconsolefh.write('MatchIsKeyboard "on"\n')
newconsolefh.write('Option "XkbLayout" "{}"\n'.format(self.setup.keyboard_layout))
newconsolefh.write('Option "XkbModel" "{}"\n'.format(self.setup.keyboard_model))
newconsolefh.write('Option "XkbVariant" "{}"\n'.format(self.setup.keyboard_variant))
newconsolefh.write('#Option "XkbOptions" "grp:alt_shift_toggle"\n')
newconsolefh.write('EndSection\n')
newconsolefh.close()
# write MBR (grub)
......
live-installer/resources/distro.svg deleted 100644 → 0
Dosyayı görüntüle @ 17faa65a
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="256"
height="256"
viewBox="0 0 135.46666 135.46667"
version="1.1"
id="svg8"
inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)"
sodipodi:docname="distro.svg">
<defs
id="defs2" />
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="1.4"
inkscape:cx="106.81959"
inkscape:cy="114.12436"
inkscape:document-units="mm"
inkscape:current-layer="layer1"
showgrid="false"
units="px"
inkscape:window-width="1366"
inkscape:window-height="701"
inkscape:window-x="0"
inkscape:window-y="30"
inkscape:window-maximized="1"
inkscape:snap-bbox="true"
inkscape:snap-global="false"
showguides="true"
inkscape:guide-bbox="true" />
<metadata
id="metadata5">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title />
</cc:Work>
</rdf:RDF>
</metadata>
<g
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(0,-161.53332)">
<path
style="fill:#000000;stroke-width:0.26458332"
d=""
id="path4751"
inkscape:connector-curvature="0" />
<g
id="g4582"
transform="translate(-7.4083331)">
<path
sodipodi:nodetypes="csssssc"
inkscape:connector-curvature="0"
id="path840"
d="m 38.920152,245.37287 c 0,0 -1.011292,-5.95242 -8.057249,-14.38231 -4.234194,-5.06585 -7.699224,-4.04144 -12.945668,-4.44122 -2.230828,-0.16999 9.67552,4.06446 6.992539,6.80357 -1.702918,1.73855 -13.692143,-9.45288 -4.973777,3.65758 1.370238,2.06053 10.813119,12.07933 15.258242,12.63929 6.04009,0.76088 3.725913,-4.27691 3.725913,-4.27691 z"
style="fill:#000000;stroke:#000000;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
<g
transform="translate(-3.1750001,-0.13438001)"
id="g4798">
<path
style="fill:#cccccc;stroke:#000000;stroke-width:1.30336714;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.30000019;stroke-dasharray:none;stroke-opacity:1"
d="m 59.021645,202.38983 c 0,0 3.071373,-7.86066 -0.861933,-14.37096 -6.586571,-10.90191 -15.078824,-22.93733 -20.23278,-21.9161 -4.046558,0.80181 -0.117127,33.68895 2.265561,38.31126 5.918985,11.48256 15.725721,5.07487 22.469981,5.07487 6.74426,0 -3.640829,-7.09907 -3.640829,-7.09907 z"
id="path4672"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cssssc" />
<path
style="fill:#de8787;stroke:#000000;stroke-width:1.30336714;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.30000019;stroke-dasharray:none;stroke-opacity:1"
d="m 56.440668,204.26637 c 0,0 2.343702,-9.89276 -0.429558,-14.48298 -4.643998,-7.68662 -10.631637,-16.17244 -14.265539,-15.4524 -2.85311,0.56533 0.493831,24.81909 2.173795,28.07814 4.173303,8.09602 7.766122,1.85724 12.521302,1.85724 4.75518,0 0,0 0,0 z"
id="path4672-6"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cssssc" />
</g>
<g
transform="translate(7.4083337)"
id="g4794">
<path
style="fill:#cccccc;stroke:#000000;stroke-width:1.30336714;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.30000019;stroke-dasharray:none;stroke-opacity:1"
d="m 87.543479,202.25545 c 0,0 -3.071369,-7.86066 0.861933,-14.37096 6.586571,-10.90191 15.078828,-22.93733 20.232778,-21.9161 4.04656,0.80181 0.11712,33.68895 -2.26556,38.31126 -5.91898,11.48256 -15.72572,5.07487 -22.46998,5.07487 -6.74426,0 3.640829,-7.09907 3.640829,-7.09907 z"
id="path4672-1"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cssssc" />
<path
style="fill:#de8787;stroke:#000000;stroke-width:1.30336714;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.30000019;stroke-dasharray:none;stroke-opacity:1"
d="m 90.124456,204.13199 c 0,0 -2.343702,-9.89276 0.429558,-14.48298 4.643998,-7.68662 10.631636,-16.17244 14.265536,-15.4524 2.85311,0.56533 -0.49383,24.81909 -2.17379,28.07814 -4.173305,8.09602 -7.766124,1.85724 -12.521304,1.85724 -4.755176,0 0,0 0,0 z"
id="path4672-6-2"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cssssc" />
</g>
<ellipse
ry="36.30373"
rx="34.450161"
cy="227.02193"
cx="75.7939"
id="path4599"
style="fill:#cccccc;fill-opacity:0.98550726;stroke:#000000;stroke-width:1.53499997;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
<path
sodipodi:nodetypes="cccccccc"
inkscape:connector-curvature="0"
id="path4944"
d="m 39.190213,248.27976 c 0,0 3.777453,4.76178 6.091194,6.30428 2.313735,2.91361 7.971859,4.02072 7.971859,4.02072 l -1.542494,3.25636 v 0 c 0,0 -6.732755,2.88954 -11.188841,-3.79461 -4.456101,-6.68415 -7.89079,-9.56258 -7.89079,-9.56258 z"
style="fill:#b3b3b3;stroke:#000000;stroke-width:1.35699999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
<ellipse
ry="12.883742"
rx="20.143269"
cy="265.9267"
cx="75.539574"
id="path4871"
style="fill:#cccccc;fill-opacity:0.98550726;stroke:#000000;stroke-width:1.20243466;stroke-opacity:0" />
<path
inkscape:connector-curvature="0"
id="path4924"
d="M 69.191623,278.95289 H 82.902629"
style="fill:none;stroke:#000000;stroke-width:1.48873889px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
<g
id="g869">
<path
style="fill:#b3b3b3;stroke:#000000;stroke-width:1.35732603px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m 52.069515,270.14515 c 0,0 2.643536,3.85201 -1.855917,6.39518 -1.59092,2.36141 -0.60411,7.02868 -0.60411,7.02868 0,0 9.869037,0.69697 11.580371,-0.75986 3.827157,-3.25805 -9.546908,-16.30187 -9.546908,-16.30187 z"
id="path4942-5"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cccscc" />
<rect
style="fill:#000000;fill-opacity:0.98550726;stroke:#000000;stroke-width:1.21767163;stroke-miterlimit:4.30000019;stroke-dasharray:none;stroke-opacity:1"
id="rect844"
width="7.6986518"
height="1.6433825"
x="50.223701"
y="280.8862" />
</g>
<g
id="g873">
<path
style="fill:#b3b3b3;stroke:#000000;stroke-width:1.35732603px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m 98.998943,269.2706 c 0,0 -2.643536,3.85201 1.855917,6.39518 1.59092,2.36141 0.60411,7.02868 0.60411,7.02868 0,0 -9.869037,0.69697 -11.580371,-0.75986 -3.827157,-3.25805 9.546908,-16.30187 9.546908,-16.30187 z"
id="path4942"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cccscc" />
<rect
style="fill:#000000;fill-opacity:0.98550726;stroke:#000000;stroke-width:1.20536339;stroke-miterlimit:4.30000019;stroke-dasharray:none;stroke-opacity:1"
id="rect844-3"
width="7.6986518"
height="1.6103277"
x="92.957115"
y="280.23367" />
</g>
<g
id="g929">
<g
id="g879"
transform="matrix(0.95197772,0,0,1,1.9122329,0.10824221)">
<path
sodipodi:nodetypes="csscccccssccc"
inkscape:connector-curvature="0"
id="path3780"
d="m 54.019939,255.1962 c 0,0 -5.564784,6.14122 -1.97401,13.88973 3.590774,7.74851 3.258856,5.16145 3.401785,9.44941 0.05888,1.76626 1.860426,2.42214 1.860426,2.42214 l -1.713428,2.57046 c -1.658903,2.66141 -4.186018,7.54038 -2.48906,9.38988 l 21.527283,-0.0174 v 0 c 2.263323,-1.11763 0.593388,-5.43827 -0.540866,-7.52636 -0.902975,-1.66232 -5.977503,-2.38185 -3.430814,-4.33466 2.546691,-1.95281 1.557535,-7.87963 1.557535,-7.87963 0,0 0.190606,-13.09805 -3.211181,-14.70445 -3.401785,-1.60639 -14.98767,-3.25915 -14.98767,-3.25915 z"
style="fill:#cccccc;stroke:#000000;stroke-width:1.35699999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
<rect
y="289.94916"
x="53.784466"
height="2.4221287"
width="20.848469"
id="rect875"
style="fill:#000000;fill-opacity:0.98550726;stroke:#000000;stroke-width:1.56971657;stroke-miterlimit:4.30000019;stroke-dasharray:none;stroke-opacity:1" />
</g>
<g
id="g879-3"
transform="matrix(-0.95197771,0,0,1,148.69059,0.10824221)">
<path
sodipodi:nodetypes="csscccccssccc"
inkscape:connector-curvature="0"
id="path3780-5"
d="m 54.019939,255.1962 c 0,0 -5.564784,6.14122 -1.97401,13.88973 3.590774,7.74851 3.258856,5.16145 3.401785,9.44941 0.05888,1.76626 1.860426,2.42214 1.860426,2.42214 l -1.713428,2.57046 c -1.658903,2.66141 -4.186018,7.54038 -2.48906,9.38988 l 21.527283,-0.0174 v 0 c 2.263323,-1.11763 0.593388,-5.43827 -0.540866,-7.52636 -0.902975,-1.66232 -5.977503,-2.38185 -3.430814,-4.33466 2.546691,-1.95281 1.557535,-7.87963 1.557535,-7.87963 0,0 0.190606,-13.09805 -3.211181,-14.70445 -3.401785,-1.60639 -14.98767,-3.25915 -14.98767,-3.25915 z"
style="fill:#cccccc;stroke:#000000;stroke-width:1.35699999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
<rect
y="289.94916"
x="53.784466"
height="2.4221287"
width="20.848469"
id="rect875-6"
style="fill:#000000;fill-opacity:0.98550726;stroke:#000000;stroke-width:1.56971657;stroke-miterlimit:4.30000019;stroke-dasharray:none;stroke-opacity:1" />
</g>
</g>
<ellipse
ry="9.4423523"
rx="19.107304"
cy="264.39313"
cx="74.63501"
id="path4871-3"
style="fill:#cccccc;fill-opacity:0.98550726;stroke:#000000;stroke-width:1.00257134;stroke-opacity:0" />
<ellipse
ry="4.8475933"
rx="1.454278"
cy="228.13686"
cx="56.28231"
id="path4671"
style="fill:#000000;fill-opacity:0.98550726;stroke:#000000;stroke-width:1.35732603;stroke-opacity:1" />
<ellipse
ry="4.8475933"
rx="1.454278"
cy="228.13686"
cx="96.517357"
id="path4671-3"
style="fill:#000000;fill-opacity:0.98550726;stroke:#000000;stroke-width:1.35732603;stroke-opacity:1" />
<ellipse
ry="13.721004"
rx="26.809505"
cy="247.4688"
cx="75.67717"
id="path4632"
style="fill:#ffffff;fill-opacity:0.98550726;stroke:#000000;stroke-width:1.54659975;stroke-opacity:1" />
<ellipse
inkscape:transform-center-y="-0.050854141"
inkscape:transform-center-x="0.29950438"
transform="matrix(0.86060118,-0.5092795,0.49540625,0.86866141,0,0)"
ry="4.1043611"
rx="1.2368147"
cy="246.43349"
cx="-61.632431"
id="path4688"
style="fill:#000000;fill-opacity:0.98550726;stroke:#000000;stroke-width:1.03019035;stroke-opacity:1" />
<ellipse
inkscape:transform-center-y="-0.28481464"
inkscape:transform-center-x="0.10571278"
transform="matrix(0.87134957,0.49066273,-0.50457971,0.86336511,0,0)"
ry="4.1043606"
rx="1.2368147"
cy="172.77385"
cx="196.24179"
id="path4688-5"
style="fill:#000000;fill-opacity:0.98550726;stroke:#000000;stroke-width:1.03019035;stroke-opacity:1" />
<path
sodipodi:nodetypes="cscssssscscc"
inkscape:connector-curvature="0"
id="path4772"
d="m 43.297662,216.33601 c 0,0 8.860215,-13.12365 7.685967,-6.72759 -2.391996,13.02905 3.004814,-0.94494 5.944779,-3.88491 2.939965,-2.93996 2.138156,17.24282 4.810853,5.75023 2.672693,-11.49259 1.460484,17.05382 4.934987,0.48316 3.474505,-16.57071 2.22685,20.48226 9.686553,-1.2312 4.486971,-13.06053 5.209492,21.69115 9.510998,1.38777 3.731865,-17.61464 13.976295,9.95612 12.79651,0.61282 -1.978015,-15.66488 9.041311,0.38354 9.041311,0.38354 0,0 -17.908909,-39.40779 -54.250153,-13.77945 -6.664796,4.70011 -10.161805,17.00568 -10.161805,17.00568 z"
style="fill:#000000;stroke:#000000;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
</g>
</g>
</svg>
live-installer/resources/interface.ui
Dosyayı görüntüle @ 8b5126e2
......@@ -1843,21 +1843,10 @@
</packing>
</child>
<child>
<object class="GtkScrolledWindow" id="scrolled_slideshow">
<property name="visible">False</property>
<object class="GtkImage" id="install_image">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">center</property>
<property name="valign">center</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="hscrollbar_policy">external</property>
<property name="vscrollbar_policy">external</property>
<property name="shadow_type">in</property>
<property name="min_content_width">752</property>
<property name="min_content_height">450</property>
<child>
<placeholder/>
</child>
<property name="icon_name">distro</property>
</object>
<packing>
<property name="expand">True</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