From 5350a6d7ceab2b446a7be92e01b9d7964ee8fa4d Mon Sep 17 00:00:00 2001 From: talksik Date: Thu, 17 Apr 2025 08:23:31 -0700 Subject: [PATCH] chore: use default system qtquick controls style --- AppCaption.qml | 2 +- AppCard.qml | 2 +- AppComboBox.qml | 2 +- AppHeadline.qml | 2 +- AppLabel.qml | 2 +- AppLink.qml | 2 +- AppMenu.qml | 2 +- AppPrimaryButton.qml | 2 +- AppSubHeadline.qml | 2 +- AppText.qml | 2 +- AppTextField.qml | 2 +- AppWindow.qml | 2 +- gallery/Main.qml | 57 ++++++++++++++++++-------------------------- 13 files changed, 35 insertions(+), 46 deletions(-) diff --git a/AppCaption.qml b/AppCaption.qml index 44211b6..26669e3 100644 --- a/AppCaption.qml +++ b/AppCaption.qml @@ -1,5 +1,5 @@ import QtQuick -import QtQuick.Controls.Basic +import QtQuick.Controls Text { color: Theme.caption diff --git a/AppCard.qml b/AppCard.qml index c87ba38..30f8833 100644 --- a/AppCard.qml +++ b/AppCard.qml @@ -1,5 +1,5 @@ import QtQuick -import QtQuick.Controls.Basic +import QtQuick.Controls Item { id: root diff --git a/AppComboBox.qml b/AppComboBox.qml index 8ebce1c..31f2a5f 100644 --- a/AppComboBox.qml +++ b/AppComboBox.qml @@ -1,5 +1,5 @@ import QtQuick -import QtQuick.Controls.Basic +import QtQuick.Controls import QtQuick.Controls.impl // Needed for features like the Control.blend() function import QtQuick.Templates as T import DesignSystem diff --git a/AppHeadline.qml b/AppHeadline.qml index 6f9a0ac..65ccb33 100644 --- a/AppHeadline.qml +++ b/AppHeadline.qml @@ -1,5 +1,5 @@ import QtQuick -import QtQuick.Controls.Basic +import QtQuick.Controls Text { color: Theme.primaryText diff --git a/AppLabel.qml b/AppLabel.qml index 25c4c19..d1030dc 100644 --- a/AppLabel.qml +++ b/AppLabel.qml @@ -1,5 +1,5 @@ import QtQuick -import QtQuick.Controls.Basic +import QtQuick.Controls Text { color: Theme.secondaryText diff --git a/AppLink.qml b/AppLink.qml index 7af3625..7bd6f45 100644 --- a/AppLink.qml +++ b/AppLink.qml @@ -1,5 +1,5 @@ import QtQuick -import QtQuick.Controls.Basic +import QtQuick.Controls Text { font.underline: true diff --git a/AppMenu.qml b/AppMenu.qml index 5d5e7e5..ea9f5a8 100644 --- a/AppMenu.qml +++ b/AppMenu.qml @@ -1,5 +1,5 @@ import QtQuick -import QtQuick.Controls.Basic +import QtQuick.Controls Menu { id: menu diff --git a/AppPrimaryButton.qml b/AppPrimaryButton.qml index 41fc2e4..c4d77f1 100644 --- a/AppPrimaryButton.qml +++ b/AppPrimaryButton.qml @@ -1,5 +1,5 @@ import QtQuick -import QtQuick.Controls.Basic +import QtQuick.Controls import QtQuick.Controls.impl // Needed for features like the Control.blend() function import DesignSystem diff --git a/AppSubHeadline.qml b/AppSubHeadline.qml index c9e5637..d6569f9 100644 --- a/AppSubHeadline.qml +++ b/AppSubHeadline.qml @@ -1,5 +1,5 @@ import QtQuick -import QtQuick.Controls.Basic +import QtQuick.Controls Text { color: Theme.secondaryText diff --git a/AppText.qml b/AppText.qml index 6d2b2a2..caa3981 100644 --- a/AppText.qml +++ b/AppText.qml @@ -1,5 +1,5 @@ import QtQuick -import QtQuick.Controls.Basic +import QtQuick.Controls Text { color: palette.text diff --git a/AppTextField.qml b/AppTextField.qml index 2b4681d..8674ec3 100644 --- a/AppTextField.qml +++ b/AppTextField.qml @@ -1,6 +1,6 @@ import QtQuick import DesignSystem -import QtQuick.Controls.Basic +import QtQuick.Controls import QtQuick.Controls.impl TextField { diff --git a/AppWindow.qml b/AppWindow.qml index 07b15ac..5ed2b30 100644 --- a/AppWindow.qml +++ b/AppWindow.qml @@ -1,5 +1,5 @@ import QtQuick -import QtQuick.Controls.Basic +import QtQuick.Controls ApplicationWindow { id: root diff --git a/gallery/Main.qml b/gallery/Main.qml index a326ec4..e03520a 100644 --- a/gallery/Main.qml +++ b/gallery/Main.qml @@ -3,7 +3,8 @@ import Qt.labs.platform import Gallery import DesignSystem import QtQuick.Layouts -import QtQuick.Controls.Basic +import QtQuick.Controls.Fusion +// import QtQuick.Controls.macOS import QtQuick.Dialogs AppWindow { @@ -76,7 +77,7 @@ AppWindow { text: "The document has been modified." } - AppComboBox { + ComboBox { model: ListModel { id: model ListElement { @@ -97,7 +98,7 @@ AppWindow { } } - AppTextField { + TextField { placeholderText: qsTr("Enter name") } @@ -119,41 +120,29 @@ AppWindow { AppWarning { Layout.fillWidth: true } - - AppMenu { - id: menu - - Action { - text: qsTr("Tool Bar") - checkable: true - } - Action { - text: qsTr("Side Bar") - checkable: true - checked: true - } - Action { - text: qsTr("Status Bar") - checkable: true - checked: true - } - - MenuSeparator {} - - Action { - text: "Hello" - } - - // NOTE: MenuItem is not recommended as it isn't consistent with the menu theming. Please use Action until a fix is made. - } AppIcon { source: "qrc:/live.flowy/imports/DesignSystem/icons/sidebar-duotone.svg" } - AppSecondaryButton { - onClicked: menu.open() - text: "Open menu" - } + Button { + id: fileButton + text: "File" + onClicked: menu.open() + Menu { + id: menu + y: fileButton.height + + MenuItem { + text: "New..." + } + MenuItem { + text: "Open..." + } + MenuItem { + text: "Save" + } + } + } Row { AppText { text: "duotone"