aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Gottfried <sebastiangottfried@web.de>2015-06-08 10:42:31 (GMT)
committerSebastian Gottfried <sebastiangottfried@web.de>2015-06-08 10:42:31 (GMT)
commitc81b1d693abfc423e7c650986abb522ee58b3523 (patch)
treef792dceafe8f15406cc855060f3f4b27672c7f26
parent50dd985e525c0489b9de3895445eb02d04e6d5a4 (diff)
Qt5: Custom Lesson Selector Fixes
* Fix tool button icons * Fix delete confirmation / undo toolbar layout
-rw-r--r--src/qml/CustomLessonSelector.qml9
-rw-r--r--src/qml/InlineToolbar.qml11
2 files changed, 11 insertions, 9 deletions
diff --git a/src/qml/CustomLessonSelector.qml b/src/qml/CustomLessonSelector.qml
index 28c2bca..750a16c 100644
--- a/src/qml/CustomLessonSelector.qml
+++ b/src/qml/CustomLessonSelector.qml
@@ -171,12 +171,12 @@ Item {
opacity: base.selectedLesson !== null? 1: 0
content: [
ToolButton {
- iconSource: "document-edit"
+ iconName: "document-edit"
text: i18n("Edit")
onClicked: editLesson()
},
ToolButton {
- iconSource: "edit-delete"
+ iconName: "edit-delete"
text: i18n("Delete")
onClicked: deleteLesson()
}
@@ -204,18 +204,19 @@ Item {
content: [
Label {
text: i18n("'%1' deleted.", undoToolbar.lastDeletedLessonTitle)
+ anchors.verticalCenter: parent.verticalCenter
},
Item {
width: 5
height: 1
},
ToolButton {
- iconSource: "edit-undo"
+ iconName: "edit-undo"
text: i18n("Undo")
onClicked: undoLessonDeletion()
},
ToolButton {
- iconSource: "dialog-close"
+ iconName: "dialog-close"
text: i18n("Dismiss")
onClicked: confirmLessonDeletion()
}
diff --git a/src/qml/InlineToolbar.qml b/src/qml/InlineToolbar.qml
index b67d3b6..4202560 100644
--- a/src/qml/InlineToolbar.qml
+++ b/src/qml/InlineToolbar.qml
@@ -28,17 +28,18 @@ Item {
width: contentArea.width + 6
height: contentArea.height + 6
- SystemPalette {
- id: palette
- colorGroup: SystemPalette.Active
- }
Rectangle {
anchors.fill: parent
id: background
- color: pallete.mid
+ color: activePalette.mid
opacity: 0.7
radius: 3
+
+ SystemPalette {
+ id: activePalette
+ colorGroup: SystemPalette.Active
+ }
}
Behavior on opacity {