Finish everything up

This commit is contained in:
Ward from fusion-voyager-3 2024-08-31 08:46:24 +03:00
parent dafbd58dda
commit ad1cd43647
13 changed files with 57 additions and 124 deletions

View File

@ -23,10 +23,3 @@ textwrap = "0.16.1"
[build-dependencies]
glib-build-tools = "0.19.0"
[profile.release]
opt-level = 'z' # Optimize for size
lto = true # Enable link-time optimization
codegen-units = 1 # Reduce number of codegen units to increase optimizations
panic = 'abort' # Abort on panic
strip = true # Strip symbols from binary*

View File

@ -1,28 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="3000px" height="3000px" style="shape-rendering:geometricPrecision; text-rendering:geometricPrecision; image-rendering:optimizeQuality; fill-rule:evenodd; clip-rule:evenodd" xmlns:xlink="http://www.w3.org/1999/xlink">
<g><path style="opacity:0.998" fill="#294172" d="M 1516.5,186.5 C 1826.66,184.043 2102,279.21 2342.5,472C 2563.55,655.769 2707.72,888.269 2775,1169.5C 2832.65,1432.3 2810.99,1688.3 2710,1937.5C 2590.62,2215.88 2397.78,2427.04 2131.5,2571C 1954.57,2663.32 1766.24,2711.65 1566.5,2716C 1228.5,2716.67 890.5,2716.67 552.5,2716C 442.415,2707.75 360.915,2655.58 308,2559.5C 288.736,2520.78 278.403,2479.78 277,2436.5C 276.333,2102.5 276.333,1768.5 277,1434.5C 285.175,1105.42 400.509,821.083 623,581.5C 839.183,357.333 1103.02,227.833 1414.5,193C 1448.6,189.83 1482.6,187.663 1516.5,186.5 Z"/></g>
<g><path style="opacity:1" fill="#fefefe" d="M 1968.5,489.5 C 1997.85,493.507 2026.85,499.674 2055.5,508C 2103.95,523.786 2138.45,554.953 2159,601.5C 2171.28,642.41 2166.28,681.077 2144,717.5C 2119.28,751.454 2085.78,770.288 2043.5,774C 2025.43,775.014 2007.43,774.514 1989.5,772.5C 1945.18,766.158 1900.84,765.992 1856.5,772C 1759.06,792.155 1685.89,845.322 1637,931.5C 1615.59,971.893 1603.25,1014.89 1600,1060.5C 1599.83,1109.83 1599.67,1159.17 1599.5,1208.5C 1599.34,1259.54 1599.84,1310.54 1601,1361.5C 1605.95,1380.62 1618.11,1391.95 1637.5,1395.5C 1713.67,1396.33 1790,1396.83 1866.5,1397C 1930.37,1407.88 1970.21,1444.71 1986,1507.5C 1994.83,1570.09 1972.99,1618.59 1920.5,1653C 1902.2,1663.04 1882.87,1669.54 1862.5,1672.5C 1774.83,1672.5 1687.17,1672.5 1599.5,1672.5C 1599.67,1785.17 1599.5,1897.83 1599,2010.5C 1588.29,2192.76 1512.46,2340.93 1371.5,2455C 1243.11,2552.11 1098.45,2592.61 937.5,2576.5C 910.274,2571.51 883.274,2565.01 856.5,2557C 814.254,2541.09 783.088,2512.92 763,2472.5C 744.4,2420.68 753.067,2374.01 789,2332.5C 817.791,2305.28 852.124,2291.95 892,2292.5C 904.211,2292.57 916.378,2293.24 928.5,2294.5C 966.362,2299.6 1004.36,2300.76 1042.5,2298C 1148.25,2282.92 1227.75,2229.42 1281,2137.5C 1303.41,2095.61 1316.07,2050.94 1319,2003.5C 1319.67,1904.83 1319.67,1806.17 1319,1707.5C 1314.38,1687.88 1302.22,1676.05 1282.5,1672C 1208.17,1671.5 1133.83,1671.33 1059.5,1671.5C 1002.53,1664.77 962.694,1635.1 940,1582.5C 922.161,1530.19 930.827,1482.86 966,1440.5C 989.435,1415.37 1018.27,1400.7 1052.5,1396.5C 1142.13,1395.51 1231.79,1395.17 1321.5,1395.5C 1321.27,1273.5 1321.6,1151.5 1322.5,1029.5C 1324.05,1009.68 1327.05,990.343 1331.5,971.5C 1333.62,963.759 1334.95,955.759 1335.5,947.5C 1336.5,947.5 1337.5,947.5 1338.5,947.5C 1338.92,942.087 1338.92,936.754 1338.5,931.5C 1375.73,793.455 1451.73,682.288 1566.5,598C 1687.15,513.354 1821.15,477.187 1968.5,489.5 Z"/></g>
<g><path style="opacity:1" fill="#3c6eb3" d="M 1968.5,489.5 C 2133.99,507.315 2269.49,579.982 2375,707.5C 2489.99,856.26 2528.99,1023.26 2492,1208.5C 2454.33,1364.8 2369.16,1487.63 2236.5,1577C 2122.32,1648.88 1997.65,1680.71 1862.5,1672.5C 1882.87,1669.54 1902.2,1663.04 1920.5,1653C 1972.99,1618.59 1994.83,1570.09 1986,1507.5C 1970.21,1444.71 1930.37,1407.88 1866.5,1397C 1790,1396.83 1713.67,1396.33 1637.5,1395.5C 1734.83,1395.67 1832.17,1395.5 1929.5,1395C 2030.75,1387.31 2111.25,1342.81 2171,1261.5C 2226.91,1178.12 2241.91,1087.79 2216,990.5C 2178.52,878.181 2103.02,805.514 1989.5,772.5C 2007.43,774.514 2025.43,775.014 2043.5,774C 2085.78,770.288 2119.28,751.454 2144,717.5C 2166.28,681.077 2171.28,642.41 2159,601.5C 2138.45,554.953 2103.95,523.786 2055.5,508C 2026.85,499.674 1997.85,493.507 1968.5,489.5 Z"/></g>
<g><path style="opacity:1" fill="#333333" d="M 1337.5,933.5 C 1335.87,942.468 1334.04,951.468 1332,960.5C 1331.5,964.152 1331.33,967.818 1331.5,971.5C 1327.05,990.343 1324.05,1009.68 1322.5,1029.5C 1321.53,1031.95 1321.19,1034.61 1321.5,1037.5C 1320.83,1049.5 1320.17,1061.5 1319.5,1073.5C 1300.39,1050.64 1283.22,1026.3 1268,1000.5C 1258.33,982.833 1248.67,965.167 1239,947.5C 1230.07,929.543 1221.24,911.543 1212.5,893.5C 1201.63,903.206 1191.3,913.372 1181.5,924C 1165.52,939.316 1147.85,952.316 1128.5,963C 1103.68,974.629 1080.35,972.296 1058.5,956C 1050.14,949.813 1042.14,943.146 1034.5,936C 1033.55,935.517 1032.55,935.351 1031.5,935.5C 1031.5,945.833 1031.5,956.167 1031.5,966.5C 1030.51,974.65 1030.17,982.983 1030.5,991.5C 1025.54,1032.38 1017.87,1072.71 1007.5,1112.5C 1005.96,1114.84 1005.29,1117.5 1005.5,1120.5C 995.539,1154.23 987.705,1188.56 982,1223.5C 979.877,1242.79 979.21,1262.12 980,1281.5C 981.473,1290.52 982.806,1299.52 984,1308.5C 963.305,1274.36 955.638,1237.36 961,1197.5C 964.383,1178.17 970.383,1159.84 979,1142.5C 979.667,1141.5 979.667,1140.5 979,1139.5C 945.113,1189.53 939.113,1242.87 961,1299.5C 981.064,1340.73 1011.23,1372.4 1051.5,1394.5C 1044.02,1395.49 1036.35,1395.83 1028.5,1395.5C 1028.17,1395.5 1027.83,1395.5 1027.5,1395.5C 1027.17,1394.5 1026.5,1393.83 1025.5,1393.5C 1004.75,1373.59 983.75,1353.76 962.5,1334C 954.549,1326.94 945.382,1322.11 935,1319.5C 929.759,1320.74 926.426,1324.07 925,1329.5C 919.801,1348.35 915.135,1367.35 911,1386.5C 908.213,1393.78 904.046,1400.11 898.5,1405.5C 895.624,1405.93 892.791,1406.59 890,1407.5C 889.235,1407.43 888.735,1407.1 888.5,1406.5C 897.042,1400.44 903.208,1392.44 907,1382.5C 910.578,1369.69 913.078,1356.69 914.5,1343.5C 910.847,1329.23 908.18,1314.9 906.5,1300.5C 906.417,1285.82 906.75,1271.15 907.5,1256.5C 911.174,1231.97 916.341,1207.64 923,1183.5C 938.575,1141.34 955.575,1099.67 974,1058.5C 979.325,1041.36 984.992,1024.36 991,1007.5C 1003.26,957.479 1003.59,907.145 992,856.5C 983.39,825.669 975.39,794.669 968,763.5C 962.77,737.605 965.27,712.605 975.5,688.5C 997.495,647.183 1030.5,618.183 1074.5,601.5C 1111.51,592.541 1146.51,597.374 1179.5,616C 1207.9,632.268 1229.4,655.101 1244,684.5C 1245.79,690.743 1248.12,696.743 1251,702.5C 1258.46,740.122 1265.79,777.788 1273,815.5C 1283.73,860.98 1305.23,900.313 1337.5,933.5 Z"/></g>
<g><path style="opacity:1" fill="#ececec" d="M 1142.5,736.5 C 1173.89,735.286 1193.39,749.952 1201,780.5C 1202.97,799.379 1198.97,816.713 1189,832.5C 1188.67,834.5 1188.33,836.5 1188,838.5C 1179.14,837.663 1170.31,836.33 1161.5,834.5C 1170.68,823.448 1173.85,810.781 1171,796.5C 1168.91,785.787 1163.07,777.953 1153.5,773C 1136.2,770.947 1125.36,778.447 1121,795.5C 1119.55,806.733 1121.38,817.399 1126.5,827.5C 1126,827.833 1125.5,828.167 1125,828.5C 1119.67,827.281 1114.33,826.281 1109,825.5C 1104.13,805.28 1104.8,785.28 1111,765.5C 1116.85,750.677 1127.35,741.01 1142.5,736.5 Z"/></g>
<g><path style="opacity:1" fill="#294172" d="M 1989.5,772.5 C 2103.02,805.514 2178.52,878.181 2216,990.5C 2241.91,1087.79 2226.91,1178.12 2171,1261.5C 2111.25,1342.81 2030.75,1387.31 1929.5,1395C 1832.17,1395.5 1734.83,1395.67 1637.5,1395.5C 1618.11,1391.95 1605.95,1380.62 1601,1361.5C 1599.84,1310.54 1599.34,1259.54 1599.5,1208.5C 1599.67,1159.17 1599.83,1109.83 1600,1060.5C 1603.25,1014.89 1615.59,971.893 1637,931.5C 1685.89,845.322 1759.06,792.155 1856.5,772C 1900.84,765.992 1945.18,766.158 1989.5,772.5 Z"/></g>
<g><path style="opacity:1" fill="#eaeaea" d="M 1017.5,772.5 C 1022.9,771.966 1027.9,773.133 1032.5,776C 1044.19,785.199 1052.02,797.032 1056,811.5C 1057.96,818.968 1059.79,826.468 1061.5,834C 1057.78,837.38 1053.78,840.547 1049.5,843.5C 1049.55,824.075 1040.55,810.909 1022.5,804C 1015.28,802.519 1010.45,805.353 1008,812.5C 1003.71,828.965 1007.88,842.799 1020.5,854C 1023.92,856.041 1027.59,857.541 1031.5,858.5C 1028.14,862.192 1024.8,865.859 1021.5,869.5C 1000.94,850.7 991.771,827.366 994,799.5C 996.775,785.904 1004.61,776.904 1017.5,772.5 Z"/></g>
<g><path style="opacity:1" fill="#fdcb22" d="M 1093.5,830.5 C 1115.87,831.742 1137.87,834.908 1159.5,840C 1172.18,841.594 1184.84,843.26 1197.5,845C 1209.81,849.311 1215.81,857.978 1215.5,871C 1214.91,878.953 1211.91,885.787 1206.5,891.5C 1194.63,902.874 1182.96,914.374 1171.5,926C 1156.08,940.408 1138.74,952.075 1119.5,961C 1099.44,968.101 1080.77,965.435 1063.5,953C 1052.79,943.952 1041.79,935.286 1030.5,927C 1039.35,929.463 1048.35,931.797 1057.5,934C 1083.75,937.736 1108.42,933.069 1131.5,920C 1155.53,904.806 1176.53,886.14 1194.5,864C 1193.33,862.833 1192.17,861.667 1191,860.5C 1172.86,882.624 1151.69,901.124 1127.5,916C 1098.15,932.004 1067.82,934.337 1036.5,923C 1028,919.001 1019.33,915.501 1010.5,912.5C 1010.02,902.077 1012.52,892.41 1018,883.5C 1031.98,863.857 1049.48,848.023 1070.5,836C 1077.86,832.387 1085.52,830.554 1093.5,830.5 Z"/></g>
<g><path style="opacity:1" fill="#3b3832" d="M 1100.5,855.5 C 1103.94,855.301 1107.27,855.801 1110.5,857C 1112.02,860.659 1110.69,862.159 1106.5,861.5C 1102.62,861.302 1098.95,860.468 1095.5,859C 1097.23,857.811 1098.9,856.644 1100.5,855.5 Z"/></g>
<g><path style="opacity:1" fill="#363532" d="M 1066.5,863.5 C 1068.2,863.34 1069.87,863.506 1071.5,864C 1068.19,867.811 1064.19,870.311 1059.5,871.5C 1059.42,870.07 1059.75,868.736 1060.5,867.5C 1062.57,866.143 1064.57,864.81 1066.5,863.5 Z"/></g>
<g><path style="opacity:1" fill="#ededed" d="M 1319.5,1073.5 C 1319.78,1074.29 1320.28,1074.96 1321,1075.5C 1321.5,1062.84 1321.67,1050.17 1321.5,1037.5C 1321.19,1034.61 1321.53,1031.95 1322.5,1029.5C 1321.6,1151.5 1321.27,1273.5 1321.5,1395.5C 1231.79,1395.17 1142.13,1395.51 1052.5,1396.5C 1052.67,1395.51 1052.34,1394.84 1051.5,1394.5C 1011.23,1372.4 981.064,1340.73 961,1299.5C 939.113,1242.87 945.113,1189.53 979,1139.5C 979.667,1140.5 979.667,1141.5 979,1142.5C 970.383,1159.84 964.383,1178.17 961,1197.5C 955.638,1237.36 963.305,1274.36 984,1308.5C 982.806,1299.52 981.473,1290.52 980,1281.5C 979.21,1262.12 979.877,1242.79 982,1223.5C 987.705,1188.56 995.539,1154.23 1005.5,1120.5C 1006.83,1120.5 1008.17,1120.5 1009.5,1120.5C 1009.71,1117.55 1009.05,1114.88 1007.5,1112.5C 1017.87,1072.71 1025.54,1032.38 1030.5,991.5C 1032.04,990.699 1033.71,990.366 1035.5,990.5C 1034.66,985.794 1033.49,981.128 1032,976.5C 1031.5,973.183 1031.33,969.85 1031.5,966.5C 1031.5,956.167 1031.5,945.833 1031.5,935.5C 1032.55,935.351 1033.55,935.517 1034.5,936C 1042.14,943.146 1050.14,949.813 1058.5,956C 1080.35,972.296 1103.68,974.629 1128.5,963C 1147.85,952.316 1165.52,939.316 1181.5,924C 1191.3,913.372 1201.63,903.206 1212.5,893.5C 1221.24,911.543 1230.07,929.543 1239,947.5C 1248.67,965.167 1258.33,982.833 1268,1000.5C 1283.22,1026.3 1300.39,1050.64 1319.5,1073.5 Z"/></g>
<g><path style="opacity:1" fill="#abacac" d="M 1338.5,931.5 C 1338.92,936.754 1338.92,942.087 1338.5,947.5C 1337.5,947.5 1336.5,947.5 1335.5,947.5C 1334.95,955.759 1333.62,963.759 1331.5,971.5C 1331.33,967.818 1331.5,964.152 1332,960.5C 1334.04,951.468 1335.87,942.468 1337.5,933.5C 1337.33,932.508 1337.66,931.842 1338.5,931.5 Z"/></g>
<g><path style="opacity:1" fill="#3f517b" d="M 1031.5,966.5 C 1031.33,969.85 1031.5,973.183 1032,976.5C 1033.49,981.128 1034.66,985.794 1035.5,990.5C 1033.71,990.366 1032.04,990.699 1030.5,991.5C 1030.17,982.983 1030.51,974.65 1031.5,966.5 Z"/></g>
<g><path style="opacity:1" fill="#646465" d="M 1321.5,1037.5 C 1321.67,1050.17 1321.5,1062.84 1321,1075.5C 1320.28,1074.96 1319.78,1074.29 1319.5,1073.5C 1320.17,1061.5 1320.83,1049.5 1321.5,1037.5 Z"/></g>
<g><path style="opacity:1" fill="#485a82" d="M 1007.5,1112.5 C 1009.05,1114.88 1009.71,1117.55 1009.5,1120.5C 1008.17,1120.5 1006.83,1120.5 1005.5,1120.5C 1005.29,1117.5 1005.96,1114.84 1007.5,1112.5 Z"/></g>
<g><path style="opacity:1" fill="#576582" d="M 907.5,1256.5 C 906.75,1271.15 906.417,1285.82 906.5,1300.5C 905.834,1295.18 905.501,1289.68 905.5,1284C 905.389,1274.62 906.055,1265.46 907.5,1256.5 Z"/></g>
<g><path style="opacity:1" fill="#fcca22" d="M 1025.5,1393.5 C 1008.17,1394.17 990.833,1394.83 973.5,1395.5C 971.517,1395.16 970.183,1395.82 969.5,1397.5C 960.435,1396.86 951.769,1397.53 943.5,1399.5C 937.729,1398.89 932.396,1399.55 927.5,1401.5C 922.381,1400.9 917.715,1401.56 913.5,1403.5C 908.391,1403.43 903.391,1404.1 898.5,1405.5C 904.046,1400.11 908.213,1393.78 911,1386.5C 915.135,1367.35 919.801,1348.35 925,1329.5C 926.426,1324.07 929.759,1320.74 935,1319.5C 945.382,1322.11 954.549,1326.94 962.5,1334C 983.75,1353.76 1004.75,1373.59 1025.5,1393.5 Z"/></g>
<g><path style="opacity:1" fill="#cbb145" d="M 1025.5,1393.5 C 1026.5,1393.83 1027.17,1394.5 1027.5,1395.5C 1009.5,1395.5 991.5,1395.5 973.5,1395.5C 990.833,1394.83 1008.17,1394.17 1025.5,1393.5 Z"/></g>
<g><path style="opacity:1" fill="#72878b" d="M 973.5,1395.5 C 991.5,1395.5 1009.5,1395.5 1027.5,1395.5C 1027.83,1395.5 1028.17,1395.5 1028.5,1395.5C 1008.98,1396.21 989.314,1396.88 969.5,1397.5C 970.183,1395.82 971.517,1395.16 973.5,1395.5 Z"/></g>
<g><path style="opacity:1" fill="#3c6db3" d="M 1051.5,1394.5 C 1052.34,1394.84 1052.67,1395.51 1052.5,1396.5C 1018.27,1400.7 989.435,1415.37 966,1440.5C 930.827,1482.86 922.161,1530.19 940,1582.5C 962.694,1635.1 1002.53,1664.77 1059.5,1671.5C 1020.25,1669.77 981.25,1671.93 942.5,1678C 854.08,1698.26 785.58,1746.42 737,1822.5C 682.058,1917.32 675.725,2015.32 718,2116.5C 761.744,2207.08 831.91,2266.41 928.5,2294.5C 916.378,2293.24 904.211,2292.57 892,2292.5C 852.124,2291.95 817.791,2305.28 789,2332.5C 753.067,2374.01 744.4,2420.68 763,2472.5C 783.088,2512.92 814.254,2541.09 856.5,2557C 883.274,2565.01 910.274,2571.51 937.5,2576.5C 775.095,2555.07 642.595,2481.07 540,2354.5C 429.416,2208.16 391.416,2044.49 426,1863.5C 464.913,1697.33 556.413,1569.17 700.5,1479C 758.902,1443.97 821.569,1419.81 888.5,1406.5C 888.735,1407.1 889.235,1407.43 890,1407.5C 892.791,1406.59 895.624,1405.93 898.5,1405.5C 903.391,1404.1 908.391,1403.43 913.5,1403.5C 918.338,1403.09 923.005,1402.42 927.5,1401.5C 932.998,1401.05 938.331,1400.38 943.5,1399.5C 952.319,1398.95 960.986,1398.29 969.5,1397.5C 989.314,1396.88 1008.98,1396.21 1028.5,1395.5C 1036.35,1395.83 1044.02,1395.49 1051.5,1394.5 Z"/></g>
<g><path style="opacity:1" fill="#778988" d="M 969.5,1397.5 C 960.986,1398.29 952.319,1398.95 943.5,1399.5C 951.769,1397.53 960.435,1396.86 969.5,1397.5 Z"/></g>
<g><path style="opacity:1" fill="#88917d" d="M 943.5,1399.5 C 938.331,1400.38 932.998,1401.05 927.5,1401.5C 932.396,1399.55 937.729,1398.89 943.5,1399.5 Z"/></g>
<g><path style="opacity:1" fill="#89927c" d="M 927.5,1401.5 C 923.005,1402.42 918.338,1403.09 913.5,1403.5C 917.715,1401.56 922.381,1400.9 927.5,1401.5 Z"/></g>
<g><path style="opacity:1" fill="#294172" d="M 1059.5,1671.5 C 1133.83,1671.33 1208.17,1671.5 1282.5,1672C 1302.22,1676.05 1314.38,1687.88 1319,1707.5C 1319.67,1806.17 1319.67,1904.83 1319,2003.5C 1316.07,2050.94 1303.41,2095.61 1281,2137.5C 1227.75,2229.42 1148.25,2282.92 1042.5,2298C 1004.36,2300.76 966.362,2299.6 928.5,2294.5C 831.91,2266.41 761.744,2207.08 718,2116.5C 675.725,2015.32 682.058,1917.32 737,1822.5C 785.58,1746.42 854.08,1698.26 942.5,1678C 981.25,1671.93 1020.25,1669.77 1059.5,1671.5 Z"/></g>
<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="512px" height="512px" style="shape-rendering:geometricPrecision; text-rendering:geometricPrecision; image-rendering:optimizeQuality; fill-rule:evenodd; clip-rule:evenodd" xmlns:xlink="http://www.w3.org/1999/xlink">
<g><path style="opacity:0.971" fill="#fdfefd" d="M 233.5,-0.5 C 247.167,-0.5 260.833,-0.5 274.5,-0.5C 304.317,9.15263 323.483,29.1526 332,59.5C 339.345,89.3663 342.679,119.7 342,150.5C 344.778,161.507 349.112,171.84 355,181.5C 368.05,195.948 380.383,210.948 392,226.5C 416.433,265.55 428.433,308.217 428,354.5C 430.744,356.984 432.744,359.984 434,363.5C 434.819,374.077 434.652,384.577 433.5,395C 440.273,401.107 447.607,406.44 455.5,411C 466.604,419.701 470.437,430.868 467,444.5C 464.925,448.579 462.092,452.079 458.5,455C 445.248,460.862 431.915,466.528 418.5,472C 411.333,476.5 405.5,482.333 401,489.5C 390.087,500.368 377.254,507.701 362.5,511.5C 354.833,511.5 347.167,511.5 339.5,511.5C 330.106,507.941 323.44,501.441 319.5,492C 295.187,490.478 270.854,490.145 246.5,491C 225.029,492.989 205.362,499.822 187.5,511.5C 181.833,511.5 176.167,511.5 170.5,511.5C 162.979,509.277 155.313,507.11 147.5,505C 137.164,499.556 126.498,494.889 115.5,491C 98.9022,490.511 82.5689,488.178 66.5,484C 57.7298,481.552 50.2298,477.052 44,470.5C 42.227,466.848 41.0603,463.015 40.5,459C 42.0611,451.405 43.0611,443.739 43.5,436C 42.3624,423.826 41.529,411.66 41,399.5C 42.5281,392.606 46.3614,387.439 52.5,384C 63.1918,379.744 74.1918,376.577 85.5,374.5C 87.1162,360.256 93.6162,348.923 105,340.5C 116.867,286.112 136.534,234.779 164,186.5C 173.368,166.541 178.201,145.708 178.5,124C 178.862,94.5989 183.029,65.7655 191,37.5C 198.802,17.5227 212.968,4.85606 233.5,-0.5 Z M 207.5,64.5 C 220.436,64.5483 228.269,70.8816 231,83.5C 233.682,94.99 232.348,105.99 227,116.5C 225.333,118.167 223.667,119.833 222,121.5C 222.97,116.943 223.303,112.276 223,107.5C 221.172,94.4585 214.839,91.4585 204,98.5C 201.067,106.127 200.733,113.794 203,121.5C 198.228,117.632 195.228,112.632 194,106.5C 190.633,93.5179 192.633,81.5179 200,70.5C 202.114,67.8792 204.614,65.8792 207.5,64.5 Z M 271.5,64.5 C 284.436,64.5483 292.269,70.8816 295,83.5C 297.682,94.99 296.348,105.99 291,116.5C 289.333,118.167 287.667,119.833 286,121.5C 286.97,116.943 287.303,112.276 287,107.5C 285.172,94.4585 278.839,91.4585 268,98.5C 265.067,106.127 264.733,113.794 267,121.5C 262.228,117.632 259.228,112.632 258,106.5C 254.633,93.5179 256.633,81.5179 264,70.5C 266.114,67.8792 268.614,65.8792 271.5,64.5 Z M 236.5,128.5 C 254.324,128.717 269.991,134.55 283.5,146C 269.722,156.266 254.389,163.266 237.5,167C 234.833,167.667 232.167,167.667 229.5,167C 219.431,162.599 210.764,156.266 203.5,148C 213.012,138.913 224.012,132.413 236.5,128.5 Z M 290.5,167.5 C 291.675,167.281 292.675,167.614 293.5,168.5C 325.327,227.811 340.16,291.144 338,358.5C 327.362,377.047 321.695,397.047 321,418.5C 302.089,435.121 279.923,443.954 254.5,445C 237.066,447.234 219.732,446.567 202.5,443C 201.069,442.535 199.903,441.701 199,440.5C 196.125,434.788 192.291,429.788 187.5,425.5C 173.617,415.373 162.784,402.706 155,387.5C 149.593,370.68 141.093,355.68 129.5,342.5C 137.436,308.858 148.27,276.192 162,244.5C 173.654,220.862 184.988,197.196 196,173.5C 206.45,183.224 218.783,189.224 233,191.5C 253.824,187.162 272.991,179.162 290.5,167.5 Z M 113.5,363.5 C 116.755,365.926 119.588,368.926 122,372.5C 128.522,389.214 136.855,404.881 147,419.5C 156.721,430.554 167.054,440.887 178,450.5C 183.979,460.374 186.312,471.04 185,482.5C 184.654,484.848 183.487,486.681 181.5,488C 174.336,487.795 167.336,486.462 160.5,484C 147.419,478.862 134.419,473.529 121.5,468C 105.707,467.505 90.0407,465.838 74.5,463C 70.0056,462.288 67.0056,459.955 65.5,456C 66.6609,449.046 67.3276,442.046 67.5,435C 66.8651,425.435 66.0318,415.935 65,406.5C 65.3742,405.584 65.8742,404.75 66.5,404C 76.3652,400.827 86.3652,398.16 96.5,396C 102.636,392.915 106.802,388.081 109,381.5C 110.505,375.481 112.005,369.481 113.5,363.5 Z M 348.5,395.5 C 356.885,403.406 366.885,406.739 378.5,405.5C 390.32,406.842 400.82,403.842 410,396.5C 411.072,401.383 412.739,406.05 415,410.5C 424.398,419.068 434.232,427.068 444.5,434.5C 442.717,436.232 440.717,437.732 438.5,439C 424.464,442.894 411.464,448.894 399.5,457C 390.435,466.734 380.769,475.734 370.5,484C 362.803,487.195 354.803,488.528 346.5,488C 344.777,487.477 343.444,486.477 342.5,485C 341.437,481.916 340.771,478.749 340.5,475.5C 342.772,448.779 345.439,422.113 348.5,395.5 Z"/></g>
<g><path style="opacity:0.932" fill="#fdfdfd" d="M 270.5,249.5 C 275.434,249.334 279.101,251.334 281.5,255.5C 278.224,260.279 274.391,264.612 270,268.5C 268.436,270.37 268.436,272.37 270,274.5C 272.833,276.667 275.333,279.167 277.5,282C 284.118,280.955 289.451,277.455 293.5,271.5C 296.862,270.091 299.362,271.091 301,274.5C 301.667,278.5 301.667,282.5 301,286.5C 297.123,293.447 291.623,298.614 284.5,302C 278.449,302.26 272.449,302.927 266.5,304C 263.318,307.349 259.985,310.516 256.5,313.5C 250.167,307.833 244.167,301.833 238.5,295.5C 241.484,292.015 244.651,288.682 248,285.5C 245.759,266.991 253.259,254.991 270.5,249.5 Z"/></g>
<g><path style="opacity:0.914" fill="#fcfcfc" d="M 198.5,256.5 C 199.552,256.351 200.552,256.517 201.5,257C 206.333,261.833 211.167,266.667 216,271.5C 216.333,273.5 216.667,275.5 217,277.5C 219.706,279.871 222.039,282.537 224,285.5C 235.357,295.858 246.357,306.525 257,317.5C 265.81,308.19 270.81,309.856 272,322.5C 280.725,330.89 289.058,339.556 297,348.5C 299.385,355.018 297.885,360.518 292.5,365C 288.289,366.534 283.956,366.867 279.5,366C 270.053,357.43 261.053,348.43 252.5,339C 245.087,340.921 242.254,338.088 244,330.5C 245.685,328.983 247.185,327.316 248.5,325.5C 235.708,312.208 222.708,299.041 209.5,286C 207.048,285.71 204.715,285.044 202.5,284C 198.027,278.86 193.194,274.027 188,269.5C 187.333,268.833 187.333,268.167 188,267.5C 191.762,263.915 195.262,260.248 198.5,256.5 Z"/></g>
<g><path style="opacity:0.933" fill="#fcfcfc" d="M 225.5,307.5 C 226.552,307.351 227.552,307.517 228.5,308C 233.667,313.167 238.833,318.333 244,323.5C 244.667,324.5 244.667,325.5 244,326.5C 231.473,339.027 218.973,351.527 206.5,364C 201.32,366.851 195.987,367.185 190.5,365C 185.283,359.704 184.116,353.537 187,346.5C 200.035,333.632 212.869,320.632 225.5,307.5 Z"/></g>
</svg>

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 6.3 KiB

View File

@ -25,7 +25,7 @@
"kernel_badge_running_version_label": "Running Version",
"kernel_badge_running_kernel_label": "Running Kernel",
"kernel_badge_running_sched_label": "Running Sched",
"kernel_main_label_label": "Available Kernel Packages for",
"kernel_main_label_label": "Available Kernel Packages",
"kernel_status_icon_tooltip_text": "Installed",
"kernel_install_button_label": "Install",
"kernel_install_button_tooltip_text": "Install this kernel",

View File

@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<gresources>
<gresource prefix="/com/github/cosmicfusion/pika-kernel-manager/icons/scalable/actions/">
<gresource prefix="/com/github/pikaos-linux/pika-kernel-manager/icons/scalable/actions/">
<file compressed="true" preprocess="xml-stripblanks">tux-symbolic.svg</file>
<file compressed="true" preprocess="xml-stripblanks">tux-download-symbolic.svg</file>
<file compressed="true" preprocess="xml-stripblanks">tux-settings-symbolic.svg</file>
</gresource>
<gresource prefix="/com/github/cosmicfusion/pika-kernel-manager/css/">
<gresource prefix="/com/github/pikaos-linux/pika-kernel-manager/css/">
<file compressed="true">style.css</file>
</gresource>
</gresources>

View File

@ -0,0 +1,3 @@
#! /bin/bash
apt show kernel-pika 2>&1 | grep Depends: | tr "," "\n" | cut -f2 -d":" | grep linux-image | tr -d ' '

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 32 KiB

After

Width:  |  Height:  |  Size: 5.8 KiB

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 36 KiB

After

Width:  |  Height:  |  Size: 6.3 KiB

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 29 KiB

After

Width:  |  Height:  |  Size: 4.3 KiB

View File

@ -1,10 +1,20 @@
{
"latest_kernel_version": "6.10.5",
"latest_kernel_version": "6.11.0",
"kernels": [
{
"name": "PikaOS Kernel 6.11.0 RC-5 (Experimental)",
"main_package": "linux-image-6.11.0-rc5-pikaos",
"packages": "linux-image-6.11.0-rc5-pikaos linux-headers-6.11.0-rc5-pikaos"
},
{
"name": "PikaOS Kernel 6.10.5",
"main_package": "linux-image-6.10.5-pikaos",
"packages": "linux-image-6.10.5-pikaos linux-headers-6.10.5-pikaos"
},
{
"name": "PikaOS Kernel 6.10.0",
"main_package": "linux-image-6.10.0-pikaos",
"packages": "linux-image-6.10.0-pikaos linux-headers-6.10.0-pikaos"
}
]
}
}

View File

@ -129,8 +129,8 @@ pub fn build_ui(app: &adw::Application) {
fn load_icon_theme(window: &adw::ApplicationWindow) {
let icon_theme = gtk::IconTheme::for_display(&WidgetExt::display(window));
icon_theme.add_resource_path("/com/github/cosmicfusion/pika-kernel-manager/icons/");
icon_theme.add_resource_path("/com/github/pikaos-linux/pika-kernel-manager/icons/");
icon_theme.add_resource_path(
"/com/github/cosmicfusion/pika-kernel-manager/icons/scalable/actions/",
"/com/github/pikaos-linux/pika-kernel-manager/icons/scalable/actions/",
);
}

View File

@ -1,17 +1,14 @@
use crate::{kernel_pkg, sched_ext, RunningKernelInfo, KERNEL_DB_JSON_URL};
use adw::prelude::*;
use async_channel::Receiver;
use duct::cmd;
use glib::*;
use gtk::*;
use homedir::get_my_home;
use std::cell::RefCell;
use std::path::Path;
use std::process::{Command, Stdio};
use std::rc::Rc;
use std::{fs, time};
use version_compare::Version;
use Vec;
pub fn content(
content_stack: &gtk::Stack,
@ -310,7 +307,7 @@ pub fn get_running_kernel_info() -> RunningKernelInfo {
}
fn is_scx_kernel() -> bool {
if Path::new("/sys/kernel/sched_ext/root/ops").exists() {
if Path::new("/sys/kernel/sched_ext").exists() {
true
} else {
false
@ -318,7 +315,6 @@ fn is_scx_kernel() -> bool {
}
pub fn get_current_scheduler(version: String) -> String {
if is_scx_kernel() {
println!("{}", t!("get_current_scheduler_sched_ext_detected"));
let scx_sched = match fs::read_to_string("/sys/kernel/sched_ext/root/ops") {
Ok(t) => t,
Err(_) => "disabled".to_string(),
@ -359,7 +355,7 @@ fn create_kernel_badges(
let json: serde_json::Value =
serde_json::from_str(&kernel_db).expect("Unable to parse");
let kernel_version = json["latest_kernel_version"].as_str().to_owned().unwrap().to_string()
let kernel_version = json["latest_kernel_version"].as_str().to_owned().unwrap().to_string();
let version_css_style = if &running_kernel_info.version == &kernel_version {
"background-green-bg"
@ -431,7 +427,7 @@ fn is_scx_installed() -> bool {
match Command::new("systemctl")
.args(["status", "scx"])
.output() {
Ok(t) if t.status.success() => true,
Ok(t) if t.status.code().unwrap() != 4 => true,
_ => false
}
}

View File

@ -3,13 +3,11 @@ use adw::prelude::*;
use duct::cmd;
use glib::*;
use gtk::*;
use std::cell::RefCell;
use std::error::Error;
use std::io::BufRead;
use std::io::BufReader;
use std::process::Command;
use std::process::Stdio;
use std::rc::Rc;
use std::time::*;
pub fn kernel_pkg_page(
@ -39,11 +37,8 @@ pub fn kernel_pkg_page(
.orientation(Orientation::Vertical)
.build();
/*let main_label = gtk::Label::builder()
.label(format!(
"{} {}", t!("kernel_main_label_label"),
&selected_kernel_branch_clone0.name
))
let main_label = gtk::Label::builder()
.label(t!("kernel_main_label_label"))
.hexpand(true)
.halign(Align::Center)
.margin_start(10)
@ -52,7 +47,7 @@ pub fn kernel_pkg_page(
.margin_top(20)
.build();
main_label.add_css_class("symbolic-accent-bg");
main_label.add_css_class("size-20-font");*/
main_label.add_css_class("size-20-font");
let main_icon = gtk::Image::builder()
.pixel_size(48)
@ -69,7 +64,7 @@ pub fn kernel_pkg_page(
let main_label_box = gtk::Box::new(Orientation::Horizontal, 0);
main_label_box.append(&main_icon);
//main_label_box.append(&main_label);
main_label_box.append(&main_label);
let searchbar = gtk::SearchEntry::builder()
.search_delay(500)
@ -157,13 +152,6 @@ fn add_package_rows(
searchbar: &gtk::SearchEntry,
parse_loading_dialog: &adw::MessageDialog
) {
let cpu_feature_level: u32 = match get_cpu_feature_level().as_str() {
"x86-64-v4" => 4,
"x86-64-v3" => 3,
"x86-64-v2" => 2,
_ => 1,
};
let (kernel_package_sender, kernel_package_receiver) = async_channel::unbounded();
let kernel_package_sender = kernel_package_sender.clone();
@ -241,14 +229,20 @@ fn add_package_rows(
.args(["-s", &kernel_main_package_clone0])
.output()
.unwrap();
if command_installed_status.status.success() {
kernel_status_loop_sender
.send_blocking(true)
.expect("channel needs to be open")
} else {
kernel_status_loop_sender
.send_blocking(false)
.expect("channel needs to be open")
let command_get_kernel_pika = Command::new("/usr/lib/pika/kernel-manager/scripts/get_kernel_pika.sh")
.output()
.unwrap();
let kernel_pika_pkg = String::from_utf8(command_get_kernel_pika.stdout).unwrap();
if kernel_main_package_clone0.trim() != kernel_pika_pkg.trim() {
if command_installed_status.status.success() {
kernel_status_loop_sender
.send_blocking(true)
.expect("channel needs to be open")
} else {
kernel_status_loop_sender
.send_blocking(false)
.expect("channel needs to be open")
}
}
std::thread::sleep(Duration::from_secs(6));
});

View File

@ -97,7 +97,7 @@ fn load_gresource() {
fn load_css() {
// Load the CSS file and add it to the provider
let provider = CssProvider::new();
provider.load_from_resource("/com/github/cosmicfusion/pika-kernel-manager/css/style.css");
provider.load_from_resource("/com/github/pikaos-linux/pika-kernel-manager/css/style.css");
// Add the provider to the default screen
gtk::style_context_add_provider_for_display(