From 3aa47af18babdbb56dbf233594128d579bbffd13 Mon Sep 17 00:00:00 2001 From: cutefishd Date: Fri, 9 Apr 2021 22:33:16 +0800 Subject: [PATCH] Update FishUI --- CMakeLists.txt | 2 +- polkit-agent/CMakeLists.txt | 2 +- polkit-agent/main.qml | 14 +++++++------- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 50243db..934ece5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -12,7 +12,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON) set(QT Core Gui Widgets Quick QuickControls2 DBus X11Extras LinguistTools) find_package(Qt5 REQUIRED ${QT}) -find_package(MeuiKit REQUIRED) +find_package(FishUI REQUIRED) find_package(PkgConfig REQUIRED) find_package(ECM REQUIRED NO_MODULE) diff --git a/polkit-agent/CMakeLists.txt b/polkit-agent/CMakeLists.txt index 3731361..6788325 100644 --- a/polkit-agent/CMakeLists.txt +++ b/polkit-agent/CMakeLists.txt @@ -22,7 +22,7 @@ target_link_libraries(cutefish-polkit-agent Qt5::Quick Qt5::QuickControls2 - MeuiKit + FishUI ${POLKITQT-1_CORE_LIBRARY} ${POLKITQT-1_AGENT_LIBRARY} diff --git a/polkit-agent/main.qml b/polkit-agent/main.qml index 62fd4f6..0fe9835 100644 --- a/polkit-agent/main.qml +++ b/polkit-agent/main.qml @@ -1,7 +1,7 @@ import QtQuick 2.12 import QtQuick.Controls 2.5 import QtQuick.Layouts 1.3 -import MeuiKit 1.0 as Meui +import FishUI 1.0 as FishUI Rectangle { id: root @@ -9,12 +9,12 @@ Rectangle { width: 550 height: column.implicitHeight + radius * 4 - radius: Meui.Theme.bigRadius - color: Meui.Theme.backgroundColor + radius: FishUI.Theme.bigRadius + color: FishUI.Theme.backgroundColor border.color: Qt.rgba(0, 0, 0, 0.4) border.width: 1 - Meui.WindowShadow { + FishUI.WindowShadow { view: rootWindow geometry: Qt.rect(root.x, root.y, root.width, root.height) radius: root.radius @@ -35,7 +35,7 @@ Rectangle { } Item { - width: Meui.Units.smallSpacing + width: FishUI.Units.smallSpacing } ColumnLayout { @@ -50,7 +50,7 @@ Rectangle { } Item { - height: Meui.Units.smallSpacing + height: FishUI.Units.smallSpacing } TextField { @@ -74,7 +74,7 @@ Rectangle { } Item { - height: Meui.Units.smallSpacing + height: FishUI.Units.smallSpacing } RowLayout {