Add icon and update README

This commit is contained in:
Victor Fuentes 2022-09-07 23:49:34 -04:00
parent 5bc30308e5
commit 2f6cb539de
No known key found for this signature in database
GPG Key ID: 0A88B68D6A9ACAE0
9 changed files with 503 additions and 541 deletions

172
Cargo.lock generated
View File

@ -17,12 +17,6 @@ version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
[[package]]
name = "adler32"
version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234"
[[package]] [[package]]
name = "ahash" name = "ahash"
version = "0.7.6" version = "0.7.6"
@ -36,9 +30,9 @@ dependencies = [
[[package]] [[package]]
name = "aho-corasick" name = "aho-corasick"
version = "0.7.18" version = "0.7.19"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f" checksum = "b4f55bd91a0978cbfd91c457a164bab8b4001c833b7f323132c0a4e1922dd44e"
dependencies = [ dependencies = [
"memchr", "memchr",
] ]
@ -73,9 +67,9 @@ dependencies = [
[[package]] [[package]]
name = "anyhow" name = "anyhow"
version = "1.0.62" version = "1.0.64"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1485d4d2cc45e7b201ee3767015c96faa5904387c9d87c6efdd0fb511f12d305" checksum = "b9a8f622bcf6ff3df478e9deba3e03e4e04b300f8e6a139e192c05fa3490afc7"
[[package]] [[package]]
name = "async-broadcast" name = "async-broadcast"
@ -204,7 +198,7 @@ checksum = "ec8a7b6a70fde80372154c65702f00a0f56f3e1c36abbc6c440484be248856db"
[[package]] [[package]]
name = "cairo-rs" name = "cairo-rs"
version = "0.16.0" version = "0.16.0"
source = "git+https://github.com/gtk-rs/gtk-rs-core#679b3717abeea7ef0837995180d8a85dc342dadd" source = "git+https://github.com/gtk-rs/gtk-rs-core#9fe7e5ce970d5e992b5b4f393c52670cb2443a62"
dependencies = [ dependencies = [
"bitflags", "bitflags",
"cairo-sys-rs", "cairo-sys-rs",
@ -217,7 +211,7 @@ dependencies = [
[[package]] [[package]]
name = "cairo-sys-rs" name = "cairo-sys-rs"
version = "0.16.0" version = "0.16.0"
source = "git+https://github.com/gtk-rs/gtk-rs-core#679b3717abeea7ef0837995180d8a85dc342dadd" source = "git+https://github.com/gtk-rs/gtk-rs-core#9fe7e5ce970d5e992b5b4f393c52670cb2443a62"
dependencies = [ dependencies = [
"glib-sys", "glib-sys",
"libc", "libc",
@ -256,9 +250,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
[[package]] [[package]]
name = "clap" name = "clap"
version = "3.2.17" version = "3.2.20"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "29e724a68d9319343bb3328c9cc2dfde263f4b3142ee1059a9980580171c954b" checksum = "23b71c3ce99b7611011217b366d923f1d0a7e07a92bb2dbf1e84508c673ca3bd"
dependencies = [ dependencies = [
"atty", "atty",
"bitflags", "bitflags",
@ -273,9 +267,9 @@ dependencies = [
[[package]] [[package]]
name = "clap_derive" name = "clap_derive"
version = "3.2.17" version = "3.2.18"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "13547f7012c01ab4a0e8f8967730ada8f9fdf419e8b6c792788f39cf4e46eefa" checksum = "ea0c8bce528c4be4da13ea6fead8965e95b6073585a2f05204bd8f4119f82a65"
dependencies = [ dependencies = [
"heck", "heck",
"proc-macro-error", "proc-macro-error",
@ -323,9 +317,9 @@ checksum = "328b822bdcba4d4e402be8d9adb6eebf269f969f8eadef977a553ff3c4fbcb58"
[[package]] [[package]]
name = "cpufeatures" name = "cpufeatures"
version = "0.2.4" version = "0.2.5"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dc948ebb96241bb40ab73effeb80d9f93afaad49359d159a5e61be51619fe813" checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320"
dependencies = [ dependencies = [
"libc", "libc",
] ]
@ -394,15 +388,6 @@ dependencies = [
"num_cpus", "num_cpus",
] ]
[[package]]
name = "deflate"
version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c86f7e25f518f4b81808a2cf1c50996a61f5c2eb394b2393bd87f2a4780a432f"
dependencies = [
"adler32",
]
[[package]] [[package]]
name = "digest" name = "digest"
version = "0.9.0" version = "0.9.0"
@ -583,9 +568,9 @@ dependencies = [
[[package]] [[package]]
name = "futures" name = "futures"
version = "0.3.23" version = "0.3.24"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ab30e97ab6aacfe635fad58f22c2bb06c8b685f7421eb1e064a729e2a5f481fa" checksum = "7f21eda599937fba36daeb58a22e8f5cee2d14c4a17b5b7739c7c8e5e3b8230c"
dependencies = [ dependencies = [
"futures-channel", "futures-channel",
"futures-core", "futures-core",
@ -598,9 +583,9 @@ dependencies = [
[[package]] [[package]]
name = "futures-channel" name = "futures-channel"
version = "0.3.23" version = "0.3.24"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2bfc52cbddcfd745bf1740338492bb0bd83d76c67b445f91c5fb29fae29ecaa1" checksum = "30bdd20c28fadd505d0fd6712cdfcb0d4b5648baf45faef7f852afb2399bb050"
dependencies = [ dependencies = [
"futures-core", "futures-core",
"futures-sink", "futures-sink",
@ -608,15 +593,15 @@ dependencies = [
[[package]] [[package]]
name = "futures-core" name = "futures-core"
version = "0.3.23" version = "0.3.24"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d2acedae88d38235936c3922476b10fced7b2b68136f5e3c03c2d5be348a1115" checksum = "4e5aa3de05362c3fb88de6531e6296e85cde7739cccad4b9dfeeb7f6ebce56bf"
[[package]] [[package]]
name = "futures-executor" name = "futures-executor"
version = "0.3.23" version = "0.3.24"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1d11aa21b5b587a64682c0094c2bdd4df0076c5324961a40cc3abd7f37930528" checksum = "9ff63c23854bee61b6e9cd331d523909f238fc7636290b96826e9cfa5faa00ab"
dependencies = [ dependencies = [
"futures-core", "futures-core",
"futures-task", "futures-task",
@ -625,15 +610,15 @@ dependencies = [
[[package]] [[package]]
name = "futures-io" name = "futures-io"
version = "0.3.23" version = "0.3.24"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "93a66fc6d035a26a3ae255a6d2bca35eda63ae4c5512bef54449113f7a1228e5" checksum = "bbf4d2a7a308fd4578637c0b17c7e1c7ba127b8f6ba00b29f717e9655d85eb68"
[[package]] [[package]]
name = "futures-macro" name = "futures-macro"
version = "0.3.23" version = "0.3.24"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0db9cce532b0eae2ccf2766ab246f114b56b9cf6d445e00c2549fbc100ca045d" checksum = "42cd15d1c7456c04dbdf7e88bcd69760d74f3a798d6444e16974b505b0e62f17"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
@ -651,21 +636,21 @@ dependencies = [
[[package]] [[package]]
name = "futures-sink" name = "futures-sink"
version = "0.3.23" version = "0.3.24"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ca0bae1fe9752cf7fd9b0064c674ae63f97b37bc714d745cbde0afb7ec4e6765" checksum = "21b20ba5a92e727ba30e72834706623d94ac93a725410b6a6b6fbc1b07f7ba56"
[[package]] [[package]]
name = "futures-task" name = "futures-task"
version = "0.3.23" version = "0.3.24"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "842fc63b931f4056a24d59de13fb1272134ce261816e063e634ad0c15cdc5306" checksum = "a6508c467c73851293f390476d4491cf4d227dbabcd4170f3bb6044959b294f1"
[[package]] [[package]]
name = "futures-util" name = "futures-util"
version = "0.3.23" version = "0.3.24"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f0828a5471e340229c11c77ca80017937ce3c58cb788a17e5f1c2d5c485a9577" checksum = "44fb6cb1be61cc1d2e43b262516aafcf63b241cffdb1d3fa115f91d9c7b09c90"
dependencies = [ dependencies = [
"futures-channel", "futures-channel",
"futures-core", "futures-core",
@ -682,7 +667,7 @@ dependencies = [
[[package]] [[package]]
name = "gdk-pixbuf" name = "gdk-pixbuf"
version = "0.16.0" version = "0.16.0"
source = "git+https://github.com/gtk-rs/gtk-rs-core#679b3717abeea7ef0837995180d8a85dc342dadd" source = "git+https://github.com/gtk-rs/gtk-rs-core#9fe7e5ce970d5e992b5b4f393c52670cb2443a62"
dependencies = [ dependencies = [
"bitflags", "bitflags",
"gdk-pixbuf-sys", "gdk-pixbuf-sys",
@ -694,7 +679,7 @@ dependencies = [
[[package]] [[package]]
name = "gdk-pixbuf-sys" name = "gdk-pixbuf-sys"
version = "0.16.0" version = "0.16.0"
source = "git+https://github.com/gtk-rs/gtk-rs-core#679b3717abeea7ef0837995180d8a85dc342dadd" source = "git+https://github.com/gtk-rs/gtk-rs-core#9fe7e5ce970d5e992b5b4f393c52670cb2443a62"
dependencies = [ dependencies = [
"gio-sys", "gio-sys",
"glib-sys", "glib-sys",
@ -706,7 +691,7 @@ dependencies = [
[[package]] [[package]]
name = "gdk4" name = "gdk4"
version = "0.5.0" version = "0.5.0"
source = "git+https://github.com/gtk-rs/gtk4-rs#d6139f4e294437491a72f66de9d8363bf7c004d1" source = "git+https://github.com/gtk-rs/gtk4-rs#1d4d54ba8ed3e9ed5757ab295823f5feef1b0289"
dependencies = [ dependencies = [
"bitflags", "bitflags",
"cairo-rs", "cairo-rs",
@ -721,7 +706,7 @@ dependencies = [
[[package]] [[package]]
name = "gdk4-sys" name = "gdk4-sys"
version = "0.5.0" version = "0.5.0"
source = "git+https://github.com/gtk-rs/gtk4-rs#d6139f4e294437491a72f66de9d8363bf7c004d1" source = "git+https://github.com/gtk-rs/gtk4-rs#1d4d54ba8ed3e9ed5757ab295823f5feef1b0289"
dependencies = [ dependencies = [
"cairo-sys-rs", "cairo-sys-rs",
"gdk-pixbuf-sys", "gdk-pixbuf-sys",
@ -787,7 +772,7 @@ checksum = "22030e2c5a68ec659fde1e949a745124b48e6fa8b045b7ed5bd1fe4ccc5c4e5d"
[[package]] [[package]]
name = "gio" name = "gio"
version = "0.16.0" version = "0.16.0"
source = "git+https://github.com/gtk-rs/gtk-rs-core#679b3717abeea7ef0837995180d8a85dc342dadd" source = "git+https://github.com/gtk-rs/gtk-rs-core#9fe7e5ce970d5e992b5b4f393c52670cb2443a62"
dependencies = [ dependencies = [
"bitflags", "bitflags",
"futures-channel", "futures-channel",
@ -804,7 +789,7 @@ dependencies = [
[[package]] [[package]]
name = "gio-sys" name = "gio-sys"
version = "0.16.0" version = "0.16.0"
source = "git+https://github.com/gtk-rs/gtk-rs-core#679b3717abeea7ef0837995180d8a85dc342dadd" source = "git+https://github.com/gtk-rs/gtk-rs-core#9fe7e5ce970d5e992b5b4f393c52670cb2443a62"
dependencies = [ dependencies = [
"glib-sys", "glib-sys",
"gobject-sys", "gobject-sys",
@ -816,7 +801,7 @@ dependencies = [
[[package]] [[package]]
name = "glib" name = "glib"
version = "0.16.0" version = "0.16.0"
source = "git+https://github.com/gtk-rs/gtk-rs-core#679b3717abeea7ef0837995180d8a85dc342dadd" source = "git+https://github.com/gtk-rs/gtk-rs-core#9fe7e5ce970d5e992b5b4f393c52670cb2443a62"
dependencies = [ dependencies = [
"bitflags", "bitflags",
"futures-channel", "futures-channel",
@ -837,7 +822,7 @@ dependencies = [
[[package]] [[package]]
name = "glib-macros" name = "glib-macros"
version = "0.16.0" version = "0.16.0"
source = "git+https://github.com/gtk-rs/gtk-rs-core#679b3717abeea7ef0837995180d8a85dc342dadd" source = "git+https://github.com/gtk-rs/gtk-rs-core#9fe7e5ce970d5e992b5b4f393c52670cb2443a62"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"heck", "heck",
@ -851,7 +836,7 @@ dependencies = [
[[package]] [[package]]
name = "glib-sys" name = "glib-sys"
version = "0.16.0" version = "0.16.0"
source = "git+https://github.com/gtk-rs/gtk-rs-core#679b3717abeea7ef0837995180d8a85dc342dadd" source = "git+https://github.com/gtk-rs/gtk-rs-core#9fe7e5ce970d5e992b5b4f393c52670cb2443a62"
dependencies = [ dependencies = [
"libc", "libc",
"system-deps", "system-deps",
@ -860,7 +845,7 @@ dependencies = [
[[package]] [[package]]
name = "gobject-sys" name = "gobject-sys"
version = "0.16.0" version = "0.16.0"
source = "git+https://github.com/gtk-rs/gtk-rs-core#679b3717abeea7ef0837995180d8a85dc342dadd" source = "git+https://github.com/gtk-rs/gtk-rs-core#9fe7e5ce970d5e992b5b4f393c52670cb2443a62"
dependencies = [ dependencies = [
"glib-sys", "glib-sys",
"libc", "libc",
@ -870,7 +855,7 @@ dependencies = [
[[package]] [[package]]
name = "graphene-rs" name = "graphene-rs"
version = "0.16.0" version = "0.16.0"
source = "git+https://github.com/gtk-rs/gtk-rs-core#679b3717abeea7ef0837995180d8a85dc342dadd" source = "git+https://github.com/gtk-rs/gtk-rs-core#9fe7e5ce970d5e992b5b4f393c52670cb2443a62"
dependencies = [ dependencies = [
"glib", "glib",
"graphene-sys", "graphene-sys",
@ -880,7 +865,7 @@ dependencies = [
[[package]] [[package]]
name = "graphene-sys" name = "graphene-sys"
version = "0.16.0" version = "0.16.0"
source = "git+https://github.com/gtk-rs/gtk-rs-core#679b3717abeea7ef0837995180d8a85dc342dadd" source = "git+https://github.com/gtk-rs/gtk-rs-core#9fe7e5ce970d5e992b5b4f393c52670cb2443a62"
dependencies = [ dependencies = [
"glib-sys", "glib-sys",
"libc", "libc",
@ -891,7 +876,7 @@ dependencies = [
[[package]] [[package]]
name = "gsk4" name = "gsk4"
version = "0.5.0" version = "0.5.0"
source = "git+https://github.com/gtk-rs/gtk4-rs#d6139f4e294437491a72f66de9d8363bf7c004d1" source = "git+https://github.com/gtk-rs/gtk4-rs#1d4d54ba8ed3e9ed5757ab295823f5feef1b0289"
dependencies = [ dependencies = [
"bitflags", "bitflags",
"cairo-rs", "cairo-rs",
@ -906,7 +891,7 @@ dependencies = [
[[package]] [[package]]
name = "gsk4-sys" name = "gsk4-sys"
version = "0.5.0" version = "0.5.0"
source = "git+https://github.com/gtk-rs/gtk4-rs#d6139f4e294437491a72f66de9d8363bf7c004d1" source = "git+https://github.com/gtk-rs/gtk4-rs#1d4d54ba8ed3e9ed5757ab295823f5feef1b0289"
dependencies = [ dependencies = [
"cairo-sys-rs", "cairo-sys-rs",
"gdk4-sys", "gdk4-sys",
@ -921,7 +906,7 @@ dependencies = [
[[package]] [[package]]
name = "gtk4" name = "gtk4"
version = "0.5.0" version = "0.5.0"
source = "git+https://github.com/gtk-rs/gtk4-rs#d6139f4e294437491a72f66de9d8363bf7c004d1" source = "git+https://github.com/gtk-rs/gtk4-rs#1d4d54ba8ed3e9ed5757ab295823f5feef1b0289"
dependencies = [ dependencies = [
"bitflags", "bitflags",
"cairo-rs", "cairo-rs",
@ -943,7 +928,7 @@ dependencies = [
[[package]] [[package]]
name = "gtk4-macros" name = "gtk4-macros"
version = "0.5.0" version = "0.5.0"
source = "git+https://github.com/gtk-rs/gtk4-rs#d6139f4e294437491a72f66de9d8363bf7c004d1" source = "git+https://github.com/gtk-rs/gtk4-rs#1d4d54ba8ed3e9ed5757ab295823f5feef1b0289"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"proc-macro-crate", "proc-macro-crate",
@ -956,7 +941,7 @@ dependencies = [
[[package]] [[package]]
name = "gtk4-sys" name = "gtk4-sys"
version = "0.5.0" version = "0.5.0"
source = "git+https://github.com/gtk-rs/gtk4-rs#d6139f4e294437491a72f66de9d8363bf7c004d1" source = "git+https://github.com/gtk-rs/gtk4-rs#1d4d54ba8ed3e9ed5757ab295823f5feef1b0289"
dependencies = [ dependencies = [
"cairo-sys-rs", "cairo-sys-rs",
"gdk-pixbuf-sys", "gdk-pixbuf-sys",
@ -1110,9 +1095,9 @@ dependencies = [
[[package]] [[package]]
name = "httparse" name = "httparse"
version = "1.7.1" version = "1.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "496ce29bb5a52785b44e0f7ca2847ae0bb839c9bd28f69acac9b99d461c0c04c" checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904"
[[package]] [[package]]
name = "httpdate" name = "httpdate"
@ -1272,7 +1257,7 @@ checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8"
[[package]] [[package]]
name = "libadwaita" name = "libadwaita"
version = "0.2.0" version = "0.2.0"
source = "git+https://gitlab.gnome.org/World/Rust/libadwaita-rs#01881b0c9f67ed5a351b78fcd9b172fee246fdd4" source = "git+https://gitlab.gnome.org/World/Rust/libadwaita-rs#f77307028c4d874d9cb87e9489e389aad4151dbf"
dependencies = [ dependencies = [
"futures-channel", "futures-channel",
"gdk-pixbuf", "gdk-pixbuf",
@ -1289,7 +1274,7 @@ dependencies = [
[[package]] [[package]]
name = "libadwaita-sys" name = "libadwaita-sys"
version = "0.2.0" version = "0.2.0"
source = "git+https://gitlab.gnome.org/World/Rust/libadwaita-rs#01881b0c9f67ed5a351b78fcd9b172fee246fdd4" source = "git+https://gitlab.gnome.org/World/Rust/libadwaita-rs#f77307028c4d874d9cb87e9489e389aad4151dbf"
dependencies = [ dependencies = [
"gdk4-sys", "gdk4-sys",
"gio-sys", "gio-sys",
@ -1317,9 +1302,9 @@ dependencies = [
[[package]] [[package]]
name = "lock_api" name = "lock_api"
version = "0.4.7" version = "0.4.8"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "327fa5b6a6940e4699ec49a9beae1ea4845c6bab9314e4f84ac68742139d8c53" checksum = "9f80bf5aacaf25cbfc8210d1cfb718f2bf3b11c4c54e5afe36c236853a8ec390"
dependencies = [ dependencies = [
"autocfg", "autocfg",
"scopeguard", "scopeguard",
@ -1415,9 +1400,9 @@ checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d"
[[package]] [[package]]
name = "miniz_oxide" name = "miniz_oxide"
version = "0.5.3" version = "0.5.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6f5c75688da582b8ffc1f1799e9db273f32133c49e048f614d22ec3256773ccc" checksum = "96590ba8f175222643a85693f33d26e9c8a015f599c216509b1a6894af675d34"
dependencies = [ dependencies = [
"adler", "adler",
] ]
@ -1571,9 +1556,9 @@ dependencies = [
[[package]] [[package]]
name = "once_cell" name = "once_cell"
version = "1.13.1" version = "1.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "074864da206b4973b84eb91683020dbefd6a8c3f0f38e054d93954e891935e4e" checksum = "2f7254b99e31cad77da24b08ebf628882739a608578bb1bcdfc1f9c21260d7c0"
[[package]] [[package]]
name = "opaque-debug" name = "opaque-debug"
@ -1641,7 +1626,7 @@ checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f"
[[package]] [[package]]
name = "pango" name = "pango"
version = "0.16.0" version = "0.16.0"
source = "git+https://github.com/gtk-rs/gtk-rs-core#679b3717abeea7ef0837995180d8a85dc342dadd" source = "git+https://github.com/gtk-rs/gtk-rs-core#9fe7e5ce970d5e992b5b4f393c52670cb2443a62"
dependencies = [ dependencies = [
"bitflags", "bitflags",
"gio", "gio",
@ -1654,7 +1639,7 @@ dependencies = [
[[package]] [[package]]
name = "pango-sys" name = "pango-sys"
version = "0.16.0" version = "0.16.0"
source = "git+https://github.com/gtk-rs/gtk-rs-core#679b3717abeea7ef0837995180d8a85dc342dadd" source = "git+https://github.com/gtk-rs/gtk-rs-core#9fe7e5ce970d5e992b5b4f393c52670cb2443a62"
dependencies = [ dependencies = [
"glib-sys", "glib-sys",
"gobject-sys", "gobject-sys",
@ -1817,13 +1802,13 @@ checksum = "1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae"
[[package]] [[package]]
name = "png" name = "png"
version = "0.17.5" version = "0.17.6"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dc38c0ad57efb786dd57b9864e5b18bae478c00c824dc55a38bbc9da95dde3ba" checksum = "8f0e7f4c94ec26ff209cee506314212639d6c91b80afb82984819fafce9df01c"
dependencies = [ dependencies = [
"bitflags", "bitflags",
"crc32fast", "crc32fast",
"deflate", "flate2",
"miniz_oxide", "miniz_oxide",
] ]
@ -1901,9 +1886,9 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
[[package]] [[package]]
name = "quick-xml" name = "quick-xml"
version = "0.23.0" version = "0.24.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9279fbdacaad3baf559d8cabe0acc3d06e30ea14931af31af79578ac0946decc" checksum = "678404d55890514fa1c01fe98cf280b674db93944fdcb70310dd3be1d0d63be7"
dependencies = [ dependencies = [
"memchr", "memchr",
"serde", "serde",
@ -2299,9 +2284,9 @@ dependencies = [
[[package]] [[package]]
name = "serde_yaml" name = "serde_yaml"
version = "0.9.10" version = "0.9.11"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7a09f551ccc8210268ef848f0bab37b306e87b85b2e017b899e7fb815f5aed62" checksum = "89f31df3f50926cdf2855da5fd8812295c34752cb20438dae42a67f79e021ac3"
dependencies = [ dependencies = [
"indexmap", "indexmap",
"itoa", "itoa",
@ -2393,9 +2378,9 @@ dependencies = [
[[package]] [[package]]
name = "socket2" name = "socket2"
version = "0.4.6" version = "0.4.7"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "10c98bba371b9b22a71a9414e420f92ddeb2369239af08200816169d5e2dd7aa" checksum = "02e2d2db9033d13a1567121ddd7a095ee144db4e1ca1b1bda3419bc0da294ebd"
dependencies = [ dependencies = [
"libc", "libc",
"winapi", "winapi",
@ -2588,18 +2573,18 @@ checksum = "b1141d4d61095b28419e22cb0bbf02755f5e54e0526f97f1e3d1d160e60885fb"
[[package]] [[package]]
name = "thiserror" name = "thiserror"
version = "1.0.32" version = "1.0.34"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f5f6586b7f764adc0231f4c79be7b920e766bb2f3e51b3661cdb263828f19994" checksum = "8c1b05ca9d106ba7d2e31a9dab4a64e7be2cce415321966ea3132c49a656e252"
dependencies = [ dependencies = [
"thiserror-impl", "thiserror-impl",
] ]
[[package]] [[package]]
name = "thiserror-impl" name = "thiserror-impl"
version = "1.0.32" version = "1.0.34"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "12bafc5b54507e0149cdf1b145a5d80ab80a90bcd9275df43d4fff68460f6c21" checksum = "e8f2591983642de85c921015f3f070c665a197ed69e417af436115e3a1407487"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
@ -2654,9 +2639,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
[[package]] [[package]]
name = "tokio" name = "tokio"
version = "1.20.1" version = "1.21.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7a8325f63a7d4774dd041e363b2409ed1c5cbbd0f867795e661df066b2b0a581" checksum = "89797afd69d206ccd11fb0ea560a44bbb87731d020670e79416d442919257d42"
dependencies = [ dependencies = [
"autocfg", "autocfg",
"bytes", "bytes",
@ -2789,9 +2774,9 @@ checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987"
[[package]] [[package]]
name = "ucd-trie" name = "ucd-trie"
version = "0.1.4" version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "89570599c4fe5585de2b388aab47e99f7fa4e9238a1399f707a02e356058141c" checksum = "9e79c4d996edb816c91e4308506774452e55e95c3c9de07b6729e17e15a5ef81"
[[package]] [[package]]
name = "unicode-bidi" name = "unicode-bidi"
@ -2828,13 +2813,12 @@ checksum = "931179334a56395bcf64ba5e0ff56781381c1a5832178280c7d7f91d1679aeb0"
[[package]] [[package]]
name = "url" name = "url"
version = "2.2.2" version = "2.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c" checksum = "22fe195a4f217c25b25cb5058ced57059824a678474874038dc88d211bf508d3"
dependencies = [ dependencies = [
"form_urlencoded", "form_urlencoded",
"idna", "idna",
"matches",
"percent-encoding", "percent-encoding",
] ]

View File

@ -8,7 +8,7 @@ default-run = "nix-software-center"
relm4 = { git = "https://github.com/Relm4/Relm4", tag = "v0.5.0-beta.2", features = ["all"] } relm4 = { git = "https://github.com/Relm4/Relm4", tag = "v0.5.0-beta.2", features = ["all"] }
relm4-components = { package = "relm4-components", git = "https://github.com/Relm4/Relm4", tag = "v0.5.0-beta.2"} relm4-components = { package = "relm4-components", git = "https://github.com/Relm4/Relm4", tag = "v0.5.0-beta.2"}
adw = { package = "libadwaita", git = "https://gitlab.gnome.org/World/Rust/libadwaita-rs", features = ["v1_2"] } adw = { package = "libadwaita", git = "https://gitlab.gnome.org/World/Rust/libadwaita-rs", features = ["v1_2"] }
tokio = { version = "1.20", features = ["rt", "macros", "time", "rt-multi-thread", "sync", "process"] } tokio = { version = "1.21", features = ["rt", "macros", "time", "rt-multi-thread", "sync", "process"] }
sourceview5 = { git = "https://gitlab.gnome.org/World/Rust/sourceview5-rs/", rev = "6082210f7d1fc32b100bd9c714e9521eecacb3f7", features = ["v5_4"] } sourceview5 = { git = "https://gitlab.gnome.org/World/Rust/sourceview5-rs/", rev = "6082210f7d1fc32b100bd9c714e9521eecacb3f7", features = ["v5_4"] }
tracker = "0.1" tracker = "0.1"
@ -24,7 +24,7 @@ brotli = "3.3"
log = "0.4" log = "0.4"
pretty_env_logger = "0.4" pretty_env_logger = "0.4"
flate2 = "1.0" flate2 = "1.0"
quick-xml = { version = "0.23", features = ["serialize"] } quick-xml = { version = "0.24", features = ["serialize"] }
rand = "0.8" rand = "0.8"
reqwest = { version = "0.11", features = ["blocking"] } reqwest = { version = "0.11", features = ["blocking"] }
sha256 = "1.0" sha256 = "1.0"

View File

@ -1,5 +1,7 @@
<div align="center"> <div align="center">
<img src="data/icons/dev.vlinkz.NixSoftwareCenter.svg"/>
Nix Software Center Nix Software Center
=== ===
@ -7,13 +9,72 @@ Nix Software Center
[![License: GPLv3][GPLv3 badge]][GPLv3] [![License: GPLv3][GPLv3 badge]][GPLv3]
[![Chat on Matrix][matrix badge]][matrix] [![Chat on Matrix][matrix badge]][matrix]
## More info soon... A graphical app store for Nix built with [libadwaita](https://gitlab.gnome.org/GNOME/libadwaita), [GTK4](https://www.gtk.org/), and [Relm4](https://relm4.org/). Heavily inspired by [GNOME Software](https://gitlab.gnome.org/GNOME/gnome-software).
<img src="data/screenshots/frontpage-light.png#gh-light-mode-only"/> <img src="data/screenshots/frontpage-light.png#gh-light-mode-only"/>
<img src="data/screenshots/frontpage-dark.png#gh-dark-mode-only"/> <img src="data/screenshots/frontpage-dark.png#gh-dark-mode-only"/>
</div> </div>
## NixOS Installation
Head of `configuration.nix`
```nix
{ config, pkgs, lib, ... }:
let
nixos-conf-editor = (import (pkgs.fetchFromGitHub {
owner = "vlinkz";
repo = "nix-software-center";
rev = "0.0.1";
sha256 = "0000000000000000000000000000000000000000000000000000";
})) {};
in
```
Packages:
```nix
environment.systemPackages =
with pkgs; [
nix-software-center
# rest of your packages
];
```
For any other method of installation, when rebuilding you will be prompted to authenticate twice in a row by `pkexec`
## 'nix profile' installation
```bash
nix profile install github:vlinkz/nix-software-center
```
## 'nix-env' Installation
```bash
git clone https://github.com/vlinkz/nix-software-center
nix-env -f nix-software-center -i nix-software-center
```
## Single run on an flakes enabled system:
```bash
nix run github:vlinkz/nix-software-center
```
## Single run on non-flakes enabled system:
```bash
nix --extra-experimental-features "nix-command flakes" run github:vlinkz/nix-software-center
```
## Debugging
```bash
RUST_LOG=nix_software_center=trace nix-software-center
```
## Licenses
Some icons in [data/icons](data/icons/) contains assets from the [NixOS logo](https://github.com/NixOS/nixos-artwork/tree/master/logo) and are licensed under a [CC-BY license](https://creativecommons.org/licenses/by/4.0/).
Some icons in [data/icons](data/icons/) contains assets from [GNOME Software](https://gitlab.gnome.org/GNOME/gnome-software/-/tree/main/data/icons/hicolor/scalable) and are licensed under [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/).
[builtwithnix badge]: https://img.shields.io/badge/Built%20With-Nix-41439A?style=for-the-badge&logo=nixos&logoColor=white [builtwithnix badge]: https://img.shields.io/badge/Built%20With-Nix-41439A?style=for-the-badge&logo=nixos&logoColor=white
[builtwithnix]: https://builtwithnix.org/ [builtwithnix]: https://builtwithnix.org/

View File

@ -1,22 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<svg height="128px" viewBox="0 0 128 128" width="128px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"> <svg height="128px" viewBox="0 0 128 128" width="128px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<linearGradient id="a" gradientUnits="userSpaceOnUse"> <linearGradient id="a" gradientUnits="userSpaceOnUse">
<stop offset="0" stop-color="#99b2e5"/> <stop offset="0" stop-color="#699ad7"/>
<stop offset="0.243452" stop-color="#a9c2e5"/> <stop offset="0.243452" stop-color="#7eb1dd"/>
<stop offset="1" stop-color="#c2cdeb"/> <stop offset="1" stop-color="#7ebae4"/>
</linearGradient> </linearGradient>
<linearGradient id="b" x1="29.258924657" x2="52.12594020815" xlink:href="#a" y1="63.99513142558" y2="103.54451872902"/> <linearGradient id="b" x1="46.58235407812" x2="58.04687025165" xlink:href="#a" y1="71.53165168077" y2="91.35997555537"/>
<linearGradient id="c" gradientTransform="matrix(0.127763 0.221291 -0.221291 0.127763 96.086827 -56.897127)" x1="200.59668" x2="290.087006" xlink:href="#a" y1="351.411163" y2="506.188141"/> <linearGradient id="c" gradientTransform="matrix(0.0640544 0.110945 -0.110945 0.0640544 80.086815 10.921623)" x1="200.59668" x2="290.087006" xlink:href="#a" y1="351.411163" y2="506.188141"/>
<linearGradient id="d" gradientTransform="matrix(0.127763 -0.221291 0.221291 0.127763 -54.103341 92.070101)" x1="200.59668" x2="290.087006" xlink:href="#a" y1="351.411163" y2="506.188141"/> <linearGradient id="d" gradientTransform="matrix(0.0640544 -0.110945 0.110945 0.0640544 4.78821 85.607104)" x1="200.59668" x2="290.087006" xlink:href="#a" y1="351.411163" y2="506.188141"/>
<linearGradient id="e" gradientTransform="matrix(-0.255525 0 0 -0.255525 150.106936 147.648442)" x1="200.59668" x2="290.087006" xlink:href="#a" y1="351.411163" y2="506.188141"/> <linearGradient id="e" gradientTransform="matrix(-0.128109 0 -0 -0.128109 107.170077 113.471592)" x1="200.59668" x2="290.087006" xlink:href="#a" y1="351.411163" y2="506.188141"/>
<linearGradient id="f" gradientUnits="userSpaceOnUse"> <linearGradient id="f" gradientUnits="userSpaceOnUse">
<stop offset="0" stop-color="#636378"/> <stop offset="0" stop-color="#415e9a"/>
<stop offset="0.231686" stop-color="#6a6b8f"/> <stop offset="0.231686" stop-color="#4a6baf"/>
<stop offset="1" stop-color="#444465"/> <stop offset="1" stop-color="#5277c3"/>
</linearGradient> </linearGradient>
<linearGradient id="g" x1="31.62242739098" x2="54.0836659203" xlink:href="#f" y1="62.6498143668" y2="102.35286903923"/> <linearGradient id="g" x1="47.76712762383" x2="59.02820503995" xlink:href="#f" y1="70.85726947989" y2="90.7626354168"/>
<linearGradient id="h" gradientTransform="matrix(-0.127763 0.221291 -0.221291 -0.127763 177.158345 261.09881)" x1="-584.199341" x2="-496.297028" xlink:href="#f" y1="782.335632" y2="937.713989"/> <linearGradient id="h" gradientTransform="matrix(-0.0640544 0.110945 -0.110945 -0.0640544 120.732441 170.350512)" x1="-584.199341" x2="-496.297028" xlink:href="#f" y1="782.335632" y2="937.713989"/>
<linearGradient id="i" gradientTransform="matrix(-0.127763 -0.221291 0.221291 -0.127763 -166.023458 58.751427)" x1="-584.199341" x2="-496.297028" xlink:href="#f" y1="782.335632" y2="937.713989"/> <linearGradient id="i" gradientTransform="matrix(-0.0640544 -0.110945 0.110945 -0.0640544 -51.323516 68.902613)" x1="-584.199341" x2="-496.297028" xlink:href="#f" y1="782.335632" y2="937.713989"/>
<clipPath id="j"> <clipPath id="j">
<rect height="128" width="128"/> <rect height="128" width="128"/>
</clipPath> </clipPath>
@ -29,19 +29,26 @@
<mask id="m"> <mask id="m">
<g clip-path="url(#k)" filter="url(#l)"> <g clip-path="url(#k)" filter="url(#l)">
<g clip-path="url(#j)"> <g clip-path="url(#j)">
<path d="m 39.046875 62.296875 l 31.222656 54.085937 l -14.347656 0.136719 l -8.335937 -14.53125 l -8.398438 14.453125 l -7.128906 -0.003906 l -3.652344 -6.308594 l 11.960938 -20.566406 l -8.488282 -14.777344 z m 0 0" fill="url(#b)" fill-rule="evenodd"/> <path d="m 44 18 l 8 -8 h 24 l 8 8 z m 0 0" fill="#c0bfbc"/>
<path d="m 89.023438 65.707031 l -31.222657 -54.089843 l 0.039063 -6.152344 l 22.644531 20.550781 l 19.214844 -14.296875 l -0.035157 6.152344 l -11.960937 20.566406 l 8.527344 8.625 l -0.039063 6.152344 z m 0 0" fill="#d7dded" fill-rule="evenodd"/> <path d="m 52 10 l -8 8 v 16 h 8 z m 0 0" fill="#f6f5f4"/>
<path d="m 75.277344 44.613281 l -62.457032 -0.003906 l -0.007812 -6.140625 l 23.820312 -6.304688 l -8.320312 -14.5 l -0.007812 -6.140624 l 10.867187 -0.039063 l 11.828125 20.640625 l 24.265625 6.347656 z m 0 0" fill="#3d3846" fill-rule="evenodd"/> <path d="m 76 10 l 8 8 v 16 h -8 z m 0 0" fill="#f6f5f4"/>
<path d="m 50.277344 46.167969 l -31.226563 54.085937 l -7.292969 -12.359375 l 0.039063 -6.152343 l 8.378906 -8.332032 l -16.714843 -0.042968 l -3.5625 -6.175782 l 0.0351558 -6.152344 l 27.3945312 -0.089843 l 22.988281 -20.933594 z m 0 0" fill="#d7dded" fill-rule="evenodd"/> <path d="m 16 74 h 96 c 4.417969 0 8 3.582031 8 8 v 28 c 0 4.417969 -3.582031 8 -8 8 h -96 c -4.417969 0 -8 -3.582031 -8 -8 v -28 c 0 -4.417969 3.582031 -8 8 -8 z m 0 0" fill="#deddda"/>
<path d="m 52.675781 89.402344 l 0.035157 -6.152344 l 62.453124 0.003906 l -0.035156 6.152344 l -7.058594 12.496094 l -16.753906 -0.046875 l 8.359375 8.34375 l -0.039062 6.152343 l -3.566407 6.175782 l -7.289062 0.007812 l -11.832031 -20.644531 l -17.042969 -0.035156 z m 0 0" fill="#d7dded" fill-rule="evenodd"/> <path d="m 8 30 h 112 v 80 h -112 z m 0 0" fill="#e5e5e1"/>
<path d="m 31.878906 74.785156 l 38.390625 41.597656 l -0.035156 6.15625 l -14.351563 0.132813 l -8.335937 -14.53125 l -8.394531 14.453125 l -7.128906 -0.003906 l -3.652344 -6.308594 l 0.035156 -6.152344 l 11.925781 -14.414062 l -8.492187 -14.777344 z m 0 0" fill="#3d3846" fill-rule="evenodd"/> <path d="m 8 70 h 112 v 40 h -112 z m 0 0" fill="#f6f5f4"/>
<path d="m 77.710938 87.972656 l 0.011718 -6.148437 l 38.519532 -41.726563 l -0.007813 6.148438 l -8.417969 14.488281 l 20.285156 0.070313 l -0.007812 6.148437 l -3.636719 6.316406 l -23.792969 -0.074219 l -8.550781 14.742188 z m 0 0" fill="#3d3846" fill-rule="evenodd"/> <path d="m 51.46875 70.699219 l 15.65625 27.117187 l -7.195312 0.066406 l -4.179688 -7.285156 l -4.207031 7.246094 h -3.574219 l -1.832031 -3.164062 l 5.996093 -10.3125 l -4.257812 -7.40625 z m 0 0" fill="#5277c3" fill-rule="evenodd"/>
<path d="m 50.316406 40.015625 l -31.230468 54.085937 l -7.289063 -12.359374 l 8.414063 -14.484376 l -16.714844 -0.042968 l -3.5625002 -6.175782 l 3.6367182 -6.320312 l 23.792969 0.078125 l 8.550781 -14.742187 z m 0 0" fill="url(#c)" fill-rule="evenodd"/> <path d="m 57.121094 59.527344 l -15.65625 27.117187 l -3.65625 -6.199219 l 4.21875 -7.261718 l -8.378906 -0.019532 l -1.785157 -3.097656 l 1.820313 -3.167968 l 11.929687 0.039062 l 4.289063 -7.390625 z m 0 0" fill="#7ebae4" fill-rule="evenodd"/>
<path d="m 52.710938 83.25 l 62.453124 0.003906 l -7.054687 12.496094 l -16.753906 -0.046875 l 8.320312 14.496094 l -3.570312 6.175781 l -7.289063 0.007812 l -11.828125 -20.644531 l -17.042969 -0.035156 z m 0 0" fill="url(#d)" fill-rule="evenodd"/> <path d="m 58.320312 81.203125 h 31.3125 l -3.539062 6.265625 l -8.398438 -0.023438 l 4.171876 7.269532 l -1.789063 3.09375 l -3.652344 0.003906 l -5.933593 -10.347656 l -8.542969 -0.019532 z m 0 0" fill="#7ebae4" fill-rule="evenodd"/>
<path d="m 89.0625 59.554688 l -31.222656 -54.089844 l 14.347656 -0.136719 l 8.335938 14.535156 l 8.394531 -14.457031 l 7.132812 0.003906 l 3.648438 6.308594 l -11.960938 20.566406 l 8.492188 14.777344 z m 0 0" fill="url(#e)" fill-rule="evenodd"/> <path d="m 76.546875 69.320312 l -15.65625 -27.117187 l 7.195313 -0.066406 l 4.179687 7.285156 l 4.210937 -7.246094 h 3.574219 l 1.828125 3.164063 l -5.996094 10.3125 l 4.257813 7.40625 z m 0 0" fill="#7ebae4" fill-rule="evenodd"/>
<path d="m 39.046875 62.296875 l 31.222656 54.085937 l -14.347656 0.136719 l -8.335937 -14.53125 l -8.398438 14.453125 l -7.128906 -0.003906 l -3.652344 -6.308594 l 11.960938 -20.566406 l -8.488282 -14.777344 z m 0 0" fill="url(#g)" fill-rule="evenodd"/> <path d="m 51.46875 70.699219 l 15.65625 27.117187 l -7.195312 0.066406 l -4.179688 -7.285156 l -4.207031 7.246094 h -3.574219 l -1.832031 -3.164062 l 5.996093 -10.3125 l -4.257812 -7.40625 z m 0 0" fill="#5277c3" fill-rule="evenodd"/>
<path d="m 75.265625 38.472656 l -62.453125 -0.003906 l 7.058594 -12.492188 l 16.753906 0.046876 l -8.320312 -14.5 l 3.566406 -6.171876 l 7.289062 -0.007812 l 11.832032 20.640625 l 17.042968 0.035156 z m 0 0" fill="url(#h)" fill-rule="evenodd"/> <path d="m 69.652344 58.746094 h -31.3125 l 3.539062 -6.265625 l 8.402344 0.023437 l -4.171875 -7.265625 l 1.789063 -3.097656 l 3.652343 -0.003906 l 5.933594 10.351562 l 8.542969 0.015625 z m 0 0" fill="#5277c3" fill-rule="evenodd"/>
<path d="m 77.722656 81.824219 l 31.226563 -54.085938 l 7.292969 12.359375 l -8.417969 14.484375 l 16.714843 0.046875 l 3.5625 6.175782 l -3.636718 6.316406 l -23.792969 -0.074219 l -8.550781 14.738281 z m 0 0" fill="url(#i)" fill-rule="evenodd"/> <path d="m 70.875 80.484375 l 15.65625 -27.113281 l 3.65625 6.195312 l -4.21875 7.261719 l 8.378906 0.023437 l 1.785156 3.097657 l -1.824218 3.164062 l -11.925782 -0.035156 l -4.289062 7.390625 z m 0 0" fill="#5277c3" fill-rule="evenodd"/>
<path d="m 51.488281 70.679688 l 15.65625 27.117187 l -7.195312 0.066406 l -4.179688 -7.285156 l -4.207031 7.246094 h -3.578125 l -1.828125 -3.164063 l 5.996094 -10.308594 l -4.257813 -7.410156 z m 0 0" fill="url(#b)" fill-rule="evenodd"/>
<path d="m 57.140625 59.511719 l -15.660156 27.113281 l -3.652344 -6.195312 l 4.21875 -7.261719 l -8.378906 -0.023438 l -1.789063 -3.097656 l 1.824219 -3.164063 l 11.929687 0.035157 l 4.285157 -7.390625 z m 0 0" fill="url(#c)" fill-rule="evenodd"/>
<path d="m 58.339844 81.1875 h 31.3125 l -3.539063 6.265625 l -8.398437 -0.023437 l 4.171875 7.265624 l -1.789063 3.097657 l -3.65625 0.003906 l -5.929687 -10.351563 l -8.542969 -0.015624 z m 0 0" fill="url(#d)" fill-rule="evenodd"/>
<path d="m 76.566406 69.304688 l -15.65625 -27.117188 l 7.195313 -0.066406 l 4.179687 7.285156 l 4.207032 -7.246094 h 3.574218 l 1.832032 3.164063 l -5.996094 10.308593 l 4.257812 7.410157 z m 0 0" fill="url(#e)" fill-rule="evenodd"/>
<path d="m 51.488281 70.679688 l 15.65625 27.117187 l -7.195312 0.066406 l -4.179688 -7.285156 l -4.207031 7.246094 h -3.578125 l -1.828125 -3.164063 l 5.996094 -10.308594 l -4.257813 -7.410156 z m 0 0" fill="url(#g)" fill-rule="evenodd"/>
<path d="m 69.648438 58.734375 h -31.3125 l 3.539062 -6.265625 l 8.398438 0.023438 l -4.167969 -7.265626 l 1.785156 -3.097656 l 3.65625 -0.003906 l 5.933594 10.351562 l 8.542969 0.015626 z m 0 0" fill="url(#h)" fill-rule="evenodd"/>
<path d="m 70.878906 80.46875 l 15.65625 -27.113281 l 3.65625 6.195312 l -4.21875 7.261719 l 8.378906 0.023438 l 1.785157 3.09375 l -1.820313 3.167968 l -11.929687 -0.035156 l -4.289063 7.390625 z m 0 0" fill="url(#i)" fill-rule="evenodd"/>
</g> </g>
</g> </g>
</mask> </mask>
@ -60,20 +67,27 @@
<clipPath id="q"> <clipPath id="q">
<rect height="128" width="128"/> <rect height="128" width="128"/>
</clipPath> </clipPath>
<path d="m 44 18 l 8 -8 h 24 l 8 8 z m 0 0" fill="#c0bfbc"/>
<path d="m 52 10 l -8 8 v 16 h 8 z m 0 0" fill="#f6f5f4"/>
<path d="m 76 10 l 8 8 v 16 h -8 z m 0 0" fill="#f6f5f4"/>
<path d="m 16 74 h 96 c 4.417969 0 8 3.582031 8 8 v 28 c 0 4.417969 -3.582031 8 -8 8 h -96 c -4.417969 0 -8 -3.582031 -8 -8 v -28 c 0 -4.417969 3.582031 -8 8 -8 z m 0 0" fill="#deddda"/>
<path d="m 8 30 h 112 v 80 h -112 z m 0 0" fill="#e5e5e1"/>
<path d="m 8 70 h 112 v 40 h -112 z m 0 0" fill="#f6f5f4"/>
<g fill-rule="evenodd"> <g fill-rule="evenodd">
<path d="m 39.046875 62.296875 l 31.222656 54.085937 l -14.347656 0.136719 l -8.335937 -14.53125 l -8.398438 14.453125 l -7.128906 -0.003906 l -3.652344 -6.308594 l 11.960938 -20.566406 l -8.488282 -14.777344 z m 0 0" fill="url(#b)"/> <path d="m 51.46875 70.699219 l 15.65625 27.117187 l -7.195312 0.066406 l -4.179688 -7.285156 l -4.207031 7.246094 h -3.574219 l -1.832031 -3.164062 l 5.996093 -10.3125 l -4.257812 -7.40625 z m 0 0" fill="#5277c3"/>
<path d="m 89.023438 65.707031 l -31.222657 -54.089843 l 0.039063 -6.152344 l 22.644531 20.550781 l 19.214844 -14.296875 l -0.035157 6.152344 l -11.960937 20.566406 l 8.527344 8.625 l -0.039063 6.152344 z m 0 0" fill="#d7dded"/> <path d="m 57.121094 59.527344 l -15.65625 27.117187 l -3.65625 -6.199219 l 4.21875 -7.261718 l -8.378906 -0.019532 l -1.785157 -3.097656 l 1.820313 -3.167968 l 11.929687 0.039062 l 4.289063 -7.390625 z m 0 0" fill="#7ebae4"/>
<path d="m 75.277344 44.613281 l -62.457032 -0.003906 l -0.007812 -6.140625 l 23.820312 -6.304688 l -8.320312 -14.5 l -0.007812 -6.140624 l 10.867187 -0.039063 l 11.828125 20.640625 l 24.265625 6.347656 z m 0 0" fill="#3d3846"/> <path d="m 58.320312 81.203125 h 31.3125 l -3.539062 6.265625 l -8.398438 -0.023438 l 4.171876 7.269532 l -1.789063 3.09375 l -3.652344 0.003906 l -5.933593 -10.347656 l -8.542969 -0.019532 z m 0 0" fill="#7ebae4"/>
<path d="m 50.277344 46.167969 l -31.226563 54.085937 l -7.292969 -12.359375 l 0.039063 -6.152343 l 8.378906 -8.332032 l -16.714843 -0.042968 l -3.5625 -6.175782 l 0.0351558 -6.152344 l 27.3945312 -0.089843 l 22.988281 -20.933594 z m 0 0" fill="#d7dded"/> <path d="m 76.546875 69.320312 l -15.65625 -27.117187 l 7.195313 -0.066406 l 4.179687 7.285156 l 4.210937 -7.246094 h 3.574219 l 1.828125 3.164063 l -5.996094 10.3125 l 4.257813 7.40625 z m 0 0" fill="#7ebae4"/>
<path d="m 52.675781 89.402344 l 0.035157 -6.152344 l 62.453124 0.003906 l -0.035156 6.152344 l -7.058594 12.496094 l -16.753906 -0.046875 l 8.359375 8.34375 l -0.039062 6.152343 l -3.566407 6.175782 l -7.289062 0.007812 l -11.832031 -20.644531 l -17.042969 -0.035156 z m 0 0" fill="#d7dded"/> <path d="m 51.46875 70.699219 l 15.65625 27.117187 l -7.195312 0.066406 l -4.179688 -7.285156 l -4.207031 7.246094 h -3.574219 l -1.832031 -3.164062 l 5.996093 -10.3125 l -4.257812 -7.40625 z m 0 0" fill="#5277c3"/>
<path d="m 31.878906 74.785156 l 38.390625 41.597656 l -0.035156 6.15625 l -14.351563 0.132813 l -8.335937 -14.53125 l -8.394531 14.453125 l -7.128906 -0.003906 l -3.652344 -6.308594 l 0.035156 -6.152344 l 11.925781 -14.414062 l -8.492187 -14.777344 z m 0 0" fill="#3d3846"/> <path d="m 69.652344 58.746094 h -31.3125 l 3.539062 -6.265625 l 8.402344 0.023437 l -4.171875 -7.265625 l 1.789063 -3.097656 l 3.652343 -0.003906 l 5.933594 10.351562 l 8.542969 0.015625 z m 0 0" fill="#5277c3"/>
<path d="m 77.710938 87.972656 l 0.011718 -6.148437 l 38.519532 -41.726563 l -0.007813 6.148438 l -8.417969 14.488281 l 20.285156 0.070313 l -0.007812 6.148437 l -3.636719 6.316406 l -23.792969 -0.074219 l -8.550781 14.742188 z m 0 0" fill="#3d3846"/> <path d="m 70.875 80.484375 l 15.65625 -27.113281 l 3.65625 6.195312 l -4.21875 7.261719 l 8.378906 0.023437 l 1.785156 3.097657 l -1.824218 3.164062 l -11.925782 -0.035156 l -4.289062 7.390625 z m 0 0" fill="#5277c3"/>
<path d="m 50.316406 40.015625 l -31.230468 54.085937 l -7.289063 -12.359374 l 8.414063 -14.484376 l -16.714844 -0.042968 l -3.5625002 -6.175782 l 3.6367182 -6.320312 l 23.792969 0.078125 l 8.550781 -14.742187 z m 0 0" fill="url(#c)"/> <path d="m 51.488281 70.679688 l 15.65625 27.117187 l -7.195312 0.066406 l -4.179688 -7.285156 l -4.207031 7.246094 h -3.578125 l -1.828125 -3.164063 l 5.996094 -10.308594 l -4.257813 -7.410156 z m 0 0" fill="url(#b)"/>
<path d="m 52.710938 83.25 l 62.453124 0.003906 l -7.054687 12.496094 l -16.753906 -0.046875 l 8.320312 14.496094 l -3.570312 6.175781 l -7.289063 0.007812 l -11.828125 -20.644531 l -17.042969 -0.035156 z m 0 0" fill="url(#d)"/> <path d="m 57.140625 59.511719 l -15.660156 27.113281 l -3.652344 -6.195312 l 4.21875 -7.261719 l -8.378906 -0.023438 l -1.789063 -3.097656 l 1.824219 -3.164063 l 11.929687 0.035157 l 4.285157 -7.390625 z m 0 0" fill="url(#c)"/>
<path d="m 89.0625 59.554688 l -31.222656 -54.089844 l 14.347656 -0.136719 l 8.335938 14.535156 l 8.394531 -14.457031 l 7.132812 0.003906 l 3.648438 6.308594 l -11.960938 20.566406 l 8.492188 14.777344 z m 0 0" fill="url(#e)"/> <path d="m 58.339844 81.1875 h 31.3125 l -3.539063 6.265625 l -8.398437 -0.023437 l 4.171875 7.265624 l -1.789063 3.097657 l -3.65625 0.003906 l -5.929687 -10.351563 l -8.542969 -0.015624 z m 0 0" fill="url(#d)"/>
<path d="m 39.046875 62.296875 l 31.222656 54.085937 l -14.347656 0.136719 l -8.335937 -14.53125 l -8.398438 14.453125 l -7.128906 -0.003906 l -3.652344 -6.308594 l 11.960938 -20.566406 l -8.488282 -14.777344 z m 0 0" fill="url(#g)"/> <path d="m 76.566406 69.304688 l -15.65625 -27.117188 l 7.195313 -0.066406 l 4.179687 7.285156 l 4.207032 -7.246094 h 3.574218 l 1.832032 3.164063 l -5.996094 10.308593 l 4.257812 7.410157 z m 0 0" fill="url(#e)"/>
<path d="m 75.265625 38.472656 l -62.453125 -0.003906 l 7.058594 -12.492188 l 16.753906 0.046876 l -8.320312 -14.5 l 3.566406 -6.171876 l 7.289062 -0.007812 l 11.832032 20.640625 l 17.042968 0.035156 z m 0 0" fill="url(#h)"/> <path d="m 51.488281 70.679688 l 15.65625 27.117187 l -7.195312 0.066406 l -4.179688 -7.285156 l -4.207031 7.246094 h -3.578125 l -1.828125 -3.164063 l 5.996094 -10.308594 l -4.257813 -7.410156 z m 0 0" fill="url(#g)"/>
<path d="m 77.722656 81.824219 l 31.226563 -54.085938 l 7.292969 12.359375 l -8.417969 14.484375 l 16.714843 0.046875 l 3.5625 6.175782 l -3.636718 6.316406 l -23.792969 -0.074219 l -8.550781 14.738281 z m 0 0" fill="url(#i)"/> <path d="m 69.648438 58.734375 h -31.3125 l 3.539062 -6.265625 l 8.398438 0.023438 l -4.167969 -7.265626 l 1.785156 -3.097656 l 3.65625 -0.003906 l 5.933594 10.351562 l 8.542969 0.015626 z m 0 0" fill="url(#h)"/>
<path d="m 70.878906 80.46875 l 15.65625 -27.113281 l 3.65625 6.195312 l -4.21875 7.261719 l 8.378906 0.023438 l 1.785157 3.09375 l -1.820313 3.167968 l -11.929687 -0.035156 l -4.289063 7.390625 z m 0 0" fill="url(#i)"/>
</g> </g>
<g clip-path="url(#q)" mask="url(#m)"> <g clip-path="url(#q)" mask="url(#m)">
<g clip-path="url(#p)" mask="url(#n)"> <g clip-path="url(#p)" mask="url(#n)">

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 11 KiB

View File

@ -1,35 +1,42 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<svg height="128px" viewBox="0 0 128 128" width="128px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"> <svg height="128px" viewBox="0 0 128 128" width="128px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<linearGradient id="a" gradientUnits="userSpaceOnUse"> <linearGradient id="a" gradientUnits="userSpaceOnUse">
<stop offset="0" stop-color="#99b2e5"/> <stop offset="0" stop-color="#699ad7"/>
<stop offset="0.243452" stop-color="#a9c2e5"/> <stop offset="0.243452" stop-color="#7eb1dd"/>
<stop offset="1" stop-color="#c2cdeb"/> <stop offset="1" stop-color="#7ebae4"/>
</linearGradient> </linearGradient>
<linearGradient id="b" x1="29.258924657" x2="52.12594020815" xlink:href="#a" y1="63.99513142558" y2="103.54451872902"/> <linearGradient id="b" x1="46.58235407812" x2="58.04687025165" xlink:href="#a" y1="71.53165168077" y2="91.35997555537"/>
<linearGradient id="c" gradientTransform="matrix(0.127763 0.221291 -0.221291 0.127763 96.086827 -56.897127)" x1="200.59668" x2="290.087006" xlink:href="#a" y1="351.411163" y2="506.188141"/> <linearGradient id="c" gradientTransform="matrix(0.0640544 0.110945 -0.110945 0.0640544 80.086815 10.921623)" x1="200.59668" x2="290.087006" xlink:href="#a" y1="351.411163" y2="506.188141"/>
<linearGradient id="d" gradientTransform="matrix(0.127763 -0.221291 0.221291 0.127763 -54.103341 92.070101)" x1="200.59668" x2="290.087006" xlink:href="#a" y1="351.411163" y2="506.188141"/> <linearGradient id="d" gradientTransform="matrix(0.0640544 -0.110945 0.110945 0.0640544 4.78821 85.607104)" x1="200.59668" x2="290.087006" xlink:href="#a" y1="351.411163" y2="506.188141"/>
<linearGradient id="e" gradientTransform="matrix(-0.255525 0 0 -0.255525 150.106936 147.648442)" x1="200.59668" x2="290.087006" xlink:href="#a" y1="351.411163" y2="506.188141"/> <linearGradient id="e" gradientTransform="matrix(-0.128109 0 -0 -0.128109 107.170077 113.471592)" x1="200.59668" x2="290.087006" xlink:href="#a" y1="351.411163" y2="506.188141"/>
<linearGradient id="f" gradientUnits="userSpaceOnUse"> <linearGradient id="f" gradientUnits="userSpaceOnUse">
<stop offset="0" stop-color="#636378"/> <stop offset="0" stop-color="#415e9a"/>
<stop offset="0.231686" stop-color="#6a6b8f"/> <stop offset="0.231686" stop-color="#4a6baf"/>
<stop offset="1" stop-color="#444465"/> <stop offset="1" stop-color="#5277c3"/>
</linearGradient> </linearGradient>
<linearGradient id="g" x1="31.62242739098" x2="54.0836659203" xlink:href="#f" y1="62.6498143668" y2="102.35286903923"/> <linearGradient id="g" x1="47.76712762383" x2="59.02820503995" xlink:href="#f" y1="70.85726947989" y2="90.7626354168"/>
<linearGradient id="h" gradientTransform="matrix(-0.127763 0.221291 -0.221291 -0.127763 177.158345 261.09881)" x1="-584.199341" x2="-496.297028" xlink:href="#f" y1="782.335632" y2="937.713989"/> <linearGradient id="h" gradientTransform="matrix(-0.0640544 0.110945 -0.110945 -0.0640544 120.732441 170.350512)" x1="-584.199341" x2="-496.297028" xlink:href="#f" y1="782.335632" y2="937.713989"/>
<linearGradient id="i" gradientTransform="matrix(-0.127763 -0.221291 0.221291 -0.127763 -166.023458 58.751427)" x1="-584.199341" x2="-496.297028" xlink:href="#f" y1="782.335632" y2="937.713989"/> <linearGradient id="i" gradientTransform="matrix(-0.0640544 -0.110945 0.110945 -0.0640544 -51.323516 68.902613)" x1="-584.199341" x2="-496.297028" xlink:href="#f" y1="782.335632" y2="937.713989"/>
<path d="m 44 18 l 8 -8 h 24 l 8 8 z m 0 0" fill="#c0bfbc"/>
<path d="m 52 10 l -8 8 v 16 h 8 z m 0 0" fill="#f6f5f4"/>
<path d="m 76 10 l 8 8 v 16 h -8 z m 0 0" fill="#f6f5f4"/>
<path d="m 16 74 h 96 c 4.417969 0 8 3.582031 8 8 v 28 c 0 4.417969 -3.582031 8 -8 8 h -96 c -4.417969 0 -8 -3.582031 -8 -8 v -28 c 0 -4.417969 3.582031 -8 8 -8 z m 0 0" fill="#deddda"/>
<path d="m 8 30 h 112 v 80 h -112 z m 0 0" fill="#e5e5e1"/>
<path d="m 8 70 h 112 v 40 h -112 z m 0 0" fill="#f6f5f4"/>
<g fill-rule="evenodd"> <g fill-rule="evenodd">
<path d="m 39.046875 62.296875 l 31.222656 54.085937 l -14.347656 0.136719 l -8.335937 -14.53125 l -8.398438 14.453125 l -7.128906 -0.003906 l -3.652344 -6.308594 l 11.960938 -20.566406 l -8.488282 -14.777344 z m 0 0" fill="url(#b)"/> <path d="m 51.46875 70.699219 l 15.65625 27.117187 l -7.195312 0.066406 l -4.179688 -7.285156 l -4.207031 7.246094 h -3.574219 l -1.832031 -3.164062 l 5.996093 -10.3125 l -4.257812 -7.40625 z m 0 0" fill="#5277c3"/>
<path d="m 89.023438 65.707031 l -31.222657 -54.089843 l 0.039063 -6.152344 l 22.644531 20.550781 l 19.214844 -14.296875 l -0.035157 6.152344 l -11.960937 20.566406 l 8.527344 8.625 l -0.039063 6.152344 z m 0 0" fill="#d7dded"/> <path d="m 57.121094 59.527344 l -15.65625 27.117187 l -3.65625 -6.199219 l 4.21875 -7.261718 l -8.378906 -0.019532 l -1.785157 -3.097656 l 1.820313 -3.167968 l 11.929687 0.039062 l 4.289063 -7.390625 z m 0 0" fill="#7ebae4"/>
<path d="m 75.277344 44.613281 l -62.457032 -0.003906 l -0.007812 -6.140625 l 23.820312 -6.304688 l -8.320312 -14.5 l -0.007812 -6.140624 l 10.867187 -0.039063 l 11.828125 20.640625 l 24.265625 6.347656 z m 0 0" fill="#3d3846"/> <path d="m 58.320312 81.203125 h 31.3125 l -3.539062 6.265625 l -8.398438 -0.023438 l 4.171876 7.269532 l -1.789063 3.09375 l -3.652344 0.003906 l -5.933593 -10.347656 l -8.542969 -0.019532 z m 0 0" fill="#7ebae4"/>
<path d="m 50.277344 46.167969 l -31.226563 54.085937 l -7.292969 -12.359375 l 0.039063 -6.152343 l 8.378906 -8.332032 l -16.714843 -0.042968 l -3.5625 -6.175782 l 0.0351558 -6.152344 l 27.3945312 -0.089843 l 22.988281 -20.933594 z m 0 0" fill="#d7dded"/> <path d="m 76.546875 69.320312 l -15.65625 -27.117187 l 7.195313 -0.066406 l 4.179687 7.285156 l 4.210937 -7.246094 h 3.574219 l 1.828125 3.164063 l -5.996094 10.3125 l 4.257813 7.40625 z m 0 0" fill="#7ebae4"/>
<path d="m 52.675781 89.402344 l 0.035157 -6.152344 l 62.453124 0.003906 l -0.035156 6.152344 l -7.058594 12.496094 l -16.753906 -0.046875 l 8.359375 8.34375 l -0.039062 6.152343 l -3.566407 6.175782 l -7.289062 0.007812 l -11.832031 -20.644531 l -17.042969 -0.035156 z m 0 0" fill="#d7dded"/> <path d="m 51.46875 70.699219 l 15.65625 27.117187 l -7.195312 0.066406 l -4.179688 -7.285156 l -4.207031 7.246094 h -3.574219 l -1.832031 -3.164062 l 5.996093 -10.3125 l -4.257812 -7.40625 z m 0 0" fill="#5277c3"/>
<path d="m 31.878906 74.785156 l 38.390625 41.597656 l -0.035156 6.15625 l -14.351563 0.132813 l -8.335937 -14.53125 l -8.394531 14.453125 l -7.128906 -0.003906 l -3.652344 -6.308594 l 0.035156 -6.152344 l 11.925781 -14.414062 l -8.492187 -14.777344 z m 0 0" fill="#3d3846"/> <path d="m 69.652344 58.746094 h -31.3125 l 3.539062 -6.265625 l 8.402344 0.023437 l -4.171875 -7.265625 l 1.789063 -3.097656 l 3.652343 -0.003906 l 5.933594 10.351562 l 8.542969 0.015625 z m 0 0" fill="#5277c3"/>
<path d="m 77.710938 87.972656 l 0.011718 -6.148437 l 38.519532 -41.726563 l -0.007813 6.148438 l -8.417969 14.488281 l 20.285156 0.070313 l -0.007812 6.148437 l -3.636719 6.316406 l -23.792969 -0.074219 l -8.550781 14.742188 z m 0 0" fill="#3d3846"/> <path d="m 70.875 80.484375 l 15.65625 -27.113281 l 3.65625 6.195312 l -4.21875 7.261719 l 8.378906 0.023437 l 1.785156 3.097657 l -1.824218 3.164062 l -11.925782 -0.035156 l -4.289062 7.390625 z m 0 0" fill="#5277c3"/>
<path d="m 50.316406 40.015625 l -31.230468 54.085937 l -7.289063 -12.359374 l 8.414063 -14.484376 l -16.714844 -0.042968 l -3.5625002 -6.175782 l 3.6367182 -6.320312 l 23.792969 0.078125 l 8.550781 -14.742187 z m 0 0" fill="url(#c)"/> <path d="m 51.488281 70.679688 l 15.65625 27.117187 l -7.195312 0.066406 l -4.179688 -7.285156 l -4.207031 7.246094 h -3.578125 l -1.828125 -3.164063 l 5.996094 -10.308594 l -4.257813 -7.410156 z m 0 0" fill="url(#b)"/>
<path d="m 52.710938 83.25 l 62.453124 0.003906 l -7.054687 12.496094 l -16.753906 -0.046875 l 8.320312 14.496094 l -3.570312 6.175781 l -7.289063 0.007812 l -11.828125 -20.644531 l -17.042969 -0.035156 z m 0 0" fill="url(#d)"/> <path d="m 57.140625 59.511719 l -15.660156 27.113281 l -3.652344 -6.195312 l 4.21875 -7.261719 l -8.378906 -0.023438 l -1.789063 -3.097656 l 1.824219 -3.164063 l 11.929687 0.035157 l 4.285157 -7.390625 z m 0 0" fill="url(#c)"/>
<path d="m 89.0625 59.554688 l -31.222656 -54.089844 l 14.347656 -0.136719 l 8.335938 14.535156 l 8.394531 -14.457031 l 7.132812 0.003906 l 3.648438 6.308594 l -11.960938 20.566406 l 8.492188 14.777344 z m 0 0" fill="url(#e)"/> <path d="m 58.339844 81.1875 h 31.3125 l -3.539063 6.265625 l -8.398437 -0.023437 l 4.171875 7.265624 l -1.789063 3.097657 l -3.65625 0.003906 l -5.929687 -10.351563 l -8.542969 -0.015624 z m 0 0" fill="url(#d)"/>
<path d="m 39.046875 62.296875 l 31.222656 54.085937 l -14.347656 0.136719 l -8.335937 -14.53125 l -8.398438 14.453125 l -7.128906 -0.003906 l -3.652344 -6.308594 l 11.960938 -20.566406 l -8.488282 -14.777344 z m 0 0" fill="url(#g)"/> <path d="m 76.566406 69.304688 l -15.65625 -27.117188 l 7.195313 -0.066406 l 4.179687 7.285156 l 4.207032 -7.246094 h 3.574218 l 1.832032 3.164063 l -5.996094 10.308593 l 4.257812 7.410157 z m 0 0" fill="url(#e)"/>
<path d="m 75.265625 38.472656 l -62.453125 -0.003906 l 7.058594 -12.492188 l 16.753906 0.046876 l -8.320312 -14.5 l 3.566406 -6.171876 l 7.289062 -0.007812 l 11.832032 20.640625 l 17.042968 0.035156 z m 0 0" fill="url(#h)"/> <path d="m 51.488281 70.679688 l 15.65625 27.117187 l -7.195312 0.066406 l -4.179688 -7.285156 l -4.207031 7.246094 h -3.578125 l -1.828125 -3.164063 l 5.996094 -10.308594 l -4.257813 -7.410156 z m 0 0" fill="url(#g)"/>
<path d="m 77.722656 81.824219 l 31.226563 -54.085938 l 7.292969 12.359375 l -8.417969 14.484375 l 16.714843 0.046875 l 3.5625 6.175782 l -3.636718 6.316406 l -23.792969 -0.074219 l -8.550781 14.738281 z m 0 0" fill="url(#i)"/> <path d="m 69.648438 58.734375 h -31.3125 l 3.539062 -6.265625 l 8.398438 0.023438 l -4.167969 -7.265626 l 1.785156 -3.097656 l 3.65625 -0.003906 l 5.933594 10.351562 l 8.542969 0.015626 z m 0 0" fill="url(#h)"/>
<path d="m 70.878906 80.46875 l 15.65625 -27.113281 l 3.65625 6.195312 l -4.21875 7.261719 l 8.378906 0.023438 l 1.785157 3.09375 l -1.820313 3.167968 l -11.929687 -0.035156 l -4.289063 7.390625 z m 0 0" fill="url(#i)"/>
</g> </g>
</svg> </svg>

Before

Width:  |  Height:  |  Size: 5.0 KiB

After

Width:  |  Height:  |  Size: 5.4 KiB

File diff suppressed because it is too large Load Diff

Before

Width:  |  Height:  |  Size: 37 KiB

After

Width:  |  Height:  |  Size: 39 KiB

View File

@ -4,13 +4,13 @@
}: }:
let let
libadwaita-git = pkgs.libadwaita.overrideAttrs (oldAttrs: rec { libadwaita-git = pkgs.libadwaita.overrideAttrs (oldAttrs: rec {
version = "1.2.beta"; version = "1.2.rc";
src = pkgs.fetchFromGitLab { src = pkgs.fetchFromGitLab {
domain = "gitlab.gnome.org"; domain = "gitlab.gnome.org";
owner = "GNOME"; owner = "GNOME";
repo = "libadwaita"; repo = "libadwaita";
rev = version; rev = version;
hash = "sha256-QBblkeNAgfHi5YQxaV9ceqNDyDIGu8d6pvLcT6apm6o="; hash = "sha256-p7nsaAqrzQKeUiu7aGlgoKu0AH9KV/sMsVcLLpgl4Lo=";
}; };
}); });
nixos-appstream-data = (import (pkgs.fetchFromGitHub { nixos-appstream-data = (import (pkgs.fetchFromGitHub {
@ -28,7 +28,7 @@ in pkgs.stdenv.mkDerivation rec {
cargoDeps = pkgs.rustPlatform.fetchCargoTarball { cargoDeps = pkgs.rustPlatform.fetchCargoTarball {
inherit src; inherit src;
name = "${pname}-${version}"; name = "${pname}-${version}";
hash = "sha256-EI9zULrlN+GvtDO0PvtAEA1YjJAbK+SDZ8NSRZf+2Rw="; hash = "sha256-c21JMLq1m5bLhmZihCbOjAr8WShDimaAjYISpai8oXE=";
}; };
nativeBuildInputs = with pkgs; [ nativeBuildInputs = with pkgs; [
@ -60,10 +60,6 @@ in pkgs.stdenv.mkDerivation rec {
nixos-appstream-data nixos-appstream-data
]; ];
# mesonFlags = [
# "-Dprofile=development"
# ];
patchPhase = '' patchPhase = ''
substituteInPlace ./src/lib.rs \ substituteInPlace ./src/lib.rs \
--replace "/usr/share/app-info" "${nixos-appstream-data}/share/app-info" --replace "/usr/share/app-info" "${nixos-appstream-data}/share/app-info"

View File

@ -11,13 +11,13 @@
inherit system; inherit system;
}; };
libadwaita-git = pkgs.libadwaita.overrideAttrs (oldAttrs: rec { libadwaita-git = pkgs.libadwaita.overrideAttrs (oldAttrs: rec {
version = "1.2.beta"; version = "1.2.rc";
src = pkgs.fetchFromGitLab { src = pkgs.fetchFromGitLab {
domain = "gitlab.gnome.org"; domain = "gitlab.gnome.org";
owner = "GNOME"; owner = "GNOME";
repo = "libadwaita"; repo = "libadwaita";
rev = version; rev = version;
hash = "sha256-QBblkeNAgfHi5YQxaV9ceqNDyDIGu8d6pvLcT6apm6o="; hash = "sha256-p7nsaAqrzQKeUiu7aGlgoKu0AH9KV/sMsVcLLpgl4Lo=";
}; };
}); });
nixos-appstream-data = pkgs.fetchFromGitHub { nixos-appstream-data = pkgs.fetchFromGitHub {

View File

@ -5,7 +5,7 @@ use adw::prelude::*;
use edit_distance; use edit_distance;
use serde_json::Value; use serde_json::Value;
use spdx::Expression; use spdx::Expression;
use crate::{parse::{packages::{Package, LicenseEnum, Platform}, cache::{uptodatelegacy, uptodateflake}, config::{NscConfig, getconfig, editconfig}}, ui::{installedpage::InstalledItem, pkgpage::PkgPageTypes}, APPINFO}; use crate::{parse::{packages::{Package, LicenseEnum, Platform}, cache::{uptodatelegacy, uptodateflake}, config::{NscConfig, getconfig, editconfig}}, ui::{installedpage::InstalledItem, pkgpage::PkgPageTypes}, APPINFO, config};
use super::{ use super::{
categories::{PkgGroup, PkgCategory}, categories::{PkgGroup, PkgCategory},
@ -102,10 +102,6 @@ pub enum AppMsg {
UpdateInstalledPkgs, UpdateInstalledPkgs,
UpdateUpdatePkgs, UpdateUpdatePkgs,
UpdateCategoryPkgs, UpdateCategoryPkgs,
// AddUserPkg(String),
// RemoveUserPkg(String),
// AddSystemPkg(String),
// RemoveSystemPkg(String),
SetSearch(bool), SetSearch(bool),
SetVsBar(bool), SetVsBar(bool),
SetVsChild(String), SetVsChild(String),
@ -116,7 +112,6 @@ pub enum AppMsg {
RemoveInstalledBusy(WorkPkg), RemoveInstalledBusy(WorkPkg),
OpenCategoryPage(PkgCategory), OpenCategoryPage(PkgCategory),
LoadCategory(PkgCategory) LoadCategory(PkgCategory)
// OpenWithScrnshots(String, Option<Vec<String>>),
} }
#[derive(Debug, Clone, PartialEq)] #[derive(Debug, Clone, PartialEq)]
@ -167,11 +162,13 @@ impl Component for AppModel {
set_valign: gtk::Align::Center, set_valign: gtk::Align::Center,
set_hexpand: true, set_hexpand: true,
set_vexpand: true, set_vexpand: true,
gtk::Spinner { set_spacing: 15,
set_spinning: true, gtk::Image {
set_height_request: 80, set_icon_name: Some(config::APP_ID),
set_pixel_size: 192,
}, },
gtk::Label { gtk::Label {
add_css_class: "title-1",
set_label: "Loading...", set_label: "Loading...",
}, },
} }