diff --git a/CHANGELOG.org b/CHANGELOG.org new file mode 100644 index 0000000..7e444ae --- /dev/null +++ b/CHANGELOG.org @@ -0,0 +1,4 @@ +#+TITLE: Changelog +* Changelog +** [2022-03-31 Thu 06:25] Initial Changelog - Nothing worth adding here yet. Once we have a base then the changelog with be appended to +[[file:~/dev/church-presenter/CHANGELOG.org::+TITLE: Changelog]] diff --git a/TODO.org b/TODO.org index 3fcebfe..799a8f9 100644 --- a/TODO.org +++ b/TODO.org @@ -1,8 +1,26 @@ #+TITLE: Todo List * Inbox -** TODO Need to make ListModel capable of bringing in a string list [1/2] [50%] +** TODO Fix file dialog using basic QT theme +[[file:~/dev/church-presenter/src/qml/presenter/SongEditor.qml::FileDialog {]] +** TODO Make toolbar functional for songeditor +[[file:~/dev/church-presenter/src/qml/presenter/SongEditor.qml::Controls.ToolBar {]] +** TODO Finish toolbar +[[file:~/dev/church-presenter/src/qml/presenter/Presentation.qml::Controls.ToolBar {]] +** TODO Find a way to maths the textsize +[[file:~/dev/church-presenter/src/qml/presenter/Slide.qml::property real textSize: 50]] + +** TODO Make nextSlideText a nextAction function to incorporate other types of items +[[file:~/dev/church-presenter/src/qml/presenter/Presentation.qml::function nextSlideText() {]] + +** TODO Create a nextslide function to be used after the end of the list of slides +[[file:~/dev/church-presenter/src/qml/presenter/Presentation.qml::function nextSlide() {]] + +** TODO Fix broken append when importing River song +[[file:~/dev/church-presenter/src/qml/presenter/LeftDock.qml::function appendItem(name, type, background, backgroundType, text, itemID) {]] + +** DONE Need to make ListModel capable of bringing in a string list [2/2] [100%] - [X] Create a Model -- [ ] Create a class that we'll make a list of in the model +- [X] Create a class that we'll make a list of in the model ** DONE Parse Lyrics to create a list of strings for slides SCHEDULED: <2022-03-23 Wed 10:00> diff --git a/src/qml/presenter/DragHandle.qml b/src/qml/presenter/DragHandle.qml index ad3aa0c..e0f081b 100644 --- a/src/qml/presenter/DragHandle.qml +++ b/src/qml/presenter/DragHandle.qml @@ -38,6 +38,7 @@ Item { // Emitted when clicking to activate underneath mousearea signal clicked() + signal rightClicked() MouseArea { id: mouseArea @@ -127,10 +128,16 @@ Item { MouseArea { id: clickArea anchors.fill: parent - onClicked: root.clicked() hoverEnabled: true + acceptedButtons: Qt.LeftButton | Qt.RightButton onEntered: root.containsMouse = true onExited: root.containsMouse = false + onClicked: { + if (mouse.button === Qt.RightButton) + root.rightClicked(); + else + root.clicked(); + } } } } diff --git a/src/qml/presenter/LeftDock.qml b/src/qml/presenter/LeftDock.qml index fb8535c..b15b65e 100644 --- a/src/qml/presenter/LeftDock.qml +++ b/src/qml/presenter/LeftDock.qml @@ -113,6 +113,17 @@ ColumnLayout { serviceItemList.currentIndex = index; changeServiceItem(index); } + onRightClicked: rightClickMenu.popup() + } + + Controls.Menu { + id: rightClickMenu + x: mouseHandler.mouseX + y: mouseHandler.mouseY + 10 + Kirigami.Action { + text: "delete" + onTriggered: serviceItemModel.removeItem(index) + } } DropArea { diff --git a/src/qml/presenter/Presentation.qml b/src/qml/presenter/Presentation.qml index f496730..f4bacd1 100644 --- a/src/qml/presenter/Presentation.qml +++ b/src/qml/presenter/Presentation.qml @@ -32,11 +32,18 @@ Item { anchors.fill: parent Controls.ToolButton { - text: "Grid" + text: "Solo" + icon.name: "viewimage" hoverEnabled: true } Controls.ToolButton { - text: "Solo" + text: "Grid" + icon.name: "view-app-grid-symbolic" + hoverEnabled: true + } + Controls.ToolButton { + text: "Details" + icon.name: "view-list-details" hoverEnabled: true } Controls.ToolSeparator {}