From f4953f7f54ccfda65f40f91d623360705f69e74a Mon Sep 17 00:00:00 2001 From: zhangkun Date: Tue, 20 May 2025 19:28:13 +0800 Subject: [PATCH] feat: add deepin logo support for community edition MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. Added deepin_logo.svg for community edition display 2. Modified logo loading logic to show different logos based on system edition (community vs uos) 3. Updated resource file and renamed logo.svg to uos_logo.svg for clarity 4. Applied changes to both CheckProgressWidget and UpdateProgressWidget feat: 添加社区版 deepin 徽标支持 1. 添加 deepin_logo.svg 用于社区版显示 2. 修改徽标加载逻辑，根据系统版本(社区版 vs uos)显示不同徽标 3. 更新资源文件并将 logo.svg 重命名为 uos_logo.svg 以提高清晰度 4. 修改同时应用于 CheckProgressWidget 和 UpdateProgressWidget pms: BUG-317201 --- src/dde-update/checksystemwidget.cpp | 7 ++++++- src/dde-update/img/deepin_logo.svg | 12 ++++++++++++ src/dde-update/img/{logo.svg => uos_logo.svg} | 0 src/dde-update/updateimages.qrc | 3 ++- src/dde-update/updatewidget.cpp | 6 +++++- 5 files changed, 25 insertions(+), 3 deletions(-) create mode 100644 src/dde-update/img/deepin_logo.svg rename src/dde-update/img/{logo.svg => uos_logo.svg} (100%) diff --git a/src/dde-update/checksystemwidget.cpp b/src/dde-update/checksystemwidget.cpp index 78b4c6df4..2714165dc 100644 --- a/src/dde-update/checksystemwidget.cpp +++ b/src/dde-update/checksystemwidget.cpp @@ -10,6 +10,7 @@ #include #include #include +#include #include #include @@ -51,7 +52,11 @@ CheckProgressWidget::CheckProgressWidget(QWidget *parent) if (UpdateModel::CSS_BeforeLogin == UpdateModel::instance()->checkSystemStage()) { m_logo = new QLabel(this); m_logo->setFixedSize(286, 57); - m_logo->setPixmap(DHiDPIHelper::loadNxPixmap(":img/logo.svg")); + + if (DSysInfo::uosEditionType() == DSysInfo::UosCommunity) + m_logo->setPixmap(DIcon::loadNxPixmap(":img/deepin_logo.svg")); + else + m_logo->setPixmap(DIcon::loadNxPixmap(":img/uos_logo.svg")); m_tip->setText(tr("The check is almost complete, thank you for your patience")); diff --git a/src/dde-update/img/deepin_logo.svg b/src/dde-update/img/deepin_logo.svg new file mode 100644 index 000000000..94a580f3f --- /dev/null +++ b/src/dde-update/img/deepin_logo.svg @@ -0,0 +1,12 @@ + + + 编组 + + + + + + + + + \ No newline at end of file diff --git a/src/dde-update/img/logo.svg b/src/dde-update/img/uos_logo.svg similarity index 100% rename from src/dde-update/img/logo.svg rename to src/dde-update/img/uos_logo.svg diff --git a/src/dde-update/updateimages.qrc b/src/dde-update/updateimages.qrc index 716da345c..7b56d8746 100644 --- a/src/dde-update/updateimages.qrc +++ b/src/dde-update/updateimages.qrc @@ -2,7 +2,8 @@ img/failed.svg img/success.svg - img/logo.svg + img/uos_logo.svg + img/deepin_logo.svg img/waiting_update/waiting_update_0.png img/waiting_update/waiting_update_1.png img/waiting_update/waiting_update_2.png diff --git a/src/dde-update/updatewidget.cpp b/src/dde-update/updatewidget.cpp index 824daad3a..d31d7564c 100644 --- a/src/dde-update/updatewidget.cpp +++ b/src/dde-update/updatewidget.cpp @@ -17,6 +17,7 @@ #include #include #include +#include DCORE_USE_NAMESPACE DWIDGET_USE_NAMESPACE @@ -117,7 +118,10 @@ UpdateProgressWidget::UpdateProgressWidget(QWidget *parent) , m_installBeginValue(0) { m_logo->setFixedSize(286, 57); - m_logo->setPixmap(DIcon::loadNxPixmap(":img/logo.svg")); + if (DSysInfo::uosEditionType() == DSysInfo::UosCommunity) + m_logo->setPixmap(DIcon::loadNxPixmap(":img/deepin_logo.svg")); + else + m_logo->setPixmap(DIcon::loadNxPixmap(":img/uos_logo.svg")); auto palette = m_tip->palette(); palette.setColor(QPalette::WindowText, Qt::white);