cleaning up the new next action
This commit is contained in:
parent
c1410781c9
commit
420d521494
2 changed files with 7 additions and 39 deletions
|
@ -169,30 +169,6 @@ Item {
|
||||||
currentServiceItem++;
|
currentServiceItem++;
|
||||||
loadVideo();
|
loadVideo();
|
||||||
}
|
}
|
||||||
/* print(textIndex); */
|
|
||||||
/* if (itemType === "song") { */
|
|
||||||
/* if (textIndex === 0) { */
|
|
||||||
/* SlideObject.setText(root.text[textIndex]); */
|
|
||||||
/* print(root.text[textIndex]); */
|
|
||||||
/* textIndex++; */
|
|
||||||
/* } else if (textIndex < root.text.length) { */
|
|
||||||
/* SlideObject.setText(root.text[textIndex]); */
|
|
||||||
/* print(root.text[textIndex]); */
|
|
||||||
/* textIndex++; */
|
|
||||||
/* } else { */
|
|
||||||
/* print("Next slide time"); */
|
|
||||||
/* textIndex = 0; */
|
|
||||||
/* clearText(); */
|
|
||||||
/* nextSlide(); */
|
|
||||||
/* } */
|
|
||||||
/* } else if (itemType === "video") { */
|
|
||||||
/* /\* clearText(); *\/ */
|
|
||||||
/* nextSlide(); */
|
|
||||||
/* } */
|
|
||||||
/* else if (itemType === "image") { */
|
|
||||||
/* /\* clearText(); *\/ */
|
|
||||||
/* nextSlide(); */
|
|
||||||
/* } */
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function nextSlide() {
|
function nextSlide() {
|
||||||
|
|
|
@ -200,13 +200,6 @@ bool Slide::next(QVariantMap nextItem)
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (m_type != "song") {
|
|
||||||
qDebug() << "nextslide current type is song";
|
|
||||||
// setText("");
|
|
||||||
// changeSlide(item);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (m_type == "song") {
|
|
||||||
// since the string list is 0 indexed m_slideIndex actually
|
// since the string list is 0 indexed m_slideIndex actually
|
||||||
// maps to the next item.
|
// maps to the next item.
|
||||||
int nextTextIndex = m_slideIndex;
|
int nextTextIndex = m_slideIndex;
|
||||||
|
@ -214,7 +207,6 @@ bool Slide::next(QVariantMap nextItem)
|
||||||
qDebug() << text[nextTextIndex];
|
qDebug() << text[nextTextIndex];
|
||||||
setText(text[nextTextIndex]);
|
setText(text[nextTextIndex]);
|
||||||
m_slideIndex++;
|
m_slideIndex++;
|
||||||
}
|
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue