Compare commits
No commits in common. "1f676f2e9f70fb546156fdb5b2fc91fe7522f8f8" and "f3dc071bd69b0aec8c3967621a6b420ffde295ed" have entirely different histories.
1f676f2e9f
...
f3dc071bd6
22 changed files with 43 additions and 43 deletions
44
Cargo.lock
generated
44
Cargo.lock
generated
|
|
@ -1855,7 +1855,7 @@ dependencies = [
|
||||||
"libc",
|
"libc",
|
||||||
"option-ext",
|
"option-ext",
|
||||||
"redox_users",
|
"redox_users",
|
||||||
"windows-sys 0.61.2",
|
"windows-sys 0.59.0",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
|
|
@ -2012,7 +2012,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
|
checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"libc",
|
"libc",
|
||||||
"windows-sys 0.61.2",
|
"windows-sys 0.52.0",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
|
|
@ -2385,7 +2385,7 @@ checksum = "9fb9654ba8355388abeb8dcb4fc62f511300867002afc858860463bdd9fe0c44"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"proc-macro2",
|
"proc-macro2",
|
||||||
"quote",
|
"quote",
|
||||||
"syn 3.0.5",
|
"syn 3.0.3",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
|
|
@ -3742,7 +3742,7 @@ version = "1.4.2"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "7a1886916523694cd6ea3d175f03a1e5010699a2a4cc13696d83d7bea1d80638"
|
checksum = "7a1886916523694cd6ea3d175f03a1e5010699a2a4cc13696d83d7bea1d80638"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"windows-sys 0.61.2",
|
"windows-sys 0.59.0",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
|
|
@ -4257,9 +4257,9 @@ dependencies = [
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "nmrs"
|
name = "nmrs"
|
||||||
version = "3.5.2"
|
version = "3.4.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "aa84a0ad51eda83c8817099a0b613847599c712d049e89d892cca53ed6c4a337"
|
checksum = "62c427203beda58ac05815b356d64a34eeb2fba180b3077d543ebb1472fc1269"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"async-trait",
|
"async-trait",
|
||||||
"base64",
|
"base64",
|
||||||
|
|
@ -4317,7 +4317,7 @@ version = "0.50.3"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5"
|
checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"windows-sys 0.61.2",
|
"windows-sys 0.59.0",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
|
|
@ -5443,7 +5443,7 @@ dependencies = [
|
||||||
"errno",
|
"errno",
|
||||||
"libc",
|
"libc",
|
||||||
"linux-raw-sys 0.12.1",
|
"linux-raw-sys 0.12.1",
|
||||||
"windows-sys 0.61.2",
|
"windows-sys 0.52.0",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
|
|
@ -5838,7 +5838,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "52d1cfed4120b4d927bf7c0f86d2087a4a7d6027c906d9f9d525a80573b9be51"
|
checksum = "52d1cfed4120b4d927bf7c0f86d2087a4a7d6027c906d9f9d525a80573b9be51"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"libc",
|
"libc",
|
||||||
"windows-sys 0.61.2",
|
"windows-sys 0.60.2",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
|
|
@ -5971,9 +5971,9 @@ dependencies = [
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "syn"
|
name = "syn"
|
||||||
version = "3.0.5"
|
version = "3.0.3"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "12df2e0110f65b775f769bb17ef989067a1d931b2eb822bd4346631eeada89f9"
|
checksum = "53e9bae58849f64dfa4f5d5ae372c8341f7305f82a3868709269343628b659a3"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"proc-macro2",
|
"proc-macro2",
|
||||||
"quote",
|
"quote",
|
||||||
|
|
@ -6025,10 +6025,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "32497e9a4c7b38532efcdebeef879707aa9f794296a4f0244f6f69e9bc8574bd"
|
checksum = "32497e9a4c7b38532efcdebeef879707aa9f794296a4f0244f6f69e9bc8574bd"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"fastrand",
|
"fastrand",
|
||||||
"getrandom 0.4.3",
|
"getrandom 0.3.4",
|
||||||
"once_cell",
|
"once_cell",
|
||||||
"rustix 1.1.4",
|
"rustix 1.1.4",
|
||||||
"windows-sys 0.61.2",
|
"windows-sys 0.52.0",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
|
|
@ -6389,7 +6389,7 @@ checksum = "f2f6fb2847f6742cd76af783a2a2c49e9375d0a111c7bef6f71cd9e738c72d6e"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"memoffset",
|
"memoffset",
|
||||||
"tempfile",
|
"tempfile",
|
||||||
"windows-sys 0.61.2",
|
"windows-sys 0.60.2",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
|
|
@ -7021,7 +7021,7 @@ version = "0.1.11"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22"
|
checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"windows-sys 0.61.2",
|
"windows-sys 0.48.0",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
|
|
@ -7911,7 +7911,7 @@ dependencies = [
|
||||||
"proc-macro-crate",
|
"proc-macro-crate",
|
||||||
"proc-macro2",
|
"proc-macro2",
|
||||||
"quote",
|
"quote",
|
||||||
"syn 3.0.5",
|
"syn 3.0.3",
|
||||||
"zbus_names",
|
"zbus_names",
|
||||||
"zvariant",
|
"zvariant",
|
||||||
"zvariant_utils",
|
"zvariant_utils",
|
||||||
|
|
@ -8165,7 +8165,7 @@ dependencies = [
|
||||||
"proc-macro-crate",
|
"proc-macro-crate",
|
||||||
"proc-macro2",
|
"proc-macro2",
|
||||||
"quote",
|
"quote",
|
||||||
"syn 3.0.5",
|
"syn 3.0.3",
|
||||||
"zvariant_utils",
|
"zvariant_utils",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
|
@ -8178,14 +8178,14 @@ dependencies = [
|
||||||
"proc-macro2",
|
"proc-macro2",
|
||||||
"quote",
|
"quote",
|
||||||
"serde",
|
"serde",
|
||||||
"syn 3.0.5",
|
"syn 3.0.3",
|
||||||
"winnow",
|
"winnow",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[patch.unused]]
|
|
||||||
name = "winit-x11"
|
|
||||||
version = "0.31.0-beta.2"
|
|
||||||
|
|
||||||
[[patch.unused]]
|
[[patch.unused]]
|
||||||
name = "cosmic-settings-airplane-mode-subscription"
|
name = "cosmic-settings-airplane-mode-subscription"
|
||||||
version = "1.7.0"
|
version = "1.7.0"
|
||||||
|
|
||||||
|
[[patch.unused]]
|
||||||
|
name = "winit-x11"
|
||||||
|
version = "0.31.0-beta.2"
|
||||||
|
|
|
||||||
|
|
@ -3,6 +3,6 @@ pin = Закрепить на панели приложений
|
||||||
quit = Завершить
|
quit = Завершить
|
||||||
quit-all = Завершить все
|
quit-all = Завершить все
|
||||||
new-window = Новое окно
|
new-window = Новое окно
|
||||||
run = Запустить
|
run = Выполнить
|
||||||
run-on = Запустить на { $gpu }
|
run-on = Запустить на { $gpu }
|
||||||
run-on-default = (По умолчанию)
|
run-on-default = (По умолчанию)
|
||||||
|
|
|
||||||
|
|
@ -439,7 +439,7 @@ impl cosmic::Application for Audio {
|
||||||
tokio::time::sleep(Duration::from_millis(128)).await;
|
tokio::time::sleep(Duration::from_millis(128)).await;
|
||||||
_ = client
|
_ = client
|
||||||
.conn
|
.conn
|
||||||
.set_source_volume(volume.load(atomic::Ordering::Relaxed))
|
.set_sink_volume(volume.load(atomic::Ordering::Relaxed))
|
||||||
.await;
|
.await;
|
||||||
Message::ReattachClient(Arc::new(client)).into()
|
Message::ReattachClient(Arc::new(client)).into()
|
||||||
});
|
});
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,9 @@
|
||||||
battery = Batterij
|
battery = Batterij
|
||||||
battery-desc = Verminderde prestaties en lager energieverbruik.
|
battery-desc = Energiebesparing en lagere prestaties.
|
||||||
balanced = Gebalanceerd
|
balanced = Gebalanceerd
|
||||||
balanced-desc = Normale prestaties en matig energieverbruik.
|
balanced-desc = Normale prestaties en batterijverbruik.
|
||||||
performance = Hoge prestaties
|
performance = Hoge prestaties
|
||||||
performance-desc = Maximale prestaties en hoger energieverbruik.
|
performance-desc = Hoge prestaties en energieverbruik.
|
||||||
max-charge = Verleng de levensduur van uw batterij door een maximale laadwaarde van 80% in te stellen
|
max-charge = Verleng de levensduur van uw batterij door een maximale laadwaarde van 80% in te stellen
|
||||||
seconds = s
|
seconds = s
|
||||||
minutes = m
|
minutes = m
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
battery = Bateria
|
battery = Economia de energia
|
||||||
battery-desc = Uso reduzido de energia e desempenho limitado.
|
battery-desc = Uso reduzido de energia e desempenho limitado.
|
||||||
balanced = Balanceado
|
balanced = Balanceado
|
||||||
balanced-desc = Desempenho padrão e uso de bateria moderado.
|
balanced-desc = Desempenho padrão e uso de bateria moderado.
|
||||||
|
|
|
||||||
|
|
@ -275,9 +275,10 @@ const DEFAULT_DEVICE_ICON: &str = "bluetooth-symbolic";
|
||||||
impl BluerDevice {
|
impl BluerDevice {
|
||||||
#[inline(never)]
|
#[inline(never)]
|
||||||
pub async fn from_device(device: &bluer::Device) -> Self {
|
pub async fn from_device(device: &bluer::Device) -> Self {
|
||||||
let (alias, name, is_paired, is_trusted, is_connected, battery_percent, icon) = futures::join!(
|
let (mut name, is_paired, is_trusted, is_connected, battery_percent, icon) = futures::join!(
|
||||||
device.alias().map(|res| res.ok()),
|
device
|
||||||
device.name().map(|res| res.ok().flatten()),
|
.name()
|
||||||
|
.map(|res| res.ok().flatten().unwrap_or(device.address().to_string())),
|
||||||
device.is_paired().map(Result::unwrap_or_default),
|
device.is_paired().map(Result::unwrap_or_default),
|
||||||
device.is_trusted().map(Result::unwrap_or_default),
|
device.is_trusted().map(Result::unwrap_or_default),
|
||||||
device.is_connected().map(Result::unwrap_or_default),
|
device.is_connected().map(Result::unwrap_or_default),
|
||||||
|
|
@ -286,11 +287,10 @@ impl BluerDevice {
|
||||||
.icon()
|
.icon()
|
||||||
.map(|res| device_type_to_icon(&res.ok().flatten().unwrap_or_default()))
|
.map(|res| device_type_to_icon(&res.ok().flatten().unwrap_or_default()))
|
||||||
);
|
);
|
||||||
let address_string = device.address().to_string();
|
|
||||||
let name = alias
|
if name.is_empty() {
|
||||||
.filter(|name| !name.is_empty() && *name != address_string.replace(':', "-"))
|
name = device.address().to_string();
|
||||||
.or(name.filter(|name| !name.is_empty()))
|
}
|
||||||
.unwrap_or(address_string);
|
|
||||||
|
|
||||||
let status = if is_connected {
|
let status = if is_connected {
|
||||||
BluerDeviceStatus::Connected
|
BluerDeviceStatus::Connected
|
||||||
|
|
|
||||||
|
|
@ -26,4 +26,4 @@ tracing.workspace = true
|
||||||
indexmap = "2.13.0"
|
indexmap = "2.13.0"
|
||||||
secure-string = "0.3.0"
|
secure-string = "0.3.0"
|
||||||
uuid = { version = "1.21.0", features = ["v4"] }
|
uuid = { version = "1.21.0", features = ["v4"] }
|
||||||
nmrs = "3.5.2"
|
nmrs = "3.4.0"
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
use indexmap::IndexMap;
|
use indexmap::IndexMap;
|
||||||
use nmrs::{
|
use nmrs::{
|
||||||
ActiveConnection, ActiveConnectionState, ConnectByUuidConfig, ConnectType, ConnectivityState,
|
ActiveConnection, ActiveConnectionState, ConnectType, ConnectivityState, EapOptions,
|
||||||
EapOptions, NetworkEvent, NetworkManager as NmrsManager, NetworkSnapshot, WifiSecurity,
|
NetworkEvent, NetworkManager as NmrsManager, NetworkSnapshot, WifiSecurity,
|
||||||
agent::{SecretAgent, SecretAgentCapabilities, SecretRequest, SecretResponder, SecretSetting},
|
agent::{SecretAgent, SecretAgentCapabilities, SecretRequest, SecretResponder, SecretSetting},
|
||||||
};
|
};
|
||||||
use rustc_hash::FxHashSet;
|
use rustc_hash::FxHashSet;
|
||||||
|
|
@ -916,7 +916,7 @@ impl CosmicNetworkApplet {
|
||||||
cosmic::task::future(async move {
|
cosmic::task::future(async move {
|
||||||
let error = match NmrsManager::new().await {
|
let error = match NmrsManager::new().await {
|
||||||
Ok(nm) => nm
|
Ok(nm) => nm
|
||||||
.connect_by_uuid(&uuid, ConnectByUuidConfig::default())
|
.connect_vpn_by_uuid(&uuid)
|
||||||
.await
|
.await
|
||||||
.err()
|
.err()
|
||||||
.map(|e| format!("activate VPN {uuid}: {e}")),
|
.map(|e| format!("activate VPN {uuid}: {e}")),
|
||||||
|
|
@ -1318,7 +1318,7 @@ impl cosmic::Application for CosmicNetworkApplet {
|
||||||
let disconnect_task = cosmic::task::future(async move {
|
let disconnect_task = cosmic::task::future(async move {
|
||||||
let error = match NmrsManager::new().await {
|
let error = match NmrsManager::new().await {
|
||||||
Ok(nm) => nm
|
Ok(nm) => nm
|
||||||
.disconnect_by_uuid(&uuid)
|
.disconnect_vpn_by_uuid(&uuid)
|
||||||
.await
|
.await
|
||||||
.err()
|
.err()
|
||||||
.map(|e| format!("disconnect VPN {uuid}: {e}")),
|
.map(|e| format!("disconnect VPN {uuid}: {e}")),
|
||||||
|
|
|
||||||
|
|
@ -45,7 +45,7 @@ cosmic-applet-tiling-comment = Διαχείριση της ένδειξης εν
|
||||||
cosmic-applet-tiling-keywords = Μικροεφαρμογή;Παράθεση;Ένδειξη;Χώρος;Εργασίας;COSMIC;Applet;Tiling;Hint;Workspace;
|
cosmic-applet-tiling-keywords = Μικροεφαρμογή;Παράθεση;Ένδειξη;Χώρος;Εργασίας;COSMIC;Applet;Tiling;Hint;Workspace;
|
||||||
cosmic-applet-time-comment = Προβολή της τρέχουσας ώρας στη γραμμή συστήματος με αναδυόμενο ημερολόγιο
|
cosmic-applet-time-comment = Προβολή της τρέχουσας ώρας στη γραμμή συστήματος με αναδυόμενο ημερολόγιο
|
||||||
cosmic-applet-workspaces-comment = Εναλλαγή μεταξύ των αριθμημένων χώρων εργασίας στη γραμμή συστήματος
|
cosmic-applet-workspaces-comment = Εναλλαγή μεταξύ των αριθμημένων χώρων εργασίας στη γραμμή συστήματος
|
||||||
cosmic-panel-launcher-button = Κουμπί γραμμής εκκίνησης
|
cosmic-panel-launcher-button = Κουμπί μενού εκκίνησης
|
||||||
cosmic-panel-launcher-button-comment = Άνοιγμα της γραμμής εκκίνησης για αναζήτηση εφαρμογών και εκτέλεση εντολών
|
cosmic-panel-launcher-button-comment = Άνοιγμα του μενού εκκίνησης για αναζήτηση εφαρμογών και εκτέλεση εντολών
|
||||||
cosmic-panel-launcher-button-keywords = Μικροεφαρμογή;Μενού;Εκκίνηση;Εκτέλεση;COSMIC;Applet;Launcher;Runner;
|
cosmic-panel-launcher-button-keywords = Μικροεφαρμογή;Μενού;Εκκίνηση;Εκτέλεση;COSMIC;Applet;Launcher;Runner;
|
||||||
cosmic-panel-workspaces-button-comment = Άνοιγμα των χώρων εργασίας για διαχείριση και εναλλαγή χώρων εργασίας
|
cosmic-panel-workspaces-button-comment = Άνοιγμα των χώρων εργασίας για διαχείριση και εναλλαγή χώρων εργασίας
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue