Update Controls Text Editor example and docs

a27b75c89da31a9ed1cf6dc6f6d3f3514ad28f8e doesn't work in its
entirety on 6.7 branch; but this patch applies the parts that are
possible. These docs have been adapted from the version in
6217408799c43869b8a7c1fcbff882d42ae71171.

We update the html and markdown example files.

We also move ScrollBar to make explanation easier.

Change-Id: If65de335f840382b5e236d8a04db382b0b7aee6a
Reviewed-by: Oliver Eftevaag <oliver.eftevaag@qt.io>
(cherry picked from commit 6217408799c43869b8a7c1fcbff882d42ae71171)
(cherry picked from commit 3b44a457efcf42f4f6b3ce0d6ae41ef3821e4478)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

1 files changed, 28 insertions, 25 deletions

diff --git a/examples/quickcontrols/texteditor/qml/texteditor.qml b/examples/quickcontrols/texteditor/qml/texteditor.qml
index a33aba6f31..9aee7e1e45 100644
--- a/examples/quickcontrols/texteditor/qml/texteditor.qml
+++ b/examples/quickcontrols/texteditor/qml/texteditor.qml
@@ -6,7 +6,7 @@ import QtCore
 import QtQuick.Controls
 import QtQuick.Window
 import QtQuick.Dialogs
-import Qt.labs.platform as Platform
+import Qt.labs.platform as Platform // note: soon to be obsolete
 
 // TODO:
 // - make designer-friendly
@@ -57,18 +57,21 @@ ApplicationWindow {
     Action {
         id: copyAction
         shortcut: StandardKey.Copy
+        enabled: textArea.selectedText
         onTriggered: textArea.copy()
     }
 
     Action {
         id: cutAction
         shortcut: StandardKey.Cut
+        enabled: textArea.selectedText
         onTriggered: textArea.cut()
     }
 
     Action {
         id: pasteAction
         shortcut: StandardKey.Paste
+        enabled: textArea.canPaste
         onTriggered: textArea.paste()
     }
 
@@ -141,15 +144,19 @@ ApplicationWindow {
 
             Platform.MenuItem {
                 text: qsTr("&Open")
-                onTriggered: openDialog.open()
+                onTriggered: openAction.trigger()
             }
             Platform.MenuItem {
-                text: qsTr("&Save As...")
-                onTriggered: saveDialog.open()
+                text: qsTr("&Save…")
+                onTriggered: saveAction.trigger()
+            }
+            Platform.MenuItem {
+                text: qsTr("Save &As…")
+                onTriggered: saveAsAction.trigger()
             }
             Platform.MenuItem {
                 text: qsTr("&Quit")
-                onTriggered: close()
+                onTriggered: quitAction.trigger()
             }
         }
 
@@ -158,18 +165,18 @@ ApplicationWindow {
 
             Platform.MenuItem {
                 text: qsTr("&Copy")
-                enabled: textArea.selectedText
-                onTriggered: textArea.copy()
+                enabled: copyAction.enabled
+                onTriggered: copyAction.trigger()
             }
             Platform.MenuItem {
                 text: qsTr("Cu&t")
-                enabled: textArea.selectedText
-                onTriggered: textArea.cut()
+                enabled: cutAction.enabled
+                onTriggered: cutAction.trigger()
             }
             Platform.MenuItem {
                 text: qsTr("&Paste")
-                enabled: textArea.canPaste
-                onTriggered: textArea.paste()
+                enabled: pasteAction.enabled
+                onTriggered: pasteAction.trigger()
             }
         }
 
@@ -325,7 +332,6 @@ ApplicationWindow {
                     text: "\uF0C5" // icon-docs
                     font.family: "fontello"
                     focusPolicy: Qt.TabFocus
-                    enabled: textArea.selectedText
                     action: copyAction
                 }
                 ToolButton {
@@ -333,7 +339,6 @@ ApplicationWindow {
                     text: "\uE802" // icon-scissors
                     font.family: "fontello"
                     focusPolicy: Qt.TabFocus
-                    enabled: textArea.selectedText
                     action: cutAction
                 }
                 ToolButton {
@@ -341,7 +346,6 @@ ApplicationWindow {
                     text: "\uF0EA" // icon-paste
                     font.family: "fontello"
                     focusPolicy: Qt.TabFocus
-                    enabled: textArea.canPaste
                     action: pasteAction
                 }
                 ToolSeparator {
@@ -463,6 +467,8 @@ ApplicationWindow {
         flickableDirection: Flickable.VerticalFlick
         anchors.fill: parent
 
+        ScrollBar.vertical: ScrollBar {}
+
         TextArea.flickable: TextArea {
             id: textArea
             textFormat: Qt.RichText
@@ -479,10 +485,9 @@ ApplicationWindow {
             bottomPadding: 0
             background: null
 
-            MouseArea {
+            TapHandler {
                 acceptedButtons: Qt.RightButton
-                anchors.fill: parent
-                onClicked: contextMenu.open()
+                onTapped: contextMenu.open()
             }
 
             onLinkActivated: function (link) {
@@ -511,8 +516,6 @@ ApplicationWindow {
                 }
             }
         }
-
-        ScrollBar.vertical: ScrollBar {}
     }
 
     Platform.Menu {
@@ -520,18 +523,18 @@ ApplicationWindow {
 
         Platform.MenuItem {
             text: qsTr("Copy")
-            enabled: textArea.selectedText
-            onTriggered: textArea.copy()
+            enabled: copyAction.enabled
+            onTriggered: copyAction.trigger()
         }
         Platform.MenuItem {
             text: qsTr("Cut")
-            enabled: textArea.selectedText
-            onTriggered: textArea.cut()
+            enabled: cutAction.enabled
+            onTriggered: cutAction.trigger()
         }
         Platform.MenuItem {
             text: qsTr("Paste")
-            enabled: textArea.canPaste
-            onTriggered: textArea.paste()
+            enabled: pasteAction.enabled
+            onTriggered: pasteAction.trigger()
         }
 
         Platform.MenuSeparator {}