From fbfffb21f24b9f8889e7fa55841aa81752698477 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=A6=8C=EA=A6=AB=EA=A6=B6=EA=A6=8F=EA=A7=80=EA=A6=A6?= =?UTF-8?q?=EA=A6=BF=EA=A6=A7=EA=A6=AE=EA=A6=91=EA=A6=A9=EA=A6=AD=EA=A7=80?= Date: Thu, 16 Feb 2023 17:20:20 +0800 Subject: Header is UI only & is removed from flickables Qeduport user should use a page and set its header to Header --- Checkout.ui.qml | 6 ---- CourseDetailClassic.ui.qml | 7 ---- Header.qml | 81 ---------------------------------------------- Header.ui.qml | 80 +++++++++++++++++++++++++++++++++++++++++++++ HomeDefault.ui.qml | 6 ---- 5 files changed, 80 insertions(+), 100 deletions(-) delete mode 100644 Header.qml create mode 100644 Header.ui.qml diff --git a/Checkout.ui.qml b/Checkout.ui.qml index 46b4880..7545610 100644 --- a/Checkout.ui.qml +++ b/Checkout.ui.qml @@ -3,7 +3,6 @@ import QtQuick.Controls 2.15 import QtQuick.Layouts 1.15 Flickable { - property alias header: header property alias checkoutAlert: alert property alias checkoutLogin: login property alias checkoutName: name @@ -27,11 +26,6 @@ Flickable { right: parent.right } - Header { - id: header - Layout.fillWidth: true - } - GridLayout { columns: width < 1200 ? 1 : 2 rows: width < 1200 ? 2 : 1 diff --git a/CourseDetailClassic.ui.qml b/CourseDetailClassic.ui.qml index 08cf027..6223f7f 100644 --- a/CourseDetailClassic.ui.qml +++ b/CourseDetailClassic.ui.qml @@ -4,8 +4,6 @@ import QtQuick.Layouts 1.15 import QtGraphicalEffects 1.15 Flickable { - id: flickable - property alias header: header property alias introBadge: introBadge property alias introTitleHeader: introTitleHeader property alias introTitleParagraph: introTitleParagraph @@ -31,11 +29,6 @@ Flickable { right: parent.right } - Header { - id: header - Layout.fillWidth: true - } - FontLoader { id: heebo source: "Heebo/Heebo-Bold.ttf" diff --git a/Header.qml b/Header.qml deleted file mode 100644 index 395d713..0000000 --- a/Header.qml +++ /dev/null @@ -1,81 +0,0 @@ -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import QtQuick.Layouts 1.15 - -ToolBar { - property alias logo: logo - property alias toolButton: toolButton - property alias optionsMenu: optionsMenu - property alias optionProfile: profile - property alias optionSettings: settings - property alias optionHelp: help - property alias optionSign: sign - property bool doesntEmbed: Qt.platform.os === "android" - || Qt.platform.os === "linux" - || Qt.platform.os === "osx" - || Qt.platform.os === "unix" - || Qt.platform.os === "windows" - - background: Rectangle { - implicitHeight: 64 - } - - FontLoader { - id: roboto - source: doesntEmbed ? "" : "Roboto/Roboto-Medium.ttf" - } - - Item { - anchors.fill: parent - - ToolButton { - id: logo - anchors.left: parent.left - icon.source: "https://eduport.webestica.com/assets/images/logo.svg" - icon.width: 115 - background: Rectangle { - implicitHeight: 64 - } - } - - ToolButton { - id: toolButton - anchors.right: parent.right - icon.source: "https://eduport.webestica.com/assets/images/avatar/01.jpg" - icon.color: "transparent" - background: Rectangle { - implicitHeight: 64 - } - onClicked: optionsMenu.open() - - Menu { - id: optionsMenu - y: parent.height - Action { - id: profile - text: qsTr("Edit Profile") - } - Action { - id: settings - text: qsTr("Account Settings") - } - Action { - id: help - text: qsTr("Help") - } - Action { - id: sign - text: qsTr("Sign Out") - } - delegate: MenuItem { - font { - family: doesntEmbed ? "Roboto" - : roboto.name - pixelSize: 15 - weight: Font.Medium - } - } - } - } - } -} diff --git a/Header.ui.qml b/Header.ui.qml new file mode 100644 index 0000000..776add4 --- /dev/null +++ b/Header.ui.qml @@ -0,0 +1,80 @@ +import QtQuick 2.15 +import QtQuick.Controls 2.15 +import QtQuick.Layouts 1.15 + +ToolBar { + property alias logo: logo + property alias toolButton: toolButton + property alias optionsMenu: optionsMenu + property alias optionProfile: profile + property alias optionSettings: settings + property alias optionHelp: help + property alias optionSign: sign + property bool doesntEmbed: Qt.platform.os === "android" + || Qt.platform.os === "linux" + || Qt.platform.os === "osx" + || Qt.platform.os === "unix" + || Qt.platform.os === "windows" + + background: Rectangle { + implicitHeight: 64 + } + + FontLoader { + id: roboto + source: doesntEmbed ? "" : "Roboto/Roboto-Medium.ttf" + } + + Item { + anchors.fill: parent + + ToolButton { + id: logo + anchors.left: parent.left + icon.source: "https://eduport.webestica.com/assets/images/logo.svg" + icon.width: 115 + background: Rectangle { + implicitHeight: 64 + } + } + + ToolButton { + id: toolButton + anchors.right: parent.right + icon.source: "https://eduport.webestica.com/assets/images/avatar/01.jpg" + icon.color: "transparent" + background: Rectangle { + implicitHeight: 64 + } + + Menu { + id: optionsMenu + y: parent.height + Action { + id: profile + text: qsTr("Edit Profile") + } + Action { + id: settings + text: qsTr("Account Settings") + } + Action { + id: help + text: qsTr("Help") + } + Action { + id: sign + text: qsTr("Sign Out") + } + delegate: MenuItem { + font { + family: doesntEmbed ? "Roboto" + : roboto.name + pixelSize: 15 + weight: Font.Medium + } + } + } + } + } +} diff --git a/HomeDefault.ui.qml b/HomeDefault.ui.qml index 3f2777b..be58d58 100644 --- a/HomeDefault.ui.qml +++ b/HomeDefault.ui.qml @@ -3,7 +3,6 @@ import QtQuick.Controls 2.15 import QtQuick.Layouts 1.15 Flickable { - property alias header: header property alias counter: counter property alias popular: popular property alias getStarted: getStarted @@ -22,11 +21,6 @@ Flickable { right: parent.right } - Header { - id: header - Layout.fillWidth: true - } - Item { implicitHeight: banner.height + counter.height + popular.height -- cgit v1.2.3