Skip to content

feat: add deepin logo support for community edition #77

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xionglinlin merged 1 commit into from
May 20, 2025
Merged

feat: add deepin logo support for community edition #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion src/dde-update/checksystemwidget.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,13 @@

#include <DFontSizeManager>
#include <DHiDPIHelper>
#include <DPaletteHelper>

Check warning on line 10 in src/dde-update/checksystemwidget.cpp

View workflow job for this annotation

GitHub Actions / cppcheck 

Include file: <DPaletteHelper> not found. Please note: Cppcheck does not need standard library headers to get proper results.
#include <DGuiApplicationHelper>

Check warning on line 11 in src/dde-update/checksystemwidget.cpp

View workflow job for this annotation

GitHub Actions / cppcheck 

Include file: <DGuiApplicationHelper> not found. Please note: Cppcheck does not need standard library headers to get proper results.
#include <DSysInfo>

Check warning on line 12 in src/dde-update/checksystemwidget.cpp

View workflow job for this annotation

GitHub Actions / cppcheck 

Include file: <DSysInfo> not found. Please note: Cppcheck does not need standard library headers to get proper results.
#include <DIcon>

Check warning on line 13 in src/dde-update/checksystemwidget.cpp

View workflow job for this annotation

GitHub Actions / cppcheck 

Include file: <DIcon> not found. Please note: Cppcheck does not need standard library headers to get proper results.

#include <QEvent>

Check warning on line 15 in src/dde-update/checksystemwidget.cpp

View workflow job for this annotation

GitHub Actions / cppcheck 

Include file: <QEvent> not found. Please note: Cppcheck does not need standard library headers to get proper results.
#include <QApplication>

Check warning on line 16 in src/dde-update/checksystemwidget.cpp

View workflow job for this annotation

GitHub Actions / cppcheck 

Include file: <QApplication> not found. Please note: Cppcheck does not need standard library headers to get proper results.
#include <QKeyEvent>

DWIDGET_USE_NAMESPACE
Expand Down Expand Up @@ -51,7 +52,11 @@
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"));

Expand Down
12 changes: 12 additions & 0 deletions src/dde-update/img/deepin_logo.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
0 src/dde-update/img/logo.svg → src/dde-update/img/uos_logo.svg
View file
Open in desktop
File renamed without changes
3 changes: 2 additions & 1 deletion src/dde-update/updateimages.qrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
<qresource prefix="/">
<file>img/failed.svg</file>
<file>img/success.svg</file>
<file>img/logo.svg</file>
<file>img/uos_logo.svg</file>
<file>img/deepin_logo.svg</file>
<file>img/waiting_update/waiting_update_0.png</file>
<file>img/waiting_update/waiting_update_1.png</file>
<file>img/waiting_update/waiting_update_2.png</file>
Expand Down
6 changes: 5 additions & 1 deletion src/dde-update/updatewidget.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,10 @@

#include <DFontSizeManager>
#include <QKeyEvent>
#include <DPaletteHelper>

Check warning on line 17 in src/dde-update/updatewidget.cpp

View workflow job for this annotation

GitHub Actions / cppcheck 

Include file: <DPaletteHelper> not found. Please note: Cppcheck does not need standard library headers to get proper results.
#include <DGuiApplicationHelper>

Check warning on line 18 in src/dde-update/updatewidget.cpp

View workflow job for this annotation

GitHub Actions / cppcheck 

Include file: <DGuiApplicationHelper> not found. Please note: Cppcheck does not need standard library headers to get proper results.
#include <DIcon>

Check warning on line 19 in src/dde-update/updatewidget.cpp

View workflow job for this annotation

GitHub Actions / cppcheck 

Include file: <DIcon> not found. Please note: Cppcheck does not need standard library headers to get proper results.
#include <DSysInfo>

Check warning on line 20 in src/dde-update/updatewidget.cpp

View workflow job for this annotation

GitHub Actions / cppcheck 

Include file: <DSysInfo> not found. Please note: Cppcheck does not need standard library headers to get proper results.

DCORE_USE_NAMESPACE
DWIDGET_USE_NAMESPACE
Expand Down Expand Up @@ -117,7 +118,10 @@
, 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);
Expand Down