Skip to content

Commit 93f805a

Browse files
mhduiyxionglinlin
authored andcommitted
feat: add deepin logo support for community edition
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
1 parent 19a62ef commit 93f805a

5 files changed

Lines changed: 25 additions & 3 deletions

File tree

src/dde-update/checksystemwidget.cpp

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
#include <DPaletteHelper>
1111
#include <DGuiApplicationHelper>
1212
#include <DSysInfo>
13+
#include <DIcon>
1314

1415
#include <QEvent>
1516
#include <QApplication>
@@ -51,7 +52,11 @@ CheckProgressWidget::CheckProgressWidget(QWidget *parent)
5152
if (UpdateModel::CSS_BeforeLogin == UpdateModel::instance()->checkSystemStage()) {
5253
m_logo = new QLabel(this);
5354
m_logo->setFixedSize(286, 57);
54-
m_logo->setPixmap(DHiDPIHelper::loadNxPixmap(":img/logo.svg"));
55+
56+
if (DSysInfo::uosEditionType() == DSysInfo::UosCommunity)
57+
m_logo->setPixmap(DIcon::loadNxPixmap(":img/deepin_logo.svg"));
58+
else
59+
m_logo->setPixmap(DIcon::loadNxPixmap(":img/uos_logo.svg"));
5560

5661
m_tip->setText(tr("The check is almost complete, thank you for your patience"));
5762

src/dde-update/img/deepin_logo.svg

Lines changed: 12 additions & 0 deletions
Loading

src/dde-update/updateimages.qrc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
<qresource prefix="/">
33
<file>img/failed.svg</file>
44
<file>img/success.svg</file>
5-
<file>img/logo.svg</file>
5+
<file>img/uos_logo.svg</file>
6+
<file>img/deepin_logo.svg</file>
67
<file>img/waiting_update/waiting_update_0.png</file>
78
<file>img/waiting_update/waiting_update_1.png</file>
89
<file>img/waiting_update/waiting_update_2.png</file>

src/dde-update/updatewidget.cpp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
#include <DPaletteHelper>
1818
#include <DGuiApplicationHelper>
1919
#include <DIcon>
20+
#include <DSysInfo>
2021

2122
DCORE_USE_NAMESPACE
2223
DWIDGET_USE_NAMESPACE
@@ -117,7 +118,10 @@ UpdateProgressWidget::UpdateProgressWidget(QWidget *parent)
117118
, m_installBeginValue(0)
118119
{
119120
m_logo->setFixedSize(286, 57);
120-
m_logo->setPixmap(DIcon::loadNxPixmap(":img/logo.svg"));
121+
if (DSysInfo::uosEditionType() == DSysInfo::UosCommunity)
122+
m_logo->setPixmap(DIcon::loadNxPixmap(":img/deepin_logo.svg"));
123+
else
124+
m_logo->setPixmap(DIcon::loadNxPixmap(":img/uos_logo.svg"));
121125

122126
auto palette = m_tip->palette();
123127
palette.setColor(QPalette::WindowText, Qt::white);

0 commit comments

Comments
 (0)