getting a bit more organized and adding some ui tweaks
This commit is contained in:
parent
9b6949090e
commit
7545f05724
5 changed files with 52 additions and 5 deletions
4
CHANGELOG.org
Normal file
4
CHANGELOG.org
Normal file
|
@ -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]]
|
22
TODO.org
22
TODO.org
|
@ -1,8 +1,26 @@
|
||||||
#+TITLE: Todo List
|
#+TITLE: Todo List
|
||||||
* Inbox
|
* 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
|
- [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
|
** DONE Parse Lyrics to create a list of strings for slides
|
||||||
SCHEDULED: <2022-03-23 Wed 10:00>
|
SCHEDULED: <2022-03-23 Wed 10:00>
|
||||||
|
|
|
@ -38,6 +38,7 @@ Item {
|
||||||
|
|
||||||
// Emitted when clicking to activate underneath mousearea
|
// Emitted when clicking to activate underneath mousearea
|
||||||
signal clicked()
|
signal clicked()
|
||||||
|
signal rightClicked()
|
||||||
|
|
||||||
MouseArea {
|
MouseArea {
|
||||||
id: mouseArea
|
id: mouseArea
|
||||||
|
@ -127,10 +128,16 @@ Item {
|
||||||
MouseArea {
|
MouseArea {
|
||||||
id: clickArea
|
id: clickArea
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
onClicked: root.clicked()
|
|
||||||
hoverEnabled: true
|
hoverEnabled: true
|
||||||
|
acceptedButtons: Qt.LeftButton | Qt.RightButton
|
||||||
onEntered: root.containsMouse = true
|
onEntered: root.containsMouse = true
|
||||||
onExited: root.containsMouse = false
|
onExited: root.containsMouse = false
|
||||||
|
onClicked: {
|
||||||
|
if (mouse.button === Qt.RightButton)
|
||||||
|
root.rightClicked();
|
||||||
|
else
|
||||||
|
root.clicked();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -113,6 +113,17 @@ ColumnLayout {
|
||||||
serviceItemList.currentIndex = index;
|
serviceItemList.currentIndex = index;
|
||||||
changeServiceItem(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 {
|
DropArea {
|
||||||
|
|
|
@ -32,11 +32,18 @@ Item {
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
|
|
||||||
Controls.ToolButton {
|
Controls.ToolButton {
|
||||||
text: "Grid"
|
text: "Solo"
|
||||||
|
icon.name: "viewimage"
|
||||||
hoverEnabled: true
|
hoverEnabled: true
|
||||||
}
|
}
|
||||||
Controls.ToolButton {
|
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
|
hoverEnabled: true
|
||||||
}
|
}
|
||||||
Controls.ToolSeparator {}
|
Controls.ToolSeparator {}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue