diff options
| author | Tannin <devnull@localhost> | 2015-03-09 12:34:34 +0100 |
|---|---|---|
| committer | Tannin <devnull@localhost> | 2015-03-09 12:34:34 +0100 |
| commit | 7a1ae9b0f1560c9eda32e032796fbb3fd56ff236 (patch) | |
| tree | dea71435ac1042cb008fcd9f7b1ec57e6ea91227 /src/tutorials/TutorialOverlay.qml | |
| parent | d45ebf134819e1559718681becca9c4139fb7151 (diff) | |
| parent | db2954e8eb41da715b9e7d79a72e225797401413 (diff) | |
Merge with branch1.2
Diffstat (limited to 'src/tutorials/TutorialOverlay.qml')
| -rw-r--r-- | src/tutorials/TutorialOverlay.qml | 89 |
1 files changed, 52 insertions, 37 deletions
diff --git a/src/tutorials/TutorialOverlay.qml b/src/tutorials/TutorialOverlay.qml index f2aad027..15fe9603 100644 --- a/src/tutorials/TutorialOverlay.qml +++ b/src/tutorials/TutorialOverlay.qml @@ -2,52 +2,67 @@ import QtQuick 1.1 import "tutorials.js" as Logic
Rectangle {
- color: "transparent"
+ color: "transparent"
- property int step : 0
- property alias description: tutDescription
- property alias highlight: tutHighlight
- property alias text: tutDescription.text
- property alias boxOpacity: tutDescription.opacity
- property int offsetBottom: 50
- property int maxWidth: 400
+ id: tutToplevel
- function init() {
- Logic.init()
- Logic.nextStep()
- }
+ property int step : 0
+ property alias description: tutDescription
+ property alias highlight: tutHighlight
+ property alias text: tutDescription.text
+ property alias boxOpacity: tutDescription.opacity
+ property int offsetBottom: 50
+ property int maxWidth: 400
- function enableBackground(enabled) {
- disabledBackground.visible = enabled
- }
-/*
- signal nextStep
+ signal tabChanged(int index)
- onNextStep: {*/
- function nextStep() {
- if (step == 0) {
- Logic.init()
- }
+ function init() {
+ Logic.init()
+ Logic.nextStep()
+ }
- Logic.nextStep()
- }
+ function enableBackground(enabled) {
+ disabledBackground.visible = enabled
+ }
+
+ function backgroundEnabled() {
+ return disabledBackground.visible
+ }
- TutorialDescription {
- id: tutDescription
- innerWidth: maxWidth
- anchors.bottomMargin: offsetBottom
- onClicked: {
- Logic.clickNext()
- }
+ function nextStep() {
+ if (step == 0) {
+ Logic.init()
}
- Rectangle {
- id: disabledBackground
- anchors.fill: parent
- opacity: 0.2
- color: "#808080"
+ Logic.nextStep()
+ }
+
+ TutorialDescription {
+ id: tutDescription
+ innerWidth: maxWidth
+ anchors.bottomMargin: offsetBottom
+ onClicked: {
+ Logic.clickNext()
}
+ }
+
+ Rectangle {
+ id: disabledBackground
+ anchors.fill: parent
+ opacity: 0.2
+ color: "#808080"
+ }
+
+ Connections {
+ target: manager
+ onTabChanged: tabChanged(index)
+ }
- Highlight { id: tutHighlight }
+ Tooltip {
+ id: tooltip
+ }
+ Highlight {
+ id: tutHighlight
+ }
}
|