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

adding a nextSlideAction instead of nextSlideText to allow for other types

Browse source
This commit is contained in:
Chris Cochrun 2022-04-02 14:50:40 -05:00
parent 366660dcb2
commit 2e72a01c6f
4 changed files with 24 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/main.cpp
View file

@ -79,7 +79,7 @@ int main(int argc, char *argv[])
#ifdef Q_OS_WINDOWS
QIcon::setFallbackThemeName("breeze");
QQuickStyle::setStyle(QStringLiteral("org.kde.breeze"));
QApplication::setStyle(QStringLiteral("breeze"));
// QApplication::setStyle(QStringLiteral("breeze"));
#else
QIcon::setFallbackThemeName("breeze");
QQuickStyle::setStyle(QStringLiteral("org.kde.desktop"));
@ -87,6 +87,8 @@ int main(int argc, char *argv[])
#endif
QGuiApplication::setWindowIcon(QIcon::fromTheme(QStringLiteral("system-config-display")));
qDebug() << QQuickStyle::availableStyles();
qDebug() << QIcon::themeName();
// apparently mpv needs this class set
// let's register mpv as well

1
src/qml/main.qml
View file

@ -121,6 +121,7 @@ Kirigami.ApplicationWindow {
/* print(Qt.application.state); */
screens = Qt.application.screens;
presentationScreen = screens[1]
print(Kirigami.Settings.Style);
for (let i = 0; i < screens.length; i++) {
/* print(screens[i]); */
/* print(screens[i].name); */

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

@ -125,7 +125,7 @@ Controls.Page {
else
presentation.text = item.text;
presentation.textIndex = 0;
presentation.nextSlideText();
presentation.nextSlideAction();
print("Slide changed to: " + item.name);
}

33
src/qml/presenter/Presentation.qml
View file

@ -104,7 +104,7 @@ Item {
Layout.alignment: Qt.AlignLeft
MouseArea {
anchors.fill: parent
onPressed: nextSlideText()
onPressed: nextSlideAction()
cursorShape: Qt.PointingHandCursor
}
}
@ -122,20 +122,25 @@ Item {
previewSlide.loadVideo();
}
function nextSlideText() {
if (textIndex === 0) {
previewSlide.text = root.text[textIndex];
print(root.text[textIndex]);
textIndex++;
} else if (textIndex < root.text.length) {
previewSlide.text = root.text[textIndex];
print(root.text[textIndex]);
textIndex++;
} else {
print("Next slide time");
function nextSlideAction() {
if (itemType === "song") {
if (textIndex === 0) {
previewSlide.text = root.text[textIndex];
print(root.text[textIndex]);
textIndex++;
} else if (textIndex < root.text.length) {
previewSlide.text = root.text[textIndex];
print(root.text[textIndex]);
textIndex++;
} else {
print("Next slide time");
textIndex = 0;
nextSlide();
}
} else if (itemType === "video")
nextSlide();
else if (itemType === "image")
nextSlide();
textIndex = 0;
}
}
function nextSlide() {