From 8394b5729466ba7047720a48236b8ca18fd719f3 Mon Sep 17 00:00:00 2001 From: cutefishd Date: Fri, 9 Apr 2021 22:46:17 +0800 Subject: [PATCH] Update FishUI --- CMakeLists.txt | 4 +- qml/CardItem.qml | 40 ++++++++++---------- qml/ControlDialog.qml | 88 +++++++++++++++++++++---------------------- qml/IconButton.qml | 6 +-- qml/StandardItem.qml | 8 ++-- qml/main.qml | 50 ++++++++++++------------ 6 files changed, 98 insertions(+), 98 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9fbc3c4..49713da 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,7 +14,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON) find_package(Qt5 CONFIG REQUIRED Widgets DBus X11Extras Concurrent Svg LinguistTools QuickControls2) find_package(KF5WindowSystem REQUIRED) find_package(dbusmenu-qt5 REQUIRED) -find_package(MeuiKit REQUIRED) +find_package(FishUI REQUIRED) set(SRCS src/main.cpp @@ -64,7 +64,7 @@ target_link_libraries(cutefish-statusbar Qt5::DBus Qt5::Svg - MeuiKit + FishUI KF5::WindowSystem dbusmenu-qt5 diff --git a/qml/CardItem.qml b/qml/CardItem.qml index b5585a6..57fdf8f 100644 --- a/qml/CardItem.qml +++ b/qml/CardItem.qml @@ -2,7 +2,7 @@ import QtQuick 2.12 import QtQuick.Controls 2.12 import QtQuick.Layouts 1.12 import QtGraphicalEffects 1.0 -import MeuiKit 1.0 as Meui +import FishUI 1.0 as FishUI Item { id: control @@ -14,15 +14,15 @@ Item { signal clicked - property var hoverColor: Meui.Theme.darkMode ? Qt.lighter(Meui.Theme.secondBackgroundColor, 2) - : Qt.darker(Meui.Theme.secondBackgroundColor, 1.3) - property var pressedColor: Meui.Theme.darkMode ? Qt.lighter(Meui.Theme.secondBackgroundColor, 1.8) - : Qt.darker(Meui.Theme.secondBackgroundColor, 1.5) + property var hoverColor: FishUI.Theme.darkMode ? Qt.lighter(FishUI.Theme.secondBackgroundColor, 2) + : Qt.darker(FishUI.Theme.secondBackgroundColor, 1.3) + property var pressedColor: FishUI.Theme.darkMode ? Qt.lighter(FishUI.Theme.secondBackgroundColor, 1.8) + : Qt.darker(FishUI.Theme.secondBackgroundColor, 1.5) - property var highlightHoverColor: Meui.Theme.darkMode ? Qt.lighter(Meui.Theme.highlightColor, 1.1) - : Qt.darker(Meui.Theme.highlightColor, 1.1) - property var highlightPressedColor: Meui.Theme.darkMode ? Qt.lighter(Meui.Theme.highlightColor, 1.1) - : Qt.darker(Meui.Theme.highlightColor, 1.2) + property var highlightHoverColor: FishUI.Theme.darkMode ? Qt.lighter(FishUI.Theme.highlightColor, 1.1) + : Qt.darker(FishUI.Theme.highlightColor, 1.1) + property var highlightPressedColor: FishUI.Theme.darkMode ? Qt.lighter(FishUI.Theme.highlightColor, 1.1) + : Qt.darker(FishUI.Theme.highlightColor, 1.2) MouseArea { id: _mouseArea @@ -42,9 +42,9 @@ Item { } } - Meui.RoundedRect { + FishUI.RoundedRect { anchors.fill: parent - radius: Meui.Theme.bigRadius + radius: FishUI.Theme.bigRadius backgroundOpacity: control.checked ? 0.9 : 0.3 animationEnabled: false @@ -55,22 +55,22 @@ Item { else if (_mouseArea.containsMouse) return highlightHoverColor else - return Meui.Theme.highlightColor + return FishUI.Theme.highlightColor } else { if (_mouseArea.pressed) return pressedColor else if (_mouseArea.containsMouse) return hoverColor else - return Meui.Theme.secondBackgroundColor + return FishUI.Theme.secondBackgroundColor } } } ColumnLayout { anchors.fill: parent - anchors.leftMargin: Meui.Theme.smallRadius - anchors.rightMargin: Meui.Theme.smallRadius + anchors.leftMargin: FishUI.Theme.smallRadius + anchors.rightMargin: FishUI.Theme.smallRadius Image { id: _image @@ -79,12 +79,12 @@ Item { sourceSize: Qt.size(width, height) asynchronous: true Layout.alignment: Qt.AlignCenter - Layout.topMargin: Meui.Units.largeSpacing + Layout.topMargin: FishUI.Units.largeSpacing // ColorOverlay { // anchors.fill: _image // source: _image -// color: control.checked ? Meui.Theme.highlightedTextColor : Meui.Theme.disabledTextColor +// color: control.checked ? FishUI.Theme.highlightedTextColor : FishUI.Theme.disabledTextColor // } } @@ -94,7 +94,7 @@ Item { Label { id: _titleLabel - color: control.checked ? Meui.Theme.highlightedTextColor : Meui.Theme.textColor + color: control.checked ? FishUI.Theme.highlightedTextColor : FishUI.Theme.textColor Layout.preferredHeight: control.height * 0.15 Layout.alignment: Qt.AlignHCenter } @@ -105,12 +105,12 @@ Item { Label { id: _label - color: control.checked ? Meui.Theme.highlightedTextColor : Meui.Theme.textColor + color: control.checked ? FishUI.Theme.highlightedTextColor : FishUI.Theme.textColor elide: Label.ElideRight Layout.preferredHeight: control.height * 0.1 Layout.alignment: Qt.AlignHCenter // Layout.fillWidth: true - Layout.bottomMargin: Meui.Units.largeSpacing + Layout.bottomMargin: FishUI.Units.largeSpacing } Item { diff --git a/qml/ControlDialog.qml b/qml/ControlDialog.qml index 64a5853..ebfd795 100644 --- a/qml/ControlDialog.qml +++ b/qml/ControlDialog.qml @@ -6,19 +6,19 @@ import QtGraphicalEffects 1.0 import Cutefish.Accounts 1.0 as Accounts import Cutefish.StatusBar 1.0 -import MeuiKit 1.0 as Meui +import FishUI 1.0 as FishUI ControlCenterDialog { id: control width: 500 - height: _mainLayout.implicitHeight + Meui.Units.largeSpacing * 4 + height: _mainLayout.implicitHeight + FishUI.Units.largeSpacing * 4 minimumWidth: 500 maximumWidth: 500 - minimumHeight: _mainLayout.implicitHeight + Meui.Units.largeSpacing * 4 - maximumHeight: _mainLayout.implicitHeight + Meui.Units.largeSpacing * 4 + minimumHeight: _mainLayout.implicitHeight + FishUI.Units.largeSpacing * 4 + maximumHeight: _mainLayout.implicitHeight + FishUI.Units.largeSpacing * 4 - property var margin: 4 * Meui.Units.devicePixelRatio + property var margin: 4 * FishUI.Units.devicePixelRatio property point position: Qt.point(0, 0) onWidthChanged: adjustCorrectLocation() @@ -52,22 +52,22 @@ ControlCenterDialog { id: currentUser } - Meui.WindowBlur { + FishUI.WindowBlur { view: control geometry: Qt.rect(control.x, control.y, control.width, control.height) windowRadius: _background.radius enabled: true } - Meui.RoundedRect { + FishUI.RoundedRect { id: _background anchors.fill: parent radius: control.height * 0.05 - color: Meui.Theme.backgroundColor - backgroundOpacity: Meui.Theme.darkMode ? 0.3 : 0.4 + color: FishUI.Theme.backgroundColor + backgroundOpacity: FishUI.Theme.darkMode ? 0.3 : 0.4 } - Meui.WindowShadow { + FishUI.WindowShadow { view: control geometry: Qt.rect(control.x, control.y, control.width, control.height) radius: _background.radius @@ -76,11 +76,11 @@ ControlCenterDialog { ColumnLayout { id: _mainLayout anchors.fill: parent - anchors.leftMargin: Meui.Units.largeSpacing * 2 - anchors.topMargin: Meui.Units.largeSpacing * 1.5 - anchors.rightMargin: Meui.Units.largeSpacing * 2 - anchors.bottomMargin: Meui.Units.largeSpacing - spacing: Meui.Units.largeSpacing + anchors.leftMargin: FishUI.Units.largeSpacing * 2 + anchors.topMargin: FishUI.Units.largeSpacing * 1.5 + anchors.rightMargin: FishUI.Units.largeSpacing * 2 + anchors.bottomMargin: FishUI.Units.largeSpacing + spacing: FishUI.Units.largeSpacing Item { id: topItem @@ -90,7 +90,7 @@ ControlCenterDialog { RowLayout { id: topItemLayout anchors.fill: parent - spacing: Meui.Units.largeSpacing + spacing: FishUI.Units.largeSpacing Image { id: userIcon @@ -126,7 +126,7 @@ ControlCenterDialog { implicitWidth: topItem.height * 0.8 implicitHeight: topItem.height * 0.8 Layout.alignment: Qt.AlignTop - source: "qrc:/images/" + (Meui.Theme.darkMode ? "dark/" : "light/") + "settings.svg" + source: "qrc:/images/" + (FishUI.Theme.darkMode ? "dark/" : "light/") + "settings.svg" onLeftButtonClicked: { control.visible = false process.startDetached("cutefish-settings") @@ -138,7 +138,7 @@ ControlCenterDialog { implicitWidth: topItem.height * 0.8 implicitHeight: topItem.height * 0.8 Layout.alignment: Qt.AlignTop - source: "qrc:/images/" + (Meui.Theme.darkMode ? "dark/" : "light/") + "system-shutdown-symbolic.svg" + source: "qrc:/images/" + (FishUI.Theme.darkMode ? "dark/" : "light/") + "system-shutdown-symbolic.svg" onLeftButtonClicked: { control.visible = false process.startDetached("cutefish-shutdown") @@ -155,13 +155,13 @@ ControlCenterDialog { RowLayout { anchors.fill: parent - spacing: Meui.Units.largeSpacing + spacing: FishUI.Units.largeSpacing CardItem { id: wirelessItem Layout.fillHeight: true - Layout.preferredWidth: contentItem.width / 3 - Meui.Units.largeSpacing * 2 - icon: Meui.Theme.darkMode || checked ? "qrc:/images/dark/network-wireless-connected-100.svg" + Layout.preferredWidth: contentItem.width / 3 - FishUI.Units.largeSpacing * 2 + icon: FishUI.Theme.darkMode || checked ? "qrc:/images/dark/network-wireless-connected-100.svg" : "qrc:/images/light/network-wireless-connected-100.svg" visible: network.wirelessHardwareEnabled checked: network.wirelessEnabled @@ -175,8 +175,8 @@ ControlCenterDialog { CardItem { id: bluetoothItem Layout.fillHeight: true - Layout.preferredWidth: contentItem.width / 3 - Meui.Units.largeSpacing * 2 - icon: Meui.Theme.darkMode || checked ? "qrc:/images/dark/bluetooth-symbolic.svg" + Layout.preferredWidth: contentItem.width / 3 - FishUI.Units.largeSpacing * 2 + icon: FishUI.Theme.darkMode || checked ? "qrc:/images/dark/bluetooth-symbolic.svg" : "qrc:/images/light/bluetooth-symbolic.svg" checked: false label: qsTr("Bluetooth") @@ -186,13 +186,13 @@ ControlCenterDialog { CardItem { id: darkModeItem Layout.fillHeight: true - Layout.preferredWidth: contentItem.width / 3 - Meui.Units.largeSpacing * 2 - icon: Meui.Theme.darkMode || checked ? "qrc:/images/dark/dark-mode.svg" + Layout.preferredWidth: contentItem.width / 3 - FishUI.Units.largeSpacing * 2 + icon: FishUI.Theme.darkMode || checked ? "qrc:/images/dark/dark-mode.svg" : "qrc:/images/light/dark-mode.svg" - checked: Meui.Theme.darkMode + checked: FishUI.Theme.darkMode label: qsTr("Dark Mode") - text: Meui.Theme.darkMode ? qsTr("On") : qsTr("Off") - onClicked: appearance.switchDarkMode(!Meui.Theme.darkMode) + text: FishUI.Theme.darkMode ? qsTr("On") : qsTr("Off") + onClicked: appearance.switchDarkMode(!FishUI.Theme.darkMode) } Item { @@ -207,25 +207,25 @@ ControlCenterDialog { height: 50 visible: brightness.enabled - Meui.RoundedRect { + FishUI.RoundedRect { id: brightnessItemBg anchors.fill: parent anchors.margins: 0 - radius: Meui.Theme.bigRadius - color: Meui.Theme.backgroundColor + radius: FishUI.Theme.bigRadius + color: FishUI.Theme.backgroundColor backgroundOpacity: 0.3 } RowLayout { anchors.fill: brightnessItemBg - anchors.margins: Meui.Units.largeSpacing - spacing: Meui.Units.largeSpacing + anchors.margins: FishUI.Units.largeSpacing + spacing: FishUI.Units.largeSpacing Image { width: parent.height * 0.6 height: parent.height * 0.6 sourceSize: Qt.size(width, height) - source: "qrc:/images/" + (Meui.Theme.darkMode ? "dark" : "light") + "/brightness.svg" + source: "qrc:/images/" + (FishUI.Theme.darkMode ? "dark" : "light") + "/brightness.svg" } Slider { @@ -250,25 +250,25 @@ ControlCenterDialog { height: 50 visible: volume.isValid - Meui.RoundedRect { + FishUI.RoundedRect { id: volumeItemBg anchors.fill: parent anchors.margins: 0 - radius: Meui.Theme.bigRadius - color: Meui.Theme.backgroundColor + radius: FishUI.Theme.bigRadius + color: FishUI.Theme.backgroundColor backgroundOpacity: 0.3 } RowLayout { anchors.fill: volumeItemBg - anchors.margins: Meui.Units.largeSpacing - spacing: Meui.Units.largeSpacing + anchors.margins: FishUI.Units.largeSpacing + spacing: FishUI.Units.largeSpacing Image { width: parent.height * 0.6 height: parent.height * 0.6 sourceSize: Qt.size(width, height) - source: "qrc:/images/" + (Meui.Theme.darkMode ? "dark" : "light") + "/" + volume.iconName + ".svg" + source: "qrc:/images/" + (FishUI.Theme.darkMode ? "dark" : "light") + "/" + volume.iconName + ".svg" } Slider { @@ -310,8 +310,8 @@ ControlCenterDialog { } StandardItem { - width: batteryLayout.implicitWidth + Meui.Units.largeSpacing - height: batteryLayout.implicitHeight + Meui.Units.largeSpacing + width: batteryLayout.implicitWidth + FishUI.Units.largeSpacing + height: batteryLayout.implicitHeight + FishUI.Units.largeSpacing onClicked: { control.visible = false @@ -329,14 +329,14 @@ ControlCenterDialog { width: 22 height: 16 sourceSize: Qt.size(width, height) - source: "qrc:/images/" + (Meui.Theme.darkMode ? "dark/" : "light/") + battery.iconSource + source: "qrc:/images/" + (FishUI.Theme.darkMode ? "dark/" : "light/") + battery.iconSource asynchronous: true Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter } Label { text: battery.chargePercent + "%" - color: Meui.Theme.textColor + color: FishUI.Theme.textColor Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter } } diff --git a/qml/IconButton.qml b/qml/IconButton.qml index 06c6dc9..7ad880a 100644 --- a/qml/IconButton.qml +++ b/qml/IconButton.qml @@ -1,7 +1,7 @@ import QtQuick 2.12 import QtQuick.Controls 2.12 import QtQuick.Layouts 1.12 -import MeuiKit 1.0 as Meui +import FishUI 1.0 as FishUI Item { id: control @@ -35,9 +35,9 @@ Item { color: { if (mouseArea.containsMouse) { if (mouseArea.containsPress) - return (Meui.Theme.darkMode) ? Qt.rgba(255, 255, 255, 0.3) : Qt.rgba(0, 0, 0, 0.3) + return (FishUI.Theme.darkMode) ? Qt.rgba(255, 255, 255, 0.3) : Qt.rgba(0, 0, 0, 0.3) else - return (Meui.Theme.darkMode) ? Qt.rgba(255, 255, 255, 0.2) : Qt.rgba(0, 0, 0, 0.2) + return (FishUI.Theme.darkMode) ? Qt.rgba(255, 255, 255, 0.2) : Qt.rgba(0, 0, 0, 0.2) } return "transparent" diff --git a/qml/StandardItem.qml b/qml/StandardItem.qml index fabec38..aa4c91c 100644 --- a/qml/StandardItem.qml +++ b/qml/StandardItem.qml @@ -3,7 +3,7 @@ import QtQuick.Controls 2.12 import QtQuick.Layouts 1.12 import QtGraphicalEffects 1.0 -import MeuiKit 1.0 as Meui +import FishUI 1.0 as FishUI import Cutefish.StatusBar 1.0 Item { @@ -45,14 +45,14 @@ Item { Rectangle { anchors.fill: parent - radius: Meui.Theme.smallRadius + radius: FishUI.Theme.smallRadius color: { if (_mouseArea.containsMouse) { if (_mouseArea.containsPress) - return (Meui.Theme.darkMode) ? Qt.rgba(255, 255, 255, 0.3) : Qt.rgba(0, 0, 0, 0.2) + return (FishUI.Theme.darkMode) ? Qt.rgba(255, 255, 255, 0.3) : Qt.rgba(0, 0, 0, 0.2) else - return (Meui.Theme.darkMode) ? Qt.rgba(255, 255, 255, 0.2) : Qt.rgba(0, 0, 0, 0.1) + return (FishUI.Theme.darkMode) ? Qt.rgba(255, 255, 255, 0.2) : Qt.rgba(0, 0, 0, 0.1) } return "transparent" diff --git a/qml/main.qml b/qml/main.qml index 0e2ec03..b779a6f 100644 --- a/qml/main.qml +++ b/qml/main.qml @@ -4,7 +4,7 @@ import QtQuick.Controls 2.12 import Cutefish.StatusBar 1.0 import Cutefish.NetworkManagement 1.0 as NM -import MeuiKit 1.0 as Meui +import FishUI 1.0 as FishUI Item { id: rootItem @@ -14,7 +14,7 @@ Item { Rectangle { id: background anchors.fill: parent - color: Meui.Theme.backgroundColor + color: FishUI.Theme.backgroundColor opacity: 0.6 Behavior on color { @@ -25,13 +25,13 @@ Item { } } - Meui.PopupTips { + FishUI.PopupTips { id: popupTips - backgroundColor: Meui.Theme.backgroundColor - backgroundOpacity: Meui.Theme.darkMode ? 0.3 : 0.4 + backgroundColor: FishUI.Theme.backgroundColor + backgroundOpacity: FishUI.Theme.darkMode ? 0.3 : 0.4 } - Meui.DesktopMenu { + FishUI.DesktopMenu { id: acticityMenu MenuItem { @@ -42,14 +42,14 @@ Item { RowLayout { anchors.fill: parent - anchors.leftMargin: Meui.Units.smallSpacing - anchors.rightMargin: Meui.Units.smallSpacing + anchors.leftMargin: FishUI.Units.smallSpacing + anchors.rightMargin: FishUI.Units.smallSpacing spacing: 0 StandardItem { id: acticityItem Layout.fillHeight: true - Layout.preferredWidth: acticityLayout.implicitWidth + Meui.Units.largeSpacing + Layout.preferredWidth: acticityLayout.implicitWidth + FishUI.Units.largeSpacing visible: acticityLabel.text onClicked: acticityMenu.open() @@ -57,11 +57,11 @@ Item { RowLayout { id: acticityLayout anchors.fill: parent - anchors.leftMargin: Meui.Units.smallSpacing - anchors.rightMargin: Meui.Units.smallSpacing - spacing: Meui.Units.largeSpacing + anchors.leftMargin: FishUI.Units.smallSpacing + anchors.rightMargin: FishUI.Units.smallSpacing + spacing: FishUI.Units.largeSpacing - Meui.IconItem { + FishUI.IconItem { id: acticityIcon width: 22 height: 22 @@ -91,7 +91,7 @@ Item { // width: 16 // height: 16 // sourceSize: Qt.size(width, height) -// source: "qrc:/images/" + (Meui.Theme.darkMode ? "dark/down.svg" : "light/down.svg") +// source: "qrc:/images/" + (FishUI.Theme.darkMode ? "dark/down.svg" : "light/down.svg") // } } } @@ -110,7 +110,7 @@ Item { spacing: 0 property var itemSize: rootItem.height * 0.8 - property var itemWidth: itemSize + Meui.Units.largeSpacing + property var itemWidth: itemSize + FishUI.Units.largeSpacing Layout.fillHeight: true Layout.preferredWidth: itemWidth * count @@ -123,7 +123,7 @@ Item { width: trayView.itemWidth height: ListView.view.height - property bool darkMode: Meui.Theme.darkMode + property bool darkMode: FishUI.Theme.darkMode onDarkModeChanged: updateTimer.restart() Timer { @@ -132,7 +132,7 @@ Item { onTriggered: iconItem.updateIcon() } - Meui.IconItem { + FishUI.IconItem { id: iconItem anchors.centerIn: parent width: rootItem.iconSize @@ -150,7 +150,7 @@ Item { id: controler Layout.fillHeight: true - Layout.preferredWidth: _controlerLayout.implicitWidth + Meui.Units.largeSpacing + Layout.preferredWidth: _controlerLayout.implicitWidth + FishUI.Units.largeSpacing onClicked: { if (controlDialog.visible) @@ -166,15 +166,15 @@ Item { RowLayout { id: _controlerLayout anchors.fill: parent - anchors.leftMargin: Meui.Units.smallSpacing - anchors.rightMargin: Meui.Units.smallSpacing + anchors.leftMargin: FishUI.Units.smallSpacing + anchors.rightMargin: FishUI.Units.smallSpacing - spacing: Meui.Units.largeSpacing + spacing: FishUI.Units.largeSpacing Image { id: volumeIcon visible: volume.isValid && status === Image.Ready - source: "qrc:/images/" + (Meui.Theme.darkMode ? "dark/" : "light/") + volume.iconName + ".svg" + source: "qrc:/images/" + (FishUI.Theme.darkMode ? "dark/" : "light/") + volume.iconName + ".svg" width: rootItem.iconSize height: width sourceSize: Qt.size(width, height) @@ -187,7 +187,7 @@ Item { width: rootItem.iconSize height: width sourceSize: Qt.size(width, height) - source: network.wirelessIconName ? "qrc:/images/" + (Meui.Theme.darkMode ? "dark/" : "light/") + network.wirelessIconName + ".svg" : "" + source: network.wirelessIconName ? "qrc:/images/" + (FishUI.Theme.darkMode ? "dark/" : "light/") + network.wirelessIconName + ".svg" : "" asynchronous: true Layout.alignment: Qt.AlignCenter visible: network.enabled && @@ -210,7 +210,7 @@ Item { height: rootItem.iconSize width: height + 6 sourceSize: Qt.size(width, height) - source: "qrc:/images/" + (Meui.Theme.darkMode ? "dark/" : "light/") + battery.iconSource + source: "qrc:/images/" + (FishUI.Theme.darkMode ? "dark/" : "light/") + battery.iconSource Layout.alignment: Qt.AlignCenter asynchronous: true } @@ -221,7 +221,7 @@ Item { // height: rootItem.iconSize + 2 // width: height // sourceSize: Qt.size(width, height) -// source: "qrc:/images/" + (Meui.Theme.darkMode ? "dark/" : "light/") + "system-shutdown-symbolic.svg" +// source: "qrc:/images/" + (FishUI.Theme.darkMode ? "dark/" : "light/") + "system-shutdown-symbolic.svg" // Layout.alignment: Qt.AlignCenter // asynchronous: true // }