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

Trying to get a settings module working

Browse source
This commit is contained in:
Chris Cochrun 2022-03-11 11:22:11 -06:00
parent 475a0abe3c
commit 9882a0a289
4 changed files with 121 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

101
src/qml/main.qml
View file

@ -14,6 +14,9 @@ Kirigami.ApplicationWindow {
property bool libraryOpen: true
property bool presenting: false
property var presentationScreen
property var screens
property bool editMode: false
@ -22,29 +25,53 @@ Kirigami.ApplicationWindow {
pageStack.initialPage: mainPage
header: Presenter.Header {}
/* Loader { */
/* Labs.MenuBar { */
/* Labs.Menu { */
/* title: qsTr("File") */
/* Labs.MenuItem { text: qsTr("New...") } */
/* Labs.MenuItem { text: qsTr("Open...") } */
/* Labs.MenuItem { text: qsTr("Save") } */
/* Labs.MenuItem { text: qsTr("Save As...") } */
/* Labs.MenuSeparator { } */
/* Labs.MenuItem { text: qsTr("Quit") } */
/* } */
/* Labs.Menu { */
/* title: qsTr("Edit") */
/* Labs.MenuItem { text: qsTr("Cut") } */
/* Labs.MenuItem { text: qsTr("Copy") } */
/* Labs.MenuItem { text: qsTr("Paste") } */
/* } */
/* Labs.Menu { */
/* title: qsTr("Help") */
/* Labs.MenuItem { text: qsTr("About") } */
/* } */
/* } */
/* } */
menuBar: Controls.MenuBar {
Controls.Menu {
title: qsTr("File")
Controls.MenuItem { text: qsTr("New...") }
Controls.MenuItem { text: qsTr("Open...") }
Controls.MenuItem { text: qsTr("Save") }
Controls.MenuItem { text: qsTr("Save As...") }
Controls.MenuSeparator { }
Controls.MenuItem { text: qsTr("Quit") }
}
Controls.Menu {
title: qsTr("Settings")
Controls.MenuItem {
text: qsTr("Configure")
onTriggered: openSettings()
}
}
Controls.Menu {
title: qsTr("Help")
Controls.MenuItem { text: qsTr("About") }
}
}
Labs.MenuBar {
Labs.Menu {
title: qsTr("File")
Labs.MenuItem { text: qsTr("New...") }
Labs.MenuItem { text: qsTr("Open...") }
Labs.MenuItem { text: qsTr("Save") }
Labs.MenuItem { text: qsTr("Save As...") }
Labs.MenuSeparator { }
Labs.MenuItem { text: qsTr("Quit") }
}
Labs.Menu {
title: qsTr("Settings")
Labs.MenuItem {
text: qsTr("Configure")
onTriggered: openSettings()
}
}
Labs.Menu {
title: qsTr("Help")
Labs.MenuItem { text: qsTr("About") }
}
}
width: 1800
height: 900
@ -61,15 +88,27 @@ Kirigami.ApplicationWindow {
libraryOpen = !libraryOpen
}
function openSettings() {
settingsSheet.open()
}
Component.onCompleted: {
showPassiveNotification(Kirigami.Settings.style);
Kirigami.Settings.style = "Plasma";
showPassiveNotification(Kirigami.Settings.style);
/* showPassiveNotification(Kirigami.Settings.style); */
/* Kirigami.Settings.style = "Plasma"; */
/* showPassiveNotification(Kirigami.Settings.style); */
print(Qt.platform.os);
print("checking screens");
print("Present Mode is " + presentMode);
print("Present Mode is " + presenting);
screens = Qt.application.screens;
for (let i = 0; i < screens.length; i++) {
print(screens[i].name);
screenModel.append({
"name": screens[i].name,
"width": (screens[i].width * screens[i].devicePixelRatio),
"height": (screens[i].height * screens[i].devicePixelRatio),
"pixeldensity": screens[i].pixelDensity,
"pixelratio": screens[i].devicePixelRatio
})
print("width of screen: " + (screens[i].width * screens[i].devicePixelRatio));
print("height of screen: " + (screens[i].height * screens[i].devicePixelRatio));
print("pixeldensity of screen: " + screens[i].pixelDensity);
@ -77,4 +116,12 @@ Kirigami.ApplicationWindow {
}
}
Presenter.Settings {
id: settingsSheet
model: screenModel
}
ListModel {
id: screenModel
}
}

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

@ -87,12 +87,17 @@ Controls.Page {
Loader {
id: presentLoader
active: presenting
sourceComponent: Window {
sourceComponent: presentationComponent
}
Component {
id: presentationComponent
Window {
id: presentationWindow
title: "presentation-window"
height: maximumHeight
width: maximumWidth
screen: screens[1].name
screen: screens[0]
onClosing: presenting = false
Component.onCompleted: {
@ -110,6 +115,7 @@ Controls.Page {
Component.onCompleted: slideItem = presentationSlide
}
}
}
FileDialog {

38
src/qml/presenter/Settings.qml Normal file
View file

@ -0,0 +1,38 @@
import QtQuick 2.13
import QtQuick.Dialogs 1.0
import QtQuick.Controls 2.15 as Controls
import QtQuick.Layouts 1.2
import org.kde.kirigami 2.13 as Kirigami
import "./" as Presenter
import org.presenter 1.0
Kirigami.OverlaySheet {
property ListModel model
id: root
header: Kirigami.Heading {
text: "Settings"
}
Kirigami.FormLayout {
Controls.ComboBox {
id: screenSelectionField
Kirigami.FormData.label: i18nc("@label:textbox", "Screen:")
model: model
textRole: name
onAccepted: descriptionField.forceActiveFocus()
}
Controls.TextField {
id: descriptionField
Kirigami.FormData.label: i18nc("@label:textbox", "Description:")
placeholderText: i18n("Optional")
onAccepted: dateField.forceActiveFocus()
}
Controls.TextField {
id: dateField
Kirigami.FormData.label: i18nc("@label:textbox", "Date:")
placeholderText: i18n("YYYY-MM-DD")
inputMask: "0000-00-00"
}
}
}

1
src/resources.qrc
View file

@ -13,6 +13,7 @@
<file>qml/presenter/SlideEditor.qml</file>
<file>qml/presenter/DragHandle.qml</file>
<file>qml/presenter/Presentation.qml</file>
<file>qml/presenter/Settings.qml</file>
<file>assets/parallel.jpg</file>
</qresource>
</RCC>