fixing small ui things and making audio picking use portal

This commit is contained in:
Chris Cochrun 2023-09-28 06:31:29 -05:00
parent 4b6a079a4e
commit 9f4d426a8f
7 changed files with 189 additions and 151 deletions

View file

@ -92,10 +92,12 @@ mod file_helper {
}
#[qinvokable]
pub fn load_file(self: Pin<&mut Self>) -> QUrl {
let file = FileDialog::new()
.set_title("Load Presentation")
.pick_file();
pub fn load_file(
self: Pin<&mut Self>,
title: QString,
) -> QUrl {
let title = title.to_string();
let file = FileDialog::new().set_title(title).pick_file();
if let Some(file) = file {
println!("loading-file: {:?}", file);
let mut string =

View file

@ -859,8 +859,10 @@ pub mod song_model {
let mut verse_name = "";
debug!(verse = verse);
for word in keywords.clone() {
let end_verse = verse.get(1..2).unwrap();
let beg_verse = verse.get(0..1).unwrap();
let end_verse =
verse.get(1..2).unwrap_or_default();
let beg_verse =
verse.get(0..1).unwrap_or_default();
println!(
"verse: {:?}, beginning: {:?}, end: {:?}, word: {:?}",
verse, beg_verse, end_verse, word