From fc4f2ddcc52144562223752bf75e0603779fc6c9 Mon Sep 17 00:00:00 2001 From: RigoLigoRLC Date: Tue, 6 Jul 2021 11:13:13 +0800 Subject: [PATCH] =?UTF-8?q?SpkMsgBox=E5=AF=B9=E8=AF=9D=E6=A1=86=E5=BC=B9?= =?UTF-8?q?=E5=87=BA=E6=97=B6=E5=9B=BA=E5=AE=9A=E5=A4=A7=E5=B0=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gui/spkmsgbox.cpp | 11 +++++++---- src/telemetry/collectid.cpp | 3 --- 2 files changed, 7 insertions(+), 7 deletions(-) delete mode 100644 src/telemetry/collectid.cpp diff --git a/gui/spkmsgbox.cpp b/gui/spkmsgbox.cpp index bb110ec..2178d41 100644 --- a/gui/spkmsgbox.cpp +++ b/gui/spkmsgbox.cpp @@ -35,23 +35,26 @@ int SpkMsgBox::StaticExec(QString msg, QString title, QMessageBox::Icon icon, if(icon) { wIcon = new QLabel; + QIcon icon_; switch(icon) { case QMessageBox::Critical: - wIcon->setPixmap(QIcon::fromTheme("dialog-error").pixmap(IconSize)); + icon_ = QIcon::fromTheme("dialog-error"); break; case QMessageBox::Warning: - wIcon->setPixmap(QIcon::fromTheme("dialog-warning").pixmap(IconSize)); + icon_ = QIcon::fromTheme("dialog-warning"); break; case QMessageBox::Information: - wIcon->setPixmap(QIcon::fromTheme("dialog-information").pixmap(IconSize)); + icon_ = QIcon::fromTheme("dialog-information"); break; case QMessageBox::Question: - wIcon->setPixmap(QIcon::fromTheme("dialog-question").pixmap(IconSize)); + icon_ = QIcon::fromTheme("dialog-question"); break; case QMessageBox::NoIcon: break; } + if(icon) + wIcon->setPixmap(icon_.pixmap(IconSize)); wMsg->addWidget(wIcon); } wMsgText->setText(msg); diff --git a/src/telemetry/collectid.cpp b/src/telemetry/collectid.cpp deleted file mode 100644 index 40d2365..0000000 --- a/src/telemetry/collectid.cpp +++ /dev/null @@ -1,3 +0,0 @@ - -#include -