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

a bit of updating and making pdfs work better

Browse source
This commit is contained in:
Chris Cochrun 2022-09-24 14:58:17 -05:00
parent 6866b86a20
commit d8aca3d149
7 changed files with 31 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/qml/main.qml
View file

@ -1,4 +1,4 @@
import QtQuick 2.13 import QtQuick 2.15
import QtQuick.Dialogs 1.0 import QtQuick.Dialogs 1.0
import QtQuick.Controls 2.15 as Controls import QtQuick.Controls 2.15 as Controls
import Qt.labs.platform 1.1 as Labs import Qt.labs.platform 1.1 as Labs

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

@ -1,4 +1,4 @@
import QtQuick 2.13 import QtQuick 2.15
import QtQuick.Dialogs 1.0 import QtQuick.Dialogs 1.0
import QtQuick.Controls 2.15 as Controls import QtQuick.Controls 2.15 as Controls
import QtQuick.Window 2.13 import QtQuick.Window 2.13
@ -135,24 +135,21 @@ Controls.Page {
print(item); print(item);
presentation.stopVideo(); presentation.stopVideo();
presentation.itemType = item.type; /* presentation.itemType = item.type; */
print("Time to start changing"); print("Time to start changing");
// This determines if pdf and gives slide the right SlideObject.changeSlide(item);
// page count to use. showPassiveNotification(SlideObject.imageBackground);
if (item.type == "pres")
SlideObject.changeSlide(item);
else
SlideObject.changeSlide(item);
if (item.backgroundType === "video") /* if (item.backgroundType === "video") */
{ /* { */
presentation.loadVideo(); /* presentation.loadVideo(); */
} /* } */
presentation.textIndex = 0; presentation.textIndex = 0;
presentation.changeSlide(); /* presentation.changeSlide(); */
showPassiveNotification(SlideObject.imageBackground);
print("Slide changed to: " + item.name); print("Slide changed to: " + item.name);
} }

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

@ -1,4 +1,4 @@
import QtQuick 2.13 import QtQuick 2.15
import QtQuick.Dialogs 1.0 import QtQuick.Dialogs 1.0
import QtQuick.Controls 2.15 as Controls import QtQuick.Controls 2.15 as Controls
import QtQuick.Window 2.13 import QtQuick.Window 2.13
@ -13,9 +13,9 @@ Item {
property var text property var text
property int textIndex: 0 property int textIndex: 0
property string itemType property string itemType: SlideObject.type
property url imagebackground property url imagebackground: SlideObject.imageBackground
property url vidbackground property url vidbackground: SlideObject.videoBackground
property Item slide: previewSlide property Item slide: previewSlide
@ -88,9 +88,10 @@ Item {
Layout.alignment: Qt.AlignCenter Layout.alignment: Qt.AlignCenter
textSize: width / 15 textSize: width / 15
itemType: root.itemType itemType: root.itemType
imageSource: SlideObject.imageBackground imageSource: imagebackground
videoSource: SlideObject.videoBackground videoSource: vidbackground
text: SlideObject.text text: SlideObject.text
pdfIndex: SlideObject.pdfIndex
preview: true preview: true
} }

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

@ -1,4 +1,4 @@
import QtQuick 2.13 import QtQuick 2.15
import QtQuick.Controls 2.15 as Controls import QtQuick.Controls 2.15 as Controls
import QtQuick.Dialogs 1.3 import QtQuick.Dialogs 1.3
import QtQuick.Layouts 1.2 import QtQuick.Layouts 1.2

4
src/qml/presenter/PresentationWindow.qml
View file

@ -1,4 +1,4 @@
import QtQuick 2.13 import QtQuick 2.15
import QtQuick.Dialogs 1.0 import QtQuick.Dialogs 1.0
import QtQuick.Controls 2.15 as Controls import QtQuick.Controls 2.15 as Controls
import QtQuick.Window 2.13 import QtQuick.Window 2.13
@ -36,6 +36,8 @@ Window {
imageSource: SlideObject.imageBackground imageSource: SlideObject.imageBackground
videoSource: presentationWindow.visible ? SlideObject.videoBackground : "" videoSource: presentationWindow.visible ? SlideObject.videoBackground : ""
text: SlideObject.text text: SlideObject.text
pdfIndex: SlideObject.pdfIndex
itemType: SlideObject.type
} }
Connections { Connections {

5
src/qml/presenter/Slide.qml
View file

@ -1,4 +1,4 @@
import QtQuick 2.13 import QtQuick 2.15
import QtQuick.Controls 2.15 as Controls import QtQuick.Controls 2.15 as Controls
import QtQuick.Layouts 1.2 import QtQuick.Layouts 1.2
/* import QtMultimedia 5.15 */ /* import QtMultimedia 5.15 */
@ -19,6 +19,7 @@ Item {
property bool dropShadow: false property bool dropShadow: false
property url imageSource property url imageSource
property url videoSource property url videoSource
property int pdfIndex
property string chosenFont: "Quicksand" property string chosenFont: "Quicksand"
property string text: "This is demo text" property string text: "This is demo text"
property color backgroundColor property color backgroundColor
@ -119,7 +120,7 @@ Item {
fillMode: Image.PreserveAspectCrop fillMode: Image.PreserveAspectCrop
clip: true clip: true
visible: true visible: true
currentFrame: pdfIndex
} }
FastBlur { FastBlur {

9
src/slide.h
View file

@ -11,10 +11,13 @@ class Slide : public QObject
Q_OBJECT Q_OBJECT
Q_PROPERTY(QString text READ text WRITE setText NOTIFY textChanged) Q_PROPERTY(QString text READ text WRITE setText NOTIFY textChanged)
Q_PROPERTY(QString type READ type WRITE setType NOTIFY typeChanged) Q_PROPERTY(QString type READ type WRITE setType NOTIFY typeChanged)
Q_PROPERTY(QVariantMap serviceItem READ serviceItem WRITE setServiceItem NOTIFY serviceItemChanged) Q_PROPERTY(QVariantMap serviceItem READ serviceItem WRITE setServiceItem
NOTIFY serviceItemChanged)
Q_PROPERTY(QString audio READ audio WRITE setAudio NOTIFY audioChanged) Q_PROPERTY(QString audio READ audio WRITE setAudio NOTIFY audioChanged)
Q_PROPERTY(QString imageBackground READ imageBackground WRITE setImageBackground NOTIFY imageBackgroundChanged) Q_PROPERTY(QString imageBackground READ imageBackground WRITE setImageBackground
Q_PROPERTY(QString videoBackground READ videoBackground WRITE setVideoBackground NOTIFY videoBackgroundChanged) NOTIFY imageBackgroundChanged)
Q_PROPERTY(QString videoBackground READ videoBackground WRITE setVideoBackground
NOTIFY videoBackgroundChanged)
Q_PROPERTY(QString horizontalTextAlignment READ horizontalTextAlignment Q_PROPERTY(QString horizontalTextAlignment READ horizontalTextAlignment
WRITE setHorizontalTextAlignment NOTIFY horizontalTextAlignmentChanged) WRITE setHorizontalTextAlignment NOTIFY horizontalTextAlignmentChanged)
Q_PROPERTY(QString verticalTextAlignment READ verticalTextAlignment Q_PROPERTY(QString verticalTextAlignment READ verticalTextAlignment