From 05d1f4d919d9ac0cb710744a33fa83e5250db85f Mon Sep 17 00:00:00 2001 From: tsic404 Date: Mon, 13 May 2024 18:13:49 +0800 Subject: [PATCH 1/2] fix: onboard has same icon with fcitx log: as title issue: https://github.com/linuxdeepin/developer-center/issues/8557 --- .../frame/package/icons/onboard-symbolic.dci | Bin 0 -> 1478 bytes .../dock/tray/plugins/onboard/CMakeLists.txt | 2 +- .../onboard/icon/keyboard-symbolic-dark.svg | 7 ------ .../onboard/icon/keyboard-symbolic.svg | 7 ------ panels/dock/tray/plugins/onboard/onboard.qrc | 6 ------ .../dock/tray/plugins/onboard/onboarditem.cpp | 20 ++---------------- 6 files changed, 3 insertions(+), 39 deletions(-) create mode 100644 panels/dock/tray/frame/package/icons/onboard-symbolic.dci delete mode 100644 panels/dock/tray/plugins/onboard/icon/keyboard-symbolic-dark.svg delete mode 100644 panels/dock/tray/plugins/onboard/icon/keyboard-symbolic.svg delete mode 100644 panels/dock/tray/plugins/onboard/onboard.qrc diff --git a/panels/dock/tray/frame/package/icons/onboard-symbolic.dci b/panels/dock/tray/frame/package/icons/onboard-symbolic.dci new file mode 100644 index 0000000000000000000000000000000000000000..fc4f55e4a4e38cb62a15002c69a7250f62f473eb GIT binary patch literal 1478 zcmZ>9_GDmWVqjo0G-IFylmg8F0j9kCqTIwBy_CeFY={VH%{fURHY#Uq{;tDq=1}NCc@mVo-F}2Lj zx;^db!Mol&Ocj_|bCOe&J~PNLO>kr`h~QLsZNJFB^S}GO`^P)}X&2qzHu1vkdHv+PVW4bvRY4at@pLvE{qHS8I9{Q literal 0 HcmV?d00001 diff --git a/panels/dock/tray/plugins/onboard/CMakeLists.txt b/panels/dock/tray/plugins/onboard/CMakeLists.txt index 7cf697d09..5e69f0146 100644 --- a/panels/dock/tray/plugins/onboard/CMakeLists.txt +++ b/panels/dock/tray/plugins/onboard/CMakeLists.txt @@ -20,7 +20,7 @@ find_package(Dtk6Gui REQUIRED) find_package(Dtk6Widget REQUIRED) add_definitions("${QT_DEFINITIONS} -DQT_PLUGIN") -add_library(${PLUGIN_NAME} SHARED ${SRCS} onboard.qrc) +add_library(${PLUGIN_NAME} SHARED ${SRCS}) set_target_properties(${PLUGIN_NAME} PROPERTIES LIBRARY_OUTPUT_DIRECTORY ../) target_include_directories(${PLUGIN_NAME} PUBLIC ${Qt6DBus_INCLUDE_DIRS} diff --git a/panels/dock/tray/plugins/onboard/icon/keyboard-symbolic-dark.svg b/panels/dock/tray/plugins/onboard/icon/keyboard-symbolic-dark.svg deleted file mode 100644 index 1f42f65fb..000000000 --- a/panels/dock/tray/plugins/onboard/icon/keyboard-symbolic-dark.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - input-keyboard - - - - \ No newline at end of file diff --git a/panels/dock/tray/plugins/onboard/icon/keyboard-symbolic.svg b/panels/dock/tray/plugins/onboard/icon/keyboard-symbolic.svg deleted file mode 100644 index 1024d4064..000000000 --- a/panels/dock/tray/plugins/onboard/icon/keyboard-symbolic.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - input-keyboard-dark - - - - \ No newline at end of file diff --git a/panels/dock/tray/plugins/onboard/onboard.qrc b/panels/dock/tray/plugins/onboard/onboard.qrc deleted file mode 100644 index 8747d5121..000000000 --- a/panels/dock/tray/plugins/onboard/onboard.qrc +++ /dev/null @@ -1,6 +0,0 @@ - - - icon/keyboard-symbolic-dark.svg - icon/keyboard-symbolic.svg - - diff --git a/panels/dock/tray/plugins/onboard/onboarditem.cpp b/panels/dock/tray/plugins/onboard/onboarditem.cpp index 6f3612922..ee684e366 100644 --- a/panels/dock/tray/plugins/onboard/onboarditem.cpp +++ b/panels/dock/tray/plugins/onboard/onboarditem.cpp @@ -31,15 +31,7 @@ OnboardItem::OnboardItem(QWidget *parent) QIcon OnboardItem::iconPixmap(QSize size, DGuiApplicationHelper::ColorType themeType) const { - QString iconName; - if (std::min(width(), height()) <= PLUGIN_BACKGROUND_MIN_SIZE - || themeType == DGuiApplicationHelper::LightType) { - iconName = ":/icons/icon/keyboard-symbolic.svg"; - } else { - iconName = ":/icons/icon/keyboard-symbolic-dark.svg"; - } - - return QIcon(iconName); + return QIcon::fromTheme("onboard-symbolic"); } void OnboardItem::paintEvent(QPaintEvent *e) @@ -88,15 +80,7 @@ void OnboardItem::paintEvent(QPaintEvent *e) painter.fillPath(path, color); } - QString iconName; - if (std::min(width(), height()) <= PLUGIN_BACKGROUND_MIN_SIZE - || DGuiApplicationHelper::instance()->themeType() == DGuiApplicationHelper::LightType) { - iconName = ":/icons/icon/keyboard-symbolic.svg"; - } else { - iconName = ":/icons/icon/keyboard-symbolic-dark.svg"; - } - - const QPixmap &pixmap = loadSvg(iconName, QSize(PLUGIN_ICON_MAX_SIZE, PLUGIN_ICON_MAX_SIZE)); + const QPixmap &pixmap = QIcon::fromTheme("onboard-symbolic").pixmap(PLUGIN_ICON_MAX_SIZE, PLUGIN_ICON_MAX_SIZE); painter.setOpacity(1); const QRectF &rf = QRectF(rect()); const QRectF &rfp = QRectF(pixmap.rect()); From de2088db94375f322ed85179c4232a0401526b2f Mon Sep 17 00:00:00 2001 From: tsic404 Date: Mon, 13 May 2024 18:19:55 +0800 Subject: [PATCH 2/2] chore: bump version 0.0.20 bump version 0.0.20 log: as title --- debian/changelog | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/debian/changelog b/debian/changelog index 50c15873b..01cd3b686 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +dde-shell (0.0.20) unstable; urgency=medium + + * fix: brightness-popup's setting button no blur effect and txt color has error + Thanks to ZhaoYingZhen(Issue: https://github.com/linuxdeepin/developer-center/issues/8470)(Influence: brightness-popup's setting button) + * fix: tray plugin mouse right click cause dock crash + Thanks to ZhaoYingZhen(Issue: https://github.com/linuxdeepin/developer-center/issues/8506)(Influence: tray plugin menu display) + * fix: onboard has same icon with fcitx(issue: #8557) + * chore: bump version 0.0.20 + + -- tsic404 Tue, 14 May 2024 10:20:00 +0800 + dde-shell (0.0.19) unstable; urgency=medium * feat: remove uos-ai plugin when uos ai uninstalled