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

making songeditor funcitonal but not yet

Browse source
This commit is contained in:
Chris Cochrun 2022-02-24 11:45:28 -06:00
parent d5515d4c52
commit f755190e40
6 changed files with 39 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/qml/presenter/Library.qml
View file

@ -1,5 +1,4 @@
import QtQuick 2.13
import QtQuick.Dialogs 1.0
import QtQuick.Controls 2.0 as Controls
import QtQuick.Layouts 1.2
import org.kde.kirigami 2.13 as Kirigami
@ -79,7 +78,6 @@ Item {
delegate: songDelegate
state: "selected"
Component.onCompleted: songList = songLibraryList
states: [
State {
name: "deselected"
@ -143,7 +141,7 @@ Item {
onClicked: {
showPassiveNotification(title, 3000)
songLibraryList.currentIndex = index
song = songLibraryList.selected
song = index
songTitle = title
songLyrics = lyrics
songAuthor = author
@ -412,4 +410,8 @@ Item {
}
}
function updateSongLyrics(lyrics) {
showPassiveNotification("library function" + lyrics)
showPassiveNotification("WE DID IT!")
}
}

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

@ -3,8 +3,6 @@ import QtQuick.Dialogs 1.0
import QtQuick.Controls 2.15 as Controls
import QtQuick.Window 2.13
import QtQuick.Layouts 1.2
import QtMultimedia 5.15
import QtAudioEngine 1.15
import org.kde.kirigami 2.13 as Kirigami
import "./" as Presenter
import org.presenter 1.0
@ -20,13 +18,16 @@ Controls.Page {
property string songLyrics: ""
property string songAuthor: ""
property int blurRadius: 0
property ListView songList
property Item slideItem
property var song
property var draggedLibraryItem
signal songUpdated(string title, string lyrics, string author, string ccli, string audio)
signal songLyricsUpdated(string lyrics)
Component.onCompleted: {
mainPage.songLyricsUpdated.connect(library.updateSongLyrics)
}
Item {
id: mainItem
@ -139,14 +140,15 @@ Controls.Page {
}
SongSqlModel {
id: songsqlmodel
}
function updateLyrics(lyrics) {
showPassiveNotification("adding lyrics...")
songList.model.lyrics = lyrics;
showPassiveNotification("added lyrics:\n " + lyrics)
showPassiveNotification("song id " + song);
songsqlmodel.setLyrics(song, lyrics);
showPassiveNotification("did we do it?");
}
}

7
src/qml/presenter/SongEditor.qml
View file

@ -1,9 +1,6 @@
import QtQuick 2.13
import QtQuick.Dialogs 1.0
import QtQuick.Controls 2.15 as Controls
import QtQuick.Window 2.13
import QtQuick.Layouts 1.2
import QtAudioEngine 1.15
import org.kde.kirigami 2.13 as Kirigami
import "./" as Presenter
@ -137,7 +134,7 @@ Item {
textFormat: TextEdit.MarkdownText
padding: 10
onEditingFinished: mainPage.updateLyrics(text)
onPressed: editorTimer.running = true
/* onPressed: editorTimer.running = true */
}
}
Controls.TextField {
@ -189,5 +186,5 @@ Item {
repeat: true
running: false
onTriggered: showPassiveNotification("updating song...")
}
}
}