Add scrollable area around text messages

CURA-9374
Ultimaker · Aug 18, 2023 · a3d6645 · a3d6645
1 parent 0432b76
commit a3d6645
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 54 deletions.
diff --git a/plugins/Marketplace/resources/qml/LicenseDialog.qml b/plugins/Marketplace/resources/qml/LicenseDialog.qml
@@ -6,7 +6,7 @@ import QtQuick.Window 2.2
 import QtQuick.Controls 2.3
 import QtQuick.Layouts 1.3
 
-import UM 1.6 as UM
+import UM 1.7 as UM
 import Cura 1.6 as Cura
 
 UM.Dialog
@@ -52,7 +52,7 @@ UM.Dialog
             }
         }
 
-        Cura.ScrollableTextArea
+        UM.ScrollableTextArea
         {
             Layout.fillWidth: true
             Layout.fillHeight: true

diff --git a/plugins/Marketplace/resources/qml/MultipleLicenseDialog.qml b/plugins/Marketplace/resources/qml/MultipleLicenseDialog.qml
@@ -6,7 +6,7 @@ import QtQuick.Window 2.2
 import QtQuick.Controls 2.3
 import QtQuick.Layouts 1.3
 
-import UM 1.5 as UM
+import UM 1.7 as UM
 import Cura 1.6 as Cura
 
 UM.Dialog
@@ -66,7 +66,7 @@ UM.Dialog
             }
         }
 
-        Cura.ScrollableTextArea
+        UM.ScrollableTextArea
         {
             Layout.fillWidth: true
             Layout.fillHeight: true

diff --git a/plugins/SliceInfoPlugin/MoreInfoWindow.qml b/plugins/SliceInfoPlugin/MoreInfoWindow.qml
@@ -5,7 +5,7 @@ import QtQuick 2.10
 import QtQuick.Controls 2.3
 import QtQuick.Window 2.2
 
-import UM 1.5 as UM
+import UM 1.7 as UM
 import Cura 1.1 as Cura
 
 Window
@@ -74,7 +74,7 @@ Window
                 wrapMode: Text.WordWrap
             }
 
-            Cura.ScrollableTextArea
+            UM.ScrollableTextArea
             {
                 anchors
                 {

diff --git a/resources/qml/WelcomePages/ChangelogContent.qml b/resources/qml/WelcomePages/ChangelogContent.qml
@@ -4,7 +4,7 @@
 import QtQuick 2.10
 import QtQuick.Controls 2.3
 
-import UM 1.5 as UM
+import UM 1.7 as UM
 import Cura 1.1 as Cura
 
 
@@ -26,7 +26,7 @@ Item
         font: UM.Theme.getFont("huge")
     }
 
-    Cura.ScrollableTextArea
+    UM.ScrollableTextArea
     {
         id: changelogTextArea
 

diff --git a/resources/qml/WelcomePages/WhatsNewContent.qml b/resources/qml/WelcomePages/WhatsNewContent.qml
@@ -5,7 +5,7 @@ import QtQuick 2.10
 import QtQuick.Controls 2.3
 import QtQuick.Layouts 1.3
 
-import UM 1.5 as UM
+import UM 1.7 as UM
 import Cura 1.1 as Cura
 
 
@@ -90,7 +90,7 @@ Item
                         source: manager.getSubpageImageSource(index)
                     }
 
-                    Cura.ScrollableTextArea
+                    UM.ScrollableTextArea
                     {
                         id: subpageText
 

diff --git a/resources/qml/Widgets/ScrollableTextArea.qml b/resources/qml/Widgets/ScrollableTextArea.qml