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

adjusting small ui changes

Browse source
This commit is contained in:
Chris Cochrun 2022-10-21 10:38:50 -05:00
parent f1511b79ff
commit 5083865626
3 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/qml/main.qml
View file

@ -26,7 +26,7 @@ Kirigami.ApplicationWindow {
onActiveFocusItemChanged: print("FOCUS CHANGED TO: " + activeFocusControl) onActiveFocusItemChanged: print("FOCUS CHANGED TO: " + activeFocusControl)
pageStack.initialPage: mainPage /* pageStack.initialPage: mainPage */
header: Presenter.Header {} header: Presenter.Header {}
menuBar: Controls.MenuBar { menuBar: Controls.MenuBar {
@ -86,7 +86,10 @@ Kirigami.ApplicationWindow {
onTriggered: saveAs() onTriggered: saveAs()
} }
Labs.MenuSeparator { } Labs.MenuSeparator { }
Labs.MenuItem { text: qsTr("Quit") } Labs.MenuItem {
text: qsTr("Quit")
onTriggered: rootApp.quit()
}
} }
Labs.Menu { Labs.Menu {
title: qsTr("Settings") title: qsTr("Settings")
@ -108,6 +111,7 @@ Kirigami.ApplicationWindow {
Presenter.MainWindow { Presenter.MainWindow {
id: mainPage id: mainPage
anchors.fill: parent
} }
FileDialog { FileDialog {
@ -216,5 +220,4 @@ Kirigami.ApplicationWindow {
id: settingsSheet id: settingsSheet
theModel: screenModel theModel: screenModel
} }
} }

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

@ -80,6 +80,7 @@ Controls.Page {
FocusScope { FocusScope {
id: mainPageArea id: mainPageArea
Controls.SplitView.fillWidth: true Controls.SplitView.fillWidth: true
Controls.SplitView.fillHeight: true
Controls.SplitView.minimumWidth: 100 Controls.SplitView.minimumWidth: 100
Presenter.Presentation { Presenter.Presentation {

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

@ -36,6 +36,7 @@ FocusScope {
GridLayout { GridLayout {
anchors.fill: parent anchors.fill: parent
/* anchors.bottomMargin: 40 */
columns: 3 columns: 3
rowSpacing: 5 rowSpacing: 5
columnSpacing: 0 columnSpacing: 0
@ -130,11 +131,11 @@ FocusScope {
spacing: 2 spacing: 2
Layout.preferredWidth: previewSlide.width - 50 Layout.preferredWidth: previewSlide.width - 50
/* Layout.columnSpan: 3 */ /* Layout.columnSpan: 3 */
visible: itemType === "video";
Kirigami.Icon { Kirigami.Icon {
source: previewSlide.mpvIsPlaying ? "media-pause" : "media-play" source: previewSlide.mpvIsPlaying ? "media-pause" : "media-play"
Layout.preferredWidth: 25 Layout.preferredWidth: 25
Layout.preferredHeight: 25 Layout.preferredHeight: 25
visible: itemType === "video";
MouseArea { MouseArea {
anchors.fill: parent anchors.fill: parent
onPressed: SlideObject.playPause(); onPressed: SlideObject.playPause();
@ -143,7 +144,6 @@ FocusScope {
} }
Controls.Slider { Controls.Slider {
id: videoSlider id: videoSlider
visible: itemType === "video";
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredHeight: 25 Layout.preferredHeight: 25
from: 0 from: 0
@ -155,7 +155,6 @@ FocusScope {
Controls.Switch { Controls.Switch {
text: "Loop" text: "Loop"
visible: itemType === "video";
checked: previewSlide.mpvLoop === "inf" ? true : false checked: previewSlide.mpvLoop === "inf" ? true : false
onToggled: mainPage.loopVideo() onToggled: mainPage.loopVideo()
Keys.onLeftPressed: previousSlideAction() Keys.onLeftPressed: previousSlideAction()
@ -249,7 +248,7 @@ FocusScope {
} }
Item { Item {
/* Layout.preferredHeight: 200 */ /* Layout.preferredHeight: 20 */
Layout.fillHeight: true Layout.fillHeight: true
Layout.fillWidth: true Layout.fillWidth: true
Layout.columnSpan: 3 Layout.columnSpan: 3