From 22a5953624433740bd8b71239c7dbca296e2455b Mon Sep 17 00:00:00 2001
From: cutefishd <cutefishos@foxmail.com>
Date: Fri, 9 Apr 2021 22:38:15 +0800
Subject: [PATCH] Update FishUI

---
 CMakeLists.txt   |  4 ++--
 README.md        |  2 +-
 qml/AppItem.qml  |  4 ++--
 qml/DockItem.qml | 12 ++++++------
 qml/main.qml     | 16 ++++++++--------
 5 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 985cbbd..56d595c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,7 +13,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(MeuiKit REQUIRED)
+find_package(FishUI REQUIRED)
 
 set(SRCS
     src/applicationitem.h
@@ -47,7 +47,7 @@ target_link_libraries(${PROJECT_NAME} PRIVATE
         Qt5::DBus
         Qt5::Svg
 
-        MeuiKit
+        FishUI
 
         KF5::WindowSystem
 )
diff --git a/README.md b/README.md
index df9481e..3aa1dfb 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@ CutefishOS application dock.
 sudo pacman -S gcc cmake qt5-base qt5-quickcontrols2 kwindowsystem
 ```
 
-You also need [`meuikit`](https://github.com/cyberos/meuikit) and [`libcyber-system`](https://github.com/cyberos/libcyber-system).
+You also need [`fishui`](https://github.com/cutefishos/fishui) and [`libcutefish`](https://github.com/cutefishos/libcutefish).
 
 ## Build and Install
 
diff --git a/qml/AppItem.qml b/qml/AppItem.qml
index 078e385..5a7130c 100644
--- a/qml/AppItem.qml
+++ b/qml/AppItem.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.12
 import QtQuick.Controls 2.12
 import Cutefish.Dock 1.0
-import MeuiKit 1.0 as Meui
+import FishUI 1.0 as FishUI
 
 DockItem {
     id: appItem
@@ -37,7 +37,7 @@ DockItem {
         updateGeometry()
     }
 
-    Meui.DesktopMenu {
+    FishUI.DesktopMenu {
         id: contextMenu
 
         MenuItem {
diff --git a/qml/DockItem.qml b/qml/DockItem.qml
index 44ca58f..61c9869 100644
--- a/qml/DockItem.qml
+++ b/qml/DockItem.qml
@@ -2,7 +2,7 @@ import QtQuick 2.12
 import QtQuick.Controls 2.12
 import QtGraphicalEffects 1.0
 import Cutefish.Dock 1.0
-import MeuiKit 1.0 as Meui
+import FishUI 1.0 as FishUI
 
 Item {
     id: control
@@ -53,7 +53,7 @@ Item {
         dragStarted = false
     }
 
-    Meui.IconItem {
+    FishUI.IconItem {
         id: icon
         anchors.centerIn: parent
         width: control.iconSize
@@ -122,14 +122,14 @@ Item {
                 popupTips.popupText = control.popupText
 
                 if (Settings.direction === DockSettings.Left)
-                    popupTips.position = Qt.point(root.width + Meui.Units.largeSpacing,
+                    popupTips.position = Qt.point(root.width + FishUI.Units.largeSpacing,
                                                   control.mapToGlobal(0, 0).y + (control.height / 2 - popupTips.height / 2))
                 else if (Settings.direction === DockSettings.Right)
-                    popupTips.position = Qt.point(control.mapToGlobal(0, 0).x - popupTips.width - Meui.Units.smallSpacing / 2,
+                    popupTips.position = Qt.point(control.mapToGlobal(0, 0).x - popupTips.width - FishUI.Units.smallSpacing / 2,
                                                   control.mapToGlobal(0, 0).y + (control.height / 2 - popupTips.height / 2))
                 else
                     popupTips.position = Qt.point(control.mapToGlobal(0, 0).x + (control.width / 2 - popupTips.width / 2),
-                                                  control.mapToGlobal(0, 0).y - popupTips.height - Meui.Units.smallSpacing)
+                                                  control.mapToGlobal(0, 0).y - popupTips.height - FishUI.Units.smallSpacing)
 
                 popupTips.show()
             } else {
@@ -142,7 +142,7 @@ Item {
         id: activeLine
         width: !isBottom ? parent.width * 0.06 : (isActive ? parent.height * 0.4 : parent.height * 0.06)
         height: !isBottom ? (isActive ? parent.height * 0.4 : parent.height * 0.06) : parent.height * 0.06
-        color: Meui.Theme.textColor
+        color: FishUI.Theme.textColor
         radius: !isBottom ? width / 2 : height / 2
         visible: enableActivateDot && !dragStarted
         opacity: isActive ? 1 : 0.6
diff --git a/qml/main.qml b/qml/main.qml
index 02ffc22..db9ec87 100644
--- a/qml/main.qml
+++ b/qml/main.qml
@@ -4,7 +4,7 @@ import QtQuick.Layouts 1.12
 import QtGraphicalEffects 1.0
 
 import Cutefish.Dock 1.0
-import MeuiKit 1.0 as Meui
+import FishUI 1.0 as FishUI
 
 Item {
     id: root
@@ -18,14 +18,14 @@ Item {
         enabled: true
     }
 
-    Meui.WindowShadow {
+    FishUI.WindowShadow {
         view: mainWindow
         geometry: Qt.rect(root.x, root.y, root.width, root.height)
         strength: 0.5
         radius: _background.radius
     }
 
-    Meui.WindowBlur {
+    FishUI.WindowBlur {
         view: mainWindow
         geometry: Qt.rect(root.x, root.y, root.width, root.height)
         windowRadius: _background.radius
@@ -37,8 +37,8 @@ Item {
         id: _background
         anchors.fill: parent
         radius: windowRadius
-        color: Meui.Theme.backgroundColor
-        opacity: Meui.Theme.darkMode ? 0.3 : 0.4
+        color: FishUI.Theme.backgroundColor
+        opacity: FishUI.Theme.darkMode ? 0.3 : 0.4
 
         Behavior on opacity {
             NumberAnimation {
@@ -78,10 +78,10 @@ Item {
         smooth: true
     }
 
-    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
     }
 
     GridLayout {