spark-store-project/spark-web-app-runtime
15
0
Fork 0
mirror of https://gitee.com/spark-store-project/spark-web-app-runtime.git synced 2025-12-15 19:42:04 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: setDescription from cmdline or cfg not working

Browse Source 
when aboutDialog is not created yet, ApplicationDescription can't be set

Log: merge changes from develop/qt6 branch
This commit is contained in:
zty199
2024-10-20 15:47:35 +08:00
parent c4e34eb048
commit 7e5525d4e9
9 changed files with 111 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
spark-webapp-runtime/mainwindow.cpp
View File

@@ -1,7 +1,5 @@
#include "mainwindow.h"
#include "application.h"
#include "webengineview.h"
#include "webenginepage.h"
#include <DLog>
#include <DWidgetUtil>
@@ -50,8 +48,8 @@ MainWindow::MainWindow(QString szTitle,
, m_clearCache(new QAction(QObject::tr("Clear Cache"), this))
, t_menu(new QMenu(this))
, t_show(new QAction(QObject::tr("Show MainWindow"), this))
, t_about(new QAction(qApp->translate("TitleBarMenu", "About"), this))
, t_exit(new QAction(qApp->translate("TitleBarMenu", "Exit"), this))
, t_about(new QAction(qApp->translate("TitleBarMenu", QString("About").toUtf8().data()), this))
, t_exit(new QAction(qApp->translate("TitleBarMenu", QString("Exit").toUtf8().data()), this))
, downloadMessage(new DFloatingMessage(DFloatingMessage::ResidentType, this))
, downloadProgressWidget(new QWidget(downloadMessage))
, progressBarLayout(new QHBoxLayout(downloadProgressWidget))
@@ -75,7 +73,7 @@ MainWindow::~MainWindow()
void MainWindow::setIcon(QString szIconPath)
{
if (!QFileInfo(szIconPath).exists()) {
if (!QFile::exists(szIconPath)) {
return;
}
@@ -83,19 +81,13 @@ void MainWindow::setIcon(QString szIconPath)
setWindowIcon(QIcon(szIconPath));
m_tray->setIcon(QIcon(szIconPath));
DAboutDialog *aboutDialog = qobject_cast<Application *>(qApp)->aboutDialog();
if (aboutDialog) {
aboutDialog->setWindowIcon(QIcon::fromTheme(szIconPath));
aboutDialog->setProductIcon(QIcon::fromTheme(szIconPath));
}
qApp->setWindowIcon(QIcon::fromTheme(szIconPath));
qApp->setProductIcon(QIcon::fromTheme(szIconPath));
}
void MainWindow::setDescription(const QString &desc)
{
DAboutDialog *aboutDialog = qobject_cast<Application *>(qApp)->aboutDialog();
if (aboutDialog) {
aboutDialog->setDescription(desc);
}
qApp->setApplicationDescription(desc);
}
QString MainWindow::title() const
@@ -187,6 +179,7 @@ void MainWindow::initUI()
fixSize();
fullScreen();
hideButtons(); // 修复指定hidebuttons之后没有生效
}
void MainWindow::initTitleBar()
@@ -223,8 +216,6 @@ void MainWindow::initTitleBar()
if (!m_isHideButton) {
m_menu->addAction(m_hideButtons);
}else{
hideButtons(); // 修复指定hidebuttons之后没有生效
}
if (m_menu->actions().size() > 0) {
@@ -303,7 +294,7 @@ void MainWindow::initConnections()
fixSize();
});
connect(t_about, &QAction::triggered, this, [=]() {
qobject_cast<Application *>(qApp)->handleAboutAction();
qobject_cast<Application *>(qApp)->triggerAboutAction();
});
connect(t_exit, &QAction::triggered, this, [=]() {
exit(0);
@@ -384,7 +375,7 @@ QString MainWindow::saveAs(QString fileName)
QStandardPaths::writableLocation(QStandardPaths::DownloadLocation) + "/" + fileName);
if (!saveFile.isEmpty()) {
// 判断上层目录是否可写入
if (QFileInfo(QFileInfo(saveFile).absolutePath()).isWritable()) {
if (QFileInfo(QFileInfo(saveFile).absoluteDir().canonicalPath()).isWritable()) {
return saveFile;
} else {
return saveAs(fileName);
@@ -418,14 +409,13 @@ void MainWindow::on_downloadStart(QWebEngineDownloadItem *item)
{
// 尝试加锁互斥量，禁止同时下载多个文件
if (mutex.tryLock()) {
QString fileName = QFileInfo(item->path()).fileName();
QString fileName = item->downloadFileName();
QString filePath = saveAs(fileName);
if (filePath.isEmpty()) {
mutex.unlock();
return;
}
item->setPath(filePath);
filePath = QFileInfo(item->path()).absoluteFilePath();
item->setDownloadDirectory(QFileInfo(filePath).absoluteDir().canonicalPath());
connect(item, &QWebEngineDownloadItem::downloadProgress, this, &MainWindow::on_downloadProgress);
connect(item, &QWebEngineDownloadItem::finished, this, [=]() {