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

lyrics system update

Browse source
This commit is contained in:
Chris Cochrun 2022-03-25 10:06:32 -05:00
parent 7c1ff53074
commit 9bd6adb2f3
2 changed files with 16 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/qml/presenter/MainWindow.qml
View file

@ -59,7 +59,6 @@ Controls.Page {
Item { Item {
id: mainPageArea id: mainPageArea
Controls.SplitView.fillWidth: true Controls.SplitView.fillWidth: true
/* Controls.SplitView.preferredWidth: 500 */
Controls.SplitView.minimumWidth: 100 Controls.SplitView.minimumWidth: 100
Presenter.Presentation { Presenter.Presentation {

20
src/songsqlmodel.cpp
View file

@ -154,22 +154,34 @@ QStringList SongSqlModel::getLyricList(const int &row) {
int endIndex; int endIndex;
QString line; QString line;
QString verse; QString verse;
qDebug() << vorder.contains("C1");
qDebug() << vorder.indexOf("C1");
foreach (QString vstr, vorder) {
foreach (line, rawLyrics) {
if (line.startsWith(vstr.at(0)) && line.endsWith(vstr.at(1))) {
qDebug() << line;
startIndex = rawLyrics.indexOf(line);
}
if (rawLyrics.indexOf(line) > startIndex)
verse.append(line + "\n");
}
}
foreach (line, rawLyrics) { foreach (line, rawLyrics) {
if (line.trimmed() == "Chorus 1") { if (line.trimmed() == "Chorus 1") {
startIndex = rawLyrics.indexOf(line) + 1; startIndex = rawLyrics.indexOf(line) + 1;
qDebug() << line; // qDebug() << line;
qDebug() << startIndex; // qDebug() << startIndex;
} }
if (line.trimmed() == "Verse 1") { if (line.trimmed() == "Verse 1") {
endIndex = rawLyrics.indexOf(line); endIndex = rawLyrics.indexOf(line);
qDebug() << endIndex; // qDebug() << endIndex;
break; break;
} }
if (rawLyrics.indexOf(line) == startIndex - 1) { if (rawLyrics.indexOf(line) == startIndex - 1) {
continue; continue;
} }
verse.append(line + "\n"); verse.append(line + "\n");
qDebug() << verse; // qDebug() << verse;
} }
lyrics.append(verse); lyrics.append(verse);