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

updates to fix qml

Browse source
This commit is contained in:
Chris Cochrun 2024-09-12 09:47:24 -05:00
parent 7b82202c51
commit 66f313675b
21 changed files with 211 additions and 229 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/qml/main.qml
View file

@ -1,5 +1,4 @@
import QtQuick
/* import QtQuick.Dialogs */
import QtQuick.Controls as Controls
import Qt.labs.platform as Labs
import QtQuick.Window

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

@ -1,5 +1,4 @@
import QtQuick 2.13
import QtQuick.Dialogs 1.0
import QtQuick.Controls 2.15 as Controls
import QtQuick.Window 2.15
import QtQuick.Layouts 1.15

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

@ -1,5 +1,4 @@
import QtQuick 2.13
import QtQuick.Dialogs 1.0
import QtQuick.Controls 2.15 as Controls
import QtQuick.Window 2.15
import QtQuick.Layouts 1.15

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

@ -1,6 +1,5 @@
import QtQuick 2.15
import QtQuick.Controls 2.15 as Controls
import QtQuick.Dialogs 1.3
import QtQuick.Layouts 1.15
import org.kde.kirigami 2.13 as Kirigami
import "./" as Presenter

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

@ -1,5 +1,4 @@
import QtQuick 2.13
/* import QtQuick.Dialogs 1.0 */
import QtQuick.Controls 2.0 as Controls
/* import QtQuick.Window 2.15 */
import QtQuick.Layouts 1.15

2
src/qml/presenter/LoadingSpinner.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

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

@ -1,5 +1,4 @@
import QtQuick 2.15
import QtQuick.Dialogs 1.0
import QtQuick.Controls 2.15 as Controls
import QtQuick.Window 2.15
import QtQuick.Layouts 1.15
@ -176,13 +175,13 @@ Controls.Page {
/* id: pWindow */
/* } */
SongProxyModel { id: songProxyModel }
ImageProxyModel { id: imageProxyModel }
PresentationProxyModel { id: presProxyModel }
VideoProxyModel { id: videoProxyModel }
/* ServiceThing { id: serviceThing } */
/* SongProxyModel { id: songProxyModel } */
/* ImageProxyModel { id: imageProxyModel } */
/* PresentationProxyModel { id: presProxyModel } */
/* VideoProxyModel { id: videoProxyModel } */
ServiceThing { id: serviceThing }
FileHelper { id: fileHelper }
SlideHelper { id: slideHelper }
/* SlideHelper { id: slideHelper } */
SongEditor {
id: songEditorModel
/* songModel: songProxyModel.songModel() */

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

@ -1,6 +1,5 @@
import QtQuick 2.15
import QtQuick.Controls 2.15 as Controls
import QtQuick.Dialogs 1.3
import QtQuick.Layouts 1.15
import QtGraphicalEffects 1.15
import org.kde.kirigami 2.13 as Kirigami

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

@ -1,13 +1,12 @@
import QtQuick 2.15
import QtQuick.Dialogs 1.0
import QtQuick.Controls 2.15 as Controls
import QtQuick.Window 2.15
import QtQuick.Layouts 1.15
import QtMultimedia
/* import QtAudioEngine 1.15 */
import org.kde.kirigami 2.13 as Kirigami
import "./" as Presenter
import org.presenter 1.0
import mpv 1.0
FocusScope {
id: root
@ -454,13 +453,12 @@ FocusScope {
onTriggered: root.visible ? keyHandler.forceActiveFocus() : null
}
MpvObject {
MediaPlayer {
id: audio
useHwdec: true
enableAudio: true
audioOutput: AudioOutput {}
// embeded mpv allows to set commandline propertys using the options/<name>
// syntax. This could be abstracted later, but for now this works.
Component.onCompleted: audio.setProperty("options/audio-display", "no");
/* Component.onCompleted: audio.setProperty("options/audio-display", "no"); */
}
function pauseVideo() {

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

@ -1,6 +1,5 @@
import QtQuick 2.15
import QtQuick.Controls 2.15 as Controls
import QtQuick.Dialogs 1.3
import QtQuick.Layouts 1.15
import QtWebEngine 1.10
import org.kde.kirigami 2.13 as Kirigami

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

@ -1,5 +1,4 @@
import QtQuick 2.15
import QtQuick.Dialogs 1.0
import QtQuick.Controls 2.15 as Controls
import QtQuick.Window 2.15
import QtQuick.Layouts 1.15

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

@ -3,7 +3,7 @@ import QtQuick.Controls 2.15 as Controls
import QtQuick.Layouts 1.15
import QtMultimedia 5.15
/* import QtAudioEngine 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

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

@ -1,5 +1,4 @@
import QtQuick 2.13
/* import QtQuick.Dialogs 1.0 */
import QtQuick.Controls 2.12 as Controls
/* import QtQuick.Window 2.15 */
import QtQuick.Layouts 1.15
@ -8,7 +7,7 @@ import QtQml.Models 2.15
/* import QtQml.Models 2.12 */
/* import QtMultimedia 5.15 */
/* import QtAudioEngine 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
@ -78,9 +77,7 @@ Item {
}
}
Component {
id: delegate
Kirigami.AbstractListItem {
Item {
id: serviceListItem
implicitWidth: serviceItemList.width
height: Kirigami.Units.gridUnit * 2
@ -278,6 +275,22 @@ Item {
}
}
Controls.Menu {
id: rightClickMenu
Kirigami.Action {
text: "Copy"
}
Kirigami.Action {
text: "Paste"
}
Kirigami.Action {
text: "Delete"
onTriggered: removeItem(index)
}
Controls.MenuSeparator {}
Controls.Menu {
id: rightClickMenu
Kirigami.Action {
@ -307,6 +320,7 @@ Item {
ObsModel.setScene(modelData);
}
}
}
onObjectAdded: obsMenu.insertAction(index, object)
onObjectRemoved: obsMenu.removeAction(object)
}
@ -314,7 +328,6 @@ Item {
}
}
}
}
ListView {
id: serviceItemList
@ -345,11 +358,7 @@ Item {
model: ServiceItemModel
delegate: Kirigami.DelegateRecycler {
width: serviceItemList.width
height: Kirigami.Units.gridUnit * 2
sourceComponent: delegate
}
delegate: serviceListItem
Kirigami.WheelHandler {
id: wheelHandler
target: serviceItemList

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

@ -1,5 +1,4 @@
import QtQuick 2.13
import QtQuick.Dialogs 1.0
import QtQuick.Controls 2.15 as Controls
import QtQuick.Layouts 1.15
import org.kde.kirigami 2.13 as Kirigami

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

@ -4,11 +4,10 @@ import QtQuick.Layouts 1.15
import QtMultimedia
/* import QtAudioEngine 1.15 */
import QtWebEngine 1.10
import QtGraphicalEffects 1.15
import Qt5Compat.GraphicalEffects
import org.kde.kirigami 2.13 as Kirigami
import "./" as Presenter
import org.presenter 1.0
import mpv 1.0
Item {
id: root

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

@ -1,7 +1,6 @@
import QtQuick 2.15
import QtQuick.Controls 2.15 as Controls
import QtQuick.Dialogs 1.3
import QtQuick.Layouts 1.15
import QtWebEngine 1.10
import org.kde.kirigami 2.13 as Kirigami

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

@ -3,7 +3,6 @@ import QtQuick.Controls 2.15 as Controls
import org.kde.kirigami 2.13 as Kirigami
import "./" as Presenter
import org.presenter 1.0
import mpv 1.0
ListView {
// The active items X value from root

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

@ -1,7 +1,6 @@
import QtQuick 2.13
import QtQuick.Controls 2.15 as Controls
import Qt.labs.platform 1.1 as Labs
import QtQuick.Dialogs 1.3
import QtQuick.Layouts 1.15
import org.kde.kirigami 2.13 as Kirigami
import "./" as Presenter

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

@ -1,5 +1,4 @@
import QtQuick 2.15
import QtQuick.Dialogs 1.0
import QtQuick.Controls 2.15 as Controls
import QtQuick.Window 2.15
import QtQuick.Layouts 1.15

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

@ -1,5 +1,5 @@
import QtQuick 2.13
import QtGraphicalEffects 1.15
import QtQuick
import Qt5Compat.GraphicalEffects
import org.kde.kirigami 2.13 as Kirigami
Item {

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

@ -1,10 +1,9 @@
import QtQuick 2.15
import QtQuick.Controls 2.15 as Controls
import QtQuick.Dialogs 1.3
import QtQuick.Layouts 1.15
import org.kde.kirigami 2.13 as Kirigami
import QtMultimedia
import "./" as Presenter
import mpv 1.0
import org.presenter 1.0
Item {
@ -90,19 +89,10 @@ Item {
Layout.leftMargin: Kirigami.Units.largeSpacing
Layout.rightMargin: Kirigami.Units.largeSpacing
MpvObject {
Video {
id: videoPreview
width: parent.width
height: parent.height
objectName: "mpv"
useHwdec: true
enableAudio: audioOn
Component.onCompleted: mpvLoadingTimer.start()
onPositionChanged: videoSlider.value = position
onFileLoaded: {
/* showPassiveNotification(video.title + " has been loaded"); */
videoPreview.pause();
}
}
RowLayout {
@ -111,7 +101,7 @@ Item {
height: videoTitleField.height
spacing: 2
Kirigami.Icon {
source: videoPreview.isPlaying ? "media-pause" : "media-play"
source: videoPreview.playbackState == MediaPlayer.PlayingState ? "media-pause" : "media-play"
Layout.preferredWidth: 25
Layout.preferredHeight: 25
color: Kirigami.Theme.textColor
@ -127,7 +117,7 @@ Item {
Layout.preferredHeight: 25
from: 0
to: videoPreview.duration
/* value: videoPreview.postion */
value: videoPreview.postion
live: true
onMoved: videoPreview.seek(value);
}