diff --git a/src/declarativeimports/CMakeLists.txt b/src/declarativeimports/CMakeLists.txt --- a/src/declarativeimports/CMakeLists.txt +++ b/src/declarativeimports/CMakeLists.txt @@ -70,4 +70,6 @@ DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/plasma/components.3) install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/plasmacomponents3/private DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/plasma/components.3) +install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/plasmacomponents3/mobiletextselection DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/plasma/components.3) + diff --git a/src/declarativeimports/plasmacomponents3/ComboBox.qml b/src/declarativeimports/plasmacomponents3/ComboBox.qml --- a/src/declarativeimports/plasmacomponents3/ComboBox.qml +++ b/src/declarativeimports/plasmacomponents3/ComboBox.qml @@ -25,6 +25,7 @@ import org.kde.plasma.core 2.0 as PlasmaCore import org.kde.kirigami 2.5 as Kirigami import "private" as Private +import "mobiletextselection" as MobileTextSelection T.ComboBox { id: control @@ -154,7 +155,7 @@ opacity: control.enabled ? 1 : 0.3 onFocusChanged: { if (focus) { - Private.MobileTextActionsToolBar.controlRoot = textField; + MobileTextSelection.MobileTextActionsToolBar.controlRoot = textField; } } @@ -176,7 +177,7 @@ } } - Private.MobileCursor { + MobileTextSelection.MobileCursor { target: textField selectionStartHandle: true property var rect: textField.positionToRectangle(textField.selectionStart) diff --git a/src/declarativeimports/plasmacomponents3/TextArea.qml b/src/declarativeimports/plasmacomponents3/TextArea.qml --- a/src/declarativeimports/plasmacomponents3/TextArea.qml +++ b/src/declarativeimports/plasmacomponents3/TextArea.qml @@ -24,6 +24,7 @@ import org.kde.plasma.core 2.0 as PlasmaCore import "private" as Private import org.kde.kirigami 2.5 as Kirigami +import "mobiletextselection" as MobileTextSelection T.TextArea { id: control @@ -68,7 +69,7 @@ selectWord(); } - Private.MobileCursor { + MobileTextSelection.MobileCursor { target: control selectionStartHandle: true property var rect: target.positionToRectangle(target.selectionStart) @@ -78,7 +79,7 @@ onFocusChanged: { if (focus) { - Private.MobileTextActionsToolBar.controlRoot = control; + MobileTextSelection.MobileTextActionsToolBar.controlRoot = control; } } diff --git a/src/declarativeimports/plasmacomponents3/TextField.qml b/src/declarativeimports/plasmacomponents3/TextField.qml --- a/src/declarativeimports/plasmacomponents3/TextField.qml +++ b/src/declarativeimports/plasmacomponents3/TextField.qml @@ -24,6 +24,7 @@ import org.kde.plasma.core 2.0 as PlasmaCore import "private" as Private import org.kde.kirigami 2.5 as Kirigami +import "mobiletextselection" as MobileTextSelection T.TextField { id: control @@ -51,13 +52,13 @@ cursorDelegate: Kirigami.Settings.tabletMode ? mobileCursor : null Component { id: mobileCursor - Private.MobileCursor { + MobileTextSelection.MobileCursor { target: control } } onFocusChanged: { if (focus) { - Private.MobileTextActionsToolBar.controlRoot = control; + MobileTextSelection.MobileTextActionsToolBar.controlRoot = control; } } diff --git a/src/declarativeimports/plasmacomponents3/private/MobileCursor.qml b/src/declarativeimports/plasmacomponents3/mobiletextselection/MobileCursor.qml rename from src/declarativeimports/plasmacomponents3/private/MobileCursor.qml rename to src/declarativeimports/plasmacomponents3/mobiletextselection/MobileCursor.qml diff --git a/src/declarativeimports/plasmacomponents3/private/MobileTextActionsToolBar.qml b/src/declarativeimports/plasmacomponents3/mobiletextselection/MobileTextActionsToolBar.qml rename from src/declarativeimports/plasmacomponents3/private/MobileTextActionsToolBar.qml rename to src/declarativeimports/plasmacomponents3/mobiletextselection/MobileTextActionsToolBar.qml --- a/src/declarativeimports/plasmacomponents3/private/MobileTextActionsToolBar.qml +++ b/src/declarativeimports/plasmacomponents3/mobiletextselection/MobileTextActionsToolBar.qml @@ -23,7 +23,6 @@ import QtQuick.Layouts 1.2 import QtQuick.Window 2.2 import QtQuick.Controls @QQC2_VERSION@ -import org.kde.plasma.core 2.0 as PlasmaCore import org.kde.kirigami 2.5 as Kirigami Popup { @@ -81,4 +80,4 @@ } } } - + diff --git a/src/declarativeimports/plasmacomponents3/mobiletextselection/qmldir b/src/declarativeimports/plasmacomponents3/mobiletextselection/qmldir new file mode 100644 --- /dev/null +++ b/src/declarativeimports/plasmacomponents3/mobiletextselection/qmldir @@ -0,0 +1,3 @@ + +singleton MobileTextActionsToolBar 1.0 MobileTextActionsToolBar.qml +MobileCursor 1.0 MobileCursor.qml diff --git a/src/declarativeimports/plasmacomponents3/private/qmldir b/src/declarativeimports/plasmacomponents3/private/qmldir --- a/src/declarativeimports/plasmacomponents3/private/qmldir +++ b/src/declarativeimports/plasmacomponents3/private/qmldir @@ -1,7 +1,5 @@ -singleton MobileTextActionsToolBar 1.0 MobileTextActionsToolBar.qml ButtonShadow 1.0 ButtonShadow.qml DefaultListItemBackground 1.0 DefaultListItemBackground.qml -MobileCursor 1.0 MobileCursor.qml RoundShadow 1.0 RoundShadow.qml TextFieldFocus 1.0 TextFieldFocus.qml