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

making slide work regardless of other things

Browse source
This commit is contained in:
Chris Cochrun 2022-02-10 15:14:43 -06:00
parent f374115513
commit 6e9e1eca0d
10 changed files with 720 additions and 271 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/qml/main.qml
View file

@ -12,6 +12,7 @@ Kirigami.ApplicationWindow {
id: root
property bool libraryOpen: true
property bool presenting: false
pageStack.initialPage: mainPage
header: Presenter.Header {}

6
src/qml/presenter/Header.qml
View file

@ -40,13 +40,13 @@ Kirigami.ActionToolBar {
text: "Go Live"
onTriggered: {
print("Window is loading")
presentLoader.active = true
presenting = true
}
},
Kirigami.Action {
icon.name: "sidebar-collapse-right"
text: "Close Library"
icon.name: libraryOpen ? "sidebar-collapse-right" : "sidebar-expand-right"
text: libraryOpen ? "Close Library" : "Open Library"
onTriggered: toggleLibrary()
}

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

@ -76,68 +76,20 @@ Controls.Page {
Loader {
id: presentLoader
active: false
active: presenting
sourceComponent: Window {
id: presentWindow
id: presentationWindow
title: "presentation-window"
height: maximumHeight
width: maximumWidth
visible: true
onClosing: presentLoader.active = false
screen: Qt.application.screens[1]
onClosing: presenting = false
Component.onCompleted: {
presentWindow.showFullScreen();
presentationWindow.showFullScreen();
}
Item {
id: basePresentationLayer
anchors.fill: parent
Rectangle {
id: basePrColor
anchors.fill: parent
color: "black"
MediaPlayer {
id: videoPlayer
source: video
loops: MediaPlayer.Infinite
autoPlay: true
notifyInterval: 100
}
VideoOutput {
id: videoOutput
anchors.fill: parent
source: videoPlayer
}
MouseArea {
id: playArea
anchors.fill: parent
onPressed: videoPlayer.play();
}
Controls.ProgressBar {
id: progressBar
anchors.left: parent.left
anchors.right: parent.right
anchors.bottom: parent.bottom
anchors.margins: 100
from: 0
to: videoPlayer.duraion
value: videoPlayer.position/videoPlayer.duration
height: 30
MouseArea {
anchors.fill: parent
onClicked: {
if (videoPlayer.seekable) {
videoPlayer.seek(videoPlayer.duration * mouse.x/width);
}
}
}
}
}
Presenter.Slide {
id: presentationSlide
imageSource: "../../assets/parallel.jpg"
}
}
}

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

@ -3,162 +3,71 @@ import QtQuick.Controls 2.15 as Controls
import QtQuick.Layouts 1.2
import QtMultimedia 5.15
import QtAudioEngine 1.15
import QtGraphicalEffects 1.15
import org.kde.kirigami 2.13 as Kirigami
import "./" as Presenter
Item {
/*
Slides can only be instantiated as a direct child of a Presentation {} as they rely on
several properties there.
*/
id: root
anchors.fill: parent
id: slide
property real textSize: 50
property bool dropShadow: false
property url imageSource: ""
property url videoSource: ""
property string chosenFont: "Quicksand"
property bool isSlide: true;
Rectangle {
id: basePrColor
anchors.fill: parent
color: "black"
property bool delayPoints: false;
property int _pointCounter: 0;
function _advance() {
if (!parent.allowDelay)
return false;
_pointCounter = _pointCounter + 1;
if (_pointCounter < content.length)
return true;
_pointCounter = 0;
return false;
}
property string title;
property variant content: []
property string centeredText
property string writeInText;
property string notes;
property real fontSize: parent.height * 0.05
property real fontScale: 1
property real baseFontSize: fontSize * fontScale
property real titleFontSize: fontSize * 1.2 * fontScale
property real bulletSpacing: 1
property real contentWidth: width
// Define the slide to be the "content area"
x: parent.width * 0.05
y: parent.height * 0.2
width: parent.width * 0.9
height: parent.height * 0.7
property real masterWidth: parent.width
property real masterHeight: parent.height
property color titleColor: parent.titleColor;
property color textColor: parent.textColor;
property string fontFamily: parent.fontFamily;
property int textFormat: Text.PlainText
visible: false
Controls.Label {
id: titleText
font.pixelSize: titleFontSize
text: title;
anchors.horizontalCenter: parent.horizontalCenter
anchors.bottom: parent.top
anchors.bottomMargin: parent.fontSize * 1.5
font.bold: true;
font.family: slide.fontFamily
color: slide.titleColor
horizontalAlignment: Text.Center
z: 1
}
Controls.Label {
id: centeredId
width: parent.width
anchors.centerIn: parent
anchors.verticalCenterOffset: - parent.y / 3
text: centeredText
horizontalAlignment: Text.Center
font.pixelSize: baseFontSize
font.family: slide.fontFamily
color: slide.textColor
wrapMode: Text.Wrap
}
Controls.Label {
id: writeInTextId
property int length;
font.family: slide.fontFamily
font.pixelSize: baseFontSize
color: slide.textColor
anchors.fill: parent;
wrapMode: Text.Wrap
text: slide.writeInText.substring(0, length);
NumberAnimation on length {
from: 0;
to: slide.writeInText.length;
duration: slide.writeInText.length * 30;
running: slide.visible && parent.visible && slide.writeInText.length > 0
MediaPlayer {
id: videoPlayer
source: videoSource
loops: MediaPlayer.Infinite
autoPlay: true
notifyInterval: 100
}
visible: slide.writeInText != undefined;
}
VideoOutput {
id: videoOutput
anchors.fill: parent
source: videoPlayer
}
MouseArea {
id: playArea
anchors.fill: parent
onPressed: videoPlayer.play();
}
Image {
id: backgroundImage
anchors.fill: parent
source: imageSource
fillMode: Image.PreserveAspectCrop
clip: true
Column {
id: contentId
anchors.fill: parent
Controls.Label {
id: lyrics
text: "This is some test lyrics" // change to song lyrics of current verse
font.pointSize: textSize
font.family: chosenFont
style: Text.Raised
anchors.centerIn: parent
}
Repeater {
model: content.length
Row {
id: row
function decideIndentLevel(s) { return s.charAt(0) == " " ? 1 + decideIndentLevel(s.substring(1)) : 0 }
property int indentLevel: decideIndentLevel(content[index])
property int nextIndentLevel: index < content.length - 1 ? decideIndentLevel(content[index+1]) : 0
property real indentFactor: (10 - row.indentLevel * 2) / 10;
height: text.height + (nextIndentLevel == 0 ? 1 : 0.3) * slide.baseFontSize * slide.bulletSpacing
x: slide.baseFontSize * indentLevel
visible: (!slide.parent.allowDelay || !delayPoints) || index <= _pointCounter
Rectangle {
id: dot
anchors.baseline: text.baseline
anchors.baselineOffset: -text.font.pixelSize / 2
width: text.font.pixelSize / 3
height: text.font.pixelSize / 3
color: slide.textColor
radius: width / 2
opacity: text.text.length == 0 ? 0 : 1
}
Item {
id: space
width: dot.width * 1.5
height: 1
}
Controls.Label {
id: text
width: slide.contentWidth - parent.x - dot.width - space.width
font.pixelSize: baseFontSize * row.indentFactor
text: content[index]
textFormat: slide.textFormat
wrapMode: Text.WordWrap
color: slide.textColor
horizontalAlignment: Text.AlignLeft
font.family: slide.fontFamily
}
DropShadow {
id: textDropShadow
source: lyrics
anchors.fill: lyrics
horizontalOffset: 3
verticalOffset: 3
radius: 8.0
samples: 17
color: "#80000000"
visible: true
}
}
}
}

3
src/qml/presenter/SongEditor.qml
View file

@ -48,6 +48,9 @@ Item {
Controls.ToolButton {
text: "Effects"
}
Controls.ToolButton {
text: "Background"
}
}
}