chris/lumina-qml
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

basic updates to make cxx-qt work with 6.0

Browse source
This commit is contained in:
Chris Cochrun 2023-11-21 11:44:46 -06:00
parent 6b3559b4ef
commit 5d571a7e6f
2 changed files with 171 additions and 170 deletions
Download patch file Download diff file Expand all files Collapse all files

134
src/rust/service_thing.rs
View file

@ -1,7 +1,5 @@
#[cxx_qt::bridge]
mod service_thing {
use cxx_qt_lib::QVariantValue;
unsafe extern "C++" {
include!("cxx-qt-lib/qstring.h");
type QString = cxx_qt_lib::QString;
@ -9,75 +7,73 @@ mod service_thing {
type QVariant = cxx_qt_lib::QVariant;
}
#[derive(Clone)]
#[cxx_qt::qobject]
pub struct ServiceThing {
#[qproperty]
name: QString,
#[qproperty]
kind: QString,
#[qproperty]
background: QString,
#[qproperty]
background_type: QString,
#[qproperty]
text: QString,
#[qproperty]
audio: QString,
#[qproperty]
font: QString,
#[qproperty]
font_size: QString,
#[qproperty]
active: bool,
#[qproperty]
selected: bool,
}
impl Default for ServiceThing {
fn default() -> Self {
Self {
name: QString::from(""),
kind: QString::from(""),
background: QString::from(""),
background_type: QString::from(""),
text: QString::from(""),
audio: QString::from(""),
font: QString::from(""),
font_size: QString::from(""),
active: false,
selected: false,
}
}
}
impl qobject::ServiceThing {
#[qinvokable]
pub fn activate(self: Pin<&mut Self>) {
println!("{}", self.active());
let active: bool = *self.active();
self.set_active(!active);
println!("{}", !active);
}
unsafe extern "RustQt" {
#[qobject]
#[qml_element]
#[qproperty(QString, name)]
#[qproperty(QString, kind)]
#[qproperty(QString, background)]
#[qproperty(QString, background_type)]
#[qproperty(QString, text)]
#[qproperty(QString, audio)]
#[qproperty(QString, font)]
#[qproperty(QString, font_size)]
#[qproperty(bool, active)]
#[qproperty(bool, selected)]
type ServiceThing = super::ServiceThingRust;
#[qinvokable]
pub fn check_active(self: Pin<&mut Self>) {
println!("Are we active?: {}", self.active());
}
fn activate(self: Pin<&mut ServiceThing>);
// #[qinvokable]
// pub fn slap_variant_around(self: Pin<&mut Self>, variant: &QVariant) {
// println!("wow!");
// let sname: String;
// match variant.value() {
// QVariantValue::QString(string) => {
// let nstr = string.to_string();
// self.set_name(QString::from(nstr.as_str()));
// sname = nstr;
// println!("New name is: {}", sname);
// }
// _ => println!("Unknown QVariant type"),
// };
// }
#[qinvokable]
fn check_active(self: Pin<&mut ServiceThing>);
}
}
use cxx_qt_lib::QString;
#[derive(Clone)]
pub struct ServiceThingRust {
name: QString,
kind: QString,
background: QString,
background_type: QString,
text: QString,
audio: QString,
font: QString,
font_size: QString,
active: bool,
selected: bool,
}
impl Default for ServiceThingRust {
fn default() -> Self {
Self {
name: QString::from(""),
kind: QString::from(""),
background: QString::from(""),
background_type: QString::from(""),
text: QString::from(""),
audio: QString::from(""),
font: QString::from(""),
font_size: QString::from(""),
active: false,
selected: false,
}
}
}
impl qobject::ServiceThing {
#[qinvokable]
pub fn activate(self: Pin<&mut Self>) {
println!("{}", self.active());
let active: bool = *self.active();
self.set_active(!active);
println!("{}", !active);
}
#[qinvokable]
pub fn check_active(self: Pin<&mut Self>) {
println!("Are we active?: {}", self.active());
}
}