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

bug: fixing insertion bugs of many items

Browse source 
Videos, images, and presentations were all look at the wrong index. I
needed to look for the count - 1 in order to find the right index from
the model when switching to the editMode
This commit is contained in:
Chris Cochrun 2023-05-17 11:09:21 -05:00
parent 085ede2e04
commit 4dc4036dda
2 changed files with 116 additions and 98 deletions
Download patch file Download diff file Expand all files Collapse all files

188
src/qml/presenter/Library.qml
View file

@ -291,104 +291,6 @@ Item {
}
onExited: overlay = false
function addVideo(url) {
videoProxyModel.videoModel.newItem(url);
selectedLibrary = "video";
videoLibrary.libraryList.currentIndex = videoProxyModel.videoModel.count();
console.log(videoProxyModel.getVideo(videoLibrary.libraryList.currentIndex));
const video = videoProxyModel.getVideo(videoLibrary.libraryList.currentIndex);
showPassiveNotification("newest video: " + video.title);
if (!editMode)
editMode = true;
editSwitch(video, "video");
}
function addImg(url) {
imageProxyModel.newItem(url);
selectedLibrary = "image";
imageLibrary.libraryList.currentIndex = imageProxyModel.imageModel.count();
console.log(imageProxyModel.getImage(imageLibrary.libraryList.currentIndex));
const image = imageProxyModel.getImage(imageLibrary.libraryList.currentIndex);
showPassiveNotification("newest image: " + image.title);
if (!editMode)
editMode = true;
editSwitch(image, "image");
}
function addPres(url) {
console.log(pdf.status);
let pageCount = 1;
pdf.source = url;
while (pdf.status != 2) {
console.log(pdf.status);
console.log("PAGECOUNT: " + pdf.pageCount);
pageCount = pdf.pageCount;
}
presProxyModel.presentationModel.newItem(url, pageCount);
selectedLibrary = "presentation";
presentationLibrary.libraryList.currentIndex = presProxyModel.presentationModel.count();
console.log(presProxyModel.getPresentation(presentationLibrary.libraryList.currentIndex));
const presentation = presProxyModel.getPresentation(presentationLibrary.libraryList.currentIndex);
showPassiveNotification("newest image: " + presentation.title);
if (!editMode)
editMode = true;
editSwitch(presentation, "presentation");
pdf.source = "";
}
function isDragFile(item) {
var extension = item.split('.').pop();
var valid = false;
if(extension) {
console.log(extension);
valid = true;
}
return valid;
}
function addFile(file) {
let extension = file.split('.').pop();
if (videoexts.includes(extension))
{
addVideo(file);
}
if (imgexts.includes(extension))
{
addImg(file);
}
if (presexts.includes(extension))
{
if (file.endsWith(".html")) {
web.url = file;
} else
addPres(file);
}
}
function addFiles(files) {
showPassiveNotification("More than one file");
for (let i = 0; i < files.length; i++) {
let file = files[i];
let ext = file.split('.').pop()
if (videoexts.includes(ext))
{
addVideo(file);
}
if (imgexts.includes(ext))
{
console.log(file);
addImg(file);
console.log(file);
}
if (presexts.includes(ext))
{
addPres(file);
}
}
}
}
Rectangle {
@ -415,6 +317,96 @@ Item {
}
}
function addVideo(url) {
videoProxyModel.videoModel.newItem(url);
selectedLibrary = "video";
videoLibrary.libraryList.currentIndex = videoProxyModel.videoModel.count() - 1;
if (!editMode)
editMode = true;
editSwitch(videoLibrary.libraryList.currentIndex, "video");
}
function addImg(url) {
imageProxyModel.newItem(url);
selectedLibrary = "image";
imageLibrary.libraryList.currentIndex = imageProxyModel.imageModel.count() - 1;
if (!editMode)
editMode = true;
editSwitch(imageLibrary.libraryList.currentIndex, "image");
}
function addPres(url) {
console.log(pdf.status);
let pageCount = 1;
pdf.source = url;
while (pdf.status != 2) {
console.log(pdf.status);
console.log("PAGECOUNT: " + pdf.pageCount);
pageCount = pdf.pageCount;
}
presProxyModel.presentationModel.newItem(url, pageCount);
selectedLibrary = "presentation";
presentationLibrary.libraryList.currentIndex = presProxyModel.presentationModel.count() - 1;
if (!editMode)
editMode = true;
editSwitch(presentationLibrary.libraryList.currentIndex, "presentation");
pdf.source = "";
}
function isDragFile(item) {
var extension = item.split('.').pop();
var valid = false;
if(extension) {
console.log(extension);
valid = true;
}
return valid;
}
function addFile(file) {
let extension = file.split('.').pop();
if (videoexts.includes(extension))
{
addVideo(file);
}
if (imgexts.includes(extension))
{
addImg(file);
}
if (presexts.includes(extension))
{
if (file.endsWith(".html")) {
web.url = file;
} else
addPres(file);
}
}
function addFiles(files) {
showPassiveNotification("More than one file");
for (let i = 0; i < files.length; i++) {
let file = files[i];
let ext = file.split('.').pop()
if (videoexts.includes(ext))
{
addVideo(file);
}
if (imgexts.includes(ext))
{
console.log(file);
addImg(file);
console.log(file);
}
if (presexts.includes(ext))
{
addPres(file);
}
}
}
function addHtml(url) {
console.log("adding an html");
var pageCount = 1;

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

@ -36,6 +36,14 @@ Kirigami.OverlaySheet {
text: ""
onEditingFinished: videoInput.text.startsWith("http") ? loadVideo() : showPassiveNotification("Coach called, this isn't it.");
}
Controls.ToolButton {
id: localButton
text: "Local Video"
icon.name: "fileopen"
hoverEnabled: true
onClicked: videoFileDialog.open()
}
}
}
@ -117,6 +125,24 @@ 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")
}
}
}
function loadVideo() {