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

update to make song_editor ready

Browse source
This commit is contained in:
Chris Cochrun 2023-10-09 13:53:09 -05:00
parent e1cfa5e843
commit 96d5bdac73
5 changed files with 93 additions and 85 deletions
Download patch file Download diff file Expand all files Collapse all files

56
src/rust/songs/song_editor.rs
View file

@ -1,6 +1,5 @@
#[cxx_qt::bridge]
mod song_editor {
use crate::songs::song_model::qobject::SongModel;
pub mod song_editor {
unsafe extern "C++" {
include!("cxx-qt-lib/qmap.h");
@ -16,8 +15,8 @@ mod song_editor {
type QStringList = cxx_qt_lib::QStringList;
include!("cxx-qt-lib/qlist.h");
type QList_QString = cxx_qt_lib::QList<QString>;
#[cxx_name = "SongModel"]
type CxxSongs = SongModel;
// #[cxx_name = "SongModel"]
// type CxxSongs = crate::songs::song_model::qobject::SongModel;
}
#[derive(Clone, Debug)]
@ -49,8 +48,8 @@ mod song_editor {
font: QString,
#[qproperty]
font_size: i32,
#[qproperty]
song_model: *mut CxxSongs,
// #[qproperty]
// song_model: *mut CxxSongs,
}
impl Default for SongEditor {
@ -69,17 +68,50 @@ mod song_editor {
vertical_text_alignment: QString::default(),
font: QString::default(),
font_size: 50,
song_model: std::ptr::null_mut(),
// song_model: std::ptr::null_mut(),
}
}
}
impl SongEditor {
impl qobject::SongEditor {
fn idk(mut self: Pin<&mut Self>) {
let mut model = self.song_model().as_mut().unwrap();
let pinned_model = Pin::new_unchecked(model);
pinned_model.update_ccli(0, QString::from("idk"));
todo!();
// let mut model = self.song_model().as_mut().unwrap();
// let pinned_model = Pin::new_unchecked(model);
// pinned_model.update_ccli(0, QString::from("idk"));
todo!()
}
// #[qinvokable]
// fn set_song(
// mut self: Pin<&mut Self>,
// title: QString,
// lyrics: QString,
// author: QString,
// ccli: QString,
// audio: QUrl,
// verse_order: QString,
// background: QUrl,
// background_type: QString,
// horizontal_text_alignment: QString,
// vertical_text_alignment: QString,
// font: QString,
// font_size: i32,
// ) -> bool {
// self.as_mut().set_title(title);
// self.as_mut().set_lyrics(lyrics);
// self.as_mut().set_author(author);
// self.as_mut().set_ccli(ccli);
// self.as_mut().set_audio(audio);
// self.as_mut().set_verse_order(verse_order);
// self.as_mut().set_background(background);
// self.as_mut().set_background_type(background_type);
// self.as_mut().set_horizontal_text_alignment(
// horizontal_text_alignment,
// );
// self.as_mut()
// .set_vertical_text_alignment(vertical_text_alignment);
// self.as_mut().set_font(font);
// self.as_mut().set_font_size(font_size);
// true
// }
}
}

11
src/rust/songs/song_model.rs
View file

@ -286,11 +286,11 @@ pub mod song_model {
.get_mut(index as usize)
{
song.title = updated_title.to_string();
self.as_mut().emit(Signals::DataChanged {
top_left: &model_index,
bottom_right: &model_index,
roles: &vector_roles,
});
self.as_mut().emit_data_changed(
model_index,
model_index,
&vector_roles,
);
self.as_mut().emit_title_changed();
true
} else {
@ -793,6 +793,7 @@ pub mod song_model {
let role_names_iter = role_names.iter();
if let Some(song) = self.rust().songs.get(index as usize)
{
debug!(song);
for i in role_names_iter {
qvariantmap.insert(
QString::from(&i.1.to_string()),