From 9e716c76d6b1b49ec5d12a256e0811b6d3f8b7f0 Mon Sep 17 00:00:00 2001 From: cutefishd Date: Sat, 3 Apr 2021 16:01:38 +0800 Subject: [PATCH] Update text color --- debian/control | 1 + src/CMakeLists.txt | 1 + src/controls/Theme.qml | 4 ++-- src/controls/qmldir | 9 +++++++-- 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/debian/control b/debian/control index dcc8c09..15283ce 100644 --- a/debian/control +++ b/debian/control @@ -8,6 +8,7 @@ Build-Depends: cmake, libkf5windowsystem-dev, libqt5x11extras5-dev, qtbase5-dev, + qtbase5-private-dev, qtdeclarative5-dev, qtquickcontrols2-5-dev, qttools5-dev, diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 1ab7321..1925c04 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -29,6 +29,7 @@ target_link_libraries (${TARGET} Qt5::Qml Qt5::Quick Qt5::QuickControls2 + Qt5::GuiPrivate Qt5::X11Extras KF5::WindowSystem ) diff --git a/src/controls/Theme.qml b/src/controls/Theme.qml index 4a63516..858138f 100644 --- a/src/controls/Theme.qml +++ b/src/controls/Theme.qml @@ -20,8 +20,8 @@ QtObject { property color backgroundColor: darkMode ? "#3B3B3D" : "#FFFFFF" property color secondBackgroundColor: darkMode ? "#2E2E2E" : "#F5F5F5" - property color textColor: darkMode ? "#FFFFFF" : "#171A20" - property color disabledTextColor: darkMode ? "#888888" : "#5c5c5c" + property color textColor: darkMode ? "#FFFFFF" : "#333338" + property color disabledTextColor: darkMode ? "#888888" : "#64646E" property color highlightColor: MeuiKitCore.ThemeManager.accentColor property color highlightedTextColor: darkMode ? "#FFFFFF" : "#FFFFFF" diff --git a/src/controls/qmldir b/src/controls/qmldir index b55d8d6..e25f44a 100644 --- a/src/controls/qmldir +++ b/src/controls/qmldir @@ -1,7 +1,7 @@ module MeuiKit plugin MeuiKit classname MeuiKit -depends QtQuick.Controls 2.13 +depends QtQuick.Controls 2.12 depends QtQuick.Controls.Private 2.10 depends QtQuick.Controls 2.10 depends QtGraphicalEffects 1.0 @@ -12,4 +12,9 @@ typeinfo plugins.qmltypes singleton Theme 1.0 Theme.qml singleton Units 1.0 Units.qml -PopupTips 1.0 PopupTips.qml \ No newline at end of file +BusyIndicator 1.0 BusyIndicator.qml +Icon 1.0 Icon.qml +PopupTips 1.0 PopupTips.qml +RoundedRect 1.0 RoundedRect.qml +Window 1.0 Window.qml +WindowButton 1.0 WindowButton.qml