Compare commits

...

743 Commits

Author SHA1 Message Date
Jakob Petsovits
c21ca79777 [libcalamares] Block sleep with systemd/CK login manager if present
Calamares running as root is not always conducive to successfully
communicating with the fd.o PowerManagement interface on the user
session bus.

The login manager interface has long provided a similarly capable
sleep inhibition functionality, which at this point would be present
on the vast majority of distributions. Use it if systemd-logind
or ConsoleKit2 have registered this service on the system bus.
Regardless of running as root or user, Calamares shouldn't have
an issue contacting this interface.

Fixes #2384
2024-12-16 09:35:05 +07:00
Philip Mueller
363c02faba Release v3.3.12
-----BEGIN PGP SIGNATURE-----
 
 iHUEABYIAB0WIQRtmLmVocps5LuQZRjHqjN9+hOIHgUCZz+5vgAKCRDHqjN9+hOI
 Hth+AQD/GwVRmPACOgldmMOr1ONSJKyoGG8mmbBWX97Yo/GgWwEArFMgmewBvP9j
 cJseKirQdQZuS5jIuYA6fdjK/uECIgw=
 =iXFF
 -----END PGP SIGNATURE-----

Merge tag 'v3.3.12' of https://github.com/calamares/calamares into 3.3.x-stable

Release v3.3.12
2024-11-22 06:51:07 +07:00
Philip Mueller
870b137bfc [postcfg] add workaround for BTRFS bug 2024-11-07 19:13:05 +07:00
Philip Mueller
a0e4323063 Release v3.3.11
-----BEGIN PGP SIGNATURE-----
 
 iQGzBAABCAAdFiEESUdADzdGoDiQC7F4Mo10LYgHpDUFAmcqM4gACgkQMo10LYgH
 pDXG1Qv/bRC7Xh2sE94unbRnSUTHtHyyyRegaNfSmkECAEr9jUZ+YxuTLs7USAML
 iT7MhvPKB2fuPAgeu6LoANPiqpmV3yj9eODKWnkcDi/u5DiFdk/BebCO1nC3+hMX
 bZOKABuEJWbSoEHRzv+Hc95PJ/842fGHQO+YXyGbyCsxOuQ0mPe4AC0iBxi5ru8X
 ZCR7mn8Xj2x/HrV3yw9pNhEia7W/peD8MkRN1l2rgWn5+nsV7DKp09O+3jnEJRob
 iFDyfBMkjd0NzGFx8+MviUARSm7ZMNEa1m+3Vdkd87evWUtz11t+jTjGp9vkUCQA
 REqmgtvnCJEAys7/TZWkUZUs3BjiNq7D/xQ2e6hk0NgtaKR2DYj51VklpbUQKF4L
 kg8zhcFz3SniLEbBISlNvf8Ad3gzQfIil2PSrRTcrsWYKjaE84mdOJhiQodJ1nDC
 BTA4vfYVoWvFupJTvKdE6w7lJJX3v+PvXF/i2TQjECNtG88Bg3m+aMMO61yD8I9u
 Iro5sQo5
 =zpRH
 -----END PGP SIGNATURE-----

Merge tag 'v3.3.11' of https://github.com/calamares/calamares into 3.3.x-stable

Release v3.3.11
2024-11-06 08:36:44 +07:00
Simon Quigley
9a658a20fa Fix a syntax error in Presentation.qml which prevents the slideshow from displaying 2024-11-04 23:27:14 +07:00
Jakob Petsovits
a3f2a56b40 [partition] Use the same last sector for root vs. swap partitions
If we have already determined that `lastSectorForRoot` should be
a lower value for GPT tables, the calculation of swap partition
boundaries shouldn't keep using `dev->totalLogical()` for its
own size.

Fixes #2367
2024-11-04 23:27:00 +07:00
Philip Mueller
cd6d6a4f08 Release v3.3.10
-----BEGIN PGP SIGNATURE-----
 
 iHUEABYIAB0WIQRtmLmVocps5LuQZRjHqjN9+hOIHgUCZxf/FAAKCRDHqjN9+hOI
 HpNfAQCRQgTxRNHHB2Jpb9Gzoh04usmGahHfx2NfQVlzsR/23wD7B/R2AqNUdSmx
 9nP8KpM6hBMY6O2yeh5wyQGMUAat/wg=
 =0C4X
 -----END PGP SIGNATURE-----

Merge tag 'v3.3.10' of https://github.com/calamares/calamares into 3.3.x-stable

Release v3.3.10
2024-10-23 08:20:23 +07:00
Philip Mueller
8963c28e8a Release v3.3.9
-----BEGIN PGP SIGNATURE-----
 
 iQGzBAABCAAdFiEESUdADzdGoDiQC7F4Mo10LYgHpDUFAma7yZoACgkQMo10LYgH
 pDVzmwwA7q/UhEsvE2yfhwe/8J5FjZ6I+Ot1qKNLIWQlvVcyeUc6lUSLEPZnnrea
 QmQXKc6zDiIKoZYBdl5CkJO0y6YkaIaRfT2m4u5h4rToRUI3Wn6pYGQ9BjbREcwt
 //+KfN8+MlCaLVGzUP/LfgGXYyLj3t/VsYLu/XIY5Nw/uzL54pQlJj4n86dY+E1z
 522/oiWrdhO2cqQL59h4r6d5ZvHxN8lDWpOqYpYvuapltwbZMZW8aIroJKOm4by5
 62SuxAdOGdAgntkpGpRcbgOcCcgh8MFeq0LJL6cLqi4D4G2zu3HG+BtFSrQW478b
 j8FZjqNg0xt7Ej1+7UA57YEe/njENY61LTp9vn9bdtz5sW2UNZJQ3db2lBxAIgcB
 E2uPKYyOfd1UHGEd1vCmKiibSHGWZgJXy4yAvHr/j9wCxSAlIAbRG4E9UXSOL7SU
 iZQU26MWBGfCT/qkm6x+i/rnVQFY55s2bmiVn+vt2ozaFHuaYmeDEGH5X2md5Tiq
 eRrbt2i1
 =Xzfp
 -----END PGP SIGNATURE-----

[merge] v3.3.9
2024-08-14 10:04:04 +07:00
Philip Mueller
5a9d1879ee Release v3.3.8
-----BEGIN PGP SIGNATURE-----
 
 iQGzBAABCAAdFiEESUdADzdGoDiQC7F4Mo10LYgHpDUFAmaFwHAACgkQMo10LYgH
 pDWiVwwA8OLFLQhvB1cmqosD8TRYHs7unnzLVNxtXpi64nqO6XXNLgFrFM+nQ4XB
 H+Bt7DCbbrIUUZBC0BN+FPXxUJYl6cS/k8AaLdiUBCWuCWPQP6UO0rBRrL7fAUla
 mwdR/soSrjVkCJBqbkwcR1EdGnDobfTJq279CiPGj/fyn0QVf+zvrIzJRGkryAtP
 ro5YLgOH3zyLAhccKU7QaVfE4/CdsuRRSFVTkmN5rXlKiPkB+djeR29ZfLbkStt7
 PN1FmQcnyVWZD2bPUjyB4OUmM+V95vHQmMLaVpEsbMcr1K6HBdZx6OKttQkb6C6H
 qNVOgrtR9xGr+cS5VvU87dV1rQvGTLt7a/VwZcQY4BU20UlkIMmC06RMb72UH737
 MXVtBKwTIl/fd02q1AYGF/X4jnrSfX/a6XP6y7+Tr7tetGw639JJIn77r7j8VmkV
 jPnZF2IxdpE+Yth39vHqJSOH9gDqfHhl1BXZ/ZB+bfHnOz16pQGCCrBsU/T23H0L
 VT23AMqL
 =88Dj
 -----END PGP SIGNATURE-----

Merge tag 'v3.3.8' of https://github.com/calamares/calamares into 3.3.x-stable

Release v3.3.8
2024-07-04 16:21:17 +07:00
Manjaro Build Server
176986c2a0 Release v3.3.7
-----BEGIN PGP SIGNATURE-----
 
 iQGzBAABCAAdFiEESUdADzdGoDiQC7F4Mo10LYgHpDUFAmZ0bpkACgkQMo10LYgH
 pDW/fgv7BG7O+VT1PQJ017L8N99ukMWhRElM1IqkFvIu1SkMqRtPYIDGv7p5TFt+
 CMV001bQFYyfKS+Yet4tqrNjTVwhR7Ao2UfCqMDKfRSgr7Tni0P51skPpslmB236
 7KdKMCcRVICkCw2iSWUB277IukJC9m895sknv1MG5Yj3Km5qzZFpjOyAno//SeXW
 uGmKLXh16FzyAXMPSEErEOdD2VOYcTEQbDFvPQh/j0sXwoAfm9jIA6j19CDbGgEH
 rRd9alV39uM0SAo0W4wi/yJl7oF8yzjrKCmxeYwDH0ILSfuPfI/IvSwizPWH9xrF
 VhYFjFVIFugxx9U7kP1Ag3WTbbYXKKoiqshBFZhFB3mRNk9hupGqCyQnFltdvpWr
 pUXK752XKorkXIpIvnyR2g51qaIgxLA+CYP+TLDuSQcysLjWPFlwJ/i5IkBNdSh6
 abhcKOtXBTp0mchYEvMy2vtYf+w8IVOIMZj3eHzC8lQTonJOFbGIYN1oj4Iyvh9J
 msU3msvQ
 =oSKf
 -----END PGP SIGNATURE-----

Merge tag 'v3.3.7' of https://github.com/calamares/calamares into 3.3.x-stable

Release v3.3.7
2024-06-24 15:09:44 +07:00
Philip Mueller
cf4d25b2b2 [polkit] update policy 2024-06-16 09:15:09 +07:00
Philip Mueller
97f960f5dc [postcfg] fix copytree 2024-05-08 20:24:20 +07:00
Philip Müller
efb6a522bf [postcfg] get rid of distutils 2024-05-08 19:06:42 +07:00
Philip Mueller
41451c9500 Release v3.3.6
-----BEGIN PGP SIGNATURE-----
 
 iQGzBAABCAAdFiEESUdADzdGoDiQC7F4Mo10LYgHpDUFAmYegr0ACgkQMo10LYgH
 pDVL2wwAwI+efwkyadFEIZ3d8wSHQ5UVZqH+ccbBVDh+cWH4a/MBrTEXNv4NwX3s
 PKdj58otEinMPgBVMpdSZEODUMYOM6NsTBU5u8g8CR9GK7rRflqyyeHS1xUNRwOp
 i2FfUQF0NpHFNCd0kJ1b4UB1wWvqVrHhO2YR6gIJ5ud7B3BQyP8+RTxwMOBwp9M0
 nAE+p3/jDuqzq+BRbF75rNyUbMgKlqku1DI8qjqJQTehj3uYvgsAL4ze6yvgRGnH
 BLLoNmFqsH4tEQ9M7oHyO5JmMTXaOGmtuLj17RGeQuwftXjfSYbaqMRThH0q+xue
 s0cmNCDH68aFQaHYmAXonCHTdUkch+ClupIprnOuZe4JkNU9IakQ20SfP54C7OO7
 Cf2Oz+1z8psfX0PjJV4l0UoAbdLB8rj65v+JgxS/o+rFeNlBu5o3WSzuhJ1LDA8D
 H2Q6OF0ApgbY+duH43ur3ggAe+nf3Ls8nAPW/IYPaH+0SiqgFvKKqY3HNGWtqFgT
 8pRoWnmB
 =lGOn
 -----END PGP SIGNATURE-----

Merge tag 'v3.3.6' of https://github.com/calamares/calamares into 3.3.x-stable

Release v3.3.6
2024-04-17 12:02:29 +07:00
Adriaan de Groot
2fe94e2376 [locale] Fix build with DEBUG_TIMEZONES 2024-03-30 22:02:11 +07:00
dalto
4425edf90e [displaymanager] Fix sddm config file writing to the wrong location 2024-03-30 22:01:26 +07:00
dalto
a12edb1065 [mount] Ensure efi partition gets correct options 2024-03-30 22:01:01 +07:00
Philip Mueller
0f9c5f9686 [postcfg] remove ucode related code
- with the new microcode hook in mkinitcpio it is partly obsolete
- see also: https://gitlab.manjaro.org/applications/calamares/-/issues/88
2024-03-30 21:55:45 +07:00
Artem Grinev
e3e83cf125 [branding] Capitalize style entries' first letters 2024-03-14 21:17:34 +05:00
Peter Jung
c60acb0113 initcpiocfg: Add microcode module
Signed-off-by: Peter Jung <admin@ptr1337.dev>
2024-03-14 22:33:48 +07:00
Harald Sitter
752b01cbba on Qt6 we need to build with position independent code
otherwise linking may fail with

> copy relocation against non-copyable protected symbol `qt_resourceFeatureZstd@@Qt_6'
2024-03-14 22:32:50 +07:00
Philip Mueller
28f1ac98e9 Release v3.3.5
-----BEGIN PGP SIGNATURE-----
 
 iQGzBAABCAAdFiEESUdADzdGoDiQC7F4Mo10LYgHpDUFAmXk9vwACgkQMo10LYgH
 pDVzyAwA1RVYTwj6kJz21OR/zrbCvMcXnIZIhOCxCSLyzD92O+FeR8N58uVlhAJu
 VIYebDlWJopJ6KTuvXFwy5R5KENMpyACPGmcobiQjChxNinCxgBRdopmrdqWeE7C
 +23voIT10wrbpBFodZFCyi/a+Hohk2GQdpCNOii27qRPHFYnplj50MrzSn3si291
 MKQFqC4ySMlBvQ/FNsfsEbJuzuq9ZrxPjeAc06nC0QX/L1RY3VqBXKj4VHfcl1IV
 ozgf8InA3V4yW9NjRvEWpnPtKeywDKBr/8EBWEmQf0g8qPQ5N+QYZTCfhKMxvFv1
 7o8x9N5VdMMX4D4cxcTZi6KFwMicXP61WDDFw7pwlZW7vJ+ufxY9QnEleY4Hf2VD
 +cIp0UhBAtHvV+aXPCTajHXnP2RgT8RmFRU2HCyU4S9n2TR9gNW/yPfGO8toudDi
 vrEWPJly+UfnhDLFBpFmLcsZfN+IUC8xEfMJP/bJGOFKR25ygHDJnKKI7Zm9/xV7
 HtX3RFIr
 =szVR
 -----END PGP SIGNATURE-----

Merge tag 'v3.3.5' of https://github.com/calamares/calamares into 3.3.x-stable

Release v3.3.5
2024-03-14 22:32:31 +07:00
Philip Mueller
9e82eeafc1 Release v3.3.4
-----BEGIN PGP SIGNATURE-----
 
 iQGzBAABCAAdFiEESUdADzdGoDiQC7F4Mo10LYgHpDUFAmXdJnEACgkQMo10LYgH
 pDULsAwAnWo+PpPVtxYxfhCpjN+dq9kP6oNVBdew+hlRWJV+dvk79z6ERWmZaBR2
 YeKCYYo5uG/STHSkjSKwXfQiP6Cxm5/D+56xUojvxsYwmShKKTuyCxVebXUrDFZF
 KrFYEO6MkqbHaFM4HHkraUdTiY8MgcYHCFVBkIzo8xr5k7LW95fy1i/4JI3k73kM
 u6ZQqQFZJ8ADc2ADnO5e/LAH18yPPcHTwkFajKl11Ez5Igr2/gwKBTCaBfxdO7Pk
 zSYW1fMzPhO5dP/MNDBDto5dXwF3AyrHYPc59mTk1Uz564MVvPJvx3ctTU3/N/aZ
 0CrfDsg6im/5apTiqIxLoE2NbzE/EhJRJfsNPE+mWEmZ51yBbEpkYqIOSSXjDEmp
 N+UrV7k0GR1N2X0D5KGdFQSNtIrnWFi+d5MzBSQ1B928S8VCcyNtJQnpj4Vqk8zz
 DBSRdrud76CynZyuhvmjz8hUIX2ilQLzfx3Nkvts13EsGQ7DeJGwOZIxZ5JwnOfk
 sLmBOVzs
 =+xng
 -----END PGP SIGNATURE-----

Merge tag 'v3.3.4' of https://github.com/calamares/calamares into 3.3.x-stable

Release v3.3.4
2024-02-28 09:12:07 +07:00
Philip Mueller
43eb5c0d4a Release v3.3.2
-----BEGIN PGP SIGNATURE-----
 
 iQGzBAABCAAdFiEESUdADzdGoDiQC7F4Mo10LYgHpDUFAmXTpAsACgkQMo10LYgH
 pDVH/AwA3/O/OvPGUcoUa3MsBY0TzsWnNLKuGim28vPLdYXsYTdlBAVgNDIdP4+W
 zbR7k+W2fXgmGF6ZwbrRCjNNqWKwmBWnCRFQsD0PeEp9lmnJFByDcvqoT6B39s0m
 UYt56PmqM7FpPB+iLbfpIhjo6WD2e5jJjOCZh83w5CH+pCG/lmQ6L03gf/wy2r5+
 RTUumbKGHKoC2AVIQfYeuMdIHrInBqz9A1VxjtcqHgtsYRt9iAmOulfOJyqgaZEp
 BA5eVYivIQPiRcU1zGWJ/2gKjC6ASE1O0GBwtZjjHkS2HIgRIOdvetEOKZJUNQeC
 /IztuNW9m94PW9zvRzxEFj5c3YCGppu+BGMPR4d5xHoiBmbM3vU8npdfiom7lHTG
 j8vXC4Om0RQjttHcUwV8JD/aCAZoyV6eJZAut+uuIiZUvKJfRZc4eIR68UTWB+o8
 UnekuNtuzk+VAmOUPgxEsYhRhQcQx26TDOix3zpK2zkt5H5eaV1Ig/8jZ1jyae39
 ST6MoRXE
 =qE3g
 -----END PGP SIGNATURE-----

Merge tag 'v3.3.2' of https://github.com/calamares/calamares into 3.3.x-stable

Release v3.3.2
2024-02-20 19:26:58 +07:00
Philip Mueller
b8047384aa Release v3.3.1
-----BEGIN PGP SIGNATURE-----
 
 iQGzBAABCAAdFiEESUdADzdGoDiQC7F4Mo10LYgHpDUFAmWlgLkACgkQMo10LYgH
 pDWiJgwA1kLPSsDg7uPeoOXG5ba2rqQ+XTZIR8p59euLiWrDBg8PmPiDAuXoXbv4
 TJZ8McShV0hM/rF7yInMVyayrRJuKo0yocoq1+pbdPjJ19c4NbeZ5pqKrTUjVlGx
 vVaC390LRHhmtWZFQw9ClzmyL25GugUUJ61HzQ0nzTl0jQ+GI6DxcoTEDcZt47w4
 xOCPPGxLNow0L9MXmSpkk6qS/Eng0oDKZnL2prgZvcBVKgJ9kzOqQWsIsOpTLyme
 AGomVXEg2KKVdo9Hz3eABAbKzFm3/ztL+SK/lqMwzsUTuaafV64PozcRKLEpxvR/
 iMvXUHj2czS6ofHWdHFRRlP+ISa1Wdsxzh5y137aMyx4/5f3YiEr+WPbkg35yAh4
 D0sZJlp915pcwZRah0qmHjw5DDbfmTm1nAiwKngnKeOi3z9mcaVV+MoT7eampMvl
 uJhv5FdN7fyepNVwfOROAJtiadN5zZt/grA61koI6bmDCfXYvQXrJwH8s9sE9148
 EnBNIthb
 =1VQW
 -----END PGP SIGNATURE-----

Merge tag 'v3.3.1' into development

Release v3.3.1
2024-01-18 13:37:18 +07:00
Philip Mueller
a9e2f87868 Merge branch 'calamares' of https://github.com/calamares/calamares into development 2024-01-13 09:44:45 +07:00
Philip Mueller
cc9a093f16 [data] fix polkit script 2024-01-03 14:36:10 +07:00
Philip Mueller
20f84795c5 [branding] adopt changes from 3.2 branch 2023-12-31 06:53:09 +07:00
Philip Mueller
d562c6134e Release v3.3.0
-----BEGIN PGP SIGNATURE-----
 
 iQGzBAABCAAdFiEESUdADzdGoDiQC7F4Mo10LYgHpDUFAmV4DwgACgkQMo10LYgH
 pDXQLgwAlgiFFPwgYKL6hHK96FN7cAqtNe8Xa7Nkkp8xEUzeHYkr7QRzvtyeRVUq
 YAkW6BYZl9OZvzUwKAw7TnwayNJI3TVtdCRR7uXpNYoAFnCMxhIqBhI+tDDVYmmn
 +9/Y8DkNk8JikYO6HEJR4rEDErQ768ybel0yti0Tx1OZE5x6L85bIRdfkH5eUJtM
 IwcbJfLpQHQv0cIhitLrsu84d8lldmhUOHxQ071+6RC3A7RiI7wGG1YYBJdCdoH4
 ga2VC38F64NwVmdpTzbDftoJygD14bZg580UwdicVVdBeSqOp/vvk9hatqUsYtsJ
 /Nl+NsK0lMt/ysoltNSOHJMj9mcAuREDqCbeltDvono1Ql770Gr+Sfk/FImRikiE
 dlQJ/bjWKniNnvQNuHx4lL+1wnUNsjof5U2BMqwFkrDPnGrnG2RRDkGO7XtVrhCI
 HofjxQTAqfh2e4VLH3WnuE0Ah+zuqIWNBoeZbNYANgmsVen7cnPJ6kULMEToS+Fg
 AuY1WKDG
 =8nLw
 -----END PGP SIGNATURE-----

Merge tag 'v3.3.0' into development

Release v3.3.0
2023-12-23 08:57:16 +07:00
Philip Mueller
e582bee3f9 Merge branch 'calamares' of https://github.com/calamares/calamares into development 2023-11-27 19:33:20 +07:00
Artem Grinev
73670631c8 [branding] Update slideshow
- Add sponsor text support
- Update smoke assets
- Rework starfield to use Qt Particles
- Minor refactorings
- Reformat qml files
2023-11-27 19:29:43 +07:00
Philip Mueller
0659f6e0a5 Release v3.3.0-alpha6
-----BEGIN PGP SIGNATURE-----
 
 iQGzBAABCAAdFiEESUdADzdGoDiQC7F4Mo10LYgHpDUFAmVWmEIACgkQMo10LYgH
 pDUN+wv+IzNYGbWDXX3FSHBMeWSbFe2m9CyN5TZ3nDi5AgyTa6b0NEBBZf8UeCfz
 LTdCQX3/oMjOgAyjCmN8fuc5FadzbUSxNLqL27U1ht+VPvoL/vNKqOE0fhTuMfPL
 qHS8nUocY/Mg7KU0f9jVLjdQxJagBI/WiDjaZd+HPZAZRWxyecEnxSb+KIj8et8p
 L8iKwFNX5qxLEypSDy9oYFfcD5sKxkuwvYu4eGYtRIe7YyRXYJKt/K6Owkcq1Bg3
 rhQSPDyO+aSuwMkvBx0oYIqMJnGGDspVjAr6ooBLadXa0zr5+d7UVARDQRjw0tAu
 xIDRY0gMT1Unn1+oeB6N/CoAIDNcxPm4MX01FsDob7Dsi/NsDYGvEqUz/0Xg1CoS
 V3r+C3aRhOaRRBW1uW87cerIwZpjyOv7eK6nlDAjbEcZkNoWgxnrSmKYaCqFETWB
 bSRQuFc75Juyew+yBihYzF7k+ObHFOXPRNsOgE1x9+N3xdb6XDwz15wnKxrDamIQ
 wq/m3GiB
 =O0o0
 -----END PGP SIGNATURE-----

Merge tag 'v3.3.0-alpha6' into development

Release v3.3.0-alpha6
2023-11-17 08:09:50 +07:00
Adriaan de Groot
c490434f02 [partition] Repair comparison 2023-11-16 05:41:54 +07:00
Philip Mueller
bb99e4790e Merge commit '12413ad9e817215754098b4dae5ac8fe908d3b8c' into development 2023-11-14 13:41:00 +07:00
Philip Mueller
fd10a4a4a2 Merge branch 'calamares' of https://github.com/calamares/calamares into development 2023-10-13 10:39:10 +07:00
Philip Mueller
b272011b21 Merge branch 'calamares' of https://github.com/calamares/calamares into development 2023-09-11 07:22:30 +02:00
Philip Mueller
d6471d93e2 [branding] update background 2023-06-16 15:20:09 +02:00
Philip Mueller
100f408dae Merge branch 'calamares' of https://github.com/calamares/calamares into development 2023-06-15 20:05:16 +02:00
Philip Mueller
9ef9e9b7fa [branding] adopt the enum names as keys 2023-06-03 18:36:35 +02:00
Philip Mueller
e99d0bc081 Revert "[branding] adopt the enum names as keys"
This reverts commit 73e4c46756.
2023-06-03 18:35:48 +02:00
Philip Mueller
73e4c46756 [branding] adopt the enum names as keys 2023-06-03 18:22:02 +02:00
Philip Müller
b419ce34ca [displaymanager] add plasma-mobile support 2023-05-26 13:20:39 +02:00
Philip Mueller
cfa2e8d25f [branding] sync with 3.2.x branch 2023-05-26 13:19:29 +02:00
Philip Mueller
8785180a3a [fstab] update conf 2023-05-26 11:21:00 +02:00
Philip Mueller
7621788fb2 [services-systemd] update config 2023-05-26 10:59:06 +02:00
Philip Mueller
448ebd639c [merge] with upstream 2023-05-26 10:46:16 +02:00
Philip Müller
b08573a500 Merge branch 'calamares' of github.com:calamares/calamares into development 2022-09-17 07:32:13 +02:00
Philip Müller
06ab34c068 Merge branch 'new-branding' into '3.2.x-stable'
New branding

See merge request applications/calamares!36
2022-09-17 07:30:21 +02:00
Philip Müller
3d986c95ea Merge branch 'calamares' of https://github.com/calamares/calamares into development 2022-08-25 16:11:12 +02:00
Philip Müller
16dc879080 [merge] with upstream 2022-07-30 08:03:38 +02:00
Philip Müller
4342b244ba [merge] with upstream 2022-06-12 19:04:17 +07:00
Philip Müller
d12d830b4d Merge branch 'calamares' of https://github.com/calamares/calamares into development 2022-05-24 23:06:15 +07:00
Philip Müller
bd4be95754 Merge branch 'calamares' of https://github.com/calamares/calamares into development 2022-05-21 18:40:02 +07:00
Philip Müller
c781599c0d [merge] with upstream 2022-05-19 19:51:15 +07:00
Philip Müller
8120d2ae6c [merge] with upstream 2022-05-19 19:37:15 +07:00
Philip Müller
969965f171 [merge] with upstream 2022-05-19 19:34:24 +07:00
Philip Müller
d5a79180e7 Merge branch 'calamares' of https://github.com/calamares/calamares into development 2022-04-28 19:27:39 +07:00
Philip Müller
83c5ceaa9c Merge branch 'calamares' of https://github.com/calamares/calamares into development 2022-04-19 06:17:37 +02:00
Philip Müller
17b97a48b8 Merge branch 'calamares' of https://github.com/calamares/calamares into development 2022-03-21 21:06:19 +01:00
Philip Müller
0c71520fc6 Merge branch 'calamares' of https://github.com/calamares/calamares into development 2022-03-19 17:09:31 +01:00
Philip Müller
65a0ce2b8b Merge branch 'calamares' of https://github.com/calamares/calamares into development 2022-03-14 11:10:34 +01:00
Philip Müller
85393d52ad Merge branch 'calamares' of https://github.com/calamares/calamares into development 2022-03-13 07:40:58 +01:00
Philip Müller
8f7de7a272 Merge branch 'calamares' of https://github.com/calamares/calamares into development 2022-02-25 15:20:01 +01:00
Philip Müller
3e130c3e36 Merge branch 'calamares' of https://github.com/calamares/calamares into development 2022-02-01 19:14:27 +01:00
Philip Müller
e3bf37c261 Merge upstream development 2022-01-18 15:13:19 +01:00
Philip Müller
ba0bcc8cd2 Merge branch 'calamares' of https://github.com/calamares/calamares into development 2021-12-28 11:51:55 +01:00
Philip Müller
fb630d722e Merge branch 'development' of ssh://gitlab.manjaro.org:22277/applications/calamares into development 2021-12-13 18:41:58 +01:00
Philip Müller
d557fdd6c8 Merge branch 'calamares' of https://github.com/calamares/calamares into development 2021-12-13 18:41:09 +01:00
Artem Grinev
1a1c1eb6dd [fstab] Remove additional ssd options for btrfs 2021-12-11 13:30:17 +00:00
Philip Müller
9a2fd457ba Merge branch 'calamares' of https://github.com/calamares/calamares into development 2021-12-08 13:09:31 +01:00
Philip Müller
b7763f0427 Merge branch 'calamares' of https://github.com/calamares/calamares into development 2021-12-04 10:48:56 +01:00
Philip Müller
38a9da5ae7 Merge branch 'development' of ssh://gitlab.manjaro.org:22277/applications/calamares into development 2021-11-24 11:54:14 +01:00
Philip Müller
fe2d8f3262 Merge branch 'calamares' of https://github.com/calamares/calamares into development 2021-11-24 11:53:45 +01:00
Philip Müller
deac7b545c [fstab] Remove space_cache from btrfs mount options 2021-11-11 01:18:35 +00:00
Philip Müller
fad0503696 Merge branch 'calamares' of https://github.com/calamares/calamares into development 2021-11-09 01:59:17 +01:00
Philip Müller
21641bd2a2 [partition] offer /boot also when other EFI partition was specified
- it still makes sense to offer /boot in EFI
- example: /boot ext4, /boot/efi vfat
- this partly reverts 60f8a7c5fb
2021-11-09 01:59:06 +01:00
Philip Müller
3fba6cf57e [merge] with upstream 2021-10-31 16:02:33 +01:00
Philip Müller
e36df22323 [postcfg] we should also check for folders 2021-10-28 13:39:27 +02:00
Philip Müller
0fbdaa5756 Merge branch 'calamares' of https://github.com/calamares/calamares into development 2021-10-28 13:37:58 +02:00
Philip Müller
682d3b087f [postcfg] deal with symlinks 2021-10-17 17:10:56 +02:00
Philip Müller
33643b5c6b Merge branch 'calamares' of https://github.com/calamares/calamares into development 2021-10-08 09:54:21 +02:00
Philip Müller
abfda4fc57 Merge branch 'calamares' of https://github.com/calamares/calamares into development 2021-09-27 20:50:40 +02:00
Philip Müller
b09fefc4a6 [fstab] remove double compress 2021-09-24 21:39:56 +02:00
Philip Müller
217780bec0 [merge] with upstream 2021-09-24 21:36:43 +02:00
Philip Müller
03d8e5e68c Merge branch 'calamares' of https://github.com/calamares/calamares into development 2021-09-21 12:43:27 +02:00
Philip Müller
52ef084c31 [merge] upstream code 2021-09-17 21:18:36 +02:00
Philip Müller
3966239635 [merge] upstream changes 2021-09-14 10:44:57 +02:00
Philip Müller
8ae76edd88 Merge branch 'calamares' of https://github.com/calamares/calamares into development 2021-09-06 15:32:40 +02:00
Philip Müller
46b0a933c2 Merge branch 'calamares' of https://github.com/calamares/calamares into development 2021-08-09 11:13:13 +02:00
Philip Müller
25b2f89d31 [postcfg] fix copy_tree() 2021-08-09 09:06:58 +00:00
Philip Müller
7a4cd9cdcc [postcfg] adopt to symlinks in copy_tree() 2021-08-09 07:57:37 +00:00
Philip Müller
8e28547f2c Merge branch 'calamares' of https://github.com/calamares/calamares into development 2021-07-14 12:41:13 +02:00
Philip Müller
58cafbd988 Merge branch 'calamares' of https://github.com/calamares/calamares into development 2021-07-11 22:48:17 +02:00
Philip Müller
16de7a0715 Merge branch 'development' of ssh://gitlab.manjaro.org:22277/applications/calamares into development 2021-07-05 13:31:51 +02:00
Philip Müller
16c6e2c6d3 Merge branch 'calamares' of https://github.com/calamares/calamares into development 2021-07-05 13:31:37 +02:00
Bernhard Landauer
538e7561b0 Merge remote-tracking branch 'upstream/calamares' into development 2021-06-22 09:20:51 +02:00
Philip Müller
0769a541d5 Merge branch 'calamares' of https://github.com/calamares/calamares into development 2021-06-18 09:31:28 +02:00
Philip Müller
e0d1d253da Merge branch 'calamares' of https://github.com/calamares/calamares into development 2021-06-10 09:41:45 +02:00
Philip Müller
dbdf5fabe7 Merge branch 'calamares' of https://github.com/calamares/calamares into development 2021-05-26 09:42:58 +02:00
Philip Müller
90ee4cdb4c [merge] upstream 2021-04-30 15:27:56 +02:00
Philip Müller
c57eedd4e7 Merge branch 'calamares' of https://github.com/calamares/calamares into development 2021-04-17 20:11:36 +02:00
Philip Müller
e575d188c7 Merge branch 'calamares' of https://github.com/calamares/calamares into development 2021-04-14 15:13:50 +02:00
Philip Müller
9c30ebfed2 Merge branch 'calamares' of https://github.com/calamares/calamares into development 2021-04-13 22:19:34 +02:00
Philip Müller
02c1fbd791 Merge branch 'calamares' of https://github.com/calamares/calamares into development 2021-04-03 13:13:35 +02:00
Philip Müller
72257e1766 Merge branch 'calamares' of https://github.com/calamares/calamares into development 2021-03-31 00:30:08 +02:00
Philip Müller
ed29278fd0 Merge branch 'calamares' of https://github.com/calamares/calamares into development 2021-03-19 15:52:14 +01:00
Philip Müller
7a15c3af57 Merge branch 'calamares' of https://github.com/calamares/calamares into development 2021-03-15 13:18:15 +01:00
Philip Müller
8fa681a16b Merge branch 'calamares' of https://github.com/calamares/calamares into development 2021-03-15 01:46:25 +01:00
Philip Müller
9e92f5d032 Merge branch 'calamares' of https://github.com/calamares/calamares into development 2021-03-03 14:17:59 +01:00
Philip Müller
3cc67489fa [merge] upstream 2021-01-30 11:10:18 +01:00
Philip Müller
b47e25155e [initcpiocfg] fix 'fsck' 2021-01-30 11:08:39 +01:00
Philip Müller
9ee5e2cbde Merge branch 'calamares' of https://github.com/calamares/calamares into development 2021-01-20 20:04:03 +01:00
Philip Müller
40263b09f8 Merge branch 'calamares' of https://github.com/calamares/calamares into development 2020-12-25 17:49:40 +01:00
Philip Müller
4e72924893 Merge branch 'calamares' of https://github.com/calamares/calamares into development 2020-12-11 21:45:53 +01:00
Philip Müller
0f64491b9a Merge branch 'calamares' of https://github.com/calamares/calamares into development 2020-12-05 11:22:45 +01:00
Philip Müller
644825311c Merge branch 'calamares' of https://github.com/calamares/calamares into development 2020-12-03 09:15:03 +01:00
Philip Müller
2331c50159 Merge branch 'calamares' of https://github.com/calamares/calamares into development 2020-11-18 09:20:57 +01:00
Philip Müller
589afbea30 Merge branch 'calamares' of https://github.com/calamares/calamares into development 2020-11-13 00:20:13 +01:00
Philip Müller
9d8e9a6c7d Merge branch 'calamares' of https://github.com/calamares/calamares into development 2020-11-04 23:07:45 +01:00
Philip Müller
4f6c4391fc [grubcfg] check obsolete 2020-11-03 10:10:10 +01:00
Philip Müller
61178724af Merge branch 'calamares' of https://github.com/calamares/calamares into development 2020-11-01 11:47:03 +01:00
Philip Müller
c64f7821ef Merge branch 'calamares' of https://github.com/calamares/calamares into development 2020-10-29 20:39:53 +01:00
Philip Müller
45063938df Merge branch 'calamares' of https://github.com/calamares/calamares into development 2020-10-22 22:18:32 +02:00
Philip Müller
2077e58fd7 Merge branch 'calamares' of https://github.com/calamares/calamares into development 2020-10-17 17:46:55 +02:00
Philip Müller
4edbbecdb3 Merge branch 'calamares' of https://github.com/calamares/calamares into development 2020-10-08 10:18:29 +02:00
Philip Müller
332de4bb78 Merge branch 'calamares' of https://github.com/calamares/calamares into development 2020-10-03 00:53:16 +02:00
Philip Müller
484a038e68 Merge branch 'calamares' of https://github.com/calamares/calamares into development 2020-09-03 23:24:40 +02:00
Philip Müller
7e631e34df Merge branch 'calamares' of https://github.com/calamares/calamares into development 2020-09-02 19:09:58 +02:00
Philip Müller
6a962f044e [merge] with upstream 2020-09-02 11:42:14 +02:00
Philip Müller
7dbc44ff7f Merge branch 'calamares' of https://github.com/calamares/calamares into development 2020-08-23 20:28:13 +02:00
Philip Müller
a96483a28b Merge branch 'calamares' of https://github.com/calamares/calamares into development 2020-08-07 15:46:28 +02:00
Philip Müller
5aee4d195d :Merge branch 'calamares' of https://github.com/calamares/calamares into development 2020-07-30 12:48:59 +02:00
Philip Müller
3fd088b338 [branding] update to 20.1 Mikah 2020-07-14 02:02:39 +02:00
Philip Müller
1657cd8af2 Merge branch 'calamares' of https://github.com/calamares/calamares into development 2020-07-14 02:01:09 +02:00
Philip Müller
a8230a6411 Merge branch 'calamares' of https://github.com/calamares/calamares into development 2020-07-05 10:02:39 +02:00
Philip Müller
d5bf1db06e Merge branch 'calamares' of https://github.com/calamares/calamares into development 2020-06-24 08:30:07 +02:00
Philip Müller
561bc0d10c Merge branch 'calamares' of https://github.com/calamares/calamares into development 2020-06-18 22:14:18 +02:00
Philip Müller
3ad469d9b5 Merge branch 'calamares' of https://github.com/calamares/calamares into development 2020-06-15 12:37:43 +02:00
Philip Müller
19b48c3c82 [CMake] fix typo 2020-06-15 12:35:52 +02:00
Philip Müller
216caf9130 Merge branch 'master' of https://github.com/calamares/calamares into development 2020-06-15 12:10:15 +02:00
Philip Müller
06b8b33a9e Merge branch 'master' of https://github.com/calamares/calamares into development 2020-06-08 08:26:32 +02:00
Philip Müller
b8c3d15994 [branding] add slideshowAPI value 2020-05-29 18:28:31 +02:00
Philip Müller
9a4475d779 Merge branch 'master' of https://github.com/calamares/calamares into development 2020-05-29 18:27:14 +02:00
Philip Müller
49c17942d0 Merge branch 'master' of https://github.com/calamares/calamares into development 2020-05-21 12:02:42 +02:00
Philip Müller
717ccf9193 [postcfg] also remove calamares-git if present 2020-05-19 16:43:06 +02:00
Philip Müller
61496e72fa [merge] with upstream 2020-05-19 16:42:01 +02:00
Philip Müller
5de9ede750 Merge branch 'master' of https://github.com/calamares/calamares into development 2020-05-13 07:40:13 +02:00
Philip Müller
3081be948a [branding] 20.0 2020-05-10 14:05:02 +02:00
Philip Müller
fb8e69ca6c Merge branch 'master' of https://github.com/calamares/calamares into development 2020-05-09 10:39:28 +02:00
Philip Müller
6ef31e1622 Merge branch 'master' of https://github.com/calamares/calamares into development 2020-05-07 13:47:14 +02:00
Philip Müller
160f8c2aea [fstab] discard 'discard' option
- we rather use 'fstrim' via systemd timmer
- see: https://github.com/calamares/calamares/issues/1395
2020-05-07 13:17:06 +02:00
Philip Müller
d51bf842e1 Merge branch 'master' of https://github.com/calamares/calamares into development 2020-05-01 09:06:10 +02:00
Philip Müller
8d314d2d56 Merge branch 'master' of https://github.com/calamares/calamares into development 2020-04-24 12:15:20 +02:00
Philip Müller
f431863593 Merge branch 'master' of https://github.com/calamares/calamares into development 2020-04-23 21:25:21 +02:00
Philip Müller
67d0565e64 Merge branch 'master' of https://github.com/calamares/calamares into development 2020-04-22 20:47:15 +02:00
Philip Müller
b64e8c831d [displaymanager] update OEM autologin 2020-04-22 20:22:16 +02:00
Philip Müller
96251ed1c3 Revert "[displaymanager] update OEM autologin"
This reverts commit 0dd93810ac.
2020-04-22 19:48:23 +02:00
Philip Müller
0dd93810ac [displaymanager] update OEM autologin 2020-04-22 19:34:29 +02:00
Philip Müller
4d654b71e3 [displaymanager] update OEM autologin 2020-04-22 19:24:10 +02:00
Philip Müller
7778518afd [displaymanager] update OEM autologin 2020-04-22 19:01:58 +02:00
Philip Müller
261ab35b9c [displaymanager] update autologin for OEM setup 2020-04-22 18:07:41 +02:00
Philip Müller
ae32a41082 Merge branch 'master' of https://github.com/calamares/calamares into development 2020-04-20 10:31:25 +02:00
Philip Müller
a063390de9 Merge branch 'development' of ssh://gitlab.manjaro.org:22277/applications/calamares into development 2020-04-08 20:26:13 +02:00
Philip Müller
b250c748a8 Merge branch 'master' of https://github.com/calamares/calamares into development 2020-04-08 20:23:41 +02:00
Philip Müller
2557cc23cd Merge branch 'master' of https://github.com/calamares/calamares into development 2020-04-08 10:52:26 +02:00
Philip Müller
8b6d605d55 Merge branch 'master' of https://github.com/calamares/calamares into development 2020-04-06 20:16:13 +02:00
Philip Müller
963e2f46b8 Merge branch 'master' of https://github.com/calamares/calamares into development 2020-04-06 00:07:29 +02:00
Philip Müller
e3816fa138 Merge branch 'master' of https://github.com/calamares/calamares into development 2020-04-04 21:11:37 +02:00
Philip Müller
76f29dcddd Merge branch 'master' of https://github.com/calamares/calamares into development 2020-04-02 23:53:08 +02:00
Philip Müller
276195c2ba Merge branch 'master' of https://github.com/calamares/calamares into development 2020-03-28 09:41:42 +01:00
Philip Müller
af4a7086df Merge branch 'master' of https://github.com/calamares/calamares into development 2020-03-27 13:09:00 +01:00
Philip Müller
b88e5589ed Merge branch 'master' of https://github.com/calamares/calamares into development 2020-03-24 11:22:13 +01:00
Philip Müller
252802870f Merge branch 'master' of https://github.com/calamares/calamares into development 2020-03-11 12:35:00 +01:00
Philip Müller
6af4da1db3 Merge branch 'master' of https://github.com/calamares/calamares into development 2020-03-10 10:50:58 +01:00
Philip Müller
c52aeb3856 Merge branch 'master' of https://github.com/calamares/calamares into development 2020-03-05 05:34:19 +01:00
Philip Müller
42b065b1fc Merge branch 'master' of https://github.com/calamares/calamares into development 2020-02-28 10:04:17 +01:00
Philip Müller
94bf3af04d Merge branch 'development' of ssh://gitlab.manjaro.org:22277/applications/calamares into development 2020-02-24 22:30:31 +01:00
Philip Müller
5764d9672e Merge branch 'master' of https://github.com/calamares/calamares into development 2020-02-24 22:29:50 +01:00
Philip Müller
f9878e7fcb Merge branch 'patch-2' into 'development'
Optimize fstab for btrfs performance and stability

See merge request applications/calamares!32
2020-02-24 20:35:05 +01:00
Philip Müller
1cc9f61ba7 [branding] bump to Kyria 2020-02-24 20:21:41 +01:00
Philip Müller
cdbd9eb8eb [merge] with upstream 2020-02-24 19:44:30 +01:00
Philip Müller
ee99e34e25 [initcpiocfg] add check for foreign swap 2020-02-24 17:29:06 +01:00
Philip Müller
93f20fb656 Merge branch 'master' of https://github.com/calamares/calamares into development 2020-02-24 16:26:24 +01:00
Matti Hyttinen
cf7c0900b6 Optimize fstab for btrfs performance and stability 2020-02-23 09:50:56 +01:00
Philip Müller
cb1a24bf06 Merge branch 'master' of https://github.com/calamares/calamares into development 2020-02-22 20:29:55 +01:00
Philip Müller
c50726de2d Merge branch 'master' of https://github.com/calamares/calamares into development 2020-02-21 11:52:23 +01:00
Philip Müller
90e7e82078 Merge branch 'master' of https://github.com/calamares/calamares into development 2020-02-19 10:50:50 +01:00
Philip Müller
039940a131 Merge branch 'master' of https://github.com/calamares/calamares into development 2020-02-14 00:22:06 +01:00
Philip Müller
f0ab3a46de [merge] with upstream 2020-02-12 15:53:13 +01:00
Philip Müller
7477a4da8e [initcpiocfg] bootsplash: add hook for each theme 2020-02-08 13:06:51 +01:00
Philip Müller
830cc1b4d2 [initcpiocfg] add bootsplash hook support 2020-02-08 12:56:30 +01:00
Philip Müller
7333a925b4 [merge] with upstream 2020-02-07 21:37:00 +01:00
Philip Müller
70f370f0d3 Merge branch 'development' of ssh://gitlab.manjaro.org:22277/applications/calamares into development 2020-02-05 14:54:17 +01:00
Philip Müller
5a42657ff3 Merge branch 'master' of https://github.com/calamares/calamares into development 2020-02-05 14:52:48 +01:00
Philip Müller
d23712da4e Merge branch 'master' of https://github.com/calamares/calamares into development 2020-02-03 10:24:39 +01:00
Philip Müller
792be6a8d8 Merge branch 'master' of https://github.com/calamares/calamares into development 2020-01-30 13:03:47 +01:00
Philip Müller
2ec1cd7ee1 Merge branch 'master' of https://github.com/calamares/calamares into development 2020-01-30 00:19:03 +01:00
Philip Müller
9c59e98f89 Merge branch 'master' of https://github.com/calamares/calamares into development 2020-01-25 13:47:26 +01:00
Philip Müller
45f1522561 [branding] update manjaro defaults 2020-01-17 09:13:29 +01:00
Philip Müller
d47544e1e3 [merge] with upstream 2020-01-08 14:35:47 +01:00
Philip Müller
f7ed4f3220 [initcpiocfg] fix imports 2019-12-16 09:20:03 +01:00
Philip Müller
26f006bd32 [initcpiocfg] fix typo for separate usr partition hook 2019-12-16 09:05:31 +01:00
Philip Müller
fb3240046d [initcpiocfg] update plymouth check 2019-12-16 08:43:41 +01:00
Philip Müller
14aba17cc3 Merge branch 'master' of https://github.com/calamares/calamares into development 2019-12-12 19:53:47 +01:00
Philip Müller
d385752155 [initcpio] add usr hook as needed 2019-12-06 08:28:42 +01:00
Philip Müller
93883ef27f Merge branch 'master' of https://github.com/calamares/calamares into development 2019-12-06 08:20:36 +01:00
Philip Müller
0e6c414150 Merge branch 'master' of https://github.com/calamares/calamares into development 2019-12-02 10:56:44 +01:00
Philip Müller
5b6bc48429 Merge branch 'master' of https://github.com/calamares/calamares into development 2019-11-30 10:47:36 +01:00
Philip Müller
a9d9a19e35 Merge branch 'master' of https://github.com/calamares/calamares into development 2019-11-18 11:11:33 +01:00
Philip Müller
7ba07d8f75 Merge branch 'development' of ssh://gitlab.manjaro.org:22277/applications/calamares into development 2019-11-16 16:51:01 +01:00
Philip Müller
5989d6aa5a Merge branch 'master' of https://github.com/calamares/calamares into development 2019-11-16 16:50:48 +01:00
Philip Müller
d790e2489e Merge branch 'master' of https://github.com/calamares/calamares into development 2019-11-02 21:46:30 +01:00
Philip Müller
473fa63cfa [packagechooser] resize image 2019-10-23 11:07:50 +02:00
Philip Müller
ceb7663242 Merge branch 'master' of https://github.com/calamares/calamares into development 2019-10-23 11:05:16 +02:00
Philip Müller
38294a61ea [packagechooser] update choose office 2019-10-23 11:05:04 +02:00
Philip Müller
29548f70a8 Merge branch 'master' of https://github.com/calamares/calamares into development 2019-10-15 10:20:32 +02:00
Philip Müller
62c13e6eaf Merge branch 'master' of https://github.com/calamares/calamares into development 2019-10-07 23:28:57 +02:00
Philip Müller
fcda9f3e68 [merge] with upstream 2019-10-01 12:12:45 +02:00
Philip Müller
e1618f20a1 Merge branch 'master' of https://github.com/calamares/calamares into development 2019-09-26 09:04:58 +02:00
Philip Müller
718f24b826 Merge branch 'master' of https://github.com/calamares/calamares into development 2019-09-05 07:00:21 -04:00
Philip Müller
212e0d8f46 Merge branch 'master' of https://github.com/calamares/calamares into development 2019-09-04 13:44:10 -04:00
Philip Müller
71d26e85e1 [mhwdcfg] fix mounting mhwd/db blacklists 2019-09-02 18:15:25 -04:00
Philip Müller
a2a47826d4 [mhwdcfg] fix call cmd 2019-09-02 17:23:09 -04:00
Philip Müller
bba3ce09cd [modules] fix mkdir for 'opt/mhwd' 2019-09-02 16:42:37 -04:00
Philip Müller
e797bb0dc5 [modules] add mkdir and rmdir for 'opt/mhwd' 2019-09-02 16:37:48 -04:00
Philip Müller
250093d9f0 [postcfg] update value 2019-09-02 14:53:17 -04:00
Philip Müller
703640f7c2 [packagechooser] use our images 2019-09-02 11:46:10 -04:00
Philip Müller
ff9483c2bd [cleanup] remove unneeded conf 2019-09-02 11:38:44 -04:00
Philip Müller
a927a9f6a2 [packagechooser] add Office example settings 2019-09-02 11:36:57 -04:00
Philip Müller
42d6322ce3 Merge branch 'master' of https://github.com/calamares/calamares into development 2019-09-02 11:18:52 -04:00
Philip Müller
4e5f5eaf48 [postcfg] adopt to 'opt/mhwd' folder 2019-08-31 05:21:11 -04:00
Philip Müller
91b32f9c5a [mhwdcfg] use 'opt/mhwd' folder 2019-08-31 05:19:57 -04:00
Philip Müller
1b2af1c635 [mhwdcfg] mount also var/lib/mhwd 2019-08-31 05:16:19 -04:00
Philip Müller
f95aa970e9 [mhwdcfg] mount also var 2019-08-31 05:14:22 -04:00
Philip Müller
2797322f0b [postcfg] don't mount opt as readonly 2019-08-31 05:11:00 -04:00
Philip Müller
7e302bda96 [officechooser] update cmakelists 2019-08-31 02:07:48 -04:00
Philip Müller
37750cb9f4 Merge branch 'master' of https://github.com/calamares/calamares into development 2019-08-31 01:52:28 -04:00
Philip Müller
a9732a71ae Merge branch 'master' of https://github.com/calamares/calamares into development 2019-08-27 12:20:54 -04:00
Philip Müller
d8e76719a9 Merge branch 'master' of https://github.com/calamares/calamares into development 2019-08-27 02:27:07 -04:00
Philip Müller
3f101bcdb7 Revert "[libcalamares] Disable Q_DELCARE_INTERFACE once more"
This reverts commit ab986233c3.
2019-08-27 02:26:50 -04:00
Philip Müller
ab986233c3 [libcalamares] Disable Q_DELCARE_INTERFACE once more 2019-08-24 16:29:13 -04:00
Philip Müller
71828d8274 [officechooser] update text and pics 2019-08-24 09:44:31 -04:00
Philip Müller
746d7f6af7 Merge branch 'master' of https://github.com/calamares/calamares into development 2019-08-24 09:32:10 -04:00
Philip Müller
07dd0e832f Merge branch 'master' of https://github.com/calamares/calamares into development 2019-08-20 21:08:07 +02:00
Philip Müller
43820c920e Merge branch 'master' of https://github.com/calamares/calamares into development 2019-08-17 04:04:38 -04:00
Philip Müller
b700eea6f9 Revert "[libcalamaresui] try to fix pythonqt"
This reverts commit a1014f7656.
2019-08-10 01:19:53 -04:00
Philip Müller
a1014f7656 [libcalamaresui] try to fix pythonqt 2019-08-10 01:15:59 -04:00
Philip Müller
5c94a7b15d [settings.conf] fix yaml 2019-08-10 01:00:28 -04:00
Philip Müller
96783d2a55 Merge branch 'master' of https://github.com/calamares/calamares into development 2019-08-10 00:59:34 -04:00
Philip Müller
dce9b215af [officechooser] Drop hard-coded data 2019-08-09 06:40:39 +02:00
Philip Müller
25db582a0a Merge branch 'master' of https://github.com/calamares/calamares into development 2019-08-09 06:34:11 +02:00
Philip Müller
0d74bd3689 [officechooser] fix conf 2019-08-08 23:01:19 +02:00
Philip Müller
332c8801da [officechooser] fix cpp file 2019-08-07 08:15:49 +02:00
Philip Müller
8255966384 [officechooser] fix qrc file 2019-08-07 08:11:23 +02:00
Philip Müller
d5653c0215 [officechooser] fix Makefile 2019-08-07 08:06:50 +02:00
Philip Müller
e635454ebd [officechooser] update debug lines 2019-08-07 07:47:18 +02:00
Philip Müller
76d79d8cd0 [officechooser] fix ccp files 2019-08-07 07:44:00 +02:00
Philip Müller
d0a64e1736 [officechooser] center fonts 2019-08-07 07:39:25 +02:00
Philip Müller
51ec85fdd5 [officechooser] merge with upstream 2019-08-07 07:38:12 +02:00
Philip Müller
ac5c2a041d Merge branch 'master' of https://github.com/calamares/calamares into development 2019-08-07 07:16:41 +02:00
Philip Müller
5a433e22ac Merge branch 'software-chooser' of https://github.com/calamares/calamares into development 2019-08-06 13:03:34 +02:00
Philip Müller
1d8938cc28 Merge branch 'master' of https://github.com/calamares/calamares into development 2019-08-06 13:02:38 +02:00
Philip Müller
0da1cce660 [postcfg] make sure call is from subprocess 2019-08-04 09:30:48 +02:00
Philip Müller
147e6fb580 [postcfg] add noconfirm for pacman cmd in officechooser 2019-08-04 09:02:32 +02:00
Philip Müller
d0531c8beb [postcfg] add temp some code for officechooser module 2019-08-04 08:57:33 +02:00
Philip Müller
26c1f01b87 [officechooser] fix typos 2019-08-04 08:17:29 +02:00
Philip Müller
a7feb620d1 [officechooser] add conf 2019-08-04 07:28:56 +02:00
Philip Müller
19f24a61bf [officechooser] sync with upstream 2019-08-04 07:23:33 +02:00
Philip Müller
e7e25a11e7 Merge branch 'software-chooser' of https://github.com/calamares/calamares into development 2019-08-04 07:02:56 +02:00
Philip Müller
3f20295760 [officechooser] update UI and text 2019-08-03 09:18:06 +02:00
Philip Müller
258eb36432 [officechooser] update text 2019-08-03 08:47:04 +02:00
Philip Müller
5cabeee80d [officechooser] initial commit 2019-08-03 08:28:20 +02:00
Philip Müller
92d256ae06 Merge branch 'software-chooser' of https://github.com/calamares/calamares into development 2019-08-03 07:00:24 +02:00
Philip Müller
a0b330863b Merge branch 'master' of https://github.com/calamares/calamares into development 2019-08-03 06:59:28 +02:00
Philip Müller
7bc8781d16 Merge branch 'master' of https://github.com/calamares/calamares into development 2019-07-09 21:39:45 +02:00
Philip Müller
d07b529c92 Merge branch 'master' of https://github.com/calamares/calamares into development 2019-07-02 07:27:35 +02:00
Philip Müller
da8f45ae18 [machineid] use force for symlink creation 2019-06-26 23:41:09 +02:00
Philip Müller
c29c3f610d Merge branch 'master' of https://github.com/calamares/calamares into development 2019-06-26 23:30:51 +02:00
Philip Müller
7afb2443d5 Merge branch 'master' of https://github.com/calamares/calamares into development 2019-06-19 08:22:12 +02:00
Philip Müller
945cc0ef23 [grubcfg] add apparmor support 2019-06-16 11:17:48 +02:00
Philip Müller
719812ffd6 Merge branch 'master' of https://github.com/calamares/calamares into development 2019-06-15 21:47:31 +02:00
Philip Müller
6fd9088b97 Merge branch 'master' of https://github.com/calamares/calamares into development 2019-06-09 08:39:24 +02:00
Philip Müller
b2533793c7 Merge branch 'master' of https://github.com/calamares/calamares into development 2019-06-08 09:48:05 +02:00
Philip Müller
1af2ee7fab Merge branch 'master' of https://github.com/calamares/calamares into development 2019-06-05 11:43:56 +02:00
Philip Müller
36ce87e1dc Merge branch 'master' of https://github.com/calamares/calamares into development 2019-06-02 09:28:30 +02:00
Philip Müller
353005a924 Merge branch 'master' of https://github.com/calamares/calamares into development 2019-05-28 21:08:36 +02:00
Philip Müller
6cf365e11d Merge branch 'master' of https://github.com/calamares/calamares into development 2019-05-28 07:34:20 +02:00
Philip Müller
52541c786b Merge branch 'master' of https://github.com/calamares/calamares into development 2019-05-22 21:08:47 +02:00
Philip Müller
b58bc964c3 Merge branch 'master' of https://github.com/calamares/calamares into development 2019-05-20 23:31:22 +02:00
Philip Müller
e23c92de5e Merge branch 'master' of https://github.com/calamares/calamares into development 2019-05-17 17:48:31 +02:00
Philip Müller
5329b77df6 Merge branch 'master' of https://github.com/calamares/calamares into development 2019-05-15 06:18:59 +02:00
Philip Müller
c7aa9ba056 Merge branch 'master' of https://github.com/calamares/calamares into development 2019-05-11 09:23:17 +02:00
Philip Müller
3fb500344c Merge branch 'master' of https://github.com/calamares/calamares into development 2019-05-08 07:09:40 +02:00
Philip Müller
3d9ddf7d7b Merge branch 'master' of https://github.com/calamares/calamares into development 2019-05-07 07:07:07 +02:00
Philip Müller
c848867797 [merge] with upstream 2019-05-05 00:37:00 +02:00
Philip Müller
b144449cfe Merge branch 'master' of https://github.com/calamares/calamares into development 2019-04-05 20:01:14 +02:00
Philip Müller
f364ee5660 Merge branch 'master' of https://github.com/calamares/calamares into development 2019-03-31 19:27:12 +02:00
Philip Müller
26578f849e Merge branch 'master' of https://github.com/calamares/calamares into development 2019-03-29 17:17:35 +01:00
Philip Müller
4929a26e89 Merge branch 'master' of https://github.com/calamares/calamares into development 2019-03-12 08:15:35 +01:00
Philip Müller
4b96a4ab24 Revert "Revert "Merge branch 'issue-1098'""
This reverts commit ce4d0e6aea.
2019-03-02 17:36:59 +01:00
Philip Müller
ce4d0e6aea Revert "Merge branch 'issue-1098'"
This reverts commit fdb4311a70, reversing
changes made to 6b369dc5de.
2019-03-02 15:51:36 +01:00
Philip Müller
c55e426fd9 Merge branch 'master' of https://github.com/calamares/calamares into development 2019-03-02 10:53:31 +01:00
Philip Müller
afa70e1944 Merge branch 'master' of https://github.com/calamares/calamares into development 2019-02-26 18:15:19 +01:00
Philip Müller
3f70007410 Merge branch 'master' of https://github.com/calamares/calamares into development 2019-02-24 10:54:03 +01:00
Philip Müller
54a7f31433 Merge branch 'master' of https://github.com/calamares/calamares into development 2019-02-22 22:47:35 +01:00
Philip Müller
870d9200e8 Release v3.2.4
-----BEGIN PGP SIGNATURE-----
 
 iHUEABEIAB0WIQTnwx6uJD15hBW87wASjwCHPgWvHQUCXGLH4QAKCRASjwCHPgWv
 HeCzAP4/cwoZOBtOFAdDy6IlolCC42wAyTdW8NOrA8A7jNmETAD/bIsYGRlVEQeG
 i9CW7IgRLRjlSM+hJPVYY8GYbF3k0Us=
 =0y3i
 -----END PGP SIGNATURE-----

Merge tag 'v3.2.4' of https://github.com/calamares/calamares into development

Release v3.2.4
2019-02-12 15:43:56 +01:00
Philip Müller
9baebce7fd Merge branch 'master' of https://github.com/calamares/calamares into development 2019-02-12 13:45:54 +01:00
Philip Müller
2b32e1ac5c [branding] update colours 2019-01-19 20:40:19 +01:00
Philip Müller
067ca16112 Merge branch 'improve-swap-ui' of https://github.com/calamares/calamares into development 2019-01-18 18:11:25 +01:00
Philip Müller
25d1022c4c Merge branch 'master' of https://github.com/calamares/calamares into development 2019-01-16 23:04:34 +01:00
Philip Müller
7e471444d6 [branding] adjust branding 2019-01-13 14:14:41 +01:00
Philip Müller
42f8bc50f8 Merge branch 'resize-control' of https://github.com/calamares/calamares into development 2019-01-13 14:10:52 +01:00
Philip Müller
ae53c6ba84 Merge branch 'master' of https://github.com/calamares/calamares into development 2019-01-13 14:09:44 +01:00
Philip Müller
2e47911369 Merge branch 'master' of https://github.com/calamares/calamares into development 2019-01-11 21:52:12 +01:00
Philip Müller
d38db49bc9 Merge branch 'master' of https://github.com/calamares/calamares into development 2019-01-09 13:13:58 +01:00
Philip Müller
e28dfc2358 Merge branch 'master' of https://github.com/calamares/calamares into development 2019-01-04 13:11:09 +01:00
Philip Müller
64e8295f82 Merge branch 'master' of https://github.com/calamares/calamares into development 2018-12-15 10:40:57 +01:00
Philip Müller
404cfc451d Merge branch 'master' of https://github.com/calamares/calamares into development 2018-12-08 12:37:13 +01:00
Philip Müller
a33cd43d09 [partition] fix PartitionActions 2018-12-01 09:18:04 +01:00
Philip Müller
961b603f78 [merge] with upstream 2018-12-01 08:50:10 +01:00
Philip Müller
07fe2aef4f [partition] fix comment 2018-11-09 00:42:18 +01:00
Philip Müller
af3ffa855e [partion] Set FlagBoot for some legacy BIOSes, otherwise may not boot. 2018-11-09 00:39:52 +01:00
Philip Müller
7c6ff1a367 [partition] mount only read-only 2018-11-02 23:48:47 +01:00
Philip Müller
5dd2673714 [partition] mount only read-only 2018-11-02 23:46:35 +01:00
Philip Müller
70ebf4dd96 [partition] mount only read-only 2018-11-02 23:42:27 +01:00
Philip Müller
4c73fc0f53 [merge] with upstream 2018-11-02 23:37:53 +01:00
Philip Müller
009c96b2ea [postcfg] fix update-grub call 2018-10-29 21:03:44 +01:00
Philip Müller
f6557c5fe5 [revert] last commit errors
error: ‘m_mountPointDir’ does not name a type
2018-10-29 19:43:05 +01:00
Philip Müller
5a92312cf2 [partition] avoid data cleanup in osprobe
- Fixes #1044
2018-10-29 19:34:51 +01:00
Philip Müller
8c36035aa0 [partition] avoid data cleanup in osprobe
- Fixes #1044
2018-10-29 19:25:50 +01:00
Philip Müller
09bd05dfef [postcfg] fix ucode removal 2018-10-29 18:53:48 +01:00
Philip Müller
1cbeefbf50 [grubcfg] remove loglevel settings
- with systemd 239.3-1 we have quiet really quiet
2018-10-26 18:25:33 +02:00
Philip Müller
fb8e1ad6cd [grubcfg] reduce bootflags 2018-10-25 17:44:00 +02:00
Philip Müller
85fcf11804 [grubcfg] remove vga 2018-10-23 19:15:57 +02:00
Philip Müller
a8a3171401 [branding] tag v18.0 2018-10-21 10:53:17 +02:00
Philip Müller
7bd99940b8 Merge branch 'fix-swap-ui' of https://github.com/calamares/calamares into development 2018-10-15 21:16:38 +02:00
Philip Müller
fe171b84bf [Merge] with upstream 2018-10-06 08:39:43 +02:00
Philip Müller
69d86ce2cf Merge branch 'master' of https://github.com/calamares/calamares into development 2018-10-03 20:27:49 +02:00
Philip Müller
6bca9b3e6e Merge branch 'master' of https://github.com/calamares/calamares into development 2018-10-03 19:27:14 +02:00
Philip Müller
040c5cdf67 [grubcfg] fix grub.params 2018-09-27 20:56:17 +02:00
Philip Müller
42c05c8ac3 Merge branch 'master' of https://github.com/calamares/calamares into development 2018-09-27 20:15:55 +02:00
Philip Müller
2e6dd6a075 [grubcfg] fix syntax 2018-09-26 23:00:19 +02:00
Philip Müller
d39bd34baf [grubcfg] fix syntax 2018-09-26 22:45:41 +02:00
Philip Müller
4f8309d41c [grubcfg] fix syntax 2018-09-26 22:43:28 +02:00
Philip Müller
b48a026061 [grubcfg] fix syntax 2018-09-26 22:40:53 +02:00
Philip Müller
e9f3c88844 [grubcfg] fix syntax 2018-09-26 22:35:35 +02:00
Philip Müller
b4ca18177f [grubcfg] fix syntax 2018-09-26 22:32:04 +02:00
Philip Müller
1f52bfac4e [grubcfg] fix syntax 2018-09-26 22:22:21 +02:00
Philip Müller
b7d993d211 [initcpiocfg] fix syntax 2018-09-26 22:14:12 +02:00
Philip Müller
c89a55fc83 [initcpiocfg] fix syntax 2018-09-26 22:08:02 +02:00
Philip Müller
8a2c5c1727 [initcpiocfg] fix syntax 2018-09-26 21:52:41 +02:00
Philip Müller
8814ebd8a9 [initcpiocfg] fix syntax 2018-09-26 21:41:20 +02:00
Philip Müller
5c6ae3f1b0 [modules] adopt for silent boot 2018-09-26 19:25:03 +02:00
Philip Müller
cf55b16914 [postcfg] fix last commit 2018-09-25 20:21:26 +02:00
Philip Müller
6e81d0fe3a [postcfg] fix last commit 2018-09-25 20:16:20 +02:00
Philip Müller
84659674cd [postcfg] enable menu_auto_hide option 2018-09-25 20:15:40 +02:00
Philip Müller
0c29aa2df8 [keyboard] fix reverse mapping from console to xkb 2018-09-25 00:24:28 +02:00
Philip Müller
d4d9aaf1c6 [keyboard] fix Austrian layout
- should have put more attention to it
2018-09-24 23:48:03 +02:00
Philip Müller
7ba794f484 [keyboard] use de-deadtilde variant for at 2018-09-24 20:19:00 +02:00
Philip Müller
391913cce3 [keyboard] try to fix https://github.com/calamares/calamares/issues/1035 2018-09-24 20:13:47 +02:00
Philip Müller
d0488b7d0c Merge branch 'master' of https://github.com/calamares/calamares into development 2018-09-24 20:13:16 +02:00
Philip Müller
da89f461bd Merge branch 'master' of https://github.com/calamares/calamares into development 2018-09-05 19:54:36 +02:00
Philip Müller
87726c641e [displaymanager] fix desktop_environment_setup ldm 2018-08-26 21:16:20 +02:00
Philip Müller
d133175a5c [postcfg] add ucode removal 2018-08-26 05:06:25 +02:00
Philip Müller
83c397620c Merge branch 'master' of https://github.com/calamares/calamares into development 2018-08-22 10:28:04 +02:00
Philip Müller
a1af1655b4 Merge branch 'master' of https://github.com/calamares/calamares into development 2018-08-21 09:45:33 +02:00
Philip Müller
46e53997a8 Merge branch 'master' of https://github.com/calamares/calamares into development 2018-08-20 12:32:10 +02:00
Philip Müller
271a1ffa86 Merge branch 'master' of https://github.com/calamares/calamares into development 2018-08-10 21:14:24 +02:00
Philip Müller
c8eec9e5f0 Merge branch 'master' of https://github.com/calamares/calamares into development 2018-08-08 17:19:56 +02:00
Philip Müller
627161258f Merge branch 'update-lvm-support' of https://github.com/calamares/calamares into development 2018-07-22 08:33:58 +02:00
Philip Müller
73faaeae2f Merge branch 'master' of https://github.com/calamares/calamares into development 2018-07-17 06:43:49 +02:00
Philip Müller
15eaff15fb [services-systemd] add Manjaro specific settings 2018-06-29 08:30:58 +02:00
Philip Müller
62e065c52f [merge] sync with upstream 2018-06-29 08:25:08 +02:00
Philip Müller
c5c48bafa0 Merge branch 'master' of https://github.com/calamares/calamares into development 2018-06-25 18:56:15 +02:00
Philip Müller
92f2461337 Merge branch 'master' of https://github.com/calamares/calamares into development 2018-06-21 07:38:30 +02:00
Philip Müller
5f78d49777 Merge branch 'master' of https://github.com/calamares/calamares into development 2018-06-16 08:14:07 +02:00
Philip Müller
c652970f02 Merge branch 'master' of https://github.com/calamares/calamares into development 2018-06-08 09:22:56 +02:00
Philip
518a944884 Merge branch 'master' of https://github.com/calamares/calamares into development 2018-05-30 00:10:17 +02:00
Philip
e31cb0a77b Merge branch 'master' of https://github.com/calamares/calamares into development 2018-05-26 11:07:07 +02:00
Philip
2b4a087f39 Merge branch 'master' of https://github.com/calamares/calamares into development 2018-05-23 19:56:52 +02:00
Philip
001d6cf9d3 Merge branch 'master' of https://github.com/calamares/calamares into development 2018-05-18 20:56:34 +02:00
Philip
6f4dff78a7 [partition] Only bootloader model should ignore devices that are not of Disk_Device type #950 2018-05-12 10:05:34 +02:00
Philip
96e04b1285 Merge branch 'master' of https://github.com/calamares/calamares into development 2018-05-11 08:30:09 +02:00
Philip
454636624c [branding] update slides 2018-04-29 13:22:36 +02:00
Philip
13bf2ba42f Merge remote-tracking branch 'upstream/master' into development 2018-04-29 09:03:41 +02:00
Philip
b8fd5bdeae [merge] with upstream 2018-04-18 09:01:59 +02:00
Philip
29acd744b8 [Merge] with upstream 2018-04-13 16:38:07 +02:00
Philip
031416a1de Merge upstream changes 2018-04-07 21:59:58 +02:00
Philip
3a54f44886 Merge branch 'master' of https://github.com/calamares/calamares into development 2018-03-10 09:58:10 +01:00
Philip
6590a06d93 Merge branch 'master' of https://github.com/calamares/calamares into development 2018-02-28 09:10:00 +01:00
Philip
567c5f3326 [Merge] with upstream
- use upstream 'users' module
- Chakra 'users' module wasn't further developed
2018-01-27 02:31:04 -05:00
Philip
bff6890358 [merge] with upstream master branch 2018-01-14 15:45:56 -05:00
Philip
c857568b7a Merge branch 'master' of https://github.com/calamares/calamares into development 2018-01-03 03:55:57 -05:00
Philip
1e019b18ec [postcfg] use -f3 for pacman-mirrors 2018-01-02 03:36:21 -05:00
Philip
5bc59ed489 [postcfg] initialize package manager databases 2018-01-01 15:14:35 +01:00
Philip
587c8b82a9 [initcpiocfg] search just for 'lvm2' in partition[fs] 2017-12-30 02:57:52 -05:00
Philip
7c88deedc8 [initcpiocfg] add 'lvm2' hook as needed 2017-12-30 02:48:00 -05:00
Philip
138fd82a8c [partition]: fix cDebug() format 2017-12-27 10:13:05 -05:00
Philip
63f126d98f [partition] Fix propagation of new partition table to global storage. 2017-12-27 10:11:50 -05:00
Philip
47a9a57b76 Merge branch 'kpmcore-3.2' of https://github.com/calamares/calamares into development 2017-12-25 15:59:29 -05:00
Philip
31c4d934ad Merge branch 'kpmcore-3.2' of https://github.com/calamares/calamares into development 2017-12-25 11:15:00 -05:00
Philip
c1ffc18738 [merge] with upstream 2017-12-23 07:30:07 -05:00
Philip
d9348971a7 Merge branch 'kpmcore-3.2' of https://github.com/calamares/calamares into development 2017-12-23 07:26:03 -05:00
Philip
fc49a1a8b6 Merge branch 'kpmcore-3.2' of https://github.com/calamares/calamares into development 2017-12-16 08:42:11 -05:00
Philip
e6e172db90 Merge branch 'master' of https://github.com/calamares/calamares into development 2017-12-15 02:51:54 -05:00
Philip
978bc2a4ef [Merge] with upstream 2017-12-07 16:49:55 -05:00
Philip
f131c96c0b [branding] update to v17.1 2017-12-01 07:48:34 -05:00
Philip
345c398be9 [Merge] with upstream 2017-12-01 07:44:49 -05:00
Philip
5cbc2273de Merge branch 'master' of https://github.com/calamares/calamares into development 2017-11-14 10:44:33 -05:00
Philip
04a8454fff [Merge] sync with upstream 2017-11-06 06:14:02 -05:00
Philip
243d7c5e29 [keyboard] match keyboard layouts with selected sys-lang 2017-10-27 17:48:49 +02:00
Philip
4b4bd83a39 Merge branch 'master' of https://github.com/calamares/calamares into development 2017-10-27 06:17:25 -04:00
Philip
1396e215c9 [Travis] alert #Manjaro instead of upstream chan 2017-10-25 04:03:14 -04:00
Philip
ee9860dc35 Merge branch 'master' of https://github.com/calamares/calamares into development 2017-10-24 08:26:09 -04:00
Philip
3275a33827 [bootloader] use generic file names instead of grub
- see also #839
2017-10-23 08:28:59 -04:00
Philip
929d302f4d Merge branch 'master' of https://github.com/calamares/calamares into development 2017-10-23 08:24:09 -04:00
Philip
69c0125db5 Merge branch 'master' of https://github.com/calamares/calamares into development 2017-10-15 14:07:39 -04:00
Philip
6c2b3cfbdd Merge branch 'master' of https://github.com/calamares/calamares into development 2017-09-30 20:58:12 -04:00
Philip
de81e06efc Merge branch 'master' of https://github.com/calamares/calamares into development 2017-09-26 05:13:08 -04:00
Philip
cd379d131d [users] revert to old code 2017-09-21 02:57:36 -04:00
Philip
28931b32b5 [Merge] add some fixes 2017-09-21 02:40:54 -04:00
Philip
8a10f5565b Merge branch 'master' of https://github.com/calamares/calamares into development 2017-09-14 08:07:21 -04:00
Philip
769be16fc6 [Merge] with upstream 2017-09-12 05:47:44 -04:00
Philip
35983e9e5f Merge branch 'master' of https://github.com/calamares/calamares into development 2017-09-07 11:00:57 +01:00
Philip
c61f662c86 Merge branch 'master' of https://github.com/calamares/calamares into development 2017-09-06 18:13:08 +01:00
Philip
88172bf1b3 Merge branch 'master' of https://github.com/calamares/calamares into development 2017-09-05 19:13:43 +01:00
Philip
c1aff3631f Merge branch 'master' of https://github.com/calamares/calamares into development 2017-09-04 14:24:06 +01:00
Philip
99fd0b76c2 [Merge] fix conflicts 2017-08-31 13:18:18 +02:00
Philip
79ae0c5130 Merge branch 'master' of https://github.com/calamares/calamares into development 2017-08-28 21:23:12 +01:00
Philip
7acdbcdac5 Merge branch 'master' of https://github.com/calamares/calamares into development 2017-08-23 12:44:11 +01:00
Philip
5df04e5a13 Merge branch 'master' of https://github.com/calamares/calamares into development 2017-08-23 09:02:04 +01:00
Philip
feb2601607 [Merge] get changes from upstream 2017-08-11 09:18:11 +02:00
Philip Müller
283b2f9b8f Merge pull request #25 from scootergrisen/patch-1
Add danish translation
2017-07-13 09:14:54 +02:00
Philip
417ff583a2 Merge branch 'master' of https://github.com/calamares/calamares into development 2017-07-13 08:40:10 +02:00
Philip
da24829bba [unpackfs] fix merge 2017-07-11 11:16:51 +02:00
Philip
34100f9b94 Merge branch 'master' of https://github.com/calamares/calamares into development 2017-07-05 08:51:28 +02:00
Philip
95f6ec5da2 Merge branch 'master' of https://github.com/calamares/calamares into development 2017-07-04 13:54:33 +02:00
scootergrisen
2a15fdff05 Add danish translation 2017-07-02 00:57:01 +02:00
Philip
2a327a91e3 Merge branch 'master' of https://github.com/calamares/calamares into development 2017-06-29 09:45:17 +02:00
Philip
07e84bf315 Merge branch 'master' of https://github.com/calamares/calamares into development 2017-06-28 11:04:27 +02:00
Philip
5ad6958888 Merge branch 'master' of https://github.com/calamares/calamares into development 2017-06-28 09:11:57 +02:00
Philip
76693e6a1f [users] adopt PasswordTests 2017-06-27 21:27:44 +02:00
Philip
c2aed163bc Merge branch 'master' of https://github.com/calamares/calamares into development 2017-06-27 21:05:09 +02:00
Philip
8d1a6b524d [servicescfg] PEP8 modification 2017-06-23 12:45:14 +02:00
Philip
709a9e9078 [chrootcfg] PEP8 modification 2017-06-23 12:33:19 +02:00
Philip
a1e1c66f1d [PEP8] fix several modules 2017-06-23 12:29:44 +02:00
Philip
09f11a4091 [PEP8] fix several modules 2017-06-23 11:59:45 +02:00
Philip
cf1c4bd7ae [servicescfg] PEP8 modification 2017-06-23 11:51:47 +02:00
Philip
4b19c677b3 [chrootcfg] PEP8 modification 2017-06-23 11:46:43 +02:00
Philip
779f602df7 [openrcdmcryptcfg] PEP8 modification
- see also: https://github.com/calamares/calamares/pull/750
2017-06-23 11:35:14 +02:00
Philip
66c36446fa [services] PEP8 modification 2017-06-23 11:32:41 +02:00
Philip
e761ae9008 [mhwdcfg] PEP8 modification 2017-06-23 11:27:47 +02:00
Philip
f37c8627a6 [postcfg] PEP8 modifications 2017-06-23 11:24:17 +02:00
Philip
1d737d0ff8 [displaymanager] PEP8 modifications 2017-06-23 11:20:25 +02:00
Philip
5eb07fe901 Merge branch 'master' of https://github.com/calamares/calamares into development 2017-06-23 11:02:52 +02:00
Philip
1a8af0e660 [Merge with upstream 2017-06-21 19:10:59 +02:00
Philip
f5ad4b12b2 Merge branch 'master' of https://github.com/calamares/calamares into development 2017-06-21 14:26:35 +02:00
Philip
c2ec6467d7 Users: adjust test 2017-06-21 09:12:23 +02:00
Philip
ba50c166f8 Merge branch 'master' of https://github.com/calamares/calamares into development 2017-06-21 08:25:17 +02:00
Philip
b3143d057c Merge branch 'master' of https://github.com/calamares/calamares into development 2017-06-20 00:28:59 +02:00
Philip
67987fa29b [openrcdmcryptcfg] Fixed pep8 whining in module
- see also https://github.com/calamares/calamares/pull/750
2017-06-19 18:50:24 +02:00
Philip
af89d58647 Merge branch 'master' of https://github.com/calamares/calamares into development 2017-06-19 18:24:14 +02:00
Philip
61f63cfa5c [openrcdmcryptcfg] Fixed pep8 whining in module
- fix small regression
- see also https://github.com/calamares/calamares/pull/750
2017-06-19 16:19:46 +02:00
Philip
4c7dbad755 [openrcdmcryptcfg] Fixed pep8 whining in module
- see also https://github.com/calamares/calamares/pull/750
2017-06-19 16:12:13 +02:00
Philip
2d1ab745e3 new module : openrcdmcryptcfg
- auto unlock encrypted /home partition with OpenRC
- see also https://github.com/calamares/calamares/pull/750
2017-06-19 15:54:49 +02:00
Philip
ad683fb117 [Users] adopt hostname lenght 2017-06-19 15:47:48 +02:00
Philip
8ccbbb2f2d [CMakeModules] fix routine 2017-06-18 21:53:08 +02:00
Philip
d22d28dc48 [CMakeModules] fix if loops 2017-06-18 21:46:36 +02:00
Philip
08423f0d5a [CMakeModules] fix if loops 2017-06-18 21:42:27 +02:00
Philip
3afc94d68e [CMakeModules] fix if loops 2017-06-18 21:25:33 +02:00
Philip
c7bc6a17a0 [CMakeModules] search for v3.1+ PythonQT 2017-06-18 21:22:27 +02:00
Philip
9b9789d299 [CMakeModules] adopt to pythonqt v3.2 so-name changes 2017-06-18 10:11:14 +02:00
Philip
4c33e9a16a Keyboard: guess at layout based on locale
Split locale into <language>_<country> and go looking for keyboard
layouts that match. Do that in reverse, so look for country first.

- known weakness is el_CY [should get layout gr] because CY and el
  don't name any keyboard layout.
- known weakness are Hausa, Igbo .. which are ha_NG and ig_NG. They select
  keyboard layout ng, which is labeled 'English [Nigeria]'; they ought
  to select ng[hausa] and ng[igbo], which are the right variant keyboard
  layouts to use.
- similar selecting a locale in Canada [en_CA, fr_CA, iu_CA ...] will
  select keyboard layout ca, which is for French-speaking Canada.
  Locale en_CA should select keyboard en -- e.g. en[us]. But iu_CA
  [Inuktituk] needs layout ca[ike].
2017-06-17 15:36:09 +02:00
Philip
b7ce68897d Merge branch 'master' of https://github.com/calamares/calamares into development 2017-06-17 15:31:01 +02:00
Philip
21c2b15b8e Merge branch 'master' of https://github.com/calamares/calamares into development 2017-06-14 18:40:40 +02:00
Philip
5e2c6b87d5 Merge branch 'master' of https://github.com/calamares/calamares into development 2017-06-14 13:25:48 +02:00
Philip
0ad9ae9432 [services] adjust merge 2017-06-07 09:49:57 +02:00
Philip
8d4a98d5f9 Merge branch 'master' of https://github.com/calamares/calamares into development 2017-06-07 00:02:52 +02:00
Philip
acb0a6aeba Merge branch 'master' of https://github.com/calamares/calamares into development 2017-06-03 23:06:35 +02:00
udeved
a5b7426f6b chrootcfg: rank mirrors fasttrack on host
The ranking at boot is too unreliable
2017-04-07 22:11:41 +02:00
Philip
491789bb05 [postcfg] add geoip 2017-04-02 13:26:31 +02:00
Philip
0407a699ea [bootloader] fix merge conflict 2017-03-31 08:12:42 +02:00
Philip
9c3ada3e88 [bootloader] fix mkdirs -> makedirs 2017-03-24 23:05:41 +01:00
Philip
60a19afeed [bootloader] pep8 optimization 2017-03-20 23:01:42 +01:00
Philip
db931e15bd [bootloader] fix issue when /EFI/Boot exists 2017-03-20 07:53:51 +01:00
Philip
7997265ce9 Merge remote-tracking branch 'upstream/master' into development 2017-03-20 07:52:05 +01:00
Philip Müller
3a45d658ca Merge pull request #24 from oberon2007/development
fix text color for vertex-dark and adjust background color
2017-03-08 23:51:12 +01:00
Bernhard Landauer
48fe6af82b fix colors for both vertex themes 2017-03-08 23:38:25 +01:00
Bernhard Landauer
c18298f8ea try fix text on maia-dark 2017-03-08 23:00:14 +01:00
Bernhard Landauer
d7c9c7fa20 Merge pull request #2 from manjaro/development
merge manjaro dev
2017-03-08 21:56:45 +00:00
Philip
6bb046fad6 Merge remote-tracking branch 'upstream/master' into development 2017-02-24 22:04:31 +01:00
Philip
e9e8b47c06 Merge remote-tracking branch 'upstream/master' into development 2017-02-20 20:40:24 +01:00
Philip
160ad68007 Merge remote-tracking branch 'upstream/master' into development 2017-02-17 21:34:36 +01:00
Philip
9694ca2f27 Merge remote-tracking branch 'upstream/master' into development 2017-02-11 11:35:36 +01:00
Philip
3c1d85dadb Merge remote-tracking branch 'upstream/master' into development 2017-02-08 00:50:29 +01:00
Philip
fccb7ef647 [branding] update slideshow 2017-02-08 00:49:12 +01:00
Philip
d93ab0fb8c [branding] update slides 2017-02-06 21:01:19 +01:00
Ramon Buldó
d1f3c2d73b partition: use always double click to activate a partition tree view item
Using activated signal may use single or double click depending on environment settings
2017-02-05 06:39:30 +01:00
Philip
dd25323a08 [netinstall] made packages optional
A group can now contain only subgroups. Thus packages can be categorized
through sub-categories such as Internet->Web Browsers->firefox
2017-02-04 12:45:25 +01:00
Philip
a6016c63aa [branding] update manjaro branding 2017-02-04 10:17:19 +01:00
Philip
e7dd377e27 Merge branch 'development' of github.com:manjaro/calamares into development 2017-02-03 20:13:09 +01:00
Philip
c0c573d40c [Adjustments] fix conflicts 2017-02-03 20:12:55 +01:00
Philip
88b33d3830 [welcome] revert 56b21bb 2017-02-03 20:08:53 +01:00
udeved
e6c4efbb11 chrootcfg: update module for changed packages global storage 2017-02-03 17:13:27 +01:00
Philip
56b21bbb20 [welcome] refactoring of the checkHasInternet() function. 2017-01-28 10:31:09 +01:00
Philip
f16890ac36 Merge remote-tracking branch 'upstream/master' into development 2017-01-27 11:39:20 +01:00
Philip
dd8bf404e8 [packages] corrected packages syntax errors 2017-01-26 11:32:48 +01:00
Philip
d8bd2b22a7 [netinstall] corrected packages module features so that they are up to date 2017-01-26 11:31:38 +01:00
Philip
3725c46a3c [users] adopt upstream changes
- Change permissions of avatar file after copying
- Use Calamares utils rather than QProcess
- Remove modal dialog and show warning message instead
2017-01-25 15:32:08 +01:00
Philip
c36641aa0a Merge remote-tracking branch 'upstream/master' into development 2017-01-25 12:12:44 +01:00
Philip
69d2f5ddc3 [netinstall] made requested changes 2017-01-25 12:08:02 +01:00
Philip
77b839748f [netinstall] add new files 2017-01-23 17:41:30 +01:00
Philip
55b56b4b5d [netinstall] modify it to a tree based UI 2017-01-23 17:20:40 +01:00
Philip
de8fbc3f9d [users] remove unneeded files 2017-01-23 17:03:12 +01:00
Philip
f4fddc4268 [upstream] merge latest commits 2017-01-23 17:00:17 +01:00
Philip
7499e44046 [upstream] merge latest commits 2017-01-23 16:48:27 +01:00
Philip
31470eabde [initcpio] adjust conf 2017-01-23 16:23:52 +01:00
Philip
93e46baa4a [services] adopt Marcus' modifications for Manjaro 2017-01-23 16:16:22 +01:00
Philip
0440765680 [configs] adjust for manjaro 2017-01-23 16:09:47 +01:00
Philip
170b6cadc2 adopt upstream changes vor v3.0 2017-01-23 15:52:14 +01:00
Philip
368101a73e [bump] v2.4.6 2017-01-23 15:31:59 +01:00
Philip
87e4e3c4a0 [bootloader] improve efi check and don't fail if install path is null 2017-01-23 15:29:49 +01:00
Philip
a57b08c200 Adopt upstream changes on webview and partition
- [webview] fix crash on loading webview page with QtWebengine
- [partition] Bump KPMcore dependency to 3.0.2
- [partition] Make sure to disable the root password if setRootPassword is false
- [partition] Force the correct flags for EFI system partition
- [partition] Always write bootloader path
- [partition] Do not write bootloader install path if the system is EFI
2017-01-23 15:23:22 +01:00
Bernhard Landauer
cc307ae6ab typo 2017-01-21 16:44:18 +01:00
Bernhard Landauer
a49b4713a4 version 3.0.0 2017-01-21 03:22:05 +01:00
Bernhard Landauer
6cb208966a upd 'about' 2017-01-21 03:20:23 +01:00
Bernhard Landauer
4ba0026b88 Always write bootloader path. 2017-01-21 03:16:16 +01:00
Bernhard Landauer
a2264bcc2b don't fail if no bootloader install path 2017-01-21 03:12:46 +01:00
Bernhard Landauer
2dc14dae8e Do not write bootloader install path if the system is EFI. 2017-01-21 03:03:33 +01:00
Bernhard Landauer
554ebcdff4 improve bootloader efi check 2017-01-21 02:59:02 +01:00
Bernhard Landauer
5392615053 Don't assume 'User' exists in autologin section. 2017-01-21 02:53:43 +01:00
Bernhard Landauer
64ca3857c3 Print full error when failing the copy of resolv.conf 2017-01-21 02:52:08 +01:00
Bernhard Landauer
03c2b7f526 Force the correct flags for EFI system partition. 2017-01-21 02:48:10 +01:00
Bernhard Landauer
f9db712033 bootloaderInstallPath only applies if isEfi. 2017-01-21 02:45:52 +01:00
Bernhard Landauer
5571bc0efa reduce font manipulation. 2017-01-21 02:43:02 +01:00
Bernhard Landauer
f11d932d4b Style. 2017-01-21 02:39:59 +01:00
Bernhard Landauer
cb2ef737f0 Bump KPMcore dependency to 3.0.2. 2017-01-21 02:12:35 +01:00
Bernhard Landauer
f57955d8c0 update launcher 2017-01-21 02:00:39 +01:00
Bernhard Landauer
82571a3ab9 Merge pull request #22 from oberon2007/upstream_shainer
[users] disable root password if setRootPassword is false
2017-01-21 01:42:46 +01:00
Bernhard Landauer
4570bc24e7 rm content of other PR 2017-01-20 07:45:04 +01:00
Bernhard Landauer
db3f7af489 disable root password if setRootPassword is false 2017-01-20 07:38:46 +01:00
Bernhard Landauer
6bfa27ec00 Merge pull request #1 from manjaro/development
merge manjaro-dev
2017-01-20 07:31:15 +01:00
Philip
3e6001f098 [partition] The sender QObject should be in scope so the bootloader path is written 2017-01-11 14:01:18 +01:00
Philip
82243914de [partition] The sender QObject should be in scope so the bootloader path is written 2017-01-11 14:00:47 +01:00
Bernhard Landauer
c07654e3df update launcher 2017-01-06 03:31:22 +01:00
Philip
6c941fc4c9 [branding] prepare for 'Gellivara' 2017-01-01 03:30:45 +01:00
Philip
e6c1125988 [partition] Disallow assigning the same mountpoint to two partitions 2017-01-01 02:45:44 +01:00
Philip
fbe90c22af [users] Clarify semantics of avatarFilePath config setting. 2017-01-01 02:44:37 +01:00
Philip
1727d2f267 [partition] Disallow assigning the same mountpoint to two partitions 2017-01-01 02:43:41 +01:00
Philip
c29bca3fe0 [branding] prepare for 'Gellivara' 2016-12-24 08:56:55 +01:00
Philip
a65f57cfc9 [partition] Improve debug output 2016-12-24 08:54:43 +01:00
Philip
47600ea6d1 [webview] fix crash on loading webview page with QtWebengine 2016-12-23 09:50:44 +01:00
Philip
edade9423f [users] Fix reading shells from the config file. 2016-12-23 09:45:39 +01:00
Philip
742deb1203 [users] Set tab order to more logical one for the flow. 2016-12-23 09:44:45 +01:00
Teo Mrnjavac
2082fff1d2 Improve debug output for bootloader code path. 2016-12-19 20:07:18 +01:00
Chantara Tith
32402eeafa Use device's immutable copy instead of rescanning. 2016-12-19 20:03:23 +01:00
Chantara Tith
ed42185927 Use device's immutable copy instead of rescanning. 2016-12-19 20:02:58 +01:00
Bernhard Landauer
297cf45bba logo padding 2016-12-19 19:53:38 +01:00
Bernhard Landauer
213c65676e update logos 2016-12-19 19:53:28 +01:00
Teo Mrnjavac
188b9efd79 Bump KPMcore requirement. 2016-12-19 19:48:07 +01:00
Teo Mrnjavac
a9e4315665 Make sure we write the inner fs type to globalstorage. 2016-12-19 19:48:01 +01:00
Philip
f73171ac4c [partition] Bump kpmcore requirements 2016-12-19 19:47:51 +01:00
Teo Mrnjavac
56fbec7b55 Improve user-visible strings in SetPartFlagsJob. 2016-12-19 19:47:46 +01:00
Teo Mrnjavac
6d0965ef3f Keep an immutable copy for every scanned Device* to avoid rescans. 2016-12-19 19:47:30 +01:00
Teo Mrnjavac
44368db30a Assert on nullptr Device*. 2016-12-19 19:47:25 +01:00
Chantara Tith
9afa2935cd Update to KPMcore LUKS' API changes 2016-12-19 19:47:18 +01:00
Chantara Tith
39c9f82c9c API Changes, logicalSectorSize -> logicalSize, totalSectors -> totalLogical. 2016-12-19 19:47:14 +01:00
Teo Mrnjavac
2d980c2af6 Bump KPMcore requirement. 2016-12-19 19:42:45 +01:00
Teo Mrnjavac
a0b76fa594 Make sure we write the inner fs type to globalstorage. 2016-12-19 19:42:35 +01:00
Philip
dae0f1078d [partition] Bump kpmcore requirements 2016-12-19 19:42:24 +01:00
Teo Mrnjavac
8b0d27bd18 Improve user-visible strings in SetPartFlagsJob. 2016-12-19 19:42:02 +01:00
Teo Mrnjavac
6093042863 Keep an immutable copy for every scanned Device* to avoid rescans. 2016-12-19 19:40:44 +01:00
Teo Mrnjavac
0053721896 Assert on nullptr Device*. 2016-12-19 19:40:33 +01:00
Chantara Tith
2914b3ea1b Update to KPMcore LUKS' API changes 2016-12-19 19:40:22 +01:00
Chantara Tith
ff86874d66 API Changes, logicalSectorSize -> logicalSize, totalSectors -> totalLogical. 2016-12-19 19:40:12 +01:00
Teo Mrnjavac
8882a477be Do not dereference nullptr. 2016-12-14 09:08:32 +01:00
Teo Mrnjavac
9bff57a60d Provide default for m_writeEtcDefaultKeyboard in KeyboardViewStep. 2016-12-14 09:08:25 +01:00
Teo Mrnjavac
66c578fa8d Write hasInternet to GlobalStorage.
CAL-431 #close
2016-12-14 09:08:15 +01:00
Teo Mrnjavac
32039bd388 Do not LINK_PUBLIC by default. 2016-12-14 09:07:41 +01:00
Teo Mrnjavac
04a2681ba9 Add LINK_PRIVATE_LIBRARIES to calamares_add_plugin. 2016-12-14 09:02:57 +01:00
Teo Mrnjavac
49afe4bc8e Document settings for services module. 2016-12-14 09:02:47 +01:00
Teo Mrnjavac
026fa922d2 Do not dereference nullptr. 2016-12-14 09:02:07 +01:00
Teo Mrnjavac
07de427aab Provide default for m_writeEtcDefaultKeyboard in KeyboardViewStep. 2016-12-14 09:01:56 +01:00
Teo Mrnjavac
163cf52900 Write hasInternet to GlobalStorage.
CAL-431 #close
2016-12-14 09:01:39 +01:00
Teo Mrnjavac
cdf77c8a0d Do not LINK_PUBLIC by default. 2016-12-14 09:01:10 +01:00
Teo Mrnjavac
07fd7135e3 Add LINK_PRIVATE_LIBRARIES to calamares_add_plugin. 2016-12-14 09:00:59 +01:00
Teo Mrnjavac
bbba9e60ee Document settings for services module. 2016-12-14 09:00:35 +01:00
Philip Müller
254583dd64 Merge pull request #18 from oberon2007/development
update logos
2016-12-12 08:46:31 +01:00
Bernhard Landauer
a8fe13a6d4 logo padding 2016-12-12 08:28:13 +01:00
Bernhard Landauer
8b2986c80a update logos 2016-12-12 08:24:43 +01:00
Philip
0bd31b0404 [displaymanager] set_autologin: Unset autologin for sddm when needed 2016-12-06 21:58:30 +01:00
Philip
4666a96b56 [displaymanager] set_autologin: Unset autologin for sddm when needed 2016-12-06 21:57:31 +01:00
Philip
ec44f2e4f4 [users] implement upstream fixes 2016-12-06 21:56:40 +01:00
Philip
b6e0e226a1 Bump 2016-11-25 22:28:57 +01:00
Kevin Kofler
041db6e3d7 [dracutlukscfg] Don't include keyfile in initramfs on unencrypted /boot.
This matches the fix in initcpiocfg and initramfscfg.
2016-11-25 22:28:44 +01:00
Kevin Kofler
423c7b57e3 [initramfscfg] Don't include keyfile in initramfs on unencrypted /boot.
This matches the fix in initcpiocfg.

I had to create an encrypt_hook_nokey that is a copy of encrypt_hook
without the part that copies the keyfile.
2016-11-25 22:28:33 +01:00
Teo Mrnjavac
e0c5e81b5b Write Btrfs subvolume lines to fstab. 2016-11-25 22:24:57 +01:00
Teo Mrnjavac
84b96b4f18 Special case for Btrfs root: create subvolumes and mount them. 2016-11-25 22:24:53 +01:00
Philip
846a4a19ae Bump 2016-11-25 22:24:28 +01:00
Kevin Kofler
c7d390f864 [dracutlukscfg] Don't include keyfile in initramfs on unencrypted /boot.
This matches the fix in initcpiocfg and initramfscfg.
2016-11-25 22:23:57 +01:00
Kevin Kofler
88d6989c8f [initramfscfg] Don't include keyfile in initramfs on unencrypted /boot.
This matches the fix in initcpiocfg.

I had to create an encrypt_hook_nokey that is a copy of encrypt_hook
without the part that copies the keyfile.
2016-11-25 22:23:45 +01:00
Teo Mrnjavac
8f68f9bdef Write Btrfs subvolume lines to fstab. 2016-11-25 22:22:27 +01:00
Teo Mrnjavac
e3d7180932 Special case for Btrfs root: create subvolumes and mount them. 2016-11-25 22:22:17 +01:00
Philip
8e2b041498 [pythonqt] Start from empty str for entry point annotation. 2016-11-22 20:57:24 +01:00
Teo Mrnjavac
c0b7b0bc27 Show warning. 2016-11-18 09:06:29 +01:00
Teo Mrnjavac
45e7363dfb Oops. 2016-11-18 09:06:26 +01:00
Teo Mrnjavac
8d93c34031 Warn user about encrypted root with unencrypted /boot. 2016-11-18 09:06:21 +01:00
Teo Mrnjavac
555f0ba6cf Don't include keyfile in initramfs on unencrypted /boot. 2016-11-18 09:06:17 +01:00
Teo Mrnjavac
b513a892af Show warning. 2016-11-18 09:05:53 +01:00
Teo Mrnjavac
2aedea7d5f Oops. 2016-11-18 09:05:40 +01:00
Teo Mrnjavac
d852999cba Warn user about encrypted root with unencrypted /boot. 2016-11-18 09:05:27 +01:00
Teo Mrnjavac
b04dcdc42f Don't include keyfile in initramfs on unencrypted /boot. 2016-11-18 09:05:15 +01:00
Philip
b95503065f [mount] Bind-mount /run/udev in the chroot by default 2016-11-09 07:40:34 +01:00
Philip
433d6ded6d [mount] Bind-mount /run/udev in the chroot by default 2016-11-09 07:39:58 +01:00
Philip
d698b98988 Modifications
-  [welcome] Use QNetworkAccessManager in checkHasInternet
-  [bootloader] Fix UEFI firmware workaround for 32-bit UEFI
2016-11-06 08:51:03 +01:00
Philip
2e9fe3f185 Modifications
-  [welcome] Use QNetworkAccessManager in checkHasInternet
-  [bootloader] Fix UEFI firmware workaround for 32-bit UEFI
2016-11-06 08:49:45 +01:00
Philip
e21338d81e Modifications
- [bootloader] Fix vfat_correct_case
- [welcome] Fix RequirementsChecker::checkHasInternet()
2016-11-05 22:02:41 +01:00
Philip
c8f1134196 Modifications
- [bootloader] Fix vfat_correct_case
- [welcome] Fix RequirementsChecker::checkHasInternet()
2016-11-05 22:01:44 +01:00
Philip
bbef3d8abc bump 2016-11-05 10:21:38 +01:00
Philip
77ea82baee bump 2016-11-05 09:56:41 +01:00
Philip
e91be5bd12 v2.4.4
- [partition] remove sgdisk dependency
- [displaymanager] use configparser and add better autologin handling
- [displaymanager] set a preferred Xsession for autologin
- [netinstall] Support selecting visible groups by default
- [packages] Add option of updating packages db before perfoming package operations
- [packages] Allow try_install and try_remove entries in packages module
- [unpackfs] Do not fail if rsync returns exit code 23
2016-11-05 09:55:37 +01:00
Kevin Kofler
35f098e04a [unpackfs] Do not fail if rsync returns exit code 23.
Unfortunately, rsync returns exit code 23 (Partial transfer due to
error) if it cannot write extended attributes (with -X) because the
target file system does not support it, e.g., the FAT EFI system
partition. We need -X because distributions using file system
capabilities and/or SELinux require the extended attributes. But
distributions using SELinux may also have SELinux labels set on files
under /boot/efi, and rsync complains about those. The only clean way
would be to split the rsync into one with -X and --exclude /boot/efi and
a separate one without -X for /boot/efi, but only if /boot/efi is
actually an EFI system partition. For now, this hack will have to do.

See also:
https://bugzilla.redhat.com/show_bug.cgi?id=868755#c50
for the same issue in Anaconda, which uses a similar workaround.
2016-11-05 09:25:59 +01:00
Teo Mrnjavac
2bc12b80cc Allow try_install and try_remove entries in packages module. 2016-11-03 18:04:38 +01:00
Teo Mrnjavac
d4bdef0be3 Add option of updating packages db before perfoming package operations. 2016-11-03 18:04:28 +01:00
Kevin Kofler
f43c600adc [netinstall] Support selecting visible groups by default.
In other words, support:
  hidden: false
  selected: true
groups.

This was supposed to work according to README.md, but not actually
implemented. Now it should be working.
2016-11-03 18:04:15 +01:00
Philip
b7c121de9c [users] add missing images 2016-11-01 05:52:58 +01:00
Philip
09f6392173 [users] enhance dialog
- multiple users management.
- ability to set different shells based on configuration.
- ability to select avatars from files and then copy them to a target location in the user's home directory. No specific location suggested due to differences between DEs on where to read avatars from.
2016-11-01 05:42:56 +01:00
Philip
0b4f015d3a [displaymanager] set a preferred Xsession for autologin 2016-11-01 05:28:39 +01:00
Philip
0ceadc2b95 [displaymanager] use configparser and add better autologin handling 2016-10-31 18:02:50 +01:00
Philip
e2f26467ab [libcalamaresui] try with upstream fix 2016-10-31 17:55:19 +01:00
Philip
5bbb71e90e [libcalamaresui] try to fix issue with ‘pythonConsoleButton’ not declared in this scope 2016-10-31 11:57:23 +01:00
Philip
f42e904dba [partition] remove sgdisk dependency 2016-10-31 11:06:04 +01:00
Philip
4752f70809 Merge pythonqt branch 2016-10-31 07:45:35 +01:00
Philip
095e5317cb bump 2016-10-28 21:03:55 +02:00
Kevin Kofler
ff7cf9b9ec New dummycpp C++ job module (ported from dummypython). 2016-10-28 21:02:30 +02:00
Kevin Kofler
7264c9dcbf Add support for C++/Qt batch job plugins
These job plugins work similarly to view modules, with the following
differences:

* These jobs need to link only libcalamares, not libcalamaresui. For
  this reason, PluginFactory was moved from libcalamaresui to
  libcalamares. (It depends only on QtCore.)

* Instead of deriving from ViewModule, derive from CppJob (which is a
  subclass of Job).

* Like process and Python jobs, a job plugin is a single job, whereas a
  ViewModule can generate a whole list of jobs.

The CppJob and CppJobModule classes are new. In Module::fromDescriptor,
the combination type=job, intf=qtplugin is now supported and mapped to
CppJobModule.
2016-10-28 21:02:19 +02:00
Philip
27602cf832 bump 2016-10-28 21:00:32 +02:00
Kevin Kofler
9ae4755b1c New dummycpp C++ job module (ported from dummypython). 2016-10-28 20:57:32 +02:00
Kevin Kofler
206a89e06c Add support for C++/Qt batch job plugins
These job plugins work similarly to view modules, with the following
differences:

* These jobs need to link only libcalamares, not libcalamaresui. For
  this reason, PluginFactory was moved from libcalamaresui to
  libcalamares. (It depends only on QtCore.)

* Instead of deriving from ViewModule, derive from CppJob (which is a
  subclass of Job).

* Like process and Python jobs, a job plugin is a single job, whereas a
  ViewModule can generate a whole list of jobs.

The CppJob and CppJobModule classes are new. In Module::fromDescriptor,
the combination type=job, intf=qtplugin is now supported and mapped to
CppJobModule.
2016-10-28 20:55:50 +02:00
Teo Mrnjavac
19e41a3c71 Only add LUKS keyfile if relevant, and with a 15s timeout. 2016-10-28 20:52:20 +02:00
Teo Mrnjavac
a2c7256406 Add user to groups separately from useradd. 2016-10-28 20:51:03 +02:00
Philip
381f3e9bb3 Revert "Improve user-visible strings in SetPartFlagsJob."
This reverts commit fbe72b3663.
2016-10-28 20:50:10 +02:00
Teo Mrnjavac
5e81ddecad Only add LUKS keyfile if relevant, and with a 15s timeout. 2016-10-28 20:47:09 +02:00
Teo Mrnjavac
9a643431dd Improve user-visible strings in SetPartFlagsJob. 2016-10-28 20:46:56 +02:00
Teo Mrnjavac
c61e53edf7 Add user to groups separately from useradd. 2016-10-28 20:46:32 +02:00
Philip
37df041b9c [displaymanager] use same pattern for all str.format calls 2016-10-26 22:14:00 +02:00
Bernhard Landauer
b293f0320d [displaymanager] add Deepin 2016-10-26 22:13:58 +02:00
Philip
f71602ec6c [displaymanager] use same pattern for all str.format calls 2016-10-26 22:13:38 +02:00
Bernhard Landauer
811b1422e9 [displaymanager] add Deepin 2016-10-26 22:13:26 +02:00
Philip
e1d72552db [branding] bump to 16.10 2016-10-22 11:21:52 +02:00
Kevin Kofler
9d2291b74e [grubcfg] Compare integers to integers, not strings.
target_env_call returns an integer, so do not compare its result to the
string "0".
2016-10-22 11:21:41 +02:00
V3n3RiX
a279eaf4fa dracut : unlock encrypted swap if exists (#267)
* dracut : unlock encrypted swap if exists
* only check for swap_outer_uuid if dracut exists
2016-10-22 11:21:31 +02:00
V3n3RiX
e0dc6e03fd Only write rd.luks.uuid if dracut is present and leave other initramfs generators clean (#266)
* add rd.luks.uuid to GRUB_CMDLINE (fixes unbootable system with dracut --nohostonly, and doesn't affect any other initramfs generators)

* typo

* only write rd.luks.uuid line if dracut is present, and leave other initramfs generators alone :D

* add missing = operator
2016-10-22 11:21:19 +02:00
V3n3RiX
f5793a760d add rd.luks.uuid to GRUB_CMDLINE (fixes unbootable system with dracut… (#265)
* add rd.luks.uuid to GRUB_CMDLINE (fixes unbootable system with dracut --nohostonly, and doesn't affect any other initramfs generators)

* typo
2016-10-22 11:21:10 +02:00
Kevin Kofler
4a88223f6d [dracutlukscfg] New module: pre-configuration for dracut+LUKS. 2016-10-22 11:21:02 +02:00
Kevin Kofler
4a7c469f96 [grubcfg] Fix mismatched quoting and escaping.
If we use .replace("'", "'\\''") for escaping, we also need to use
single quotes, not double quotes.

This was broken by the port from '%' to format, which also randomly
changed quoting characters for no good reason. Changing the outer ones
does not matter, but \" or ' within a string is not the same thing!
2016-10-22 11:20:54 +02:00
Calamares CI
cd76aa599f Automatic merge of Transifex translations 2016-10-22 11:20:47 +02:00
David McKinney
af8b0e84a4 [initramfscfg] New module: pre-configuration for update-initramfs.
Added an initramfscfg module to handle pre-configuration for the Debian
update-initramfs, such as installing hooks (needed for luks/FDE support
on Debian-based distros).

Closes #254. (Cherry-picked from the pull request.)
2016-10-22 11:20:37 +02:00
Philip
3f614ee3a6 bump 2016-10-22 11:11:18 +02:00
Philip
3a5cb47081 [branding] bump to 16.10 2016-10-22 11:08:35 +02:00
Kevin Kofler
c0898c308b [grubcfg] Compare integers to integers, not strings.
target_env_call returns an integer, so do not compare its result to the
string "0".
2016-10-22 11:06:55 +02:00
V3n3RiX
4a35035396 dracut : unlock encrypted swap if exists (#267)
* dracut : unlock encrypted swap if exists
* only check for swap_outer_uuid if dracut exists
2016-10-22 11:06:42 +02:00
V3n3RiX
93ecf0d44d Only write rd.luks.uuid if dracut is present and leave other initramfs generators clean (#266)
* add rd.luks.uuid to GRUB_CMDLINE (fixes unbootable system with dracut --nohostonly, and doesn't affect any other initramfs generators)

* typo

* only write rd.luks.uuid line if dracut is present, and leave other initramfs generators alone :D

* add missing = operator
2016-10-22 11:06:31 +02:00
V3n3RiX
601f61fefa add rd.luks.uuid to GRUB_CMDLINE (fixes unbootable system with dracut… (#265)
* add rd.luks.uuid to GRUB_CMDLINE (fixes unbootable system with dracut --nohostonly, and doesn't affect any other initramfs generators)

* typo
2016-10-22 11:06:14 +02:00
Kevin Kofler
645ba95989 [dracutlukscfg] New module: pre-configuration for dracut+LUKS. 2016-10-22 11:05:27 +02:00
Kevin Kofler
b1169dc48c [grubcfg] Fix mismatched quoting and escaping.
If we use .replace("'", "'\\''") for escaping, we also need to use
single quotes, not double quotes.

This was broken by the port from '%' to format, which also randomly
changed quoting characters for no good reason. Changing the outer ones
does not matter, but \" or ' within a string is not the same thing!
2016-10-22 11:00:54 +02:00
Calamares CI
b935c7db79 Automatic merge of Transifex translations 2016-10-22 11:00:43 +02:00
David McKinney
1b8b5aab13 [initramfscfg] New module: pre-configuration for update-initramfs.
Added an initramfscfg module to handle pre-configuration for the Debian
update-initramfs, such as installing hooks (needed for luks/FDE support
on Debian-based distros).

Closes #254. (Cherry-picked from the pull request.)
2016-10-22 11:00:20 +02:00
Philip
87006eaa20 [services] proper DM check 2016-10-15 09:41:10 +02:00
Philip
9d18fb1ece [services] don't configure DM if already configured 2016-10-14 18:55:02 +02:00
Philip
b8bd65d69b bump 2016-10-14 18:38:23 +02:00
Teo Mrnjavac
499fd513b4 Use the target system's boot name in partitioning summary widget. 2016-10-14 18:37:35 +02:00
Kevin Kofler
eb6bb49d5a [fstab] Write configurable options to crypttab (default: luks).
fstab.conf: Add a new "crypttabOptions" option that defaults to "luks".
            Document that for Debian and Debian-based distributions, the
            setting should be changed to "luks,keyscript=/bin/cat".

main.py: Append the options from the above setting to the end of every
         line in crypttab.

At least the "luks" option should always be there, because there may be
different encryption types. The Debian initramfs-tools also require the
Debian-specific keyscript option and will otherwise ignore the keyfile
entirely (see pull request #254).
2016-10-14 18:37:19 +02:00
Kevin Kofler
17c0dd08c7 [fstab] Do not omit "/" from crypttab.
At least the Debian update-initramfs needs the entry to be there (see
pull request #254). Dracut will probably need it too. And logically, it
should be there.
2016-10-14 18:37:09 +02:00
shainer
7e59fa9e40 Bump QT_VERSION to 5.6 in cmake. 2016-10-14 18:36:59 +02:00
shainer
f78cd25fe9 Set qt >=5.6 as a "global" dependency.
i.e. not just required by the netinstall module.
2016-10-14 18:36:50 +02:00
shainer
dbdc50b8a8 Fix dependency list in README.md
The netinstall module requires Qt >= 5.6 instead of
Qt >= 5.3
2016-10-14 18:36:36 +02:00
Calamares CI
fef4832a65 Merge Translation Updates 2016-10-14 18:36:27 +02:00
Philip
ebfa1e2838 bump 2016-10-14 18:23:10 +02:00
Teo Mrnjavac
130eb43b26 Use the target system's boot name in partitioning summary widget. 2016-10-14 18:21:52 +02:00
Kevin Kofler
9a5221bbd8 [fstab] Write configurable options to crypttab (default: luks).
fstab.conf: Add a new "crypttabOptions" option that defaults to "luks".
            Document that for Debian and Debian-based distributions, the
            setting should be changed to "luks,keyscript=/bin/cat".

main.py: Append the options from the above setting to the end of every
         line in crypttab.

At least the "luks" option should always be there, because there may be
different encryption types. The Debian initramfs-tools also require the
Debian-specific keyscript option and will otherwise ignore the keyfile
entirely (see pull request #254).
2016-10-14 18:21:20 +02:00
Kevin Kofler
fce053439c [fstab] Do not omit "/" from crypttab.
At least the Debian update-initramfs needs the entry to be there (see
pull request #254). Dracut will probably need it too. And logically, it
should be there.
2016-10-14 18:21:05 +02:00
shainer
a1b2a71267 Bump QT_VERSION to 5.6 in cmake. 2016-10-14 18:18:56 +02:00
shainer
0956ea5dec Set qt >=5.6 as a "global" dependency.
i.e. not just required by the netinstall module.
2016-10-14 18:18:45 +02:00
shainer
c9946117cd Fix dependency list in README.md
The netinstall module requires Qt >= 5.6 instead of
Qt >= 5.3
2016-10-14 18:18:34 +02:00
Calamares CI
7a24975654 Merge Translation Updates 2016-10-14 18:17:54 +02:00
Philip
a5b4e3f518 bump 2016-10-01 10:09:04 +02:00
Philip
0153c47e29 fix settings.conf 2016-09-28 22:33:18 +02:00
Philip
b042506ac9 fix settings.conf 2016-09-28 22:32:50 +02:00
Kevin Kofler
b6f8d6ae92 users: Drop dependency on chfn. (#260)
Pass the full name directly to useradd instead, using the "-c" (comment)
parameter, which is "currently used as the field for the user's full
name" according to the documentation.

The chfn utility is no longer installed by default on current Fedora
releases due to its dependency on libuser. (They split out chfn and chsh
from util-linux into an optional subpackage.) It could be added as a
dependency of Calamares, but since it is needed inside the chroot, it
has to be on the base live image, not the overlay. Thus, to allow
testing Calamares with a simple "dnf install calamares" again, the
dependency needs to go away. And it is unnecessary anyway.
2016-09-28 21:24:36 +02:00
Kevin Kofler
3edf1bb162 Fix locale filtering for UTF-8 on Fedora.
locale -a returns the locales using ".utf8" names rather than ".UTF-8".
The case-insensitive match does not help because it is "utf8" rather
than "UTF-8". So we need to match both with and without the dash.
2016-09-28 21:22:10 +02:00
Teo Mrnjavac
2a74fc423f Make writeEtcDefaultKeyboard an option in keyboard.conf. 2016-09-28 21:22:07 +02:00
Teo Mrnjavac
431e6b8c03 Allow disabling automated LUKS modes. 2016-09-28 21:22:04 +02:00
Teo Mrnjavac
11dd15f123 Allow disabling automated LUKS modes. 2016-09-28 21:20:13 +02:00
Teo Mrnjavac
36a96fedfb Make writeEtcDefaultKeyboard an option in keyboard.conf. 2016-09-28 21:19:56 +02:00
Kevin Kofler
a37896da49 Fix locale filtering for UTF-8 on Fedora.
locale -a returns the locales using ".utf8" names rather than ".UTF-8".
The case-insensitive match does not help because it is "utf8" rather
than "UTF-8". So we need to match both with and without the dash.
2016-09-28 21:19:40 +02:00
Kevin Kofler
97b06e3101 users: Drop dependency on chfn. (#260)
Pass the full name directly to useradd instead, using the "-c" (comment)
parameter, which is "currently used as the field for the user's full
name" according to the documentation.

The chfn utility is no longer installed by default on current Fedora
releases due to its dependency on libuser. (They split out chfn and chsh
from util-linux into an optional subpackage.) It could be added as a
dependency of Calamares, but since it is needed inside the chroot, it
has to be on the base live image, not the overlay. Thus, to allow
testing Calamares with a simple "dnf install calamares" again, the
dependency needs to go away. And it is unnecessary anyway.
2016-09-28 21:16:52 +02:00
udeved
9fe9320555 services: enable displaymanager via globalstorage 2016-09-27 19:28:31 +02:00
Philip
c06903e168 [servicescfg] set pulse autospawn; clean up imports 2016-09-24 12:28:51 +02:00
Philip
b4a63ecb28 [chrootcfg] add new module
- 'chrootcfg' is used for our new netinstall approach
- it provides the needed function to install packages in a chroot
- we might need to optimize its progressbar visualization ...
2016-09-24 12:24:30 +02:00
Philip
5eb56733b8 [servicescfg] add new module
- 'servicescfg' is the equivalent to module 'services', just for OpenRC
2016-09-24 12:21:28 +02:00
udeved
18f4b6e50c servicescfg: fix typo 2016-09-23 22:37:23 +02:00
udeved
74c2090ebc servicescfg: set pulse autospawn; clean up imports 2016-09-23 22:34:58 +02:00
Teo Mrnjavac
4ed06d4fe3 Remove target resolv.conf before proceeding. 2016-09-22 20:52:04 +02:00
Teo Mrnjavac
ec2094d768 Add support for writing keymap data to /etc/default/keyboard. 2016-09-22 20:52:01 +02:00
Teo Mrnjavac
a1c4c23051 Remove target resolv.conf before proceeding. 2016-09-22 20:51:27 +02:00
Teo Mrnjavac
027ba074ed Add support for writing keymap data to /etc/default/keyboard. 2016-09-22 20:51:16 +02:00
shainer
b6811c65e8 In the netinstall page, always show the arrow-down button.
The arrow no longer changes direction depending on whether
the button is clicked or not.
2016-09-21 20:35:15 +02:00
shainer
cb6f9ae576 In the netinstall page, fix the group button.
The button is "not checked" by default, and becomes
checked when clicked; the packageview becomes visible
when the button is checked.
2016-09-21 20:34:56 +02:00
Teo Mrnjavac
94916f59e0 Remove irrelevant debug output. 2016-09-21 20:34:40 +02:00
udeved
8a3047f1ab license: validate yaml conf 2016-09-19 09:29:52 +02:00
udeved
b593682c0c servicescfg: validate yaml conf 2016-09-19 09:17:31 +02:00
udeved
1917844338 settings.conf: validate settings with kwalify 2016-09-19 08:39:48 +02:00
udeved
2b00d28de2 postcfg: only attempt to rank mirrors if hasInternet
clean up imports
2016-09-17 23:03:55 +02:00
Philip
8632c3d609 Merge branch '2.4.x-stable' of github.com:manjaro/calamares into 2.4.x-stable 2016-09-17 10:35:43 +02:00
Philip
d935b7df68 bump 2016-09-17 10:35:05 +02:00
Teo Mrnjavac
021e3b20c6 Fix VFAT filename handling in bootloader module.
CAL-385 #close
2016-09-17 10:16:44 +02:00
Teo Mrnjavac
dcea99e278 Warning in debug output when the RequirementsChecker is misconfigured.
CAL-390 #close
2016-09-17 10:16:35 +02:00
Philip Müller
9dfbc54fda Merge pull request #4 from calamares/2.4.x-stable
Merge upstream changes
2016-09-17 10:13:16 +02:00
Philip Müller
94b8ad3b6e Merge pull request #1 from manjaro/pr-mhwdcfg
[mhwdcfg] replace hardwarecfg
2016-09-17 10:11:22 +02:00
Teo Mrnjavac
77fb264129 Fix VFAT filename handling in bootloader module.
CAL-385 #close
2016-09-16 16:30:17 +02:00
Teo Mrnjavac
0c29233062 Warning in debug output when the RequirementsChecker is misconfigured.
CAL-390 #close
2016-09-16 11:00:53 +02:00
Philip
cc4ab32350 [mhwdcfg] clean up imports; use target_env_call() 2016-09-13 08:08:57 +02:00
udeved
5610e274ba [mhwdcfg] adopt development changes 2016-09-13 08:04:20 +02:00
udeved
c70e91fa9a mhwdcfg:clean up imports; use target_env_call() 2016-09-12 18:51:38 +02:00
udeved
ac43d43409 mhwdcfg: adjust interation; update conf 2016-09-12 18:30:39 +02:00
Philip
7dfac7b5bf [mhwdcfg] update conf file
- add 302 and 380 to gfx IDs
- disable usb as we don't have any config for that yet
2016-09-12 07:40:08 +02:00
Philip
8627f291ca [mhwdcfg] update conf file
- add 302 and 380 to gfx IDs
- disable usb as we don't have any config for that yet
2016-09-12 07:39:25 +02:00
Philip
045ec0408d [displaymanager] prefer Budgie before Gnome 2016-09-10 23:04:27 +02:00
Philip
fe92450e7b [displaymanager] prefer Budgie before Gnome 2016-09-10 22:16:58 +02:00
Philip
7ed780014d [mhwdcfg] replace hardwarecfg 2016-09-10 14:55:28 +02:00
Philip
06facb22cb [servicescfg] add new module 2016-09-10 14:18:58 +02:00
Philip
6927ca6439 [chrootcfg] add new module 2016-09-10 14:17:47 +02:00
Philip
29392f24ee [mhwdcfg] replace hardwarecfg 2016-09-10 14:17:04 +02:00
Philip
f03195150b [hardwarecfg] remove module 2016-09-10 14:15:47 +02:00
Philip
5adf8775fa [users] use upstream config 2016-09-10 14:10:43 +02:00
Philip
cda9e2f0c1 [settings.conf] update for Manjaro 2016-09-10 14:03:39 +02:00
Philip
ff8be85b08 [modules] adjust to Manjaro configs 2016-09-10 14:01:50 +02:00
Philip
d50a27cb4c [data] add manjaro files 2016-09-10 13:57:38 +02:00
Philip
587681b14c [postcfg] add new module 2016-09-10 13:56:05 +02:00
Philip
d7c8ff5a45 [hardwarecfg] add new module 2016-09-10 13:55:17 +02:00
Philip
6b44320bfd [branding] add Manjaro branding 2016-09-10 13:54:01 +02:00
Philip
295cf12b9a [plymouthcfg] add module to configure Plymouth 2016-09-10 13:50:50 +02:00
55 changed files with 4973 additions and 45 deletions

23
.travis.yml Normal file
View File

@ -0,0 +1,23 @@
# SPDX-FileCopyrightText: no
# SPDX-License-Identifier: CC0-1.0
#
language: cpp
python:
- 3.5
sudo: required
services:
- docker
notifications:
irc:
- "chat.freenode.net#manjaro"
install:
- docker build -t calamares .
script:
- docker run -v $PWD:/src --tmpfs /build:rw,size=112M -e SRCDIR=/src -e BUILDDIR=/build calamares "/src/ci/travis.sh"

View File

@ -17,7 +17,7 @@
<defaults>
<allow_any>no</allow_any>
<allow_inactive>no</allow_inactive>
<allow_active>auth_admin</allow_active>
<allow_active>yes</allow_active>
</defaults>
<annotate key="org.freedesktop.policykit.exec.path">/usr/bin/calamares</annotate>
<annotate key="org.freedesktop.policykit.exec.allow_gui">true</annotate>

View File

@ -0,0 +1,8 @@
/* Allow Calamares to be started without password authentication
*/
polkit.addRule(function(action, subject) {
if ((action.id == "com.github.calamares.calamares.pkexec.run"))
{
return polkit.Result.YES;
}
});

16
data/calamares.desktop Executable file
View File

@ -0,0 +1,16 @@
[Desktop Entry]
Type=Application
Version=1.0
Name=Install Manjaro Linux
Name[da]=Installer Manjaro Linux
GenericName=Live Installer
GenericName[da]=Live-installationsprogram
Comment=Install the operating system to disk
Comment[da]=Installer styresystemet på disk
Comment[de]=Manjaro Linux installieren
Exec=/usr/bin/calamares_polkit %f
Icon=calamares
Terminal=false
StartupNotify=true
Type=Application
Categories=Qt;System;

6
data/calamares_polkit Normal file
View File

@ -0,0 +1,6 @@
#!/bin/bash
if [ $(which pkexec) ]; then
pkexec --disable-internal-agent env DBUS_SESSION_BUS_ADDRESS="$DBUS_SESSION_BUS_ADDRESS" DISPLAY="$DISPLAY" GNOME_DESKTOP_SESSION_ID="$GNOME_DESKTOP_SESSION_ID" HOME="$HOME" KDE_FULL_SESSION="$KDE_FULL_SESSION" KDE_SESSION_VERSION="$KDE_SESSION_VERSION" QT_STYLE_OVERRIDE="$QT_STYLE_OVERRIDE" QT_QPA_PLATFORMTHEME="$QT_QPA_PLATFORMTHEME" QT_XCB_FORCE_SOFTWARE_OPENGL="$QT_XCB_FORCE_SOFTWARE_OPENGL" XAUTHORITY="$XAUTHORITY" XDG_CURRENT_DESKTOP="$XDG_CURRENT_DESKTOP" "/usr/bin/calamares" "-D6" "$@"
else
/usr/bin/calamares "-D6" "$@"
fi

224
data/manjaro-icon.svg Normal file
View File

@ -0,0 +1,224 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
id="svg3505"
version="1.1"
inkscape:version="0.91 r13725"
width="512"
height="512"
viewBox="0 0 512 512"
sodipodi:docname="manjaro-icon.svg">
<metadata
id="metadata3511">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<defs
id="defs3509" />
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1280"
inkscape:window-height="998"
id="namedview3507"
showgrid="false"
inkscape:zoom="1"
inkscape:cx="256"
inkscape:cy="256"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="1"
inkscape:current-layer="svg3505" />
<image
width="512"
height="512"
preserveAspectRatio="none"
style="image-rendering:optimizeQuality"
xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAgAAAAIACAYAAAD0eNT6AAAABHNCSVQICAgIfAhkiAAAAAlwSFlz
AAAN1wAADdcBQiibeAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAACAASURB
VHic7d17dJxnYefx3zP3Gd2tiyXbcSLHDrk4jnMBkkDuxAllT7g1aWlP6cJu6bKHQmCh0LKwB+i2
sOG+UGhZtgu0sAUKgS4HkgZYSFiSkNhOHLu5yNfYuliSpdFtbpp59g9LiaPI1kiamWdmnu/nHJ2x
7Jl5fjpH1vvT+z7v80gAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
6o1xHeBUF110USQajb5e0uuMMZdK2iCpwXEsAABWYlrSUUk7rbU/yGQy39+7d2/Wdah5VVMALr/8
8tslfUJSr+ssAACUwQFjzPsfeeSR77oOIklB1wFuv/32YCwW+5Qx5tOS2lznAQCgTNok3bFu3brm
V77ylT/dt2+fdRnGeQGYO/i/23UOAAAq5KqxsbGGgYGBe12GcHoJYO60/7ddZgAAwAVr7Rt37tz5
PVfjOysAF110USQWi+2TdK6rDAAAOHQwmUxe0NfXl3ExeMDFoJI0N9ufgz8AwFe9LS0tt7ka3FkB
CAQCr3c1NgAAVeJ1rgZ2VgCstZe7GhsAgCrh7FjorABI6nY4NgAA1WC9q4FdFoBGh2MDAFANnB0L
XRYAAADgCAUAAAAPUQAAAPAQBQAAAA9RAAAA8BAFAAAAD4VcB1iNgU+83XUEAIDHet7/JdcRVowz
AAAAeIgCAACAhygAAAB4iAIAAICHKAAAAHiIAgAAgIcoAAAAeIgCAACAhygAAAB4iAIAAICHKAAA
AHiIAgAAgIcoAAAAeIgCAACAhygAAAB4iAIAAICHKAAAAHiIAgAAgIcoAAAAeIgCAACAhygAAAB4
iAIAAICHKAAAAHiIAgAAgIcoAAAAeIgCAACAhygAAAB4KOQ6AFDLYvc+oug9j7iOAZRE5pYrlN5x
hesYqBDOAAAA4CEKAAAAHqIAAADgIQoAAAAeYhIgMCdsAuoOxdQTiqknHNfaUEwdoYiaA2G1BMJq
DoTUGAgpEjjZmxMmpH9sG9U/iEmAAGoPBQBeag2GdWG0RZsjDdocadKmSIPOiiQUlHEdDQAqggIA
L3SHYro83qZL4q3aGm3RxnDCdSQAcIoCgLoUlNGl8VZdmWjXy+Pt6o00uI4EAFWFAoC6ETRGF0Wb
dUNDl17VuFZtwYjrSABQtSgAqHkbwwnd1rxOtzR2c9AHgCJRAFCTgjK6sbFLr21er0tirUzdA4Bl
ogCgpjQEgnpN0zr9bstGdYWiruMAQM2iAKAmtAUj+v3Wjbqteb0SJug6DgDUPAoAqlpzMKzfbt6g
32nZqIYAB34AKBUKAKpSxAR0R8tZ+oPWczjwA0AZUABQdV6R6NA727dofTjuOgoA1C0KAKrGWeGE
3tfxEl0Wb3MdBQDqHgUAzgVl9MaWDfqjtk2Kc7ofACqCAgCnNkca9cHOC7Ql2uQ6CgB4hQIAJ4yk
21vO0tvXnKuwCbiOAwDeoQCg4jpCUX2w8wK9NL7GdRQA8BYFABV1SaxVH127Ve2s2Q8ATlEAUDGv
bV6v93ScpyAr9wOAcxQAlF3EBPRnnRfo5sa1rqMAAOZQAFBWzcGw/nLtxdoea3UdBQBwCgoAymZ9
OK67ui/RxnDCdRQAwAIUAJTFlmiTPtO9Xa3BsOsoAIBFcAM2Su78aJM+y8EfAKoaZwBQUttjrfpv
PZcoYVjSFwCqGQUAJXNRrEV39VyiOAd/AKh6XAJASWyJNumT3ds4+ANAjaAAYNU2RRr02e7tagpw
zR8AagUFAKvSEYrqk93b1cKEPwCoKRQArFjCBHXX2m3qCkVdRwEALBMFACsSlNFH1m7VlmiT6ygA
gBWgAGBF/mP7Zl2VaHcdAwCwQhQALNt1DZ26o+Us1zEAAKtAAcCynB1p0J93XsiGvgBQ4ygAKFos
ENRfdm1VQ4B7/QGg1rESIIr2jjWbdXakwXUMlFCgO6L4+3tdxyiL6Xc/9YLP4x/oVWBtpKxjpj5x
UIXBbFnHAEqFMwAoylWJdr22eb3rGACAEqEAYEltwYg+yHV/AKgrFAAs6V0dW9jaFwDqDAUAZ3RV
ol2valjrOgYAoMQoADithAnqfR3nu44BACgDCgBO69+29bLOPwDUKQoAFrU+HNftLRtcxwAAlAkF
AIt6x5rNChu+PQCgXvETHi9yabxN1zR0uo4BACgjCgBe5N+11efKcACA51EA8AJXJdq1PdbqOgYA
oMwoAHiBt/LbPwB4gQKA51yVaNcF0WbXMQAAFUABwHPe1LrRdQQAQIVQACBJOjfSqEtjba5jAAAq
JOQ6AKrD77VuZLe/07DWKpPJKJVOayaVUjabVb5QUD6f18joqOt4ALAiFACoJRDWjQ1drmNUlemZ
GY0nkxpPJjUxOal8Pr/o82ZSqQonA4DSoABAv9XUw6p/kjLZrIZHRnR8ePi5A7sxRqFQSJFoVMFg
UKFgUIFAQEaSCQSUSCTchgaAFaIAQK9p6nEdwamZVEpH+/s1PDIia60CgYBi8biikYhCoZCM4eII
gPpDAfDc9lirzok0uI7hRCab1cHDhzV64oSstYqEw4rF4wqHwxz0AdQ9CoDndjR2u45QcdZaHevv
15Fjx1QoFBSJRpWIxRQKh11HA4CKoQB4LCijaz3b9CedTuvJZ57R1PS0QsGgmlpaFObAD8BDFACP
XZFYo9agPwe/4ZER9R08qHw+r0QiwQQ+AF6jAHjsBo9u/Tt67JgOPfusAoGAWvitHwAoAL4ykq6K
r3Edo+ystTpw6JAGhoYUCofV3NysABP8AIAC4Kvzok1qD0Vdxyi7vgMHNDQ8rHAkouamppLP7r/m
lVdr60UXKpfLKTkxqeHhYQ0ODmn/gYNKJidKOhYAlBIFwFMv9+C3/4OHD2toeFjRSESNZTj4S1I8
Hlc8Hl/0344Pj2j37sf16KO7WDIYQNWhAHjq5Yl21xHKqn9wUMcGBhQOh8t28F9KV2eHdtx8o3bc
fKOefqZP99xznw4dPlLxHACwGAqAh8ImoAujza5jlM3E5KQOHDqkYCik5ubmqljU57wtm3Xels3a
u+9Jff/uf9bY2JjrSBVjR3JKf/Wo6xgAFqAAeOjCaHPdrv0/Ozurp/r6ZIwpyzX/1browvO1ZfMm
3f2D/6OHHn7EdZyKsHmrwmDWdQwAC9TnUQBndHGsxXWEsuk7eFCZTEaNjY0KBoOu4ywqEonojtvf
oN970x0Kh+ngANygAHhoa50WgPFkUiOjo4pGIopGq/8Oh8sv264/+vdvUTwWcx0FgIf49cNDL4k0
uY5QcgVrtf/gQQUCATU0NrqOU7RzN/XqbW97q778N19VJpNxHadiYn+4ruxjpL/WX/YxgFpGAfBM
czCszjq8///48eNKpdNqaGhQIFBbJ7Y2nrVBb/6DN+l//t03lM/nXcepiOD2CpTQr5V/CKCW1dZP
Sqza5kjt/HZcLGutnu3vVyAQqNnT6ee/5Dy9+tabXccA4BHOAHimHgvA8MiIMpmMGhIJqYyz/q2k
Qyar3UppUDklldeU8mpUUC0KqlshbVdC59iIVpLi+uuuUd/+A3ryyadLHR0AXoQC4JmzwvW3A97A
8eMyxih2mhX5Visnq5+aKd1nJjSuxU7Rzz73px9pQq0mqB22STfYJoWXUQWMMbr9ja/TJ+76rLJZ
bpsDUF5cAvBMT7g2T5GfTjqd1uTkpKKRSFnu+X/MpPTBQL++a8ZOc/B/sXHl9W0zrv8cGNDjSi1r
vNbWVt1043UriQoAy0IB8Ex3sL4KwNDwsCQpWoZr//eZSX3BDOtEkQf+hUY1q/8eGNYPTVJ2Ga+7
9ppXqKGhYUVjAkCxKACeWRuqrwIweuKEAsGgwuFwSd/3H82Y/rcZW9aBezFW0g9NUt8x40W/JhKJ
6BVXX7nKkQHgzJgD4JGWYFjxQHWujrcSuVxOM6mUYiVe9OdXZlr/YiZL+p73mgl125CuVXGTMK98
+Ut1330/U8GutoKcmU0XlN9d2q91oUJyduknAag4CoBHWoMR1xFKanxiQpIUipTu6xpQTl835dm6
9x8CJ3SejanbLv3frqWlWedu3qRnntlflizz7PgsC+YAnuISgEdaAvXV96ampiSppKf//ymQXOEV
/6XlJX1/GZcCLrjg/DIlAQAKgFda6uwMwEwqJWOMgiVa+e+gyWq3ZkryXqezUzM6pOJu8duy+dyy
ZgHgt/r6lRBn1FRnZwBSqVRJd/x7SNMle6/TsZIeMtM6xy5dxnq61yoajZZ3j4CQUaCjtBMoF7Kz
VnYkV9YxACxffR0RcEZRUz8nfKy1ymSzipTw+v9jZnn37K/ULs3od9S25POMMersaNfRY+W7Rh/o
CCv+/t6yvb8kFYaySn38YFnHALB89XNEwJIidVQA8vm8rLUyJTr9f0J5Dasys9VHTF5jpriZBh0d
7WVOA8BX9XNEwJLCdVQAZmdPHqwDJVr9b6xCB/95xa4qGC/T8sYAUD9HBCwpVEcFoFAolPT9ij0g
l8pYkeOVeo0DAJhXP0cEYBXKsY/AGcer6GgA8GIUAI/M2tL+1uxSoISz/yWp1Vb2v0KrisufLucd
AAC8RgHwSK6OCkBorgCUaqnc1grfENNmiysAqVRl7kwA4B8KgEeydVQAgsGgjDGyJZoLsEZBdVao
BHQqXPQZgOGR8ixLDAAUAI9k6qgAGGMUiUaVz5du8t52W5kZ95cVOY61ViMUAABlQgHwyES+vlZj
S8RiJS0AL7OJsk/OM5JepkRRzx0YGCzvKoAAvEYB8Mh4vRWAeFzW2pKVgF5FdVmRB+eVutwmdHYR
ywBL0jN95d0JEIDfKAAemSjUVwFoamyUJOVmS7eIz+ttq0JlOg8QktEbbGvRz9+378my5AAAiQLg
lWSdFYCW5mZJ0my2uN31itFtQ3qzXVOy9zvV79s2dRU50TCZnND+A6yfD6B8KAAeSeZzShUqu+Jd
OYXDYSUSCWVzpS02V9sG7bDNJX3PW22TrrGNRT//oYd/I1uiWxwBYDEUAM8MzqZdRyip9rY2FQoF
5UpcAu6wrfpd27bqiwFG0m22Rb9tl979b14mk9EDv3pwlSMDwJlRADwzlK+vArC2s1OSlEmX/ut6
lW3SnxQ61b7C9QE6FdK7Cp26zbYs63W/vP9Xmp6eXtGYAFCsyi5/BucGcmmpjjaYi8Viamps1PTM
zMntgUu8pv82xXVhIaafmUndayaL2jSozQa1Q826wTYue0Lh+Pi4fvbzX640LgAUjQLgmcO5+vvN
sqe7W0/39SmVSimRKP1tfCEZ7bDNutk265Ay2m1SGjKzSiqvKRXUqIBaFFS3DWu7jetsRVZ06cBa
q+98925lSzipEQBOhwLgmf3ZKdcRSq6zvV1Hjh5VOp1WPB4v285+RifXCui1UakM8/N+9vNf6Mmn
ni79GwPAIpgD4Jm+TP2dATDGaH1PjwqFQs1unvPkk0/rJ/fc5zoGAI9QADwzWchpOF9/y8t2d3Up
EY8rlUqpUKINgirlyJFn9bVvfLPmcgOobRQADz2ZnnAdoeSMMTq3t1fW2pqaQd+3/4D+9it/x3V/
ABVHAfDQE5n6KwDSyZUBO9rblclkynJbYKn95tGd+sr/+F9K1UBWAPWHSYAeejw17jpC2Wzu7dXU
1JSmpqcVCoUUDFXft3gmk9Hdd/+zHn5kp+soADxWfT8dUXZPZieVtQVFTP2dAAqFQjpv82bt2bdP
k1NTamlulglUz9e5d9+T+t73f6jx8fotYQBqAwXAQzlb0L7MhLbHit+ZrpY0NzWpd+NGHTh8WBOT
k2pubi7brYHFevqZPv3knvt0+PARpzkAYB4FwFMPzYzWbQGQpHU9Pcrmcjra36/JuRJQaUNDx/XY
43v0yM7dGh0Zrfj4AHAmFABPPZQ6oT/Wua5jlNU5GzcqNzuroePHNTExoaamppKfCUilUhobG1c2
l9NEckLDwyMaHBpSX98BTUxOlnQsACglCoCnnslMamQ2o45Q1HWUstrc26uAMRoYGtJEMnnyckAJ
5wTc/8D/0z33/rRk7wcAlVI9s6NQUVbSr1P1f1p6fn2Ac846S7nZWY2Nn/xtHQB8RwHw2M+mjruO
UDEb1q/X+Vu2yBijiWRSMzMz5VjOHwBqBgXAYzvTYxrL+7MCXUd7uy7dtk2NDQ2amZnR+NiYcpwN
AOApCoDH8tbqF9PDrmNUVCwa1SVbt6r37LNlrVUymdTExIRmZ2ddRwOAiqIAeO5fpoZcR6i4+d0D
r9i+XZ3t7crlchofH9fExISy2ays5eIAgPrHXQCeeyw9roPZafVGGlxHqbhIJKKXbNmijamUjg4M
6PjwsLLZrAKBgCLRqCLhsMKRiNwuIQQA5UEBgH40OaB3tG92HcOZeDyuLZs26ewNGzQ8Oqqh4WHN
zMwonUrJSAqFwwqHQgoGgwrMfxjjfHVBAFgNCgD046kB/fGaTQrX4d4AyxGJRLS+p0fre3o0k0pp
PJnUeDKp5MSEZlKpRV8zMzNT4ZQAUBoUACiZz+mn08d1a2O36yhVIxGPKxGPa113t6y1ymQySqXT
mkmllMvlNJvPa3Z2Vol43HVUAFgRCgAkSd8cP6xbGru53r0IY4xisZhisZjaWl+4f8LOnbsdpQKA
1fH7nC+ecyA7rUdTY65jAAAqhAKA53wryVa1AOALCgCe89DMqPZlJlzHAABUAAUAL/DVsYOuIwAA
KoACgBd4aGZUu1LjrmMAAMqMAoAX+erYAdcRAABlRgHAi+xOj3u3SRAA+IYCgEV98USfsrbgOgYA
oEwoAFhUfy6lbyefdR0DAFAmFACc1tfGDmlwNu06BgCgDCgAOK2UzeuTI0+5jgEAKAMKAM7owZlR
3Ts15DoGAKDEKABY0udGntZYPus6BgCghCgAWFKykNN/Hf5XWddBAAAlQwFAUR6cGdX3J466jgEA
KJGQ6wCoHV8c7dOl8Tb1hhtcR0GJFAazmn535Sd6uhgz9XH2uQBOxRkAFC1jC/rzwT2aLsy6jgIA
WCUKAJbl2dyM/oL5AABQ8ygAWLb7p4f1rfEjrmMAAFaBAoAV+Zux/fr1zKjrGACAFaIAYEXy1upD
x5/Qv2YmXEcBAKwABQArli7k9YGhPRpivwAAqDkUAKzK6GxG7x18TMlCznUUAMAyUACwagez03pX
/y5N5CkBAFArKAAoib7slN439LhmbN51FABAESgAKJm96aT+dOAxTRcoAQBQ7SgAKKnd6XG9s38n
cwIAoMpRAFByT2Un9c7+XTrBFsIAULUoACiL/dkp/Yf+R3UoO+06CgBgERQAlE1/LqW39+/UrtSY
6ygAgAUoACiryUJO7xl8TD+ZHHQdBQBwCgoAyi5nC/qL4X26a+QpzVr2EQSAakABQMX8YOKY/qR/
p0ZnM66jAID3KACoqD2ZpN567Dd6kJ0EAcApCgAqbjSf1fsGH9NdI08pzaJBAOAEBQBOWJ28JPC2
/kf0VGbSdRwA8A4FAE4dyE7rbcce0edHn1GKfQQAoGIoAHAuL6tvJ5/VHz77sB5OnXAdBwC8QAFA
1eifTek9A7t158AuHWQFQQAoKwoAqs4jqTG95djD+usTfZoqzLqOAwB1iQKAqjRrrb45fkRvOPwr
ffnEfk1TBACgpCgAqGozNq+/Hz+sO478Wn8/fljT3DYIACVBAUBNSBZy+vKJ/Xr94Qf0+dFnNDSb
dh0JAGpayHUAYDlmbF7fTj6rf0oe1Q2NXbqtaZ0ujbfJuA4GADWGAoCalJfVfVNDum9qSBvCcf2b
pnV6dWO32kNR19EAoCZQAFDzjuZS+vKJ/frbsQPaGm3WDQ1durFxrdqDEdfRAKBqUQBQNwrW6vF0
Uo+nk/rCiT5ti7XqyvgaXZlo17mRRtfxAKCqUABQl/LWaldqTLtSY/rSif3qDEV1RXyNtsVatDXa
onMiDcwbAOA1CgC8MDyb0Y8nB/TjyQFJUkswrAsizdocbdTmaKM2hRt1diShILUAgCcoAPBSMp/T
g6lRPZgafe7vgjJaG4qpJxxTTyim7lBMHaGYmgMhtQTDag6ElQgElQgEJUmJAP99ANQufoIBc/Ky
6p9NqX82VfRrYmMHxX0HAGoRCwEBAOAhCgAAAB6iAAAA4CEKAAAAHmISILAK6R1XKL3jCtcxAGDZ
OAMAAICHKAAAAHiIAgAAgIcoAAAAeIgCAACAhygAAAB4iAIAAICHKAAAAHiIAgAAgIcoAAAAeIgC
AACAhygAAAB4iAIAAICHKAAAAHiIAgAAgIcoAAAAeIgCAACAhygAAAB4iAIAAICHKAAAAHiIAgAA
gIcoAAAAeIgCAACAhygAAAB4iAIAAICHKAAAAHiIAgAAgIdCrgOsRs/7v+Q6AgAANYkzAAAAeIgC
AACAhygAAAB4iAIAAICHKAAAAHiIAgAAgIcoAAAAeIgCAACAhygAAAB4iAIAAICHKAAAAHiIAgAA
gIcoAAAAeIgCAACAhygAAAB4iAIAAICHjKuBB4fHrauxAQCoFt2drU6OxZwBAADAQxQAAAA8RAEA
AMBDFAAAADxEAQAAwEMUAAAAPEQBAADAQxQAAAA8RAEAAMBDFAAAADwUch0AQOXs2vmo7v/l/9UT
T+zR6MiwJKmjs0tbt16sa669XtsvvcxxQgCVwl4AgAeOHTuqz3/2U3piz+NnfN7Wi7fpnXf+J61f
v6FCyQCwFwCAsnhiz+N6z53vWPLg/4LnPrGnAskAuEQBAOrYsWNH9bGPflhTk5NFv2ZqclIf+8iH
1N9/rIzJALhGAQDq2Bc+/5llHfznTU1O6nOf+WQZEgGoFhQAoE7t2vmoHn9s94pf/8Sex7V7184S
JgJQTSgAQJ365S9+vur3eOD+X5QgCYBqRAEA6tTevU+s+j32FDFxEEBtogAAderE6Miq32N+rQAA
9YcCAOC0jHG2VAiAMqMAAHVqTXvHqt+jvaOzBEkAVCMKAFCntm69uCreA0B1ogAAdera625Y9Xtc
c+31qw8CoCpRAIA6tf3Sy3TJ9ktX/PqtF29b1esBVDcKAFDH3vXu96q5uWXZr2tsatK73v3eMiQC
UC0oAEAdW7u2Wx/88EfU2NRU9Gsam5r0of/yMa1bt76MyQC4RgEA6tzWrRfr05/9gi7edsmSz912
yXZ95nNfZPIf4AFnN/kODo9bV2MDvtq9a6ceuP8XeuKJPRoZPi5J6ujs0tatF+uaa6/nmj/gQHdn
q5NjMQUAAACHXBUALgEAAOAhlwVgyuHYAABUg9Vv27lCzgqAlfpdjQ0AQDUI2MKHnY3tamAjPepq
bAAAXDNG3+nqWvOAq/HdXQKw+oGzsQEAcGsyHyg4XW3LWQFY29nyPUn7XY0PAIArRnrvujVrjrjM
4O4SgDE5a/UBV+MDAOCCMfpOV0fLV1zncHobYE9X63etzKddZgAAoIIes7PptxhjnK+F43wdgO6O
5j+10qdc5wAAoJystMvOBm/u7u6edp1FqoICYIzJ93S2vtcY+0YxJwAAUJfsj6LBwg09PU3DrpPM
c7YU8GL2WhtZM5x8rTF6naTLJG2Q1Og4FgAAKzEh6WFj7F93tbfeXQ2n/U9VVQUAqEWHjgx9aHCo
/6Ouc/hiciL5jZtvuv7NrnMAtc75JQCg1qXTqR2uM/gk0dBwg6So6xxAraMAAKswODjYkMtlXuY6
h0+CwdCGr3/9W9td5wBqHQUAWAUbiF+XzmQirnP4pqt77WtcZwBqHQUAWIXpmalb8/m86xjeiUVj
N0kKus4B1DIKALAKuUzmZtcZfBSLx1565513drnOAdQyCgCwQsePT3VnstmXuM7hJWPC1990862u
YwC1jAIArFBe6VsymTS30jqSSDTsELcyAytGAQBWaGo6tcPaqlrXwyuNicbrN2zYEHOdA6hVFABg
Bay1JpPO3OQ6h88CoWD3X/3VXVe4zgHUKk6fASsweOLEVuUDe1zn8J7Rn3V3tH7cdQygFnEGAFiJ
vGH2fxUwVq92nQGoVRQAYAWMKADVwEpXj42NtbrOAdQiCgCwTHutjVjpGtc5IEkKpXOGvRiAFaAA
AMu0ZmT8arFNddUIBAyXAYAVoAAAy2QMp/+ribX2VmstE5qBZaIAAMtlRQGoLt0DI8nLXIcAag0F
AFiGw+PjbZI42FSZoMxvuc4A1BoKALAMkazYha4KWWuZBwAsEwUAWAZjOP1flYxe1t8/0eE6BlBL
KADA8rzKdQAsKhgM21tchwBqCQUAKNLQ0PgmSZtc58DirApcBgCWgQIAFCvA6f/qZm6x1jI/AygS
BQAoUoHr/9WuY+jExEtdhwBqBQUAKIK1NmisbnCdA2dmC1wGAIpFAQCKMDg6cbmkNa5z4MwM6wEA
RaMAAEUwBcvp/9pw+fHjU92uQwC1gAIAFIPr/7XC5AM5bgcEikABAJYwODjYIOlK1zlQHGPZHRAo
BgUAWIINxK+TFHWdA8Ux0g5rbch1DqDaUQCAJbD8b22xUtvA8NhVrnMA1Y4CACyNAlBjAgpwGQBY
AgUAOIOTM8rtha5zYJmMuB0QWAIFADgDG8jtkGRc58CybTs6OrrBdQigmlEAgDMoWHb/q1EmVAje
6joEUM0oAMBpWGuNYfvfmmWtmAcAnAEFADiNobGxiyTT4zoHVsYY3bzX2ojrHEC1ogAAp5M3zP6v
bU3to8lXug4BVCsKAHAaRhSAWsdlAOD0KADAIvZaG7HSNa5zYHWMLLcD/IsCqAAAAyxJREFUAqdB
AQAWsWZk/GpJja5zYLXMhQMDY+e4TgFUIwoAsAhjOP1fLwJhNgcCFkMBABZjWf63Xlh2BwQWxQpn
wAKHx8fbojkNSwq6zoKSmE5NtXT09pq06yBANeEMALBAJKubxMG/njQkEhPXuQ4BVBsKALAA2//W
HxvkdkBgIQoA8GIs/1tvLLcDAgsxBwDesdaGjh9PblRQm2TnPgJzj9ImK7W5zojSM9KYpAMyOqDC
3KPRAeV1oKur5YgxZtZ1RqCSKACoS4fHx9vCOW0ycwd3M3dwn/vYKCnkNiGqzKykI5IOSDpg50qC
NTqQC+vA2a2tY47zASVHAUDdGRgYO8eEzEHXOVA/7Kzt7elpO+Q6B1BKzAFA/QnqetcRUGf4nkId
ogCgFgV18hR+RFJs7iOuk0v3NmZzWSbxoaTmvqca5z7iev77LqKT34vcNoqaw3VQlEtQUljP/3AM
6mThDJ3y5+Apnxs9//248HH+3+cfz8gW7E0l+QqAOXPfU9uLeaqk/CmP0sn5BQsf5/99du6xcMrn
83+e/zx3ynsBJcMcAKxG89xHXCcP9pG5x7A4uwSUUkEni0B27jEnKSVpYu4DWDZ+SKOUrOsAAIDi
cAYA5bLwEsCpp/zn/3zq5/N/Z4p4BKrVwksAp3sszH3MXwLIL/j81EsCXAJAWfDDFLUosOBDer4g
LHzOvIXzXUJneO7ConHqc5caZ7GxlrLcYrPYmGeyMHMx5g9WxZo/oBXr1GvkxVq4UM/CMRdmPvX5
C8db+NqF7z17hueeOk5hwQcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAM78f6ZMXPE9Xy/GAAAAAElFTkSuQmCC
"
id="image3513"
x="0"
y="0" />
</svg>

After

Width:  |  Height:  |  Size: 14 KiB

View File

@ -121,12 +121,8 @@ sequence:
- keyboard
- partition
- users
# - tracking
- summary
- exec:
# - dummycpp
# - dummyprocess
# - dummypython
- partition
# - zfs
- mount
@ -135,23 +131,23 @@ sequence:
- locale
- keyboard
- localecfg
# - luksbootkeyfile
# - luksopenswaphookcfg
- luksbootkeyfile
- luksopenswaphookcfg
# - dracutlukscfg
- fstab
# - plymouthcfg
- plymouthcfg
# - zfshostid
- initcpiocfg
- initcpio
- users
- displaymanager
- mhwdcfg
- networkcfg
- hwclock
- services-systemd
# - dracut
- initramfs
# - grubcfg
- grubcfg
- bootloader
- postcfg
- umount
- show:
- finished
@ -168,7 +164,7 @@ sequence:
# here, Calamares then takes care of finding it and loading the contents.
#
# YAML: string.
branding: default
branding: manjaro
# If this is set to true, Calamares will show an "Are you sure?" prompt right
# before each execution phase, i.e. at points of no return. If this is set to

View File

@ -0,0 +1,240 @@
# SPDX-FileCopyrightText: no
# SPDX-License-Identifier: CC0-1.0
#
# Product branding information. This influences some global
# user-visible aspects of Calamares, such as the product
# name, window behavior, and the slideshow during installation.
#
# Additional styling can be done using the stylesheet.qss
# file, also in the branding directory.
---
componentName: manjaro
### WELCOME / OVERALL WORDING
#
# These settings affect some overall phrasing and looks,
# which are most visible in the welcome page.
# This selects between different welcome texts. When false, uses
# the traditional "Welcome to the %1 installer.", and when true,
# uses "Welcome to the Calamares installer for %1." This allows
# to distinguish this installer from other installers for the
# same distribution.
welcomeStyleCalamares: false
# Should the welcome image (productWelcome, below) be scaled
# up beyond its natural size? If false, the image does not grow
# with the window but remains the same size throughout (this
# may have surprising effects on HiDPI monitors).
welcomeExpandingLogo: true
### WINDOW CONFIGURATION
#
# The settings here affect the placement of the Calamares
# window through hints to the window manager and initial
# sizing of the Calamares window.
# Size and expansion policy for Calamares.
# - "normal" or unset, expand as needed, use *windowSize*
# - "fullscreen", start as large as possible, ignore *windowSize*
# - "noexpand", don't expand automatically, use *windowSize*
windowExpanding: normal
# Size of Calamares window, expressed as w,h. Both w and h
# may be either pixels (suffix px) or font-units (suffix em).
# e.g. "800px,600px"
# "60em,480px"
# This setting is ignored if "fullscreen" is selected for
# *windowExpanding*, above. If not set, use constants defined
# in CalamaresUtilsGui, 800x520.
windowSize: 800px,520px
# Placement of Calamares window. Either "center" or "free".
# Whether "center" actually works does depend on the window
# manager in use (and only makes sense if you're not using
# *windowExpanding* set to "fullscreen").
windowPlacement: center
### PANELS CONFIGURATION
#
# Calamares has a main content area, and two panels (navigation
# and progress / sidebar). The panels can be controlled individually,
# or switched off. If both panels are switched off, the layout of
# the main content area loses its margins, on the assumption that
# you're doing something special.
# Kind of sidebar (panel on the left, showing progress).
# - "widget" or unset, use traditional sidebar (logo, items)
# - "none", hide it entirely
# - "qml", use calamares-sidebar.qml from branding folder
# In addition, you **may** specify a side, separated by a comma,
# from the kind. Valid sides are:
# - "left" (if not specified, uses this)
# - "right"
# - "top"
# - "bottom"
# For instance, "widget,right" is valid; so is "qml", which defaults
# to putting the sidebar on the left. Also valid is "qml,top".
# While "widget,top" is valid, the widgets code is **not** flexible
# and results will be terrible.
sidebar: qml
# Kind of navigation (button panel on the bottom).
# - "widget" or unset, use traditional navigation
# - "none", hide it entirely
# - "qml", use calamares-navigation.qml from branding folder
# In addition, you **may** specify a side, separated by a comma,
# from the kind. The same sides are valid as for *sidebar*,
# except the default is *bottom*.
navigation: widget
### STRINGS, IMAGES AND COLORS
#
# This section contains the "branding proper" of names
# and images, rather than global-look settings.
# These are strings shown to the user in the user interface.
# There is no provision for translating them -- since they
# are names, the string is included as-is.
#
# The four Url strings are the Urls used by the buttons in
# the welcome screen, and are not shown to the user. Clicking
# on the "Support" button, for instance, opens the link supportUrl.
# If a Url is empty, the corresponding button is not shown.
#
# bootloaderEntryName is how this installation / distro is named
# in the boot loader (e.g. in the GRUB menu).
#
# These strings support substitution from /etc/os-release
# if KDE Frameworks 5.58 are available at build-time. When
# enabled, @{var-name} is replaced by the equivalent value
# from os-release. All the supported var-names are in all-caps,
# and are listed on the FreeDesktop.org site,
# https://www.freedesktop.org/software/systemd/man/os-release.html
# Note that ANSI_COLOR and CPE_NAME don't make sense here, and
# are not supported (the rest are). Remember to quote the string
# if it contains substitutions, or you'll get YAML exceptions.
#
# The *Url* entries are used on the welcome page, and they
# are visible as buttons there if the corresponding *show* keys
# are set to "true" (they can also be overridden).
strings:
productName: Manjaro Linux
shortProductName: Manjaro
version: 22.0.0
shortVersion: 22.0
versionedName: Manjaro Linux 22.0
shortVersionedName: Manjaro 22.0
bootloaderEntryName: Manjaro
productUrl: https://manjaro.org/
supportUrl: https://forum.manjaro.org/
knownIssuesUrl: https://gitlab.manjaro.org/
releaseNotesUrl: https://blog.manjaro.org/
donateUrl: https://manjaro.org/donate/
# These images are loaded from the branding module directory.
#
# productBanner is an optional image, which if present, will be shown
# on the welcome page of the application, above the welcome text.
# It is intended to have a width much greater than height.
# It is displayed at 64px height (also on HiDPI).
# Recommended size is 64px tall, and up to 460px wide.
# productIcon is used as the window icon, and will (usually) be used
# by the window manager to represent the application. This image
# should be square, and may be displayed by the window manager
# as small as 16x16 (but possibly larger).
# productLogo is used as the logo at the top of the left-hand column
# which shows the steps to be taken. The image should be square,
# and is displayed at 80x80 pixels (also on HiDPI).
# productWallpaper is an optional image, which if present, will replace
# the normal solid background on every page of the application.
# It can be any size and proportion,
# and will be tiled to fit the entire window.
# For a non-tiled wallpaper, the size should be the same as
# the overall window, see *windowSize* above (800x520).
# productWelcome is shown on the welcome page of the application in
# the middle of the window, below the welcome text. It can be
# any size and proportion, and will be scaled to fit inside
# the window. Use `welcomeExpandingLogo` to make it non-scaled.
# Recommended size is 320x150.
#
# These filenames can also use substitutions from os-release (see above).
images:
# productBanner: "banner.png"
productIcon: "logo_small.svg"
productLogo: "logo.svg"
# productWallpaper: "wallpaper.png"
productWelcome: "welcome/mascot.svg"
# Colors for text and background components.
#
# - SidebarBackground is the background of the sidebar
# - SidebarText is the (foreground) text color
# - SidebarBackgroundCurrent sets the background of the current step.
# Optional, and defaults to the application palette.
# - SidebarTextCurrent is the text color of the current step.
#
# These colors can **also** be set through the stylesheet, if the
# branding component also ships a stylesheet.qss. Then they are
# the corresponding CSS attributes of #sidebarApp.
style:
SidebarBackground: "#263238"
SidebarText: "#efefef"
SidebarTextSelect: "#4d915e"
SidebarTextHighlight: "#1a1c1b"
### SLIDESHOW
#
# The slideshow is displayed during execution steps (e.g. when the
# installer is actually writing to disk and doing other slow things).
# The slideshow can be a QML file (recommended) which can display
# arbitrary things -- text, images, animations, or even play a game --
# during the execution step. The QML **is** abruptly stopped when the
# execution step is done, though, so maybe a game isn't a great idea.
#
# The slideshow can also be a sequence of images (not recommended unless
# you don't want QML at all in your Calamares). The images are displayed
# at a rate of 1 every 2 seconds during the execution step.
#
# To configure a QML file, list a single filename:
# slideshow: "show.qml"
# To configure images, like the filenames (here, as an inline list):
# slideshow: [ "/etc/calamares/slideshow/0.png", "/etc/logo.png" ]
slideshow: "slideshow/SlideShow.qml"
# There are two available APIs for a QML slideshow:
# - 1 (the default) loads the entire slideshow when the installation-
# slideshow page is shown and starts the QML then. The QML
# is never stopped (after installation is done, times etc.
# continue to fire).
# - 2 loads the slideshow on startup and calls onActivate() and
# onLeave() in the root object. After the installation is done,
# the show is stopped (first by calling onLeave(), then destroying
# the QML components).
#
# An image slideshow does not need to have the API defined.
slideshowAPI: 2
# These options are to customize online uploading of logs to pastebins:
# - type : Defines the kind of pastebin service to be used. Currently
# it accepts two values:
# - none : disables the pastebin functionality
# - fiche : use fiche pastebin server
# - url : Defines the address of pastebin service to be used.
# Takes string as input. Important bits are the host and port,
# the scheme is not used.
# - sizeLimit : Defines maximum size limit (in KiB) of log file to be pasted.
# The option must be set, to have the log option work.
# Takes integer as input. If < 0, no limit will be forced,
# else only last (approximately) 'n' KiB of log file will be pasted.
# Please note that upload size may be slightly over the limit (due
# to last minute logging), so provide a suitable value.
uploadServer :
type : "fiche"
url : "http://termbin.com:9999"
sizeLimit : -1

View File

@ -0,0 +1,182 @@
import io.calamares.ui 1.0
import io.calamares.core 1.0
import QtQuick 2.15
import QtQuick.Layouts 1.15
import QtQuick.Controls 2.15
import QtQuick.Shapes 1.15
Rectangle {
id: sideBar;
SystemPalette {
id: systemPalette
}
color: systemPalette.window;
antialiasing: true
Rectangle {
anchors.fill: parent
anchors.rightMargin: 35/2
color: Branding.styleString(Branding.SidebarBackground)
}
ListView {
id: list
anchors.leftMargin: 12
anchors.fill: parent
model: ViewManager
interactive: false
spacing: 0
delegate: RowLayout {
visible: index!=0
height: index==0?0:50
width: parent.width
Text {
Layout.fillWidth: true
fontSizeMode: Text.Fit
color: Branding.styleString(Branding.SidebarText)
text: display;
font.pointSize : 12
minimumPointSize: 5
Layout.alignment: Qt.AlignLeft|Qt.AlignVCenter
clip: true
}
Item {
Layout.fillHeight: true
Layout.preferredWidth: 35
Rectangle {
anchors.centerIn: parent
id: image
height: parent.width*0.65
width: height
radius: height/2
color: {
if (index>ViewManager.currentStepIndex) {
return systemPalette.mid;
}
return systemPalette.highlight
}
z: 10
}
Rectangle {
color: {
if (index>ViewManager.currentStepIndex && index!=1) {
return systemPalette.mid;
}
return systemPalette.highlight;
}
anchors.horizontalCenter: parent.horizontalCenter
anchors.bottom: image.verticalCenter
height: parent.height/2
width: 5
z: 0
}
Rectangle {
color: {
if (index<ViewManager.currentStepIndex || ViewManager.currentStepIndex==list.count-1) {
return systemPalette.highlight;
}
return systemPalette.mid;
}
anchors.horizontalCenter: parent.horizontalCenter
anchors.top: image.verticalCenter
height: parent.height/2
width: 5
//visible: (index !== (list.count - 1))
z: 0
}
Shape {
visible: index == ViewManager.currentStepIndex
id: shape
anchors.fill: parent
smooth: true
layer.enabled: true
layer.samples: 8
ShapePath {
fillColor: "transparent"
strokeColor: systemPalette.highlight
strokeWidth: 3
capStyle: ShapePath.FlatCap
PathAngleArc {
centerX: shape.width/2; centerY: shape.height/2
radiusX: 15; radiusY: 15
startAngle: 0
sweepAngle: 360
}
}
}
}
}
header: RowLayout {
height: 55
anchors.right: parent.right
anchors.left: parent.left
Item {
Layout.fillWidth: true
}
Shape {
id: manjaroShape
Layout.preferredHeight: 27
Layout.preferredWidth: 27
ShapePath {
scale: Qt.size((manjaroShape.width-1)/200, (manjaroShape.height-1)/200)
fillColor: systemPalette.highlight
strokeWidth: -1
PathSvg {
path: "M 14.28571,0 C 6.37556,0 0,6.375557 0,14.285714 V 185.71428 C 0,193.62444 6.37556,200 14.28571,200 H 57.14286 V 57.142856 h 71.42857 V 0 Z m 128.57144,0 v 200 h 42.85714 C 193.62445,200 200,193.62444 200,185.71428 V 14.285714 C 200,6.375557 193.62445,0 185.71429,0 Z M 71.42857,71.42857 V 200 h 57.14286 V 71.42857 Z m 0,0"
}
}
}
Label {
text: "manjaro"
font.pointSize: 16
font.family: "Comfortaa"
color: Branding.styleString(Branding.SidebarText)
Layout.fillWidth: true
}
Item {
Layout.fillHeight: true
Layout.preferredWidth: 35
Rectangle {
color: systemPalette.highlight
anchors.horizontalCenter: parent.horizontalCenter
anchors.top: parent.top
height: parent.height
width: 5
z: 0
}
}
}
}
Item {
anchors.right: parent.right
anchors.bottom: parent.bottom
height: list.height - list.contentHeight
width: 35
Rectangle {
color: {
if (ViewManager.currentStepIndex==list.count-1) {
return systemPalette.highlight;
}
return systemPalette.mid;
}
anchors.horizontalCenter: parent.horizontalCenter
anchors.top: parent.top
height: parent.height
width: 5
z: 0
}
}
}

View File

@ -0,0 +1,85 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
version="1.2"
width="200"
height="200"
id="svg2"
inkscape:version="1.2 (dc2aedaf03, 2022-05-15)"
sodipodi:docname="logo.svg"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns="http://www.w3.org/2000/svg"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:dc="http://purl.org/dc/elements/1.1/">
<sodipodi:namedview
pagecolor="#585858"
bordercolor="#424242"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="2560"
inkscape:window-height="1371"
id="namedview15"
showgrid="false"
inkscape:showpageshadow="false"
fit-margin-top="0"
fit-margin-left="0"
fit-margin-right="0"
fit-margin-bottom="0"
inkscape:zoom="2.1729671"
inkscape:cx="232.63122"
inkscape:cy="5.2923028"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="1"
inkscape:current-layer="svg2"
inkscape:pagecheckerboard="0"
showguides="true"
inkscape:guide-bbox="true"
inkscape:deskcolor="#585858">
<sodipodi:guide
position="-103.95081,200"
orientation="0,-1"
id="guide831"
inkscape:locked="false" />
<sodipodi:guide
position="-103.95081,142.85715"
orientation="0,-1"
id="guide833"
inkscape:locked="false" />
<sodipodi:guide
position="-103.95081,128.57143"
orientation="0,-1"
id="guide835"
inkscape:locked="false" />
<inkscape:grid
type="xygrid"
id="grid837"
originx="-2e-06"
originy="2.5e-06" />
</sodipodi:namedview>
<defs
id="defs4" />
<metadata
id="metadata7">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
</cc:Work>
</rdf:RDF>
</metadata>
<path
style="fill:#35bfa4;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.57143"
d="M 14.28571,0 C 6.37556,0 0,6.375557 0,14.285714 V 185.71428 C 0,193.62444 6.37556,200 14.28571,200 H 57.14286 V 57.142856 h 71.42857 V 0 Z m 128.57144,0 v 200 h 42.85714 C 193.62445,200 200,193.62444 200,185.71428 V 14.285714 C 200,6.375557 193.62445,0 185.71429,0 Z M 71.42857,71.42857 V 200 h 57.14286 V 71.42857 Z m 0,0"
id="path9" />
</svg>

After

Width:  |  Height:  |  Size: 2.7 KiB

View File

@ -0,0 +1,415 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
width="99.911003"
height="105.45631"
viewBox="0 0 99.911002 105.45632"
version="1.1"
id="svg8"
inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20, custom)"
sodipodi:docname="logo_small.svg"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns="http://www.w3.org/2000/svg"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:dc="http://purl.org/dc/elements/1.1/">
<defs
id="defs2">
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient97461"
id="linearGradient192184"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(-0.25748744,-0.00959816,-0.00959816,0.25748744,-253.93245,3.5748631)"
x1="-1889.2522"
y1="519.47839"
x2="-2050.3433"
y2="541.32788" />
<linearGradient
inkscape:collect="always"
id="linearGradient97461">
<stop
style="stop-color:#cccccc;stop-opacity:1"
offset="0"
id="stop97457" />
<stop
style="stop-color:#e6e6e6;stop-opacity:1"
offset="1"
id="stop97459" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient275394"
id="linearGradient192182"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(-0.23168548,-0.10952704,-0.10952704,0.23168548,315.07813,37.331727)"
x1="350.4982"
y1="283.14035"
x2="505.82822"
y2="952.06641" />
<linearGradient
inkscape:collect="always"
id="linearGradient275394">
<stop
style="stop-color:#24282c;stop-opacity:1;"
offset="0"
id="stop275390" />
<stop
style="stop-color:#000000;stop-opacity:1"
offset="1"
id="stop275392" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient6008"
id="linearGradient192180"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(-0.23920126,-0.11308005,-0.11308005,0.23920126,64.298455,-84.300352)"
x1="-805.84595"
y1="764.44513"
x2="-771.58569"
y2="593.95886" />
<linearGradient
inkscape:collect="always"
id="linearGradient6008">
<stop
style="stop-color:#cccccc;stop-opacity:1"
offset="0"
id="stop6004" />
<stop
style="stop-color:#f2f2f2;stop-opacity:1"
offset="1"
id="stop6006" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient167524"
id="linearGradient192178"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.24848259,0,0,0.24848259,46.886037,71.063508)"
x1="307.0033"
y1="402.83612"
x2="325.54938"
y2="368.49637" />
<linearGradient
inkscape:collect="always"
id="linearGradient167524">
<stop
style="stop-color:#008080;stop-opacity:1"
offset="0"
id="stop167520" />
<stop
style="stop-color:#1a1a1a;stop-opacity:0;"
offset="1"
id="stop167522" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient215970"
id="linearGradient192176"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.26458333,0,0,0.26458333,100.79156,101.20254)"
x1="146.51627"
y1="403.08319"
x2="165.59502"
y2="377.1142" />
<linearGradient
inkscape:collect="always"
id="linearGradient215970">
<stop
style="stop-color:#008080;stop-opacity:1"
offset="0"
id="stop215966" />
<stop
style="stop-color:#333333;stop-opacity:0;"
offset="1"
id="stop215968" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient377614"
id="linearGradient193628"
x1="-172.92175"
y1="5952.0996"
x2="-202.737"
y2="5847.1855"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.26458333,0,0,0.26458333,222.62724,-1397.7303)" />
<linearGradient
inkscape:collect="always"
id="linearGradient377614">
<stop
style="stop-color:#3c7038;stop-opacity:1"
offset="0"
id="stop377610" />
<stop
style="stop-color:#44883c;stop-opacity:1"
offset="1"
id="stop377612" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient347651"
id="linearGradient192172"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(-0.15135679,-0.21621034,-0.21036193,0.15176557,316.53373,131.84185)"
x1="580.76862"
y1="718.56329"
x2="490.62381"
y2="500.19333" />
<linearGradient
inkscape:collect="always"
id="linearGradient347651">
<stop
style="stop-color:#24282c;stop-opacity:1;"
offset="0"
id="stop347647" />
<stop
style="stop-color:#181a1d;stop-opacity:1"
offset="1"
id="stop347649" />
</linearGradient>
</defs>
<sodipodi:namedview
id="base"
pagecolor="#525252"
bordercolor="#404040"
borderopacity="1"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:zoom="5.6"
inkscape:cx="24.464286"
inkscape:cy="38.303571"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="false"
inkscape:window-width="1914"
inkscape:window-height="1047"
inkscape:window-x="588"
inkscape:window-y="86"
inkscape:window-maximized="0"
inkscape:pagecheckerboard="0"
units="px"
fit-margin-top="0"
fit-margin-left="0"
fit-margin-right="0"
fit-margin-bottom="0"
width="167.10596px" />
<metadata
id="metadata5">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
</cc:Work>
</rdf:RDF>
</metadata>
<g
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(-447.37555,-638.70039)">
<g
id="g84744"
transform="matrix(3.7795276,0,0,3.7795276,-334.259,1364.1449)"
style="display:inline">
<g
id="g227137"
transform="matrix(0.11522404,0,0,0.11522404,200.4627,-189.69709)">
<path
style="color:#000000;display:inline;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke-width:0.264583;stroke-linecap:round;stroke-linejoin:round;-inkscape-stroke:none;paint-order:markers fill stroke"
d="m 233.69052,203.98467 c 0.005,0.004 0.0259,0.0315 0.0259,0.0314 l -0.003,0.003 c -0.009,-0.0116 -0.0138,-0.0193 -0.0246,-0.0336 z"
id="path192100" />
<path
style="color:#000000;display:inline;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke-width:0.264583;stroke-linecap:round;stroke-linejoin:round;-inkscape-stroke:none;paint-order:markers fill stroke"
d="m 232.85627,203.29506 c -3e-5,3e-5 0.0299,0.0175 0.0349,0.0204 -0.0159,-0.008 -0.0243,-0.0116 -0.0368,-0.0177 0,0 0.003,-0.003 0.003,-0.003 z"
id="path192102" />
<path
style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke-width:0.264583;stroke-linecap:round;stroke-linejoin:round;-inkscape-stroke:none;paint-order:markers fill stroke"
d="m 210.45698,140.42728 c 0.21696,-0.61232 0.51941,-1.21687 0.91038,-1.79863 3.12791,-4.65397 7.88752,-9.41578 14.14939,-2.77464 1.14776,1.21732 0.42521,4.58452 8.81332,7.10941 5.3929,1.6233 9.81829,0.97137 15.4894,-2.58516 12.26151,-7.68948 18.35954,-9.54853 25.45329,-2.95458 7.56499,7.03204 11.13165,20.49597 8.17732,25.66249 -9.43036,16.49175 -12.95128,12.35044 -22.68834,12.6128 -36.49022,0.98321 -34.9672,-8.5674 -46.20657,-24.67676 -2.02811,-1.36309 -5.46404,-3.32531 -6.472,-5.41195 -0.75594,-1.56488 1.72241,-3.34624 2.37381,-5.18298 z"
id="path192104"
sodipodi:nodetypes="sssssssscss" />
<path
style="color:#000000;fill:url(#linearGradient192184);fill-opacity:1;fill-rule:evenodd;stroke-width:3.70819;stroke-linecap:round;stroke-linejoin:round;-inkscape-stroke:none;paint-order:markers fill stroke"
d="m 255.48203,146.30397 c 2.94217,-0.58343 7.58621,-1.95781 2.76204,5.22007 -4.8242,7.17788 11.44272,14.6662 4.58372,16.10836 -31.31415,6.58413 -33.48331,-3.28393 -46.02676,-20.96973 -3.51679,-2.36361 -6.1024,-2.35591 -3.73883,-5.87272 2.36361,-3.51682 6.49571,-4.38558 9.65452,-1.56128 5.17012,4.62261 10.11605,10.59767 22.8786,9.35058 4.92403,-0.48117 5.58276,-1.42181 9.88671,-2.27528 z"
id="path192106"
sodipodi:nodetypes="ssscssss" />
<path
style="color:#000000;display:inline;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke-width:0.264583;stroke-linecap:round;stroke-linejoin:round;-inkscape-stroke:none;paint-order:markers fill stroke"
d="m 226.11952,13.901577 c 27.60443,13.057055 39.75807,45.695393 27.72535,73.536359 4.88709,8.432615 5.42493,18.756524 1.24341,27.647314 a 3.3076224,3.3076224 0 0 1 -0.003,0.006 c -5.54308,11.71914 -17.98995,18.42141 -30.64968,16.85375 l -17.37683,44.42955 a 3.3076224,3.3076224 0 0 1 -0.0306,0.0759 c -10.38188,24.7304 -29.93742,39.03004 -52.51342,44.0713 -22.57602,5.04132 -48.13921,1.08178 -71.461865,-9.94378 a 3.3076224,3.3076224 0 0 1 -1.57652,-4.40354 L 139.07476,84.334427 C 125.11775,76.910404 119.26614,59.694522 126.09202,45.25568 131.93778,32.898581 145.42314,26.18253 158.67834,28.718481 175.12294,9.1172488 202.82331,2.8984822 226.11743,13.901709 a 3.3076224,3.3076224 0 0 1 0.003,0 z"
id="path192108" />
<path
style="color:#000000;display:inline;fill:url(#linearGradient192182);fill-opacity:1;fill-rule:evenodd;stroke-width:6.40675;stroke-linecap:round;stroke-linejoin:round;-inkscape-stroke:none;paint-order:markers fill stroke"
d="m 225.15133,19.383611 a 51.575654,51.575654 0 0 1 24.64319,68.521288 25.711532,25.711532 0 0 1 1.88606,25.224081 25.711532,25.711532 0 0 1 -28.82675,14.10478 l -17.77826,45.45573 c -19.35295,46.10002 -71.6829,52.23507 -115.757216,31.39937 L 145.65992,84.907937 c 0.29554,-0.625157 0.62674,-1.221052 0.96837,-1.807157 a 25.711532,25.711532 0 0 1 -1.83956,-0.640979 25.711532,25.711532 0 0 1 -12.25617,-34.233882 25.711532,25.711532 0 0 1 29.86165,-13.84972 51.575654,51.575654 0 0 1 62.75712,-14.992588 z"
id="path192110" />
<circle
style="display:inline;fill:#000000;fill-rule:evenodd;stroke-width:0.501018;stroke-linecap:round;stroke-linejoin:round;paint-order:markers fill stroke"
id="circle192112"
cx="-205.95627"
cy="-3.9240594"
r="4.7567239"
transform="matrix(-0.99862549,0.05241305,0.05241305,0.99862549,0,0)" />
<path
id="path192114"
style="display:inline;fill:url(#linearGradient192180);fill-opacity:1;fill-rule:evenodd;stroke-width:14.3814;stroke-linecap:round;stroke-linejoin:round;paint-order:markers fill stroke"
d="m 208.1858,35.211198 16.91907,5.599483 c 6.79323,3.621325 9.24735,11.950964 5.50238,18.676857 l -22.79964,40.947392 3.0521,1.61832 21.60405,-39.083319 c 3.70403,-6.700943 11.22981,-8.769958 16.8739,-4.638781 5.64404,4.131205 7.20564,12.851712 3.50158,19.552682 l -23.86962,43.182958 c -2.30206,4.16463 -6.08047,6.53669 -9.96569,6.74654 0.75295,1.33191 1.40917,2.69451 1.89693,4.08971 l -16.92233,43.26739 c -17.31621,41.24833 -60.2025,51.48953 -100.95238,39.48981 -5.03613,-7.12846 -6.608232,-15.18367 -0.98345,-19.92445 31.0674,-26.18478 34.88055,-55.43119 39.96316,-84.53522 1.87767,-10.751794 16.363,-14.228737 29.12912,-10.521342 -6.12209,-3.847544 -8.21611,-11.730276 -4.63687,-18.158486 l 22.66566,-40.705669 c 3.74494,-6.725867 12.2288,-9.225227 19.02203,-5.603875 z"
sodipodi:nodetypes="ccccccsccccccsscccc" />
<g
id="g192120"
transform="matrix(-0.28015681,-0.10884548,-0.10884548,0.28015681,314.26281,3.0663868)"
style="display:inline;fill:#24282c;fill-opacity:1">
<path
style="color:#000000;fill:#24282c;fill-opacity:1;fill-rule:evenodd;stroke-width:9.05993;stroke-linecap:round;stroke-linejoin:round;-inkscape-stroke:none;paint-order:markers fill stroke"
d="m 263.19617,447.2113 c 1e-5,8.60278 -17.48849,15.90448 -36.5586,16.19052 -17.88353,0.26825 -48.73412,-3.58081 -64.30051,-16.19052 -6.68471,-5.41502 24.83095,-20.0435 52.68242,-20.0435 27.85146,10e-6 48.17668,11.44072 48.17669,20.0435 z"
id="path192116" />
<path
style="color:#000000;fill:#24282c;fill-opacity:1;fill-rule:evenodd;stroke-linecap:round;stroke-linejoin:round;-inkscape-stroke:none;paint-order:markers fill stroke"
d="m 215.01953,422.63867 c -14.71881,0 -29.93599,3.76874 -41.01758,8.33203 -5.54079,2.28165 -10.00417,4.674 -13.14453,7.40821 -1.57018,1.3671 -2.95757,2.79028 -3.65625,5.11132 -0.69868,2.32105 0.38559,5.70147 2.28516,7.24024 17.49074,14.16855 48.60735,17.48034 67.21875,17.20117 10.09224,-0.15138 19.69635,-2.10393 27.16797,-5.35156 3.73581,-1.62382 6.95853,-3.5594 9.46289,-6.01367 2.50435,-2.45428 4.39063,-5.66996 4.39062,-9.35547 0,-3.93447 -2.12198,-7.21857 -4.97851,-10.00391 -2.85654,-2.78534 -6.6694,-5.22895 -11.30469,-7.35937 -9.27058,-4.26086 -21.87785,-7.20898 -36.42383,-7.20899 z m 0,9.0586 c 13.30545,0 24.78575,2.77262 32.64063,6.38281 3.92744,1.80509 6.93692,3.83396 8.76171,5.61328 1.8248,1.77932 2.24415,3.15066 2.24415,3.51758 0,0.61587 -0.3012,1.5415 -1.67188,2.88476 -1.37067,1.34327 -3.71235,2.86307 -6.73242,4.17578 -6.04014,2.62542 -14.71356,4.4669 -23.69141,4.60157 -16.43488,0.24652 -45.0348,-3.83895 -59.41601,-13.89258 1.85635,-1.52579 5.52331,-3.66711 10.29687,-5.63281 9.96791,-4.1047 24.43573,-7.65039 37.56836,-7.65039 z"
id="path192118" />
</g>
<circle
style="display:inline;fill:#000000;fill-rule:evenodd;stroke-width:0.835546;stroke-linecap:round;stroke-linejoin:round;paint-order:markers fill stroke"
id="circle192122"
cx="-247.15955"
cy="-35.313438"
r="7.9327707"
transform="matrix(-0.8516397,-0.52412768,-0.52412768,0.8516397,0,0)" />
<circle
style="display:inline;fill:#000000;fill-rule:evenodd;stroke-width:0.973579;stroke-linecap:round;stroke-linejoin:round;paint-order:markers fill stroke"
id="circle192124"
cx="-205.27351"
cy="-37.265644"
r="9.2432623"
transform="matrix(-0.8516397,-0.52412768,-0.52412768,0.8516397,0,0)" />
<path
id="path192126"
style="display:inline;fill:#d45500;fill-rule:evenodd;stroke:none;stroke-width:2.39711;stroke-linecap:round;stroke-linejoin:round;paint-order:markers fill stroke"
d="m 194.60691,100.54288 c -0.82431,2.12164 2.78913,5.59811 7.46487,7.49591 4.38481,1.77969 12.3621,3.78645 17.4094,2.16813 2.16747,-0.69493 -4.20338,-7.32242 -11.07223,-9.99109 -6.86885,-2.668641 -12.97773,-1.794616 -13.80204,0.32705 z"
sodipodi:nodetypes="sssss" />
<circle
style="display:inline;fill:url(#linearGradient192178);fill-opacity:1;fill-rule:evenodd;stroke-width:0.752475;stroke-linecap:round;stroke-linejoin:round;paint-order:markers fill stroke"
id="circle192128"
cx="125.76052"
cy="166.4637"
r="7.1440735"
transform="rotate(-31.609538)" />
<circle
style="display:inline;fill:url(#linearGradient192176);fill-opacity:1;fill-rule:evenodd;stroke-width:0.640834;stroke-linecap:round;stroke-linejoin:round;paint-order:markers fill stroke"
id="circle192130"
cx="142.89081"
cy="204.73656"
r="6.0841508"
transform="rotate(-31.609538)" />
<path
id="path192132"
style="display:inline;fill:#ffe6d5;stroke:none;stroke-width:0.175027px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m 207.97178,102.45092 c 0.30128,0.0797 0.56803,0.18902 0.7783,0.32123 l 0.007,-0.005 6.4892,4.50625 c -2.97146,-0.9552 -6.26636,-2.28703 -9.04849,-3.09697 -0.78671,-0.23183 -1.26854,-0.67204 -1.13601,-1.10358 0.16632,-0.5403 1.23269,-0.86325 2.38191,-0.72138 0.18188,0.0222 0.35952,0.0559 0.52837,0.0998 z"
sodipodi:nodetypes="ccccccsc" />
<circle
style="display:inline;fill:#000000;fill-rule:evenodd;stroke-width:0.52727;stroke-linecap:round;stroke-linejoin:round;paint-order:markers fill stroke"
id="circle192134"
cx="-249.09935"
cy="-36.855076"
r="5.0059543"
transform="matrix(-0.8516397,-0.52412768,-0.52412768,0.8516397,0,0)" />
<circle
style="display:inline;fill:#000000;fill-rule:evenodd;stroke-width:0.635153;stroke-linecap:round;stroke-linejoin:round;paint-order:markers fill stroke"
id="circle192136"
cx="-207.59985"
cy="-38.867096"
r="6.0302086"
transform="matrix(-0.8516397,-0.52412768,-0.52412768,0.8516397,0,0)" />
<ellipse
style="display:inline;fill:#000000;fill-rule:evenodd;stroke-width:0.262132;stroke-linecap:round;stroke-linejoin:round;paint-order:markers fill stroke"
id="ellipse192138"
cx="-161.13872"
cy="-11.350615"
transform="matrix(-0.9510046,-0.30917674,-0.4704672,0.88241748,0,0)"
rx="3.5619171"
ry="1.7388597" />
<ellipse
style="display:inline;fill:#000000;fill-rule:evenodd;stroke-width:0.262132;stroke-linecap:round;stroke-linejoin:round;paint-order:markers fill stroke"
id="ellipse192140"
cx="-166.05257"
cy="-5.8080592"
transform="matrix(-0.9510046,-0.30917674,-0.4704672,0.88241748,0,0)"
rx="3.5619171"
ry="1.7388597" />
<ellipse
style="display:inline;fill:#000000;fill-rule:evenodd;stroke-width:0.262132;stroke-linecap:round;stroke-linejoin:round;paint-order:markers fill stroke"
id="ellipse192142"
cx="-169.85072"
cy="1.2814305"
transform="matrix(-0.9510046,-0.30917674,-0.4704672,0.88241748,0,0)"
rx="3.5619171"
ry="1.7388597" />
<path
id="path192144"
style="display:inline;fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:0.264583"
d="m 209.35203,-14.636143 c 5.00796,-3.791664 11.88204,-0.335439 14.44675,4.6560052 4.18042,8.1359638 -0.99562,17.7095412 -8.92182,21.0484238 -5.40766,2.277957 12.47732,3.903345 7.29456,1.233567 4.15131,-4.5695392 6.19334,-10.9460503 5.00467,-17.0538771 -1.62354,-8.3423919 -9.8384,-15.3068339 -18.55817,-12.8938869 l 0.73401,3.009768"
sodipodi:nodetypes="csccscc" />
<ellipse
style="display:inline;fill:#ffffff;fill-rule:evenodd;stroke-width:0.114886;stroke-linecap:round;stroke-linejoin:round;paint-order:markers fill stroke"
id="ellipse192146"
cx="200.76089"
cy="-97.575531"
transform="matrix(0.92199027,0.38721305,-0.22029215,0.97543394,0,0)"
rx="1.5610961"
ry="0.76209718" />
<ellipse
style="display:inline;fill:#ffffff;fill-rule:evenodd;stroke-width:0.198981;stroke-linecap:round;stroke-linejoin:round;paint-order:markers fill stroke"
id="ellipse192148"
cx="228.58231"
cy="65.866119"
transform="matrix(0.99191138,0.12693233,0.04819858,0.99883777,0,0)"
rx="2.7038045"
ry="1.3199455" />
<ellipse
style="display:inline;fill:#ffffff;fill-rule:evenodd;stroke-width:0.231852;stroke-linecap:round;stroke-linejoin:round;paint-order:markers fill stroke"
id="ellipse192150"
cx="194.90251"
cy="45.50922"
transform="matrix(0.99191138,0.12693233,0.04819858,0.99883777,0,0)"
rx="3.1504724"
ry="1.5380001" />
<path
id="rect4149-7-8"
style="display:inline;fill:url(#linearGradient193628);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2.06952;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:6.20855, 6.20855;stroke-dashoffset:0;stroke-opacity:1"
d="m 153.71217,121.41692 c -3.13846,19.50138 -10.88274,37.95604 -19.58105,53.89396 l 15.79502,6.79201 c 5.41949,-11.95803 12.27426,-25.13034 16.27127,-37.81465 5.38382,2.21229 11.62978,6.37146 17.6368,9.55927 l 6.02435,-14.28822 -17.85196,-9.49388 z m 38.83099,20.82718 c -10.0642,29.38131 -15.96525,37.24608 -21.92888,47.43701 l 14.67482,5.19525 c 7.94822,-13.02178 15.91969,-26.01724 20.34429,-43.03485 -3.97864,-3.39277 -8.40668,-6.55939 -13.09023,-9.59741 z m -23.55675,7.09345 c -5.19393,15.49964 -10.61858,24.59807 -16.03518,33.91961 l 14.55422,5.45042 c 5.35213,-10.2176 10.79545,-20.32104 15.07271,-31.88372 z"
sodipodi:nodetypes="cccccccccccccccccc" />
<path
style="color:#000000;display:inline;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke-width:0.264583;stroke-linecap:round;stroke-linejoin:round;-inkscape-stroke:none;paint-order:markers fill stroke"
d="m 55.103496,-0.37351398 c -0.0058,0.002646 -0.03884,0.0132292 -0.03884,0.0132292 l 0.0026,0.004498 c 0.01323,-0.005556 0.0217,-0.008996 0.03839,-0.015875 z"
id="path192160" />
<path
style="color:#000000;display:inline;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke-width:0.264583;stroke-linecap:round;stroke-linejoin:round;-inkscape-stroke:none;paint-order:markers fill stroke"
d="m 56.176011,-0.51927293 c -2.6e-5,2.645e-5 -0.03453,0 -0.04048,0 0.01826,0 0.02664,0.00291 0.04075,0.004498 0,0 -0.0026,-0.004498 -0.0026,-0.004498 z"
id="path192162" />
<path
id="path192164"
style="color:#000000;display:inline;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke-width:0.264583;stroke-linecap:round;stroke-linejoin:round;-inkscape-stroke:none;paint-order:markers fill stroke"
d="m 141.52088,89.454273 c 1.24399,2.286846 1.40817,4.754933 0.63701,6.706499 -0.88132,2.230358 -4.82793,8.408588 -6.81029,9.839718 -3.85398,2.78226 -16.51061,-4.60883 -26.72615,3.7669 -10.889161,8.92824 -5.06544,11.20601 -11.208592,17.9183 -5.708439,6.23734 -13.76762,7.91345 -24.105579,6.34249 -3.144097,-0.57447 -3.913637,-1.72998 -7.201138,-2.14847 -0.05128,-0.006 -0.03051,-0.004 -0.06324,-0.008 -0.06802,0.005 -0.09578,0.0238 -0.177006,0.0243 -0.605922,-0.003 -1.630018,-0.69181 -1.856184,-1.29083 -0.226219,-0.59907 0.08662,-1.79303 0.539194,-2.19601 0.06117,-0.054 0.09464,-0.0574 0.149278,-0.0986 0.02275,-0.0233 0.0082,-0.009 0.04263,-0.0473 1.600411,-1.916 2.838397,-3.5434 2.55217,-5.43708 -1.77747,-8.35427 -2.718488,-14.28692 3.122692,-20.03914 6.799104,-6.695416 12.798346,-18.82672 26.692013,-19.534692 6.827602,-0.347874 15.644682,5.503148 20.103862,4.75906 4.45918,-0.744061 7.61622,-1.802738 8.97347,-2.78257 4.54904,-3.284088 11.18056,-1.817423 14.73611,3.258688 0.22222,0.317262 0.42201,0.639789 0.59967,0.966523 z"
sodipodi:nodetypes="sssssccccsccccsssssss" />
<path
style="color:#000000;display:inline;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke-width:0.264583;stroke-linecap:round;stroke-linejoin:round;-inkscape-stroke:none;paint-order:markers fill stroke"
d="m 147.39926,162.38196 c -0.003,0.006 -0.0116,0.0391 -0.0116,0.0391 l 0.003,0.003 c 0.003,-0.014 0.005,-0.0233 0.009,-0.0405 z"
id="path192166" />
<path
style="color:#000000;display:inline;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke-width:0.264583;stroke-linecap:round;stroke-linejoin:round;-inkscape-stroke:none;paint-order:markers fill stroke"
d="m 147.89721,161.42091 c 3e-5,0 -0.0206,0.0278 -0.0243,0.0324 0.0119,-0.0132 0.0177,-0.0204 0.0268,-0.031 0,0 -0.003,-0.003 -0.003,-0.003 z"
id="path192168" />
<path
id="path192170"
style="display:inline;fill:url(#linearGradient192172);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.63794;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;paint-order:markers fill stroke"
d="m 135.6125,89.31325 c 12.86171,5.425546 5.73019,13.57998 2.38784,15.99131 -3.34233,2.41131 -23.14705,-7.492047 -32.52166,0.1139 -10.020617,8.61928 -3.81775,16.47426 -16.123231,22.16542 -5.929234,2.42959 -12.589854,2.93936 -18.349463,0.54864 0.434816,-0.55896 1.415203,-3.29256 2.131642,-5.11903 -3.37685,-6.01707 -5.083492,-14.50247 -0.02998,-19.49841 5.997469,-5.929156 17.814051,-19.555965 23.282301,-16.768976 17.851571,9.09828 25.367721,4.357264 28.710071,1.945931 3.34235,-2.41136 6.67168,-0.998961 10.51248,0.621215 z m -64.606514,38.81927 c -0.02381,0.0302 -0.04318,0.0477 -0.05104,0.0362 -0.0079,-0.0119 0.01455,-0.0238 0.05104,-0.0362 z"
sodipodi:nodetypes="ssccccsssscsc" />
</g>
</g>
</g>
</svg>

After

Width:  |  Height:  |  Size: 25 KiB

View File

@ -0,0 +1,453 @@
import QtQuick 2.15
Rectangle {
id: root
// Max size of the scene - needed to load heavy assets only once and also set star field sizes
QtObject {
id: maxSceneSize
property int width: 6075
property int height: 6950
}
SystemPalette {
id: systemPalette
}
color: "#103e49"
Image {
id: comet
source: "comet.svg"
sourceSize {
width: 50
height: 50
}
opacity: 0
Timer {
id: cometShowupTimeout
running: true
interval: 6000
repeat: true
onTriggered: {
comet.x = Math.floor(Math.random() * root.width);
comet.y = Math.floor(Math.random() * root.height);
cometShowupAnimation.start();
}
}
ParallelAnimation {
id: cometShowupAnimation
loops: 1
SequentialAnimation {
NumberAnimation {
target: comet
property: "opacity"
duration: 200
from: 0
to: 1
}
NumberAnimation {
target: comet
property: "opacity"
duration: 200
from: 1
to: 0
}
}
NumberAnimation {
target: comet
properties: "x"
duration: 700
easing.type: Easing.OutQuad
to: comet.x - 100
}
NumberAnimation {
target: comet
properties: "y"
duration: 700
easing.type: Easing.OutQuad
to: comet.y + 100
}
}
}
Column {
id: starsClose
anchors {
left: parent.left
right: parent.right
top: parent.top
topMargin: -starsClose1.sourceSize.height
}
height: starsClose1.height + starsClose2.height
Image {
id: starsClose1
fillMode: Image.Tile
source: 'starsClose.svg'
height: maxSceneSize.height
width: maxSceneSize.width
}
Image {
id: starsClose2
fillMode: Image.Tile
source: 'starsClose.svg'
height: maxSceneSize.height
width: maxSceneSize.width
}
NumberAnimation {
id: starsCloseMovingAnimation
running: true
loops: -1
duration: 100000
target: starsClose
property: "anchors.topMargin"
from: -starsClose1.sourceSize.height
to: 0
}
}
Column {
id: starsFar
anchors {
left: parent.left
right: parent.right
top: parent.top
topMargin: -starsFar1.sourceSize.height
}
height: starsFar1.height + starsFar2.height
Image {
id: starsFar1
fillMode: Image.Tile
source: 'starsFar.svg'
height: maxSceneSize.height
width: maxSceneSize.width
}
Image {
id: starsFar2
fillMode: Image.Tile
source: 'starsFar.svg'
height: maxSceneSize.height
width: maxSceneSize.width
}
NumberAnimation {
id: starsFarMovingAnimation
running: true
loops: -1
duration: 200000
target: starsFar
property: "anchors.topMargin"
from: -starsFar1.sourceSize.height
to: 0
}
}
Image {
id: moon
source: "moon.svg"
sourceSize.height: height
sourceSize.width: width
x: -height
height: 70
width: height
Timer {
id: moonShowupTimeout
running: true
interval: 25000
repeat: true
onTriggered: {
moon.height = Math.floor(Math.random() * (45 - 200) + 200);
moon.x = Math.floor(Math.random() * root.width);
moonShowupAnimation.start();
}
}
NumberAnimation {
id: moonShowupAnimation
target: moon
properties: "y"
duration: 25000
from: -moon.height
to: maxSceneSize.height + moon.height
}
}
Image {
id: background
anchors.fill: parent
mipmap: true
source: systemPalette.window.hslLightness > 0.5 ? "background.svg" : "background_dark.svg"
}
Loader {
source: "sponsor/SponsoredBy.qml"
anchors {
bottom: parent.bottom
right: parent.right
margins: 10
}
}
Item {
id: smoke
anchors {
bottom: parent.bottom
right: parent.right
left: parent.left
}
height: smokeAsset.paintedHeight
Rectangle {
anchors {
bottom: parent.bottom
right: parent.right
left: parent.left
}
height: 57
color: "#eff0f1"
}
Image {
id: smokeAsset
anchors {
bottom: parent.bottom
horizontalCenter: parent.horizontalCenter
}
source: "smoke.svg"
sourceSize.width: width
sourceSize.height: height
}
}
Rocket {
id: rocket
property int lift: 0
anchors {
bottom: parent.bottom
bottomMargin: -(height - lift)
horizontalCenter: parent.horizontalCenter
horizontalCenterOffset: -235
}
width: 100
showSmoke: true
}
state: "onGround"
states: [
State {
name: "onGround"
PropertyChanges {
target: rocket
lift: 180
}
PropertyChanges {
target: background
anchors.topMargin: -root.height
anchors.bottomMargin: 20
opacity: 1
}
PropertyChanges {
target: starsCloseMovingAnimation
running: false
}
PropertyChanges {
target: starsFarMovingAnimation
running: false
}
PropertyChanges {
target: moonShowupTimeout
running: false
}
PropertyChanges {
target: cometShowupTimeout
running: false
}
},
State {
extend: "onGround"
name: "nearGround"
PropertyChanges {
target: rocket
lift: root.height / 2 + 150
}
PropertyChanges {
target: smoke
anchors.bottomMargin: -smoke.height / 2 + 100
}
PropertyChanges {
target: background
anchors.bottomMargin: -(root.height * 0.2)
anchors.topMargin: -root.height + root.height * 0.2
}
},
State {
extend: "nearGround"
name: "inAtmosphere"
PropertyChanges {
target: rocket
showSmoke: false
}
PropertyChanges {
target: rocket
lift: root.height / 2 + 100
}
PropertyChanges {
target: background
anchors.bottomMargin: -root.height * 0.9
anchors.topMargin: 0
}
},
State {
extend: "inAtmosphere"
name: "inSpace"
PropertyChanges {
target: background
anchors.bottomMargin: -(root.height * 2)
anchors.topMargin: root.height
}
PropertyChanges {
target: starsCloseMovingAnimation
running: true
}
PropertyChanges {
target: starsFarMovingAnimation
running: true
}
PropertyChanges {
target: moonShowupTimeout
running: true
}
PropertyChanges {
target: cometShowupTimeout
running: true
}
}
]
transitions: [
Transition {
id: transition1
from: "onGround"
to: "nearGround"
SequentialAnimation {
NumberAnimation {
target: rocket
property: "lift"
duration: 10000
easing.type: Easing.InQuad
}
ScriptAction {
script: root.state = "inAtmosphere"
}
}
NumberAnimation {
target: smoke
property: "bottomMargin"
duration: 10000
easing.type: Easing.InQuad
}
NumberAnimation {
target: background
properties: "anchors.topMargin,anchors.bottomMargin"
duration: 10000
easing.type: Easing.InQuad
}
},
Transition {
id: transition2
from: "nearGround"
to: "inAtmosphere"
NumberAnimation {
target: rocket
property: "lift"
duration: 5000
easing.type: Easing.OutQuad
}
SequentialAnimation {
NumberAnimation {
target: background
properties: "anchors.topMargin,anchors.bottomMargin"
duration: 5000
}
ScriptAction {
script: root.state = "inSpace"
}
}
},
Transition {
id: transition3
from: "inAtmosphere"
to: "inSpace"
NumberAnimation {
target: rocket
property: "lift"
duration: 3000
easing.type: Easing.OutQuad
}
NumberAnimation {
target: background
properties: "anchors.bottomMargin"
duration: 15000
from: -root.height
}
NumberAnimation {
target: background
properties: "anchors.topMargin"
duration: 15000
from: 0
}
}
]
// Animation objects don't bind properties - so we have to reset the animation when a window size changes. In our case it's only about height.
// Timeout is needed to ensure that properties already have needed values set.
Timer {
id: sizeChangeTimeout
interval: 1
onTriggered: {
switch (state) {
case "nearGround":
if (!transition1.running)
return;
state = "onGround";
state = "nearGround";
break;
case "inAtmosphere":
if (!transition2.running)
return;
state = "nearGround";
state = "inAtmosphere";
break;
case "inSpace":
if (!transition3.running)
return;
state = "inAtmosphere";
state = "inSpace";
}
}
}
onHeightChanged: {
sizeChangeTimeout.restart();
}
}

View File

@ -0,0 +1,58 @@
import QtQuick 2.15
Item {
property bool showSmoke: false
Item {
id: rocketNoSmoke
property bool rocketFrame: false
Timer {
interval: 200
running: !showSmoke
repeat: true
onTriggered: rocketNoSmoke.rocketFrame = !rocketNoSmoke.rocketFrame
}
width: 250
height: Math.min(rocket_a.paintedHeight, rocket_b.paintedHeight)
anchors.horizontalCenter: parent.horizontalCenter
anchors.top: parent.top
Image {
opacity: rocketNoSmoke.rocketFrame?1:0
width: parent.width
id: rocket_a
fillMode: Image.PreserveAspectFit
source: "rocket_a.svg"
}
Image {
opacity: rocketNoSmoke.rocketFrame?0:1
width: parent.width
id: rocket_b
fillMode: Image.PreserveAspectFit
source: "rocket_b.svg"
}
}
Image {
opacity: showSmoke?1:0
width: 250
anchors.top: parent.top
anchors.horizontalCenter: parent.horizontalCenter
id: rocketSmoke
fillMode: Image.PreserveAspectFit
source: "rocket_smoke.svg"
Behavior on opacity {
NumberAnimation{}
}
}
}

View File

@ -0,0 +1,8 @@
import QtQuick 2.15
QtObject {
required property string title
property string secondaryTitle
required property string body
property string footer
}

View File

@ -0,0 +1,74 @@
import QtQml 2.15
import QtQuick 2.15
Item {
id: root
function onActivate() {
timer.restart();
slider.reset();
artwork.state = "nearGround";
}
function onLeave() {
}
width: 800
height: 400
Timer {
id: timer
interval: 20000
running: false
repeat: true
onTriggered: slider.currentSlideIndex++
}
MouseArea {
anchors.fill: parent
onClicked: {
timer.restart();
slider.currentSlideIndex++;
}
}
Artwork {
id: artwork
anchors.fill: parent
}
Slider {
id: slider
height: 50
slides: [
Slide {
title: qsTr("Hello")
body: qsTr("Manjaro is simple and elegant yet fully customizable. Use as is or create something incredible? You decide.")
footer: qsTr("During the installation, this slideshow will provide a quick introduction.")
},
Slide {
title: qsTr("Pamac")
secondaryTitle: qsTr("Add/Remove Software")
body: qsTr("Accessible via command line or fast, beautiful graphical interface. Add or remove software with the greatest of ease.")
},
Slide {
title: qsTr("Control Panel")
body: qsTr("The control panel is a handy tool to install device drivers, download missing translations and language packages, it also helps in keeping your kernels up to date.")
},
Slide {
title: qsTr("Thank You")
body: qsTr("It's time to relax and prepare for new adventures.")
footer: qsTr("Check our forum and wiki if you have any questions or feedback.")
}
]
anchors {
centerIn: parent
horizontalCenterOffset: -100
verticalCenterOffset: -57
}
}
}

View File

@ -0,0 +1,186 @@
import QtQuick 2.15
Item {
property list<Slide> slides
property int currentSlideIndex: 0
property int _currentSlideIndex: 0
property int slidesSize: slides.length
property bool firstIteration: true
function reset() {
currentSlideIndex = 0;
firstIteration = true;
}
onCurrentSlideIndexChanged: {
if (currentSlideIndex >= slidesSize) {
firstIteration = false;
currentSlideIndex = 0;
}
transitionAnimation.start();
}
Column {
anchors.fill: parent
spacing: 10
Text {
id: titleText
font {
family: "Montserrat"
capitalization: Font.AllUppercase
weight: Font.DemiBold
pointSize: 18
}
color: "white"
text: slides[_currentSlideIndex].title
}
Text {
id: secondaryTitleText
font {
family: "Montserrat"
weight: Font.Light
pointSize: 12
}
color: "white"
text: slides[_currentSlideIndex].secondaryTitle ?? ""
}
Text {
id: bodyText
font {
family: "Montserrat"
pointSize: 12
}
width: 400
color: "white"
text: slides[_currentSlideIndex].body
wrapMode: Text.Wrap
}
Text {
id: footerText
font {
family: "Montserrat"
weight: Font.Light
pointSize: 12
}
width: 400
color: "white"
text: slides[_currentSlideIndex].footer ?? ""
wrapMode: Text.Wrap
}
}
SequentialAnimation {
id: transitionAnimation
property int duration: 700
ParallelAnimation {
OpacityAnimator {
target: titleText
from: 1.0
to: 0.0
duration: transitionAnimation.duration
}
OpacityAnimator {
target: secondaryTitleText
from: 1.0
to: 0.0
duration: transitionAnimation.duration
}
OpacityAnimator {
target: bodyText
from: 1.0
to: 0.0
duration: transitionAnimation.duration
}
OpacityAnimator {
target: footerText
from: 1.0
to: 0.0
duration: transitionAnimation.duration
}
XAnimator {
target: titleText
from: 0
to: -30
duration: transitionAnimation.duration
}
XAnimator {
target: secondaryTitleText
from: 0
to: -30
duration: transitionAnimation.duration
}
XAnimator {
target: bodyText
from: 0
to: -25
duration: transitionAnimation.duration
}
XAnimator {
target: footerText
from: 0
to: -25
duration: transitionAnimation.duration
}
}
ScriptAction {
script: _currentSlideIndex = currentSlideIndex
}
ParallelAnimation {
OpacityAnimator {
target: titleText
from: 0.0
to: 1.0
duration: transitionAnimation.duration
}
OpacityAnimator {
target: secondaryTitleText
from: 0.0
to: 1.0
duration: transitionAnimation.duration
}
OpacityAnimator {
target: bodyText
from: 0.0
to: 1.0
duration: transitionAnimation.duration
}
OpacityAnimator {
target: footerText
from: 0.0
to: 1.0
duration: transitionAnimation.duration
}
XAnimator {
target: titleText
from: 30
to: 0
duration: transitionAnimation.duration
}
XAnimator {
target: secondaryTitleText
from: 30
to: 0
duration: transitionAnimation.duration
}
XAnimator {
target: bodyText
from: 25
to: 0
duration: transitionAnimation.duration
}
XAnimator {
target: footerText
from: 25
to: 0
duration: transitionAnimation.duration
}
}
}
}

View File

@ -0,0 +1,119 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
width="800.00085"
height="880"
viewBox="0 0 800.00094 880.00004"
version="1.1"
id="svg8"
inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
sodipodi:docname="background.svg"
xml:space="preserve"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns="http://www.w3.org/2000/svg"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:dc="http://purl.org/dc/elements/1.1/"><defs
id="defs2"><linearGradient
inkscape:collect="always"
id="linearGradient895"><stop
style="stop-color:#1abc9c;stop-opacity:0;"
offset="0"
id="stop891" /><stop
style="stop-color:#1abc9c;stop-opacity:1;"
offset="1"
id="stop893" /></linearGradient><clipPath
clipPathUnits="userSpaceOnUse"
id="clipPath290923"><rect
style="opacity:0.7;fill:#2f6b5a;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2.70918;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke"
id="rect290925"
width="309.65643"
height="170.30928"
x="-358.01489"
y="775.27844" /></clipPath><clipPath
clipPathUnits="userSpaceOnUse"
id="clipPath292441"><rect
style="opacity:0.7;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4.18763;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke"
id="rect292443"
width="478.64374"
height="263.22327"
x="-510.89438"
y="765.67975" /></clipPath><linearGradient
inkscape:collect="always"
xlink:href="#linearGradient895"
id="linearGradient897"
x1="13.87441"
y1="170.36914"
x2="13.87441"
y2="781.91968"
gradientUnits="userSpaceOnUse" /></defs><sodipodi:namedview
id="base"
pagecolor="#525252"
bordercolor="#404040"
borderopacity="1"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:zoom="0.49497475"
inkscape:cx="355.5737"
inkscape:cy="307.08637"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="false"
inkscape:window-width="1914"
inkscape:window-height="1047"
inkscape:window-x="3"
inkscape:window-y="3"
inkscape:window-maximized="0"
inkscape:pagecheckerboard="0"
units="px"
fit-margin-top="0"
fit-margin-left="0"
fit-margin-right="0"
fit-margin-bottom="0"
inkscape:showpageshadow="0"
inkscape:deskcolor="#525252" /><metadata
id="metadata5"><rdf:RDF><cc:Work
rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><g
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(-13.87441,-170.36914)"><rect
style="display:inline;fill:url(#linearGradient897);fill-opacity:1;fill-rule:evenodd;stroke-width:0.58267"
id="rect250371"
width="800"
height="880"
x="13.87523"
y="170.36914"
inkscape:export-filename="/run/media/bogdan/WORK/Work2022/Manjaro2022/4Calamares/2022/slide5.png"
inkscape:export-xdpi="96"
inkscape:export-ydpi="96" /><path
id="path287238"
style="opacity:1;fill:#569e8f;fill-opacity:1;stroke:none;stroke-width:0.442273px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m 13.87523,730.29327 53.765199,-34.07878 64.588571,39.80441 259.69851,-14.76567 148.75299,-67.1822 129.87247,-4.50792 53.32883,11.68417 72.25841,48.3183 17.73503,-6.46425 V 1050.3691 H 13.87523 Z"
sodipodi:nodetypes="cccccccccccc"
inkscape:export-filename="/run/media/bogdan/WORK/Work2021/Manjaro2021/Wallpapers_renew/mountain.png"
inkscape:export-xdpi="95.990692"
inkscape:export-ydpi="95.990692" /><path
id="path287240"
style="opacity:1;fill:#428476;fill-opacity:1;stroke:none;stroke-width:0.278593px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m 318.15234,21.335938 -6.375,35.107421 33.32227,-27.544921 z m -33.61718,1.957031 -24.48243,51.285156 16.22071,0.0293 z M 247.70508,25.4375 223.89453,60.746094 246.9082,36.841797 Z m 105.75195,3.855469 2.95313,5.613281 0.0254,6.609375 4.00195,1.826172 20.45703,42.847656 21.73438,14.515627 -6.95703,-13.187502 -16.9336,-14.714844 -3.66797,-22.787109 1.08008,0.494141 -0.57227,0.0098 47.88477,42.738281 -19.80469,-30.201171 16.38672,7.474609 4.41992,7.376953 -5.55468,-2.492187 15.85546,25.253899 -0.34374,-6.144524 4.99023,8.328124 -12.11328,33.26757 15.24609,-28.03906 0.5332,-11.933587 18.375,3.630859 0.0117,-1.380859 -18.09179,-8.845704 0.008,-0.154296 8.73633,-5.046876 2.56054,-7.054687 -10.9375,4.042969 -72.25781,-48.31836 z m 49.17188,71.412111 6.95703,13.18554 14.77734,1.32813 z M 267.07422,40.679688 245.91211,54.544922 232.63867,76.619141 Z m 72.91797,3.222656 -13.32813,44.646484 24.69336,-7.742187 z m -624.75196,24.085937 7.6211,19.115235 -15.58203,-4.888672 -10.76368,26.503906 32.12696,-3.49414 -36.4375,49.88672 -0.92188,-0.16016 -22.82422,-1.66406 -6.98437,0.40625 v 268.44922 h 800 V 220.46094 l -62.03711,-22.61914 -64.5957,8.96484 -223.85157,-14.41797 -165.587886,-30.34961 -113.066404,-9.57422 -38.99805,-0.10351 -74.59375,7.36719 -25.00781,-4.34961 46.75781,-50.59571 39.33594,3.00977 z"
transform="translate(352.3998,628.22633)" /><path
id="path287242"
style="opacity:1;fill:#2f6b5a;fill-opacity:1;stroke:none;stroke-width:0.349527px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="M 813.87524,967.12639 665.97943,942.26861 601.38381,967.12639 463.3455,957.90524 381.43491,916.17674 268.36838,913.1349 229.37092,919.38449 86.448992,950.60632 54.605504,944.26915 H 31.781024 L 13.87523,946.15991 V 1050.3691 H 813.87524 Z"
sodipodi:nodetypes="cccccccccccccc"
inkscape:export-filename="/run/media/bogdan/WORK/Work2021/Manjaro2021/Wallpapers_renew/mountain.png"
inkscape:export-xdpi="95.990692"
inkscape:export-ydpi="95.990692" /><path
id="path287244"
style="opacity:1;fill:#bbebe1;fill-opacity:1;stroke:none;stroke-width:0.442273px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m 573.63768,655.20388 -17.83295,12.99664 -1.02684,-7.45301 -14.09739,-6.67648 16.81831,-7.59808 113.05416,-4.87076 38.9932,10.00736 14.33563,9.63773 -18.02455,-3.72859 2.95337,5.61347 0.0257,6.61008 -11.33663,-12.61828 -26.94668,-7.56085 -33.61726,1.95663 -13.00846,5.92247 -0.48663,-5.137 -23.33635,1.35822 -11.6817,6.28436 0.29872,-5.62183 z"
sodipodi:nodetypes="cccccccccccccccccccc"
inkscape:export-filename="/run/media/bogdan/WORK/Work2021/Manjaro2021/Wallpapers_renew/mountain.png"
inkscape:export-xdpi="95.990692"
inkscape:export-ydpi="95.990692" /></g></svg>

After

Width:  |  Height:  |  Size: 7.2 KiB

View File

@ -0,0 +1,119 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
width="800"
height="879.99994"
viewBox="0 0 800.00009 879.99998"
version="1.1"
id="svg8"
inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
sodipodi:docname="background_dark.svg"
xml:space="preserve"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns="http://www.w3.org/2000/svg"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:dc="http://purl.org/dc/elements/1.1/"><defs
id="defs2"><linearGradient
inkscape:collect="always"
id="linearGradient883"><stop
style="stop-color:#103e49;stop-opacity:1;"
offset="0"
id="stop879" /><stop
style="stop-color:#103e49;stop-opacity:0;"
offset="1"
id="stop881" /></linearGradient><clipPath
clipPathUnits="userSpaceOnUse"
id="clipPath290923"><rect
style="opacity:0.7;fill:#2f6b5a;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2.70918;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke"
id="rect290925"
width="309.65643"
height="170.30928"
x="-358.01489"
y="775.27844" /></clipPath><clipPath
clipPathUnits="userSpaceOnUse"
id="clipPath292441"><rect
style="opacity:0.7;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4.18763;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke"
id="rect292443"
width="478.64374"
height="263.22327"
x="-510.89438"
y="765.67975" /></clipPath><linearGradient
inkscape:collect="always"
xlink:href="#linearGradient883"
id="linearGradient885"
x1="20.85878"
y1="781.51343"
x2="20.85878"
y2="170.36917"
gradientUnits="userSpaceOnUse" /></defs><sodipodi:namedview
id="base"
pagecolor="#525252"
bordercolor="#404040"
borderopacity="1"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:zoom="0.35"
inkscape:cx="321.42857"
inkscape:cy="37.142857"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="false"
inkscape:window-width="955"
inkscape:window-height="1047"
inkscape:window-x="2881"
inkscape:window-y="3"
inkscape:window-maximized="0"
inkscape:pagecheckerboard="0"
units="px"
fit-margin-top="0"
fit-margin-left="0"
fit-margin-right="0"
fit-margin-bottom="0"
inkscape:showpageshadow="0"
inkscape:deskcolor="#525252" /><metadata
id="metadata5"><rdf:RDF><cc:Work
rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><g
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(-13.875305,-170.36917)"><rect
style="display:inline;fill:url(#linearGradient885);fill-opacity:1;fill-rule:evenodd;stroke-width:0.58267"
id="rect75224"
width="800"
height="879.99994"
x="13.875305"
y="170.36917"
inkscape:export-filename="/run/media/bogdan/WORK/Work2022/Manjaro2022/4Calamares/2022/slide1.png"
inkscape:export-xdpi="96"
inkscape:export-ydpi="96" /><path
id="path287238"
style="opacity:1;fill:#11696c;fill-opacity:1;stroke:none;stroke-width:0.442273px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m 13.87523,730.29327 53.765199,-34.07878 64.588571,39.80441 259.69851,-14.76567 148.75299,-67.1822 129.87247,-4.50792 53.32883,11.68417 72.25841,48.3183 17.73503,-6.46425 V 1050.3691 H 13.87523 Z"
sodipodi:nodetypes="cccccccccccc"
inkscape:export-filename="/run/media/bogdan/WORK/Work2021/Manjaro2021/Wallpapers_renew/mountain.png"
inkscape:export-xdpi="95.990692"
inkscape:export-ydpi="95.990692" /><path
id="path287240"
style="opacity:1;fill:#115148;fill-opacity:1;stroke:none;stroke-width:0.278593px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m 318.15234,21.335938 -6.375,35.107421 33.32227,-27.544921 z m -33.61718,1.957031 -24.48243,51.285156 16.22071,0.0293 z M 247.70508,25.4375 223.89453,60.746094 246.9082,36.841797 Z m 105.75195,3.855469 2.95313,5.613281 0.0254,6.609375 4.00195,1.826172 20.45703,42.847656 21.73438,14.515627 -6.95703,-13.187502 -16.9336,-14.714844 -3.66797,-22.787109 1.08008,0.494141 -0.57227,0.0098 47.88477,42.738281 -19.80469,-30.201171 16.38672,7.474609 4.41992,7.376953 -5.55468,-2.492187 15.85546,25.253899 -0.34374,-6.144524 4.99023,8.328124 -12.11328,33.26757 15.24609,-28.03906 0.5332,-11.933587 18.375,3.630859 0.0117,-1.380859 -18.09179,-8.845704 0.008,-0.154296 8.73633,-5.046876 2.56054,-7.054687 -10.9375,4.042969 -72.25781,-48.31836 z m 49.17188,71.412111 6.95703,13.18554 14.77734,1.32813 z M 267.07422,40.679688 245.91211,54.544922 232.63867,76.619141 Z m 72.91797,3.222656 -13.32813,44.646484 24.69336,-7.742187 z m -624.75196,24.085937 7.6211,19.115235 -15.58203,-4.888672 -10.76368,26.503906 32.12696,-3.49414 -36.4375,49.88672 -0.92188,-0.16016 -22.82422,-1.66406 -6.98437,0.40625 v 268.44922 h 800 V 220.46094 l -62.03711,-22.61914 -64.5957,8.96484 -223.85157,-14.41797 -165.587886,-30.34961 -113.066404,-9.57422 -38.99805,-0.10351 -74.59375,7.36719 -25.00781,-4.34961 46.75781,-50.59571 39.33594,3.00977 z"
transform="translate(352.3998,628.22633)" /><path
id="path287242"
style="opacity:1;fill:#0e4038;fill-opacity:1;stroke:none;stroke-width:0.349527px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="M 813.87524,967.12639 665.97943,942.26861 601.38381,967.12639 463.3455,957.90524 381.43491,916.17674 268.36838,913.1349 229.37092,919.38449 86.448992,950.60632 54.605504,944.26915 H 31.781024 L 13.87523,946.15991 V 1050.3691 H 813.87524 Z"
sodipodi:nodetypes="cccccccccccccc"
inkscape:export-filename="/run/media/bogdan/WORK/Work2021/Manjaro2021/Wallpapers_renew/mountain.png"
inkscape:export-xdpi="95.990692"
inkscape:export-ydpi="95.990692" /><path
id="path287244"
style="opacity:1;fill:#148f96;fill-opacity:1;stroke:none;stroke-width:0.442273px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m 573.63768,655.20388 -17.83295,12.99664 -1.02684,-7.45301 -14.09739,-6.67648 16.81831,-7.59808 113.05416,-4.87076 38.9932,10.00736 14.33563,9.63773 -18.02455,-3.72859 2.95337,5.61347 0.0257,6.61008 -11.33663,-12.61828 -26.94668,-7.56085 -33.61726,1.95663 -13.00846,5.92247 -0.48663,-5.137 -23.33635,1.35822 -11.6817,6.28436 0.29872,-5.62183 z"
sodipodi:nodetypes="cccccccccccccccccccc"
inkscape:export-filename="/run/media/bogdan/WORK/Work2021/Manjaro2021/Wallpapers_renew/mountain.png"
inkscape:export-xdpi="95.990692"
inkscape:export-ydpi="95.990692" /></g></svg>

After

Width:  |  Height:  |  Size: 7.2 KiB

View File

@ -0,0 +1,200 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
width="331.13705"
height="323.99829"
viewBox="0 0 331.13706 323.9983"
version="1.1"
id="svg8"
inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
sodipodi:docname="commet.svg"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns="http://www.w3.org/2000/svg"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:dc="http://purl.org/dc/elements/1.1/">
<defs
id="defs2" />
<sodipodi:namedview
id="base"
pagecolor="#525252"
bordercolor="#404040"
borderopacity="1"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:zoom="0.49497475"
inkscape:cx="364.66507"
inkscape:cy="177.78685"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="false"
inkscape:window-width="1295"
inkscape:window-height="1047"
inkscape:window-x="621"
inkscape:window-y="3"
inkscape:window-maximized="0"
inkscape:pagecheckerboard="0"
units="px"
fit-margin-top="0"
fit-margin-left="0"
fit-margin-right="0"
fit-margin-bottom="0"
inkscape:showpageshadow="0"
inkscape:deskcolor="#525252" />
<metadata
id="metadata5">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
</cc:Work>
</rdf:RDF>
</metadata>
<g
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(-431.57434,-620.85803)">
<path
d="m 628.10824,737.56939 a 14.553263,14.553263 0 1 1 -19.6346,-21.44806 l 17.4293,-15.07994 -1.3219,12.2555 27.2135,-16.78564 -16.2414,23.8439 8.8083,2.29153 z"
id="path97219"
style="display:inline;fill:#35e3c1;fill-opacity:1;stroke-width:0.327349" />
<path
d="M 539.9357,788.1585 A 14.553263,14.553263 0 1 1 520.301,766.71082 l 17.4293,-15.07956 -1.3218,12.25512 25.8219,-14.16643 -14.8499,21.22469 8.8083,2.29153 z"
id="path97221"
style="display:inline;fill:#35e3c1;fill-opacity:1;stroke-width:0.327349" />
<path
d="m 561.0519,870.18408 a 28.806974,28.806974 0 0 1 -39.5437,-41.9006 l 31.8363,-29.18476 -2.4443,12.22111 27.2629,-21.00889 -1.8803,14.61619 48.7985,-34.25688 -44.286,58.04258 18.0359,1.53487 z"
id="path97223"
style="display:inline;fill:#35e3c1;fill-opacity:1;stroke-width:0.327349" />
<circle
cx="541.28003"
cy="849.23401"
r="18.331522"
id="circle97227"
style="display:inline;fill:#569e8f;fill-opacity:1;stroke-width:0.327349" />
<path
d="m 558.8718,854.40266 a 18.292567,18.292567 0 0 1 -4.7564,7.91849 5.2375775,5.2375775 0 1 1 4.7564,-7.91849 z"
id="path97229"
style="display:inline;fill:#569e8f;fill-opacity:1;stroke-width:0.327349" />
<circle
cx="536.04248"
cy="851.85272"
r="5.2375774"
id="circle97231"
style="display:inline;fill:#428476;fill-opacity:1;stroke-width:0.327349" />
<path
d="m 558.8718,854.40266 a 18.292567,18.292567 0 0 1 -4.7564,7.91849 5.2375775,5.2375775 0 1 1 4.7564,-7.91849 z"
id="path97233"
style="display:inline;fill:#428476;fill-opacity:1;stroke-width:0.327349" />
<path
d="m 538.6613,849.23378 a 2.6187887,2.6187887 0 0 1 -1.8518,-4.4708 l 5.2376,-5.2373 a 2.6188562,2.6188562 0 0 1 3.7036,3.70356 l -5.2376,5.23767 a 2.6102776,2.6102776 0 0 1 -1.8518,0.76687 z"
id="path97235"
style="display:inline;fill:#95f9e2;fill-opacity:1;stroke-width:0.327349" />
<path
d="m 556.9928,854.47145 a 2.6187887,2.6187887 0 0 1 -1.8518,-4.47081 l 15.7127,-15.71263 a 2.6188562,2.6188562 0 1 1 3.7036,3.70356 l -15.7127,15.71263 a 2.6102776,2.6102776 0 0 1 -1.8518,0.76725 z"
id="path97237"
style="display:inline;fill:#95f9e2;fill-opacity:1;stroke-width:0.327349" />
<path
d="m 541.2801,836.13998 a 2.6187887,2.6187887 0 0 1 -1.8518,-4.4708 l 15.7127,-15.71263 a 2.6188562,2.6188562 0 1 1 3.7036,3.70356 l -15.7127,15.71263 a 2.6102776,2.6102776 0 0 1 -1.8518,0.76724 z"
id="path97239"
style="display:inline;fill:#95f9e2;fill-opacity:1;stroke-width:0.327349" />
<path
d="m 599.7609,823.91359 a 2.6187887,2.6187887 0 0 1 -1.8849,-4.43603 l 16.7217,-17.34955 a 2.6187887,2.6187887 0 1 1 3.7707,3.63364 l -16.7216,17.34917 a 2.6102776,2.6102776 0 0 1 -1.8859,0.80277 z"
id="path97241"
style="display:inline;fill:#569e8f;fill-opacity:1;stroke-width:0.327349" />
<path
d="m 587.3076,785.12619 a 2.6187887,2.6187887 0 0 1 -1.8165,-4.5052 l 9.5684,-9.21411 a 2.6189931,2.6189931 0 1 1 3.6336,3.77272 l -9.5687,9.21412 a 2.6096229,2.6096229 0 0 1 -1.8168,0.73247 z"
id="path97243"
style="display:inline;fill:#569e8f;fill-opacity:1;stroke-width:0.327349" />
<path
d="m 563.0982,830.90231 a 2.6187887,2.6187887 0 0 1 -1.8518,-4.4708 l 9.6073,-9.60718 a 2.6188562,2.6188562 0 1 1 3.7036,3.70356 l -9.607,9.60718 a 2.6115871,2.6115871 0 0 1 -1.8521,0.76724 z"
id="path97245"
style="display:inline;fill:#95f9e2;fill-opacity:1;stroke-width:0.327349" />
<circle
cx="529.64526"
cy="777.86823"
r="7.1980686"
id="circle97247"
style="display:inline;fill:#428476;fill-opacity:1;stroke-width:0.327349" />
<circle
cx="617.79968"
cy="727.27893"
r="6.3973732"
id="circle97249"
style="display:inline;fill:#569e8f;fill-opacity:1;stroke-width:0.327349" />
<path
d="m 646.03324,686.83717 a 2.6187887,2.6187887 0 0 1 -1.678,-4.63068 l 3.1426,-2.61883 a 2.6189565,2.6189565 0 0 1 3.3533,4.02368 l -3.1425,2.61884 a 2.6092956,2.6092956 0 0 1 -1.6754,0.60699 z"
id="path97251"
style="display:inline;fill:#569e8f;fill-opacity:1;stroke-width:0.327349" />
<path
d="m 664.8885,702.5498 a 2.6187887,2.6187887 0 0 1 -1.678,-4.63068 l 3.1425,-2.61845 a 2.6189565,2.6189565 0 0 1 3.3534,4.02368 l -3.1426,2.61884 a 2.6092956,2.6092956 0 0 1 -1.6753,0.60661 z"
id="path97253"
style="display:inline;fill:#35e3c1;fill-opacity:1;stroke-width:0.327349" />
<path
d="m 654.41334,713.02514 a 2.6187887,2.6187887 0 0 1 -1.678,-4.63068 l 3.1426,-2.61883 a 2.6189565,2.6189565 0 0 1 3.3533,4.02368 l -3.1425,2.61884 a 2.6092956,2.6092956 0 0 1 -1.6754,0.60699 z"
id="path97255"
style="display:inline;fill:#569e8f;fill-opacity:1;stroke-width:0.327349" />
<path
d="m 633.46304,697.31251 a 2.6187887,2.6187887 0 0 1 -1.6777,-4.63068 l 5.2376,-4.3646 a 2.6187887,2.6187887 0 1 1 3.3527,4.02331 l -5.2375,4.36498 a 2.6076589,2.6076589 0 0 1 -1.6751,0.60699 z"
id="path97257"
style="display:inline;fill:#35e3c1;fill-opacity:1;stroke-width:0.327349" />
<path
d="m 670.126,681.5995 a 2.6187887,2.6187887 0 0 1 -1.8518,-4.47042 l 2.6188,-2.61884 a 2.6188619,2.6188619 0 0 1 3.7037,3.70356 l -2.6188,2.61883 a 2.6102776,2.6102776 0 0 1 -1.8519,0.76687 z"
id="path97259"
style="display:inline;fill:#35e3c1;fill-opacity:1;stroke-width:0.327349" />
<path
d="m 638.1753,786.38288 a 2.6187887,2.6187887 0 0 1 -1.8519,-4.4708 l 2.6188,-2.61884 a 2.6189962,2.6189962 0 0 1 3.7037,3.70394 l -2.6188,2.61883 a 2.6102776,2.6102776 0 0 1 -1.8518,0.76687 z"
id="path97261"
style="display:inline;fill:#569e8f;fill-opacity:1;stroke-width:0.327349" />
<path
d="m 609.3686,765.43258 a 2.6187887,2.6187887 0 0 1 -1.8518,-4.4708 l 2.6187,-2.61884 a 2.6189962,2.6189962 0 1 1 3.7037,3.70394 l -2.6188,2.61883 a 2.6102776,2.6102776 0 0 1 -1.8518,0.76687 z"
id="path97263"
style="display:inline;fill:#569e8f;fill-opacity:1;stroke-width:0.327349" />
<path
d="m 659.65094,692.07484 a 2.6187887,2.6187887 0 0 1 -1.8518,-4.4708 l 5.23756,-5.2373 a 2.6188562,2.6188562 0 0 1 3.7036,3.70356 l -5.2376,5.23767 a 2.6102776,2.6102776 0 0 1 -1.85176,0.76687 z"
id="path97265"
style="display:inline;fill:#569e8f;fill-opacity:1;stroke-width:0.327349" />
<path
d="m 625.0813,799.47668 a 2.6187887,2.6187887 0 0 1 -1.8518,-4.47043 l 5.2376,-5.23767 a 2.6188562,2.6188562 0 0 1 3.7036,3.70356 l -5.2376,5.23767 a 2.6102776,2.6102776 0 0 1 -1.8518,0.76687 z"
id="path97267"
style="display:inline;fill:#35e3c1;fill-opacity:1;stroke-width:0.327349" />
<path
d="m 577.9431,754.95724 a 2.6187887,2.6187887 0 0 1 -1.8518,-4.47042 l 2.6188,-2.61884 a 2.6188562,2.6188562 0 0 1 3.7036,3.70356 l -2.6188,2.61884 a 2.6102776,2.6102776 0 0 1 -1.8518,0.76686 z"
id="path97269"
style="display:inline;fill:#569e8f;fill-opacity:1;stroke-width:0.327349" />
<path
d="m 564.8492,768.05142 a 2.6187887,2.6187887 0 0 1 -1.8518,-4.47081 l 5.2375,-5.23767 a 2.6189609,2.6189609 0 1 1 3.7036,3.70394 l -5.2375,5.23729 a 2.6102776,2.6102776 0 0 1 -1.8518,0.76725 z"
id="path97271"
style="display:inline;fill:#569e8f;fill-opacity:1;stroke-width:0.327349" />
<path
d="m 582.309,734.00694 a 2.6187887,2.6187887 0 0 1 -1.7055,-4.60686 l 6.1106,-5.23767 a 2.6187887,2.6187887 0 1 1 3.4084,3.97644 l -6.1107,5.23767 a 2.6079862,2.6079862 0 0 1 -1.7028,0.63042 z"
id="path97273"
style="display:inline;fill:#569e8f;fill-opacity:1;stroke-width:0.327349" />
<path
d="m 570.0868,744.48228 a 2.6187887,2.6187887 0 0 1 -1.7056,-4.60724 l 5.2376,-4.4897 a 2.6193578,2.6193578 0 0 1 3.4097,3.97719 l -5.2376,4.48933 a 2.6079862,2.6079862 0 0 1 -1.7041,0.63042 z"
id="path97275"
style="display:inline;fill:#35e3c1;fill-opacity:1;stroke-width:0.327349" />
<path
d="m 555.8713,736.62578 a 2.6187887,2.6187887 0 0 1 -1.7251,-4.58986 l 8.9785,-7.85613 a 2.618876,2.618876 0 1 1 3.449,3.94167 l -8.9789,7.85651 a 2.6096229,2.6096229 0 0 1 -1.7235,0.64781 z"
id="path97277"
style="display:inline;fill:#569e8f;fill-opacity:1;stroke-width:0.327349" />
<path
d="m 543.8989,747.10112 a 2.6187887,2.6187887 0 0 1 -1.7255,-4.58986 l 5.9862,-5.23767 a 2.618807,2.618807 0 0 1 3.4486,3.94205 l -5.9859,5.23767 a 2.6079862,2.6079862 0 0 1 -1.7234,0.64781 z"
id="path97279"
style="display:inline;fill:#569e8f;fill-opacity:1;stroke-width:0.327349" />
<path
d="m 647.4873,752.33841 a 2.6187887,2.6187887 0 0 1 -1.7526,-4.56492 l 11.6389,-10.47533 a 2.6187887,2.6187887 0 1 1 3.5026,3.89291 l -11.6392,10.47496 a 2.6083136,2.6083136 0 0 1 -1.7497,0.67238 z"
id="path97281"
style="display:inline;fill:#35e3c1;fill-opacity:1;stroke-width:0.327349" />
<path
d="m 632.9377,765.43258 a 2.6187887,2.6187887 0 0 1 -1.753,-4.56529 l 5.8196,-5.23767 a 2.6187887,2.6187887 0 1 1 3.5027,3.89291 l -5.8193,5.23767 a 2.6096229,2.6096229 0 0 1 -1.75,0.67238 z"
id="path97283"
style="display:inline;fill:#569e8f;fill-opacity:1;stroke-width:0.327349" />
</g>
</svg>

After

Width:  |  Height:  |  Size: 11 KiB

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 32 KiB

View File

@ -0,0 +1,249 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
width="50.609062"
height="246.19336"
viewBox="0 0 50.609068 246.19337"
version="1.1"
id="svg8"
inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
sodipodi:docname="rocket_smoke2.svg"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns="http://www.w3.org/2000/svg"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:dc="http://purl.org/dc/elements/1.1/">
<defs
id="defs2">
<linearGradient
inkscape:collect="always"
id="linearGradient939">
<stop
style="stop-color:#eff0f1;stop-opacity:1;"
offset="0"
id="stop935" />
<stop
style="stop-color:#eff0f1;stop-opacity:0;"
offset="1"
id="stop937" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient939"
id="linearGradient941"
x1="188.87804"
y1="716.58759"
x2="188.87804"
y2="855.77551"
gradientUnits="userSpaceOnUse" />
</defs>
<sodipodi:namedview
id="base"
pagecolor="#525252"
bordercolor="#404040"
borderopacity="1"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:zoom="0.49497475"
inkscape:cx="374.76659"
inkscape:cy="422.24376"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="false"
inkscape:window-width="1914"
inkscape:window-height="1047"
inkscape:window-x="533"
inkscape:window-y="183"
inkscape:window-maximized="0"
inkscape:pagecheckerboard="0"
units="px"
fit-margin-top="0"
fit-margin-left="0"
fit-margin-right="0"
fit-margin-bottom="0"
height="2160px"
inkscape:showpageshadow="2"
inkscape:deskcolor="#525252" />
<metadata
id="metadata5">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
</cc:Work>
</rdf:RDF>
</metadata>
<g
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(-149.54261,-610.36914)">
<path
id="path250403"
style="display:inline;fill:url(#linearGradient941);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.46489;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;paint-order:markers fill stroke"
d="m 174.05576,714.57812 c -7.95027,0 -12.70931,39.06501 -15.53515,87.92774 l 6.625,-11.61328 5.03515,65.66992 10.09571,-79.48828 8.60156,12.38086 C 185.96244,746.78153 181.304,714.5918 174.05576,714.5918 Z" />
<g
id="g250475"
transform="matrix(-0.13168343,0,0,0.13168343,404.83556,757.91908)"
style="display:inline">
<path
style="fill:#1a1c1b;fill-opacity:1"
d="m 1846.0893,-550.96782 c 0.078,3.94424 0.099,7.8998 0.111,11.86596 -0.011,6.81722 -0.1209,13.64504 -0.3642,20.42902 12.9267,17.16926 -24.5401,147.31085 -24.5401,147.31085 -2.011,6.38659 -4.1224,12.6954 -6.3647,18.91581 -0.1881,0.54165 -0.3974,1.06066 -0.5854,1.60231 26.5774,21.98515 55.6478,30.97769 71.2212,110.31141 0.3981,0.26516 1.4587,0.79549 1.4587,0.79549 1.3478,0.64064 2.8504,0.9949 4.4746,1.00551 4.8168,0 8.8721,-3.21521 10.1866,-7.62402 0,0 0.21,-0.78419 0.2319,-0.93904 5.1272,-20.55065 7.8892,-112.52112 7.8885,-135.23693 0,-68.19196 -24.8817,-128.9593 -63.7181,-168.43637 z"
id="path250405"
sodipodi:nodetypes="ccccccccccccc" />
<path
id="path250409"
style="opacity:1;fill:#eff0f1;fill-opacity:1"
d="m 1752.772,-1120.4892 c -44.0463,47.7284 -104.1176,101.2739 -136.0025,150.51654 -34.0677,49.69728 -62.4062,118.71236 -62.4062,210.93946 0,56.67085 35.0815,153.37542 65.9492,250.58593 -20.7749,35.77189 -33.0703,80.0034 -33.0703,127.91407 -7e-4,22.71581 2.7615,114.68567 7.8887,135.23632 0.022,0.15485 0.2304,0.93946 0.2304,0.93946 1.3145,4.40881 5.3707,7.625 10.1875,7.625 1.6242,-0.0106 8.9132,-0.89646 10.261,-1.5371 0,0 1.0609,-0.52976 1.459,-0.79492 11.9395,-60.82187 26.0274,-79.75628 46.6277,-95.44142 3.8365,17.81576 19.7188,30.88477 38.1797,30.88477 h 38.2011 z"
sodipodi:nodetypes="ccsccccccccscc" />
<g
id="g250417"
transform="rotate(-45,1722.222,787.87678)">
<path
d="m 2410.4087,18.99406 a 88.000921,88.000921 0 0 1 127.9237,120.88083 l -91.9962,94.5719 5.3193,-37.69998 -79.4767,68.83767 3.1807,-44.90544 -142.8421,113.0054 124.9235,-184.75996 -55.275,-1.52884 z"
id="path250411"
style="fill:#fbb540" />
<path
d="m 2443.6657,10.65886 a 69.979282,69.979282 0 0 1 101.7263,96.12574 l -73.1564,75.2046 4.23,-29.97943 -63.2008,54.74045 2.5294,-35.70929 -113.5896,89.86312 99.3405,-146.92312 -43.9553,-1.21575 z"
id="path250413"
style="fill:#ffcc00;fill-opacity:1;stroke-width:0.795211" />
<path
style="fill:#ffdd55;stroke-width:0.658127"
d="m 2561.492,69.78156 c -1.5795,3.02738 -3.4222,5.98901 -5.3967,8.75311 -2.7641,3.88293 -5.7915,7.43682 -9.1479,10.793271 -15.466,15.465979 -59.3968,40.233089 -81.2138,39.873479 -0.06,-4.49525 0.3595,-8.93066 1.0188,-13.18616 -11.5078,6.59304 -24.8737,10.30915 -39.3184,10.06941 -0.1798,-14.44474 3.5363,-27.810589 10.0693,-39.31853 -4.2555,0.6593 -8.6908,1.07891 -13.186,0.95903 -0.3596,-26.4321 29.8342,-74.01598 51.5523,-89.482 2.7642,-1.97434 5.7258,-3.81711 8.7532,-5.39662 -0.066,0.3291 -0.1317,0.72391 -0.1975,1.05302 7.5027,0.98717 14.8737,2.96156 21.9815,5.92313043 4.6727,1.90858997 9.1479,4.21198997 13.4916,6.97615997 5.4624,3.4222296 10.5958,7.5025996 15.3343,12.2411296 4.7385,4.73854 8.7531,9.87194 12.1754,15.33436 2.7641,4.34367 5.1334,8.81892 7.0419,13.49158 2.9616,7.10779 4.936,14.4788 5.9231,21.98144 0.4607,0.0658 0.7898,3e-5 1.1189,-0.0658 z"
id="path250415"
sodipodi:nodetypes="ccsccccccccccscccc" />
</g>
<path
style="fill:#1a1c1b;fill-opacity:1"
d="m 1662.96,-550.96924 c -0.078,3.94424 -0.099,7.8998 -0.111,11.86596 0.011,6.81722 0.1209,13.64504 0.3642,20.42902 -12.9267,17.16926 24.5401,147.31085 24.5401,147.31085 2.011,6.38659 4.1224,12.6954 6.3647,18.91581 0.1881,0.54165 0.3974,1.06066 0.5854,1.60231 -26.5774,21.98515 -55.6478,30.97769 -71.2212,110.31141 -0.3981,0.26516 -1.4587,0.79549 -1.4587,0.79549 -1.3478,0.64064 -2.8504,0.9949 -4.4746,1.00551 -4.8168,0 -8.8721,-3.21521 -10.1866,-7.62402 0,0 -0.21,-0.78419 -0.2319,-0.93904 -5.1272,-20.55065 -7.8892,-112.52112 -7.8885,-135.23693 0,-68.19196 24.8817,-128.9593 63.7181,-168.43637 z"
id="path250419"
sodipodi:nodetypes="ccccccccccccc" />
<path
style="fill:#ffdd55;stroke-width:0.658127"
d="m 1807.3005,-314.23094 c 1.0238,3.25755 1.815,6.65473 2.3734,10.00536 0.7911,4.7002 1.1634,9.35386 1.1634,14.10059 0,21.8722 -8.5162,43.69785 -25.7347,60.35795 -3.5368,-3.4437 -6.6548,-7.21317 -9.447,-11.02916 -3.816,14.05404 -11.3084,27.31697 -22.7098,38.34614 -11.3549,-11.07571 -18.8473,-24.33863 -22.7099,-38.34614 -2.7922,3.81599 -5.9101,7.58546 -9.4934,10.98263 -20.8019,-20.24342 -28.9923,-48.16538 -24.5714,-74.45854 0.5585,-3.35064 1.3496,-6.74781 2.3734,-10.00537 0.1862,0.27922 0.4188,0.60497 0.605,0.8842 6.0032,-4.60713 12.6114,-8.42312 19.7315,-11.35494 4.6537,-1.95454 9.4469,-3.49024 14.4729,-4.60711 6.2824,-1.44264 12.7975,-2.18723 19.4988,-2.18723 6.7013,0 13.1699,0.79113 19.4523,2.23376 5.026,1.11688 9.8658,2.60604 14.5194,4.56058 7.1201,2.93182 13.7283,6.74781 19.7315,11.35494 0.3723,-0.27923 0.5585,-0.55845 0.7446,-0.83766 z"
id="path250421" />
<path
style="fill:#ffe6d5;fill-opacity:1;stroke-width:0.658127"
d="m 1786.964,-324.70168 c 6.0498,10.4242 9.3074,22.24449 9.3074,34.53015 0,13.49561 -3.9091,26.43278 -11.1223,37.55502 l -15.5898,-21.26722 -8.0042,29.22498 c -1.815,6.84088 -4.7468,13.30947 -8.6093,19.31269 -3.816,-5.95669 -6.7013,-12.47181 -8.6093,-19.31269 l -8.0043,-29.22498 -15.5897,21.26722 c -7.2132,-11.12224 -11.1223,-24.05941 -11.1223,-37.55502 0,-12.28566 3.2576,-24.10595 9.3073,-34.53015 4.6537,-1.95453 9.447,-3.49024 14.4729,-4.60712 6.2825,-1.44263 12.7976,-2.18722 19.4989,-2.18722 6.7012,0 13.1698,0.79113 19.4522,2.23376 5.1191,1.11687 9.9589,2.60605 14.6125,4.56058 z"
id="path250423" />
<path
style="fill:#6b9b89;fill-opacity:1;stroke-width:1.22212"
d="m 1757.8035,-949.18846 c -3.0932,-1.86129 -6.9698,-1.86129 -10.063,0 -4.1821,2.51146 -111.3675,56.64763 -111.3675,198.5711 0,57.30534 22.0097,279.07118 39.4628,412.9313 2.5298,19.42073 19.191,34.06662 38.7352,34.06662 h 76.4021 c 19.5441,0 36.2053,-14.64589 38.7351,-34.06662 17.4531,-133.86012 39.4628,-355.62596 39.4628,-412.9313 0,-141.92347 -107.1854,-196.06086 -111.3675,-198.5711 z"
id="path250425"
sodipodi:nodetypes="ccscsscsc" />
<path
id="path250427"
style="opacity:0.2;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke-width:7.55906;stroke-linecap:round;stroke-linejoin:round;paint-order:stroke markers fill"
d="m 1752.7723,-976.92188 v 673.30274 h 38.2012 c 19.5441,0 36.2045,-14.64568 38.7343,-34.06641 17.4531,-133.86012 39.4629,-355.6263 39.4629,-412.93164 0,-57.74221 -17.7429,-100.95157 -39.0722,-132.0664 -12.283,-19.09437 -26.1497,-37.37853 -41.5723,-54.51368 z" />
<path
style="fill:#53dcff;fill-opacity:1;stroke-width:0.802037"
d="m 1779.5567,-616.10815 c -6.4509,6.45104 -15.0287,9.99501 -24.1384,9.99558 -9.1183,-0.009 -17.6966,-3.55362 -24.1476,-10.00465 -6.4511,-6.45105 -9.9956,-15.02938 -10.0047,-24.14761 0,-9.10916 3.5621,-17.70509 9.9956,-24.13855 6.451,-6.45104 15.0288,-9.995 24.1561,-10.01315 18.8314,0.009 34.1523,15.32938 34.1523,34.15226 -0.018,9.12675 -3.5621,17.70507 -9.9956,24.13854 -0.018,0.0175 -0.018,0.0175 -0.018,0.0175 z"
id="path250429" />
<g
id="g250435"
transform="matrix(1.2221209,0,0,1.2221209,1439.9078,-817.55053)"
style="fill:#24282c;fill-opacity:1">
<g
id="g250433"
style="fill:#24282c;fill-opacity:1">
<path
style="fill:#24282c;fill-opacity:1"
d="m 256.001,451.35877 c -4.422,0 -8,-3.582 -8,-8 V 249.57205 c 0,-4.418 3.578,-8 8,-8 4.422,0 8,3.582 8,8 v 193.78672 c 0,4.418 -3.578,8 -8,8 z"
id="path250431"
sodipodi:nodetypes="sssssss" />
</g>
</g>
<path
style="opacity:0.2;fill:#000000;fill-opacity:1;stroke-width:0.802035"
d="m 1762.1431,-674.93939 c -11.4043,0.009 -22.1359,4.44852 -30.1994,12.5119 -8.0463,8.04637 -12.4852,18.77693 -12.4943,30.18182 0.011,11.38673 4.4394,22.12695 12.4943,30.18183 8.064,8.06394 18.7951,12.48638 30.1909,12.5034 11.4038,-0.009 22.127,-4.45761 30.1728,-12.5034 8.0639,-8.06396 12.5124,-18.78603 12.521,-30.19033 5e-4,-23.53626 -19.1485,-42.68522 -42.6853,-42.68522 z m 25.6011,42.68522 c -0.011,7.07998 -2.8622,13.47772 -7.5059,18.12133 -4.6254,4.62548 -11.0413,7.49683 -18.1031,7.48775 -14.1429,0 -25.6097,-11.46669 -25.6097,-25.60966 -0.011,-7.0624 2.8709,-13.46921 7.4962,-18.09469 4.6437,-4.64361 11.0323,-7.50589 18.1129,-7.5144 14.1424,5.7e-4 25.6091,11.46727 25.6096,25.60967 z"
id="path250437" />
<path
style="fill:#e6e6e6;fill-opacity:1;stroke-width:0.802035"
d="m 1755.4268,-682.94948 c -11.4044,0.009 -22.1361,4.44853 -30.1994,12.51191 -8.0464,8.04637 -12.4853,18.77693 -12.4944,30.18182 0.011,11.38673 4.4395,22.12695 12.4944,30.18182 8.0639,8.06395 18.795,12.48639 30.1909,12.5034 11.4037,-0.009 22.1269,-4.4576 30.1727,-12.5034 8.0639,-8.06395 12.5125,-18.78602 12.521,-30.19032 6e-4,-23.53626 -19.1484,-42.68523 -42.6852,-42.68523 z m 25.6011,42.68523 c -0.011,7.07998 -2.8623,13.47771 -7.5059,18.12133 -4.6255,4.62548 -11.0414,7.49683 -18.1032,7.48775 -14.143,0 -25.6096,-11.46669 -25.6096,-25.60966 -0.011,-7.06241 2.8707,-13.46921 7.4962,-18.09469 4.6436,-4.64361 11.0323,-7.50589 18.1129,-7.5144 14.1424,5.7e-4 25.6091,11.46727 25.6096,25.60967 z"
id="path250439" />
<path
style="fill:#53dcff;fill-opacity:1;stroke-width:1.38175"
d="m 1795.5329,-776.35953 c -11.454,10.78389 -26.6678,16.72333 -42.8584,16.70911 -16.1745,9.4e-4 -31.4216,-5.93944 -42.8604,-16.70911 -11.4539,-10.78389 -17.7625,-25.1381 -17.7776,-40.38154 0,-15.22732 6.2934,-29.5673 17.7473,-40.35119 11.455,-10.78485 26.685,-16.7091 42.8907,-16.73946 33.4345,0.015 60.6379,25.62729 60.6379,57.09065 -0.016,15.27284 -6.3246,29.59669 -17.7795,40.38154 z"
id="path250441" />
<path
style="opacity:0.2;fill:#000000;fill-opacity:1;stroke-width:1.38175"
d="m 1706.6505,-853.77411 c -14.3177,13.48011 -22.1839,31.37331 -22.201,50.43924 -0.016,19.06307 7.8824,36.98851 22.2001,50.46863 14.3025,13.46588 33.3235,20.8871 53.5893,20.8871 20.2496,-0.015 39.2717,-7.40701 53.5893,-20.8871 14.3187,-13.48106 22.2011,-31.41976 22.2171,-50.48476 0,-39.34342 -34.0013,-71.35571 -75.7893,-71.35571 -20.2496,0.015 -39.2868,7.45156 -53.6055,20.9326 z m 110.8518,50.42311 c 0,14.92369 -6.4012,28.37408 -16.7842,38.14968 -10.3424,9.7374 -24.6678,15.80116 -40.4783,15.76298 -31.6258,0 -57.2636,-24.13816 -57.2625,-53.91266 -0.02,-14.86874 6.419,-28.35496 16.7615,-38.09234 10.383,-9.77562 24.6691,-15.80238 40.501,-15.8203 31.622,-9.4e-4 57.2613,24.13812 57.2625,53.91264 z"
id="path250443"
sodipodi:nodetypes="scscsccscsccscc" />
<path
style="fill:#f2f2f2;fill-opacity:1;stroke-width:1.45856"
d="m 1696.0983,-869.96743 c -15.1136,14.22941 -23.417,33.11723 -23.4351,53.24295 -0.017,20.1227 8.3205,39.04455 23.4341,53.27397 15.0976,14.21439 35.176,22.04812 56.5681,22.04812 21.3752,-0.0158 41.4547,-7.81872 56.5682,-22.04812 15.1146,-14.23042 23.4351,-33.16625 23.4522,-53.29099 0,-41.53037 -35.8914,-75.32209 -80.0022,-75.32209 -21.3753,0.0158 -41.4707,7.86577 -56.5853,22.09616 z m 115.3426,53.22593 c 0,15.31768 -6.5704,29.12317 -17.2276,39.15686 -10.6155,9.99448 -25.319,16.21833 -41.5468,16.17914 -32.4607,0 -58.7756,-24.77541 -58.7742,-55.336 -0.02,-15.26129 6.5885,-29.10357 17.2039,-39.09802 10.6571,-10.0337 25.3203,-16.21958 41.5703,-16.23795 32.4569,-9.4e-4 58.7729,24.77537 58.7744,55.33597 z"
id="path250445"
sodipodi:nodetypes="scscsccscsccscc" />
<path
style="fill:#f2705b;fill-opacity:1;stroke-width:1.10803"
d="m 1837.2865,-871.1305 h -169.0289 c 13.9742,-23.28887 30.1784,-45.42157 48.7612,-66.06774 l 35.7532,-39.72324 35.7533,39.72324 c 18.5084,20.56359 34.7869,42.77887 48.7612,66.06774 z"
id="path250447" />
<path
style="fill:#ffe6d5;fill-opacity:1;stroke-width:0.658127"
d="m 1786.964,-324.70168 c 6.0498,10.4242 9.3074,22.24449 9.3074,34.53015 0,13.49561 -3.9091,26.43278 -11.1223,37.55502 l -15.5898,-21.26722 -8.0042,29.22498 c -1.815,6.84088 -4.7468,13.30947 -8.6093,19.31269 -3.816,-5.95669 -6.7013,-12.47181 -8.6093,-19.31269 l -8.0043,-29.22498 -15.5897,21.26722 c -7.2132,-11.12224 -11.1223,-24.05941 -11.1223,-37.55502 0,-12.28566 3.2576,-24.10595 9.3073,-34.53015 4.6537,-1.95453 9.447,-3.49024 14.4729,-4.60712 6.2825,-1.44263 12.7976,-2.18722 19.4989,-2.18722 6.7012,0 13.1698,0.79113 19.4522,2.23376 5.1191,1.11687 9.9589,2.60605 14.6125,4.56058 z"
id="path250449" />
<path
style="fill:#454948;fill-opacity:1;stroke-width:1.22212"
d="m 1760.8084,-1076.1934 c -4.9405,-2.9729 -11.1323,-2.9729 -16.0728,0 -6.6798,4.0113 -177.8786,90.4788 -177.8786,317.16201 0,91.52932 91.5257,287.48521 108.9788,421.34533 2.5298,19.42073 19.191,34.06662 38.7352,34.06662 h 76.4021 c 19.5441,0 36.2053,-14.64589 38.7351,-34.06662 17.4531,-133.86012 108.9788,-329.81601 108.9788,-421.34533 0,-226.68321 -171.1988,-313.15261 -177.8786,-317.16201 z"
id="path250451"
sodipodi:nodetypes="ccscsscsc" />
<path
id="path250453"
style="opacity:0.2;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke-width:7.55906;stroke-linecap:round;stroke-linejoin:round;paint-order:stroke markers fill"
d="m 1752.7725,-1120.4898 -2e-4,816.87066 h 38.2012 c 19.5441,0 36.2045,-14.64568 38.7343,-34.06641 17.4531,-133.86012 108.9787,-329.81625 108.9787,-421.34557 0,-92.2271 -28.3393,-161.24201 -62.407,-210.93929 -19.6186,-30.49789 -41.767,-59.70159 -66.4001,-87.07039 z"
sodipodi:nodetypes="ccscscsc" />
<path
style="fill:#53dcff;fill-opacity:1;stroke-width:0.802037"
d="m 1779.5567,-616.10815 c -6.4509,6.45104 -15.0287,9.99501 -24.1384,9.99558 -9.1183,-0.009 -17.6966,-3.55362 -24.1476,-10.00465 -6.4511,-6.45105 -9.9956,-15.02938 -10.0047,-24.14761 0,-9.10916 3.5621,-17.70509 9.9956,-24.13855 6.451,-6.45104 15.0288,-9.995 24.1561,-10.01315 18.8314,0.009 34.1523,15.32938 34.1523,34.15226 -0.018,9.12675 -3.5621,17.70507 -9.9956,24.13854 -0.018,0.0175 -0.018,0.0175 -0.018,0.0175 z"
id="path250455" />
<g
id="g250461"
transform="matrix(1.2221209,0,0,1.2221209,1439.9078,-817.55053)"
style="fill:#1a1c1b;fill-opacity:1">
<g
id="g250459"
style="fill:#1a1c1b;fill-opacity:1">
<path
style="fill:#1a1c1b;fill-opacity:1"
d="m 256.001,451.35877 c -4.422,0 -8,-3.582 -8,-8 V 249.57205 c 0,-4.418 3.578,-8 8,-8 4.422,0 8,3.582 8,8 v 193.78672 c 0,4.418 -3.578,8 -8,8 z"
id="path250457"
sodipodi:nodetypes="sssssss" />
</g>
</g>
<path
style="opacity:0.2;fill:#000000;fill-opacity:1;stroke-width:0.802035"
d="m 1762.1431,-674.93939 c -11.4043,0.009 -22.1359,4.44852 -30.1994,12.5119 -8.0463,8.04637 -12.4852,18.77693 -12.4943,30.18182 0.011,11.38673 4.4394,22.12695 12.4943,30.18183 8.064,8.06394 18.7951,12.48638 30.1909,12.5034 11.4038,-0.009 22.127,-4.45761 30.1728,-12.5034 8.0639,-8.06396 12.5124,-18.78603 12.521,-30.19033 5e-4,-23.53626 -19.1485,-42.68522 -42.6853,-42.68522 z m 25.6011,42.68522 c -0.011,7.07998 -2.8622,13.47772 -7.5059,18.12133 -4.6254,4.62548 -11.0413,7.49683 -18.1031,7.48775 -14.1429,0 -25.6097,-11.46669 -25.6097,-25.60966 -0.011,-7.0624 2.8709,-13.46921 7.4962,-18.09469 4.6437,-4.64361 11.0323,-7.50589 18.1129,-7.5144 14.1424,5.7e-4 25.6091,11.46727 25.6096,25.60967 z"
id="path250463" />
<path
style="fill:#e6e6e6;fill-opacity:1;stroke-width:0.802035"
d="m 1755.4268,-682.94948 c -11.4044,0.009 -22.1361,4.44853 -30.1994,12.51191 -8.0464,8.04637 -12.4853,18.77693 -12.4944,30.18182 0.011,11.38673 4.4395,22.12695 12.4944,30.18182 8.0639,8.06395 18.795,12.48639 30.1909,12.5034 11.4037,-0.009 22.1269,-4.4576 30.1727,-12.5034 8.0639,-8.06395 12.5125,-18.78602 12.521,-30.19032 6e-4,-23.53626 -19.1484,-42.68523 -42.6852,-42.68523 z m 25.6011,42.68523 c -0.011,7.07998 -2.8623,13.47771 -7.5059,18.12133 -4.6255,4.62548 -11.0414,7.49683 -18.1032,7.48775 -14.143,0 -25.6096,-11.46669 -25.6096,-25.60966 -0.011,-7.06241 2.8707,-13.46921 7.4962,-18.09469 4.6436,-4.64361 11.0323,-7.50589 18.1129,-7.5144 14.1424,5.7e-4 25.6091,11.46727 25.6096,25.60967 z"
id="path250465" />
<path
style="fill:#53dcff;fill-opacity:1;stroke-width:1.38175"
d="m 1795.5329,-776.35953 c -11.454,10.78389 -26.6678,16.72333 -42.8584,16.70911 -16.1745,9.4e-4 -31.4216,-5.93944 -42.8604,-16.70911 -11.4539,-10.78389 -17.7625,-25.1381 -17.7776,-40.38154 0,-15.22732 6.2934,-29.5673 17.7473,-40.35119 11.455,-10.78485 26.685,-16.7091 42.8907,-16.73946 33.4345,0.015 60.6379,25.62729 60.6379,57.09065 -0.016,15.27284 -6.3246,29.59669 -17.7795,40.38154 z"
id="path250467" />
<path
style="opacity:0.2;fill:#000000;fill-opacity:1;stroke-width:1.38175"
d="m 1706.6505,-853.77411 c -14.3177,13.48011 -22.1839,31.37331 -22.201,50.43924 -0.016,19.06307 7.8824,36.98851 22.2001,50.46863 14.3025,13.46588 33.3235,20.8871 53.5893,20.8871 20.2496,-0.015 39.2717,-7.40701 53.5893,-20.8871 14.3187,-13.48106 22.2011,-31.41976 22.2171,-50.48476 0,-39.34342 -34.0013,-71.35571 -75.7893,-71.35571 -20.2496,0.015 -39.2868,7.45156 -53.6055,20.9326 z m 110.8518,50.42311 c 0,14.92369 -6.4012,28.37408 -16.7842,38.14968 -10.3424,9.7374 -24.6678,15.80116 -40.4783,15.76298 -31.6258,0 -57.2636,-24.13816 -57.2625,-53.91266 -0.02,-14.86874 6.419,-28.35496 16.7615,-38.09234 10.383,-9.77562 24.6691,-15.80238 40.501,-15.8203 31.622,-9.4e-4 57.2613,24.13812 57.2625,53.91264 z"
id="path250469"
sodipodi:nodetypes="scscsccscsccscc" />
<path
style="fill:#f2f2f2;fill-opacity:1;stroke-width:1.45856"
d="m 1696.0983,-869.96743 c -15.1136,14.22941 -23.417,33.11723 -23.4351,53.24295 -0.017,20.1227 8.3205,39.04455 23.4341,53.27397 15.0976,14.21439 35.176,22.04812 56.5681,22.04812 21.3752,-0.0158 41.4547,-7.81872 56.5682,-22.04812 15.1146,-14.23042 23.4351,-33.16625 23.4522,-53.29099 0,-41.53037 -35.8914,-75.32209 -80.0022,-75.32209 -21.3753,0.0158 -41.4707,7.86577 -56.5853,22.09616 z m 115.3426,53.22593 c 0,15.31768 -6.5704,29.12317 -17.2276,39.15686 -10.6155,9.99448 -25.319,16.21833 -41.5468,16.17914 -32.4607,0 -58.7756,-24.77541 -58.7742,-55.336 -0.02,-15.26129 6.5885,-29.10357 17.2039,-39.09802 10.6571,-10.0337 25.3203,-16.21958 41.5703,-16.23795 32.4569,-9.4e-4 58.7729,24.77537 58.7744,55.33597 z"
id="path250471"
sodipodi:nodetypes="scscsccscsccscc" />
<path
style="fill:#f2705b;fill-opacity:1;stroke-width:1.10803"
d="m 1887.7604,-951.51756 c -91.5372,-11.38291 -181.4702,-10.94666 -269.9766,0 22.3199,-37.19749 48.2016,-72.54824 77.8824,-105.52484 l 57.1058,-63.4468 57.1059,63.4468 c 29.5621,32.8446 55.5624,68.32735 77.8825,105.52484 z"
id="path250473"
sodipodi:nodetypes="ccscsc" />
</g>
</g>
</svg>

After

Width:  |  Height:  |  Size: 22 KiB

View File

@ -0,0 +1,250 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
width="50.609062"
height="246.19336"
viewBox="0 0 50.609068 246.19337"
version="1.1"
id="svg8"
inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
sodipodi:docname="rocket_smoke2b.svg"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns="http://www.w3.org/2000/svg"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:dc="http://purl.org/dc/elements/1.1/">
<defs
id="defs2">
<linearGradient
inkscape:collect="always"
id="linearGradient939">
<stop
style="stop-color:#eff0f1;stop-opacity:1;"
offset="0"
id="stop935" />
<stop
style="stop-color:#eff0f1;stop-opacity:0;"
offset="1"
id="stop937" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient939"
id="linearGradient941"
x1="188.87804"
y1="716.58759"
x2="188.87804"
y2="855.77551"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(-1,0,0,1,347.39864,0)" />
</defs>
<sodipodi:namedview
id="base"
pagecolor="#525252"
bordercolor="#404040"
borderopacity="1"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:zoom="2.8"
inkscape:cx="66.25"
inkscape:cy="145"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="false"
inkscape:window-width="1914"
inkscape:window-height="1047"
inkscape:window-x="646"
inkscape:window-y="3"
inkscape:window-maximized="0"
inkscape:pagecheckerboard="0"
units="px"
fit-margin-top="0"
fit-margin-left="0"
fit-margin-right="0"
fit-margin-bottom="0"
height="2160px"
inkscape:showpageshadow="2"
inkscape:deskcolor="#525252" />
<metadata
id="metadata5">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
</cc:Work>
</rdf:RDF>
</metadata>
<g
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(-149.54261,-610.36914)">
<path
id="path250403"
style="display:inline;fill:url(#linearGradient941);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.46489;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;paint-order:markers fill stroke"
d="m 173.34288,714.57812 c 7.95027,0 12.70931,39.06501 15.53515,87.92774 l -6.625,-11.61328 -5.03515,65.66992 -10.09571,-79.48828 -8.60156,12.38086 c 2.91559,-42.67355 7.57403,-74.86328 14.82227,-74.86328 z" />
<g
id="g250475"
transform="matrix(-0.13168343,0,0,0.13168343,404.83556,757.91908)"
style="display:inline">
<path
style="fill:#1a1c1b;fill-opacity:1"
d="m 1846.0893,-550.96782 c 0.078,3.94424 0.099,7.8998 0.111,11.86596 -0.011,6.81722 -0.1209,13.64504 -0.3642,20.42902 12.9267,17.16926 -24.5401,147.31085 -24.5401,147.31085 -2.011,6.38659 -4.1224,12.6954 -6.3647,18.91581 -0.1881,0.54165 -0.3974,1.06066 -0.5854,1.60231 26.5774,21.98515 55.6478,30.97769 71.2212,110.31141 0.3981,0.26516 1.4587,0.79549 1.4587,0.79549 1.3478,0.64064 2.8504,0.9949 4.4746,1.00551 4.8168,0 8.8721,-3.21521 10.1866,-7.62402 0,0 0.21,-0.78419 0.2319,-0.93904 5.1272,-20.55065 7.8892,-112.52112 7.8885,-135.23693 0,-68.19196 -24.8817,-128.9593 -63.7181,-168.43637 z"
id="path250405"
sodipodi:nodetypes="ccccccccccccc" />
<path
id="path250409"
style="opacity:1;fill:#eff0f1;fill-opacity:1"
d="m 1752.772,-1120.4892 c -44.0463,47.7284 -104.1176,101.2739 -136.0025,150.51654 -34.0677,49.69728 -62.4062,118.71236 -62.4062,210.93946 0,56.67085 35.0815,153.37542 65.9492,250.58593 -20.7749,35.77189 -33.0703,80.0034 -33.0703,127.91407 -7e-4,22.71581 2.7615,114.68567 7.8887,135.23632 0.022,0.15485 0.2304,0.93946 0.2304,0.93946 1.3145,4.40881 5.3707,7.625 10.1875,7.625 1.6242,-0.0106 8.9132,-0.89646 10.261,-1.5371 0,0 1.0609,-0.52976 1.459,-0.79492 11.9395,-60.82187 26.0274,-79.75628 46.6277,-95.44142 3.8365,17.81576 19.7188,30.88477 38.1797,30.88477 h 38.2011 z"
sodipodi:nodetypes="ccsccccccccscc" />
<g
id="g250417"
transform="rotate(-45,1722.222,787.87678)">
<path
d="m 2410.4087,18.99406 a 88.000921,88.000921 0 0 1 127.9237,120.88083 l -91.9962,94.5719 5.3193,-37.69998 -79.4767,68.83767 3.1807,-44.90544 -142.8421,113.0054 124.9235,-184.75996 -55.275,-1.52884 z"
id="path250411"
style="fill:#fbb540" />
<path
d="m 2443.6657,10.65886 a 69.979282,69.979282 0 0 1 101.7263,96.12574 l -73.1564,75.2046 4.23,-29.97943 -63.2008,54.74045 2.5294,-35.70929 -113.5896,89.86312 99.3405,-146.92312 -43.9553,-1.21575 z"
id="path250413"
style="fill:#ffcc00;fill-opacity:1;stroke-width:0.795211" />
<path
style="fill:#ffdd55;stroke-width:0.658127"
d="m 2561.492,69.78156 c -1.5795,3.02738 -3.4222,5.98901 -5.3967,8.75311 -2.7641,3.88293 -5.7915,7.43682 -9.1479,10.793271 -15.466,15.465979 -59.3968,40.233089 -81.2138,39.873479 -0.06,-4.49525 0.3595,-8.93066 1.0188,-13.18616 -11.5078,6.59304 -24.8737,10.30915 -39.3184,10.06941 -0.1798,-14.44474 3.5363,-27.810589 10.0693,-39.31853 -4.2555,0.6593 -8.6908,1.07891 -13.186,0.95903 -0.3596,-26.4321 29.8342,-74.01598 51.5523,-89.482 2.7642,-1.97434 5.7258,-3.81711 8.7532,-5.39662 -0.066,0.3291 -0.1317,0.72391 -0.1975,1.05302 7.5027,0.98717 14.8737,2.96156 21.9815,5.92313043 4.6727,1.90858997 9.1479,4.21198997 13.4916,6.97615997 5.4624,3.4222296 10.5958,7.5025996 15.3343,12.2411296 4.7385,4.73854 8.7531,9.87194 12.1754,15.33436 2.7641,4.34367 5.1334,8.81892 7.0419,13.49158 2.9616,7.10779 4.936,14.4788 5.9231,21.98144 0.4607,0.0658 0.7898,3e-5 1.1189,-0.0658 z"
id="path250415"
sodipodi:nodetypes="ccsccccccccccscccc" />
</g>
<path
style="fill:#1a1c1b;fill-opacity:1"
d="m 1662.96,-550.96924 c -0.078,3.94424 -0.099,7.8998 -0.111,11.86596 0.011,6.81722 0.1209,13.64504 0.3642,20.42902 -12.9267,17.16926 24.5401,147.31085 24.5401,147.31085 2.011,6.38659 4.1224,12.6954 6.3647,18.91581 0.1881,0.54165 0.3974,1.06066 0.5854,1.60231 -26.5774,21.98515 -55.6478,30.97769 -71.2212,110.31141 -0.3981,0.26516 -1.4587,0.79549 -1.4587,0.79549 -1.3478,0.64064 -2.8504,0.9949 -4.4746,1.00551 -4.8168,0 -8.8721,-3.21521 -10.1866,-7.62402 0,0 -0.21,-0.78419 -0.2319,-0.93904 -5.1272,-20.55065 -7.8892,-112.52112 -7.8885,-135.23693 0,-68.19196 24.8817,-128.9593 63.7181,-168.43637 z"
id="path250419"
sodipodi:nodetypes="ccccccccccccc" />
<path
style="fill:#ffdd55;stroke-width:0.658127"
d="m 1807.3005,-314.23094 c 1.0238,3.25755 1.815,6.65473 2.3734,10.00536 0.7911,4.7002 1.1634,9.35386 1.1634,14.10059 0,21.8722 -8.5162,43.69785 -25.7347,60.35795 -3.5368,-3.4437 -6.6548,-7.21317 -9.447,-11.02916 -3.816,14.05404 -11.3084,27.31697 -22.7098,38.34614 -11.3549,-11.07571 -18.8473,-24.33863 -22.7099,-38.34614 -2.7922,3.81599 -5.9101,7.58546 -9.4934,10.98263 -20.8019,-20.24342 -28.9923,-48.16538 -24.5714,-74.45854 0.5585,-3.35064 1.3496,-6.74781 2.3734,-10.00537 0.1862,0.27922 0.4188,0.60497 0.605,0.8842 6.0032,-4.60713 12.6114,-8.42312 19.7315,-11.35494 4.6537,-1.95454 9.4469,-3.49024 14.4729,-4.60711 6.2824,-1.44264 12.7975,-2.18723 19.4988,-2.18723 6.7013,0 13.1699,0.79113 19.4523,2.23376 5.026,1.11688 9.8658,2.60604 14.5194,4.56058 7.1201,2.93182 13.7283,6.74781 19.7315,11.35494 0.3723,-0.27923 0.5585,-0.55845 0.7446,-0.83766 z"
id="path250421" />
<path
style="fill:#ffe6d5;fill-opacity:1;stroke-width:0.658127"
d="m 1786.964,-324.70168 c 6.0498,10.4242 9.3074,22.24449 9.3074,34.53015 0,13.49561 -3.9091,26.43278 -11.1223,37.55502 l -15.5898,-21.26722 -8.0042,29.22498 c -1.815,6.84088 -4.7468,13.30947 -8.6093,19.31269 -3.816,-5.95669 -6.7013,-12.47181 -8.6093,-19.31269 l -8.0043,-29.22498 -15.5897,21.26722 c -7.2132,-11.12224 -11.1223,-24.05941 -11.1223,-37.55502 0,-12.28566 3.2576,-24.10595 9.3073,-34.53015 4.6537,-1.95453 9.447,-3.49024 14.4729,-4.60712 6.2825,-1.44263 12.7976,-2.18722 19.4989,-2.18722 6.7012,0 13.1698,0.79113 19.4522,2.23376 5.1191,1.11687 9.9589,2.60605 14.6125,4.56058 z"
id="path250423" />
<path
style="fill:#6b9b89;fill-opacity:1;stroke-width:1.22212"
d="m 1757.8035,-949.18846 c -3.0932,-1.86129 -6.9698,-1.86129 -10.063,0 -4.1821,2.51146 -111.3675,56.64763 -111.3675,198.5711 0,57.30534 22.0097,279.07118 39.4628,412.9313 2.5298,19.42073 19.191,34.06662 38.7352,34.06662 h 76.4021 c 19.5441,0 36.2053,-14.64589 38.7351,-34.06662 17.4531,-133.86012 39.4628,-355.62596 39.4628,-412.9313 0,-141.92347 -107.1854,-196.06086 -111.3675,-198.5711 z"
id="path250425"
sodipodi:nodetypes="ccscsscsc" />
<path
id="path250427"
style="opacity:0.2;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke-width:7.55906;stroke-linecap:round;stroke-linejoin:round;paint-order:stroke markers fill"
d="m 1752.7723,-976.92188 v 673.30274 h 38.2012 c 19.5441,0 36.2045,-14.64568 38.7343,-34.06641 17.4531,-133.86012 39.4629,-355.6263 39.4629,-412.93164 0,-57.74221 -17.7429,-100.95157 -39.0722,-132.0664 -12.283,-19.09437 -26.1497,-37.37853 -41.5723,-54.51368 z" />
<path
style="fill:#53dcff;fill-opacity:1;stroke-width:0.802037"
d="m 1779.5567,-616.10815 c -6.4509,6.45104 -15.0287,9.99501 -24.1384,9.99558 -9.1183,-0.009 -17.6966,-3.55362 -24.1476,-10.00465 -6.4511,-6.45105 -9.9956,-15.02938 -10.0047,-24.14761 0,-9.10916 3.5621,-17.70509 9.9956,-24.13855 6.451,-6.45104 15.0288,-9.995 24.1561,-10.01315 18.8314,0.009 34.1523,15.32938 34.1523,34.15226 -0.018,9.12675 -3.5621,17.70507 -9.9956,24.13854 -0.018,0.0175 -0.018,0.0175 -0.018,0.0175 z"
id="path250429" />
<g
id="g250435"
transform="matrix(1.2221209,0,0,1.2221209,1439.9078,-817.55053)"
style="fill:#24282c;fill-opacity:1">
<g
id="g250433"
style="fill:#24282c;fill-opacity:1">
<path
style="fill:#24282c;fill-opacity:1"
d="m 256.001,451.35877 c -4.422,0 -8,-3.582 -8,-8 V 249.57205 c 0,-4.418 3.578,-8 8,-8 4.422,0 8,3.582 8,8 v 193.78672 c 0,4.418 -3.578,8 -8,8 z"
id="path250431"
sodipodi:nodetypes="sssssss" />
</g>
</g>
<path
style="opacity:0.2;fill:#000000;fill-opacity:1;stroke-width:0.802035"
d="m 1762.1431,-674.93939 c -11.4043,0.009 -22.1359,4.44852 -30.1994,12.5119 -8.0463,8.04637 -12.4852,18.77693 -12.4943,30.18182 0.011,11.38673 4.4394,22.12695 12.4943,30.18183 8.064,8.06394 18.7951,12.48638 30.1909,12.5034 11.4038,-0.009 22.127,-4.45761 30.1728,-12.5034 8.0639,-8.06396 12.5124,-18.78603 12.521,-30.19033 5e-4,-23.53626 -19.1485,-42.68522 -42.6853,-42.68522 z m 25.6011,42.68522 c -0.011,7.07998 -2.8622,13.47772 -7.5059,18.12133 -4.6254,4.62548 -11.0413,7.49683 -18.1031,7.48775 -14.1429,0 -25.6097,-11.46669 -25.6097,-25.60966 -0.011,-7.0624 2.8709,-13.46921 7.4962,-18.09469 4.6437,-4.64361 11.0323,-7.50589 18.1129,-7.5144 14.1424,5.7e-4 25.6091,11.46727 25.6096,25.60967 z"
id="path250437" />
<path
style="fill:#e6e6e6;fill-opacity:1;stroke-width:0.802035"
d="m 1755.4268,-682.94948 c -11.4044,0.009 -22.1361,4.44853 -30.1994,12.51191 -8.0464,8.04637 -12.4853,18.77693 -12.4944,30.18182 0.011,11.38673 4.4395,22.12695 12.4944,30.18182 8.0639,8.06395 18.795,12.48639 30.1909,12.5034 11.4037,-0.009 22.1269,-4.4576 30.1727,-12.5034 8.0639,-8.06395 12.5125,-18.78602 12.521,-30.19032 6e-4,-23.53626 -19.1484,-42.68523 -42.6852,-42.68523 z m 25.6011,42.68523 c -0.011,7.07998 -2.8623,13.47771 -7.5059,18.12133 -4.6255,4.62548 -11.0414,7.49683 -18.1032,7.48775 -14.143,0 -25.6096,-11.46669 -25.6096,-25.60966 -0.011,-7.06241 2.8707,-13.46921 7.4962,-18.09469 4.6436,-4.64361 11.0323,-7.50589 18.1129,-7.5144 14.1424,5.7e-4 25.6091,11.46727 25.6096,25.60967 z"
id="path250439" />
<path
style="fill:#53dcff;fill-opacity:1;stroke-width:1.38175"
d="m 1795.5329,-776.35953 c -11.454,10.78389 -26.6678,16.72333 -42.8584,16.70911 -16.1745,9.4e-4 -31.4216,-5.93944 -42.8604,-16.70911 -11.4539,-10.78389 -17.7625,-25.1381 -17.7776,-40.38154 0,-15.22732 6.2934,-29.5673 17.7473,-40.35119 11.455,-10.78485 26.685,-16.7091 42.8907,-16.73946 33.4345,0.015 60.6379,25.62729 60.6379,57.09065 -0.016,15.27284 -6.3246,29.59669 -17.7795,40.38154 z"
id="path250441" />
<path
style="opacity:0.2;fill:#000000;fill-opacity:1;stroke-width:1.38175"
d="m 1706.6505,-853.77411 c -14.3177,13.48011 -22.1839,31.37331 -22.201,50.43924 -0.016,19.06307 7.8824,36.98851 22.2001,50.46863 14.3025,13.46588 33.3235,20.8871 53.5893,20.8871 20.2496,-0.015 39.2717,-7.40701 53.5893,-20.8871 14.3187,-13.48106 22.2011,-31.41976 22.2171,-50.48476 0,-39.34342 -34.0013,-71.35571 -75.7893,-71.35571 -20.2496,0.015 -39.2868,7.45156 -53.6055,20.9326 z m 110.8518,50.42311 c 0,14.92369 -6.4012,28.37408 -16.7842,38.14968 -10.3424,9.7374 -24.6678,15.80116 -40.4783,15.76298 -31.6258,0 -57.2636,-24.13816 -57.2625,-53.91266 -0.02,-14.86874 6.419,-28.35496 16.7615,-38.09234 10.383,-9.77562 24.6691,-15.80238 40.501,-15.8203 31.622,-9.4e-4 57.2613,24.13812 57.2625,53.91264 z"
id="path250443"
sodipodi:nodetypes="scscsccscsccscc" />
<path
style="fill:#f2f2f2;fill-opacity:1;stroke-width:1.45856"
d="m 1696.0983,-869.96743 c -15.1136,14.22941 -23.417,33.11723 -23.4351,53.24295 -0.017,20.1227 8.3205,39.04455 23.4341,53.27397 15.0976,14.21439 35.176,22.04812 56.5681,22.04812 21.3752,-0.0158 41.4547,-7.81872 56.5682,-22.04812 15.1146,-14.23042 23.4351,-33.16625 23.4522,-53.29099 0,-41.53037 -35.8914,-75.32209 -80.0022,-75.32209 -21.3753,0.0158 -41.4707,7.86577 -56.5853,22.09616 z m 115.3426,53.22593 c 0,15.31768 -6.5704,29.12317 -17.2276,39.15686 -10.6155,9.99448 -25.319,16.21833 -41.5468,16.17914 -32.4607,0 -58.7756,-24.77541 -58.7742,-55.336 -0.02,-15.26129 6.5885,-29.10357 17.2039,-39.09802 10.6571,-10.0337 25.3203,-16.21958 41.5703,-16.23795 32.4569,-9.4e-4 58.7729,24.77537 58.7744,55.33597 z"
id="path250445"
sodipodi:nodetypes="scscsccscsccscc" />
<path
style="fill:#f2705b;fill-opacity:1;stroke-width:1.10803"
d="m 1837.2865,-871.1305 h -169.0289 c 13.9742,-23.28887 30.1784,-45.42157 48.7612,-66.06774 l 35.7532,-39.72324 35.7533,39.72324 c 18.5084,20.56359 34.7869,42.77887 48.7612,66.06774 z"
id="path250447" />
<path
style="fill:#ffe6d5;fill-opacity:1;stroke-width:0.658127"
d="m 1786.964,-324.70168 c 6.0498,10.4242 9.3074,22.24449 9.3074,34.53015 0,13.49561 -3.9091,26.43278 -11.1223,37.55502 l -15.5898,-21.26722 -8.0042,29.22498 c -1.815,6.84088 -4.7468,13.30947 -8.6093,19.31269 -3.816,-5.95669 -6.7013,-12.47181 -8.6093,-19.31269 l -8.0043,-29.22498 -15.5897,21.26722 c -7.2132,-11.12224 -11.1223,-24.05941 -11.1223,-37.55502 0,-12.28566 3.2576,-24.10595 9.3073,-34.53015 4.6537,-1.95453 9.447,-3.49024 14.4729,-4.60712 6.2825,-1.44263 12.7976,-2.18722 19.4989,-2.18722 6.7012,0 13.1698,0.79113 19.4522,2.23376 5.1191,1.11687 9.9589,2.60605 14.6125,4.56058 z"
id="path250449" />
<path
style="fill:#454948;fill-opacity:1;stroke-width:1.22212"
d="m 1760.8084,-1076.1934 c -4.9405,-2.9729 -11.1323,-2.9729 -16.0728,0 -6.6798,4.0113 -177.8786,90.4788 -177.8786,317.16201 0,91.52932 91.5257,287.48521 108.9788,421.34533 2.5298,19.42073 19.191,34.06662 38.7352,34.06662 h 76.4021 c 19.5441,0 36.2053,-14.64589 38.7351,-34.06662 17.4531,-133.86012 108.9788,-329.81601 108.9788,-421.34533 0,-226.68321 -171.1988,-313.15261 -177.8786,-317.16201 z"
id="path250451"
sodipodi:nodetypes="ccscsscsc" />
<path
id="path250453"
style="opacity:0.2;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke-width:7.55906;stroke-linecap:round;stroke-linejoin:round;paint-order:stroke markers fill"
d="m 1752.7725,-1120.4898 -2e-4,816.87066 h 38.2012 c 19.5441,0 36.2045,-14.64568 38.7343,-34.06641 17.4531,-133.86012 108.9787,-329.81625 108.9787,-421.34557 0,-92.2271 -28.3393,-161.24201 -62.407,-210.93929 -19.6186,-30.49789 -41.767,-59.70159 -66.4001,-87.07039 z"
sodipodi:nodetypes="ccscscsc" />
<path
style="fill:#53dcff;fill-opacity:1;stroke-width:0.802037"
d="m 1779.5567,-616.10815 c -6.4509,6.45104 -15.0287,9.99501 -24.1384,9.99558 -9.1183,-0.009 -17.6966,-3.55362 -24.1476,-10.00465 -6.4511,-6.45105 -9.9956,-15.02938 -10.0047,-24.14761 0,-9.10916 3.5621,-17.70509 9.9956,-24.13855 6.451,-6.45104 15.0288,-9.995 24.1561,-10.01315 18.8314,0.009 34.1523,15.32938 34.1523,34.15226 -0.018,9.12675 -3.5621,17.70507 -9.9956,24.13854 -0.018,0.0175 -0.018,0.0175 -0.018,0.0175 z"
id="path250455" />
<g
id="g250461"
transform="matrix(1.2221209,0,0,1.2221209,1439.9078,-817.55053)"
style="fill:#1a1c1b;fill-opacity:1">
<g
id="g250459"
style="fill:#1a1c1b;fill-opacity:1">
<path
style="fill:#1a1c1b;fill-opacity:1"
d="m 256.001,451.35877 c -4.422,0 -8,-3.582 -8,-8 V 249.57205 c 0,-4.418 3.578,-8 8,-8 4.422,0 8,3.582 8,8 v 193.78672 c 0,4.418 -3.578,8 -8,8 z"
id="path250457"
sodipodi:nodetypes="sssssss" />
</g>
</g>
<path
style="opacity:0.2;fill:#000000;fill-opacity:1;stroke-width:0.802035"
d="m 1762.1431,-674.93939 c -11.4043,0.009 -22.1359,4.44852 -30.1994,12.5119 -8.0463,8.04637 -12.4852,18.77693 -12.4943,30.18182 0.011,11.38673 4.4394,22.12695 12.4943,30.18183 8.064,8.06394 18.7951,12.48638 30.1909,12.5034 11.4038,-0.009 22.127,-4.45761 30.1728,-12.5034 8.0639,-8.06396 12.5124,-18.78603 12.521,-30.19033 5e-4,-23.53626 -19.1485,-42.68522 -42.6853,-42.68522 z m 25.6011,42.68522 c -0.011,7.07998 -2.8622,13.47772 -7.5059,18.12133 -4.6254,4.62548 -11.0413,7.49683 -18.1031,7.48775 -14.1429,0 -25.6097,-11.46669 -25.6097,-25.60966 -0.011,-7.0624 2.8709,-13.46921 7.4962,-18.09469 4.6437,-4.64361 11.0323,-7.50589 18.1129,-7.5144 14.1424,5.7e-4 25.6091,11.46727 25.6096,25.60967 z"
id="path250463" />
<path
style="fill:#e6e6e6;fill-opacity:1;stroke-width:0.802035"
d="m 1755.4268,-682.94948 c -11.4044,0.009 -22.1361,4.44853 -30.1994,12.51191 -8.0464,8.04637 -12.4853,18.77693 -12.4944,30.18182 0.011,11.38673 4.4395,22.12695 12.4944,30.18182 8.0639,8.06395 18.795,12.48639 30.1909,12.5034 11.4037,-0.009 22.1269,-4.4576 30.1727,-12.5034 8.0639,-8.06395 12.5125,-18.78602 12.521,-30.19032 6e-4,-23.53626 -19.1484,-42.68523 -42.6852,-42.68523 z m 25.6011,42.68523 c -0.011,7.07998 -2.8623,13.47771 -7.5059,18.12133 -4.6255,4.62548 -11.0414,7.49683 -18.1032,7.48775 -14.143,0 -25.6096,-11.46669 -25.6096,-25.60966 -0.011,-7.06241 2.8707,-13.46921 7.4962,-18.09469 4.6436,-4.64361 11.0323,-7.50589 18.1129,-7.5144 14.1424,5.7e-4 25.6091,11.46727 25.6096,25.60967 z"
id="path250465" />
<path
style="fill:#53dcff;fill-opacity:1;stroke-width:1.38175"
d="m 1795.5329,-776.35953 c -11.454,10.78389 -26.6678,16.72333 -42.8584,16.70911 -16.1745,9.4e-4 -31.4216,-5.93944 -42.8604,-16.70911 -11.4539,-10.78389 -17.7625,-25.1381 -17.7776,-40.38154 0,-15.22732 6.2934,-29.5673 17.7473,-40.35119 11.455,-10.78485 26.685,-16.7091 42.8907,-16.73946 33.4345,0.015 60.6379,25.62729 60.6379,57.09065 -0.016,15.27284 -6.3246,29.59669 -17.7795,40.38154 z"
id="path250467" />
<path
style="opacity:0.2;fill:#000000;fill-opacity:1;stroke-width:1.38175"
d="m 1706.6505,-853.77411 c -14.3177,13.48011 -22.1839,31.37331 -22.201,50.43924 -0.016,19.06307 7.8824,36.98851 22.2001,50.46863 14.3025,13.46588 33.3235,20.8871 53.5893,20.8871 20.2496,-0.015 39.2717,-7.40701 53.5893,-20.8871 14.3187,-13.48106 22.2011,-31.41976 22.2171,-50.48476 0,-39.34342 -34.0013,-71.35571 -75.7893,-71.35571 -20.2496,0.015 -39.2868,7.45156 -53.6055,20.9326 z m 110.8518,50.42311 c 0,14.92369 -6.4012,28.37408 -16.7842,38.14968 -10.3424,9.7374 -24.6678,15.80116 -40.4783,15.76298 -31.6258,0 -57.2636,-24.13816 -57.2625,-53.91266 -0.02,-14.86874 6.419,-28.35496 16.7615,-38.09234 10.383,-9.77562 24.6691,-15.80238 40.501,-15.8203 31.622,-9.4e-4 57.2613,24.13812 57.2625,53.91264 z"
id="path250469"
sodipodi:nodetypes="scscsccscsccscc" />
<path
style="fill:#f2f2f2;fill-opacity:1;stroke-width:1.45856"
d="m 1696.0983,-869.96743 c -15.1136,14.22941 -23.417,33.11723 -23.4351,53.24295 -0.017,20.1227 8.3205,39.04455 23.4341,53.27397 15.0976,14.21439 35.176,22.04812 56.5681,22.04812 21.3752,-0.0158 41.4547,-7.81872 56.5682,-22.04812 15.1146,-14.23042 23.4351,-33.16625 23.4522,-53.29099 0,-41.53037 -35.8914,-75.32209 -80.0022,-75.32209 -21.3753,0.0158 -41.4707,7.86577 -56.5853,22.09616 z m 115.3426,53.22593 c 0,15.31768 -6.5704,29.12317 -17.2276,39.15686 -10.6155,9.99448 -25.319,16.21833 -41.5468,16.17914 -32.4607,0 -58.7756,-24.77541 -58.7742,-55.336 -0.02,-15.26129 6.5885,-29.10357 17.2039,-39.09802 10.6571,-10.0337 25.3203,-16.21958 41.5703,-16.23795 32.4569,-9.4e-4 58.7729,24.77537 58.7744,55.33597 z"
id="path250471"
sodipodi:nodetypes="scscsccscsccscc" />
<path
style="fill:#f2705b;fill-opacity:1;stroke-width:1.10803"
d="m 1887.7604,-951.51756 c -91.5372,-11.38291 -181.4702,-10.94666 -269.9766,0 22.3199,-37.19749 48.2016,-72.54824 77.8824,-105.52484 l 57.1058,-63.4468 57.1059,63.4468 c 29.5621,32.8446 55.5624,68.32735 77.8825,105.52484 z"
id="path250473"
sodipodi:nodetypes="ccscsc" />
</g>
</g>
</svg>

After

Width:  |  Height:  |  Size: 22 KiB

View File

@ -0,0 +1,227 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
width="108.81853"
height="2160.5229"
viewBox="0 0 108.81854 2160.523"
version="1.1"
id="svg8"
inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
sodipodi:docname="rocket_smoke.svg"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns="http://www.w3.org/2000/svg"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:dc="http://purl.org/dc/elements/1.1/">
<defs
id="defs2" />
<sodipodi:namedview
id="base"
pagecolor="#525252"
bordercolor="#404040"
borderopacity="1"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:zoom="0.98994949"
inkscape:cx="-169.20055"
inkscape:cy="1534.4217"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="false"
inkscape:window-width="1914"
inkscape:window-height="1047"
inkscape:window-x="224"
inkscape:window-y="103"
inkscape:window-maximized="0"
inkscape:pagecheckerboard="0"
units="px"
fit-margin-top="0"
fit-margin-left="0"
fit-margin-right="0"
fit-margin-bottom="0"
height="2160px"
inkscape:showpageshadow="2"
inkscape:deskcolor="#525252" />
<metadata
id="metadata5">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
</cc:Work>
</rdf:RDF>
</metadata>
<g
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(-116.02842,-610.36914)">
<path
id="path250403"
style="display:inline;fill:#eff0f1;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.46489;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;paint-order:markers fill stroke"
d="m 170.0562,714.59209 c 9.38797,0 14.50417,53.62433 17.00032,114.68438 8.24465,1098.39983 1.91828,1138.93853 33.79043,1941.61563 -46.56792,0 -58.65508,0 -108.81853,0 34.53647,-791.4836 28.78177,-828.0114 41.02962,-1941.62914 2.4963,-61.06021 7.61008,-114.68446 16.99812,-114.68446 v -8.5e-4 z"
sodipodi:nodetypes="sccccscs" />
<g
id="g250475"
transform="matrix(-0.13168343,0,0,0.13168343,400.42611,757.91908)"
style="display:inline">
<path
style="fill:#1a1c1b;fill-opacity:1"
d="m 1846.0893,-550.96782 c 0.078,3.94424 0.099,7.8998 0.111,11.86596 -0.011,6.81722 -0.1209,13.64504 -0.3642,20.42902 12.9267,17.16926 -24.5401,147.31085 -24.5401,147.31085 -2.011,6.38659 -4.1224,12.6954 -6.3647,18.91581 -0.1881,0.54165 -0.3974,1.06066 -0.5854,1.60231 26.5774,21.98515 55.6478,30.97769 71.2212,110.31141 0.3981,0.26516 1.4587,0.79549 1.4587,0.79549 1.3478,0.64064 2.8504,0.9949 4.4746,1.00551 4.8168,0 8.8721,-3.21521 10.1866,-7.62402 0,0 0.21,-0.78419 0.2319,-0.93904 5.1272,-20.55065 7.8892,-112.52112 7.8885,-135.23693 0,-68.19196 -24.8817,-128.9593 -63.7181,-168.43637 z"
id="path250405"
sodipodi:nodetypes="ccccccccccccc" />
<path
id="path250409"
style="opacity:1;fill:#eff0f1;fill-opacity:1"
d="m 1752.772,-1120.4892 c -44.0463,47.7284 -104.1176,101.2739 -136.0025,150.51654 -34.0677,49.69728 -62.4062,118.71236 -62.4062,210.93946 0,56.67085 35.0815,153.37542 65.9492,250.58593 -20.7749,35.77189 -33.0703,80.0034 -33.0703,127.91407 -7e-4,22.71581 2.7615,114.68567 7.8887,135.23632 0.022,0.15485 0.2304,0.93946 0.2304,0.93946 1.3145,4.40881 5.3707,7.625 10.1875,7.625 1.6242,-0.0106 8.9132,-0.89646 10.261,-1.5371 0,0 1.0609,-0.52976 1.459,-0.79492 11.9395,-60.82187 26.0274,-79.75628 46.6277,-95.44142 3.8365,17.81576 19.7188,30.88477 38.1797,30.88477 h 38.2011 z"
sodipodi:nodetypes="ccsccccccccscc" />
<g
id="g250417"
transform="rotate(-45,1722.222,787.87678)">
<path
d="m 2410.4087,18.99406 a 88.000921,88.000921 0 0 1 127.9237,120.88083 l -91.9962,94.5719 5.3193,-37.69998 -79.4767,68.83767 3.1807,-44.90544 -142.8421,113.0054 124.9235,-184.75996 -55.275,-1.52884 z"
id="path250411"
style="fill:#fbb540" />
<path
d="m 2443.6657,10.65886 a 69.979282,69.979282 0 0 1 101.7263,96.12574 l -73.1564,75.2046 4.23,-29.97943 -63.2008,54.74045 2.5294,-35.70929 -113.5896,89.86312 99.3405,-146.92312 -43.9553,-1.21575 z"
id="path250413"
style="fill:#ffcc00;fill-opacity:1;stroke-width:0.795211" />
<path
style="fill:#ffdd55;stroke-width:0.658127"
d="m 2561.492,69.78156 c -1.5795,3.02738 -3.4222,5.98901 -5.3967,8.75311 -2.7641,3.88293 -5.7915,7.43682 -9.1479,10.793271 -15.466,15.465979 -59.3968,40.233089 -81.2138,39.873479 -0.06,-4.49525 0.3595,-8.93066 1.0188,-13.18616 -11.5078,6.59304 -24.8737,10.30915 -39.3184,10.06941 -0.1798,-14.44474 3.5363,-27.810589 10.0693,-39.31853 -4.2555,0.6593 -8.6908,1.07891 -13.186,0.95903 -0.3596,-26.4321 29.8342,-74.01598 51.5523,-89.482 2.7642,-1.97434 5.7258,-3.81711 8.7532,-5.39662 -0.066,0.3291 -0.1317,0.72391 -0.1975,1.05302 7.5027,0.98717 14.8737,2.96156 21.9815,5.92313043 4.6727,1.90858997 9.1479,4.21198997 13.4916,6.97615997 5.4624,3.4222296 10.5958,7.5025996 15.3343,12.2411296 4.7385,4.73854 8.7531,9.87194 12.1754,15.33436 2.7641,4.34367 5.1334,8.81892 7.0419,13.49158 2.9616,7.10779 4.936,14.4788 5.9231,21.98144 0.4607,0.0658 0.7898,3e-5 1.1189,-0.0658 z"
id="path250415"
sodipodi:nodetypes="ccsccccccccccscccc" />
</g>
<path
style="fill:#1a1c1b;fill-opacity:1"
d="m 1662.96,-550.96924 c -0.078,3.94424 -0.099,7.8998 -0.111,11.86596 0.011,6.81722 0.1209,13.64504 0.3642,20.42902 -12.9267,17.16926 24.5401,147.31085 24.5401,147.31085 2.011,6.38659 4.1224,12.6954 6.3647,18.91581 0.1881,0.54165 0.3974,1.06066 0.5854,1.60231 -26.5774,21.98515 -55.6478,30.97769 -71.2212,110.31141 -0.3981,0.26516 -1.4587,0.79549 -1.4587,0.79549 -1.3478,0.64064 -2.8504,0.9949 -4.4746,1.00551 -4.8168,0 -8.8721,-3.21521 -10.1866,-7.62402 0,0 -0.21,-0.78419 -0.2319,-0.93904 -5.1272,-20.55065 -7.8892,-112.52112 -7.8885,-135.23693 0,-68.19196 24.8817,-128.9593 63.7181,-168.43637 z"
id="path250419"
sodipodi:nodetypes="ccccccccccccc" />
<path
style="fill:#ffdd55;stroke-width:0.658127"
d="m 1807.3005,-314.23094 c 1.0238,3.25755 1.815,6.65473 2.3734,10.00536 0.7911,4.7002 1.1634,9.35386 1.1634,14.10059 0,21.8722 -8.5162,43.69785 -25.7347,60.35795 -3.5368,-3.4437 -6.6548,-7.21317 -9.447,-11.02916 -3.816,14.05404 -11.3084,27.31697 -22.7098,38.34614 -11.3549,-11.07571 -18.8473,-24.33863 -22.7099,-38.34614 -2.7922,3.81599 -5.9101,7.58546 -9.4934,10.98263 -20.8019,-20.24342 -28.9923,-48.16538 -24.5714,-74.45854 0.5585,-3.35064 1.3496,-6.74781 2.3734,-10.00537 0.1862,0.27922 0.4188,0.60497 0.605,0.8842 6.0032,-4.60713 12.6114,-8.42312 19.7315,-11.35494 4.6537,-1.95454 9.4469,-3.49024 14.4729,-4.60711 6.2824,-1.44264 12.7975,-2.18723 19.4988,-2.18723 6.7013,0 13.1699,0.79113 19.4523,2.23376 5.026,1.11688 9.8658,2.60604 14.5194,4.56058 7.1201,2.93182 13.7283,6.74781 19.7315,11.35494 0.3723,-0.27923 0.5585,-0.55845 0.7446,-0.83766 z"
id="path250421" />
<path
style="fill:#ffe6d5;fill-opacity:1;stroke-width:0.658127"
d="m 1786.964,-324.70168 c 6.0498,10.4242 9.3074,22.24449 9.3074,34.53015 0,13.49561 -3.9091,26.43278 -11.1223,37.55502 l -15.5898,-21.26722 -8.0042,29.22498 c -1.815,6.84088 -4.7468,13.30947 -8.6093,19.31269 -3.816,-5.95669 -6.7013,-12.47181 -8.6093,-19.31269 l -8.0043,-29.22498 -15.5897,21.26722 c -7.2132,-11.12224 -11.1223,-24.05941 -11.1223,-37.55502 0,-12.28566 3.2576,-24.10595 9.3073,-34.53015 4.6537,-1.95453 9.447,-3.49024 14.4729,-4.60712 6.2825,-1.44263 12.7976,-2.18722 19.4989,-2.18722 6.7012,0 13.1698,0.79113 19.4522,2.23376 5.1191,1.11687 9.9589,2.60605 14.6125,4.56058 z"
id="path250423" />
<path
style="fill:#6b9b89;fill-opacity:1;stroke-width:1.22212"
d="m 1757.8035,-949.18846 c -3.0932,-1.86129 -6.9698,-1.86129 -10.063,0 -4.1821,2.51146 -111.3675,56.64763 -111.3675,198.5711 0,57.30534 22.0097,279.07118 39.4628,412.9313 2.5298,19.42073 19.191,34.06662 38.7352,34.06662 h 76.4021 c 19.5441,0 36.2053,-14.64589 38.7351,-34.06662 17.4531,-133.86012 39.4628,-355.62596 39.4628,-412.9313 0,-141.92347 -107.1854,-196.06086 -111.3675,-198.5711 z"
id="path250425"
sodipodi:nodetypes="ccscsscsc" />
<path
id="path250427"
style="opacity:0.2;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke-width:7.55906;stroke-linecap:round;stroke-linejoin:round;paint-order:stroke markers fill"
d="m 1752.7723,-976.92188 v 673.30274 h 38.2012 c 19.5441,0 36.2045,-14.64568 38.7343,-34.06641 17.4531,-133.86012 39.4629,-355.6263 39.4629,-412.93164 0,-57.74221 -17.7429,-100.95157 -39.0722,-132.0664 -12.283,-19.09437 -26.1497,-37.37853 -41.5723,-54.51368 z" />
<path
style="fill:#53dcff;fill-opacity:1;stroke-width:0.802037"
d="m 1779.5567,-616.10815 c -6.4509,6.45104 -15.0287,9.99501 -24.1384,9.99558 -9.1183,-0.009 -17.6966,-3.55362 -24.1476,-10.00465 -6.4511,-6.45105 -9.9956,-15.02938 -10.0047,-24.14761 0,-9.10916 3.5621,-17.70509 9.9956,-24.13855 6.451,-6.45104 15.0288,-9.995 24.1561,-10.01315 18.8314,0.009 34.1523,15.32938 34.1523,34.15226 -0.018,9.12675 -3.5621,17.70507 -9.9956,24.13854 -0.018,0.0175 -0.018,0.0175 -0.018,0.0175 z"
id="path250429" />
<g
id="g250435"
transform="matrix(1.2221209,0,0,1.2221209,1439.9078,-817.55053)"
style="fill:#24282c;fill-opacity:1">
<g
id="g250433"
style="fill:#24282c;fill-opacity:1">
<path
style="fill:#24282c;fill-opacity:1"
d="m 256.001,451.35877 c -4.422,0 -8,-3.582 -8,-8 V 249.57205 c 0,-4.418 3.578,-8 8,-8 4.422,0 8,3.582 8,8 v 193.78672 c 0,4.418 -3.578,8 -8,8 z"
id="path250431"
sodipodi:nodetypes="sssssss" />
</g>
</g>
<path
style="opacity:0.2;fill:#000000;fill-opacity:1;stroke-width:0.802035"
d="m 1762.1431,-674.93939 c -11.4043,0.009 -22.1359,4.44852 -30.1994,12.5119 -8.0463,8.04637 -12.4852,18.77693 -12.4943,30.18182 0.011,11.38673 4.4394,22.12695 12.4943,30.18183 8.064,8.06394 18.7951,12.48638 30.1909,12.5034 11.4038,-0.009 22.127,-4.45761 30.1728,-12.5034 8.0639,-8.06396 12.5124,-18.78603 12.521,-30.19033 5e-4,-23.53626 -19.1485,-42.68522 -42.6853,-42.68522 z m 25.6011,42.68522 c -0.011,7.07998 -2.8622,13.47772 -7.5059,18.12133 -4.6254,4.62548 -11.0413,7.49683 -18.1031,7.48775 -14.1429,0 -25.6097,-11.46669 -25.6097,-25.60966 -0.011,-7.0624 2.8709,-13.46921 7.4962,-18.09469 4.6437,-4.64361 11.0323,-7.50589 18.1129,-7.5144 14.1424,5.7e-4 25.6091,11.46727 25.6096,25.60967 z"
id="path250437" />
<path
style="fill:#e6e6e6;fill-opacity:1;stroke-width:0.802035"
d="m 1755.4268,-682.94948 c -11.4044,0.009 -22.1361,4.44853 -30.1994,12.51191 -8.0464,8.04637 -12.4853,18.77693 -12.4944,30.18182 0.011,11.38673 4.4395,22.12695 12.4944,30.18182 8.0639,8.06395 18.795,12.48639 30.1909,12.5034 11.4037,-0.009 22.1269,-4.4576 30.1727,-12.5034 8.0639,-8.06395 12.5125,-18.78602 12.521,-30.19032 6e-4,-23.53626 -19.1484,-42.68523 -42.6852,-42.68523 z m 25.6011,42.68523 c -0.011,7.07998 -2.8623,13.47771 -7.5059,18.12133 -4.6255,4.62548 -11.0414,7.49683 -18.1032,7.48775 -14.143,0 -25.6096,-11.46669 -25.6096,-25.60966 -0.011,-7.06241 2.8707,-13.46921 7.4962,-18.09469 4.6436,-4.64361 11.0323,-7.50589 18.1129,-7.5144 14.1424,5.7e-4 25.6091,11.46727 25.6096,25.60967 z"
id="path250439" />
<path
style="fill:#53dcff;fill-opacity:1;stroke-width:1.38175"
d="m 1795.5329,-776.35953 c -11.454,10.78389 -26.6678,16.72333 -42.8584,16.70911 -16.1745,9.4e-4 -31.4216,-5.93944 -42.8604,-16.70911 -11.4539,-10.78389 -17.7625,-25.1381 -17.7776,-40.38154 0,-15.22732 6.2934,-29.5673 17.7473,-40.35119 11.455,-10.78485 26.685,-16.7091 42.8907,-16.73946 33.4345,0.015 60.6379,25.62729 60.6379,57.09065 -0.016,15.27284 -6.3246,29.59669 -17.7795,40.38154 z"
id="path250441" />
<path
style="opacity:0.2;fill:#000000;fill-opacity:1;stroke-width:1.38175"
d="m 1706.6505,-853.77411 c -14.3177,13.48011 -22.1839,31.37331 -22.201,50.43924 -0.016,19.06307 7.8824,36.98851 22.2001,50.46863 14.3025,13.46588 33.3235,20.8871 53.5893,20.8871 20.2496,-0.015 39.2717,-7.40701 53.5893,-20.8871 14.3187,-13.48106 22.2011,-31.41976 22.2171,-50.48476 0,-39.34342 -34.0013,-71.35571 -75.7893,-71.35571 -20.2496,0.015 -39.2868,7.45156 -53.6055,20.9326 z m 110.8518,50.42311 c 0,14.92369 -6.4012,28.37408 -16.7842,38.14968 -10.3424,9.7374 -24.6678,15.80116 -40.4783,15.76298 -31.6258,0 -57.2636,-24.13816 -57.2625,-53.91266 -0.02,-14.86874 6.419,-28.35496 16.7615,-38.09234 10.383,-9.77562 24.6691,-15.80238 40.501,-15.8203 31.622,-9.4e-4 57.2613,24.13812 57.2625,53.91264 z"
id="path250443"
sodipodi:nodetypes="scscsccscsccscc" />
<path
style="fill:#f2f2f2;fill-opacity:1;stroke-width:1.45856"
d="m 1696.0983,-869.96743 c -15.1136,14.22941 -23.417,33.11723 -23.4351,53.24295 -0.017,20.1227 8.3205,39.04455 23.4341,53.27397 15.0976,14.21439 35.176,22.04812 56.5681,22.04812 21.3752,-0.0158 41.4547,-7.81872 56.5682,-22.04812 15.1146,-14.23042 23.4351,-33.16625 23.4522,-53.29099 0,-41.53037 -35.8914,-75.32209 -80.0022,-75.32209 -21.3753,0.0158 -41.4707,7.86577 -56.5853,22.09616 z m 115.3426,53.22593 c 0,15.31768 -6.5704,29.12317 -17.2276,39.15686 -10.6155,9.99448 -25.319,16.21833 -41.5468,16.17914 -32.4607,0 -58.7756,-24.77541 -58.7742,-55.336 -0.02,-15.26129 6.5885,-29.10357 17.2039,-39.09802 10.6571,-10.0337 25.3203,-16.21958 41.5703,-16.23795 32.4569,-9.4e-4 58.7729,24.77537 58.7744,55.33597 z"
id="path250445"
sodipodi:nodetypes="scscsccscsccscc" />
<path
style="fill:#f2705b;fill-opacity:1;stroke-width:1.10803"
d="m 1837.2865,-871.1305 h -169.0289 c 13.9742,-23.28887 30.1784,-45.42157 48.7612,-66.06774 l 35.7532,-39.72324 35.7533,39.72324 c 18.5084,20.56359 34.7869,42.77887 48.7612,66.06774 z"
id="path250447" />
<path
style="fill:#ffe6d5;fill-opacity:1;stroke-width:0.658127"
d="m 1786.964,-324.70168 c 6.0498,10.4242 9.3074,22.24449 9.3074,34.53015 0,13.49561 -3.9091,26.43278 -11.1223,37.55502 l -15.5898,-21.26722 -8.0042,29.22498 c -1.815,6.84088 -4.7468,13.30947 -8.6093,19.31269 -3.816,-5.95669 -6.7013,-12.47181 -8.6093,-19.31269 l -8.0043,-29.22498 -15.5897,21.26722 c -7.2132,-11.12224 -11.1223,-24.05941 -11.1223,-37.55502 0,-12.28566 3.2576,-24.10595 9.3073,-34.53015 4.6537,-1.95453 9.447,-3.49024 14.4729,-4.60712 6.2825,-1.44263 12.7976,-2.18722 19.4989,-2.18722 6.7012,0 13.1698,0.79113 19.4522,2.23376 5.1191,1.11687 9.9589,2.60605 14.6125,4.56058 z"
id="path250449" />
<path
style="fill:#454948;fill-opacity:1;stroke-width:1.22212"
d="m 1760.8084,-1076.1934 c -4.9405,-2.9729 -11.1323,-2.9729 -16.0728,0 -6.6798,4.0113 -177.8786,90.4788 -177.8786,317.16201 0,91.52932 91.5257,287.48521 108.9788,421.34533 2.5298,19.42073 19.191,34.06662 38.7352,34.06662 h 76.4021 c 19.5441,0 36.2053,-14.64589 38.7351,-34.06662 17.4531,-133.86012 108.9788,-329.81601 108.9788,-421.34533 0,-226.68321 -171.1988,-313.15261 -177.8786,-317.16201 z"
id="path250451"
sodipodi:nodetypes="ccscsscsc" />
<path
id="path250453"
style="opacity:0.2;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke-width:7.55906;stroke-linecap:round;stroke-linejoin:round;paint-order:stroke markers fill"
d="m 1752.7725,-1120.4898 -2e-4,816.87066 h 38.2012 c 19.5441,0 36.2045,-14.64568 38.7343,-34.06641 17.4531,-133.86012 108.9787,-329.81625 108.9787,-421.34557 0,-92.2271 -28.3393,-161.24201 -62.407,-210.93929 -19.6186,-30.49789 -41.767,-59.70159 -66.4001,-87.07039 z"
sodipodi:nodetypes="ccscscsc" />
<path
style="fill:#53dcff;fill-opacity:1;stroke-width:0.802037"
d="m 1779.5567,-616.10815 c -6.4509,6.45104 -15.0287,9.99501 -24.1384,9.99558 -9.1183,-0.009 -17.6966,-3.55362 -24.1476,-10.00465 -6.4511,-6.45105 -9.9956,-15.02938 -10.0047,-24.14761 0,-9.10916 3.5621,-17.70509 9.9956,-24.13855 6.451,-6.45104 15.0288,-9.995 24.1561,-10.01315 18.8314,0.009 34.1523,15.32938 34.1523,34.15226 -0.018,9.12675 -3.5621,17.70507 -9.9956,24.13854 -0.018,0.0175 -0.018,0.0175 -0.018,0.0175 z"
id="path250455" />
<g
id="g250461"
transform="matrix(1.2221209,0,0,1.2221209,1439.9078,-817.55053)"
style="fill:#1a1c1b;fill-opacity:1">
<g
id="g250459"
style="fill:#1a1c1b;fill-opacity:1">
<path
style="fill:#1a1c1b;fill-opacity:1"
d="m 256.001,451.35877 c -4.422,0 -8,-3.582 -8,-8 V 249.57205 c 0,-4.418 3.578,-8 8,-8 4.422,0 8,3.582 8,8 v 193.78672 c 0,4.418 -3.578,8 -8,8 z"
id="path250457"
sodipodi:nodetypes="sssssss" />
</g>
</g>
<path
style="opacity:0.2;fill:#000000;fill-opacity:1;stroke-width:0.802035"
d="m 1762.1431,-674.93939 c -11.4043,0.009 -22.1359,4.44852 -30.1994,12.5119 -8.0463,8.04637 -12.4852,18.77693 -12.4943,30.18182 0.011,11.38673 4.4394,22.12695 12.4943,30.18183 8.064,8.06394 18.7951,12.48638 30.1909,12.5034 11.4038,-0.009 22.127,-4.45761 30.1728,-12.5034 8.0639,-8.06396 12.5124,-18.78603 12.521,-30.19033 5e-4,-23.53626 -19.1485,-42.68522 -42.6853,-42.68522 z m 25.6011,42.68522 c -0.011,7.07998 -2.8622,13.47772 -7.5059,18.12133 -4.6254,4.62548 -11.0413,7.49683 -18.1031,7.48775 -14.1429,0 -25.6097,-11.46669 -25.6097,-25.60966 -0.011,-7.0624 2.8709,-13.46921 7.4962,-18.09469 4.6437,-4.64361 11.0323,-7.50589 18.1129,-7.5144 14.1424,5.7e-4 25.6091,11.46727 25.6096,25.60967 z"
id="path250463" />
<path
style="fill:#e6e6e6;fill-opacity:1;stroke-width:0.802035"
d="m 1755.4268,-682.94948 c -11.4044,0.009 -22.1361,4.44853 -30.1994,12.51191 -8.0464,8.04637 -12.4853,18.77693 -12.4944,30.18182 0.011,11.38673 4.4395,22.12695 12.4944,30.18182 8.0639,8.06395 18.795,12.48639 30.1909,12.5034 11.4037,-0.009 22.1269,-4.4576 30.1727,-12.5034 8.0639,-8.06395 12.5125,-18.78602 12.521,-30.19032 6e-4,-23.53626 -19.1484,-42.68523 -42.6852,-42.68523 z m 25.6011,42.68523 c -0.011,7.07998 -2.8623,13.47771 -7.5059,18.12133 -4.6255,4.62548 -11.0414,7.49683 -18.1032,7.48775 -14.143,0 -25.6096,-11.46669 -25.6096,-25.60966 -0.011,-7.06241 2.8707,-13.46921 7.4962,-18.09469 4.6436,-4.64361 11.0323,-7.50589 18.1129,-7.5144 14.1424,5.7e-4 25.6091,11.46727 25.6096,25.60967 z"
id="path250465" />
<path
style="fill:#53dcff;fill-opacity:1;stroke-width:1.38175"
d="m 1795.5329,-776.35953 c -11.454,10.78389 -26.6678,16.72333 -42.8584,16.70911 -16.1745,9.4e-4 -31.4216,-5.93944 -42.8604,-16.70911 -11.4539,-10.78389 -17.7625,-25.1381 -17.7776,-40.38154 0,-15.22732 6.2934,-29.5673 17.7473,-40.35119 11.455,-10.78485 26.685,-16.7091 42.8907,-16.73946 33.4345,0.015 60.6379,25.62729 60.6379,57.09065 -0.016,15.27284 -6.3246,29.59669 -17.7795,40.38154 z"
id="path250467" />
<path
style="opacity:0.2;fill:#000000;fill-opacity:1;stroke-width:1.38175"
d="m 1706.6505,-853.77411 c -14.3177,13.48011 -22.1839,31.37331 -22.201,50.43924 -0.016,19.06307 7.8824,36.98851 22.2001,50.46863 14.3025,13.46588 33.3235,20.8871 53.5893,20.8871 20.2496,-0.015 39.2717,-7.40701 53.5893,-20.8871 14.3187,-13.48106 22.2011,-31.41976 22.2171,-50.48476 0,-39.34342 -34.0013,-71.35571 -75.7893,-71.35571 -20.2496,0.015 -39.2868,7.45156 -53.6055,20.9326 z m 110.8518,50.42311 c 0,14.92369 -6.4012,28.37408 -16.7842,38.14968 -10.3424,9.7374 -24.6678,15.80116 -40.4783,15.76298 -31.6258,0 -57.2636,-24.13816 -57.2625,-53.91266 -0.02,-14.86874 6.419,-28.35496 16.7615,-38.09234 10.383,-9.77562 24.6691,-15.80238 40.501,-15.8203 31.622,-9.4e-4 57.2613,24.13812 57.2625,53.91264 z"
id="path250469"
sodipodi:nodetypes="scscsccscsccscc" />
<path
style="fill:#f2f2f2;fill-opacity:1;stroke-width:1.45856"
d="m 1696.0983,-869.96743 c -15.1136,14.22941 -23.417,33.11723 -23.4351,53.24295 -0.017,20.1227 8.3205,39.04455 23.4341,53.27397 15.0976,14.21439 35.176,22.04812 56.5681,22.04812 21.3752,-0.0158 41.4547,-7.81872 56.5682,-22.04812 15.1146,-14.23042 23.4351,-33.16625 23.4522,-53.29099 0,-41.53037 -35.8914,-75.32209 -80.0022,-75.32209 -21.3753,0.0158 -41.4707,7.86577 -56.5853,22.09616 z m 115.3426,53.22593 c 0,15.31768 -6.5704,29.12317 -17.2276,39.15686 -10.6155,9.99448 -25.319,16.21833 -41.5468,16.17914 -32.4607,0 -58.7756,-24.77541 -58.7742,-55.336 -0.02,-15.26129 6.5885,-29.10357 17.2039,-39.09802 10.6571,-10.0337 25.3203,-16.21958 41.5703,-16.23795 32.4569,-9.4e-4 58.7729,24.77537 58.7744,55.33597 z"
id="path250471"
sodipodi:nodetypes="scscsccscsccscc" />
<path
style="fill:#f2705b;fill-opacity:1;stroke-width:1.10803"
d="m 1887.7604,-951.51756 c -91.5372,-11.38291 -181.4702,-10.94666 -269.9766,0 22.3199,-37.19749 48.2016,-72.54824 77.8824,-105.52484 l 57.1058,-63.4468 57.1059,63.4468 c 29.5621,32.8446 55.5624,68.32735 77.8825,105.52484 z"
id="path250473"
sodipodi:nodetypes="ccscsc" />
</g>
</g>
</svg>

After

Width:  |  Height:  |  Size: 21 KiB

View File

@ -0,0 +1,67 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
width="800.00085"
height="439.99997"
viewBox="0 0 800.00094 439.99999"
version="1.1"
id="svg8"
inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20, custom)"
sodipodi:docname="slide4_rocket_smoke.svg"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns="http://www.w3.org/2000/svg"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:dc="http://purl.org/dc/elements/1.1/">
<defs
id="defs2" />
<sodipodi:namedview
id="base"
pagecolor="#525252"
bordercolor="#404040"
borderopacity="1"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:zoom="1.979899"
inkscape:cx="232.08255"
inkscape:cy="248.24499"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="false"
inkscape:window-width="1914"
inkscape:window-height="1047"
inkscape:window-x="3"
inkscape:window-y="3"
inkscape:window-maximized="0"
inkscape:pagecheckerboard="0"
units="px"
fit-margin-top="0"
fit-margin-left="0"
fit-margin-right="0"
fit-margin-bottom="0" />
<metadata
id="metadata5">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
</cc:Work>
</rdf:RDF>
</metadata>
<g
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(-13.87441,-610.36914)">
<path
id="path210473"
style="display:inline;fill:#eff0f1;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.863131;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;paint-order:markers fill stroke"
d="m 219.70371,964.38398 c 5.74809,0 11.35816,1.7615 16.0792,5.0405 8.23733,-13.3045 22.77098,-21.401 38.41909,-21.4029 17.9044,0.011 34.11336,10.5935 41.32912,26.9796 2.92683,-0.9972 5.99769,-1.5064 9.08973,-1.5072 12.93328,0.01 24.20443,8.81 27.34703,21.3556 h 461.90741 l 0.0265,55.51982 H 13.90359 l -0.0264,-55.51982 h 29.12352 4.28519 c 3.46141,-6.7474 10.40724,-10.9909 17.99074,-10.9913 5.45416,0 10.67505,2.2129 14.47775,6.1228 9.11433,-18.8829 28.23076,-30.8844 49.19822,-30.8872 1.61095,0.01 3.22077,0.087 4.82472,0.2362 32.88979,-15.16055 58.3631,-12.52455 85.92638,5.0539 z"
sodipodi:nodetypes="ccccccccccccccccc" />
</g>
</svg>

After

Width:  |  Height:  |  Size: 2.6 KiB

View File

@ -0,0 +1,78 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
width="800.00085"
height="439.99997"
viewBox="0 0 800.00094 439.99999"
version="1.1"
id="svg8"
inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
sodipodi:docname="sky_dark.svg"
xml:space="preserve"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns="http://www.w3.org/2000/svg"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:dc="http://purl.org/dc/elements/1.1/"><defs
id="defs2"><clipPath
clipPathUnits="userSpaceOnUse"
id="clipPath290923"><rect
style="opacity:0.7;fill:#2f6b5a;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2.70918;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke"
id="rect290925"
width="309.65643"
height="170.30928"
x="-358.01489"
y="775.27844" /></clipPath><clipPath
clipPathUnits="userSpaceOnUse"
id="clipPath292441"><rect
style="opacity:0.7;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4.18763;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke"
id="rect292443"
width="478.64374"
height="263.22327"
x="-510.89438"
y="765.67975" /></clipPath></defs><sodipodi:namedview
id="base"
pagecolor="#525252"
bordercolor="#404040"
borderopacity="1"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:zoom="0.7"
inkscape:cx="484.28571"
inkscape:cy="85.714286"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="false"
inkscape:window-width="1914"
inkscape:window-height="1047"
inkscape:window-x="1923"
inkscape:window-y="3"
inkscape:window-maximized="0"
inkscape:pagecheckerboard="0"
units="px"
fit-margin-top="0"
fit-margin-left="0"
fit-margin-right="0"
fit-margin-bottom="0"
inkscape:showpageshadow="0"
inkscape:deskcolor="#525252"
showguides="true" /><metadata
id="metadata5"><rdf:RDF><cc:Work
rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><g
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(-13.87441,-610.36914)"><rect
style="display:inline;fill:#103e49;fill-opacity:1;fill-rule:evenodd;stroke-width:0.41201"
id="rect75224"
width="800"
height="440"
x="13.874837"
y="610.36914"
inkscape:export-filename="/run/media/bogdan/WORK/Work2022/Manjaro2022/4Calamares/2022/slide1.png"
inkscape:export-xdpi="96"
inkscape:export-ydpi="96" /></g></svg>

After

Width:  |  Height:  |  Size: 3.1 KiB

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 22 KiB

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 46 KiB

View File

@ -0,0 +1,3 @@
#mainApp #WelcomePage #mainText {
font-family: "Comfortaa"
}

View File

@ -0,0 +1,391 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
sodipodi:docname="mascot.svg"
inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
id="svg8"
version="1.1"
viewBox="0 0 512 512.00001"
height="512"
width="512"
inkscape:export-filename="/run/media/bogdan/WORK/Work2021/Manjaro2021/Forum/penguin/sketch_mascot_2021/Mascot_svg/mm_confident_right.png"
inkscape:export-xdpi="96"
inkscape:export-ydpi="96"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns="http://www.w3.org/2000/svg"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:dc="http://purl.org/dc/elements/1.1/">
<defs
id="defs2">
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient275394"
id="linearGradient92364"
x1="-3718.4504"
y1="2857.1636"
x2="-3531.176"
y2="2857.1636"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.26458333,0,0,0.26458333,1246.2959,-583.73245)" />
<linearGradient
inkscape:collect="always"
id="linearGradient275394">
<stop
style="stop-color:#24282c;stop-opacity:1;"
offset="0"
id="stop275390" />
<stop
style="stop-color:#000000;stop-opacity:1"
offset="1"
id="stop275392" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient275394"
id="linearGradient468087"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.24696295,0.06843708,-0.06843708,0.24696295,68.39179,6.585503)"
x1="350.4982"
y1="283.14035"
x2="505.82822"
y2="952.06641" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient6008"
id="linearGradient468085"
gradientUnits="userSpaceOnUse"
x1="-805.84595"
y1="764.44513"
x2="-771.58569"
y2="593.95886"
gradientTransform="matrix(0.25497432,0.07065715,-0.07065715,0.25497432,337.71907,78.332218)" />
<linearGradient
inkscape:collect="always"
id="linearGradient6008">
<stop
style="stop-color:#cccccc;stop-opacity:1"
offset="0"
id="stop6004" />
<stop
style="stop-color:#f2f2f2;stop-opacity:1"
offset="1"
id="stop6006" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient167524"
id="linearGradient468083"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.28093386,0,0,0.28093386,61.640743,-17.520145)"
x1="307.0033"
y1="402.83612"
x2="325.54938"
y2="368.49637" />
<linearGradient
inkscape:collect="always"
id="linearGradient167524">
<stop
style="stop-color:#008080;stop-opacity:1"
offset="0"
id="stop167520" />
<stop
style="stop-color:#1a1a1a;stop-opacity:0;"
offset="1"
id="stop167522" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient215970"
id="linearGradient468081"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.26458333,0,0,0.26458333,67.462661,-7.3333433)"
x1="146.51627"
y1="403.08319"
x2="165.59502"
y2="377.1142" />
<linearGradient
inkscape:collect="always"
id="linearGradient215970">
<stop
style="stop-color:#008080;stop-opacity:1"
offset="0"
id="stop215966" />
<stop
style="stop-color:#333333;stop-opacity:0;"
offset="1"
id="stop215968" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient377614"
id="linearGradient468079"
gradientUnits="userSpaceOnUse"
x1="-792.73834"
y1="699.15863"
x2="-659.53918"
y2="567.05298"
gradientTransform="matrix(0.25497432,0.07065715,-0.07065715,0.25497432,337.71907,78.332218)" />
<linearGradient
inkscape:collect="always"
id="linearGradient377614">
<stop
style="stop-color:#3c7038;stop-opacity:1"
offset="0"
id="stop377610" />
<stop
style="stop-color:#44883c;stop-opacity:1"
offset="1"
id="stop377612" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient347651"
id="linearGradient468077"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.24910069,0.08720456,-0.08918064,0.24358108,84.667793,2.9659501)"
x1="580.76862"
y1="718.56329"
x2="490.62381"
y2="500.19333" />
<linearGradient
inkscape:collect="always"
id="linearGradient347651">
<stop
style="stop-color:#24282c;stop-opacity:1;"
offset="0"
id="stop347647" />
<stop
style="stop-color:#181a1d;stop-opacity:1"
offset="1"
id="stop347649" />
</linearGradient>
</defs>
<sodipodi:namedview
inkscape:document-rotation="0"
inkscape:window-maximized="1"
inkscape:window-y="0"
inkscape:window-x="0"
inkscape:window-height="1369"
inkscape:window-width="2560"
showgrid="false"
inkscape:current-layer="g217450"
inkscape:document-units="px"
inkscape:cy="271.42857"
inkscape:cx="232.14286"
inkscape:zoom="0.7"
inkscape:pageshadow="2"
inkscape:pageopacity="0"
borderopacity="1"
bordercolor="#232629"
pagecolor="#ffffff"
id="base"
inkscape:pagecheckerboard="0"
fit-margin-top="0"
fit-margin-left="0"
fit-margin-right="0"
fit-margin-bottom="0"
width="250mm"
units="px"
inkscape:showpageshadow="2"
inkscape:deskcolor="#d1d1d1" />
<metadata
id="metadata5">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
</cc:Work>
</rdf:RDF>
</metadata>
<g
id="layer1"
inkscape:groupmode="layer"
inkscape:label="Layer 1"
transform="translate(72.169922,37.390446)">
<g
id="g217450"
transform="matrix(1.515806,0,0,1.515806,14.413911,-28.980635)">
<path
id="path474039"
style="color:#000000;display:inline;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke-width:0.232805;stroke-linecap:round;stroke-linejoin:round;-inkscape-stroke:none;paint-order:markers fill stroke"
d="m 73.809822,138.99189 c -2.611041,-0.11205 -5.264547,0.76671 -7.330281,2.66237 -6.988307,6.95844 -9.816306,8.40227 -16.005757,10.44072 -5.806572,1.91233 -10.672207,3.48221 -18.472758,6.62594 -9.579875,3.86077 -2.515976,20.30156 3.920648,28.37926 0.772293,2.83416 0.356659,7.71467 0.463021,9.42321 0.04971,1.34208 0.09141,2.68944 0.103849,3.6685 2.12e-4,0.43016 0.04069,0.96602 -0.05289,1.32602 -0.08271,0.52676 0.370099,1.51312 0.858361,1.79422 0.488262,0.28109 1.569297,0.17787 1.983343,-0.15815 0.293714,-0.30615 0.788538,-0.52355 1.120855,-0.71106 6.839876,-2.09484 14.413812,-7.76267 19.060398,-9.05246 0.124354,-0.048 0.257201,-0.13904 0.386027,-0.25786 v 0 c 18.515356,-19.55488 -13.17506,-21.60302 3.314514,-28.08251 12.452879,-4.33789 11.937101,-6.97859 15.4373,-10.19061 1.80041,-1.65219 3.357933,-3.45098 4.041113,-5.66528 0.512419,-1.66071 0.336365,-3.56164 -0.583432,-5.27976 -0.306573,-0.57272 -0.69604,-1.12535 -1.169961,-1.64177 -1.89566,-2.06576 -4.4645,-3.16836 -7.075541,-3.28043 z"
sodipodi:nodetypes="ccssccccscccsccsssscc" />
<path
style="color:#000000;display:inline;fill:url(#linearGradient92364);fill-opacity:1;fill-rule:evenodd;stroke-width:0.879892;stroke-linecap:round;stroke-linejoin:round;-inkscape-stroke:none;paint-order:markers fill stroke"
sodipodi:type="inkscape:offset"
inkscape:radius="-4.0999975"
inkscape:original="M 73.808594 138.99219 C 71.198176 138.88065 68.545693 139.7591 66.480469 141.6543 C 59.492162 148.61274 56.66406 150.05725 50.474609 152.0957 C 44.668037 154.00803 39.802504 155.57697 32.001953 158.7207 C 22.422078 162.58147 29.485251 179.02191 35.921875 187.09961 C 36.694168 189.93377 36.278404 194.8149 36.384766 196.52344 C 36.434476 197.86552 36.475842 199.21235 36.488281 200.19141 C 36.488493 200.62157 36.529127 201.15758 36.435547 201.51758 C 36.352837 202.04434 36.80666 203.0314 37.294922 203.3125 C 37.783184 203.59359 38.863298 203.49032 39.277344 203.1543 C 39.571058 202.84815 40.066121 202.63087 40.398438 202.44336 C 47.238313 200.34852 54.812398 194.68042 59.458984 193.39062 C 59.583338 193.34262 59.714924 193.25163 59.84375 193.13281 C 78.359106 173.57793 46.668629 171.53027 63.158203 165.05078 C 75.611082 160.71289 75.095504 158.07139 78.595703 154.85938 C 80.396113 153.20719 81.953539 151.40766 82.636719 149.19336 C 83.149138 147.53265 82.974485 145.63218 82.054688 143.91406 C 81.748114 143.34134 81.358687 142.78986 80.884766 142.27344 C 78.989566 140.20818 76.420934 139.10471 73.810547 138.99219 L 73.808594 138.99219 z "
xlink:href="#path474039"
id="path92257"
inkscape:href="#path474039"
transform="translate(-1.3094334,-1.8048842)"
d="m 73.632812,143.08789 c -1.574769,-0.0673 -3.139132,0.44839 -4.380859,1.58789 l 0.121094,-0.11523 c -7.179186,7.1485 -11.231626,9.32729 -17.615235,11.42968 -5.820072,1.91678 -10.531687,3.43364 -18.222656,6.53321 -1.297242,0.5228 -1.583308,0.95782 -1.904297,2.17187 -0.320988,1.21405 -0.277221,3.27561 0.306641,5.65821 1.167724,4.76519 4.362429,10.64115 7.191406,14.1914 a 4.1004075,4.1004075 0 0 1 0.748047,1.47656 c 0.592182,2.17319 0.620646,4.28457 0.626953,6.19922 0.0063,1.91466 -0.0449,3.76686 -0.02734,4.04883 a 4.1004075,4.1004075 0 0 1 0.0059,0.10156 c 0.02148,0.57998 0.02799,1.05129 0.04492,1.60743 2.561002,-0.95764 5.41498,-2.38967 8.240234,-3.95118 2.902357,-1.60412 5.614507,-3.13172 8.439453,-4.11718 3.841605,-4.18096 4.603975,-6.82444 4.548828,-8.35547 -0.05705,-1.584 -0.943301,-2.92252 -2.480468,-4.55469 -0.768584,-0.81608 -1.650089,-1.63162 -2.53125,-2.57812 -0.881162,-0.94651 -1.915674,-1.98851 -2.427735,-3.97657 -0.51206,-1.98806 0.441129,-4.70721 1.892578,-6.09375 1.451449,-1.38654 3.145791,-2.21207 5.449219,-3.11718 a 4.1004075,4.1004075 0 0 1 0.150391,-0.0547 c 11.931405,-4.15624 9.542605,-5.23707 14.015625,-9.3418 1.575546,-1.44584 2.544379,-2.71861 2.894531,-3.85351 0.175209,-0.56784 0.148666,-1.33536 -0.279297,-2.13477 -0.14162,-0.26456 -0.328897,-0.53524 -0.576172,-0.80469 -1.13933,-1.24156 -2.654745,-1.88919 -4.228515,-1.95703 a 4.1004075,4.1004075 0 0 1 -0.002,0 z m -15.269531,46.35156 -0.380859,0.12696 c -0.09362,0.0361 -0.06931,0.0531 -0.144531,0.0879 0.177907,-0.0553 0.346177,-0.1651 0.52539,-0.21485 z m -21.541015,10.47071 c -0.0833,0.0616 -0.02859,-0.0209 -0.128907,0.0605 l -0.375,0.34571 c 0.205767,-0.21448 0.3213,-0.24974 0.503907,-0.40625 z m 3.636718,1.93945 c -0.03244,0.3117 0.06848,0.2254 -0.05469,0.69922 l 0.08203,-0.39453 c 0.04314,-0.27477 -0.03411,-0.13622 -0.02734,-0.30469 z" />
<path
style="color:#000000;display:inline;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke-width:0.264583;stroke-linecap:round;stroke-linejoin:round;-inkscape-stroke:none;paint-order:markers fill stroke"
d="M 151.04921,46.963142 C 121.61977,38.81461 91.095607,55.585198 82.017118,84.524529 72.808083,87.716145 65.656263,95.180993 63.013764,104.644 a 3.3076224,3.3076224 0 0 0 -0.0026,0.007 c -3.45948,12.49381 1.585489,25.69964 12.194328,32.78336 l -15.869814,44.98988 a 3.3076224,3.3076224 0 0 0 -0.02646,0.0774 c -8.296222,25.50588 -2.832656,49.10778 10.966159,67.6734 13.798761,18.56566 35.739433,32.26832 60.600033,39.15757 a 3.3076224,3.3076224 0 0 0 4.0704,-2.30397 l 35.99016,-129.87456 c 15.41693,3.49737 31.09431,-5.71394 35.35931,-21.10489 3.64704,-13.17461 -2.17509,-27.06928 -13.86734,-33.80893 0.35526,-25.58333 -16.55395,-48.388217 -41.37832,-55.275692 a 3.3076224,3.3076224 0 0 0 -0.003,0 z"
id="path468027" />
<path
style="color:#000000;display:inline;fill:url(#linearGradient468087);fill-opacity:1;fill-rule:evenodd;stroke-width:6.40675;stroke-linecap:round;stroke-linejoin:round;-inkscape-stroke:none;paint-order:markers fill stroke"
d="M 148.20084,51.746067 A 51.575654,51.575654 0 0 0 84.778574,87.524163 25.711532,25.711532 0 0 0 66.871759,105.38915 25.711532,25.711532 0 0 0 79.481854,134.90037 l -16.236289,46.02904 c -15.465028,47.5456 20.145931,86.37756 67.126595,99.3966 l 35.20458,-127.03979 c 0.18468,-0.66638 0.32322,-1.33393 0.44746,-2.00081 a 25.711532,25.711532 0 0 0 1.8115,0.71649 25.711532,25.711532 0 0 0 31.64409,-17.91152 25.711532,25.711532 0 0 0 -13.56019,-29.99423 51.575654,51.575654 0 0 0 -37.71876,-52.350083 z"
id="path468029" />
<circle
style="display:inline;fill:#000000;fill-rule:evenodd;stroke-width:0.501018;stroke-linecap:round;stroke-linejoin:round;paint-order:markers fill stroke"
id="circle468031"
cx="172.71246"
cy="-2.2050297"
r="4.7567234"
transform="rotate(9.1812844)" />
<path
id="path468033"
style="display:inline;fill:url(#linearGradient468085);fill-opacity:1;fill-rule:evenodd;stroke-width:14.3814;stroke-linecap:round;stroke-linejoin:round;paint-order:markers fill stroke"
d="m 151.76157,69.741041 -17.0793,-1.045369 c -7.50898,-1.696296 -14.80873,3.006805 -16.36744,10.545551 l -9.93386,45.199457 -3.36796,-0.76869 6.65281,-32.154497 c 1.5734,-7.493159 -2.77265,-13.976191 -9.74471,-14.535732 -6.972006,-0.559541 -13.851411,5.022585 -15.424808,12.515744 l -7.615846,36.738425 c -0.977874,4.65699 0.333084,8.92128 3.137482,11.61836 -1.44018,0.51649 -2.827179,1.1194 -4.107947,1.85706 l -15.454683,43.81312 c -13.837417,42.54174 11.941228,78.31293 50.632382,95.84981 8.46987,-2.10685 14.92256,-7.17841 13.76119,-14.44228 -6.41461,-40.12084 9.80512,-64.75439 24.97069,-90.10955 5.60258,-9.36685 -3.09279,-21.46249 -15.18004,-26.9957 7.14864,1.08654 13.88377,-3.51343 15.37348,-10.71853 l 10.48914,-50.697397 c 1.55871,-7.538747 -3.23162,-14.973485 -10.74058,-16.669782 z"
sodipodi:nodetypes="ccccccsccccccsscccc" />
<g
id="g468039"
transform="matrix(0.29719,0.04486979,-0.04486979,0.29719,63.615294,-13.150032)"
style="display:inline;fill:#24282c;fill-opacity:1">
<path
style="color:#000000;fill:#24282c;fill-opacity:1;fill-rule:evenodd;stroke-width:9.05993;stroke-linecap:round;stroke-linejoin:round;-inkscape-stroke:none;paint-order:markers fill stroke"
d="m 263.19617,447.2113 c 1e-5,8.60278 -17.48849,15.90448 -36.5586,16.19052 -17.88353,0.26825 -48.73412,-3.58081 -64.30051,-16.19052 -6.68471,-5.41502 24.83095,-20.0435 52.68242,-20.0435 27.85146,10e-6 48.17668,11.44072 48.17669,20.0435 z"
id="path468035" />
<path
style="color:#000000;fill:#24282c;fill-opacity:1;fill-rule:evenodd;stroke-linecap:round;stroke-linejoin:round;-inkscape-stroke:none;paint-order:markers fill stroke"
d="m 215.01953,422.63867 c -14.71881,0 -29.93599,3.76874 -41.01758,8.33203 -5.54079,2.28165 -10.00417,4.674 -13.14453,7.40821 -1.57018,1.3671 -2.95757,2.79028 -3.65625,5.11132 -0.69868,2.32105 0.38559,5.70147 2.28516,7.24024 17.49074,14.16855 48.60735,17.48034 67.21875,17.20117 10.09224,-0.15138 19.69635,-2.10393 27.16797,-5.35156 3.73581,-1.62382 6.95853,-3.5594 9.46289,-6.01367 2.50435,-2.45428 4.39063,-5.66996 4.39062,-9.35547 0,-3.93447 -2.12198,-7.21857 -4.97851,-10.00391 -2.85654,-2.78534 -6.6694,-5.22895 -11.30469,-7.35937 -9.27058,-4.26086 -21.87785,-7.20898 -36.42383,-7.20899 z m 0,9.0586 c 13.30545,0 24.78575,2.77262 32.64063,6.38281 3.92744,1.80509 6.93692,3.83396 8.76171,5.61328 1.8248,1.77932 2.24415,3.15066 2.24415,3.51758 0,0.61587 -0.3012,1.5415 -1.67188,2.88476 -1.37067,1.34327 -3.71235,2.86307 -6.73242,4.17578 -6.04014,2.62542 -14.71356,4.4669 -23.69141,4.60157 -16.43488,0.24652 -45.0348,-3.83895 -59.41601,-13.89258 1.85635,-1.52579 5.52331,-3.66711 10.29687,-5.63281 9.96791,-4.1047 24.43573,-7.65039 37.56836,-7.65039 z"
id="path468037" />
</g>
<circle
style="display:inline;fill:#000000;fill-rule:evenodd;stroke-width:0.835546;stroke-linecap:round;stroke-linejoin:round;paint-order:markers fill stroke"
id="circle468041"
cx="109.56187"
cy="96.200912"
r="7.9327707"
transform="rotate(9.1812844)" />
<circle
style="display:inline;fill:#000000;fill-rule:evenodd;stroke-width:1.10073;stroke-linecap:round;stroke-linejoin:round;paint-order:markers fill stroke"
id="circle468043"
cx="150.81599"
cy="90.339317"
r="10.450413"
transform="rotate(9.1812844)" />
<path
id="path468045"
style="display:inline;fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:0.264583"
d="m 166.98131,25.03982 c -4.57092,-4.308475 -11.77698,-1.611974 -14.86387,3.074564 -5.03156,7.638918 -0.91567,17.713854 6.60527,21.886174 5.13117,2.846599 -12.82488,2.538175 -7.38495,0.44151 -3.63553,-4.989671 -4.97961,-11.548877 -3.14065,-17.49335 2.51174,-8.119268 11.42825,-14.159388 19.83777,-10.822199 l -1.05357,2.913301"
sodipodi:nodetypes="csccscc" />
<path
id="path468047"
style="display:inline;fill:#d45500;fill-rule:evenodd;stroke:none;stroke-width:2.39711;stroke-linecap:round;stroke-linejoin:round;paint-order:markers fill stroke"
d="m 118.96094,130.91961 c -0.3398,2.25063 -5.20351,3.47012 -10.20392,2.7917 -4.68924,-0.63622 -12.608295,-2.86176 -16.182657,-6.77555 -1.534954,-1.68072 7.287921,-4.26295 14.574357,-3.16283 7.28647,1.10011 12.15203,4.89603 11.81222,7.14668 z"
sodipodi:nodetypes="sssss" />
<circle
style="display:inline;fill:url(#linearGradient468083);fill-opacity:1;fill-rule:evenodd;stroke-width:0.850747;stroke-linecap:round;stroke-linejoin:round;paint-order:markers fill stroke"
id="circle468049"
cx="150.81599"
cy="90.339317"
r="8.0770741"
transform="rotate(9.1812844)" />
<circle
style="display:inline;fill:url(#linearGradient468081);fill-opacity:1;fill-rule:evenodd;stroke-width:0.640834;stroke-linecap:round;stroke-linejoin:round;paint-order:markers fill stroke"
id="circle468051"
cx="109.56187"
cy="96.200912"
r="6.0841508"
transform="rotate(9.1812844)" />
<path
id="path468053"
style="display:inline;fill:#ffe6d5;stroke:none;stroke-width:0.175027px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m 106.41667,125.92949 c -0.30083,-0.0814 -0.58684,-0.11845 -0.83499,-0.10829 l -0.003,-0.008 -7.870771,0.68297 c 3.053001,0.64876 6.573941,1.13165 9.390511,1.81226 0.7978,0.19008 1.43476,0.0478 1.53435,-0.39256 0.12435,-0.55147 -0.64024,-1.36194 -1.70784,-1.81031 -0.16896,-0.0709 -0.33977,-0.13017 -0.50805,-0.17613 z"
sodipodi:nodetypes="ccccccsc" />
<circle
style="display:inline;fill:#000000;fill-rule:evenodd;stroke-width:0.52727;stroke-linecap:round;stroke-linejoin:round;paint-order:markers fill stroke"
id="circle468055"
cx="111.07069"
cy="94.049881"
r="5.0059538"
transform="rotate(9.1812844)" />
<circle
style="display:inline;fill:#000000;fill-rule:evenodd;stroke-width:0.718103;stroke-linecap:round;stroke-linejoin:round;paint-order:markers fill stroke"
id="circle468057"
cx="152.08492"
cy="87.839798"
r="6.8177404"
transform="rotate(9.1812844)" />
<ellipse
style="display:inline;fill:#ffffff;fill-rule:evenodd;stroke-width:0.114886;stroke-linecap:round;stroke-linejoin:round;paint-order:markers fill stroke"
id="ellipse468063"
cx="175.71031"
cy="-46.41983"
transform="matrix(0.92199027,0.38721305,-0.22029215,0.97543394,0,0)"
rx="1.5610961"
ry="0.76209718" />
<ellipse
style="display:inline;fill:#ffffff;fill-rule:evenodd;stroke-width:0.198981;stroke-linecap:round;stroke-linejoin:round;paint-order:markers fill stroke"
id="ellipse501045"
cx="90.979248"
cy="98.144699"
transform="matrix(0.99191138,0.12693233,0.04819858,0.99883777,0,0)"
rx="2.7038045"
ry="1.3199455" />
<ellipse
style="display:inline;fill:#ffffff;fill-rule:evenodd;stroke-width:0.262132;stroke-linecap:round;stroke-linejoin:round;paint-order:markers fill stroke"
id="ellipse501047"
cx="134.00233"
cy="92.296738"
transform="matrix(0.99191138,0.12693233,0.04819858,0.99883777,0,0)"
rx="3.5619173"
ry="1.7388595" />
<ellipse
style="display:inline;fill:#000000;fill-rule:evenodd;stroke-width:0.262132;stroke-linecap:round;stroke-linejoin:round;paint-order:markers fill stroke"
id="ellipse94360"
cx="180.79883"
cy="89.594574"
transform="matrix(0.99191138,0.12693233,0.04819858,0.99883777,0,0)"
rx="3.5619173"
ry="1.7388595" />
<ellipse
style="display:inline;fill:#000000;fill-rule:evenodd;stroke-width:0.262132;stroke-linecap:round;stroke-linejoin:round;paint-order:markers fill stroke"
id="ellipse94362"
cx="175.88506"
cy="95.137131"
transform="matrix(0.99191138,0.12693233,0.04819858,0.99883777,0,0)"
rx="3.5619173"
ry="1.7388595" />
<ellipse
style="display:inline;fill:#000000;fill-rule:evenodd;stroke-width:0.262132;stroke-linecap:round;stroke-linejoin:round;paint-order:markers fill stroke"
id="ellipse94364"
cx="172.08684"
cy="102.22662"
transform="matrix(0.99191138,0.12693233,0.04819858,0.99883777,0,0)"
rx="3.5619173"
ry="1.7388595" />
<path
id="path468065"
style="display:inline;fill:url(#linearGradient468079);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2.067;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:6.20101, 6.20101;stroke-dashoffset:0;stroke-opacity:1"
d="m 76.443167,164.78096 c -8.98263,17.95613 -10.606114,31.26936 -12.711959,45.87261 l 14.504379,5.65372 c 1.461955,-13.15182 4.758822,-25.4164 10.159947,-36.66339 l 18.291096,4.07345 5.58429,-14.23646 c -13.083112,-2.7037 -25.817084,-5.05931 -35.827753,-4.69993 z m 39.685173,5.48174 c -6.27743,17.57056 -12.62626,35.09 -17.27896,53.82268 l 16.39565,5.17665 c 4.48371,-17.68464 10.9103,-36.35991 20.38408,-53.59537 z m -25.484986,13.35239 c -4.780041,10.8073 -7.329302,22.32355 -9.418081,33.98615 l 14.579732,5.38178 c 2.068301,-11.88053 5.224065,-23.9078 10.019455,-36.15631 z"
sodipodi:nodetypes="ccccccccccccccccc" />
<path
id="path468067"
style="color:#000000;display:inline;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke-width:0.264583;stroke-linecap:round;stroke-linejoin:round;-inkscape-stroke:none;paint-order:markers fill stroke"
d="m 172.83175,159.97973 c -2.53815,-0.57878 -4.95861,-0.069 -6.62869,1.2015 -1.90865,1.45195 -3.00707,3.57314 -3.84839,5.86882 -1.6356,4.46305 5.12318,17.99749 -0.17579,30.09837 -5.64856,12.89889 -9.41723,7.90876 -14.21683,15.63904 -4.45995,7.18328 -3.89276,15.39534 0.41701,24.92251 0.45191,0.86654 1.00367,1.91476 1.79298,3.45861 0.69448,1.35924 1.38276,2.72748 1.86499,3.73038 0.24106,0.50144 0.4323,0.91819 0.5325,1.15613 0.0201,0.0476 0.0127,0.0281 0.0243,0.0588 0.0135,0.0669 0.003,0.0987 0.0246,0.17693 0.16722,0.58242 1.1071,1.38202 1.74495,1.43766 0.63791,0.0557 1.70268,-0.56859 1.96821,-1.11326 0.0355,-0.0734 0.0296,-0.10663 0.0545,-0.17039 0.0164,-0.0282 0.006,-0.0103 0.034,-0.0539 0.13991,-0.21701 0.40085,-0.59396 0.72515,-1.04608 0.64867,-0.90422 1.56347,-2.13307 2.48287,-3.35145 0.42262,-0.56005 0.76089,-0.99835 1.16205,-1.52464 8.52361,-0.54951 14.48954,-1.24894 18.44657,-8.42875 4.60584,-8.35715 14.66122,-17.41527 11.58319,-30.9822 -1.51262,-6.66698 -9.53122,-13.57191 -10.02154,-18.06607 -0.49033,-4.49414 -0.32544,-7.81987 0.25058,-9.39165 1.93059,-5.26799 -1.27579,-11.25522 -7.12464,-13.30455 -0.36558,-0.12808 -0.73012,-0.23315 -1.09273,-0.31578 z"
sodipodi:nodetypes="sssssccssccscccsscsssssss" />
<path
style="color:#000000;display:inline;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke-width:0.264583;stroke-linecap:round;stroke-linejoin:round;-inkscape-stroke:none;paint-order:markers fill stroke"
d="m 159.02873,234.72624 c 0.003,0.006 0.0116,0.0391 0.0116,0.0391 l -0.003,0.003 c -0.003,-0.014 -0.005,-0.0233 -0.009,-0.0405 z"
id="path468071" />
<path
style="color:#000000;display:inline;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke-width:0.264583;stroke-linecap:round;stroke-linejoin:round;-inkscape-stroke:none;paint-order:markers fill stroke"
d="m 158.53078,233.76519 c -3e-5,0 0.0206,0.0278 0.0243,0.0324 -0.0119,-0.0132 -0.0177,-0.0204 -0.0268,-0.031 0,0 0.003,-0.003 0.003,-0.003 z"
id="path468073" />
<path
id="path468075"
style="display:inline;fill:url(#linearGradient468077);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.63794;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;paint-order:markers fill stroke"
d="m 174.5663,165.62951 c -15.95112,-10.55452 -12.8193,-0.14759 -14.23625,3.72258 -1.41695,3.87011 11.67141,18.56203 6.88594,29.64505 -5.58617,11.97912 -17.04663,7.48858 -19.19565,20.87502 -0.73454,6.36545 2.78056,17.41246 6.64062,22.31027 0.42045,-0.56983 2.80331,-6.10568 4.36777,-7.28966 6.70636,1.62268 13.93944,-1.28421 17.38156,-7.50107 4.08509,-7.3781 15.40354,-20.18747 11.24082,-24.69759 -13.58939,-14.72358 -11.05908,-23.24224 -9.64215,-27.11241 1.41697,-3.87016 0.0338,-7.65191 -3.44266,-9.95219 z m -19.90534,76.55292 c -0.0228,0.031 -0.0343,0.0544 -0.0209,0.059 0.0135,0.004 0.0188,-0.0206 0.0209,-0.059 z"
sodipodi:nodetypes="ssccccsssscsc" />
</g>
</g>
</svg>

After

Width:  |  Height:  |  Size: 26 KiB

View File

@ -17,6 +17,7 @@
#include "utils/Logger.h"
#include <QDBusConnection>
#include <QDBusConnectionInterface>
#include <QDBusMessage>
#include <QDBusPendingCall>
#include <QDBusPendingReply>
@ -24,6 +25,8 @@
#include <QThread>
#include <memory>
#include <optional>
#include <unistd.h> // for close()
namespace
{
@ -36,7 +39,7 @@ namespace
// SPDX-License-Identifier: LGPL-3.0-or-later
/** @brief Class to manage sleep / suspend on inactivity
/** @brief Class to manage sleep / suspend on inactivity (via fd.o Inhibit service on the user bus)
*
* Create an object of this class on the heap. Call inhibitSleep()
* to (try to) stop system sleep / suspend. Call uninhibitSleep()
@ -166,19 +169,165 @@ PowerManagementInterface::uninhibitSleep()
replyWatcher, &QDBusPendingCallWatcher::finished, this, &PowerManagementInterface::uninhibitDBusCallFinished );
}
/** @brief Class to manage sleep / suspend on inactivity (via logind/CK2 service on the system bus)
*
* Create an object of this class on the heap. Call inhibitSleep()
* to (try to) stop system sleep / suspend. Call uninhibitSleep()
* when the object is no longer needed. The object self-deletes
* after uninhibitSleep() completes.
*/
class LoginManagerInterface : public QObject
{
Q_OBJECT
public:
static LoginManagerInterface* makeForRegisteredService( QObject* parent = nullptr );
~LoginManagerInterface() override;
public Q_SLOTS:
void inhibitSleep();
void uninhibitSleep();
private Q_SLOTS:
void inhibitDBusCallFinished( QDBusPendingCallWatcher* aWatcher );
private:
enum class Service
{
Logind,
ConsoleKit,
};
LoginManagerInterface( Service service, QObject* parent = nullptr );
int m_inhibitFd = -1;
Service m_service;
};
LoginManagerInterface*
LoginManagerInterface::makeForRegisteredService( QObject* parent )
{
if ( QDBusConnection::systemBus().interface()->isServiceRegistered( QStringLiteral( "org.freedesktop.login1" ) ) )
{
return new LoginManagerInterface( Service::Logind, parent );
}
else if ( QDBusConnection::systemBus().interface()->isServiceRegistered(
QStringLiteral( "org.freedesktop.ConsoleKit" ) ) )
{
return new LoginManagerInterface( Service::ConsoleKit, parent );
}
else
{
return nullptr;
}
}
LoginManagerInterface::LoginManagerInterface( Service service, QObject* parent )
: QObject( parent )
, m_service( service )
{
}
LoginManagerInterface::~LoginManagerInterface() = default;
void
LoginManagerInterface::inhibitDBusCallFinished( QDBusPendingCallWatcher* aWatcher )
{
QDBusPendingReply< uint > reply = *aWatcher;
if ( reply.isError() )
{
cError() << "Could not inhibit sleep:" << reply.error();
// m_inhibitFd = -1; // unchanged
}
else
{
m_inhibitFd = reply.argumentAt< 0 >();
cDebug() << "Sleep inhibited, file descriptor" << m_inhibitFd;
}
aWatcher->deleteLater();
}
void
LoginManagerInterface::inhibitSleep()
{
if ( m_inhibitFd == -1 )
{
cDebug() << "Sleep is already inhibited.";
return;
}
auto systemBus = QDBusConnection::systemBus();
QDBusMessage inhibitCall;
if ( m_service == Service::Logind )
{
inhibitCall = QDBusMessage::createMethodCall( QStringLiteral( "org.freedesktop.login1" ),
QStringLiteral( "/org/freedesktop/login1" ),
QStringLiteral( "org.freedesktop.login1.Manager" ),
QStringLiteral( "Inhibit" ) );
}
else if ( m_service == Service::ConsoleKit )
{
inhibitCall = QDBusMessage::createMethodCall( QStringLiteral( "org.freedesktop.ConsoleKit" ),
QStringLiteral( "/org/freedesktop/ConsoleKit/Manager" ),
QStringLiteral( "org.freedesktop.ConsoleKit.Manager" ),
QStringLiteral( "Inhibit" ) );
}
else
{
cError() << "System sleep interface not supported.";
return;
}
inhibitCall.setArguments(
{ { "sleep:shutdown" }, { tr( "Calamares" ) }, { tr( "Installation in progress", "@status" ) }, { "block" } } );
auto asyncReply = systemBus.asyncCall( inhibitCall );
auto* replyWatcher = new QDBusPendingCallWatcher( asyncReply, this );
QObject::connect(
replyWatcher, &QDBusPendingCallWatcher::finished, this, &LoginManagerInterface::inhibitDBusCallFinished );
}
void
LoginManagerInterface::uninhibitSleep()
{
if ( m_inhibitFd == -1 )
{
cDebug() << "Sleep was never inhibited.";
this->deleteLater();
return;
}
if ( close( m_inhibitFd ) != 0 )
{
cError() << "Could not uninhibit sleep:" << strerror( errno );
}
this->deleteLater();
}
} // namespace
namespace Calamares
{
SleepInhibitor::SleepInhibitor()
{
// Create a PowerManagementInterface object with intentionally no parent
// Create a LoginManagerInterface object with intentionally no parent
// so it is not destroyed along with this. Instead, when this
// is destroyed, **start** the uninhibit-sleep call which will (later)
// destroy the PowerManagementInterface object.
// destroy the LoginManagerInterface object.
if ( auto* l = LoginManagerInterface::makeForRegisteredService( nullptr ) )
{
l->inhibitSleep();
connect( this, &QObject::destroyed, l, &LoginManagerInterface::uninhibitSleep );
}
// If no login manager service was present, try the same thing
// with PowerManagementInterface.
else
{
auto* p = new PowerManagementInterface( nullptr );
p->inhibitSleep();
connect( this, &QObject::destroyed, p, &PowerManagementInterface::uninhibitSleep );
}
}
SleepInhibitor::~SleepInhibitor() = default;

View File

@ -0,0 +1,14 @@
---
requirements:
- name: /etc
mode: "0o755"
- name: /var/cache/pacman/pkg
mode: "0o755"
- name: /var/lib/pacman
mode: "0o755"
isRank: true
keyrings:
- archlinux
- manjaro

View File

@ -0,0 +1,295 @@
#!/usr/bin/env python3
# -*- coding: utf-8 -*-
#
# === This file is part of Calamares - <http://github.com/calamares> ===
#
# Copyright 2016, Artoo <artoo@manjaro.org>
# Copyright 2017, Philip Müller <philm@manjaro.org>
#
# Calamares is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# Calamares is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with Calamares. If not, see <http://www.gnu.org/licenses/>.
import os
import shutil
import subprocess
import sys
import re
import libcalamares
from libcalamares.utils import check_target_env_call, target_env_call, debug
from os.path import join
from subprocess import call
class OperationTracker:
def __init__(self):
self._downloaded = 0
self._installed = 0
self._total = 0
self._progress = float(0)
@property
def downloaded(self):
return self._downloaded
@downloaded.setter
def downloaded(self, value):
self._downloaded = value
@property
def installed(self):
return self._installed
@installed.setter
def installed(self, value):
self._installed = value
@property
def total(self):
return self._total
@total.setter
def total(self, value):
self._total = value
@property
def progress(self):
return self._progress
@progress.setter
def progress(self, value):
self._progress = value
def send_progress(self, counter, phase):
for p in range(phase):
if self.total == 0:
continue
step = 0.05
step += 0.95 * (counter / float(self.total))
self.progress += step / self.total
debug("Progress: {}".format(self.progress))
libcalamares.job.setprogress(self.progress)
ON_POSIX = 'posix' in sys.builtin_module_names
class PacmanController:
def __init__(self, root):
self.__root = root
self.__operations = libcalamares.globalstorage.value(
"packageOperations"
)
self.__tracker = OperationTracker()
self.__keyrings = libcalamares.job.configuration.get(
'keyrings',
[]
)
@property
def tracker(self):
return self.__tracker
@property
def root(self):
return self.__root
@property
def operations(self):
return self.__operations
@property
def keyrings(self):
return self.__keyrings
def init_keyring(self):
target_env_call(["pacman-key", "--init"])
def populate_keyring(self):
target_env_call(["pacman-key", "--populate"] + self.keyrings)
def parse_output(self, cmd):
cal_env = os.environ
cal_env["LC_ALL"] = "C"
last = []
phase = 0
process = subprocess.Popen(
cmd,
env=cal_env,
bufsize=1,
stdout=subprocess.PIPE,
close_fds=ON_POSIX
)
for line in iter(process.stdout.readline, b''):
pkgs = re.findall(r'\((\d+)\)', line.decode())
dl = re.findall(r'downloading\s+(.*).pkg.tar.xz', line.decode())
inst = re.findall(r'installing(.*)\.\.\.', line.decode())
if pkgs:
self.tracker.total = (int(pkgs[0]))
debug("Number of packages: {}".format(self.tracker.total))
if dl:
if dl != last:
self.tracker.downloaded += 1
phase = 1
debug("Downloading: {}".format(dl[0]))
debug("Downloaded packages: {}".format(
self.tracker.downloaded
))
self.tracker.send_progress(
self.tracker.downloaded,
phase
)
last = dl
elif inst:
self.tracker.installed += 1
phase = 2
debug("Installing: {}".format(inst[0]))
debug("Installed packages: {}".format(self.tracker.installed))
self.tracker.send_progress(self.tracker.installed, phase)
if process.returncode != 0:
return process.kill()
return None
def install(self, pkglist, local=False):
cachedir = join(self.root, "var/cache/pacman/pkg")
dbdir = join(self.root, "var/lib/pacman")
args = ["pacman", "--noconfirm"]
if local:
args.extend(["-U"])
else:
args.extend(["-Sy"])
args.extend([
"--cachedir",
cachedir,
"--root",
self.root,
"--dbpath",
dbdir
])
cmd = args + pkglist
self.parse_output(cmd)
def remove(self, pkglist):
args = ["chroot", self.root, "pacman", "-Rs", "--noconfirm"]
cmd = args + pkglist
check_target_env_call(cmd)
def run(self):
pkgs = []
for key in self.operations.keys():
if key == "install":
for pkg in self.operations[key]:
pkgs.extend([pkg["package"]])
self.install(pkgs)
elif key == "localInstall":
for pkg in self.operations[key]:
pkgs.extend([pkg["package"]])
self.install(pkgs, local=True)
elif key == "remove":
for pkg in self.operations[key]:
pkgs.extend([pkg["package"]])
self.tracker.total(len(pkgs))
self.remove(pkgs)
elif key == "try_install":
for pkg in self.operations[key]:
pkgs.extend([pkg["package"]])
self.install(pkgs)
elif key == "try_remove":
for pkg in self.operations[key]:
pkgs.extend([pkg["package"]])
self.remove(pkgs)
self.init_keyring()
self.populate_keyring()
return None
class ChrootController:
def __init__(self):
self.__root = libcalamares.globalstorage.value('rootMountPoint')
self.__requirements = libcalamares.job.configuration.get(
'requirements',
[]
)
self.__isRank = libcalamares.job.configuration['isRank']
@property
def root(self):
return self.__root
@property
def isRank(self):
return self.__isRank
@property
def requirements(self):
return self.__requirements
def make_dirs(self):
for target in self.requirements:
dest = self.root + target["name"]
if not os.path.exists(dest):
debug("Create: {}".format(dest))
mod = int(target["mode"], 8)
debug("Mode: {}".format(oct(mod)))
os.makedirs(dest, mode=mod)
def rank_mirrors(self):
call(["pacman-mirrors", "-f", "5"])
def copy_file(self, file):
if os.path.exists(os.path.join("/", file)):
shutil.copy2(
os.path.join("/", file),
os.path.join(self.root, file)
)
def prepare(self):
cal_umask = os.umask(0)
self.make_dirs()
path = join(self.root, "run")
os.chmod(path, 0o755)
os.umask(cal_umask)
self.copy_file('etc/pacman-mirrors.conf')
self.copy_file('etc/resolv.conf')
def run(self):
if self.isRank:
self.rank_mirrors()
self.prepare()
pacman = PacmanController(self.root)
return pacman.run()
def run():
"""
Create chroot dirs and install pacman,
kernel and netinstall selection
"""
targetRoot = ChrootController()
return targetRoot.run()

View File

@ -0,0 +1,6 @@
# Syntax is YAML 1.2
---
type: "job"
name: "chrootcfg"
interface: "python"
script: "main.py" #assumed relative to the current directory

View File

@ -3,7 +3,7 @@
#
# === This file is part of Calamares - <https://calamares.io> ===
#
# SPDX-FileCopyrightText: 2014-2018 Philip Müller <philm@manjaro.org>
# SPDX-FileCopyrightText: 2014-2022 Philip Müller <philm@manjaro.org>
# SPDX-FileCopyrightText: 2014-2015 Teo Mrnjavac <teo@kde.org>
# SPDX-FileCopyrightText: 2014 Kevin Kofler <kevin.kofler@chello.at>
# SPDX-FileCopyrightText: 2017 Alf Gaida <agaida@siduction.org>
@ -163,6 +163,8 @@ class DesktopEnvironment:
# /usr/local/bin) then the DE is assumed to be installed
# and to use that .desktop filename.
desktop_environments = [
DesktopEnvironment('/usr/bin/startplasmamobile', 'plasma-mobile'), # KDE Plasma Mobile 5.26+
DesktopEnvironment('/usr/bin/kwinwrapper', 'plasma-mobile'), # KDE Plasma Mobile
DesktopEnvironment('/usr/bin/startplasma-x11', 'plasma'), # KDE Plasma 5.17+
DesktopEnvironment('/usr/bin/startkde', 'plasma'), # KDE Plasma 5
DesktopEnvironment('/usr/bin/startkde', 'kde-plasma'), # KDE Plasma 4

View File

@ -3,7 +3,7 @@
#
# === This file is part of Calamares - <https://calamares.io> ===
#
# SPDX-FileCopyrightText: 2014-2015 Philip Müller <philm@manjaro.org>
# SPDX-FileCopyrightText: 2014-2015,2019-2020 Philip Müller <philm@manjaro.org>
# SPDX-FileCopyrightText: 2015-2017 Teo Mrnjavac <teo@kde.org>
# SPDX-FileCopyrightText: 2017 Alf Gaida <agaida@siduction.org>
# SPDX-FileCopyrightText: 2017 2019, Adriaan de Groot <groot@kde.org>
@ -156,6 +156,8 @@ def modify_grub_default(partitions, root_mount_point, distributor):
have_plymouth = plymouth_bin == 0
use_systemd_naming = dracut_bin == 0 or uses_systemd_hook
enable_apparmor = "apparmor=1"
set_security = ""
use_splash = ""
swap_uuid = ""
swap_outer_uuid = ""
@ -225,6 +227,11 @@ def modify_grub_default(partitions, root_mount_point, distributor):
if use_splash:
kernel_params.append(use_splash)
if os.path.exists(os.path.join(root_mount_point, "usr/lib/libapparmor.so")):
set_security = "security=apparmor"
kernel_params.append(enable_apparmor)
kernel_params.append(set_security)
if swap_uuid:
kernel_params.append(f"resume=UUID={swap_uuid}")

View File

@ -191,6 +191,13 @@ def find_initcpio_features(partitions, root_mount_point):
if detect_plymouth():
hooks.append("plymouth")
# Detect bootsplash theme and enable hook
bootsplash_folder = os.path.join(root_mount_point, "usr/lib/firmware/bootsplash-themes")
if os.path.exists(bootsplash_folder):
bootsplash_themes = os.listdir(bootsplash_folder)
for bootsplash_theme in bootsplash_themes:
hooks.append("bootsplash-{!s}".format(bootsplash_theme))
for partition in partitions:
if partition["fs"] == "linuxswap" and not partition.get("claimed", None):
# Skip foreign swap

113
src/modules/mhwdcfg/main.py Normal file
View File

@ -0,0 +1,113 @@
#!/usr/bin/env python3
# -*- coding: utf-8 -*-
#
# === This file is part of Calamares - <http://github.com/calamares> ===
#
# Copyright 2016, Artoo <artoo@manjaro.org>
# Copyright 2016-2019, Philip Müller <philm@manjaro.org>
#
# Calamares is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# Calamares is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with Calamares. If not, see <http://www.gnu.org/licenses/>.
import libcalamares
from libcalamares.utils import target_env_call, debug
from os.path import join
from subprocess import call
class MhwdController:
def __init__(self):
self.__root = libcalamares.globalstorage.value("rootMountPoint")
self.__bus = libcalamares.job.configuration.get('bus', [])
self.__identifier = libcalamares.job.configuration.get(
'identifier',
[]
)
self.__local = libcalamares.job.configuration['local']
self.__repo = libcalamares.job.configuration['repo']
self._driver = libcalamares.job.configuration['driver']
@property
def driver(self):
return self._driver
@driver.setter
def driver(self, value):
self._driver = value
@property
def root(self):
return self.__root
@property
def local(self):
return self.__local
@property
def repo(self):
return self.__repo
@property
def identifier(self):
return self.__identifier
@property
def bus(self):
return self.__bus
def umount(self, mp):
call(["umount", "-l", join(self.root, mp)])
def mount(self, mp):
call(["mount", "-B", "/" + mp, join(self.root, mp)])
def rmdir(self, dir):
call(["rm", "-Rf", join(self.root, dir)])
def mkdir(self, dir):
call(["mkdir", "-p", join(self.root, dir)])
def configure(self, name, id):
cmd = ["mhwd", "-a", str(name), str(self.driver), str(id).zfill(4)]
if self.local:
self.mkdir("opt/mhwd")
self.mount("opt/mhwd")
self.mount("var/lib/mhwd/db")
cmd.extend(["--pmconfig", self.repo])
self.mount("etc/resolv.conf")
target_env_call(cmd)
if self.local:
self.umount("opt/mhwd")
self.rmdir("opt/mhwd")
self.umount("var/lib/mhwd/db")
self.umount("etc/resolv.conf")
def run(self):
for b in self.bus:
for id in self.identifier['net']:
self.configure(b, id)
for id in self.identifier['video']:
self.configure(b, id)
return None
def run():
""" Configure the hardware """
mhwd = MhwdController()
return mhwd.run()

View File

@ -0,0 +1,19 @@
---
bus:
- pci
# - usb
identifier:
net:
- 200
- 280
video:
- 300
- 302
- 380
driver: free
local: true
repo: /opt/mhwd/pacman-mhwd.conf

View File

@ -0,0 +1,6 @@
# Syntax is YAML 1.2
---
type: "job"
name: "mhwdcfg"
interface: "python"
script: "main.py" #assumed relative to the current directory

View File

@ -79,3 +79,4 @@ def run():
dmcrypt_conf_path = dmcrypt_conf_path.lstrip('/')
return write_dmcrypt_conf(partitions, root_mount_point, dmcrypt_conf_path)

Binary file not shown.

After

Width:  |  Height:  |  Size: 70 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 46 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 37 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.7 KiB

View File

@ -59,8 +59,8 @@ method: legacy
# with the explicit item-*id* "".
#
labels:
step: "Packages"
step[nl]: "Pakketten"
step: "Office Suite"
step[de]: "Office-Paket"
# (Optional) item-*id* of pre-selected list-view item.
# Pre-selects one of the items below.
@ -149,24 +149,23 @@ labels:
# key which will override the data from AppStream.
items:
- id: ""
# packages: [] # This item installs no packages
name: "No Desktop"
name[nl]: "Geen desktop"
description: "Please pick a desktop environment from the list. If you don't want to install a desktop, that's fine, your system will start up in text-only mode and you can install a desktop environment later."
description[nl]: "Kies eventueel een desktop-omgeving uit deze lijst. Als u geen desktop-omgeving wenst te gebruiken, kies er dan geen. In dat geval start het systeem straks op in tekst-modus en kunt u later alsnog een desktop-omgeving installeren."
screenshot: ":/images/no-selection.png"
- id: kde
packages: [ kde-frameworks, kde-plasma, kde-gear ]
name: Plasma Desktop
description: "KDE Plasma Desktop, simple by default, a clean work area for real-world usage which intends to stay out of your way. Plasma is powerful when needed, enabling the user to create the workflow that makes them more effective to complete their tasks."
screenshot: ":/images/kde.png"
- id: gnome
packages: [ gnome-all ]
name: GNOME
description: GNU Networked Object Modeling Environment Desktop
screenshot: ":/images/gnome.png"
- id: calamares
appdata: ../io.calamares.calamares.appdata.xml
screenshot: ":/images/calamares.png"
- id: kate
appstream: org.kde.kwrite.desktop
package: ""
name: "No Office Suite"
name[de]: "Kein Office Paket"
description: "Please pick an office suite from the list. If you don't want to install an office suite, that's fine, you can install one later as needed."
description[de]: "Bitte wählen Sie ein Office-Paket von der Liste. Wenn Sie kein Office installieren wollen, kann dies auch zu einer späteren Zeitpunkt erfolgen."
screenshot: ":/images/choose-office.jpg"
- id: "libreoffice-still"
package: "libreoffice-still"
name: "LibreOffice"
name[de]: "LibreOffice"
description: "LibreOffice is a powerful and free office suite, used by millions of people around the world. Its clean interface and feature-rich tools help you unleash your creativity and enhance your productivity."
description[de]: "LibreOffice ist ein leistungsstarkes Office-Paket. Die klare Oberfläche und mächtigen Werkzeuge lassen Sie Ihre Kreativität entfalten und Ihre Produktivität steigern."
screenshot: ":/images/LibreOffice.jpg"
- id: "freeoffice"
package: "freeoffice"
name: "FreeOffice"
name[de]: "FreeOffice"
description: "FreeOffice is a powerful Office suite with word processing, spreadsheet and presentation software. It is seamlessly compatible with Microsoft Office and can be used free of charge. For long-term use, request a free product key directly in the application."
description[de]: "FreeOffice ist ein leistungsstarkes Office-Paket mit Textverarbeitung, Tabellenkalkulation und Präsentationssoftware. Es ist nahtlos kompatible zu Microsoft Office und kann frei genutzt werden. Für eine Langzeitnutzung kann ein Produktkey im Programm angefordert werden."
screenshot: ":/images/FreeOffice.jpg"

View File

@ -1,6 +1,7 @@
<RCC>
<qresource prefix="/">
<file>images/no-selection.png</file>
<file>images/calamares.png</file>
<file>images/choose-office.jpg</file>
<file>images/FreeOffice.jpg</file>
<file>images/LibreOffice.jpg</file>
</qresource>
</RCC>

View File

@ -1,6 +1,7 @@
/* === This file is part of Calamares - <https://calamares.io> ===
*
* SPDX-FileCopyrightText: 2014 Aurélien Gâteau <agateau@kde.org>
* SPDX-FileCopyrightText: 2018, Philip Müller <philm@manjaro.org>
* SPDX-FileCopyrightText: 2017, 2019 Adriaan de Groot <groot@kde.org>
* SPDX-License-Identifier: GPL-3.0-or-later
*

152
src/modules/postcfg/main.py Normal file
View File

@ -0,0 +1,152 @@
#!/usr/bin/env python3
# -*- coding: utf-8 -*-
#
# === This file is part of Calamares - <http://github.com/calamares> ===
#
# Copyright 2014 - 2024, Philip Müller <philm@manjaro.org>
# Copyright 2016, Artoo <artoo@manjaro.org>
#
# Calamares is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# Calamares is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with Calamares. If not, see <http://www.gnu.org/licenses/>.
import libcalamares
import subprocess
import os
from shutil import copy2, copytree
from os.path import join, exists
from libcalamares.utils import target_env_call
class ConfigController:
def __init__(self):
self.__root = libcalamares.globalstorage.value("rootMountPoint")
self.__keyrings = libcalamares.job.configuration.get('keyrings', [])
@property
def root(self):
return self.__root
@property
def keyrings(self):
return self.__keyrings
def init_keyring(self):
target_env_call(["pacman-key", "--init"])
def populate_keyring(self):
target_env_call(["pacman-key", "--populate"] + self.keyrings)
def terminate(self, proc):
target_env_call(['killall', '-9', proc])
def remove_symlink(self, target):
for root, dirs, files in os.walk("/" + target):
for filename in files:
path = os.path.join(root, filename)
if os.path.islink(path):
os.unlink(path)
for folder in dirs:
path = os.path.join(root, folder)
if os.path.islink(path):
os.unlink(path)
def copy_file(self, file):
if exists("/" + file):
copy2("/" + file, join(self.root, file))
def copy_folder(self, source, target):
if exists("/" + source):
copytree("/" + source, join(self.root, target), symlinks=True, ignore_dangling_symlinks=True, dirs_exist_ok=True)
def remove_pkg(self, pkg, path):
if exists(join(self.root, path)):
target_env_call(['pacman', '-R', '--noconfirm', pkg])
def umount(self, mp):
subprocess.call(["umount", "-l", join(self.root, mp)])
def mount(self, mp):
subprocess.call(["mount", "-B", "/" + mp, join(self.root, mp)])
def rmdir(self, dir):
subprocess.call(["rm", "-Rf", join(self.root, dir)])
def mkdir(self, dir):
subprocess.call(["mkdir", "-p", join(self.root, dir)])
def run(self):
self.init_keyring()
self.populate_keyring()
# Generate mirror list
if exists(join(self.root, "usr/bin/pacman-mirrors")):
if libcalamares.globalstorage.value("hasInternet"):
target_env_call(["pacman-mirrors", "-f3"])
else:
self.copy_file('etc/pacman.d/mirrorlist')
# Initialize package manager databases
if libcalamares.globalstorage.value("hasInternet"):
target_env_call(["pacman", "-Syy"])
# Remove symlinks before copying
self.remove_symlink('root')
# Copy skel to root
self.copy_folder('etc/skel', 'root')
# Workaround for pacman-key bug
# FS#45351 https://bugs.archlinux.org/task/45351
# We have to kill gpg-agent because if it stays
# around we can't reliably unmount
# the target partition.
self.terminate('gpg-agent')
# Workaround for BTRFS amd-ucode.img bug
# https://gitlab.manjaro.org/release-plan/calamares/-/issues/2
# We have to copy the amd-ucode.img from the live-session over to target
self.copy_file('boot/amd-ucode.img')
# Enable 'menu_auto_hide' when supported in grubenv
if exists(join(self.root, "usr/bin/grub-set-bootflag")):
target_env_call(["grub-editenv", "-", "set", "menu_auto_hide=1", "boot_success=1"])
# Install Office Suite if selected (WIP)
office_package = libcalamares.globalstorage.value("packagechooser_packagechooser")
if not office_package:
libcalamares.utils.warning("no office suite selected, {!s}".format(office_package))
else:
# For PoC we added the Office Packages to mhwd-live overlay in 18.1.0
cmd = ["pacman", "-S", office_package, "--noconfirm", "--config", "/opt/mhwd/pacman-mhwd.conf" ]
self.mkdir("opt/mhwd")
self.mount("opt/mhwd")
self.mount("etc/resolv.conf")
target_env_call(cmd)
self.umount("opt/mhwd")
self.rmdir("opt/mhwd")
self.umount("etc/resolv.conf")
# Remove calamares
self.remove_pkg("calamares", "usr/bin/calamares")
self.remove_pkg("calamares-git", "usr/bin/calamares")
return None
def run():
""" Misc postinstall configurations """
config = ConfigController()
return config.run()

View File

@ -0,0 +1,6 @@
# Syntax is YAML 1.2
---
type: "job"
name: "postcfg"
interface: "python"
script: "main.py" #assumed relative to the current directory

View File

@ -0,0 +1,4 @@
---
keyrings:
- archlinux
- manjaro

View File

@ -52,3 +52,20 @@
# By default, no changes are made.
units: []
# Manjaro settings
units:
- name: "NetworkManager"
action: "enable"
mandatory: true
- name: "org.cups.cupsd"
action: "enable"
- name: "graphical"
action: "enable"
mandatory: true
- name: "pacman-init"
action: "mask"

View File

@ -0,0 +1,103 @@
#!/usr/bin/env python3
# -*- coding: utf-8 -*-
#
# === This file is part of Calamares - <http://github.com/calamares> ===
#
# Copyright 2016, Artoo <artoo@manjaro.org>
# Copyright 2017, Philip Müller <philm@manjaro.org>
#
# Calamares is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# Calamares is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with Calamares. If not, see <http://www.gnu.org/licenses/>.
import libcalamares
from libcalamares.utils import target_env_call
from os.path import exists, join
class ServicesController:
def __init__(self):
self.__root = libcalamares.globalstorage.value('rootMountPoint')
self.__services = libcalamares.job.configuration.get('services', [])
@property
def root(self):
return self.__root
@property
def services(self):
return self.__services
def setExpression(self, pattern, file):
target_env_call(["sed", "-e", pattern, "-i", file])
def configure(self):
self.setExpression(
's|^.*rc_shell=.*|rc_shell="/usr/bin/sulogin"|',
"/etc/rc.conf"
)
self.setExpression(
's|^.*rc_controller_cgroups=.*|rc_controller_cgroups="YES"|',
"/etc/rc.conf"
)
exp = 's|^.*keymap=.*|keymap="' \
+ libcalamares.globalstorage.value("keyboardLayout") \
+ '"|'
self.setExpression(exp, "/etc/conf.d/keymaps")
self.setExpression(
's|pam_systemd.so|pam_ck_connector.so nox11|',
"/etc/pam.d/system-login"
)
for dm in libcalamares.globalstorage.value("displayManagers"):
exp = 's|^.*DISPLAYMANAGER=.*|DISPLAYMANAGER="' + dm + '"|'
self.setExpression(exp, "/etc/conf.d/xdm")
if dm == "lightdm":
self.setExpression(
's|^.*minimum-vt=.*|minimum-vt=7|',
"/etc/lightdm/lightdm.conf"
)
self.setExpression(
's|pam_systemd.so|pam_ck_connector.so nox11|',
"/etc/pam.d/lightdm-greeter"
)
if exists(join(self.root, "etc/pulse/client.conf")):
self.setExpression(
's|autospawn = no|autospawn = yes|',
"/etc/pulse/client.conf"
)
def update(self, action, state):
for svc in self.services[state]:
if exists(self.root + "/etc/init.d/" + svc["name"]):
target_env_call([
"rc-update",
action,
svc["name"],
svc["runlevel"]
])
def run(self):
self.configure()
for state in self.services.keys():
if state == "enabled":
self.update("add", "enabled")
elif state == "disabled":
self.update("del", "disabled")
return None
def run():
""" Setup openrc services """
sc = ServicesController()
return sc.run()

View File

@ -0,0 +1,6 @@
---
type: "job"
name: "servicescfg"
interface: "python"
requires: []
script: "main.py"

View File

@ -0,0 +1,10 @@
---
services:
enabled:
- name: "NetworkManager"
runlevel: "default"
- name: "cups"
runlevel: "default"
# disabled:
# - name: "hwclock"
# runlevel: "boot"