feat(client): redesign native UI, themes, settings and avatars
Separate conversation drafts and voice view state, add native settings and restricted CSS themes, implement validated avatar cropping, and refresh dependencies with documented desktop compatibility backports.
This commit is contained in:
parent
44d284a568
commit
8e5ab56611
276 changed files with 53546 additions and 3399 deletions
187
patches/changes/zbus-lockstep.patch
Normal file
187
patches/changes/zbus-lockstep.patch
Normal file
|
|
@ -0,0 +1,187 @@
|
|||
--- a/zbus-lockstep/Cargo.toml
|
||||
+++ b/zbus-lockstep/Cargo.toml
|
||||
@@ -49,13 +49,16 @@
|
||||
path = "src/lib.rs"
|
||||
|
||||
[dependencies.zbus_xml]
|
||||
-version = "5.0.2"
|
||||
+version = "6"
|
||||
|
||||
-[dependencies.zvariant]
|
||||
-version = "5.1"
|
||||
|
||||
[dev-dependencies.tempfile]
|
||||
version = "3"
|
||||
|
||||
[dev-dependencies.version-sync]
|
||||
version = "0.9"
|
||||
+
|
||||
+[dependencies.zbus]
|
||||
+version = "6.1"
|
||||
+default-features = false
|
||||
+features = ["default-rt", "proxy", "service", "object-manager"]
|
||||
--- a/zbus-lockstep/src/lib.rs
|
||||
+++ b/zbus-lockstep/src/lib.rs
|
||||
@@ -32,7 +32,7 @@
|
||||
ArgDirection::{In, Out},
|
||||
Node,
|
||||
};
|
||||
-use zvariant::Signature;
|
||||
+use zbus::wire::Signature;
|
||||
use LockstepError::{ArgumentNotFound, InterfaceNotFound, MemberNotFound, PropertyNotFound};
|
||||
|
||||
type Result<T> = std::result::Result<T, Box<dyn std::error::Error>>;
|
||||
@@ -55,7 +55,7 @@
|
||||
/// # use std::fs::File;
|
||||
/// # use std::io::{Seek, SeekFrom, Write};
|
||||
/// # use tempfile::tempfile;
|
||||
-/// use zvariant::{Signature, Type, OwnedObjectPath};
|
||||
+/// use zbus::wire::{Signature, Type, OwnedObjectPath};
|
||||
/// use zbus_lockstep::get_signal_body_type;
|
||||
///
|
||||
/// let xml = r#"<?xml version="1.0" encoding="UTF-8"?>
|
||||
@@ -99,9 +99,8 @@
|
||||
.find(|iface| iface.name() == interface_name)
|
||||
.ok_or(InterfaceNotFound(interface_name.to_owned()))?;
|
||||
|
||||
- let signals = interface.signals();
|
||||
+ let mut signals = interface.signals();
|
||||
let signal = signals
|
||||
- .iter()
|
||||
.find(|signal| signal.name() == member_name)
|
||||
.ok_or(MemberNotFound(member_name.to_owned()))?;
|
||||
|
||||
@@ -132,7 +131,7 @@
|
||||
/// use std::fs::File;
|
||||
/// use std::io::{Seek, SeekFrom, Write};
|
||||
/// use tempfile::tempfile;
|
||||
-/// use zvariant::Type;
|
||||
+/// use zbus::wire::Type;
|
||||
/// use zbus_lockstep::get_property_type;
|
||||
///
|
||||
/// #[derive(Debug, PartialEq, Type)]
|
||||
@@ -169,9 +168,8 @@
|
||||
.find(|iface| iface.name() == interface_name)
|
||||
.ok_or(InterfaceNotFound(interface_name.to_string()))?;
|
||||
|
||||
- let properties = interface.properties();
|
||||
+ let mut properties = interface.properties();
|
||||
let property = properties
|
||||
- .iter()
|
||||
.find(|property| property.name() == property_name)
|
||||
.ok_or(PropertyNotFound(property_name.to_owned()))?;
|
||||
|
||||
@@ -191,7 +189,7 @@
|
||||
/// use std::fs::File;
|
||||
/// use std::io::{Seek, SeekFrom, Write};
|
||||
/// use tempfile::tempfile;
|
||||
-/// use zvariant::Type;
|
||||
+/// use zbus::wire::Type;
|
||||
/// use zbus_lockstep::get_method_return_type;
|
||||
///
|
||||
/// #[derive(Debug, PartialEq, Type)]
|
||||
@@ -237,9 +235,8 @@
|
||||
.find(|iface| iface.name() == interface_name)
|
||||
.ok_or(InterfaceNotFound(interface_name.to_string()))?;
|
||||
|
||||
- let methods = interface.methods();
|
||||
+ let mut methods = interface.methods();
|
||||
let method = methods
|
||||
- .iter()
|
||||
.find(|method| method.name() == member_name)
|
||||
.ok_or(MemberNotFound(member_name.to_string()))?;
|
||||
|
||||
@@ -278,7 +275,7 @@
|
||||
/// use std::collections::HashMap;
|
||||
/// use std::io::{Seek, SeekFrom, Write};
|
||||
/// use tempfile::tempfile;
|
||||
-/// use zvariant::{Type, Value};
|
||||
+/// use zbus::wire::{Type, Variant as Value};
|
||||
/// use zbus_lockstep::get_method_args_type;
|
||||
///
|
||||
/// let xml = r#"<?xml version="1.0" encoding="UTF-8"?>
|
||||
@@ -335,9 +332,8 @@
|
||||
.find(|iface| iface.name() == interface_name)
|
||||
.ok_or(InterfaceNotFound(interface_name.to_owned()))?;
|
||||
|
||||
- let methods = interface.methods();
|
||||
+ let mut methods = interface.methods();
|
||||
let method = methods
|
||||
- .iter()
|
||||
.find(|method| method.name() == member_name)
|
||||
.ok_or(member_name.to_owned())?;
|
||||
|
||||
@@ -364,7 +360,7 @@
|
||||
use std::io::{Seek, SeekFrom, Write};
|
||||
|
||||
use tempfile::tempfile;
|
||||
- use zvariant::{OwnedObjectPath, Type};
|
||||
+ use zbus::wire::{OwnedObjectPath, Type};
|
||||
|
||||
use crate::get_signal_body_type;
|
||||
|
||||
--- a/zbus-lockstep/src/macros.rs
|
||||
+++ b/zbus-lockstep/src/macros.rs
|
||||
@@ -143,7 +143,7 @@
|
||||
let entry = entry.expect("Failed to read entry");
|
||||
|
||||
// Skip directories and non-XML files.
|
||||
- if entry.path().is_dir() || entry.path().extension().unwrap() != "xml" {
|
||||
+ if entry.path().is_dir() || entry.path().extension() != Some(std::ffi::OsStr::new("xml")) {
|
||||
continue;
|
||||
}
|
||||
|
||||
@@ -236,7 +236,7 @@
|
||||
/// ```rust
|
||||
/// use std::str::FromStr;
|
||||
/// use zbus_lockstep::method_return_signature;
|
||||
-/// use zvariant::Signature;
|
||||
+/// use zbus::wire::Signature;
|
||||
///
|
||||
/// std::env::set_var("LOCKSTEP_XML_PATH", "../xml");
|
||||
///
|
||||
@@ -356,7 +356,7 @@
|
||||
/// ```rust
|
||||
/// use std::str::FromStr;
|
||||
/// use zbus_lockstep::method_args_signature;
|
||||
-/// use zvariant::Signature;
|
||||
+/// use zbus::wire::Signature;
|
||||
///
|
||||
/// std::env::set_var("LOCKSTEP_XML_PATH", "../xml");
|
||||
///
|
||||
@@ -473,7 +473,7 @@
|
||||
/// ```rust
|
||||
/// use std::str::FromStr;
|
||||
/// use zbus_lockstep::signal_body_type_signature;
|
||||
-/// use zvariant::Signature;
|
||||
+/// use zbus::wire::Signature;
|
||||
///
|
||||
/// std::env::set_var("LOCKSTEP_XML_PATH", "../xml");
|
||||
///
|
||||
@@ -591,7 +591,7 @@
|
||||
/// ```rust
|
||||
/// use std::str::FromStr;
|
||||
/// use zbus_lockstep::property_type_signature;
|
||||
-/// use zvariant::Signature;
|
||||
+/// use zbus::wire::Signature;
|
||||
///
|
||||
/// std::env::set_var("LOCKSTEP_XML_PATH", "../xml");
|
||||
///
|
||||
@@ -662,7 +662,7 @@
|
||||
mod test {
|
||||
use std::str::FromStr;
|
||||
|
||||
- use zvariant::Signature;
|
||||
+ use zbus::wire::Signature;
|
||||
|
||||
use crate::signal_body_type_signature;
|
||||
|
||||
@@ -675,7 +675,7 @@
|
||||
let sig = crate::signal_body_type_signature!("AddNode");
|
||||
assert_eq!(
|
||||
&sig,
|
||||
- &zvariant::Signature::from_str("(so)").expect("Valid signature pattern")
|
||||
+ &zbus::wire::Signature::from_str("(so)").expect("Valid signature pattern")
|
||||
);
|
||||
}
|
||||
|
||||
Loading…
Add table
Add a link
Reference in a new issue