diff --git a/TODO.org b/TODO.org index 13e5a4e..db9297a 100644 --- a/TODO.org +++ b/TODO.org @@ -3,7 +3,7 @@ ** TODO BUG in dropping and then selecting song will duplicate entries [[file:~/dev/church-presenter/src/qml/presenter/LeftDock.qml::Layout.fillHeight: true]] -or at least turns the entry above it into the same as itself while retaining it's title. +or at least turns the entry above it into the same as itself while retaining it's title? ** TODO Build out a slide preview system so we can see each slide in the song or image slideshow [[file:~/dev/church-presenter/src/qml/presenter/SongEditor.qml::Presenter.SlideEditor {]] diff --git a/src/qml/presenter/LeftDock.qml b/src/qml/presenter/LeftDock.qml index 047a0b7..15cc5e3 100644 --- a/src/qml/presenter/LeftDock.qml +++ b/src/qml/presenter/LeftDock.qml @@ -34,6 +34,7 @@ ColumnLayout { Layout.fillHeight: true Layout.fillWidth: true onDropped: { + print("DROPPED AT END"); appendItem(dragItemTitle, dragItemType, dragItemBackground, @@ -136,6 +137,7 @@ ColumnLayout { id: serviceDrop anchors.fill: parent onDropped: { + print("DROPPED IN ITEM AREA"); addItem(index, dragItemTitle, dragItemType, @@ -174,7 +176,7 @@ ColumnLayout { function appendItem(name, type, background, backgroundType, text, itemID) { let lyrics; - if (type == "song") { + if (type === "song") { lyrics = songsqlmodel.getLyricList(itemID); print(lyrics); } diff --git a/src/serviceitemmodel.cpp b/src/serviceitemmodel.cpp index d431556..050e3ca 100644 --- a/src/serviceitemmodel.cpp +++ b/src/serviceitemmodel.cpp @@ -1,6 +1,7 @@ #include "serviceitemmodel.h" #include "serviceitem.h" #include +#include #include #include #include @@ -115,8 +116,15 @@ Qt::ItemFlags ServiceItemModel::flags(const QModelIndex &index) const { void ServiceItemModel::addItem(ServiceItem *item) { const int index = m_items.size(); + qDebug() << index; + // foreach (item, m_items) { + // qDebug() << item; + // } beginInsertRows(QModelIndex(), index, index); m_items.append(item); + foreach (item, m_items) { + qDebug() << item; + } endInsertRows(); } @@ -177,7 +185,7 @@ bool ServiceItemModel::move(int sourceIndex, int destIndex) { qDebug() << "starting move of: " << "source: " << sourceIndex << "dest: " << destIndex; qDebug() << index(sourceIndex).row(); qDebug() << index(destIndex).row(); - QModelIndex parent = index(sourceIndex).parent(); + // QModelIndex parent = index(sourceIndex).parent(); // bool begsuc = beginMoveRows(parent, sourceIndex, sourceIndex, parent, destIndex); beginResetModel(); m_items.move(sourceIndex, destIndex);