Commit 61c1b2d9 authored by Martin Höher's avatar Martin Höher

Merge branch '191-load-pages-onto-stack-asynchronously' into 'master'

GUI Fixes after async Markdown formatting

See merge request !93
parents 0df47fed 6652bc4b
Pipeline #24785053 passed with stages
in 12 minutes and 38 seconds
......@@ -4,33 +4,34 @@ import OpenTodoList 1.0 as OTL
import "../Utils"
Item {
QtObject {
id: converter
property string markdown: ""
property bool strip: false
readonly property alias text: d.text
onMarkdownChanged: Markdown.scheduleFormat(markdown)
onStripChanged: Markdown.scheduleFormat(markdown)
Connections {
target: Markdown
onMarkdownReady: {
if (text === converter.markdown) {
if (converter.strip) {
d.text = OTL.Application.htmlToPlainText(result);
} else {
d.text = result;
property list<QtObject> __children
__children: [
Connections {
target: Markdown
onMarkdownReady: {
if (text === converter.markdown) {
if (converter.strip) {
d.text = OTL.Application.htmlToPlainText(result);
} else {
d.text = result;
}
}
}
}
}
},
QtObject {
id: d
QtObject {
id: d
property string text
}
]
property string text
}
onMarkdownChanged: Markdown.scheduleFormat(markdown)
onStripChanged: Markdown.scheduleFormat(markdown)
}
......@@ -50,6 +50,24 @@ Pane {
}
}
RowLayout {
id: layout
anchors {
verticalCenter: parent.verticalCenter
left: parent.left
right: parent.right
}
Label {
text: qsTr("<strong>%1</strong> has been created.").arg(d.itemName)
Layout.fillWidth: true
elide: Text.ElideRight
}
Button {
text: qsTr("Open")
onClicked: root.open(d.item)
}
}
QtObject {
id: d
......@@ -71,23 +89,4 @@ Pane {
repeat: false
onTriggered: d.shown = false
}
RowLayout {
id: layout
anchors {
verticalCenter: parent.verticalCenter
left: parent.left
right: parent.right
}
Label {
text: qsTr("<strong>%1</strong> has been created.").arg(d.itemName)
Layout.fillWidth: true
elide: Text.ElideRight
}
Button {
text: qsTr("Open")
onClicked: root.open(d.item)
}
}
}
......@@ -3,9 +3,9 @@ import QtQuick 2.0
Rectangle {
property var item: ({})
visible: false && item.percentageDone !== undefined &&
visible: item.percentageDone !== undefined &&
item.percentageDone > 0
width: 0 // parent.width * item.percentageDone / 100.0
width: parent.width * item.percentageDone / 100.0
color: "black"
opacity: 0.1
}
<?xml version="1.0"?>
<manifest android:versionName="3.8.0" xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="98" android:installLocation="auto" package="net.rpdev.opentodolist">
<manifest android:versionName="3.8.0" xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="100" android:installLocation="auto" package="net.rpdev.opentodolist">
<application android:icon="@drawable/icon" android:name="org.qtproject.qt5.android.bindings.QtApplication" android:label="OpenTodoList">
<activity android:screenOrientation="unspecified" android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|locale|fontScale|keyboard|keyboardHidden|navigation" android:name="org.qtproject.qt5.android.bindings.QtActivity" android:label="@string/app_name">
<intent-filter>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment