!74 fix icon error
Merge pull request !74 from likehomedream/plymouthshow
This commit is contained in:
commit
bc1874b910
|
@ -15,6 +15,7 @@ public:
|
||||||
explicit FileCheck(QObject *parent = nullptr);
|
explicit FileCheck(QObject *parent = nullptr);
|
||||||
static bool isLegalIconFile(const QString& filePath);
|
static bool isLegalIconFile(const QString& filePath);
|
||||||
static bool isLegalWallPaperFile(const QString& filePath, const QString& type);
|
static bool isLegalWallPaperFile(const QString& filePath, const QString& type);
|
||||||
|
static bool isLegalMP4File(const QString& filePath, const QString& type);
|
||||||
|
|
||||||
signals:
|
signals:
|
||||||
|
|
||||||
|
|
|
@ -138,7 +138,7 @@ void MainInterface::init()
|
||||||
FileProcess getInfo;
|
FileProcess getInfo;
|
||||||
info->getFileInfo(getInfo.FileSearch(FileProcess::g_date));
|
info->getFileInfo(getInfo.FileSearch(FileProcess::g_date));
|
||||||
info->show();
|
info->show();
|
||||||
connect(info,&InfoCreateWidget::readytoBuild,this,&MainInterface::startCopy);
|
// connect(info,&InfoCreateWidget::readytoBuild,this,&MainInterface::startCopy);
|
||||||
connect(info,&InfoCreateWidget::gohomesignals,this,[=](){
|
connect(info,&InfoCreateWidget::gohomesignals,this,[=](){
|
||||||
//发送返回主界面信号给mainwindow
|
//发送返回主界面信号给mainwindow
|
||||||
emit gohomesignals();
|
emit gohomesignals();
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
AboutDialog::AboutDialog(QWidget *parent) :
|
AboutDialog::AboutDialog(QWidget *parent) :
|
||||||
kdk::KAboutDialog(parent)
|
kdk::KAboutDialog(parent)
|
||||||
{
|
{
|
||||||
this->setAppIcon(QIcon::fromTheme("fretsonfire"));
|
this->setAppIcon(QIcon::fromTheme("kylin-theme-builder"));
|
||||||
this->setAppName(tr("Kylin Theme Builder"));
|
this->setAppName(tr("Kylin Theme Builder"));
|
||||||
this->setAppVersion(this->getCurrentVersion());
|
this->setAppVersion(this->getCurrentVersion());
|
||||||
this->setBodyText(tr(""));
|
this->setBodyText(tr(""));
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
#include "globalthemewidget.h"
|
#include "globalthemewidget.h"
|
||||||
#include "../fileProcess/filecheck.h"
|
#include "../fileProcess/filecheck.h"
|
||||||
|
|
||||||
bool GlobalThemeWidget::g_themeChange;
|
bool GlobalThemeWidget::g_themeChange;
|
||||||
|
@ -231,7 +231,7 @@ void GlobalThemeWidget::initWallPaperWidget()
|
||||||
wallpaperbtn = new EditButton(cover);
|
wallpaperbtn = new EditButton(cover);
|
||||||
wallpaperbtn->setFixedSize(160,100);
|
wallpaperbtn->setFixedSize(160,100);
|
||||||
QLabel *tip = new QLabel(cover);
|
QLabel *tip = new QLabel(cover);
|
||||||
tip->setText("<html>尺寸:3840*2160<br>大小:不超过 10 MB<br>格式:PNG</html>");
|
tip->setText("<html>尺寸:3840*2160<br>大小:不超过 10 MB<br>格式:PNG\/JPG</html>");
|
||||||
|
|
||||||
coverlayout->addWidget(wallpaperbtn);
|
coverlayout->addWidget(wallpaperbtn);
|
||||||
coverlayout->addWidget(tip);
|
coverlayout->addWidget(tip);
|
||||||
|
|
|
@ -20,13 +20,13 @@ void TypeButton::paintEvent(QPaintEvent *event)
|
||||||
{
|
{
|
||||||
QPushButton::paintEvent(event);
|
QPushButton::paintEvent(event);
|
||||||
|
|
||||||
if (isChecked()) {
|
// if (isChecked()) {
|
||||||
QPainter painter(this);
|
// QPainter painter(this);
|
||||||
QIcon icon = QIcon::fromTheme("kylin-settings-account");
|
// QIcon icon = QIcon::fromTheme("");
|
||||||
QPixmap pixmap = icon.pixmap(QSize(16, 16));
|
// QPixmap pixmap = icon.pixmap(QSize(16, 16));
|
||||||
QRect pixmapRect(rect().right() - pixmap.width(), (rect().height() - pixmap.height()) / 2, pixmap.width(), pixmap.height());
|
// QRect pixmapRect(rect().right() - pixmap.width(), (rect().height() - pixmap.height()) / 2, pixmap.width(), pixmap.height());
|
||||||
painter.drawPixmap(pixmapRect, pixmap);
|
// painter.drawPixmap(pixmapRect, pixmap);
|
||||||
}
|
// }
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -19,7 +19,7 @@ TitleBar::TitleBar(QWidget *parent) : QWidget(parent)
|
||||||
|
|
||||||
QLabel *iconlabel = new QLabel(this);
|
QLabel *iconlabel = new QLabel(this);
|
||||||
iconlabel->setFixedSize(30, 30);
|
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);
|
QIcon scaledIcon = icon.pixmap(QSize(30, 30)).scaled(QSize(30, 30), Qt::KeepAspectRatio, Qt::SmoothTransformation);
|
||||||
QPixmap pixmap = scaledIcon.pixmap(QSize(30, 30));
|
QPixmap pixmap = scaledIcon.pixmap(QSize(30, 30));
|
||||||
iconlabel->setPixmap(pixmap);
|
iconlabel->setPixmap(pixmap);
|
||||||
|
|
Loading…
Reference in New Issue