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

things are building and running now

Browse source 
Now for all the issues of things not working
This commit is contained in:
Chris Cochrun 2024-09-12 11:19:03 -05:00
parent f231b81bf4
commit a1f18f803d
8 changed files with 66 additions and 115 deletions
Download patch file Download diff file Expand all files Collapse all files

77
src/qml/presenter/LibraryItem.qml
View file

@ -222,7 +222,7 @@ ColumnLayout {
Item {
implicitWidth: ListView.view.width
height: selectedLibrary == libraryType ? 50 : 0
Kirigami.BasicListItem {
Controls.ItemDelegate {
id: listItem
property bool rightMenu: false
@ -236,43 +236,48 @@ ColumnLayout {
implicitWidth: libraryList.width
height: selectedLibrary == libraryType ? 50 : 0
clip: true
label: title
subtitle: {
if (libraryType == "song")
author
else if (fileValidation)
filePath;
else
"file is missing"
}
icon: itemIcon
iconSize: Kirigami.Units.gridUnit
supportsMouseEvents: false
backgroundColor: index % 2 === 0 ? Kirigami.Theme.backgroundColor : Kirigami.Theme.alternateBackgroundColor;
Binding on backgroundColor {
when: dragHandler.containsMouse ||
(selectionModel.hasSelection &&
selectionModel.isSelected(proxyModel.idx(index)))
value: Kirigami.Theme.highlightColor
}
text: title
/* subtitle: { */
/* if (libraryType == "song") */
/* author */
/* else if (fileValidation) */
/* filePath; */
/* else */
/* "file is missing" */
/* } */
textColor: {
if (selectedLibrary == "song")
Kirigami.Theme.textColor;
else if (fileValidation) {
Kirigami.Theme.textColor;
}
else
"red"
}
icon.source: itemIcon
icon.width: Kirigami.Units.gridUnit
icon.height: Kirigami.Units.gridUnit
/* supportsMouseEvents: false */
/* background: Rectangle { */
/* color: Kirigami.Theme.backgroundColor */
/* fill: parent */
/* } */
/* Binding on backgroundColor { */
/* when: dragHandler.containsMouse || */
/* (selectionModel.hasSelection && */
/* selectionModel.isSelected(proxyModel.idx(index))) */
/* value: Kirigami.Theme.highlightColor */
/* } */
Binding on textColor {
when: dragHandler.containsMouse ||
(selectionModel.hasSelection &&
selectionModel.isSelected(proxyModel.idx(index)))
value: Kirigami.Theme.highlightedTextColor
}
/* textColor: { */
/* if (selectedLibrary == "song") */
/* Kirigami.Theme.textColor; */
/* else if (fileValidation) { */
/* Kirigami.Theme.textColor; */
/* } */
/* else */
/* "red" */
/* } */
/* Binding on textColor { */
/* when: dragHandler.containsMouse || */
/* (selectionModel.hasSelection && */
/* selectionModel.isSelected(proxyModel.idx(index))) */
/* value: Kirigami.Theme.highlightedTextColor */
/* } */
Behavior on height {
NumberAnimation {

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

@ -14,7 +14,7 @@ Controls.Page {
// properties passed around for the slides
property int currentServiceItem
property int currentSlide
property int totalServiceItems: ServiceItemModel.rowCount
property int totalServiceItems: ServiceItemModel.rowCount()
property int totalSlides: SlideModel.count
property url imageBackground: presentation.imageBackground
property url videoBackground: presentation.vidBackground
@ -155,10 +155,10 @@ Controls.Page {
anchors.left: parent.right
url: "file:///home/chris/org/lessons/2023_24_3_noah_lesson.html"
visible: false
WebEngineScript {
name: "html2canvas"
sourceUrl: "file:///home/chris/dev/lumina/src/qml/presenter/html2canvas.min.js"
}
/* WebEngineScript { */
/* name: "html2canvas" */
/* sourceUrl: "file:///home/chris/dev/lumina/src/qml/presenter/html2canvas.min.js" */
/* } */
onLoadingChanged: {
if (loadRequest.status == 2)
showPassiveNotification("yahoo?");

21
src/qml/presenter/NewVideo.qml
View file

@ -1,7 +1,7 @@
import QtQuick 2.15
import QtQuick.Controls 2.15 as Controls
import QtQuick.Layouts 1.15
import QtGraphicalEffects 1.15
import Qt5Compat.GraphicalEffects
import org.kde.kirigami 2.13 as Kirigami
import "./" as Presenter
import org.presenter 1.0
@ -42,7 +42,7 @@ Kirigami.OverlaySheet {
text: videoInput.text.startsWith("http") ? "Download" : "Local Video"
icon.name: "folder-videos-symbolic"
hoverEnabled: true
onClicked: videoInput.text.startsWith("http") ? loadVideo() : videoFileDialog.open()
onClicked: videoInput.text.startsWith("http") ? loadVideo() : addVideo(fileHelper.load("Pick a video", "video"));
}
}
}
@ -134,23 +134,6 @@ Kirigami.OverlaySheet {
}
FileDialog {
id: videoFileDialog
title: "Please choose a video"
folder: shortcuts.home
selectMultiple: false
nameFilters: ["Video files (*.mp4 *.mkv *.mov *.wmv *.avi *.MP4 *.MOV *.MKV)"]
onAccepted: {
console.log("video = " + videoFileDialog.fileUrls[0]);
addVideo(videoFileDialog.fileUrls[0]);
root.close();
}
onRejected: {
console.log("Canceled")
}
}
Timer {
id: videoDLTimer
interval: 3000

19
src/qml/presenter/ServiceList.qml
View file

@ -81,6 +81,7 @@ Item {
id: serviceListItem
implicitWidth: serviceItemList.width
height: Kirigami.Units.gridUnit * 2
Component.onCompleted: Utils.dbg("SERVICEMODEL: " + name)
property var selectedItems
@ -150,6 +151,7 @@ Item {
else
Kirigami.Theme.textColor;
}
Component.onCompleted: Utils.dbg("SERVICEMODEL: " + name)
}
Kirigami.Icon {
@ -359,6 +361,7 @@ Item {
model: ServiceItemModel
delegate: serviceListItem
Kirigami.WheelHandler {
id: wheelHandler
target: serviceItemList
@ -375,22 +378,6 @@ Item {
anchors.bottom: serviceItemList.bottom
active: hovered || pressed
}
/* function updateDrag(y) { */
/* if (moveToIndex === serviceItemList.indexAt(0,y)) */
/* return; */
/* else */
/* moveToIndex = serviceItemList.indexAt(0,y); */
/* moveRequested(indexDragged, moveToIndex); */
/* } */
/* function moveRequested(oldIndex, newIndex) { */
/* console.log("moveRequested: ", oldIndex, newIndex); */
/* ServiceItemModel.moveRows(oldIndex, newIndex, 1); */
/* indexDragged = newIndex; */
/* serviceItemList.currentIndex = newIndex; */
/* } */
}
Rectangle {