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

ensuring things don't change before needed

Browse source
This commit is contained in:
Chris Cochrun 2023-01-22 07:30:54 -06:00
parent 9830a0a66f
commit 3286935b8e
1 changed files with 23 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

33
src/cpp/slideobject.cpp
View file

@ -55,7 +55,7 @@ int SlideObject::slideSize() const
return m_slideSize; return m_slideSize;
} }
void SlideObject::changeSlide(QVariantMap item) void SlideObject::changeSlide(QVariantMap item, int index)
{ {
// setServiceItem(item); // setServiceItem(item);
// setType(serviceItemId().value("type").toString()); // setType(serviceItemId().value("type").toString());
@ -118,17 +118,30 @@ void SlideObject::changeSlide(QVariantMap item)
//New implementation //New implementation
// QVariantMap serviceItem = serviceItemModel->getItem(item.value("serviceItemId").toInt()); // QVariantMap serviceItem = serviceItemModel->getItem(item.value("serviceItemId").toInt());
setText(item.value("text").toString()); if (item.value("text").toString() != text())
setType(item.value("type").toString()); setText(item.value("text").toString());
setAudio(item.value("audio").toString()); if (item.value("type").toString() != type())
setImageBackground(item.value("imageBackground").toString()); setType(item.value("type").toString());
setVideoBackground(item.value("videoBackground").toString()); if (item.value("audio").toString() != audio())
setVerticalTextAlignment(item.value("verticalTextAlignment").toString()); setAudio(item.value("audio").toString());
setHorizontalTextAlignment(item.value("horizontalTextAlignment").toString()); if (item.value("imageBackground").toString() != imageBackground())
setFont(item.value("font").toString()); setImageBackground(item.value("imageBackground").toString());
setFontSize(item.value("fontSize").toInt()); if (item.value("videoBackground").toString() != videoBackground()) {
qDebug() << "Setting VIDEOBACKGROUND to:" << item.value("videoBackgroundl").toString();
setVideoBackground(item.value("videoBackground").toString());
}
if (item.value("verticalTextAlignment").toString() != verticalTextAlignment())
setVerticalTextAlignment(item.value("verticalTextAlignment").toString());
if (item.value("horizontalTextAlignment").toString() != horizontalTextAlignment())
setHorizontalTextAlignment(item.value("horizontalTextAlignment").toString());
if (item.value("font").toString() != font())
setFont(item.value("font").toString());
if (item.value("fontSize").toInt() != fontSize())
setFontSize(item.value("fontSize").toInt());
setImageCount(item.value("imageCount").toInt()); setImageCount(item.value("imageCount").toInt());
setSlideIndex(item.value("slideIndex").toInt()); setSlideIndex(item.value("slideIndex").toInt());
emit slideChanged(index);
// m_slideSize = serviceItem.value("slideNumber").toInt(); // m_slideSize = serviceItem.value("slideNumber").toInt();
// emit slideSizeChanged(m_slideSize); // emit slideSizeChanged(m_slideSize);