Wrap all controls

Closes: #318
lirios · Jun 28, 2024 · 87f07d9 · 87f07d9
1 parent 71f717f
commit 87f07d9
Show file tree

Hide file tree

Showing 88 changed files with 1,068 additions and 190 deletions.
diff --git a/src/demo/qml/Pages/Basic/BusyIndicatorPage.qml b/src/demo/qml/Pages/Basic/BusyIndicatorPage.qml
@@ -13,7 +13,7 @@
  */
 
 import QtQuick
-import QtQuick.Controls
+import Fluid
 import "../.." as Components
 
 Components.StyledPage {

diff --git a/src/demo/qml/Pages/Basic/ButtonPage.qml b/src/demo/qml/Pages/Basic/ButtonPage.qml
@@ -13,7 +13,6 @@
  */
 
 import QtQuick
-import QtQuick.Controls
 import QtQuick.Layouts
 import Fluid
 import "../.." as Components

diff --git a/src/demo/qml/Pages/Basic/CheckBoxPage.qml b/src/demo/qml/Pages/Basic/CheckBoxPage.qml
@@ -14,7 +14,6 @@
  */
 
 import QtQuick
-import QtQuick.Controls
 import QtQuick.Layouts
 import Fluid
 import "../.." as Components

diff --git a/src/demo/qml/Pages/Basic/ProgressBarPage.qml b/src/demo/qml/Pages/Basic/ProgressBarPage.qml
@@ -13,7 +13,6 @@
  */
 
 import QtQuick
-import QtQuick.Controls
 import QtQuick.Layouts
 import Fluid
 import "../.." as Components

diff --git a/src/demo/qml/Pages/Basic/RadioButtonPage.qml b/src/demo/qml/Pages/Basic/RadioButtonPage.qml
@@ -13,7 +13,6 @@
  */
 
 import QtQuick
-import QtQuick.Controls
 import QtQuick.Layouts
 import Fluid
 import "../.." as Components

diff --git a/src/demo/qml/Pages/Basic/SliderPage.qml b/src/demo/qml/Pages/Basic/SliderPage.qml
@@ -13,7 +13,6 @@
  */
 
 import QtQuick
-import QtQuick.Controls
 import QtQuick.Layouts
 import Fluid
 import "../.." as Components

diff --git a/src/demo/qml/Pages/Basic/SwitchPage.qml b/src/demo/qml/Pages/Basic/SwitchPage.qml
@@ -13,27 +13,26 @@
  */
 
 import QtQuick
-import QtQuick.Controls
 import QtQuick.Layouts
-import Fluid
+import Fluid as Fluid
 import "../.." as Components
 
 Components.StyledPageTwoColumns {
     leftColumn: ColumnLayout {
         anchors.centerIn: parent
 
-        TitleLabel {
+        Fluid.TitleLabel {
             text: qsTr("Enabled")
 
             Layout.alignment: Qt.AlignHCenter
         }
 
-        Switch {
+        Fluid.Switch {
             checked: true
             text: checked ? qsTr("On") : qsTr("Off")
         }
 
-        Switch {
+        Fluid.Switch {
             checked: false
             checkable: false
             text: qsTr("Off")
@@ -43,19 +42,19 @@ Components.StyledPageTwoColumns {
     rightColumn: ColumnLayout {
         anchors.centerIn: parent
 
-        TitleLabel {
+        Fluid.TitleLabel {
             text: qsTr("Disabled")
 
             Layout.alignment: Qt.AlignHCenter
         }
 
-        Switch {
+        Fluid.Switch {
             enabled: false
             checked: true
             text: checked ? qsTr("On") : qsTr("Off")
         }
 
-        Switch {
+        Fluid.Switch {
             enabled: false
             checked: false
             checkable: false

diff --git a/src/demo/qml/Pages/Controls/ActionButtonPage.qml b/src/demo/qml/Pages/Controls/ActionButtonPage.qml
@@ -1,5 +1,5 @@
 /*
- * This file is part of Fluid.
+ * This file is part of 
  *
  * Copyright (C) 2018 Pier Luigi Fiorini <[email protected]>
  *
@@ -13,36 +13,35 @@
  */
 
 import QtQuick
-import QtQuick.Controls
-import Fluid as Fluid
+import Fluid
 import "../.." as Components
 
 Components.StyledPageTwoColumns {
     leftColumn: Column {
         anchors.centerIn: parent
 
-        Fluid.TitleLabel {
+        TitleLabel {
             text: qsTr("Enabled")
         }
 
-        Fluid.FloatingActionButton {
-            icon.source: Fluid.Utils.iconUrl("device/airplanemode_active")
+        FloatingActionButton {
+            icon.source: Utils.iconUrl("device/airplanemode_active")
             mini: false
         }
 
-        Fluid.FloatingActionButton {
-            icon.source: Fluid.Utils.iconUrl("navigation/check")
+        FloatingActionButton {
+            icon.source: Utils.iconUrl("navigation/check")
             highlighted: true
             mini: false
         }
 
-        Fluid.FloatingActionButton {
-            icon.source: Fluid.Utils.iconUrl("device/airplanemode_active")
+        FloatingActionButton {
+            icon.source: Utils.iconUrl("device/airplanemode_active")
             mini: true
         }
 
-        Fluid.FloatingActionButton {
-            icon.source: Fluid.Utils.iconUrl("navigation/check")
+        FloatingActionButton {
+            icon.source: Utils.iconUrl("navigation/check")
             highlighted: true
             mini: true
         }
@@ -51,31 +50,31 @@ Components.StyledPageTwoColumns {
     rightColumn: Column {
         anchors.centerIn: parent
 
-        Fluid.TitleLabel {
+        TitleLabel {
             text: qsTr("Disabled")
         }
 
-        Fluid.FloatingActionButton {
-            icon.source: Fluid.Utils.iconUrl("device/airplanemode_active")
+        FloatingActionButton {
+            icon.source: Utils.iconUrl("device/airplanemode_active")
             mini: false
             enabled: false
         }
 
-        Fluid.FloatingActionButton {
-            icon.source: Fluid.Utils.iconUrl("navigation/check")
+        FloatingActionButton {
+            icon.source: Utils.iconUrl("navigation/check")
             highlighted: true
             mini: false
             enabled: false
         }
 
-        Fluid.FloatingActionButton {
-            icon.source: Fluid.Utils.iconUrl("device/airplanemode_active")
+        FloatingActionButton {
+            icon.source: Utils.iconUrl("device/airplanemode_active")
             mini: true
             enabled: false
         }
 
-        Fluid.FloatingActionButton {
-            icon.source: Fluid.Utils.iconUrl("navigation/check")
+        FloatingActionButton {
+            icon.source: Utils.iconUrl("navigation/check")
             highlighted: true
             mini: true
             enabled: false

diff --git a/src/demo/qml/Pages/Controls/BottomSheetPage.qml b/src/demo/qml/Pages/Controls/BottomSheetPage.qml
@@ -1,5 +1,5 @@
 /*
- * This file is part of Fluid.
+ * This file is part of 
  *
  * Copyright (C) 2018 Pier Luigi Fiorini <[email protected]>
  *
@@ -13,30 +13,29 @@
  */
 
 import QtQuick
-import QtQuick.Controls
 import QtQuick.Controls.Material
 import Fluid as Fluid
 
 Item {
     Column {
         anchors.centerIn: parent
 
-        Button {
+        Fluid.Button {
             text: qsTr("List-style BottomSheet")
             onClicked: listBottomSheet.open()
         }
 
-        Button {
+        Fluid.Button {
             text: qsTr("Long List-style BottomSheet")
             onClicked: longListBottomSheet.open()
         }
 
-        Button {
+        Fluid.Button {
             text: qsTr("Grid-style BottomSheet")
             onClicked: gridBottomSheet.open()
         }
 
-        Button {
+        Fluid.Button {
             text: qsTr("Custom BottomSheet")
             onClicked: customBottomSheet.open()
         }
@@ -276,7 +275,7 @@ Item {
         Column {
             width: parent.width
 
-            Pane {
+            Fluid.Pane {
                 width: parent.width
                 padding: 16
 
@@ -296,7 +295,7 @@ Item {
                 Material.background: Material.color(Material.Yellow, Material.Shade800)
             }
 
-            Pane {
+            Fluid.Pane {
                 width: parent.width
                 implicitHeight: 100
                 padding: 16

diff --git a/src/demo/qml/Pages/Controls/CardPage.qml b/src/demo/qml/Pages/Controls/CardPage.qml
@@ -13,7 +13,6 @@
  */
 
 import QtQuick
-import QtQuick.Controls
 import Fluid
 import "../.." as Components