From a42fc41dc788cc9cee38cdbb2f314d9d871bfadc Mon Sep 17 00:00:00 2001 From: likehomedream Date: Mon, 11 Dec 2023 11:00:56 +0800 Subject: [PATCH] fix icon error --- src/fileProcess/filecheck.h | 1 + src/maininterface.cpp | 2 +- src/module/aboutdialog.cpp | 2 +- src/module/globalthemewidget.cpp | 4 ++-- src/module/iconwidgetfeature.cpp | 14 +++++++------- src/titlebar.cpp | 2 +- 6 files changed, 13 insertions(+), 12 deletions(-) diff --git a/src/fileProcess/filecheck.h b/src/fileProcess/filecheck.h index fe376c9..79bea4f 100644 --- a/src/fileProcess/filecheck.h +++ b/src/fileProcess/filecheck.h @@ -15,6 +15,7 @@ public: explicit FileCheck(QObject *parent = nullptr); static bool isLegalIconFile(const QString& filePath); static bool isLegalWallPaperFile(const QString& filePath, const QString& type); + static bool isLegalMP4File(const QString& filePath, const QString& type); signals: diff --git a/src/maininterface.cpp b/src/maininterface.cpp index 4313569..35fda5a 100644 --- a/src/maininterface.cpp +++ b/src/maininterface.cpp @@ -138,7 +138,7 @@ void MainInterface::init() FileProcess getInfo; info->getFileInfo(getInfo.FileSearch(FileProcess::g_date)); info->show(); - connect(info,&InfoCreateWidget::readytoBuild,this,&MainInterface::startCopy); +// connect(info,&InfoCreateWidget::readytoBuild,this,&MainInterface::startCopy); connect(info,&InfoCreateWidget::gohomesignals,this,[=](){ //发送返回主界面信号给mainwindow emit gohomesignals(); diff --git a/src/module/aboutdialog.cpp b/src/module/aboutdialog.cpp index b434882..6fdfda4 100644 --- a/src/module/aboutdialog.cpp +++ b/src/module/aboutdialog.cpp @@ -3,7 +3,7 @@ AboutDialog::AboutDialog(QWidget *parent) : kdk::KAboutDialog(parent) { - this->setAppIcon(QIcon::fromTheme("fretsonfire")); + this->setAppIcon(QIcon::fromTheme("kylin-theme-builder")); this->setAppName(tr("Kylin Theme Builder")); this->setAppVersion(this->getCurrentVersion()); this->setBodyText(tr("")); diff --git a/src/module/globalthemewidget.cpp b/src/module/globalthemewidget.cpp index f0f9fb6..d5abcef 100644 --- a/src/module/globalthemewidget.cpp +++ b/src/module/globalthemewidget.cpp @@ -1,4 +1,4 @@ -#include "globalthemewidget.h" +#include "globalthemewidget.h" #include "../fileProcess/filecheck.h" bool GlobalThemeWidget::g_themeChange; @@ -231,7 +231,7 @@ void GlobalThemeWidget::initWallPaperWidget() wallpaperbtn = new EditButton(cover); wallpaperbtn->setFixedSize(160,100); QLabel *tip = new QLabel(cover); - tip->setText("尺寸：3840*2160
大小：不超过 10 MB
格式：PNG"); + tip->setText("尺寸：3840*2160
大小：不超过 10 MB
格式：PNG\/JPG"); coverlayout->addWidget(wallpaperbtn); coverlayout->addWidget(tip); diff --git a/src/module/iconwidgetfeature.cpp b/src/module/iconwidgetfeature.cpp index 525904d..463988d 100644 --- a/src/module/iconwidgetfeature.cpp +++ b/src/module/iconwidgetfeature.cpp @@ -20,13 +20,13 @@ void TypeButton::paintEvent(QPaintEvent *event) { QPushButton::paintEvent(event); - if (isChecked()) { - QPainter painter(this); - QIcon icon = QIcon::fromTheme("kylin-settings-account"); - QPixmap pixmap = icon.pixmap(QSize(16, 16)); - QRect pixmapRect(rect().right() - pixmap.width(), (rect().height() - pixmap.height()) / 2, pixmap.width(), pixmap.height()); - painter.drawPixmap(pixmapRect, pixmap); - } +// if (isChecked()) { +// QPainter painter(this); +// QIcon icon = QIcon::fromTheme(""); +// QPixmap pixmap = icon.pixmap(QSize(16, 16)); +// QRect pixmapRect(rect().right() - pixmap.width(), (rect().height() - pixmap.height()) / 2, pixmap.width(), pixmap.height()); +// painter.drawPixmap(pixmapRect, pixmap); +// } } /** diff --git a/src/titlebar.cpp b/src/titlebar.cpp index dc2842b..1669aaa 100644 --- a/src/titlebar.cpp +++ b/src/titlebar.cpp @@ -19,7 +19,7 @@ TitleBar::TitleBar(QWidget *parent) : QWidget(parent) QLabel *iconlabel = new QLabel(this); iconlabel->setFixedSize(30, 30); - QIcon icon = QIcon::fromTheme("viewnior"); + QIcon icon = QIcon::fromTheme("kylin-theme-builder"); QIcon scaledIcon = icon.pixmap(QSize(30, 30)).scaled(QSize(30, 30), Qt::KeepAspectRatio, Qt::SmoothTransformation); QPixmap pixmap = scaledIcon.pixmap(QSize(30, 30)); iconlabel->setPixmap(pixmap);