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

lots of little bug fixes

Browse source
This commit is contained in:
Chris Cochrun 2025-08-04 07:37:35 -05:00
parent de80d304bf
commit ee5481f8db
17 changed files with 125 additions and 116 deletions
Download patch file Download diff file Expand all files Collapse all files

12
CMakeLists.txt
View file

@ -43,12 +43,12 @@ find_package(KF6 ${KF_MIN_VERSION} REQUIRED COMPONENTS Kirigami CoreAddons I18n)
find_package(FFmpeg) find_package(FFmpeg)
set_package_properties(FFmpeg PROPERTIES TYPE REQUIRED) set_package_properties(FFmpeg PROPERTIES TYPE REQUIRED)
# find_package(Libmpv) find_package(Libmpv)
# set_package_properties(Libmpv PROPERTIES TYPE REQUIRED) set_package_properties(Libmpv PROPERTIES TYPE REQUIRED)
# find_package(MpvQt) find_package(MpvQt)
# set_package_properties(MpvQt PROPERTIES TYPE REQUIRED set_package_properties(MpvQt PROPERTIES TYPE REQUIRED
# URL "https://invent.kde.org/libraries/mpvqt") URL "https://invent.kde.org/libraries/mpvqt")
find_package(YouTubeDl) find_package(YouTubeDl)
set_package_properties(YouTubeDl PROPERTIES TYPE RUNTIME) set_package_properties(YouTubeDl PROPERTIES TYPE RUNTIME)
@ -137,7 +137,7 @@ target_link_libraries(liblumina INTERFACE
KF6::I18n KF6::I18n
KF6::CoreAddons KF6::CoreAddons
# KF6::FileMetaData # KF6::FileMetaData
# MpvQt::MpvQt MpvQt::MpvQt
# mpv # mpv
ssl ssl
crypto crypto

2
justfile
View file

@ -1,7 +1,7 @@
default: default:
just --list just --list
build: build:
cmake -DCMAKE_BUILD_TYPE=Debug -B bld/ . cmake -DQT_QML_GENERATE_QMLLS_INI=ON -DCMAKE_BUILD_TYPE=Debug -B bld/ .
make -j8 --dir bld/ make -j8 --dir bld/
rm -rf ~/.cache/lumina/lumina/qmlcache/ rm -rf ~/.cache/lumina/lumina/qmlcache/
run: run:

2
smdview/blah/CMakeLists.txt
View file

@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.28)
project(kirigami_rust) project(kirigami_rust)
find_package(ECM 6.0 REQUIRED NO_MODULE) find_package(ECM 6.0 REQUIRED NO_MODULE)
set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH})
include(KDEInstallDirs) include(KDEInstallDirs)
include(ECMUninstallTarget) include(ECMUninstallTarget)

4
src/CMakeLists.txt
View file

@ -14,8 +14,8 @@ target_sources(lumina
# cpp/imagesqlmodel.cpp cpp/imagesqlmodel.h # cpp/imagesqlmodel.cpp cpp/imagesqlmodel.h
# cpp/filemanager.cpp cpp/filemanager.h # cpp/filemanager.cpp cpp/filemanager.h
# cpp/presentationsqlmodel.cpp cpp/presentationsqlmodel.h # cpp/presentationsqlmodel.cpp cpp/presentationsqlmodel.h
# cpp/mpv/mpvitem.h cpp/mpv/mpvitem.cpp cpp/mpv/mpvitem.h cpp/mpv/mpvitem.cpp
# cpp/mpv/mpvproperties.h cpp/mpv/mpvproperties.h
) )
target_compile_options (lumina PUBLIC -fexceptions) target_compile_options (lumina PUBLIC -fexceptions)

8
src/main.cpp
View file

@ -27,8 +27,8 @@
#include <QtQuickControls2/qquickstyle.h> #include <QtQuickControls2/qquickstyle.h>
#include <QtCore/qstringliteral.h> #include <QtCore/qstringliteral.h>
// #include <MpvAbstractItem> // #include <MpvAbstractItem>
// #include "cpp/mpv/mpvitem.h" #include "cpp/mpv/mpvitem.h"
// #include "cpp/mpv/mpvproperties.h" #include "cpp/mpv/mpvproperties.h"
// RUST // RUST
#include <liblumina/src/rust/file_helper.cxxqt.h> #include <liblumina/src/rust/file_helper.cxxqt.h>
@ -149,8 +149,8 @@ int main(int argc, char *argv[])
// apparently mpv needs this class set // apparently mpv needs this class set
// let's register mpv as well // let's register mpv as well
std::setlocale(LC_NUMERIC, "C"); std::setlocale(LC_NUMERIC, "C");
// qmlRegisterType<MpvItem>("mpv", 1, 0, "MpvItem"); qmlRegisterType<MpvItem>("org.presenter", 1, 0, "MpvItem");
// qmlRegisterSingletonInstance("org.presenter", 1, 0, "MpvProperties", MpvProperties::self()); qmlRegisterSingletonInstance("org.presenter", 1, 0, "MpvProperties", MpvProperties::self());
qDebug() << "IDKFd"; qDebug() << "IDKFd";
qDebug() << serviceItemModel.get()->rowCount(QModelIndex()); qDebug() << serviceItemModel.get()->rowCount(QModelIndex());

6
src/qml/main.qml
View file

@ -200,7 +200,7 @@ Kirigami.ApplicationWindow {
Labs.FileDialog { Labs.FileDialog {
id: saveFileDialog id: saveFileDialog
title: "Save" title: "Save"
folder: shortcuts.home /* folder: shortcuts.home */
/* fileMode: Labs.FileDialog.SaveFile */ /* fileMode: Labs.FileDialog.SaveFile */
defaultSuffix: ".pres" defaultSuffix: ".pres"
/* selectExisting: false */ /* selectExisting: false */
@ -220,7 +220,7 @@ Kirigami.ApplicationWindow {
Labs.FileDialog { Labs.FileDialog {
id: loadFileDialog id: loadFileDialog
title: "Load" title: "Load"
folder: shortcuts.home /* folder: shortcuts.home */
/* fileMode: Labs.FileDialog.SaveFile */ /* fileMode: Labs.FileDialog.SaveFile */
defaultSuffix: ".pres" defaultSuffix: ".pres"
/* selectExisting: true */ /* selectExisting: true */
@ -235,7 +235,7 @@ Kirigami.ApplicationWindow {
Labs.FileDialog { Labs.FileDialog {
id: soundFileDialog id: soundFileDialog
title: "Pick a Sound Effect" title: "Pick a Sound Effect"
folder: shortcuts.home /* folder: shortcuts.home */
/* fileMode: Labs.FileDialog.SaveFile */ /* fileMode: Labs.FileDialog.SaveFile */
/* selectExisting: true */ /* selectExisting: true */
onAccepted: { onAccepted: {

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

@ -1,8 +1,8 @@
import QtQuick 2.13 import QtQuick
import QtQuick.Controls 2.15 as Controls import QtQuick.Controls as Controls
import QtQuick.Window 2.15 import QtQuick.Window
import QtQuick.Layouts 1.15 import QtQuick.Layouts
import org.kde.kirigami 2.13 as Kirigami import org.kde.kirigami as Kirigami
import "./" as Presenter import "./" as Presenter
Kirigami.ActionToolBar { Kirigami.ActionToolBar {

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

@ -1,13 +1,13 @@
import QtQuick 2.15 import QtQuick
import QtQuick.Controls 2.15 as Controls import QtQuick.Controls as Controls
import QtQuick.Layouts 1.15 import QtQuick.Layouts
import Qt.labs.platform 1.1 as Labs import Qt.labs.platform as Labs
import QtQuick.Pdf 5.15 import QtQuick.Pdf
import QtQml.Models 2.15 import QtQml.Models
import QtWebEngine 1.10 import QtWebEngine
import org.kde.kirigami 2.13 as Kirigami import org.kde.kirigami as Kirigami
import "./" as Presenter import "./" as Presenter
import org.presenter 1.0 import org.presenter
Item { Item {
id: root id: root
@ -34,7 +34,6 @@ Item {
Layout.alignment: Qt.AlignTop Layout.alignment: Qt.AlignTop
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredHeight: parent.height - 280 Layout.preferredHeight: parent.height - 280
proxyModel: songModel
innerModel: songModel innerModel: songModel
libraryType: "song" libraryType: "song"
headerLabel: "Songs" headerLabel: "Songs"
@ -64,7 +63,6 @@ Item {
Layout.alignment: Qt.AlignTop Layout.alignment: Qt.AlignTop
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredHeight: parent.height - 280 Layout.preferredHeight: parent.height - 280
proxyModel: videoModel
innerModel: videoModel innerModel: videoModel
libraryType: "video" libraryType: "video"
headerLabel: "Videos" headerLabel: "Videos"
@ -90,7 +88,6 @@ Item {
Layout.alignment: Qt.AlignTop Layout.alignment: Qt.AlignTop
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredHeight: parent.height - 280 Layout.preferredHeight: parent.height - 280
proxyModel: imageModel
innerModel: imageModel innerModel: imageModel
libraryType: "image" libraryType: "image"
headerLabel: "Images" headerLabel: "Images"
@ -111,7 +108,6 @@ Item {
Layout.alignment: Qt.AlignTop Layout.alignment: Qt.AlignTop
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredHeight: parent.height - 280 Layout.preferredHeight: parent.height - 280
proxyModel: presentationModel
innerModel: presentationModel innerModel: presentationModel
libraryType: "presentation" libraryType: "presentation"
headerLabel: "Presentations" headerLabel: "Presentations"

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

@ -10,7 +10,6 @@ import org.presenter 1.0
ColumnLayout { ColumnLayout {
id: root id: root
property var proxyModel
property var innerModel property var innerModel
property string libraryType property string libraryType
property string headerLabel property string headerLabel
@ -228,9 +227,10 @@ ColumnLayout {
property bool selected: selectionModel.hasSelection && property bool selected: selectionModel.hasSelection &&
selectionModel.isSelected(innerModel.index(index, 0)) selectionModel.isSelected(innerModel.index(index, 0))
property bool fileValidation: { property bool fileValidation: {
if (filePath) if (filePath) {
fileHelper.validate(filePath) Utils.dbg("FILEPATH IS: " + filePath);
else fileHelper.validate(filePath);
} else
false false
} }

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

@ -92,6 +92,7 @@ Controls.Page {
Presenter.ServiceList { Presenter.ServiceList {
id: leftDock id: leftDock
parentItem: splitMainView
Controls.SplitView.preferredWidth: Kirigami.Units.largeSpacing * 25 Controls.SplitView.preferredWidth: Kirigami.Units.largeSpacing * 25
Controls.SplitView.maximumWidth: Kirigami.Units.largeSpacing * 50 Controls.SplitView.maximumWidth: Kirigami.Units.largeSpacing * 50
z: 1 z: 1

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

@ -1,8 +1,8 @@
import QtQuick 2.15 import QtQuick
import QtQuick.Controls 2.15 as Controls import QtQuick.Controls as Controls
import QtQuick.Layouts 1.15 import QtQuick.Layouts
import QtWebEngine 1.10 import QtWebEngine
import org.kde.kirigami 2.13 as Kirigami import org.kde.kirigami as Kirigami
import "./" as Presenter import "./" as Presenter
Item { Item {
@ -149,7 +149,7 @@ Item {
url: isHtml ? presentation.filePath : "" url: isHtml ? presentation.filePath : ""
visible: isHtml visible: isHtml
settings.playbackRequiresUserGesture: false settings.playbackRequiresUserGesture: false
backgroundColor: Kirigami.Theme.backgroundColor backgroundColor: "transparent"
} }
RowLayout { RowLayout {
Layout.fillWidth: true; Layout.fillWidth: true;

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

@ -1,15 +1,15 @@
import QtQuick 2.13 import QtQuick
import QtQuick.Effects import QtQuick.Effects
import QtQuick.Controls 2.12 as Controls import QtQuick.Controls as Controls
/* import QtQuick.Window 2.15 */ /* import QtQuick.Window 2.15 */
import QtQuick.Layouts 1.15 import QtQuick.Layouts
import QtQuick.Shapes 1.15 import QtQuick.Shapes
import QtQml.Models 2.15 import QtQml.Models
/* import QtQml.Models 2.12 */ /* import QtQml.Models 2.12 */
/* import QtMultimedia 5.15 */ /* import QtMultimedia 5.15 */
/* import QtAudioEngine 1.15 */ /* import QtAudioEngine 1.15 */
import Qt5Compat.GraphicalEffects import Qt5Compat.GraphicalEffects
import org.kde.kirigami 2.13 as Kirigami import org.kde.kirigami as Kirigami
import "./" as Presenter import "./" as Presenter
import org.presenter 1.0 import org.presenter 1.0
@ -17,22 +17,32 @@ Item {
id: root id: root
property var selectedItem: serviceItemList.selected property var selectedItem: serviceItemList.selected
property var hlItem property var hlItem
property var parentItem
Rectangle { Rectangle {
id: bg id: bg
color: Kirigami.Theme.backgroundColor color: Kirigami.Theme.backgroundColor
anchors.fill: parent anchors.fill: parent
opacity: 0.90 opacity: 1.0
} }
MultiEffect { /* ShaderEffectSource { */
id: backgroundBlur /* id: shaderArea */
source: bg /* sourceItem: parentItem */
anchors.fill: bg /* sourceRect: Qt.rect(0, 0, parent.width, parent.height) */
blur: 1.0 /* width: parent.width */
blurMultiplier: 20 /* height: parent.height */
blurEnabled: true /* } */
}
/* MultiEffect { */
/* id: backgroundBlur */
/* source: shaderArea */
/* anchors.fill: parent */
/* autoPaddingEnabled: true */
/* blur: 0.1 */
/* /\* blurMultiplier: 2 *\/ */
/* blurEnabled: true */
/* } */
ColumnLayout { ColumnLayout {
id: layout id: layout
@ -78,15 +88,16 @@ Item {
} }
Component { Component {
id: serviceListDelegate
Controls.ItemDelegate {
id: serviceListItem id: serviceListItem
Item {
implicitWidth: serviceItemList.width implicitWidth: serviceItemList.width
height: Kirigami.Units.gridUnit * 2 height: Kirigami.Units.gridUnit * 2
Component.onCompleted: Utils.dbg("HELLLLLOOOOOO: " + ServiceItemModel.getItem(0).name) Component.onCompleted: Utils.dbg("HELLLLLOOOOOO: " + ServiceItemModel.getItem(0).name)
property var selectedItems property var selectedItems
DropArea { contentItem: DropArea {
id: serviceDrop id: serviceDrop
anchors.fill: parent anchors.fill: parent
@ -272,10 +283,12 @@ Item {
/* width: 20 */ /* width: 20 */
listItem: serviceListItem listItem: serviceListItem
listView: serviceItemList listView: serviceItemList
onMoveRequested: ServiceItemModel.moveRows(oldIndex, onMoveRequested: (oldIndex, newIndex) => {
ServiceItemModel.moveRows(oldIndex,
newIndex, newIndex,
1) 1)
} }
}
} }
Controls.Menu { Controls.Menu {
@ -345,7 +358,7 @@ Item {
model: ServiceItemModel model: ServiceItemModel
delegate: serviceListItem delegate: serviceListDelegate
Kirigami.WheelHandler { Kirigami.WheelHandler {
id: wheelHandler id: wheelHandler

12
src/qml/presenter/Settings.qml
View file

@ -1,10 +1,10 @@
import QtQuick 2.13 import QtQuick
import QtQuick.Controls 2.15 as Controls import QtQuick.Controls as Controls
import QtQuick.Layouts 1.15 import QtQuick.Layouts
import org.kde.kirigami 2.13 as Kirigami import org.kde.kirigami as Kirigami
import "./" as Presenter import "./" as Presenter
import org.presenter 1.0 import org.presenter
import Qt.labs.settings 1.0 import Qt.labs.settings
Kirigami.OverlaySheet { Kirigami.OverlaySheet {
id: root id: root

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

@ -1,13 +1,12 @@
import QtQuick 2.15 import QtQuick
import QtQuick.Controls 2.15 as Controls import QtQuick.Controls as Controls
import QtQuick.Layouts 1.15 import QtQuick.Layouts
import QtMultimedia import QtMultimedia
/* import QtAudioEngine 1.15 */ import QtWebEngine
import QtWebEngine 1.10
import Qt5Compat.GraphicalEffects import Qt5Compat.GraphicalEffects
import org.kde.kirigami 2.13 as Kirigami import org.kde.kirigami as Kirigami
import "./" as Presenter import "./" as Presenter
import org.presenter 1.0 import org.presenter
Item { Item {
id: root id: root
@ -35,10 +34,10 @@ Item {
property var vTextAlignment: Text.AlignVCenter property var vTextAlignment: Text.AlignVCenter
//these properties are for giving video info to parents //these properties are for giving video info to parents
property int videoPosition: video.position property real videoPosition: video.position
property int videoDuration: video.duration property real videoDuration: video.duration
property var videoLoop: video.loops property var videoLoop: video.loops
property bool videoIsPlaying: video.playbackState property bool videoIsPlaying: !video.pause
// These propees help to determine the state of the slide // These propees help to determine the state of the slide
property string itemType property string itemType
@ -69,12 +68,12 @@ Item {
visible: false visible: false
} }
Video { MpvItem {
id: video id: video
anchors.fill: parent anchors.fill: parent
muted: preview muted: preview
/* Component.onCompleted: mpvLoadingTimer.start() */ /* Component.onCompleted: mpvLoadingTimer.start() */
loops: itemType == "song" ? MediaPlayer.Infinite : vidLoop ? MediaPlayer.Infinite : 1 loop: itemType == "song" ? true : vidLoop
source: videoSource source: videoSource
MouseArea { MouseArea {
@ -89,7 +88,7 @@ Item {
Timer { Timer {
id: pauseTimer id: pauseTimer
interval: 300 interval: 300
onTriggered: mpv.pause() onTriggered: video.pause()
} }
Timer { Timer {
@ -150,7 +149,7 @@ Item {
visible: htmlVisible visible: htmlVisible
enabled: htmlVisible enabled: htmlVisible
zoomFactor: preview ? 0.25 : 1.0 zoomFactor: preview ? 0.25 : 1.0
backgroundColor: Kirigami.Theme.backgroundColor backgroundColor: "transparent"
onLoadingChanged: { onLoadingChanged: {
if (loadRequest.status == 2) if (loadRequest.status == 2)
showPassiveNotification("yahoo?"); showPassiveNotification("yahoo?");
@ -185,12 +184,12 @@ Item {
} }
function loopVideo() { function loopVideo() {
if (mpv.getProperty("loop") === "inf") { if (video.loop) {
showPassiveNotification("already looping"); showPassiveNotification("already looping");
mpv.setProperty("loop", "no"); video.loop = false;
} }
else { else {
mpv.setProperty("loop", "inf"); video.loop = true;
showPassiveNotification("looping video"); showPassiveNotification("looping video");
} }
} }
@ -220,7 +219,7 @@ Item {
} }
function quitMpv() { function quitMpv() {
mpv.quit(); video.quit();
} }
function pauseVideo() { function pauseVideo() {

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

@ -35,7 +35,7 @@ Item {
padding: 10 padding: 10
onEditingFinished: updateTitle(text); onEditingFinished: updateTitle(text);
background: Presenter.TextBackground { background: Presenter.TextBackground {
control: fontBox control: slideTitleField
} }
} }

46
src/qml/presenter/VideoEditor.qml
View file

@ -1,11 +1,10 @@
import QtQuick 2.15 import QtQuick
import QtQuick.Controls 2.15 as Controls import QtQuick.Controls as Controls
import QtQuick.Layouts 1.15 import QtQuick.Layouts
import org.kde.kirigami 2.13 as Kirigami import org.kde.kirigami as Kirigami
import QtMultimedia import QtMultimedia
import "./" as Presenter import "./" as Presenter
import org.presenter 1.0 import org.presenter
Item { Item {
id: root id: root
@ -97,12 +96,12 @@ Item {
// and then save them for having a thumbnail here // and then save them for having a thumbnail here
} }
Video { MpvItem {
id: videoPreview id: videoPreview
width: parent.width width: parent.width
height: parent.height height: parent.height
source: root.video.filePath.toString() source: root.video.filePath.toString()
loops: video.loop ? MediaPlayer.Infinite : 1 loop: video.loop
} }
RowLayout { RowLayout {
@ -111,13 +110,13 @@ Item {
height: videoTitleField.height height: videoTitleField.height
spacing: 2 spacing: 2
Kirigami.Icon { Kirigami.Icon {
source: videoPreview.playbackState == MediaPlayer.PlayingState ? "media-pause" : "media-play" source: videoPreview.pause ? "media-play" : "media-pause"
Layout.preferredWidth: 25 Layout.preferredWidth: 25
Layout.preferredHeight: 25 Layout.preferredHeight: 25
color: Kirigami.Theme.textColor color: Kirigami.Theme.textColor
MouseArea { MouseArea {
anchors.fill: parent anchors.fill: parent
onPressed: videoPreview.playbackState == MediaPlayer.PlayingState ? videoPreview.pause() : videoPreview.play() onPressed: videoPreview.playPause()
cursorShape: Qt.PointingHandCursor cursorShape: Qt.PointingHandCursor
} }
} }
@ -129,21 +128,22 @@ Item {
to: videoPreview.duration to: videoPreview.duration
value: videoPreview.postion value: videoPreview.postion
live: true live: true
onMoved: videoPreview.seek(value); onMoved: videoPreview.position = value;
} }
Controls.Label { Controls.Label {
id: videoTime id: videoTime
text: { /* text: { */
let mil = Math.floor(videoPreview.position); /* let mil = Math.floor(videoPreview.position); */
let sec = Math.floor((mil / 1000) % 60); /* let sec = Math.floor((mil / 1000) % 60); */
let min = Math.floor((mil / (1000 * 60)) % 60); /* let min = Math.floor((mil / (1000 * 60)) % 60); */
let hour = Math.floor((mil / (1000 * 60 * 60)) % 24); /* let hour = Math.floor((mil / (1000 * 60 * 60)) % 24); */
sec = (sec < 10) ? "0" + sec : sec; /* sec = (sec < 10) ? "0" + sec : sec; */
min = (min < 10) ? "0" + min : min; /* min = (min < 10) ? "0" + min : min; */
hour = (hour < 10) ? "0" + hour : hour; /* hour = (hour < 10) ? "0" + hour : hour; */
return hour + ":" + min + ":" + sec /* return hour + ":" + min + ":" + sec */
} /* } */
text: videoPreview.formattedPosition
} }
} }
} }
@ -267,7 +267,7 @@ Item {
id: mpvLoadingTimer id: mpvLoadingTimer
interval: 500 interval: 500
onTriggered: { onTriggered: {
videoPreview.pause(); videoPreview.pause = true;
} }
} }
@ -284,7 +284,7 @@ Item {
function stop() { function stop() {
console.log("stopping video"); console.log("stopping video");
videoPreview.pause(); videoPreview.pause = true;
console.log("quit mpv"); console.log("quit mpv");
} }

2
src/rust/presentation_model.rs
View file

@ -717,6 +717,6 @@ impl presentation_model::PresentationModel {
pub fn row_count(&self, _parent: &QModelIndex) -> i32 { pub fn row_count(&self, _parent: &QModelIndex) -> i32 {
// println!("row count is {cnt}"); // println!("row count is {cnt}");
self.presentations.len() as i32 self.rust().presentations.len() as i32
} }
} }