From 4954f108a6e2a46895a63cdc47edfb73e5724faf Mon Sep 17 00:00:00 2001 From: Chris Cochrun Date: Wed, 7 Sep 2022 14:30:19 -0500 Subject: [PATCH] fixing a bug in the getLyricList command and clear on lyric edits --- src/qml/presenter/SongEditor.qml | 2 +- src/songsqlmodel.cpp | 17 +++++++++++++++-- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/src/qml/presenter/SongEditor.qml b/src/qml/presenter/SongEditor.qml index c6afc19..bdfb880 100644 --- a/src/qml/presenter/SongEditor.qml +++ b/src/qml/presenter/SongEditor.qml @@ -304,7 +304,7 @@ Item { function updateLyrics(lyrics) { songsqlmodel.updateLyrics(songIndex, lyrics); songLyrics = lyrics; - /* print(lyrics); */ + clearSlides(); changeSlideText(song.id - 1); } diff --git a/src/songsqlmodel.cpp b/src/songsqlmodel.cpp index 1e8ff2a..48c4000 100644 --- a/src/songsqlmodel.cpp +++ b/src/songsqlmodel.cpp @@ -158,7 +158,7 @@ QStringList SongSqlModel::getLyricList(const int &row) { } QStringList rawLyrics = recordData.value("lyrics").toString().split("\n"); - qDebug() << rawLyrics; + qDebug() << "HERE ARE RAW LYRICS: " << rawLyrics; QStringList lyrics; QStringList vorder = recordData.value("vorder").toString().split(" "); @@ -194,7 +194,7 @@ QStringList SongSqlModel::getLyricList(const int &row) { // qDebug() << line; if (verse.contains("\n\n")) { verse = verse.trimmed(); - // qDebug() << "THIS IS A EMPTY SLIDE!" << verse; + qDebug() << "THIS IS A EMPTY SLIDE!" << verse; QStringList multiverses = verse.split("\n\n"); foreach (verse, multiverses) { verses.insert(vtitle, verse); @@ -211,6 +211,19 @@ QStringList SongSqlModel::getLyricList(const int &row) { continue; } else if (rawLyrics.endsWith(line)) { // qDebug() << vtitle; + + verse.append(line.trimmed() + "\n"); + if (verse.contains("\n\n")) { + verse = verse.trimmed(); + qDebug() << "THIS IS A EMPTY SLIDE!" << verse; + QStringList multiverses = verse.split("\n\n"); + foreach (verse, multiverses) { + verses.insert(vtitle, verse); + // qDebug() << verse; + } + break; + } + verse.append(line.trimmed() + "\n"); verses.insert(vtitle, verse); break;