diff --git a/aboutwindow.cpp b/aboutwindow.cpp index 52bdf7ccaa4e545a0beb91f71a367afa046b854a..c4c23ec2ce74a587bdbe677fd695932507fbadd0 100644 --- a/aboutwindow.cpp +++ b/aboutwindow.cpp @@ -6,6 +6,7 @@ #include #include #include +#include AboutWindow::AboutWindow(QWidget *parent) : QMainWindow(parent), @@ -32,7 +33,15 @@ AboutWindow::AboutWindow(QWidget *parent) : info += "

©2023～" + QDateTime::currentDateTime().toString("yyyy") + " gfdgd xi

\n"; ui->textBrowser->setHtml(info); - ui->m_logoShower->pixmap().setDevicePixelRatio(QGuiApplication::primaryScreen()->devicePixelRatio()); + // 修复图标有锯齿的问题 + // ui->m_logoShower->pixmap().setDevicePixelRatio(QGuiApplication::primaryScreen()->devicePixelRatio()); + QIcon svgIcon(":/icon/gxde-kernel-manager.svg"); + ui->m_logoShower->setPixmap(svgIcon.pixmap(QSize(128, 128))); + ui->m_logoShower->setCursor(Qt::PointingHandCursor); + + connect(ui->m_logoShower, &ClickableLabel::clicked, this, [this]() { + QIcon pngIcon(":/icon/icon1.png"); + ui->m_logoShower->setPixmap(pngIcon.pixmap(QSize(128, 128))); } AboutWindow::~AboutWindow() @@ -46,9 +55,9 @@ void AboutWindow::on_m_closeButton_clicked() } -void AboutWindow::on_m_logoShower_linkActivated(const QString &link) +/*void AboutWindow::on_m_logoShower_linkActivated(const QString &link) { ui->m_logoShower->setText("

"); ui->m_logoShower->pixmap().setDevicePixelRatio(QGuiApplication::primaryScreen()->devicePixelRatio()); -} +}*/ diff --git a/aboutwindow.h b/aboutwindow.h index 0da59e1634cd8b4cb30720cf583009929a1d40d1..40385518f214192aef4a7b98e8d7c7a63403612a 100644 --- a/aboutwindow.h +++ b/aboutwindow.h @@ -2,6 +2,27 @@ #define ABOUTWINDOW_H #include +#include +#include +#include + +// 处理鼠标点击 +class ClickableLabel : public QLabel +{ + Q_OBJECT +public: + using QLabel::QLabel; + +signals: + void clicked(); + +protected: + void mouseReleaseEvent(QMouseEvent *ev) override { + if (ev->button() == Qt::LeftButton) + emit clicked(); + QLabel::mouseReleaseEvent(ev); + } +}; namespace Ui { class AboutWindow; @@ -18,7 +39,7 @@ public: private slots: void on_m_closeButton_clicked(); - void on_m_logoShower_linkActivated(const QString &link); + // void on_m_logoShower_linkActivated(const QString &link); private: Ui::AboutWindow *ui; diff --git a/aboutwindow.ui b/aboutwindow.ui index 83f43b50e5e5e890eea77b4cc0019a49733fb876..4943c81f5804a1d217f18ecba23fd0748f115e98 100644 --- a/aboutwindow.ui +++ b/aboutwindow.ui @@ -20,7 +20,7 @@ - + <html><head/><body><p><a href='https://www.gxde.org'><img width=128 src=":/icon/gxde-kernel-manager.svg"/></a></p></body></html> @@ -70,6 +70,13 @@ + + + ClickableLabel + QLabel +
aboutwindow.h
+ + diff --git a/data/version b/data/version index f0bb29e76388856b273698ae6064b0380ce5e5d2..d0149fef743a8035720ed161412709e87702dcab 100644 --- a/data/version +++ b/data/version @@ -1 +1 @@ -1.3.0 +1.3.4 diff --git a/kernelinstaller.cpp b/kernelinstaller.cpp index ce3354a18e72fd16ecb281c2ff24959f981dec89..84a5b086372fb0fbef6c6bd2d4dc9efba7582f36 100644 --- a/kernelinstaller.cpp +++ b/kernelinstaller.cpp @@ -6,6 +6,9 @@ #include #include #include +#include +#include + #define MAX_TMP_NUM 1024 #define MIN_TMP_NUM 0 @@ -154,10 +157,13 @@ void KernelInstaller::CheckInstallerStatusTimer() // 安装完成 if(status == 0) { ui->m_status->setText(tr("Done")); - ui->m_icon->setText(""); + // 修复图标模糊的问题 + // ui->m_icon->setText(""); + ui->m_icon->setPixmap(QIcon(":/icon/dialog-ok.svg").pixmap(64, 64)); return; } - ui->m_icon->setText(""); + // ui->m_icon->setText(""); + ui->m_icon->setPixmap(QIcon(":/icon/dialog-error.svg").pixmap(64, 64)); ui->m_status->setText(tr("Something error, exit code: ") + QString::number(status)); }