Applications
/
ubinstall-gtk
8
0
Fork 1
Code Issues 11 Pull Requests 1 Packages Projects Releases Wiki Activity
Labels Milestones
New Pull Request

Style fixes #398

Merged
asmeron merged 27 commits from YanTheKaller/ubinstall-gtk:master into master 6 days ago
Conversation 0 Commits 27 Files Changed 25
25 changed files with 1627 additions and 627 deletions
Show Stats Download Patch File Download Diff File

285
icons/emblems/com.ublinux.ubinstall-gtk.configure-complete.svg
Unescape View File

@ -1,27 +1,260 @@
<svg width="2000" height="2000" viewBox="0 0 2000 2000" fill="none" xmlns="http://www.w3.org/2000/svg"> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<rect width="2000" height="2000" fill="white"/> <svg
<path d="M218.28 400.63C201.711 400.63 188.28 414.061 188.28 430.63V1275C188.28 1291.57 201.711 1305 218.28 1305H999H1779.72C1796.29 1305 1809.72 1291.57 1809.72 1275V430.63C1809.72 414.062 1796.29 400.63 1779.72 400.63H999H218.28Z" fill="black"/> width="2000pt"
<path d="M1990 1624H1000H10L43.147 1675.69C48.6637 1684.3 58.1808 1689.5 68.4011 1689.5H1925.98C1935.43 1689.5 1944.33 1685.04 1950 1677.47L1990 1624Z" fill="#3F3F3F"/> height="2000pt"
<path fill-rule="evenodd" clip-rule="evenodd" d="M218.28 400.63C201.711 400.63 188.28 414.061 188.28 430.63V1275C188.28 1291.57 201.711 1305 218.28 1305H999H1779.72C1796.29 1305 1809.72 1291.57 1809.72 1275V430.63C1809.72 414.062 1796.29 400.63 1779.72 400.63H999H218.28ZM99 400.63C99 350.59 139.95 310 188.28 310H999H1809.72C1859.04 310 1899 350.41 1899 400.63V1386C1899 1402.57 1885.57 1416 1869 1416H999H129C112.431 1416 99 1402.57 99 1386V400.63Z" fill="#3F3F3F"/> viewBox="0 0 2000 2000"
<path d="M1990 1624L1907.32 1460.46C1902.22 1450.37 1891.87 1444 1880.55 1444H1000H117.633C106.222 1444 95.799 1450.47 90.7412 1460.7L10 1624H1000H1990Z" fill="#999999"/> fill="none"
<mask id="path-2-inside-1_34_83" fill="white"> version="1.1"
<path d="M99 400.63C99 350.59 139.95 310 188.28 310H999H1809.72C1859.04 310 1899 350.41 1899 400.63V1386C1899 1402.57 1885.57 1416 1869 1416H999H129C112.431 1416 99 1402.57 99 1386V400.63Z"/> id="svg19"
</mask> sodipodi:docname="Settings-complete.svg"
<path d="M99 400.63C99 350.59 139.95 310 188.28 310H999H1809.72C1859.04 310 1899 350.41 1899 400.63V1386C1899 1402.57 1885.57 1416 1869 1416H999H129C112.431 1416 99 1402.57 99 1386V400.63Z" fill="#1A1A1A" stroke="#3F3F3F" stroke-width="20" mask="url(#path-2-inside-1_34_83)"/> inkscape:version="1.3.2 (091e20ef0f, 2023-11-25, custom)"
<path d="M188 416C188 407.716 194.716 401 203 401H999H1795C1803.28 401 1810 407.716 1810 416V1303C1810 1311.28 1803.28 1318 1795 1318H999H203C194.716 1318 188 1311.28 188 1303V416Z" fill="#287EB4"/> xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
<circle cx="998.5" cy="356.5" r="13.5" fill="black"/> xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
<circle cx="998.5" cy="356.5" r="10.5" fill="#0A0A0A"/> xmlns="http://www.w3.org/2000/svg"
<circle cx="998.5" cy="356.5" r="6.5" fill="#090909"/> xmlns:svg="http://www.w3.org/2000/svg">
<circle cx="998.5" cy="356.5" r="6.5" fill="black"/> <sodipodi:namedview
<circle cx="1039.5" cy="356.5" r="3.5" fill="white"/> id="namedview19"
<path fill-rule="evenodd" clip-rule="evenodd" d="M1108.91 774C1095.19 749.754 1075.13 729.56 1051 715.659C1040.24 709.464 1028.68 704.519 1016.5 701.022C1002.84 697.1 988.417 695 973.5 695C958.583 695 944.156 697.1 930.5 701.022C918.321 704.519 906.755 709.464 896 715.659C871.866 729.56 851.815 749.754 838.088 774C832.58 783.729 828.09 794.111 824.763 805C820.366 819.391 818 834.669 818 850.5C818 865.235 820.05 879.492 823.879 893C827.277 904.985 832.076 916.381 838.088 927C851.815 951.246 871.866 971.44 896 985.341C906.755 991.536 918.321 996.481 930.5 999.978C944.156 1003.9 958.583 1006 973.5 1006C988.417 1006 1002.84 1003.9 1016.5 999.978C1067.98 985.197 1108.51 944.546 1123.12 893C1126.95 879.492 1129 865.235 1129 850.5C1129 836.309 1127.1 822.562 1123.54 809.5C1120.12 796.965 1115.17 785.061 1108.91 774ZM974 928C1016.53 928 1051 893.526 1051 851C1051 808.474 1016.53 774 974 774C931.474 774 897 808.474 897 851C897 893.526 931.474 928 974 928Z" fill="white"/> pagecolor="#ffffff"
<path d="M1123.54 809.5C1127.1 822.562 1129 836.309 1129 850.5C1129 865.235 1126.95 879.492 1123.12 893L1172.38 887C1174.75 874.697 1176 861.993 1176 849C1176 836.885 1174.92 825.021 1172.84 813.5L1123.54 809.5Z" fill="white"/> bordercolor="#000000"
<path d="M1091 685.647L1051 715.659C1075.13 729.56 1095.19 749.754 1108.91 774L1140.87 736C1127.37 716.423 1110.46 699.357 1091 685.647Z" fill="white"/> borderopacity="0.25"
<path d="M973.5 695C988.417 695 1002.84 697.1 1016.5 701.022L1011 652.199C999.32 650.097 987.289 649 975 649C962.711 649 950.68 650.097 939 652.199L930.5 701.022C944.156 697.1 958.583 695 973.5 695Z" fill="white"/> inkscape:showpageshadow="2"
<path d="M896 715.659L859 685.647C838.385 700.168 820.639 718.454 806.775 739.5L838.088 774C851.815 749.754 871.866 729.56 896 715.659Z" fill="white"/> inkscape:pageopacity="0.0"
<path d="M818 850.5C818 834.669 820.366 819.391 824.763 805L777.157 813.5C775.083 825.021 774 836.885 774 849C774 861.993 775.245 874.697 777.623 887L823.879 893C820.05 879.492 818 865.235 818 850.5Z" fill="white"/> inkscape:pagecheckerboard="0"
<path d="M838.088 927L808.11 960.5C821.771 980.705 839.041 998.294 859 1012.35L896 985.341C871.866 971.44 851.815 951.246 838.088 927Z" fill="white"/> inkscape:deskcolor="#d1d1d1"
<path d="M939 1045.8C950.68 1047.9 962.711 1049 975 1049C986.239 1049 997.263 1048.08 1008 1046.32L1016.5 999.978C1002.84 1003.9 988.417 1006 973.5 1006C958.583 1006 944.156 1003.9 930.5 999.978L939 1045.8Z" fill="white"/> inkscape:zoom="0.4325"
<ellipse cx="1110" cy="962.5" rx="114" ry="113.5" fill="#5096FF"/> inkscape:cx="1000"
<path d="M1054.5 965L1088.17 997.75C1089.74 999.275 1092.24 999.257 1093.79 997.711L1161.5 930" stroke="white" stroke-width="21" stroke-linecap="round"/> inkscape:cy="1000"
inkscape:window-width="1920"
inkscape:window-height="1052"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="1"
inkscape:current-layer="svg19"
inkscape:document-units="pt" />
<path
d="M218.28 400.63C201.711 400.63 188.28 414.061 188.28 430.63V1275C188.28 1291.57 201.711 1305 218.28 1305H999H1779.72C1796.29 1305 1809.72 1291.57 1809.72 1275V430.63C1809.72 414.062 1796.29 400.63 1779.72 400.63H999H218.28Z"
fill="black"
id="path1" />
<path
d="M1990 1624H1000H10L43.147 1675.69C48.6637 1684.3 58.1808 1689.5 68.4011 1689.5H1925.98C1935.43 1689.5 1944.33 1685.04 1950 1677.47L1990 1624Z"
fill="#3F3F3F"
id="path2" />
<path
fill-rule="evenodd"
clip-rule="evenodd"
d="M218.28 400.63C201.711 400.63 188.28 414.061 188.28 430.63V1275C188.28 1291.57 201.711 1305 218.28 1305H999H1779.72C1796.29 1305 1809.72 1291.57 1809.72 1275V430.63C1809.72 414.062 1796.29 400.63 1779.72 400.63H999H218.28ZM99 400.63C99 350.59 139.95 310 188.28 310H999H1809.72C1859.04 310 1899 350.41 1899 400.63V1386C1899 1402.57 1885.57 1416 1869 1416H999H129C112.431 1416 99 1402.57 99 1386V400.63Z"
fill="#3F3F3F"
id="path3" />
<path
d="M1990 1624L1907.32 1460.46C1902.22 1450.37 1891.87 1444 1880.55 1444H1000H117.633C106.222 1444 95.799 1450.47 90.7412 1460.7L10 1624H1000H1990Z"
fill="#999999"
id="path4" />
<mask
id="path-2-inside-1_90_160"
fill="white">
<path
d="M99 400.63C99 350.59 139.95 310 188.28 310H999H1809.72C1859.04 310 1899 350.41 1899 400.63V1386C1899 1402.57 1885.57 1416 1869 1416H999H129C112.431 1416 99 1402.57 99 1386V400.63Z"
id="path5" />
</mask>
<path
d="M99 400.63C99 350.59 139.95 310 188.28 310H999H1809.72C1859.04 310 1899 350.41 1899 400.63V1386C1899 1402.57 1885.57 1416 1869 1416H999H129C112.431 1416 99 1402.57 99 1386V400.63Z"
fill="#1A1A1A"
stroke="#3F3F3F"
stroke-width="20"
mask="url(#path-2-inside-1_90_160)"
id="path6" />
<path
d="M188 416C188 407.716 194.716 401 203 401H999H1795C1803.28 401 1810 407.716 1810 416V1303C1810 1311.28 1803.28 1318 1795 1318H999H203C194.716 1318 188 1311.28 188 1303V416Z"
fill="#287EB4"
id="path7" />
<circle
cx="998.5"
cy="356.5"
r="13.5"
fill="black"
id="circle7" />
<circle
cx="998.5"
cy="356.5"
r="10.5"
fill="#0A0A0A"
id="circle8" />
<circle
cx="998.5"
cy="356.5"
r="6.5"
fill="#090909"
id="circle9" />
<circle
cx="998.5"
cy="356.5"
r="6.5"
fill="black"
id="circle10" />
<circle
cx="1039.5"
cy="356.5"
r="3.5"
fill="white"
id="circle11" />
<g
filter="url(#filter0_d_90_160)"
id="g11">
<path
fill-rule="evenodd"
clip-rule="evenodd"
d="M1051 715.659L1091 685.647C1110.46 699.357 1127.37 716.423 1140.87 736L1108.91 774C1115.17 785.061 1120.12 796.965 1123.54 809.5L1172.84 813.5C1174.92 825.021 1176 836.885 1176 849C1176 861.993 1174.75 874.697 1172.38 887L1123.12 893C1108.51 944.546 1067.98 985.197 1016.5 999.978L1008 1046.32C997.263 1048.08 986.239 1049 975 1049C962.711 1049 950.68 1047.9 939 1045.8L930.5 999.978C918.321 996.481 906.755 991.536 896 985.341L859 1012.35C839.041 998.294 821.771 980.705 808.11 960.5L838.088 927C832.076 916.381 827.277 904.985 823.879 893L777.623 887C775.245 874.697 774 861.993 774 849C774 836.885 775.083 825.021 777.157 813.5L824.763 805C828.09 794.111 832.58 783.729 838.088 774L806.775 739.5C820.639 718.454 838.385 700.168 859 685.647L896 715.659C906.755 709.464 918.321 704.519 930.5 701.022L939 652.199C950.68 650.097 962.711 649 975 649C987.289 649 999.32 650.097 1011 652.199L1016.5 701.022C1028.68 704.519 1040.24 709.464 1051 715.659ZM974 928C1016.53 928 1051 893.526 1051 851C1051 808.474 1016.53 774 974 774C931.474 774 897 808.474 897 851C897 893.526 931.474 928 974 928Z"
fill="white"
id="path11" />
</g>
<g
filter="url(#filter1_d_90_160)"
id="g12">
<ellipse
cx="1119"
cy="999.5"
rx="114"
ry="113.5"
fill="#5AA8D8"
id="ellipse11" />
</g>
<g
filter="url(#filter2_d_90_160)"
id="g13">
<path
d="M1063.5 1002L1097.17 1034.75C1098.74 1036.27 1101.24 1036.26 1102.79 1034.71L1170.5 967"
stroke="white"
stroke-width="40"
stroke-linecap="round"
id="path12" />
</g>
<defs
id="defs19">
<filter
id="filter0_d_90_160"
x="774"
y="649"
width="406"
height="404"
filterUnits="userSpaceOnUse"
color-interpolation-filters="sRGB">
<feFlood
flood-opacity="0"
result="BackgroundImageFix"
id="feFlood13" />
<feColorMatrix
in="SourceAlpha"
type="matrix"
values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"
result="hardAlpha"
id="feColorMatrix13" />
<feOffset
dx="4"
dy="4"
id="feOffset13" />
<feComposite
in2="hardAlpha"
operator="out"
id="feComposite13" />
<feColorMatrix
type="matrix"
values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.25 0"
id="feColorMatrix14" />
<feBlend
mode="normal"
in2="BackgroundImageFix"
result="effect1_dropShadow_90_160"
id="feBlend14" />
<feBlend
mode="normal"
in="SourceGraphic"
in2="effect1_dropShadow_90_160"
result="shape"
id="feBlend15" />
</filter>
<filter
id="filter1_d_90_160"
x="1005"
y="886"
width="232"
height="231"
filterUnits="userSpaceOnUse"
color-interpolation-filters="sRGB">
<feFlood
flood-opacity="0"
result="BackgroundImageFix"
id="feFlood15" />
<feColorMatrix
in="SourceAlpha"
type="matrix"
values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"
result="hardAlpha"
id="feColorMatrix15" />
<feOffset
dx="4"
dy="4"
id="feOffset15" />
<feComposite
in2="hardAlpha"
operator="out"
id="feComposite15" />
<feColorMatrix
type="matrix"
values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.25 0"
id="feColorMatrix16" />
<feBlend
mode="normal"
in2="BackgroundImageFix"
result="effect1_dropShadow_90_160"
id="feBlend16" />
<feBlend
mode="normal"
in="SourceGraphic"
in2="effect1_dropShadow_90_160"
result="shape"
id="feBlend17" />
</filter>
<filter
id="filter2_d_90_160"
x="1043.5"
y="947"
width="151"
height="112.882"
filterUnits="userSpaceOnUse"
color-interpolation-filters="sRGB">
<feFlood
flood-opacity="0"
result="BackgroundImageFix"
id="feFlood17" />
<feColorMatrix
in="SourceAlpha"
type="matrix"
values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"
result="hardAlpha"
id="feColorMatrix17" />
<feOffset
dx="4"
dy="4"
id="feOffset17" />
<feComposite
in2="hardAlpha"
operator="out"
id="feComposite17" />
<feColorMatrix
type="matrix"
values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.25 0"
id="feColorMatrix18" />
<feBlend
mode="normal"
in2="BackgroundImageFix"
result="effect1_dropShadow_90_160"
id="feBlend18" />
<feBlend
mode="normal"
in="SourceGraphic"
in2="effect1_dropShadow_90_160"
result="shape"
id="feBlend19" />
</filter>
</defs>
</svg> </svg>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.6 KiB

After

Width:  |  Height:  |  Size: 8.5 KiB

282
icons/emblems/com.ublinux.ubinstall-gtk.install-complete.svg
Unescape View File

@ -1,20 +1,264 @@
<svg width="2000" height="2000" viewBox="0 0 2000 2000" fill="none" xmlns="http://www.w3.org/2000/svg"> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<rect width="2000" height="2000" fill="white"/> <svg
<path d="M218.28 400.63C201.711 400.63 188.28 414.061 188.28 430.63V1275C188.28 1291.57 201.711 1305 218.28 1305H999H1779.72C1796.29 1305 1809.72 1291.57 1809.72 1275V430.63C1809.72 414.061 1796.29 400.63 1779.72 400.63H999H218.28Z" fill="black"/> width="2000pt"
<path d="M1990 1624H1000H10L43.147 1675.69C48.6637 1684.3 58.1808 1689.5 68.4011 1689.5H1925.98C1935.43 1689.5 1944.33 1685.04 1950 1677.47L1990 1624Z" fill="#3F3F3F"/> height="2000pt"
<path fill-rule="evenodd" clip-rule="evenodd" d="M218.28 400.63C201.711 400.63 188.28 414.061 188.28 430.63V1275C188.28 1291.57 201.711 1305 218.28 1305H999H1779.72C1796.29 1305 1809.72 1291.57 1809.72 1275V430.63C1809.72 414.061 1796.29 400.63 1779.72 400.63H999H218.28ZM99 400.63C99 350.59 139.95 310 188.28 310H999H1809.72C1859.04 310 1899 350.41 1899 400.63V1386C1899 1402.57 1885.57 1416 1869 1416H999H129C112.431 1416 99 1402.57 99 1386V400.63Z" fill="#3F3F3F"/> viewBox="0 0 2000 2000"
<path d="M1990 1624L1907.32 1460.46C1902.22 1450.37 1891.87 1444 1880.55 1444H1000H117.633C106.222 1444 95.799 1450.47 90.7412 1460.7L10 1624H1000H1990Z" fill="#999999"/> fill="none"
<mask id="path-2-inside-1_34_83" fill="white"> version="1.1"
<path d="M99 400.63C99 350.59 139.95 310 188.28 310H999H1809.72C1859.04 310 1899 350.41 1899 400.63V1386C1899 1402.57 1885.57 1416 1869 1416H999H129C112.431 1416 99 1402.57 99 1386V400.63Z"/> id="svg18"
</mask> sodipodi:docname="Finish.svg"
<path d="M99 400.63C99 350.59 139.95 310 188.28 310H999H1809.72C1859.04 310 1899 350.41 1899 400.63V1386C1899 1402.57 1885.57 1416 1869 1416H999H129C112.431 1416 99 1402.57 99 1386V400.63Z" fill="#1A1A1A" stroke="#3F3F3F" stroke-width="20" mask="url(#path-2-inside-1_34_83)"/> inkscape:version="1.3.2 (091e20ef0f, 2023-11-25, custom)"
<rect x="189" y="400" width="1619" height="904" rx="30" fill="#527FD2"/> xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
<circle cx="998.5" cy="356.5" r="13.5" fill="black"/> xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
<circle cx="998.5" cy="356.5" r="10.5" fill="#0A0A0A"/> xmlns="http://www.w3.org/2000/svg"
<circle cx="998.5" cy="356.5" r="6.5" fill="#090909"/> xmlns:svg="http://www.w3.org/2000/svg">
<circle cx="998.5" cy="356.5" r="6.5" fill="black"/> <sodipodi:namedview
<circle cx="1039.5" cy="356.5" r="3.5" fill="white"/> id="namedview18"
<path fill-rule="evenodd" clip-rule="evenodd" d="M856.925 1088.79C856.925 1098.18 849.314 1105.79 839.925 1105.79H782.182C767.823 1105.79 756.182 1094.15 756.182 1079.79V833.136C756.182 825.957 762.003 820.136 769.182 820.136H843.925C851.104 820.136 856.925 825.957 856.925 833.136V1088.79ZM1083.23 601.156C1073.81 595.75 1061.86 597.95 1054.97 606.36L896.029 800.437C890.906 806.692 888.107 814.528 888.107 822.613V1091.79C888.107 1099.53 894.375 1105.79 902.107 1105.79H1086.73C1143.96 1105.79 1193.38 1065.71 1205.23 1009.68L1217.61 951.197C1230.72 889.247 1183.5 830.939 1120.22 830.939H1061.85C1042.78 830.939 1031.47 809.595 1042.17 793.794L1105.99 699.54C1128.45 666.366 1117.98 621.079 1083.23 601.156Z" fill="white"/> pagecolor="#ffffff"
<ellipse cx="1157" cy="1061.5" rx="114" ry="113.5" fill="#29D156"/> bordercolor="#000000"
<path d="M1101.5 1064L1135.17 1096.75C1136.74 1098.27 1139.24 1098.26 1140.79 1096.71L1208.5 1029" stroke="white" stroke-width="21" stroke-linecap="round"/> borderopacity="0.25"
inkscape:showpageshadow="2"
inkscape:pageopacity="0.0"
inkscape:pagecheckerboard="0"
inkscape:deskcolor="#d1d1d1"
inkscape:zoom="0.4325"
inkscape:cx="1000"
inkscape:cy="1000"
inkscape:window-width="1920"
inkscape:window-height="1052"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="1"
inkscape:current-layer="svg18"
inkscape:document-units="pt" />
<path
d="M218.28 400.63C201.711 400.63 188.28 414.061 188.28 430.63V1275C188.28 1291.57 201.711 1305 218.28 1305H999H1779.72C1796.29 1305 1809.72 1291.57 1809.72 1275V430.63C1809.72 414.061 1796.29 400.63 1779.72 400.63H999H218.28Z"
fill="black"
id="path1" />
<path
d="M1990 1624H1000H10L43.147 1675.69C48.6637 1684.3 58.1808 1689.5 68.4011 1689.5H1925.98C1935.43 1689.5 1944.33 1685.04 1950 1677.47L1990 1624Z"
fill="#3F3F3F"
id="path2" />
<path
fill-rule="evenodd"
clip-rule="evenodd"
d="M218.28 400.63C201.711 400.63 188.28 414.061 188.28 430.63V1275C188.28 1291.57 201.711 1305 218.28 1305H999H1779.72C1796.29 1305 1809.72 1291.57 1809.72 1275V430.63C1809.72 414.061 1796.29 400.63 1779.72 400.63H999H218.28ZM99 400.63C99 350.59 139.95 310 188.28 310H999H1809.72C1859.04 310 1899 350.41 1899 400.63V1386C1899 1402.57 1885.57 1416 1869 1416H999H129C112.431 1416 99 1402.57 99 1386V400.63Z"
fill="#3F3F3F"
id="path3" />
<path
d="M1990 1624L1907.32 1460.46C1902.22 1450.37 1891.87 1444 1880.55 1444H1000H117.633C106.222 1444 95.799 1450.47 90.7412 1460.7L10 1624H1000H1990Z"
fill="#999999"
id="path4" />
<mask
id="path-2-inside-1_83_64"
fill="white">
<path
d="M99 400.63C99 350.59 139.95 310 188.28 310H999H1809.72C1859.04 310 1899 350.41 1899 400.63V1386C1899 1402.57 1885.57 1416 1869 1416H999H129C112.431 1416 99 1402.57 99 1386V400.63Z"
id="path5" />
</mask>
<path
d="M99 400.63C99 350.59 139.95 310 188.28 310H999H1809.72C1859.04 310 1899 350.41 1899 400.63V1386C1899 1402.57 1885.57 1416 1869 1416H999H129C112.431 1416 99 1402.57 99 1386V400.63Z"
fill="#1A1A1A"
stroke="#3F3F3F"
stroke-width="20"
mask="url(#path-2-inside-1_83_64)"
id="path6" />
<rect
x="189"
y="400"
width="1619"
height="904"
rx="30"
fill="#527FD2"
id="rect6" />
<circle
cx="998.5"
cy="356.5"
r="13.5"
fill="black"
id="circle6" />
<circle
cx="998.5"
cy="356.5"
r="10.5"
fill="#0A0A0A"
id="circle7" />
<circle
cx="998.5"
cy="356.5"
r="6.5"
fill="#090909"
id="circle8" />
<circle
cx="998.5"
cy="356.5"
r="6.5"
fill="black"
id="circle9" />
<circle
cx="1039.5"
cy="356.5"
r="3.5"
fill="white"
id="circle10" />
<g
filter="url(#filter0_d_83_64)"
id="g10">
<path
fill-rule="evenodd"
clip-rule="evenodd"
d="M856.925 1088.79C856.925 1098.18 849.314 1105.79 839.925 1105.79H782.182C767.823 1105.79 756.182 1094.15 756.182 1079.79V833.136C756.182 825.957 762.003 820.136 769.182 820.136H843.925C851.104 820.136 856.925 825.957 856.925 833.136V1088.79ZM1083.23 601.156C1073.81 595.75 1061.86 597.95 1054.97 606.36L896.029 800.437C890.906 806.692 888.107 814.528 888.107 822.613V1091.79C888.107 1099.53 894.375 1105.79 902.107 1105.79H1086.73C1143.96 1105.79 1193.38 1065.71 1205.23 1009.68L1217.61 951.197C1230.72 889.247 1183.5 830.939 1120.22 830.939H1061.85C1042.78 830.939 1031.47 809.595 1042.17 793.794L1105.99 699.54C1128.45 666.366 1117.98 621.079 1083.23 601.156Z"
fill="white"
id="path10" />
</g>
<g
filter="url(#filter1_d_83_64)"
id="g11">
<ellipse
cx="1157"
cy="1061.5"
rx="114"
ry="113.5"
fill="#29D156"
id="ellipse10" />
</g>
<g
filter="url(#filter2_d_83_64)"
id="g12">
<path
d="M1101.5 1064L1135.17 1096.75C1136.74 1098.27 1139.24 1098.26 1140.79 1096.71L1208.5 1029"
stroke="white"
stroke-width="47"
stroke-linecap="round"
id="path11" />
</g>
<defs
id="defs18">
<filter
id="filter0_d_83_64"
x="756.182"
y="598.208"
width="467.622"
height="511.586"
filterUnits="userSpaceOnUse"
color-interpolation-filters="sRGB">
<feFlood
flood-opacity="0"
result="BackgroundImageFix"
id="feFlood12" />
<feColorMatrix
in="SourceAlpha"
type="matrix"
values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"
result="hardAlpha"
id="feColorMatrix12" />
<feOffset
dx="4"
dy="4"
id="feOffset12" />
<feComposite
in2="hardAlpha"
operator="out"
id="feComposite12" />
<feColorMatrix
type="matrix"
values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.25 0"
id="feColorMatrix13" />
<feBlend
mode="normal"
in2="BackgroundImageFix"
result="effect1_dropShadow_83_64"
id="feBlend13" />
<feBlend
mode="normal"
in="SourceGraphic"
in2="effect1_dropShadow_83_64"
result="shape"
id="feBlend14" />
</filter>
<filter
id="filter1_d_83_64"
x="1043"
y="948"
width="232"
height="231"
filterUnits="userSpaceOnUse"
color-interpolation-filters="sRGB">
<feFlood
flood-opacity="0"
result="BackgroundImageFix"
id="feFlood14" />
<feColorMatrix
in="SourceAlpha"
type="matrix"
values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"
result="hardAlpha"
id="feColorMatrix14" />
<feOffset
dx="4"
dy="4"
id="feOffset14" />
<feComposite
in2="hardAlpha"
operator="out"
id="feComposite14" />
<feColorMatrix
type="matrix"
values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.25 0"
id="feColorMatrix15" />
<feBlend
mode="normal"
in2="BackgroundImageFix"
result="effect1_dropShadow_83_64"
id="feBlend15" />
<feBlend
mode="normal"
in="SourceGraphic"
in2="effect1_dropShadow_83_64"
result="shape"
id="feBlend16" />
</filter>
<filter
id="filter2_d_83_64"
x="1078"
y="1005.5"
width="158"
height="119.882"
filterUnits="userSpaceOnUse"
color-interpolation-filters="sRGB">
<feFlood
flood-opacity="0"
result="BackgroundImageFix"
id="feFlood16" />
<feColorMatrix
in="SourceAlpha"
type="matrix"
values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"
result="hardAlpha"
id="feColorMatrix16" />
<feOffset
dx="4"
dy="4"
id="feOffset16" />
<feComposite
in2="hardAlpha"
operator="out"
id="feComposite16" />
<feColorMatrix
type="matrix"
values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.25 0"
id="feColorMatrix17" />
<feBlend
mode="normal"
in2="BackgroundImageFix"
result="effect1_dropShadow_83_64"
id="feBlend17" />
<feBlend
mode="normal"
in="SourceGraphic"
in2="effect1_dropShadow_83_64"
result="shape"
id="feBlend18" />
</filter>
</defs>
</svg> </svg>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.0 KiB

After

Width:  |  Height:  |  Size: 8.0 KiB

126
icons/emblems/com.ublinux.ubinstall-gtk.install-error.svg
Unescape View File

@ -1,18 +1,110 @@
<svg width="2000" height="2000" viewBox="0 0 2000 2000" fill="none" xmlns="http://www.w3.org/2000/svg"> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<rect width="2000" height="2000" fill="white"/> <svg
<path d="M218.28 400.63C201.711 400.63 188.28 414.061 188.28 430.63V1275C188.28 1291.57 201.711 1305 218.28 1305H999H1779.72C1796.29 1305 1809.72 1291.57 1809.72 1275V430.63C1809.72 414.061 1796.29 400.63 1779.72 400.63H999H218.28Z" fill="black"/> width="2000pt"
<path d="M1990 1624H1000H10L43.147 1675.69C48.6637 1684.3 58.1808 1689.5 68.4011 1689.5H1925.98C1935.43 1689.5 1944.33 1685.04 1950 1677.47L1990 1624Z" fill="#3F3F3F"/> height="2000pt"
<path fill-rule="evenodd" clip-rule="evenodd" d="M218.28 400.63C201.711 400.63 188.28 414.061 188.28 430.63V1275C188.28 1291.57 201.711 1305 218.28 1305H999H1779.72C1796.29 1305 1809.72 1291.57 1809.72 1275V430.63C1809.72 414.061 1796.29 400.63 1779.72 400.63H999H218.28ZM99 400.63C99 350.59 139.95 310 188.28 310H999H1809.72C1859.04 310 1899 350.41 1899 400.63V1386C1899 1402.57 1885.57 1416 1869 1416H999H129C112.431 1416 99 1402.57 99 1386V400.63Z" fill="#3F3F3F"/> viewBox="0 0 2000 2000"
<path d="M1990 1624L1907.32 1460.46C1902.22 1450.37 1891.87 1444 1880.55 1444H1000H117.633C106.222 1444 95.799 1450.47 90.7412 1460.7L10 1624H1000H1990Z" fill="#999999"/> fill="none"
<mask id="path-2-inside-1_34_83" fill="white"> version="1.1"
<path d="M99 400.63C99 350.59 139.95 310 188.28 310H999H1809.72C1859.04 310 1899 350.41 1899 400.63V1386C1899 1402.57 1885.57 1416 1869 1416H999H129C112.431 1416 99 1402.57 99 1386V400.63Z"/> id="svg10"
</mask> sodipodi:docname="Error.svg"
<path d="M99 400.63C99 350.59 139.95 310 188.28 310H999H1809.72C1859.04 310 1899 350.41 1899 400.63V1386C1899 1402.57 1885.57 1416 1869 1416H999H129C112.431 1416 99 1402.57 99 1386V400.63Z" fill="#1A1A1A" stroke="#3F3F3F" stroke-width="20" mask="url(#path-2-inside-1_34_83)"/> inkscape:version="1.3.2 (091e20ef0f, 2023-11-25, custom)"
<rect x="189" y="400" width="1619" height="904" rx="30" fill="#BA5959"/> xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
<circle cx="998.5" cy="356.5" r="13.5" fill="black"/> xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
<circle cx="998.5" cy="356.5" r="10.5" fill="#0A0A0A"/> xmlns="http://www.w3.org/2000/svg"
<circle cx="998.5" cy="356.5" r="6.5" fill="#090909"/> xmlns:svg="http://www.w3.org/2000/svg">
<circle cx="998.5" cy="356.5" r="6.5" fill="black"/> <sodipodi:namedview
<circle cx="1039.5" cy="356.5" r="3.5" fill="white"/> id="namedview10"
<path d="M882.558 1058C855.023 1058 837.682 1028.35 851.182 1004.35L923.831 875.208C929.983 864.271 929.997 850.921 923.868 839.972L857.594 721.585C844.16 697.588 861.505 668 889.007 668H920.288C934.025 668 946.564 675.818 952.612 688.152L973.914 731.6C978.311 740.4 982.909 750.2 987.706 761C992.372 771.504 997.416 782.953 1002.84 795.349C1003.12 795.987 1003.75 796.4 1004.44 796.4C1005.19 796.4 1005.86 795.924 1006.1 795.217C1010.37 782.872 1014.63 771.466 1018.89 761C1023.29 750.2 1027.48 740.4 1031.48 731.6L1049.66 689.675C1055.37 676.516 1068.35 668 1082.69 668H1108.73C1136.06 668 1153.43 697.262 1140.33 721.252L1072.94 844.672C1066.93 855.683 1067.09 869.03 1073.35 879.9L1144.89 1004.02C1158.72 1028.02 1141.4 1058 1113.7 1058H1082.78C1069.32 1058 1056.98 1050.49 1050.8 1038.53L1024.89 988.4C1019.69 978 1014.69 967.6 1009.89 957.2C1005.24 947.109 1000.4 936.264 995.364 924.666C995.083 924.019 994.445 923.6 993.74 923.6C992.997 923.6 992.334 924.064 992.077 924.76C987.809 936.323 983.353 947.136 978.711 957.2C974.314 967.6 969.716 978 964.919 988.4L941.159 1037.64C935.154 1050.09 922.555 1058 908.736 1058H882.558Z" fill="white"/> pagecolor="#ffffff"
bordercolor="#000000"
borderopacity="0.25"
inkscape:showpageshadow="2"
inkscape:pageopacity="0.0"
inkscape:pagecheckerboard="0"
inkscape:deskcolor="#d1d1d1"
inkscape:zoom="0.30582368"
inkscape:cx="1332.4671"
inkscape:cy="1554.8175"
inkscape:window-width="1920"
inkscape:window-height="1052"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="1"
inkscape:current-layer="svg10"
inkscape:document-units="pt" />
<defs
id="defs10" />
<path
d="M218.28 400.63C201.711 400.63 188.28 414.061 188.28 430.63V1275C188.28 1291.57 201.711 1305 218.28 1305H999H1779.72C1796.29 1305 1809.72 1291.57 1809.72 1275V430.63C1809.72 414.061 1796.29 400.63 1779.72 400.63H999H218.28Z"
fill="black"
id="path1" />
<path
d="M1990 1624H1000H10L43.147 1675.69C48.6637 1684.3 58.1808 1689.5 68.4011 1689.5H1925.98C1935.43 1689.5 1944.33 1685.04 1950 1677.47L1990 1624Z"
fill="#3F3F3F"
id="path2" />
<path
fill-rule="evenodd"
clip-rule="evenodd"
d="M218.28 400.63C201.711 400.63 188.28 414.061 188.28 430.63V1275C188.28 1291.57 201.711 1305 218.28 1305H999H1779.72C1796.29 1305 1809.72 1291.57 1809.72 1275V430.63C1809.72 414.061 1796.29 400.63 1779.72 400.63H999H218.28ZM99 400.63C99 350.59 139.95 310 188.28 310H999H1809.72C1859.04 310 1899 350.41 1899 400.63V1386C1899 1402.57 1885.57 1416 1869 1416H999H129C112.431 1416 99 1402.57 99 1386V400.63Z"
fill="#3F3F3F"
id="path3" />
<path
d="M1990 1624L1907.32 1460.46C1902.22 1450.37 1891.87 1444 1880.55 1444H1000H117.633C106.222 1444 95.799 1450.47 90.7412 1460.7L10 1624H1000H1990Z"
fill="#999999"
id="path4" />
<mask
id="path-2-inside-1_90_186"
fill="white">
<path
d="M99 400.63C99 350.59 139.95 310 188.28 310H999H1809.72C1859.04 310 1899 350.41 1899 400.63V1386C1899 1402.57 1885.57 1416 1869 1416H999H129C112.431 1416 99 1402.57 99 1386V400.63Z"
id="path5" />
</mask>
<path
d="M99 400.63C99 350.59 139.95 310 188.28 310H999H1809.72C1859.04 310 1899 350.41 1899 400.63V1386C1899 1402.57 1885.57 1416 1869 1416H999H129C112.431 1416 99 1402.57 99 1386V400.63Z"
fill="#1A1A1A"
stroke="#3F3F3F"
stroke-width="20"
mask="url(#path-2-inside-1_90_186)"
id="path6" />
<rect
x="189"
y="400"
width="1619"
height="904"
rx="30"
fill="#BA5959"
id="rect6" />
<circle
cx="998.5"
cy="356.5"
r="13.5"
fill="black"
id="circle6" />
<circle
cx="998.5"
cy="356.5"
r="10.5"
fill="#0A0A0A"
id="circle7" />
<circle
cx="998.5"
cy="356.5"
r="6.5"
fill="#090909"
id="circle8" />
<circle
cx="998.5"
cy="356.5"
r="6.5"
fill="black"
id="circle9" />
<circle
cx="1039.5"
cy="356.5"
r="3.5"
fill="white"
id="circle10" />
<path
d="M882.558 1058C855.023 1058 837.682 1028.35 851.182 1004.35L923.831 875.208C929.983 864.271 929.997 850.921 923.868 839.972L857.594 721.585C844.16 697.588 861.505 668 889.007 668H920.288C934.025 668 946.564 675.818 952.612 688.152L973.914 731.6C978.311 740.4 982.909 750.2 987.706 761C992.372 771.504 997.416 782.953 1002.84 795.349C1003.12 795.987 1003.75 796.4 1004.44 796.4C1005.19 796.4 1005.86 795.924 1006.1 795.217C1010.37 782.872 1014.63 771.466 1018.89 761C1023.29 750.2 1027.48 740.4 1031.48 731.6L1049.66 689.675C1055.37 676.516 1068.35 668 1082.69 668H1108.73C1136.06 668 1153.43 697.262 1140.33 721.252L1072.94 844.672C1066.93 855.683 1067.09 869.03 1073.35 879.9L1144.89 1004.02C1158.72 1028.02 1141.4 1058 1113.7 1058H1082.78C1069.32 1058 1056.98 1050.49 1050.8 1038.53L1024.89 988.4C1019.69 978 1014.69 967.6 1009.89 957.2C1005.24 947.109 1000.4 936.264 995.364 924.666C995.083 924.019 994.445 923.6 993.74 923.6C992.997 923.6 992.334 924.064 992.077 924.76C987.809 936.323 983.353 947.136 978.711 957.2C974.314 967.6 969.716 978 964.919 988.4L941.159 1037.64C935.154 1050.09 922.555 1058 908.736 1058H882.558Z"
fill="white"
id="path10" />
</svg> </svg>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.2 KiB

After

Width:  |  Height:  |  Size: 4.6 KiB

169
icons/emblems/com.ublinux.ubinstall-gtk.recovery-complete.svg
Unescape View File

@ -1,18 +1,153 @@
<svg width="2000" height="2000" viewBox="0 0 2000 2000" fill="none" xmlns="http://www.w3.org/2000/svg"> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<rect width="2000" height="2000" fill="white"/> <svg
<path d="M218.28 400.63C201.711 400.63 188.28 414.061 188.28 430.63V1275C188.28 1291.57 201.711 1305 218.28 1305H999H1779.72C1796.29 1305 1809.72 1291.57 1809.72 1275V430.63C1809.72 414.062 1796.29 400.63 1779.72 400.63H999H218.28Z" fill="black"/> width="2000pt"
<path d="M1990 1624H1000H10L43.147 1675.69C48.6637 1684.3 58.1808 1689.5 68.4011 1689.5H1925.98C1935.43 1689.5 1944.33 1685.04 1950 1677.47L1990 1624Z" fill="#3F3F3F"/> height="2000pt"
<path fill-rule="evenodd" clip-rule="evenodd" d="M218.28 400.63C201.711 400.63 188.28 414.061 188.28 430.63V1275C188.28 1291.57 201.711 1305 218.28 1305H999H1779.72C1796.29 1305 1809.72 1291.57 1809.72 1275V430.63C1809.72 414.062 1796.29 400.63 1779.72 400.63H999H218.28ZM99 400.63C99 350.59 139.95 310 188.28 310H999H1809.72C1859.04 310 1899 350.41 1899 400.63V1386C1899 1402.57 1885.57 1416 1869 1416H999H129C112.431 1416 99 1402.57 99 1386V400.63Z" fill="#3F3F3F"/> viewBox="0 0 2000 2000"
<path d="M1990 1624L1907.32 1460.46C1902.22 1450.37 1891.87 1444 1880.55 1444H1000H117.633C106.222 1444 95.799 1450.47 90.7412 1460.7L10 1624H1000H1990Z" fill="#999999"/> fill="none"
<mask id="path-2-inside-1_34_83" fill="white"> version="1.1"
<path d="M99 400.63C99 350.59 139.95 310 188.28 310H999H1809.72C1859.04 310 1899 350.41 1899 400.63V1386C1899 1402.57 1885.57 1416 1869 1416H999H129C112.431 1416 99 1402.57 99 1386V400.63Z"/> id="svg13"
</mask> sodipodi:docname="Recovery.svg"
<path d="M99 400.63C99 350.59 139.95 310 188.28 310H999H1809.72C1859.04 310 1899 350.41 1899 400.63V1386C1899 1402.57 1885.57 1416 1869 1416H999H129C112.431 1416 99 1402.57 99 1386V400.63Z" fill="#1A1A1A" stroke="#3F3F3F" stroke-width="20" mask="url(#path-2-inside-1_34_83)"/> inkscape:version="1.3.2 (091e20ef0f, 2023-11-25, custom)"
<path d="M188 416C188 407.716 194.716 401 203 401H999H1795C1803.28 401 1810 407.716 1810 416V1303C1810 1311.28 1803.28 1318 1795 1318H999H203C194.716 1318 188 1311.28 188 1303V416Z" fill="#B73FE6"/> xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
<circle cx="998.5" cy="356.5" r="13.5" fill="black"/> xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
<circle cx="998.5" cy="356.5" r="10.5" fill="#0A0A0A"/> xmlns="http://www.w3.org/2000/svg"
<circle cx="998.5" cy="356.5" r="6.5" fill="#090909"/> xmlns:svg="http://www.w3.org/2000/svg">
<circle cx="998.5" cy="356.5" r="6.5" fill="black"/> <sodipodi:namedview
<circle cx="1039.5" cy="356.5" r="3.5" fill="white"/> id="namedview13"
<path d="M931.182 739.279L1091.82 1115L1189.78 885.837H1306V832.163H1154.49L1091.82 978.721L931.182 603L833.22 832.163H717V885.837H868.507L931.182 739.279Z" fill="white"/> pagecolor="#ffffff"
bordercolor="#000000"
borderopacity="0.25"
inkscape:showpageshadow="2"
inkscape:pageopacity="0.0"
inkscape:pagecheckerboard="0"
inkscape:deskcolor="#d1d1d1"
inkscape:zoom="0.4325"
inkscape:cx="1000"
inkscape:cy="1000"
inkscape:window-width="1920"
inkscape:window-height="1052"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="1"
inkscape:current-layer="svg13"
inkscape:document-units="pt" />
<path
d="M218.28 400.63C201.711 400.63 188.28 414.061 188.28 430.63V1275C188.28 1291.57 201.711 1305 218.28 1305H999H1779.72C1796.29 1305 1809.72 1291.57 1809.72 1275V430.63C1809.72 414.062 1796.29 400.63 1779.72 400.63H999H218.28Z"
fill="black"
id="path1" />
<path
d="M1990 1624H1000H10L43.147 1675.69C48.6637 1684.3 58.1808 1689.5 68.4011 1689.5H1925.98C1935.43 1689.5 1944.33 1685.04 1950 1677.47L1990 1624Z"
fill="#3F3F3F"
id="path2" />
<path
fill-rule="evenodd"
clip-rule="evenodd"
d="M218.28 400.63C201.711 400.63 188.28 414.061 188.28 430.63V1275C188.28 1291.57 201.711 1305 218.28 1305H999H1779.72C1796.29 1305 1809.72 1291.57 1809.72 1275V430.63C1809.72 414.062 1796.29 400.63 1779.72 400.63H999H218.28ZM99 400.63C99 350.59 139.95 310 188.28 310H999H1809.72C1859.04 310 1899 350.41 1899 400.63V1386C1899 1402.57 1885.57 1416 1869 1416H999H129C112.431 1416 99 1402.57 99 1386V400.63Z"
fill="#3F3F3F"
id="path3" />
<path
d="M1990 1624L1907.32 1460.46C1902.22 1450.37 1891.87 1444 1880.55 1444H1000H117.633C106.222 1444 95.799 1450.47 90.7412 1460.7L10 1624H1000H1990Z"
fill="#999999"
id="path4" />
<mask
id="path-2-inside-1_90_146"
fill="white">
<path
d="M99 400.63C99 350.59 139.95 310 188.28 310H999H1809.72C1859.04 310 1899 350.41 1899 400.63V1386C1899 1402.57 1885.57 1416 1869 1416H999H129C112.431 1416 99 1402.57 99 1386V400.63Z"
id="path5" />
</mask>
<path
d="M99 400.63C99 350.59 139.95 310 188.28 310H999H1809.72C1859.04 310 1899 350.41 1899 400.63V1386C1899 1402.57 1885.57 1416 1869 1416H999H129C112.431 1416 99 1402.57 99 1386V400.63Z"
fill="#1A1A1A"
stroke="#3F3F3F"
stroke-width="20"
mask="url(#path-2-inside-1_90_146)"
id="path6" />
<path
d="M188 416C188 407.716 194.716 401 203 401H999H1795C1803.28 401 1810 407.716 1810 416V1303C1810 1311.28 1803.28 1318 1795 1318H999H203C194.716 1318 188 1311.28 188 1303V416Z"
fill="#B73FE6"
id="path7" />
<circle
cx="998.5"
cy="356.5"
r="13.5"
fill="black"
id="circle7" />
<circle
cx="998.5"
cy="356.5"
r="10.5"
fill="#0A0A0A"
id="circle8" />
<circle
cx="998.5"
cy="356.5"
r="6.5"
fill="#090909"
id="circle9" />
<circle
cx="998.5"
cy="356.5"
r="6.5"
fill="black"
id="circle10" />
<circle
cx="1039.5"
cy="356.5"
r="3.5"
fill="white"
id="circle11" />
<g
filter="url(#filter0_d_90_146)"
id="g11">
<path
d="M931.182 739.279L1091.82 1115L1189.78 885.837H1306V832.163H1154.49L1091.82 978.721L931.182 603L833.22 832.163H717V885.837H868.507L931.182 739.279Z"
fill="white"
id="path11" />
</g>
<defs
id="defs13">
<filter
id="filter0_d_90_146"
x="717"
y="603"
width="593"
height="516"
filterUnits="userSpaceOnUse"
color-interpolation-filters="sRGB">
<feFlood
flood-opacity="0"
result="BackgroundImageFix"
id="feFlood11" />
<feColorMatrix
in="SourceAlpha"
type="matrix"
values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"
result="hardAlpha"
id="feColorMatrix11" />
<feOffset
dx="4"
dy="4"
id="feOffset11" />
<feComposite
in2="hardAlpha"
operator="out"
id="feComposite11" />
<feColorMatrix
type="matrix"
values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.25 0"
id="feColorMatrix12" />
<feBlend
mode="normal"
in2="BackgroundImageFix"
result="effect1_dropShadow_90_146"
id="feBlend12" />
<feBlend
mode="normal"
in="SourceGraphic"
in2="effect1_dropShadow_90_146"
result="shape"
id="feBlend13" />
</filter>
</defs>
</svg> </svg>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 4.9 KiB

167
icons/emblems/com.ublinux.ubinstall-gtk.settings-complete.svg
Unescape View File

@ -1,37 +1,132 @@
<svg width="2000" height="2000" viewBox="0 0 2000 2000" fill="none" xmlns="http://www.w3.org/2000/svg"> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<rect width="2000" height="2000" fill="white"/> <svg
<path d="M218.28 400.63C201.711 400.63 188.28 414.061 188.28 430.63V1275C188.28 1291.57 201.711 1305 218.28 1305H999H1779.72C1796.29 1305 1809.72 1291.57 1809.72 1275V430.63C1809.72 414.062 1796.29 400.63 1779.72 400.63H999H218.28Z" fill="black"/> width="2000pt"
<path d="M1990 1624H1000H10L43.147 1675.69C48.6637 1684.3 58.1808 1689.5 68.4011 1689.5H1925.98C1935.43 1689.5 1944.33 1685.04 1950 1677.47L1990 1624Z" fill="#3F3F3F"/> height="2000pt"
<path fill-rule="evenodd" clip-rule="evenodd" d="M218.28 400.63C201.711 400.63 188.28 414.061 188.28 430.63V1275C188.28 1291.57 201.711 1305 218.28 1305H999H1779.72C1796.29 1305 1809.72 1291.57 1809.72 1275V430.63C1809.72 414.062 1796.29 400.63 1779.72 400.63H999H218.28ZM99 400.63C99 350.59 139.95 310 188.28 310H999H1809.72C1859.04 310 1899 350.41 1899 400.63V1386C1899 1402.57 1885.57 1416 1869 1416H999H129C112.431 1416 99 1402.57 99 1386V400.63Z" fill="#3F3F3F"/> viewBox="0 0 2000 2000"
<path d="M1990 1624L1907.32 1460.46C1902.22 1450.37 1891.87 1444 1880.55 1444H1000H117.633C106.222 1444 95.799 1450.47 90.7412 1460.7L10 1624H1000H1990Z" fill="#999999"/> fill="none"
<mask id="path-2-inside-1_34_83" fill="white"> version="1.1"
<path d="M99 400.63C99 350.59 139.95 310 188.28 310H999H1809.72C1859.04 310 1899 350.41 1899 400.63V1386C1899 1402.57 1885.57 1416 1869 1416H999H129C112.431 1416 99 1402.57 99 1386V400.63Z"/> id="svg14"
</mask> sodipodi:docname="Finish-1.svg"
<path d="M99 400.63C99 350.59 139.95 310 188.28 310H999H1809.72C1859.04 310 1899 350.41 1899 400.63V1386C1899 1402.57 1885.57 1416 1869 1416H999H129C112.431 1416 99 1402.57 99 1386V400.63Z" fill="#1A1A1A" stroke="#3F3F3F" stroke-width="20" mask="url(#path-2-inside-1_34_83)"/> inkscape:version="1.3.2 (091e20ef0f, 2023-11-25, custom)"
<rect x="189" y="400" width="1619" height="904" rx="30" fill="#59BA8E"/> xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
<circle cx="998.5" cy="356.5" r="13.5" fill="black"/> xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
<circle cx="998.5" cy="356.5" r="10.5" fill="#0A0A0A"/> xmlns="http://www.w3.org/2000/svg"
<circle cx="998.5" cy="356.5" r="6.5" fill="#090909"/> xmlns:svg="http://www.w3.org/2000/svg">
<circle cx="998.5" cy="356.5" r="6.5" fill="black"/> <sodipodi:namedview
<circle cx="1039.5" cy="356.5" r="3.5" fill="white"/> id="namedview14"
<path d="M1050.21 670.806L1078.77 701.015C1082.12 704.557 1082.05 710.128 1078.6 713.577L1050.34 741.868L1078.71 771.877C1082.12 775.483 1081.97 781.173 1078.38 784.595L1045 816.391L1077.26 844L1106.95 815.37L1107.11 815.213C1110.59 812.021 1115.95 812.071 1119.37 815.326L1119.53 815.487L1147.81 843.795L1178.62 815.126L1178.95 814.834C1182.29 812.012 1187.19 812.012 1190.53 814.834L1190.86 815.126L1221.66 843.795L1251 814.424V639H1079.76L1050.21 670.806Z" fill="white"/> pagecolor="#ffffff"
<path d="M834 892.46L865.251 922L895.52 893.389L895.856 893.087C899.272 890.164 904.336 890.21 907.698 893.194L908.029 893.502L936.786 921.693L965.056 891.154L965.171 891.03L1001.91 856.109L973.481 826.107C970.122 822.562 970.199 816.987 973.654 813.536L1002 785.225L973.392 755.034C970.12 751.581 970.095 746.181 973.337 742.699L997.262 717H834V892.46Z" fill="white"/> bordercolor="#000000"
<path d="M943.468 924.935C940.016 928.659 934.164 928.801 930.535 925.248L901.703 897.02L871.451 925.581C867.974 928.863 862.535 928.863 859.059 925.581L834 901.923V1064H996.193L968.271 1037.49C964.443 1033.86 964.55 1027.73 968.502 1024.24L1002 994.593L973.201 960.987C970.004 957.257 970.392 951.656 974.073 948.4L1001.34 924.276L969.357 897L943.468 924.935Z" fill="white"/> borderopacity="0.25"
<path d="M1130.93 925.675C1127.39 928.968 1121.88 928.868 1118.46 925.449L1090.21 897.187L1058.1 928.145L1058.02 928.216L1027.43 955.348L1056.13 988.934C1059.32 992.662 1058.93 998.259 1055.26 1001.51L1022 1031.03L1056.63 1064H1228V902.499L1205.06 925.448C1201.64 928.868 1196.13 928.968 1192.59 925.675L1161.76 897L1130.93 925.675Z" fill="white"/> inkscape:showpageshadow="2"
<g filter="url(#filter0_d_34_83)"> inkscape:pageopacity="0.0"
<circle cx="1200.5" cy="1035.5" r="113.5" fill="#3CC97B"/> inkscape:pagecheckerboard="0"
</g> inkscape:deskcolor="#d1d1d1"
<path d="M1168.86 1029.73H1137.69C1135.33 1029.73 1134.12 1032.45 1135.74 1034.1L1146.88 1045.48L1152.68 1051.4L1196.55 1096.19C1197.43 1097.08 1198.79 1097.24 1199.84 1096.65C1200.06 1096.53 1200.26 1096.38 1200.45 1096.19L1261.26 1034.1C1262.88 1032.45 1261.67 1029.73 1259.31 1029.73H1228.14C1226.65 1029.73 1225.45 1028.57 1225.45 1027.14V972.589C1225.45 971.159 1224.25 970 1222.77 970H1221.15H1212.82H1199.84H1190.75H1174.23C1172.75 970 1171.55 971.159 1171.55 972.589V1002.01V1027.14C1171.55 1028.57 1170.35 1029.73 1168.86 1029.73Z" fill="white"/> inkscape:zoom="0.4325"
<defs> inkscape:cx="1000"
<filter id="filter0_d_34_83" x="1083" y="922" width="235" height="235" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB"> inkscape:cy="1000"
<feFlood flood-opacity="0" result="BackgroundImageFix"/> inkscape:window-width="1920"
<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/> inkscape:window-height="1052"
<feOffset dy="4"/> inkscape:window-x="0"
<feGaussianBlur stdDeviation="2"/> inkscape:window-y="0"
<feComposite in2="hardAlpha" operator="out"/> inkscape:window-maximized="1"
<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.25 0"/> inkscape:current-layer="svg14"
<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_34_83"/> inkscape:document-units="pt" />
<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_34_83" result="shape"/> <defs
</filter> id="defs14" />
</defs> <path
d="M218.28 400.63C201.711 400.63 188.28 414.061 188.28 430.63V1275C188.28 1291.57 201.711 1305 218.28 1305H999H1779.72C1796.29 1305 1809.72 1291.57 1809.72 1275V430.63C1809.72 414.062 1796.29 400.63 1779.72 400.63H999H218.28Z"
fill="black"
id="path1" />
<path
d="M1990 1624H1000H10L43.147 1675.69C48.6637 1684.3 58.1808 1689.5 68.4011 1689.5H1925.98C1935.43 1689.5 1944.33 1685.04 1950 1677.47L1990 1624Z"
fill="#3F3F3F"
id="path2" />
<path
fill-rule="evenodd"
clip-rule="evenodd"
d="M218.28 400.63C201.711 400.63 188.28 414.061 188.28 430.63V1275C188.28 1291.57 201.711 1305 218.28 1305H999H1779.72C1796.29 1305 1809.72 1291.57 1809.72 1275V430.63C1809.72 414.062 1796.29 400.63 1779.72 400.63H999H218.28ZM99 400.63C99 350.59 139.95 310 188.28 310H999H1809.72C1859.04 310 1899 350.41 1899 400.63V1386C1899 1402.57 1885.57 1416 1869 1416H999H129C112.431 1416 99 1402.57 99 1386V400.63Z"
fill="#3F3F3F"
id="path3" />
<path
d="M1990 1624L1907.32 1460.46C1902.22 1450.37 1891.87 1444 1880.55 1444H1000H117.633C106.222 1444 95.799 1450.47 90.7412 1460.7L10 1624H1000H1990Z"
fill="#999999"
id="path4" />
<mask
id="path-2-inside-1_90_172"
fill="white">
<path
d="M99 400.63C99 350.59 139.95 310 188.28 310H999H1809.72C1859.04 310 1899 350.41 1899 400.63V1386C1899 1402.57 1885.57 1416 1869 1416H999H129C112.431 1416 99 1402.57 99 1386V400.63Z"
id="path5" />
</mask>
<path
d="M99 400.63C99 350.59 139.95 310 188.28 310H999H1809.72C1859.04 310 1899 350.41 1899 400.63V1386C1899 1402.57 1885.57 1416 1869 1416H999H129C112.431 1416 99 1402.57 99 1386V400.63Z"
fill="#1A1A1A"
stroke="#3F3F3F"
stroke-width="20"
mask="url(#path-2-inside-1_90_172)"
id="path6" />
<rect
x="189"
y="400"
width="1619"
height="904"
rx="30"
fill="#59BA8E"
id="rect6" />
<circle
cx="998.5"
cy="356.5"
r="13.5"
fill="black"
id="circle6" />
<circle
cx="998.5"
cy="356.5"
r="10.5"
fill="#0A0A0A"
id="circle7" />
<circle
cx="998.5"
cy="356.5"
r="6.5"
fill="#090909"
id="circle8" />
<circle
cx="998.5"
cy="356.5"
r="6.5"
fill="black"
id="circle9" />
<circle
cx="1039.5"
cy="356.5"
r="3.5"
fill="white"
id="circle10" />
<path
d="M1050.21 670.806L1078.77 701.015C1082.12 704.557 1082.05 710.128 1078.6 713.577L1050.34 741.868L1078.71 771.877C1082.12 775.483 1081.97 781.173 1078.38 784.595L1045 816.391L1077.26 844L1106.95 815.37L1107.11 815.213C1110.59 812.021 1115.95 812.071 1119.37 815.326L1119.53 815.487L1147.81 843.795L1178.62 815.126L1178.95 814.834C1182.29 812.012 1187.19 812.012 1190.53 814.834L1190.86 815.126L1221.66 843.795L1251 814.424V639H1079.76L1050.21 670.806Z"
fill="white"
id="path10" />
<path
d="M834 892.46L865.251 922L895.52 893.389L895.856 893.087C899.272 890.164 904.336 890.21 907.698 893.194L908.029 893.502L936.786 921.693L965.056 891.154L965.171 891.03L1001.91 856.109L973.481 826.107C970.122 822.562 970.199 816.987 973.654 813.536L1002 785.225L973.392 755.034C970.12 751.581 970.095 746.181 973.337 742.699L997.262 717H834V892.46Z"
fill="white"
id="path11" />
<path
d="M943.468 924.935C940.016 928.659 934.164 928.801 930.535 925.248L901.703 897.02L871.451 925.581C867.974 928.863 862.535 928.863 859.059 925.581L834 901.923V1064H996.193L968.271 1037.49C964.443 1033.86 964.55 1027.73 968.502 1024.24L1002 994.593L973.201 960.987C970.004 957.257 970.392 951.656 974.073 948.4L1001.34 924.276L969.357 897L943.468 924.935Z"
fill="white"
id="path12" />
<path
d="M1130.93 925.675C1127.39 928.968 1121.88 928.868 1118.46 925.449L1090.21 897.187L1058.1 928.145L1058.02 928.216L1027.43 955.348L1056.13 988.934C1059.32 992.662 1058.93 998.259 1055.26 1001.51L1022 1031.03L1056.63 1064H1228V902.499L1205.06 925.448C1201.64 928.868 1196.13 928.968 1192.59 925.675L1161.76 897L1130.93 925.675Z"
fill="white"
id="path13" />
<circle
cx="1197.5"
cy="1047.5"
r="113.5"
fill="#16A364"
id="circle13" />
<path
d="M1165.86 1041.73H1134.69C1132.33 1041.73 1131.12 1044.45 1132.74 1046.1L1143.88 1057.48L1149.68 1063.4L1193.55 1108.19C1194.43 1109.08 1195.79 1109.24 1196.84 1108.65C1197.06 1108.53 1197.26 1108.38 1197.45 1108.19L1258.26 1046.1C1259.88 1044.45 1258.67 1041.73 1256.31 1041.73H1225.14C1223.65 1041.73 1222.45 1040.57 1222.45 1039.14V984.589C1222.45 983.159 1221.25 982 1219.77 982H1218.15H1209.82H1196.84H1187.75H1171.23C1169.75 982 1168.55 983.159 1168.55 984.589V1014.01V1039.14C1168.55 1040.57 1167.35 1041.73 1165.86 1041.73Z"
fill="white"
id="path14" />
</svg> </svg>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.9 KiB

After

Width:  |  Height:  |  Size: 5.7 KiB

13
locale/ubinstall-gtk.pot
Unescape View File

@ -615,7 +615,7 @@ msgid "Installer configuration has been finished"
msgstr "" msgstr ""
#: source/ubl-strings.h:163 #: source/ubl-strings.h:163
msgid "Choose a save option on the header bar" msgid "You can now proceed to saving the settings"
msgstr "" msgstr ""
#: source/ubl-strings.h:165 #: source/ubl-strings.h:165
@ -1621,7 +1621,7 @@ msgstr ""
#: source/ubl-strings.h:441 #: source/ubl-strings.h:441
msgid "" msgid ""
"Selecting additional system kernel components from the repository. Internet " "Selecting additional kernel components to install from the repository. Internet "
"access required" "access required"
msgstr "" msgstr ""
@ -5348,6 +5348,9 @@ msgstr ""
#: source/libublsettingsui-gtk3.h:675 #: source/libublsettingsui-gtk3.h:675
msgid "Uncheck all" msgid "Uncheck all"
#: source/libublsettingsui-gtk3.h:675
msgid "Check all"
msgstr "" msgstr ""
msgid "Close installer" msgid "Close installer"
@ -5370,3 +5373,9 @@ msgstr ""
msgid "Exit" msgid "Exit"
msgstr "" msgstr ""
msgid "Model"
msgstr ""
msgid "Vendor"
msgstr ""

18
locale/ubinstall-gtk_ru.po
Unescape View File

@ -634,8 +634,8 @@ msgid "Installer configuration has been finished"
msgstr "Настройка конфигурации завершена" msgstr "Настройка конфигурации завершена"
#: source/ubl-strings.h:163 #: source/ubl-strings.h:163
msgid "Choose a save option on the header bar" msgid "You can now proceed to saving the settings"
msgstr "Выберите опцию сохранения на верхней панели" msgstr "Можно приступить к сохранению настроек"
#: source/ubl-strings.h:165 #: source/ubl-strings.h:165
msgid "Configuration has been saved" msgid "Configuration has been saved"
@ -1653,10 +1653,10 @@ msgstr ""
#: source/ubl-strings.h:441 #: source/ubl-strings.h:441
msgid "" msgid ""
"Selecting additional system kernel components from the repository. Internet " "Selecting additional kernel components to install from the repository. Internet "
"access required" "access required"
msgstr "" msgstr ""
"Выбор дополнительных модулей ядра из репозитория. Требуется доступ в Интернет" "Выбор дополнительных компонентов ядра для установки из репозитория. Требуется доступ в Интернет"
#: source/ubl-strings.h:443 #: source/ubl-strings.h:443
msgid "Product ecosystem" msgid "Product ecosystem"
@ -5545,6 +5545,10 @@ msgstr "Режим отладки"
msgid "Uncheck all" msgid "Uncheck all"
msgstr "Снять всё" msgstr "Снять всё"
#: source/libublsettingsui-gtk3.h:675
msgid "Check all"
msgstr "Отметить всё"
msgid "Close installer" msgid "Close installer"
msgstr "Закрыть установщик" msgstr "Закрыть установщик"
@ -5565,3 +5569,9 @@ msgstr "Аутентификация в меню загрузчика"
msgid "Exit" msgid "Exit"
msgstr "Выход" msgstr "Выход"
msgid "Model"
msgstr "Модель"
msgid "Vendor"
msgstr "Вендор"

31
source/ubinstall-gtk-advanced.c
Unescape View File

@ -230,20 +230,45 @@ gboolean yon_advanced_part_save(main_window *widgets){
} }
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(part1->SystemSectionToggle))){ if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(part1->SystemSectionToggle))){
if (!yon_advanced_part_save_part(data1)&&!yon_advanced_part_save_part(data2)){ if (!yon_advanced_part_save_part(data1)&&!yon_advanced_part_save_part(data2)){
yon_config_remove_by_args(device_parameter,
device_parameter,
part_parameter,
part_size_parameter,
part_label_parameter,
part_fs_type_parameter,
part_fs_label_parameter,
part_crypt_parameter,
part_format_parameter,
NULL);
return 0; return 0;
} }
} else { } else {
yon_advanced_part_save_part(data2); if (!yon_advanced_part_save_part(data2)&&!yon_advanced_part_save_part(data1)) {
yon_advanced_part_save_part(data1); yon_config_remove_by_args(device_parameter,
device_parameter,
part_parameter,
part_size_parameter,
part_label_parameter,
part_fs_type_parameter,
part_fs_label_parameter,
part_crypt_parameter,
part_format_parameter,
NULL);
return 0;
} }
} }
return 1; return 1;
}
yon_ubl_status_box_spawn(GTK_CONTAINER(widgets->StatusBox),NOTHING_CHOSEN_LABEL,5,BACKGROUND_IMAGE_FAIL_TYPE);
return 0;
} }
int yon_advanced_save(main_window *widgets){ int yon_advanced_save(main_window *widgets){
yon_config_register(AUTOINSTALL_TYPE_INSTALL,AUTOINSTALL_TYPE_INSTALL_command,"custom"); yon_config_register(AUTOINSTALL_TYPE_INSTALL,AUTOINSTALL_TYPE_INSTALL_command,"custom");
yon_advanced_part_clean_config(); yon_advanced_part_clean_config();
yon_advanced_part_save(widgets); if (!yon_advanced_part_save(widgets)){
return 0;
}
if (gtk_switch_get_active(GTK_SWITCH(widgets->AdvancedLoadTypeSwitch))){ if (gtk_switch_get_active(GTK_SWITCH(widgets->AdvancedLoadTypeSwitch))){
char *boot = NULL; char *boot = NULL;
if (gtk_switch_get_active(GTK_SWITCH(widgets->AdvancedBiosSectorSwitch))){ if (gtk_switch_get_active(GTK_SWITCH(widgets->AdvancedBiosSectorSwitch))){

5
source/ubinstall-gtk-bootloader.c
Unescape View File

@ -15,8 +15,10 @@ int yon_bootloader_save(main_window *widgets){
yon_config_remove_by_key(parameter); yon_config_remove_by_key(parameter);
free(parameter); free(parameter);
} }
char *old_packages = config(GRUB_SUPERUSERS_parameter);
yon_config_register(GRUB_SUPERUSERS_parameter,GRUB_SUPERUSERS_parameter_command,NULL); yon_config_register(GRUB_SUPERUSERS_parameter,GRUB_SUPERUSERS_parameter_command,NULL);
yon_config_set_status(GRUB_SUPERUSERS_parameter,-1); int status = yon_char_is_empty(old_packages);
yon_config_set_status(GRUB_SUPERUSERS_parameter,status-1);
} }
if (!gtk_switch_get_active(GTK_SWITCH(widgets->BootloadNoPasswordSwitch))){ if (!gtk_switch_get_active(GTK_SWITCH(widgets->BootloadNoPasswordSwitch))){
@ -44,6 +46,7 @@ int yon_bootloader_save(main_window *widgets){
config_str users = yon_config_get_all_keys_by_key(GRUB_PASSWORD_parameter_search,&user_size); config_str users = yon_config_get_all_keys_by_key(GRUB_PASSWORD_parameter_search,&user_size);
yon_char_parsed_add_or_create_if_exists(users,&user_size,GRUB_SUPERUSERS_parameter); yon_char_parsed_add_or_create_if_exists(users,&user_size,GRUB_SUPERUSERS_parameter);
yon_char_parsed_add_or_create_if_exists(users,&user_size,GRUB_TIMEOUT_parameter); yon_char_parsed_add_or_create_if_exists(users,&user_size,GRUB_TIMEOUT_parameter);
yon_char_parsed_add_or_create_if_exists(users,&user_size,GRUB_DEFAULT_parameter);
yon_debug_output("%s\n",yon_config_save_list_simple(users, user_size,main_config.config_load_path)); yon_debug_output("%s\n",yon_config_save_list_simple(users, user_size,main_config.config_load_path));
} }

195
source/ubinstall-gtk-components.c
Unescape View File

@ -1,105 +1,53 @@
#include "ubinstall-gtk.h" #include "ubinstall-gtk.h"
// void on_os_components_uncheck_all(GtkWidget *,main_window *widgets){
int yon_kernel_save(main_window *widgets){ // int active = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widgets->OSSoftwareUncheckAllCheck));
GList *list = gtk_container_get_children(GTK_CONTAINER(widgets->KernelListBox)); // switch(active){
char *config_val = config(packages_parameter); // case 1:{
if (yon_char_is_empty(config_val)) { // GList *list = gtk_container_get_children(GTK_CONTAINER(widgets->OSSoftwareListBox));
yon_config_register(packages_parameter,packages_parameter_command,NULL); // GList *iter;
yon_config_set_status(packages_parameter,-1); // for(iter = list;iter;iter=iter->next){
} // os_row *row = g_object_get_data(iter->data,"kernel_row");
char *enabled_module = NULL; // int sensitive = gtk_widget_get_sensitive(row->InstallCheck);
int overall_size = 0; // if (sensitive){
int active_size = 0; // gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(row->InstallCheck),0);
for(GList *iter = list;iter;iter = iter->next){ // }
overall_size++; // }
kernel_row *row = g_object_get_data(G_OBJECT(iter->data),"kernel_row"); // } break;
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(row->InstallCheck))){ // }
if (gtk_widget_get_sensitive(row->InstallCheck)){ // gtk_widget_hide(widgets->OSSoftwareUncheckAllCheck);
char *append_str = yon_char_replace(row->modules," ",","); // g_signal_handlers_block_by_func(G_OBJECT(widgets->OSSoftwareUncheckAllCheck),on_os_components_uncheck_all,widgets);
yon_config_append_elements(packages_parameter,append_str,","); // gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widgets->OSSoftwareUncheckAllCheck),0);
free(append_str); // g_signal_handlers_unblock_by_func(G_OBJECT(widgets->OSSoftwareUncheckAllCheck),on_os_components_uncheck_all,widgets);
active_size++; // }
}
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(row->EnableRadio))){ void on_os_components_switch_all(GtkWidget *self,main_window *widgets){
enabled_module = row->package; g_signal_handlers_block_by_func(G_OBJECT(self),G_CALLBACK(on_os_components_switch_all),widgets);
} gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(self),0);
} else { g_signal_handlers_unblock_by_func(G_OBJECT(self),G_CALLBACK(on_os_components_switch_all),widgets);
char *append_str = yon_char_replace(row->modules," ",","); int active = !!g_object_get_data(G_OBJECT(self),"uncheck");
yon_config_remove_elements(packages_parameter,append_str,",");
free(append_str);
}
}
if (!yon_char_is_empty(enabled_module)){
yon_config_register(KERNEL_BOOT_parameter,KERNEL_BOOT_parameter_command,enabled_module);
} else {
yon_config_remove_by_key(KERNEL_BOOT_parameter);
}
if (!main_config.configure_mode){
yon_debug_output("%s\n",yon_config_save_args_simple(main_config.config_load_path,packages_parameter, KERNEL_BOOT_parameter,NULL));
}
return 1;
}
int yon_kernel_addon_save(main_window *widgets){
char *parameter = config(packages_parameter);
GList *list = gtk_container_get_children(GTK_CONTAINER(widgets->KernelAddonListBox));
if (yon_char_is_empty(parameter)){
yon_config_register(packages_parameter,packages_parameter_command,NULL);
}
for(GList *iter = list;iter;iter = iter->next){
kernel_addon_row *row = g_object_get_data(G_OBJECT(iter->data),"kernel_row");
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(row->InstallCheck))){
if (gtk_widget_get_sensitive(row->InstallCheck)){
yon_config_append_elements(packages_parameter,row->modules,",");
}
} else {
char *append_str = yon_char_replace(row->modules," ",",");
yon_config_remove_elements(packages_parameter,row->modules,",");
free(append_str);
}
}
if (!main_config.configure_mode){
int size;
config_str parameters = yon_config_get_save_parameters_by_key(&size,packages_parameter,NULL);
if (parameters){
char *command_parameters = yon_char_parsed_to_string(parameters,size," -- ");
char *command = yon_char_unite(ubconfig_dull_command,"--target system ",command_parameters,NULL);
if (!system(yon_debug_output("%s\n",command))){}
free(command);
yon_char_parsed_free(parameters,size);
}
}
return 1;
}
void on_os_components_uncheck_all(GtkWidget *,main_window *widgets){
int active = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widgets->OSSoftwareUncheckAllCheck));
switch(active){
case 1:{
GList *list = gtk_container_get_children(GTK_CONTAINER(widgets->OSSoftwareListBox)); GList *list = gtk_container_get_children(GTK_CONTAINER(widgets->OSSoftwareListBox));
GList *iter; GList *iter;
for(iter = list;iter;iter=iter->next){ for(iter = list;iter;iter=iter->next){
os_row *row = g_object_get_data(iter->data,"kernel_row"); os_row *row = g_object_get_data(iter->data,"kernel_row");
int sensitive = gtk_widget_get_sensitive(row->InstallCheck); int sensitive = gtk_widget_get_sensitive(row->InstallCheck);
if (sensitive){ if (sensitive){
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(row->InstallCheck),0); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(row->InstallCheck),!active);
} }
} }
} break; switch(active){
case 0: gtk_button_set_label(GTK_BUTTON(self),UNCHECK_ALL_LABEL);
g_object_set_data(G_OBJECT(self),"uncheck",widgets);
break;
case 1: gtk_button_set_label(GTK_BUTTON(self),CHECK_ALL_LABEL);
g_object_set_data(G_OBJECT(self),"uncheck",NULL);
} }
gtk_widget_hide(widgets->OSSoftwareUncheckAllCheck);
g_signal_handlers_block_by_func(G_OBJECT(widgets->OSSoftwareUncheckAllCheck),on_os_components_uncheck_all,widgets);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widgets->OSSoftwareUncheckAllCheck),0);
g_signal_handlers_unblock_by_func(G_OBJECT(widgets->OSSoftwareUncheckAllCheck),on_os_components_uncheck_all,widgets);
} }
int yon_os_components_check_packages_size(GtkWidget *, main_window *widgets){ int yon_os_components_check_packages_size(GtkWidget *, main_window *widgets){
long pacman_size = 0; long pacman_size = 0;
{ {
int active = 1;
GList *list = gtk_container_get_children(GTK_CONTAINER(widgets->OSSoftwareListBox)); GList *list = gtk_container_get_children(GTK_CONTAINER(widgets->OSSoftwareListBox));
GList *listiter; GList *listiter;
for (listiter=list;listiter;listiter=listiter->next){ for (listiter=list;listiter;listiter=listiter->next){
@ -108,10 +56,18 @@ int yon_os_components_check_packages_size(GtkWidget *, main_window *widgets){
long cur_size = row->size_raw; long cur_size = row->size_raw;
pacman_size += cur_size; pacman_size += cur_size;
if (gtk_widget_get_sensitive(row->InstallCheck)){ if (gtk_widget_get_sensitive(row->InstallCheck)){
gtk_widget_show(widgets->OSSoftwareUncheckAllCheck); // gtk_widget_show(widgets->OSSoftwareUncheckAllCheck);
active = 0;
} }
} }
} }
switch(active){
case 0: gtk_button_set_label(GTK_BUTTON(widgets->OSSoftwareUncheckAllCheck),UNCHECK_ALL_LABEL);
g_object_set_data(G_OBJECT(widgets->OSSoftwareUncheckAllCheck),"uncheck",widgets);
break;
case 1: gtk_button_set_label(GTK_BUTTON(widgets->OSSoftwareUncheckAllCheck),CHECK_ALL_LABEL);
g_object_set_data(G_OBJECT(widgets->OSSoftwareUncheckAllCheck),"uncheck",NULL);
}
} }
{ {
GtkTreeIter iter; GtkTreeIter iter;
@ -348,12 +304,9 @@ void yon_os_components_init(main_window *widgets){
if (!main_config.configure_mode){ if (!main_config.configure_mode){
yon_config_update_by_args(main_config.config_load_path, modules_parameter,NULL); yon_config_update_by_args(main_config.config_load_path, modules_parameter,NULL);
} }
// int size = 0;
GList *list = gtk_container_get_children(GTK_CONTAINER(widgets->OSSoftwareListBox)); GList *list = gtk_container_get_children(GTK_CONTAINER(widgets->OSSoftwareListBox));
GList *iter; GList *iter;
for (iter=list;iter;iter=iter->next){ for (iter=list;iter;iter=iter->next){
// os_row *row = g_object_get_data(iter->data,"kernel_row");
// free(row);
gtk_widget_destroy(GTK_WIDGET(iter->data)); gtk_widget_destroy(GTK_WIDGET(iter->data));
} }
if (!gtk_widget_get_parent(widgets->OSSpinner)) if (!gtk_widget_get_parent(widgets->OSSpinner))
@ -364,25 +317,48 @@ void yon_os_components_init(main_window *widgets){
while(gtk_events_pending()) gtk_main_iteration(); while(gtk_events_pending()) gtk_main_iteration();
} }
void on_software_uncheck_all(GtkWidget *, main_window *widgets){ // void on_software_uncheck_all(GtkWidget *, main_window *widgets){
int active = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widgets->AdditionalComponentsUncheckAllCheck)); // int active = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widgets->AdditionalComponentsUncheckAllCheck));
switch(active){ // switch(active){
case 1:{ // case 1:{
// GList *list = gtk_container_get_children(GTK_CONTAINER(widgets->AdditionalComponentsList));
// GList *iter;
// for(iter = list;iter;iter=iter->next){
// os_row *row = g_object_get_data(iter->data,"kernel_row");
// int sensitive = gtk_widget_get_sensitive(row->InstallCheck);
// if (sensitive){
// gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(row->InstallCheck),0);
// }
// }
// } break;
// }
// gtk_widget_hide(widgets->AdditionalComponentsUncheckAllCheck);
// g_signal_handlers_block_by_func(G_OBJECT(widgets->AdditionalComponentsUncheckAllCheck),on_software_switch_all,widgets);
// gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widgets->AdditionalComponentsUncheckAllCheck),0);
// g_signal_handlers_unblock_by_func(G_OBJECT(widgets->AdditionalComponentsUncheckAllCheck),on_software_switch_all,widgets);
// }
void on_software_switch_all(GtkWidget *self,main_window *widgets){
g_signal_handlers_block_by_func(G_OBJECT(self),G_CALLBACK(on_software_switch_all),widgets);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(self),0);
g_signal_handlers_unblock_by_func(G_OBJECT(self),G_CALLBACK(on_software_switch_all),widgets);
int active = !!g_object_get_data(G_OBJECT(self),"uncheck");
GList *list = gtk_container_get_children(GTK_CONTAINER(widgets->AdditionalComponentsList)); GList *list = gtk_container_get_children(GTK_CONTAINER(widgets->AdditionalComponentsList));
GList *iter; GList *iter;
for(iter = list;iter;iter=iter->next){ for(iter = list;iter;iter=iter->next){
os_row *row = g_object_get_data(iter->data,"kernel_row"); os_row *row = g_object_get_data(iter->data,"kernel_row");
int sensitive = gtk_widget_get_sensitive(row->InstallCheck); int sensitive = gtk_widget_get_sensitive(row->InstallCheck);
if (sensitive){ if (sensitive){
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(row->InstallCheck),0); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(row->InstallCheck),!active);
} }
} }
} break; switch(active){
case 0: gtk_button_set_label(GTK_BUTTON(self),UNCHECK_ALL_LABEL);
g_object_set_data(G_OBJECT(self),"uncheck",widgets);
break;
case 1: gtk_button_set_label(GTK_BUTTON(self),CHECK_ALL_LABEL);
g_object_set_data(G_OBJECT(self),"uncheck",NULL);
} }
gtk_widget_hide(widgets->AdditionalComponentsUncheckAllCheck);
g_signal_handlers_block_by_func(G_OBJECT(widgets->AdditionalComponentsUncheckAllCheck),on_software_uncheck_all,widgets);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widgets->AdditionalComponentsUncheckAllCheck),0);
g_signal_handlers_unblock_by_func(G_OBJECT(widgets->AdditionalComponentsUncheckAllCheck),on_software_uncheck_all,widgets);
} }
int yon_software_save(main_window *widgets){ int yon_software_save(main_window *widgets){
@ -427,6 +403,7 @@ int yon_software_save(main_window *widgets){
int yon_software_check_packages_size(GtkWidget *, main_window *widgets){ int yon_software_check_packages_size(GtkWidget *, main_window *widgets){
long pacman_size = 0; long pacman_size = 0;
{ {
int active = 1;
GList *list = gtk_container_get_children(GTK_CONTAINER(widgets->AdditionalComponentsList)); GList *list = gtk_container_get_children(GTK_CONTAINER(widgets->AdditionalComponentsList));
GList *listiter; GList *listiter;
for (listiter=list;listiter;listiter=listiter->next){ for (listiter=list;listiter;listiter=listiter->next){
@ -435,9 +412,17 @@ int yon_software_check_packages_size(GtkWidget *, main_window *widgets){
long cur_size = row->size_raw; long cur_size = row->size_raw;
pacman_size += cur_size; pacman_size += cur_size;
if (gtk_widget_get_sensitive(row->InstallCheck)){ if (gtk_widget_get_sensitive(row->InstallCheck)){
gtk_widget_show(widgets->AdditionalComponentsUncheckAllCheck); // gtk_widget_show(widgets->AdditionalComponentsUncheckAllCheck);
active = 0;
}
} }
} }
switch(active){
case 0: gtk_button_set_label(GTK_BUTTON(widgets->AdditionalComponentsUncheckAllCheck),UNCHECK_ALL_LABEL);
g_object_set_data(G_OBJECT(widgets->AdditionalComponentsUncheckAllCheck),"uncheck",widgets);
break;
case 1: gtk_button_set_label(GTK_BUTTON(widgets->AdditionalComponentsUncheckAllCheck),CHECK_ALL_LABEL);
g_object_set_data(G_OBJECT(widgets->AdditionalComponentsUncheckAllCheck),"uncheck",NULL);
} }
} }
{ {
@ -567,8 +552,10 @@ int yon_pacman_software_save(main_window *widgets){
if (!yon_installation_check_packages_size(widgets)) return 0; if (!yon_installation_check_packages_size(widgets)) return 0;
GtkTreeIter iter; GtkTreeIter iter;
GtkTreeModel *model = GTK_TREE_MODEL(widgets->PacmanSoftwareChosenList); GtkTreeModel *model = GTK_TREE_MODEL(widgets->PacmanSoftwareChosenList);
char *old_packages = config(packages_parameter);
yon_config_register(packages_parameter,packages_parameter_command,NULL); yon_config_register(packages_parameter,packages_parameter_command,NULL);
yon_config_set_status(packages_parameter,-1); int status = yon_char_is_empty(old_packages);
yon_config_set_status(packages_parameter,status-1);
for_iter(model,&iter){ for_iter(model,&iter){
char *target; char *target;
@ -764,8 +751,8 @@ void *yon_pacman_load(struct pacman_struct *pacman){
const char *find_package = pacman->find_package; const char *find_package = pacman->find_package;
// char *command = get_local_module_info_command(find_package); // char *command = get_local_module_info_command(find_package);
pacman->packages = yon_packages_find(YON_PACKAGES_SYNC,find_package,&pacman->packages_size); pacman->packages = yon_packages_find(YON_PACKAGES_SYNC,find_package,&pacman->packages_size);
// g_idle_add((GSourceFunc)yon_pacman_fill,pacman); g_idle_add((GSourceFunc)yon_pacman_fill,pacman);
yon_pacman_fill(pacman); // yon_pacman_fill(pacman);
return NULL; return NULL;
} }

29
source/ubinstall-gtk-config-hub.c
Unescape View File

@ -109,34 +109,7 @@ int yon_configuration_hub_save(main_window *widgets){
} }
if (!main_config.configure_mode){ if (!main_config.configure_mode){
int size; int size;
config_str parameters = yon_config_get_save_parameters_by_key(&size,modules_parameter, config_str parameters = yon_config_get_save_parameters_by_key(&size,
packages_parameter,
root_password_parameter,
autologin_parameter,
xkbmodel_parameter,
xkblayout_parameter,
xkbvariant_parameter,
xkboptions_parameter,
hostname_parameter,
zone_parameter,
lang_parameter,
locale_parameter,
num_lock_boot_parameter,
swap_parameter,
swap_size_parameter,
boot_parameter,
packages_parameter,
device_typevfs_parameter,
NTPSERVERS_parameter,
DOMAIN_parameter,
DOMAIN_admanger_parameter,
KERNEL_BOOT_parameter,
SERVICES_ENABLE_parameter,
AUTOEXEC_parameter,
GRUB_SUPERUSERS_parameter,
GRUB_TIMEOUT_parameter,
GRUB_DEFAULT_parameter,
AUTOLOGINUSER_parameter,
finish_parameter, finish_parameter,
NULL); NULL);
if (parameters){ if (parameters){

2
source/ubinstall-gtk-configuration-mode.c
Unescape View File

@ -32,7 +32,7 @@ int yon_configuration_path_check(const char *path){
dialog_confirmation_data *data = yon_confirmation_dialog_data_new(); dialog_confirmation_data *data = yon_confirmation_dialog_data_new();
data->action_text = homedir_create?CREATE_CONFIG_DIALOG_LABEL_HOMEDIR:CREATE_CONFIG_DIALOG_LABEL; data->action_text = homedir_create?CREATE_CONFIG_DIALOG_LABEL_HOMEDIR:CREATE_CONFIG_DIALOG_LABEL;
data->title = WARNING_TITLE_LABEL; data->title = WARNING_TITLE_LABEL;
if (yon_confirmation_dialog_call(NULL,data)==GTK_RESPONSE_ACCEPT){ if ((!yon_char_is_empty(main_config.force_ini)&&!strcmp(main_config.force_ini,path))||yon_confirmation_dialog_call(NULL,data)==GTK_RESPONSE_ACCEPT){
char *dir_path = yon_file_get_parent(full_path); char *dir_path = yon_file_get_parent(full_path);
if (access(full_path,F_OK)&&(access(dir_path,W_OK)||access(dir_path,R_OK))){ if (access(full_path,F_OK)&&(access(dir_path,W_OK)||access(dir_path,R_OK))){
if (system(ubconfig_file_create_pkexec(full_path))){ if (system(ubconfig_file_create_pkexec(full_path))){

42
source/ubinstall-gtk-install-start.c
Unescape View File

@ -22,7 +22,47 @@ void *on_quick_install_start(void *data){
g_idle_add((GSourceFunc)yon_progress_bar_start,widgets); g_idle_add((GSourceFunc)yon_progress_bar_start,widgets);
if (!main_config.dry_run){ if (!main_config.dry_run){
char *command = yon_debug_output("%s\n",quick_install_command(main_config.config_load_path)); char *install_path = main_config.config_load_path;
if (!install_path) install_path = "system";
char *command = yon_debug_output("%s\n",auto_install_command(install_path));
yon_debug_output("%s\n","Entered installation");
if (system(yon_debug_output("%s\n",command))){
gdk_threads_add_idle((GSourceFunc)on_install_error,widgets);
free(command);
g_mutex_lock(&main_config.install_mutex);
main_config.install_complete=1;
g_mutex_unlock(&main_config.install_mutex);
return 0;
};
free(command);
g_mutex_lock(&main_config.install_mutex);
main_config.install_complete=1;
g_mutex_unlock(&main_config.install_mutex);
g_idle_add((GSourceFunc)on_install_success,widgets);
} else {
yon_launch("ubconfig --source system get /");
}
return 0;
}
void on_autoinstall_start(GtkWidget *, main_window *widgets){
main_config.save_configured=1;
gtk_widget_show(gtk_widget_get_parent(widgets->InstallationProgress));
pthread_create(&main_config.install_thread,NULL,on_auto_install_start,widgets);
gtk_notebook_set_current_page(GTK_NOTEBOOK(widgets->Notebook),YON_PAGE_INSTALLATION);
yon_page_init(widgets,YON_PAGE_INSTALLATION);
yon_page_update(widgets);
}
void *on_auto_install_start(void *data){
main_window *widgets = (main_window*)data;
g_idle_add((GSourceFunc)yon_progress_bar_start,widgets);
if (!main_config.dry_run){
char *install_path = main_config.config_load_path;
if (!install_path) install_path = "system";
char *command = yon_debug_output("%s\n",auto_install_command(install_path));
yon_debug_output("%s\n","Entered installation"); yon_debug_output("%s\n","Entered installation");
if (system(yon_debug_output("%s\n",command))){ if (system(yon_debug_output("%s\n",command))){

77
source/ubinstall-gtk-kernel.c
Unescape View File

@ -496,3 +496,80 @@ void yon_kernel_addon_init(main_window *widgets){
} }
int yon_kernel_save(main_window *widgets){
GList *list = gtk_container_get_children(GTK_CONTAINER(widgets->KernelListBox));
char *config_val = config(packages_parameter);
if (yon_char_is_empty(config_val)) {
char *old_packages = config(packages_parameter);
yon_config_register(packages_parameter,packages_parameter_command,NULL);
int status = yon_char_is_empty(old_packages);
yon_config_set_status(packages_parameter,status-1);
}
char *enabled_module = NULL;
int overall_size = 0;
int active_size = 0;
for(GList *iter = list;iter;iter = iter->next){
overall_size++;
kernel_row *row = g_object_get_data(G_OBJECT(iter->data),"kernel_row");
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(row->InstallCheck))){
if (gtk_widget_get_sensitive(row->InstallCheck)){
char *append_str = yon_char_replace(row->modules," ",",");
yon_config_append_elements(packages_parameter,append_str,",");
free(append_str);
active_size++;
}
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(row->EnableRadio))){
enabled_module = row->package;
}
} else {
char *append_str = yon_char_replace(row->modules," ",",");
yon_config_remove_elements(packages_parameter,append_str,",");
free(append_str);
}
}
if (!yon_char_is_empty(enabled_module)){
yon_config_register(KERNEL_BOOT_parameter,KERNEL_BOOT_parameter_command,enabled_module);
} else {
yon_config_remove_by_key(KERNEL_BOOT_parameter);
}
if (!main_config.configure_mode){
yon_debug_output("%s\n",yon_config_save_args_simple(main_config.config_load_path,packages_parameter, KERNEL_BOOT_parameter,NULL));
}
return 1;
}
int yon_kernel_addon_save(main_window *widgets){
char *parameter = config(packages_parameter);
GList *list = gtk_container_get_children(GTK_CONTAINER(widgets->KernelAddonListBox));
if (yon_char_is_empty(parameter)){
yon_config_register(packages_parameter,packages_parameter_command,NULL);
}
for(GList *iter = list;iter;iter = iter->next){
kernel_addon_row *row = g_object_get_data(G_OBJECT(iter->data),"kernel_row");
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(row->InstallCheck))){
if (gtk_widget_get_sensitive(row->InstallCheck)){
yon_config_append_elements(packages_parameter,row->modules,",");
}
} else {
char *append_str = yon_char_replace(row->modules," ",",");
yon_config_remove_elements(packages_parameter,row->modules,",");
free(append_str);
}
}
if (!main_config.configure_mode){
int size;
config_str parameters = yon_config_get_save_parameters_by_key(&size,packages_parameter,NULL);
if (parameters){
char *command_parameters = yon_char_parsed_to_string(parameters,size," -- ");
char *command = yon_char_unite(ubconfig_dull_command,"--target system ",command_parameters,NULL);
if (!system(yon_debug_output("%s\n",command))){}
free(command);
yon_char_parsed_free(parameters,size);
}
}
return 1;
}

7
source/ubinstall-gtk-language.c
Unescape View File

@ -13,7 +13,7 @@ void yon_language_update(main_window *widgets){
int parsed_size; int parsed_size;
config_str parsed = yon_char_parse(cur_lang,&parsed_size,"|"); config_str parsed = yon_char_parse(cur_lang,&parsed_size,"|");
gtk_list_store_append(widgets->LanguageList,&iter); gtk_list_store_append(widgets->LanguageList,&iter);
gtk_list_store_set(widgets->LanguageList,&iter,1,parsed[1],2,parsed[2],3,parsed[0],-1); gtk_list_store_set(widgets->LanguageList,&iter,0,1,1,parsed[1],2,parsed[2],3,parsed[0],-1);
} }
} else { } else {
gtk_switch_set_active(GTK_SWITCH(widgets->LocaleDefaultSwitch),0); gtk_switch_set_active(GTK_SWITCH(widgets->LocaleDefaultSwitch),0);
@ -35,6 +35,11 @@ void yon_language_update(main_window *widgets){
yon_char_parsed_free(parsed,parsed_size); yon_char_parsed_free(parsed,parsed_size);
} }
} }
if (!config_languages){
if (gtk_tree_model_get_iter_first(GTK_TREE_MODEL(widgets->LanguageList),&iter)){
gtk_list_store_set(widgets->LanguageList,&iter,0,1,-1);
}
}
} }
} }

12
source/ubinstall-gtk-page-switch.c
Unescape View File

@ -54,9 +54,10 @@ enum YON_PAGES yon_page_get_next(main_window *widgets, enum YON_PAGES page){
case YON_PAGE_RECOVERY_BEGIN: main_config.save_configured = 1; return YON_PAGE_RECOVERY_PROCESS; break; case YON_PAGE_RECOVERY_BEGIN: main_config.save_configured = 1; return YON_PAGE_RECOVERY_PROCESS; break;
case YON_PAGE_RECOVERY_PROCESS: return YON_PAGE_RECOVERY_COMPLETION; break; case YON_PAGE_RECOVERY_PROCESS: return YON_PAGE_RECOVERY_COMPLETION; break;
case YON_PAGE_INSTALLATION: return YON_PAGE_COMPLETION; break; case YON_PAGE_INSTALLATION: return YON_PAGE_COMPLETION; break;
case YON_PAGE_CONFIGURE_SAVE:
break;
case YON_PAGE_CONFIGURE_END: case YON_PAGE_CONFIGURE_END:
return YON_PAGE_CONFIGURE_SAVE;
break;
case YON_PAGE_CONFIGURE_SAVE:
gtk_main_quit(); gtk_main_quit();
exit(0); exit(0);
break; break;
@ -152,7 +153,7 @@ void yon_navigation_buttons_set_sensetiveness(main_window *widgets){
// yon_load_proceed(YON_CONFIG_LOCAL); // yon_load_proceed(YON_CONFIG_LOCAL);
gtk_widget_hide(widgets->BackButton); gtk_widget_hide(widgets->BackButton);
gtk_widget_set_sensitive(widgets->NextButton,1); gtk_widget_set_sensitive(widgets->NextButton,1);
gtk_widget_set_sensitive(widgets->CancelInstallButton,0); // gtk_widget_set_sensitive(widgets->CancelInstallButton,0);
gtk_widget_set_sensitive(widgets->LoadLocalConfigurationMenuItem,1); gtk_widget_set_sensitive(widgets->LoadLocalConfigurationMenuItem,1);
gtk_widget_set_sensitive(widgets->LoadExternalConfigurationMenuItem,1); gtk_widget_set_sensitive(widgets->LoadExternalConfigurationMenuItem,1);
gtk_widget_hide(widgets->BackButton); gtk_widget_hide(widgets->BackButton);
@ -186,7 +187,7 @@ void yon_navigation_buttons_set_sensetiveness(main_window *widgets){
gtk_widget_set_sensitive(widgets->CancelInstallButton,1); gtk_widget_set_sensitive(widgets->CancelInstallButton,1);
break; break;
case YON_PAGE_CONFIGURE_END: case YON_PAGE_CONFIGURE_END:
gtk_button_set_label(GTK_BUTTON(widgets->NextButton),SAVE_AND_EXIT_LABEL); gtk_button_set_label(GTK_BUTTON(widgets->NextButton),SAVE_LABEL);
gtk_button_set_label(GTK_BUTTON(widgets->CancelInstallButton),EXIT_LABEL); gtk_button_set_label(GTK_BUTTON(widgets->CancelInstallButton),EXIT_LABEL);
break; break;
@ -646,6 +647,8 @@ void on_page_cancel_clicked(GtkWidget *, main_window *widgets){
gtk_main_quit(); gtk_main_quit();
break; break;
case YON_PAGE_SECTIONS: case YON_PAGE_SECTIONS:
case YON_PAGE_WELCOME:
case YON_PAGE_LICENCE:
on_yon_exit(NULL,NULL,widgets); on_yon_exit(NULL,NULL,widgets);
break; break;
default: { default: {
@ -656,6 +659,7 @@ void on_page_cancel_clicked(GtkWidget *, main_window *widgets){
if (yon_confirmation_dialog_call(widgets->MainWindow,data)==GTK_RESPONSE_ACCEPT ){ if (yon_confirmation_dialog_call(widgets->MainWindow,data)==GTK_RESPONSE_ACCEPT ){
pthread_cancel(main_config.install_thread); pthread_cancel(main_config.install_thread);
kill(main_config.install_thread,SIGKILL); kill(main_config.install_thread,SIGKILL);
if (main_config.autoinstall) exit(0);
g_signal_handlers_disconnect_by_func(G_OBJECT(widgets->install_info_monitor),yon_installation_progress_update,widgets); g_signal_handlers_disconnect_by_func(G_OBJECT(widgets->install_info_monitor),yon_installation_progress_update,widgets);
g_file_monitor_cancel(widgets->install_info_monitor); g_file_monitor_cancel(widgets->install_info_monitor);
widgets->install_info_monitor = NULL; widgets->install_info_monitor = NULL;

18
source/ubinstall-gtk-saving.c
Unescape View File

@ -7,7 +7,7 @@ void yon_config_save_proceed(char *path, YON_CONFIG_TYPE type){
void yon_load_proceed(YON_CONFIG_TYPE type){ void yon_load_proceed(YON_CONFIG_TYPE type){
if (type!=YON_CONFIG_CUSTOM){ if (type!=YON_CONFIG_CUSTOM){
yon_config_clean(); yon_config_clean();
if (main_config.config_load_path){ if (main_config.config_load_path&&!main_config.configure_mode){
if (main_config.startup_config){ if (main_config.startup_config){
yon_config_restore(NULL); yon_config_restore(NULL);
yon_config_custom_clean(main_config.startup_config); yon_config_custom_clean(main_config.startup_config);
@ -22,7 +22,9 @@ void yon_load_proceed(YON_CONFIG_TYPE type){
case YON_CONFIG_LOCAL: case YON_CONFIG_LOCAL:
main_config.config_load_path = yon_char_new("system"); main_config.config_load_path = yon_char_new("system");
main_config.config_save_path = main_config.config_load_path; main_config.config_save_path = main_config.config_load_path;
if (!main_config.configure_mode){
yon_config_custom_load_config(&main_config.startup_config,config_get_command("system"),NULL); yon_config_custom_load_config(&main_config.startup_config,config_get_command("system"),NULL);
}
yon_config_load_config(type,config_get_command("system"),NULL); yon_config_load_config(type,config_get_command("system"),NULL);
break; break;
case YON_CONFIG_CUSTOM: case YON_CONFIG_CUSTOM:
@ -30,7 +32,7 @@ void yon_load_proceed(YON_CONFIG_TYPE type){
char *path = NULL; char *path = NULL;
path=yon_custom_config_init(GTK_FILE_CHOOSER_ACTION_OPEN); path=yon_custom_config_init(GTK_FILE_CHOOSER_ACTION_OPEN);
if (!yon_char_is_empty(path)){ if (!yon_char_is_empty(path)){
if (main_config.config_load_path){ if (main_config.config_load_path&&!main_config.configure_mode){
if (main_config.startup_config){ if (main_config.startup_config){
yon_config_restore(NULL); yon_config_restore(NULL);
yon_config_custom_clean(main_config.startup_config); yon_config_custom_clean(main_config.startup_config);
@ -41,13 +43,17 @@ void yon_load_proceed(YON_CONFIG_TYPE type){
main_config.config_save_path = main_config.config_load_path; main_config.config_save_path = main_config.config_load_path;
yon_config_clean(); yon_config_clean();
yon_config_load_config(type,config_get_command(path),NULL); yon_config_load_config(type,config_get_command(path),NULL);
if (!main_config.configure_mode){
yon_config_custom_load_config(&main_config.startup_config,config_get_command(path),NULL); yon_config_custom_load_config(&main_config.startup_config,config_get_command(path),NULL);
} }
}
} else { } else {
yon_config_clean(); yon_config_clean();
yon_config_load_config(type,config_get_command(main_config.force_ini),NULL); yon_config_load_config(type,config_get_command(main_config.force_ini),NULL);
if (!main_config.configure_mode){
yon_config_custom_load_config(&main_config.startup_config,config_get_command(main_config.force_ini),NULL); yon_config_custom_load_config(&main_config.startup_config,config_get_command(main_config.force_ini),NULL);
} }
}
break; break;
default: default:
break; break;
@ -185,10 +191,10 @@ void *on_config_save(void *data){
main_window *widgets = (main_window*)data; main_window *widgets = (main_window*)data;
g_idle_add((GSourceFunc)yon_progress_bar_start,widgets); g_idle_add((GSourceFunc)yon_progress_bar_start,widgets);
char *command = yon_debug_output("%s\n",install_start_command(main_config.config_save_path));
if (!main_config.dry_run){ if (!main_config.dry_run){
char *command = yon_debug_output("%s\n",save_config_command);
yon_debug_output("%s\n","Entered installation"); yon_debug_output("%s\n","Entered installation");
if (system(yon_debug_output("%s\n",command))){ if (system(command)){
gdk_threads_add_idle((GSourceFunc)on_install_error,widgets); gdk_threads_add_idle((GSourceFunc)on_install_error,widgets);
free(command); free(command);
@ -215,9 +221,9 @@ void *on_setup_system_configuration(void * data){
main_window *widgets = (main_window*)data; main_window *widgets = (main_window*)data;
if (widgets){}; if (widgets){};
char *command = yon_debug_output("%s\n",configuration_start_command(main_config.config_save_path));
if (!main_config.dry_run){ if (!main_config.dry_run){
char *command = set_user_config_command; if (system(command)){};
if (system(yon_debug_output("%s\n",command))){};
free(command); free(command);
} else { } else {
yon_launch("ubconfig --source system get /"); yon_launch("ubconfig --source system get /");

13
source/ubinstall-gtk-startup-apps.c
Unescape View File

@ -30,7 +30,7 @@ void on_startup_apps_remove(GtkWidget *self,main_window *widgets){
if (gtk_tree_selection_get_selected(gtk_tree_view_get_selection(GTK_TREE_VIEW(widgets->StartupAppsTree)),&model,&iter)){ if (gtk_tree_selection_get_selected(gtk_tree_view_get_selection(GTK_TREE_VIEW(widgets->StartupAppsTree)),&model,&iter)){
char *unit; char *unit;
int deletable; int deletable;
gtk_tree_model_get(model,&iter,2,&unit,4,&deletable,-1); gtk_tree_model_get(model,&iter,1,&unit,4,&deletable,-1);
if (!deletable) return; if (!deletable) return;
dialog_confirmation_data *data = yon_confirmation_dialog_data_new(); dialog_confirmation_data *data = yon_confirmation_dialog_data_new();
data->action_text = SERVICE_REMOVE_CONFIRMATION_LABEL(unit); data->action_text = SERVICE_REMOVE_CONFIRMATION_LABEL(unit);
@ -103,7 +103,11 @@ void yon_startup_apps_init(main_window *widgets){
if (parsed_size&&parsed){ if (parsed_size&&parsed){
for (int i=0;i<parsed_size;i++){ for (int i=0;i<parsed_size;i++){
gtk_list_store_append(widgets->StartupAppsList,&iter); gtk_list_store_append(widgets->StartupAppsList,&iter);
gtk_list_store_set(widgets->StartupAppsList,&iter,0,1,1,parsed[i],4,1,-1); char *app = NULL;
char *description = NULL;
yon_window_config_get_parameter("service_app",parsed[i],&app,YON_TYPE_STRING);
yon_window_config_get_parameter("service_desc",parsed[i],&description,YON_TYPE_STRING);
gtk_list_store_set(widgets->StartupAppsList,&iter,0,1,1,parsed[i],2,app,3,description,4,1,-1);
} }
} }
yon_char_parsed_free(parsed,parsed_size); yon_char_parsed_free(parsed,parsed_size);
@ -204,9 +208,12 @@ int yon_startup_app_save(main_window *widgets){
list_size++; list_size++;
char *target; char *target;
int status; int status;
gtk_tree_model_get(model,&iter,0,&status,1,&target,-1); char *app, *description;
gtk_tree_model_get(model,&iter,0,&status,1,&target,2,&app,3,&description,-1);
if (status){ if (status){
yon_char_parsed_add_or_create_if_exists(modules,&size,target); yon_char_parsed_add_or_create_if_exists(modules,&size,target);
yon_window_config_add_instant_parameter(target,"service_app",app,YON_TYPE_STRING);
yon_window_config_add_instant_parameter(target,"service_desc",description,YON_TYPE_STRING);
} }
} }
if (size){ if (size){

13
source/ubinstall-gtk-startup-services.c
Unescape View File

@ -38,7 +38,7 @@ void on_startup_services_remove(GtkWidget *self,main_window *widgets){
if (gtk_tree_selection_get_selected(gtk_tree_view_get_selection(GTK_TREE_VIEW(widgets->StartupServicesTree)),&model,&iter)){ if (gtk_tree_selection_get_selected(gtk_tree_view_get_selection(GTK_TREE_VIEW(widgets->StartupServicesTree)),&model,&iter)){
char *unit; char *unit;
int deletable; int deletable;
gtk_tree_model_get(model,&iter,2,&unit,4,&deletable,-1); gtk_tree_model_get(model,&iter,1,&unit,4,&deletable,-1);
if (!deletable) return; if (!deletable) return;
dialog_confirmation_data *data = yon_confirmation_dialog_data_new(); dialog_confirmation_data *data = yon_confirmation_dialog_data_new();
data->action_text = SERVICE_REMOVE_CONFIRMATION_LABEL(unit); data->action_text = SERVICE_REMOVE_CONFIRMATION_LABEL(unit);
@ -111,7 +111,11 @@ void yon_startup_services_init(main_window *widgets){
if (parsed_size&&parsed){ if (parsed_size&&parsed){
for (int i=0;i<parsed_size;i++){ for (int i=0;i<parsed_size;i++){
gtk_list_store_append(widgets->StartupList,&iter); gtk_list_store_append(widgets->StartupList,&iter);
gtk_list_store_set(widgets->StartupList,&iter,0,1,1,parsed[i],-1); char *app = NULL;
char *description = NULL;
yon_window_config_get_parameter("service_app",parsed[i],&app,YON_TYPE_STRING);
yon_window_config_get_parameter("service_desc",parsed[i],&description,YON_TYPE_STRING);
gtk_list_store_set(widgets->StartupList,&iter,0,1,1,parsed[i],2,app,3,description,-1);
} }
} }
yon_char_parsed_free(parsed,parsed_size); yon_char_parsed_free(parsed,parsed_size);
@ -208,9 +212,12 @@ int yon_startup_save(main_window *widgets){
list_size++; list_size++;
char *target; char *target;
int status; int status;
gtk_tree_model_get(model,&iter,0,&status,1,&target,-1); char *app, *description;
gtk_tree_model_get(model,&iter,0,&status,1,&target,2,&app,3,&description,-1);
if (status){ if (status){
yon_char_parsed_add_or_create_if_exists(modules,&size,target); yon_char_parsed_add_or_create_if_exists(modules,&size,target);
yon_window_config_add_instant_parameter(target,"service_app",app,YON_TYPE_STRING);
yon_window_config_add_instant_parameter(target,"service_desc",description,YON_TYPE_STRING);
} }
} }
if (size){ if (size){

4
source/ubinstall-gtk-users.c
Unescape View File

@ -270,7 +270,7 @@ void yon_user_init(main_window *widgets){
} }
user->changed=1; user->changed=1;
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(user->AdminCheck),1); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(user->AdminCheck),1);
if (yon_char_is_empty(default_passwd)){ if (yon_char_is_empty(default_passwd)||yon_config_check_ignore(DEFAULTPASSWD_parameter)){
gtk_combo_box_set_active(GTK_COMBO_BOX(user->PasswordCombo),0); gtk_combo_box_set_active(GTK_COMBO_BOX(user->PasswordCombo),0);
gtk_entry_set_placeholder_text(GTK_ENTRY(widgets->UserRootPasswordEntry),yon_config_default_get_by_key(DEFAULTPASSWD_parameter)); gtk_entry_set_placeholder_text(GTK_ENTRY(widgets->UserRootPasswordEntry),yon_config_default_get_by_key(DEFAULTPASSWD_parameter));
} else { } else {
@ -316,7 +316,7 @@ void yon_user_init(main_window *widgets){
gtk_widget_show(user->MainBox); gtk_widget_show(user->MainBox);
} }
if (yon_char_is_empty(root_password)){ if (yon_char_is_empty(root_password)||yon_config_check_ignore(root_password_parameter)){
gtk_combo_box_set_active(GTK_COMBO_BOX(widgets->UserRootPasswordCombo),0); gtk_combo_box_set_active(GTK_COMBO_BOX(widgets->UserRootPasswordCombo),0);
gtk_entry_set_placeholder_text(GTK_ENTRY(widgets->UserRootPasswordEntry),yon_config_default_get_by_key(root_password_parameter)); gtk_entry_set_placeholder_text(GTK_ENTRY(widgets->UserRootPasswordEntry),yon_config_default_get_by_key(root_password_parameter));
} else { } else {

19
source/ubinstall-gtk.c
Unescape View File

@ -322,6 +322,11 @@ void yon_update_page(main_window *widgets){
while(gtk_events_pending()) gtk_main_iteration(); while(gtk_events_pending()) gtk_main_iteration();
yon_page_init(widgets,page); yon_page_init(widgets,page);
g_signal_handlers_unblock_by_func(G_OBJECT(widgets->db_lock_monitor),G_CALLBACK(yon_db_unlock_update),widgets); g_signal_handlers_unblock_by_func(G_OBJECT(widgets->db_lock_monitor),G_CALLBACK(yon_db_unlock_update),widgets);
if (page == YON_PAGE_PACMAN_SOFTWARE){
const char *search_string = gtk_entry_get_text(GTK_ENTRY(widgets->PacmanSoftwareSearchEntry));
if (!yon_char_is_empty(search_string)) on_pacman_search_enter(GTK_ENTRY(widgets->PacmanSoftwareSearchEntry),widgets);
g_hash_table_remove_all(widgets->pacmanchosen);
}
on_status_update(NULL,widgets); on_status_update(NULL,widgets);
} }
@ -830,8 +835,8 @@ void yon_main_window_create(main_window *widgets){
g_signal_connect(G_OBJECT(widgets->SamePlaceDeviceTree),"cursor-changed",G_CALLBACK(on_device_selection_changed),widgets); g_signal_connect(G_OBJECT(widgets->SamePlaceDeviceTree),"cursor-changed",G_CALLBACK(on_device_selection_changed),widgets);
g_signal_connect(G_OBJECT(widgets->UserdataDevicesTree),"cursor-changed",G_CALLBACK(on_device_selection_changed),widgets); g_signal_connect(G_OBJECT(widgets->UserdataDevicesTree),"cursor-changed",G_CALLBACK(on_device_selection_changed),widgets);
g_signal_connect(G_OBJECT(widgets->OSSoftwareUncheckAllCheck),"toggled",G_CALLBACK(on_os_components_uncheck_all),widgets); g_signal_connect(G_OBJECT(widgets->OSSoftwareUncheckAllCheck),"toggled",G_CALLBACK(on_os_components_switch_all),widgets);
g_signal_connect(G_OBJECT(widgets->AdditionalComponentsUncheckAllCheck),"toggled",G_CALLBACK(on_software_uncheck_all),widgets); g_signal_connect(G_OBJECT(widgets->AdditionalComponentsUncheckAllCheck),"toggled",G_CALLBACK(on_software_switch_all),widgets);
g_signal_connect(G_OBJECT(widgets->NextInstallationSizeSpin),"value-changed",G_CALLBACK(yon_size_changed),widgets); g_signal_connect(G_OBJECT(widgets->NextInstallationSizeSpin),"value-changed",G_CALLBACK(yon_size_changed),widgets);
g_signal_connect(G_OBJECT(widgets->UserdataFormatSizeSpin),"value-changed",G_CALLBACK(yon_size_changed),widgets); g_signal_connect(G_OBJECT(widgets->UserdataFormatSizeSpin),"value-changed",G_CALLBACK(yon_size_changed),widgets);
g_signal_connect(G_OBJECT(widgets->OSFormatSizeSpin),"value-changed",G_CALLBACK(yon_size_changed),widgets); g_signal_connect(G_OBJECT(widgets->OSFormatSizeSpin),"value-changed",G_CALLBACK(yon_size_changed),widgets);
@ -936,6 +941,8 @@ void yon_main_window_create(main_window *widgets){
g_signal_connect(G_OBJECT(widgets->AboutMenuItem),"activate",G_CALLBACK(yon_on_about),NULL); g_signal_connect(G_OBJECT(widgets->AboutMenuItem),"activate",G_CALLBACK(yon_on_about),NULL);
g_signal_connect(G_OBJECT(widgets->DocumentationMenuItem),"activate",G_CALLBACK(on_open_documentation_confirmation),WIKI_LINK); g_signal_connect(G_OBJECT(widgets->DocumentationMenuItem),"activate",G_CALLBACK(on_open_documentation_confirmation),WIKI_LINK);
} }
yon_gtk_entry_set_password_visibility_icon(GTK_ENTRY(widgets->NetworkDomainPasswordEntry));
yon_gtk_entry_set_password_visibility_icon(GTK_ENTRY(widgets->UserRootPasswordEntry)); yon_gtk_entry_set_password_visibility_icon(GTK_ENTRY(widgets->UserRootPasswordEntry));
yon_window_config_setup(GTK_WINDOW(widgets->MainWindow)); yon_window_config_setup(GTK_WINDOW(widgets->MainWindow));
@ -1030,6 +1037,10 @@ void yon_main_window_create(main_window *widgets){
gtk_tree_model_filter_set_visible_func(GTK_TREE_MODEL_FILTER(widgets->InstallerCountryFilter),(GtkTreeModelFilterVisibleFunc)on_country_filter,widgets,NULL); gtk_tree_model_filter_set_visible_func(GTK_TREE_MODEL_FILTER(widgets->InstallerCountryFilter),(GtkTreeModelFilterVisibleFunc)on_country_filter,widgets,NULL);
if (main_config.autoinstall||!yon_char_is_empty(config(finish_parameter))){
on_autoinstall_start(NULL,widgets);
}
gtk_tree_view_set_search_equal_func(GTK_TREE_VIEW(widgets->LanguagesTree),(GtkTreeViewSearchEqualFunc)on_languages_search_func,widgets,NULL); gtk_tree_view_set_search_equal_func(GTK_TREE_VIEW(widgets->LanguagesTree),(GtkTreeViewSearchEqualFunc)on_languages_search_func,widgets,NULL);
gtk_overlay_add_overlay(GTK_OVERLAY(widgets->RegionMapOverlay),widgets->TimeZoneMapOverlayBox); gtk_overlay_add_overlay(GTK_OVERLAY(widgets->RegionMapOverlay),widgets->TimeZoneMapOverlayBox);
gtk_overlay_set_overlay_pass_through(GTK_OVERLAY(widgets->RegionMapOverlay),widgets->TimeZoneMapOverlayBox,1); gtk_overlay_set_overlay_pass_through(GTK_OVERLAY(widgets->RegionMapOverlay),widgets->TimeZoneMapOverlayBox,1);
@ -1119,13 +1130,13 @@ int main(int argc, char *argv[]){
int option_index = 0; int option_index = 0;
struct option long_options[] = { struct option long_options[] = {
{"dry-run", 0, 0, 'D'}, {"dry-run", 0, 0, 'D'},
{"scenario", 0, 0, 's'}, // {"scenario", 0, 0, 's'},
{"autoinstall", 0, 0, 'A'}, {"autoinstall", 0, 0, 'A'},
{NULL, 0, NULL, 0} {NULL, 0, NULL, 0}
}; };
optind = 1; optind = 1;
for (int i = 0; i < size; i++) { for (int i = 0; i < size; i++) {
int argument = getopt_long(argc, argv, "D", long_options, &option_index); int argument = getopt_long(argc, argv, "DA", long_options, &option_index);
switch (argument) { switch (argument) {
case 'D': case 'D':
main_config.dry_run = 1; main_config.dry_run = 1;

13
source/ubinstall-gtk.h
Unescape View File

@ -296,11 +296,10 @@ layout && /description:/ {\
#define get_localisation_command "ubconfig -ea --source global get [autoinstall] AUTOINSTALL[installer_locale] -- get [autoinstall] AUTOINSTALL['ubconfig set [locale] LANG'] -- get [locale] LANG" #define get_localisation_command "ubconfig -ea --source global get [autoinstall] AUTOINSTALL[installer_locale] -- get [autoinstall] AUTOINSTALL['ubconfig set [locale] LANG'] -- get [locale] LANG"
#define save_config_command yon_char_unite("/usr/bin/bash -c \"nice ubinstall autoinstall",main_config.debug_mode?" --debug":"","\"", NULL) #define install_start_command(path) yon_char_unite("/usr/bin/bash -c \"nice ubinstall autoinstall",main_config.debug_mode?" --debug":""," --noautoconfig --noinstall_extra",strcmp(path,"system")?" --config=":"",strcmp(path,"system")?path:"","\"", NULL)
#define quick_install_command(path) yon_char_unite("nice ubinstall autoinstall",main_config.debug_mode?" --debug":""," --config='",path,"' --noautoconfig --noinstall_extra", NULL) #define configuration_start_command(path) yon_char_unite("nice ubinstall autoconfig install_extra",main_config.debug_mode?" --debug":"",strcmp(path,"system")?" --config=":"",strcmp(path,"system")?path:"", NULL)
#define set_user_config_command yon_char_unite("nice ubinstall autoconfig",main_config.debug_mode?" --debug":""," install_extra", NULL) #define auto_install_command(path) yon_char_unite("nice ubinstall autoinstall",main_config.debug_mode?" --debug":"",strcmp(path,"system")?" --config=":"",strcmp(path,"system")?path:"", NULL)
#define save_additional_config_command(parameters) yon_char_unite("ubconfig --target system set [autoinstall] ", parameters, NULL)
#define get_default_password_command "ubconfig --raw --conarg --source default get [users] NOSECUREROOTPASSWD" #define get_default_password_command "ubconfig --raw --conarg --source default get [users] NOSECUREROOTPASSWD"
@ -1615,11 +1614,11 @@ void yon_gtk_widget_set_translation(GtkWidget *target);
void on_bootloader_user_edit(GtkWidget *, main_window *widgets); void on_bootloader_user_edit(GtkWidget *, main_window *widgets);
void on_bootloader_admin_toggled(GtkWidget *, char *path, main_window *widgets); void on_bootloader_admin_toggled(GtkWidget *, char *path, main_window *widgets);
void on_bootloader_user_remove(GtkWidget *, main_window *widgets); void on_bootloader_user_remove(GtkWidget *, main_window *widgets);
void on_software_uncheck_all(GtkWidget *, main_window *widgets); void on_software_switch_all(GtkWidget *, main_window *widgets);
gboolean on_kernel_enabled_toggled(GtkWidget *self, GdkEventButton *, kernel_row *row); gboolean on_kernel_enabled_toggled(GtkWidget *self, GdkEventButton *, kernel_row *row);
void on_status_update(GtkWidget *,main_window *widgets); void on_status_update(GtkWidget *,main_window *widgets);
gboolean on_kernel_addon_menu_block(GObject *self, GdkEventButton *event); gboolean on_kernel_addon_menu_block(GObject *self, GdkEventButton *event);
void on_os_components_uncheck_all(GtkWidget *,main_window *widgets); void on_os_components_switch_all(GtkWidget *,main_window *widgets);
gboolean yon_os_components_load(main_window *widgets); gboolean yon_os_components_load(main_window *widgets);
gboolean on_user_autoloin_switch(GtkWidget *, int status, main_window *); gboolean on_user_autoloin_switch(GtkWidget *, int status, main_window *);
void on_locale_selected(GtkTreeView *self,main_window *widgets); void on_locale_selected(GtkTreeView *self,main_window *widgets);
@ -1644,3 +1643,5 @@ void yon_db_lock_update(GFileMonitor *,GFile *,GFile *,GFileMonitorEvent ,main_w
void yon_db_unlock_update(GFileMonitor *,GFile *,GFile *,GFileMonitorEvent ,main_window *widgets); void yon_db_unlock_update(GFileMonitor *,GFile *,GFile *,GFileMonitorEvent ,main_window *widgets);
void on_config_install_success(GtkWidget *self, int state, main_window *widgets); void on_config_install_success(GtkWidget *self, int state, main_window *widgets);
void *on_quick_install_start(void *data); void *on_quick_install_start(void *data);
void on_autoinstall_start(GtkWidget *self, main_window *widgets);
void *on_auto_install_start(void *data);

7
source/ubl-strings.h
Unescape View File

@ -142,10 +142,11 @@ NULL)
#define LOG_VIEW_LABEL _("Log exploration") #define LOG_VIEW_LABEL _("Log exploration")
#define UNCHECK_ALL_LABEL _("Uncheck all") #define UNCHECK_ALL_LABEL _("Uncheck all")
#define CHECK_ALL_LABEL _("Check all")
#define CONFIGURATION_TITLE_LABEL _("Configuration") #define CONFIGURATION_TITLE_LABEL _("Configuration")
#define CONFIGURATION_FINISH_HEAD_LABEL _("Installer configuration has been finished") #define CONFIGURATION_FINISH_HEAD_LABEL _("Installer configuration has been finished")
#define CONFIGURATION_FINISH_LABEL _("Choose a save option on the header bar") #define CONFIGURATION_FINISH_LABEL _("You can now proceed to saving the settings")
#define CONFIGURATION_SAVE_HEAD_LABEL _("Configuration has been saved") #define CONFIGURATION_SAVE_HEAD_LABEL _("Configuration has been saved")
#define CONFIGURATION_SAVE_LABEL _("You can safely exit configurator or return and create new configuration file.") #define CONFIGURATION_SAVE_LABEL _("You can safely exit configurator or return and create new configuration file.")
@ -456,7 +457,7 @@ NULL)
// #define _LABEL _("The process of restoring the system is underway...") // #define _LABEL _("The process of restoring the system is underway...")
// #define _LABEL _("System recovery successfully completed!") // #define _LABEL _("System recovery successfully completed!")
// #define _LABEL _("You can reboot the system and use the installed version or continue to work in the current system.") // #define _LABEL _("You can reboot the system and use the installed version or continue to work in the current system.")
// #define _LABEL _("Selecting additional system kernel components from the repository. Internet access required") // #define _LABEL _("Selecting additional kernel components to install from the repository. Internet access required")
// #define _LABEL _("Repository") // #define _LABEL _("Repository")
// #define _LABEL _("Name") // #define _LABEL _("Name")
// #define _LABEL _("Version") // #define _LABEL _("Version")
@ -484,6 +485,8 @@ NULL)
// #define _LABEL _("Version:") // #define _LABEL _("Version:")
// #define _LABEL _("Size:") // #define _LABEL _("Size:")
// #define _LABEL _("Select installation sources") // #define _LABEL _("Select installation sources")
// #define _LABEL _("Model")
// #define _LABEL _("Vendor")
#define slide_1_title _("Product ecosystem") #define slide_1_title _("Product ecosystem")
#define slide_1_text _("Developed by a team of professionals and successfully presented on the market.\n\ #define slide_1_text _("Developed by a team of professionals and successfully presented on the market.\n\

309
ubinstall-gtk.glade
Unescape View File

@ -404,6 +404,7 @@
<class name="timezoneoverlay"/> <class name="timezoneoverlay"/>
</style> </style>
</object> </object>
<object class="GtkSizeGroup"/>
<object class="GtkImage" id="image1"> <object class="GtkImage" id="image1">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
@ -2078,12 +2079,7 @@ agreement</property>
<object class="GtkViewport"> <object class="GtkViewport">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="margin-left">5</property>
<property name="margin-right">5</property> <property name="margin-right">5</property>
<property name="margin-start">5</property>
<property name="margin-end">5</property>
<property name="margin-top">5</property>
<property name="margin-bottom">5</property>
<child> <child>
<object class="GtkBox"> <object class="GtkBox">
<property name="visible">True</property> <property name="visible">True</property>
@ -2143,6 +2139,7 @@ Select a different installation sources.</property>
<child> <child>
<object class="GtkCheckButton" id="OSSoftwareUncheckAllCheck"> <object class="GtkCheckButton" id="OSSoftwareUncheckAllCheck">
<property name="label" translatable="yes">Uncheck all</property> <property name="label" translatable="yes">Uncheck all</property>
<property name="visible">True</property>
<property name="can-focus">True</property> <property name="can-focus">True</property>
<property name="receives-default">False</property> <property name="receives-default">False</property>
<property name="draw-indicator">True</property> <property name="draw-indicator">True</property>
@ -2229,7 +2226,7 @@ Select a different installation sources.</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="valign">end</property> <property name="valign">end</property>
<property name="pixel-size">256</property> <property name="pixel-size">320</property>
<property name="icon-name">com.ublinux.ubinstall-gtk.configure-complete</property> <property name="icon-name">com.ublinux.ubinstall-gtk.configure-complete</property>
</object> </object>
<packing> <packing>
@ -2300,7 +2297,7 @@ Select a different installation sources.</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="valign">end</property> <property name="valign">end</property>
<property name="pixel-size">256</property> <property name="pixel-size">320</property>
<property name="icon-name">com.ublinux.ubinstall-gtk.recovery-complete</property> <property name="icon-name">com.ublinux.ubinstall-gtk.recovery-complete</property>
</object> </object>
<packing> <packing>
@ -3145,7 +3142,7 @@ Select a different installation sources.</property>
<object class="GtkLabel"> <object class="GtkLabel">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="label" translatable="yes">Selecting additional system kernel components from the repository. Internet access required</property> <property name="label" translatable="yes">Selecting additional kernel components to install from the repository. Internet access required</property>
<property name="wrap">True</property> <property name="wrap">True</property>
<property name="xalign">0</property> <property name="xalign">0</property>
<attributes> <attributes>
@ -3496,12 +3493,6 @@ Select a different installation sources.</property>
<object class="GtkViewport"> <object class="GtkViewport">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="margin-left">5</property>
<property name="margin-right">5</property>
<property name="margin-start">5</property>
<property name="margin-end">5</property>
<property name="margin-top">5</property>
<property name="margin-bottom">5</property>
<child> <child>
<object class="GtkBox"> <object class="GtkBox">
<property name="visible">True</property> <property name="visible">True</property>
@ -3550,6 +3541,7 @@ Select a different installation sources.</property>
<child> <child>
<object class="GtkCheckButton" id="AdditionalComponentsUncheckAllCheck"> <object class="GtkCheckButton" id="AdditionalComponentsUncheckAllCheck">
<property name="label" translatable="yes">Uncheck all</property> <property name="label" translatable="yes">Uncheck all</property>
<property name="visible">True</property>
<property name="can-focus">True</property> <property name="can-focus">True</property>
<property name="receives-default">False</property> <property name="receives-default">False</property>
<property name="draw-indicator">True</property> <property name="draw-indicator">True</property>
@ -6546,6 +6538,26 @@ Select a different installation sources.</property>
<property name="position">1</property> <property name="position">1</property>
</packing> </packing>
</child> </child>
<child>
<object class="GtkFrame">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label-xalign">0.019999999552965164</property>
<property name="shadow-type">in</property>
<child>
<object class="GtkAlignment">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="top-padding">5</property>
<property name="bottom-padding">5</property>
<property name="left-padding">5</property>
<property name="right-padding">5</property>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">5</property>
<child> <child>
<object class="GtkBox"> <object class="GtkBox">
<property name="visible">True</property> <property name="visible">True</property>
@ -6578,23 +6590,9 @@ Select a different installation sources.</property>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">2</property> <property name="position">0</property>
</packing> </packing>
</child> </child>
<child>
<object class="GtkFrame">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label-xalign">0.019999999552965164</property>
<property name="shadow-type">in</property>
<child>
<object class="GtkAlignment">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="top-padding">5</property>
<property name="bottom-padding">5</property>
<property name="left-padding">5</property>
<property name="right-padding">5</property>
<child> <child>
<object class="GtkBox"> <object class="GtkBox">
<property name="visible">True</property> <property name="visible">True</property>
@ -6613,6 +6611,7 @@ Select a different installation sources.</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">True</property> <property name="can-focus">True</property>
<property name="model">BootloadUsersList</property> <property name="model">BootloadUsersList</property>
<property name="search-column">0</property>
<child internal-child="selection"> <child internal-child="selection">
<object class="GtkTreeSelection"/> <object class="GtkTreeSelection"/>
</child> </child>
@ -6723,6 +6722,13 @@ Select a different installation sources.</property>
</packing> </packing>
</child> </child>
</object> </object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
</child> </child>
</object> </object>
</child> </child>
@ -6870,6 +6876,26 @@ Select a different installation sources.</property>
<property name="position">1</property> <property name="position">1</property>
</packing> </packing>
</child> </child>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">5</property>
<child>
<object class="GtkFrame">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label-xalign">0.019999999552965164</property>
<property name="shadow-type">in</property>
<child>
<object class="GtkAlignment">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="top-padding">5</property>
<property name="bottom-padding">5</property>
<property name="left-padding">5</property>
<property name="right-padding">5</property>
<child> <child>
<object class="GtkBox"> <object class="GtkBox">
<property name="visible">True</property> <property name="visible">True</property>
@ -6882,9 +6908,11 @@ Select a different installation sources.</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="spacing">5</property> <property name="spacing">5</property>
<child> <child>
<object class="GtkSwitch" id="NetworkDomainSwitch"> <object class="GtkLabel" id="label25">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">True</property> <property name="can-focus">False</property>
<property name="label" translatable="yes">Domain name:</property>
<property name="xalign">0</property>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
@ -6893,62 +6921,61 @@ Select a different installation sources.</property>
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkLabel"> <object class="GtkEntry" id="NetworkDomainNameEntry">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="sensitive">False</property>
<property name="label" translatable="yes">Domain name:</property> <property name="can-focus">True</property>
<property name="width-chars">8</property>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">True</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">1</property> <property name="position">1</property>
</packing> </packing>
</child> </child>
<child>
<object class="GtkEntry" id="NetworkDomainNameEntry">
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can-focus">True</property>
<property name="width-chars">10</property>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">2</property> <property name="position">0</property>
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkLabel"> <object class="GtkBox">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="label" translatable="yes">Password:</property> <property name="spacing">5</property>
<child>
<object class="GtkLabel" id="label26">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Domain administrator:</property>
<property name="xalign">0</property>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">5</property> <property name="position">0</property>
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkEntry" id="NetworkDomainPasswordEntry"> <object class="GtkEntry" id="NetworkDomainAdminEntry">
<property name="visible">True</property> <property name="visible">True</property>
<property name="sensitive">False</property> <property name="sensitive">False</property>
<property name="can-focus">True</property> <property name="can-focus">True</property>
<property name="visibility">False</property> <property name="width-chars">8</property>
<property name="invisible-char">*</property>
<property name="width-chars">10</property>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">True</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">6</property> <property name="position">1</property>
</packing> </packing>
</child> </child>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">0</property> <property name="position">1</property>
</packing> </packing>
</child> </child>
<child> <child>
@ -6957,13 +6984,11 @@ Select a different installation sources.</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="spacing">5</property> <property name="spacing">5</property>
<child> <child>
<object class="GtkBox" id="box1"> <object class="GtkLabel" id="label27">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="orientation">vertical</property> <property name="label" translatable="yes">Password:</property>
<child> <property name="xalign">0</property>
<placeholder/>
</child>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
@ -6972,23 +6997,20 @@ Select a different installation sources.</property>
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkLabel"> <object class="GtkEntry" id="NetworkDomainPasswordEntry">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="sensitive">False</property>
<property name="label" translatable="yes">Domain administrator:</property> <property name="can-focus">True</property>
<property name="visibility">False</property>
<property name="invisible-char">●</property>
<property name="width-chars">14</property>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">True</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">1</property> <property name="position">1</property>
</packing> </packing>
</child> </child>
<child>
<object class="GtkEntry" id="NetworkDomainAdminEntry">
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can-focus">True</property>
<property name="width-chars">10</property>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
@ -6997,10 +7019,20 @@ Select a different installation sources.</property>
</packing> </packing>
</child> </child>
</object> </object>
</child>
</object>
</child>
<child type="label">
<object class="GtkSwitch" id="NetworkDomainSwitch">
<property name="visible">True</property>
<property name="can-focus">True</property>
</object>
</child>
</object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">1</property> <property name="position">0</property>
</packing> </packing>
</child> </child>
<child> <child>
@ -7753,7 +7785,7 @@ Select a different installation sources.</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="valign">end</property> <property name="valign">end</property>
<property name="pixel-size">256</property> <property name="pixel-size">320</property>
<property name="icon-name">com.ublinux.ubinstall-gtk.install-complete</property> <property name="icon-name">com.ublinux.ubinstall-gtk.install-complete</property>
</object> </object>
<packing> <packing>
@ -7826,7 +7858,7 @@ or continue working in the system Live environment.</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="valign">end</property> <property name="valign">end</property>
<property name="pixel-size">256</property> <property name="pixel-size">320</property>
<property name="icon-name">com.ublinux.ubinstall-gtk.install-complete</property> <property name="icon-name">com.ublinux.ubinstall-gtk.install-complete</property>
</object> </object>
<packing> <packing>
@ -7897,7 +7929,7 @@ or continue working in the system Live environment.</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="valign">end</property> <property name="valign">end</property>
<property name="pixel-size">256</property> <property name="pixel-size">320</property>
<property name="icon-name">com.ublinux.ubinstall-gtk.configure-complete</property> <property name="icon-name">com.ublinux.ubinstall-gtk.configure-complete</property>
</object> </object>
<packing> <packing>
@ -7968,7 +8000,7 @@ or continue working in the system Live environment.</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="valign">end</property> <property name="valign">end</property>
<property name="pixel-size">256</property> <property name="pixel-size">320</property>
<property name="icon-name">com.ublinux.ubinstall-gtk.install-error</property> <property name="icon-name">com.ublinux.ubinstall-gtk.install-error</property>
</object> </object>
<packing> <packing>
@ -8044,7 +8076,7 @@ or continue working in the system Live environment.</property>
<object class="GtkImage"> <object class="GtkImage">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="pixel-size">256</property> <property name="pixel-size">320</property>
<property name="icon-name">com.ublinux.ubinstall-gtk.configure-complete</property> <property name="icon-name">com.ublinux.ubinstall-gtk.configure-complete</property>
</object> </object>
<packing> <packing>
@ -8074,7 +8106,7 @@ or continue working in the system Live environment.</property>
<object class="GtkLabel"> <object class="GtkLabel">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="label" translatable="yes">Choose a save option on the header bar</property> <property name="label" translatable="yes">You can now proceed to saving the settings</property>
<property name="justify">center</property> <property name="justify">center</property>
<property name="wrap">True</property> <property name="wrap">True</property>
<property name="yalign">0</property> <property name="yalign">0</property>
@ -8122,7 +8154,7 @@ or continue working in the system Live environment.</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="valign">end</property> <property name="valign">end</property>
<property name="pixel-size">256</property> <property name="pixel-size">320</property>
<property name="icon-name">com.ublinux.ubinstall-gtk.configure-complete</property> <property name="icon-name">com.ublinux.ubinstall-gtk.configure-complete</property>
</object> </object>
<packing> <packing>
@ -8398,33 +8430,33 @@ or continue working in the system Live environment.</property>
</child> </child>
<child> <child>
<object class="GtkTreeViewColumn"> <object class="GtkTreeViewColumn">
<property name="title" translatable="yes">Description</property> <property name="title" translatable="yes">Size</property>
<child> <child>
<object class="GtkCellRendererText"/> <object class="GtkCellRendererText"/>
<attributes> <attributes>
<attribute name="text">1</attribute> <attribute name="text">3</attribute>
</attributes> </attributes>
</child> </child>
</object> </object>
</child> </child>
<child> <child>
<object class="GtkTreeViewColumn"> <object class="GtkTreeViewColumn">
<property name="title" translatable="yes">Label</property> <property name="title" translatable="yes">Model</property>
<child> <child>
<object class="GtkCellRendererText"/> <object class="GtkCellRendererText"/>
<attributes> <attributes>
<attribute name="text">2</attribute> <attribute name="text">1</attribute>
</attributes> </attributes>
</child> </child>
</object> </object>
</child> </child>
<child> <child>
<object class="GtkTreeViewColumn"> <object class="GtkTreeViewColumn">
<property name="title" translatable="yes">Size</property> <property name="title" translatable="yes">Vendor</property>
<child> <child>
<object class="GtkCellRendererText"/> <object class="GtkCellRendererText"/>
<attributes> <attributes>
<attribute name="text">3</attribute> <attribute name="text">4</attribute>
</attributes> </attributes>
</child> </child>
</object> </object>
@ -8435,7 +8467,7 @@ or continue working in the system Live environment.</property>
<child> <child>
<object class="GtkCellRendererText"/> <object class="GtkCellRendererText"/>
<attributes> <attributes>
<attribute name="text">4</attribute> <attribute name="text">2</attribute>
</attributes> </attributes>
</child> </child>
</object> </object>
@ -8912,33 +8944,33 @@ or continue working in the system Live environment.</property>
</child> </child>
<child> <child>
<object class="GtkTreeViewColumn"> <object class="GtkTreeViewColumn">
<property name="title" translatable="yes">Description</property> <property name="title" translatable="yes">Size</property>
<child> <child>
<object class="GtkCellRendererText"/> <object class="GtkCellRendererText"/>
<attributes> <attributes>
<attribute name="text">1</attribute> <attribute name="text">3</attribute>
</attributes> </attributes>
</child> </child>
</object> </object>
</child> </child>
<child> <child>
<object class="GtkTreeViewColumn"> <object class="GtkTreeViewColumn">
<property name="title" translatable="yes">Label</property> <property name="title" translatable="yes">Model</property>
<child> <child>
<object class="GtkCellRendererText"/> <object class="GtkCellRendererText"/>
<attributes> <attributes>
<attribute name="text">2</attribute> <attribute name="text">1</attribute>
</attributes> </attributes>
</child> </child>
</object> </object>
</child> </child>
<child> <child>
<object class="GtkTreeViewColumn"> <object class="GtkTreeViewColumn">
<property name="title" translatable="yes">Size</property> <property name="title" translatable="yes">Vendor</property>
<child> <child>
<object class="GtkCellRendererText"/> <object class="GtkCellRendererText"/>
<attributes> <attributes>
<attribute name="text">3</attribute> <attribute name="text">4</attribute>
</attributes> </attributes>
</child> </child>
</object> </object>
@ -8949,7 +8981,7 @@ or continue working in the system Live environment.</property>
<child> <child>
<object class="GtkCellRendererText"/> <object class="GtkCellRendererText"/>
<attributes> <attributes>
<attribute name="text">4</attribute> <attribute name="text">2</attribute>
</attributes> </attributes>
</child> </child>
</object> </object>
@ -9674,33 +9706,33 @@ or continue working in the system Live environment.</property>
</child> </child>
<child> <child>
<object class="GtkTreeViewColumn"> <object class="GtkTreeViewColumn">
<property name="title" translatable="yes">Description</property> <property name="title" translatable="yes">Size</property>
<child> <child>
<object class="GtkCellRendererText"/> <object class="GtkCellRendererText"/>
<attributes> <attributes>
<attribute name="text">1</attribute> <attribute name="text">3</attribute>
</attributes> </attributes>
</child> </child>
</object> </object>
</child> </child>
<child> <child>
<object class="GtkTreeViewColumn"> <object class="GtkTreeViewColumn">
<property name="title" translatable="yes">Label</property> <property name="title" translatable="yes">Model</property>
<child> <child>
<object class="GtkCellRendererText"/> <object class="GtkCellRendererText"/>
<attributes> <attributes>
<attribute name="text">2</attribute> <attribute name="text">1</attribute>
</attributes> </attributes>
</child> </child>
</object> </object>
</child> </child>
<child> <child>
<object class="GtkTreeViewColumn"> <object class="GtkTreeViewColumn">
<property name="title" translatable="yes">Size</property> <property name="title" translatable="yes">Vendor</property>
<child> <child>
<object class="GtkCellRendererText"/> <object class="GtkCellRendererText"/>
<attributes> <attributes>
<attribute name="text">3</attribute> <attribute name="text">4</attribute>
</attributes> </attributes>
</child> </child>
</object> </object>
@ -9711,7 +9743,7 @@ or continue working in the system Live environment.</property>
<child> <child>
<object class="GtkCellRendererText"/> <object class="GtkCellRendererText"/>
<attributes> <attributes>
<attribute name="text">4</attribute> <attribute name="text">2</attribute>
</attributes> </attributes>
</child> </child>
</object> </object>
@ -10447,33 +10479,33 @@ separately into the selected partition.</property>
</child> </child>
<child> <child>
<object class="GtkTreeViewColumn"> <object class="GtkTreeViewColumn">
<property name="title" translatable="yes">Description</property> <property name="title" translatable="yes">Size</property>
<child> <child>
<object class="GtkCellRendererText"/> <object class="GtkCellRendererText"/>
<attributes> <attributes>
<attribute name="text">1</attribute> <attribute name="text">3</attribute>
</attributes> </attributes>
</child> </child>
</object> </object>
</child> </child>
<child> <child>
<object class="GtkTreeViewColumn"> <object class="GtkTreeViewColumn">
<property name="title" translatable="yes">Label</property> <property name="title" translatable="yes">Model</property>
<child> <child>
<object class="GtkCellRendererText"/> <object class="GtkCellRendererText"/>
<attributes> <attributes>
<attribute name="text">2</attribute> <attribute name="text">1</attribute>
</attributes> </attributes>
</child> </child>
</object> </object>
</child> </child>
<child> <child>
<object class="GtkTreeViewColumn"> <object class="GtkTreeViewColumn">
<property name="title" translatable="yes">Size</property> <property name="title" translatable="yes">Vendor</property>
<child> <child>
<object class="GtkCellRendererText"/> <object class="GtkCellRendererText"/>
<attributes> <attributes>
<attribute name="text">3</attribute> <attribute name="text">4</attribute>
</attributes> </attributes>
</child> </child>
</object> </object>
@ -10484,7 +10516,7 @@ separately into the selected partition.</property>
<child> <child>
<object class="GtkCellRendererText"/> <object class="GtkCellRendererText"/>
<attributes> <attributes>
<attribute name="text">4</attribute> <attribute name="text">2</attribute>
</attributes> </attributes>
</child> </child>
</object> </object>
@ -11942,33 +11974,33 @@ separately into the selected partition.</property>
</child> </child>
<child> <child>
<object class="GtkTreeViewColumn"> <object class="GtkTreeViewColumn">
<property name="title" translatable="yes">Description</property> <property name="title" translatable="yes">Size</property>
<child> <child>
<object class="GtkCellRendererText"/> <object class="GtkCellRendererText"/>
<attributes> <attributes>
<attribute name="text">1</attribute> <attribute name="text">3</attribute>
</attributes> </attributes>
</child> </child>
</object> </object>
</child> </child>
<child> <child>
<object class="GtkTreeViewColumn"> <object class="GtkTreeViewColumn">
<property name="title" translatable="yes">Label</property> <property name="title" translatable="yes">Model</property>
<child> <child>
<object class="GtkCellRendererText"/> <object class="GtkCellRendererText"/>
<attributes> <attributes>
<attribute name="text">2</attribute> <attribute name="text">1</attribute>
</attributes> </attributes>
</child> </child>
</object> </object>
</child> </child>
<child> <child>
<object class="GtkTreeViewColumn"> <object class="GtkTreeViewColumn">
<property name="title" translatable="yes">Size</property> <property name="title" translatable="yes">Vendor</property>
<child> <child>
<object class="GtkCellRendererText"/> <object class="GtkCellRendererText"/>
<attributes> <attributes>
<attribute name="text">3</attribute> <attribute name="text">4</attribute>
</attributes> </attributes>
</child> </child>
</object> </object>
@ -11979,7 +12011,7 @@ separately into the selected partition.</property>
<child> <child>
<object class="GtkCellRendererText"/> <object class="GtkCellRendererText"/>
<attributes> <attributes>
<attribute name="text">4</attribute> <attribute name="text">2</attribute>
</attributes> </attributes>
</child> </child>
</object> </object>
@ -12137,7 +12169,7 @@ separately into the selected partition.</property>
</child> </child>
</object> </object>
<packing> <packing>
<property name="expand">True</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">2</property> <property name="position">2</property>
</packing> </packing>
@ -12400,33 +12432,33 @@ separately into the selected partition.</property>
</child> </child>
<child> <child>
<object class="GtkTreeViewColumn"> <object class="GtkTreeViewColumn">
<property name="title" translatable="yes">Description</property> <property name="title" translatable="yes">Size</property>
<child> <child>
<object class="GtkCellRendererText"/> <object class="GtkCellRendererText"/>
<attributes> <attributes>
<attribute name="text">1</attribute> <attribute name="text">3</attribute>
</attributes> </attributes>
</child> </child>
</object> </object>
</child> </child>
<child> <child>
<object class="GtkTreeViewColumn"> <object class="GtkTreeViewColumn">
<property name="title" translatable="yes">Label</property> <property name="title" translatable="yes">Model</property>
<child> <child>
<object class="GtkCellRendererText"/> <object class="GtkCellRendererText"/>
<attributes> <attributes>
<attribute name="text">2</attribute> <attribute name="text">1</attribute>
</attributes> </attributes>
</child> </child>
</object> </object>
</child> </child>
<child> <child>
<object class="GtkTreeViewColumn"> <object class="GtkTreeViewColumn">
<property name="title" translatable="yes">Size</property> <property name="title" translatable="yes">Vendor</property>
<child> <child>
<object class="GtkCellRendererText"/> <object class="GtkCellRendererText"/>
<attributes> <attributes>
<attribute name="text">3</attribute> <attribute name="text">4</attribute>
</attributes> </attributes>
</child> </child>
</object> </object>
@ -12437,7 +12469,7 @@ separately into the selected partition.</property>
<child> <child>
<object class="GtkCellRendererText"/> <object class="GtkCellRendererText"/>
<attributes> <attributes>
<attribute name="text">4</attribute> <attribute name="text">2</attribute>
</attributes> </attributes>
</child> </child>
</object> </object>
@ -12851,33 +12883,33 @@ separately into the selected partition.</property>
</child> </child>
<child> <child>
<object class="GtkTreeViewColumn"> <object class="GtkTreeViewColumn">
<property name="title" translatable="yes">Description</property> <property name="title" translatable="yes">Size</property>
<child> <child>
<object class="GtkCellRendererText"/> <object class="GtkCellRendererText"/>
<attributes> <attributes>
<attribute name="text">1</attribute> <attribute name="text">3</attribute>
</attributes> </attributes>
</child> </child>
</object> </object>
</child> </child>
<child> <child>
<object class="GtkTreeViewColumn"> <object class="GtkTreeViewColumn">
<property name="title" translatable="yes">Label</property> <property name="title" translatable="yes">Model</property>
<child> <child>
<object class="GtkCellRendererText"/> <object class="GtkCellRendererText"/>
<attributes> <attributes>
<attribute name="text">2</attribute> <attribute name="text">1</attribute>
</attributes> </attributes>
</child> </child>
</object> </object>
</child> </child>
<child> <child>
<object class="GtkTreeViewColumn"> <object class="GtkTreeViewColumn">
<property name="title" translatable="yes">Size</property> <property name="title" translatable="yes">Vendor</property>
<child> <child>
<object class="GtkCellRendererText"/> <object class="GtkCellRendererText"/>
<attributes> <attributes>
<attribute name="text">3</attribute> <attribute name="text">4</attribute>
</attributes> </attributes>
</child> </child>
</object> </object>
@ -12888,7 +12920,7 @@ separately into the selected partition.</property>
<child> <child>
<object class="GtkCellRendererText"/> <object class="GtkCellRendererText"/>
<attributes> <attributes>
<attribute name="text">4</attribute> <attribute name="text">2</attribute>
</attributes> </attributes>
</child> </child>
</object> </object>
@ -13704,33 +13736,33 @@ separately into the selected partition.</property>
</child> </child>
<child> <child>
<object class="GtkTreeViewColumn"> <object class="GtkTreeViewColumn">
<property name="title" translatable="yes">Description</property> <property name="title" translatable="yes">Size</property>
<child> <child>
<object class="GtkCellRendererText"/> <object class="GtkCellRendererText"/>
<attributes> <attributes>
<attribute name="text">1</attribute> <attribute name="text">3</attribute>
</attributes> </attributes>
</child> </child>
</object> </object>
</child> </child>
<child> <child>
<object class="GtkTreeViewColumn"> <object class="GtkTreeViewColumn">
<property name="title" translatable="yes">Label</property> <property name="title" translatable="yes">Model</property>
<child> <child>
<object class="GtkCellRendererText"/> <object class="GtkCellRendererText"/>
<attributes> <attributes>
<attribute name="text">2</attribute> <attribute name="text">1</attribute>
</attributes> </attributes>
</child> </child>
</object> </object>
</child> </child>
<child> <child>
<object class="GtkTreeViewColumn"> <object class="GtkTreeViewColumn">
<property name="title" translatable="yes">Size</property> <property name="title" translatable="yes">Vendor</property>
<child> <child>
<object class="GtkCellRendererText"/> <object class="GtkCellRendererText"/>
<attributes> <attributes>
<attribute name="text">3</attribute> <attribute name="text">4</attribute>
</attributes> </attributes>
</child> </child>
</object> </object>
@ -13741,7 +13773,7 @@ separately into the selected partition.</property>
<child> <child>
<object class="GtkCellRendererText"/> <object class="GtkCellRendererText"/>
<attributes> <attributes>
<attribute name="text">4</attribute> <attribute name="text">2</attribute>
</attributes> </attributes>
</child> </child>
</object> </object>
@ -14699,6 +14731,13 @@ separately into the selected partition.</property>
</object> </object>
</child> </child>
</object> </object>
<object class="GtkSizeGroup" id="NetworkDomainSizeGroup">
<widgets>
<widget name="label25"/>
<widget name="label26"/>
<widget name="label27"/>
</widgets>
</object>
<object class="GtkSizeGroup" id="PLabelSizeGroup"> <object class="GtkSizeGroup" id="PLabelSizeGroup">
<widgets> <widgets>
<widget name="label9"/> <widget name="label9"/>
@ -14737,12 +14776,6 @@ separately into the selected partition.</property>
<widget name="label15"/> <widget name="label15"/>
</widgets> </widgets>
</object> </object>
<object class="GtkSizeGroup">
<widgets>
<widget name="box1"/>
<widget name="NetworkDomainSwitch"/>
</widgets>
</object>
<object class="GtkSizeGroup"> <object class="GtkSizeGroup">
<widgets> <widgets>
<widget name="PacmanChosenLabel"/> <widget name="PacmanChosenLabel"/>

2
ubinstall-gtk_ru.po
Unescape View File

@ -613,7 +613,7 @@ msgstr "Загрузить"
msgid "Installer configuration has been finished" msgid "Installer configuration has been finished"
msgstr "Настройка конфигурации завершена" msgstr "Настройка конфигурации завершена"
msgid "Choose a save option on the header bar" msgid "You can now proceed to saving the settings"
msgstr "Выберите опцию сохранения на верхней панели" msgstr "Выберите опцию сохранения на верхней панели"
#, fuzzy #, fuzzy

Write Preview
Loading…
Cancel
Save