mirror of
https://gitee.com/spark-store-project/spark-web-app-runtime.git
synced 2025-07-03 12:16:01 +08:00
Compare commits
14 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
f2b69ceb5e | ||
bf6a6893b3 | |||
|
c18a5b5b36 | ||
64d5e51ef3 | |||
290c57e1bc | |||
|
7e5525d4e9 | ||
c4e34eb048 | |||
3ded131e34 | |||
8a950603d9 | |||
19233d8c22 | |||
4e4bf8a80f | |||
d197bd3a04 | |||
|
a95e7e1beb | ||
|
23b40dd231 |
.github/workflows
debian
spark-webapp-runtime
13
.github/workflows/program-builder.yml
vendored
Normal file
13
.github/workflows/program-builder.yml
vendored
Normal file
@ -0,0 +1,13 @@
|
||||
name: Building Program
|
||||
run-name: Building ${{ GITHUB.REPOSITORY }}
|
||||
|
||||
on:
|
||||
workflow_dispatch:
|
||||
push:
|
||||
tags:
|
||||
- "*"
|
||||
|
||||
jobs:
|
||||
call:
|
||||
uses: GXDE-OS/GXDE/.github/workflows/building-deb.yml@master
|
||||
secrets: inherit
|
6
debian/changelog
vendored
6
debian/changelog
vendored
@ -1,7 +1,7 @@
|
||||
spark-webapp-runtime (1.7.0-1) stable; urgency=medium
|
||||
spark-webapp-runtime (1.8) stable; urgency=medium
|
||||
|
||||
* Transmit web notification to system notification center
|
||||
* Fix a bug that force using dtk platform plugin does not work
|
||||
* Fix: Now won't lock cookies.
|
||||
* Feat: Support local html files
|
||||
|
||||
-- shenmo <shenmo@spark-app.store> Mon, 19 Dec 2022 10:00:00 +0800
|
||||
|
||||
|
20
debian/control
vendored
20
debian/control
vendored
@ -6,14 +6,10 @@ Build-Depends:
|
||||
debhelper (>= 9),
|
||||
pkg-config,
|
||||
qtchooser (>= 55-gc9562a1-1~),
|
||||
libqt5core5a,
|
||||
libqt5gui5,
|
||||
libqt5widgets5,
|
||||
libqt5concurrent5,
|
||||
libqt5dbus5,
|
||||
qtbase5-dev,
|
||||
libqt5svg5-dev,
|
||||
qtwebengine5-dev,
|
||||
qttools5-private-dev,
|
||||
qttools5-dev-tools,
|
||||
libdtkcore-dev (>= 5.0),
|
||||
libdtkgui-dev (>= 5.0),
|
||||
libdtkwidget-dev (>= 5.0)
|
||||
@ -23,17 +19,7 @@ Homepage: https://gitee.com/deepin-community-store/spark-web-app-runtime
|
||||
|
||||
Package: spark-webapp-runtime
|
||||
Architecture: any
|
||||
Depends:${shlibs:Depends}, ${misc:Depends},
|
||||
libqt5core5a,
|
||||
libqt5gui5,
|
||||
libqt5widgets5,
|
||||
libqt5concurrent5,
|
||||
libqt5dbus5,
|
||||
libqt5svg5,
|
||||
libqt5webenginewidgets5,
|
||||
libdtkcore5,
|
||||
libdtkgui5,
|
||||
libdtkwidget5
|
||||
Depends:${shlibs:Depends}, ${misc:Depends}
|
||||
Conflicts: store.spark-app.spark-webapp-runtime
|
||||
Provides: store.spark-app.spark-webapp-runtime
|
||||
Replaces: store.spark-app.spark-webapp-runtime
|
||||
|
21
debian/rules
vendored
21
debian/rules
vendored
@ -1,35 +1,36 @@
|
||||
#!/usr/bin/make -f
|
||||
|
||||
export QT_SELECT=5
|
||||
export QT_SELECT = qt5
|
||||
export DEB_BUILD_MAINT_OPTIONS = hardening=+all
|
||||
include /usr/share/dpkg/default.mk
|
||||
|
||||
DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
|
||||
DH_AUTO_ARGS = --parallel --buildsystem=qmake
|
||||
DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
|
||||
|
||||
# Uncomment this to turn on verbose mode.
|
||||
# export DH_VERBOSE=1
|
||||
#export DH_VERBOSE=1
|
||||
|
||||
%:
|
||||
dh $@ --parallel
|
||||
|
||||
override_dh_auto_clean:
|
||||
rm -rf $(CURDIR)/build
|
||||
rm -rf $(CURDIR)/build-$(DEB_HOST_MULTIARCH)
|
||||
|
||||
|
||||
override_dh_auto_configure:
|
||||
mkdir -p $(CURDIR)/build
|
||||
mkdir -p $(CURDIR)/build-$(DEB_HOST_MULTIARCH)
|
||||
|
||||
dh_auto_configure MAKEFLAGS=-j$(JOBS) -- spark-webapp-runtime.pro \
|
||||
-spec linux-g++ CONFIG+=qtquickcompiler \
|
||||
-o $(CURDIR)/build/
|
||||
qmake BUILD_VERSION=$(DEB_VERSION_UPSTREAM) spark-webapp-runtime.pro \
|
||||
-spec linux-g++ CONFIG+=force_debug_info \
|
||||
-o $(CURDIR)/build-$(DEB_HOST_MULTIARCH)/
|
||||
|
||||
|
||||
override_dh_auto_build:
|
||||
make -C $(CURDIR)/build -j$(JOBS)
|
||||
make -C $(CURDIR)/build-$(DEB_HOST_MULTIARCH) -j$(JOBS)
|
||||
|
||||
|
||||
override_dh_auto_install:
|
||||
make -C $(CURDIR)/build install \
|
||||
make -C $(CURDIR)/build-$(DEB_HOST_MULTIARCH) install \
|
||||
INSTALL_ROOT=$(CURDIR)/debian/spark-webapp-runtime
|
||||
|
||||
|
||||
|
@ -8,6 +8,8 @@
|
||||
|
||||
#include <unistd.h>
|
||||
|
||||
const QString websiteLinkTemplate = "<a href='%1' style='text-decoration: none; color: rgba(0,129,255,0.9);'>%2</a>";
|
||||
|
||||
Application::Application(int &argc, char **argv)
|
||||
: DApplication(argc, argv)
|
||||
{
|
||||
@ -20,25 +22,21 @@ Application::Application(int &argc, char **argv)
|
||||
setAttribute(Qt::AA_DontCreateNativeWidgetSiblings, true);
|
||||
}
|
||||
|
||||
setApplicationVersion(QString(CURRENT_VER));
|
||||
setOrganizationName(ORGANIZATION_NAME); // 添加组织名称,和商店主体的文件夹同在 ~/.local/share/spark-union 文件夹下
|
||||
setApplicationName(APPLICATION_NAME); // 这里不要翻译,否则 ~/.local/share 中文件夹名也会被翻译
|
||||
setProductName(DEFAULT_TITLE);
|
||||
setApplicationName(PROJECT_NAME); // 这里不要翻译,否则 ~/.local/share 中文件夹名也会被翻译
|
||||
setApplicationVersion(APP_VERSION);
|
||||
setApplicationDisplayName(DEFAULT_TITLE);
|
||||
setApplicationLicense(" <a href='https://www.gnu.org/licenses/gpl-3.0.html'>GPLv3</a> ");
|
||||
setWindowIcon(QIcon(":/images/spark-webapp-runtime.svg"));
|
||||
|
||||
initAboutDialog();
|
||||
setProductIcon(QIcon(":/images/spark-webapp-runtime.svg"));
|
||||
setProductName(websiteLinkTemplate.arg("https://gitee.com/spark-store-project/spark-web-app-runtime", DEFAULT_TITLE));
|
||||
setApplicationDescription(QObject::tr("Presented By Spark developers # HadesStudio"));
|
||||
setApplicationLicense(websiteLinkTemplate.arg("https://gitee.com/spark-store-project/spark-web-app-runtime/blob/master/LICENSE", "GPLv3"));
|
||||
}
|
||||
|
||||
void Application::handleAboutAction()
|
||||
void Application::triggerAboutAction()
|
||||
{
|
||||
if (aboutDialog()) {
|
||||
DApplication::handleAboutAction();
|
||||
return;
|
||||
}
|
||||
|
||||
initAboutDialog();
|
||||
DApplication::handleAboutAction();
|
||||
handleAboutAction();
|
||||
}
|
||||
|
||||
QStringList Application::launchParams() const
|
||||
@ -56,6 +54,21 @@ MainWindow *Application::mainWindow()
|
||||
return m_mainWindow;
|
||||
}
|
||||
|
||||
void Application::handleAboutAction()
|
||||
{
|
||||
DApplication::handleAboutAction();
|
||||
|
||||
DAboutDialog *dialog = aboutDialog();
|
||||
if (dialog) {
|
||||
// CompanyLogo
|
||||
dialog->setCompanyLogo(QPixmap(":/images/Logo-Spark.png"));
|
||||
// WebsiteName
|
||||
dialog->setWebsiteName("Spark Project");
|
||||
// WebsiteLink
|
||||
dialog->setWebsiteLink("https://gitee.com/spark-store-project/");
|
||||
}
|
||||
}
|
||||
|
||||
void Application::saveLaunchParams(int &argc, char **argv)
|
||||
{
|
||||
m_argc = argc;
|
||||
@ -68,47 +81,9 @@ void Application::saveLaunchParams(int &argc, char **argv)
|
||||
qDebug() << Q_FUNC_INFO << m_argc << m_argv;
|
||||
}
|
||||
|
||||
void Application::initAboutDialog()
|
||||
{
|
||||
// Customized DAboutDialog
|
||||
DAboutDialog *dialog = new DAboutDialog(activeWindow());
|
||||
// WindowIcon
|
||||
dialog->setWindowIcon(QIcon(":/images/spark-webapp-runtime.svg"));
|
||||
// ProductIcon
|
||||
dialog->setProductIcon(QIcon(":/images/spark-webapp-runtime.svg"));
|
||||
// ProductName
|
||||
dialog->setProductName(productName());
|
||||
// Version
|
||||
dialog->setVersion(translate("DAboutDialog", "Version: %1").arg(applicationVersion()));
|
||||
// CompanyLogo
|
||||
dialog->setCompanyLogo(QPixmap(":/images/Logo-Spark.png"));
|
||||
// Description
|
||||
|
||||
QString szDefaultDesc = QString("<a href='https://gitee.com/deepin-community-store/spark-web-app-runtime'><span style='font-size:12pt;font-weight:500;'>%1</span></a><br/>"
|
||||
"<span style='font-size:12pt;'>%2</span>")
|
||||
.arg(DEFAULT_TITLE)
|
||||
.arg(QObject::tr("Presented By Spark developers # HadesStudio"));
|
||||
|
||||
dialog->setDescription(szDefaultDesc);
|
||||
// WebsiteName
|
||||
dialog->setWebsiteName("Spark Project");
|
||||
// WebsiteLink
|
||||
dialog->setWebsiteLink("https://gitee.com/deepin-community-store/");
|
||||
// License
|
||||
dialog->setLicense(translate("DAboutDialog", "%1 is released under %2").arg(productName()).arg(applicationLicense()));
|
||||
|
||||
setAboutDialog(dialog);
|
||||
connect(aboutDialog(), &DAboutDialog::destroyed, this, [=] {
|
||||
setAboutDialog(nullptr);
|
||||
});
|
||||
|
||||
dialog->hide();
|
||||
}
|
||||
|
||||
void Application::slotMainWindowClose()
|
||||
{
|
||||
if (aboutDialog()) {
|
||||
aboutDialog()->close();
|
||||
aboutDialog()->deleteLater();
|
||||
}
|
||||
}
|
||||
|
@ -13,16 +13,18 @@ class Application : public DApplication
|
||||
|
||||
public:
|
||||
Application(int &argc, char **argv);
|
||||
void handleAboutAction() override;
|
||||
void triggerAboutAction();
|
||||
|
||||
QStringList launchParams() const;
|
||||
|
||||
void setMainWindow(MainWindow *window);
|
||||
MainWindow *mainWindow();
|
||||
|
||||
protected:
|
||||
void handleAboutAction() override;
|
||||
|
||||
private:
|
||||
void saveLaunchParams(int &argc, char **argv);
|
||||
void initAboutDialog();
|
||||
|
||||
signals:
|
||||
void sigQuit();
|
||||
|
@ -4,7 +4,6 @@
|
||||
#include <QObject>
|
||||
|
||||
#define DEFAULT_TITLE QObject::tr("SparkWebAppRuntime")
|
||||
#define APPLICATION_NAME QString("spark-webapp-runtime")
|
||||
#define ORGANIZATION_NAME QString("spark-union")
|
||||
#define DEFAULT_URL QString("qrc:/help/help.html")
|
||||
#define DEFAULT_WIDTH (1024)
|
||||
@ -18,6 +17,4 @@
|
||||
#define DEFAULT_PORT 0
|
||||
#define DEFAULT_GPU 1
|
||||
|
||||
#define CURRENT_VER QString("1.7.0")
|
||||
|
||||
#endif // GLOBALDEFINE_H
|
||||
|
@ -19,23 +19,8 @@
|
||||
|
||||
int main(int argc, char *argv[])
|
||||
{
|
||||
if (!QString(qgetenv("XDG_CURRENT_DESKTOP")).toLower().startsWith("deepin")) {
|
||||
qputenv("XDG_CURRENT_DESKTOP", "Deepin");
|
||||
}
|
||||
|
||||
// 龙芯机器配置,使得 DApplication 能正确加载 QTWEBENGINE
|
||||
qputenv("DTK_FORCE_RASTER_WIDGETS", "FALSE");
|
||||
// qputenv("QTWEBENGINE_CHROMIUM_FLAGS", "--disable-features=UseModernMediaControls");
|
||||
// qputenv("QTWEBENGINE_CHROMIUM_FLAGS", "--disable-web-security");
|
||||
#ifdef __sw_64__
|
||||
qputenv("QTWEBENGINE_CHROMIUM_FLAGS", "--no-sandbox");
|
||||
#endif
|
||||
|
||||
if (!Dtk::Core::DSysInfo::isDDE()) {
|
||||
#ifndef DSTORE_NO_DXCBs
|
||||
DApplication::loadDXcbPlugin();
|
||||
#endif
|
||||
}
|
||||
|
||||
// 开启 HiDPI 缩放支持
|
||||
DApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
|
||||
@ -51,9 +36,6 @@ int main(int argc, char *argv[])
|
||||
}
|
||||
Application a(fakeArgc, fakeArgv.data());
|
||||
|
||||
// 保存 DTK 主题
|
||||
DApplicationSettings settings;
|
||||
|
||||
// 解析命令行启动参数
|
||||
QCommandLineParser parser;
|
||||
|
||||
@ -180,10 +162,7 @@ int main(int argc, char *argv[])
|
||||
#if SSL_SERVER
|
||||
quint16 u16sslPort = 0;
|
||||
#endif
|
||||
QString szDefaultDesc = QString("<a href='https://gitee.com/deepin-community-store/spark-web-app-runtime'><span style='font-size:12pt;font-weight:500;'>%1</span></a><br/>"
|
||||
"<span style='font-size:12pt;'>%2</span>")
|
||||
.arg(DEFAULT_TITLE)
|
||||
.arg(QObject::tr("Presented By Spark developers # HadesStudio"));
|
||||
QString szDefaultDesc = QObject::tr("Presented By Spark developers # HadesStudio");
|
||||
|
||||
// 解析可能存在的配置文件
|
||||
QString szCfgFile = DEFAULT_CFG;
|
||||
@ -196,10 +175,10 @@ int main(int argc, char *argv[])
|
||||
szUrl = settings.value("SparkWebAppRuntime/URL", DEFAULT_TITLE).toString();
|
||||
width = settings.value("SparkWebAppRuntime/Width", DEFAULT_WIDTH).toInt();
|
||||
height = settings.value("SparkWebAppRuntime/Height", DEFAULT_HEIGHT).toInt();
|
||||
tray = settings.value("SparkWebAppRunTime/Tray", false).toBool();
|
||||
fullScreen = settings.value("SparkWebAppRunTime/FullScreen", false).toBool();
|
||||
fixSize = settings.value("SparkWebAppRunTime/FixSize", false).toBool();
|
||||
hideButtons = settings.value("SparkWebAppRunTime/HideButtons", false).toBool();
|
||||
tray = settings.value("SparkWebAppRuntime/Tray", false).toBool();
|
||||
fullScreen = settings.value("SparkWebAppRuntime/FullScreen", false).toBool();
|
||||
fixSize = settings.value("SparkWebAppRuntime/FixSize", false).toBool();
|
||||
hideButtons = settings.value("SparkWebAppRuntime/HideButtons", false).toBool();
|
||||
szIcon = settings.value("SparkWebAppRuntime/Ico", DEFAULT_ICON).toString();
|
||||
szDesc = QString("%1<br/><br/>%2")
|
||||
.arg(settings.value("SparkWebAppRuntime/Desc", QString()).toString())
|
||||
@ -258,11 +237,17 @@ int main(int argc, char *argv[])
|
||||
if (parser.isSet(useGPU)) {
|
||||
toUseGPU = parser.value(useGPU).toUInt();
|
||||
}
|
||||
if (toUseGPU == true) {
|
||||
qputenv("QTWEBENGINE_CHROMIUM_FLAGS", "--ignore-gpu-blocklist --enable-gpu-rasterization --enable-native-gpu-memory-buffers --enable-accelerated-video-decode");
|
||||
#ifdef __sw_64__
|
||||
qputenv("QTWEBENGINE_CHROMIUM_FLAGS", "--ignore-gpu-blocklist --enable-gpu-rasterization --enable-native-gpu-memory-buffers --enable-accelerated-video-decode --no-sandbox");
|
||||
|
||||
QStringList chromium_flags = {"--disable-web-security"};
|
||||
#if defined __sw_64__ || __loongarch__
|
||||
chromium_flags << "--no-sandbox";
|
||||
#endif
|
||||
if (toUseGPU == true) {
|
||||
chromium_flags << "--ignore-gpu-blocklist"
|
||||
<< "--enable-gpu-rasterization"
|
||||
<< "--enable-native-gpu-memory-buffers"
|
||||
<< "--enable-accelerated-video-decode";
|
||||
qputenv("QTWEBENGINE_CHROMIUM_FLAGS", chromium_flags.join(" ").toUtf8());
|
||||
qDebug() << "Setting GPU to True.";
|
||||
}
|
||||
// 初始化 QtWebEngine 深色模式环境变量
|
||||
|
@ -1,7 +1,5 @@
|
||||
#include "mainwindow.h"
|
||||
#include "application.h"
|
||||
#include "webengineview.h"
|
||||
#include "webenginepage.h"
|
||||
|
||||
#include <DLog>
|
||||
#include <DWidgetUtil>
|
||||
@ -38,7 +36,7 @@ MainWindow::MainWindow(QString szTitle,
|
||||
, m_isFullScreen(nFullScreen)
|
||||
, m_isFixedSize(nFixSize)
|
||||
, m_isHideButton(nHideButtons)
|
||||
, m_widget(new Widget(m_url, this))
|
||||
, m_widget(new Widget(m_url, this, m_title))
|
||||
, m_tray(new QSystemTrayIcon(this))
|
||||
, btnBack(new DToolButton(titlebar()))
|
||||
, btnForward(new DToolButton(titlebar()))
|
||||
@ -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()
|
||||
@ -301,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);
|
||||
@ -382,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);
|
||||
@ -416,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, [=]() {
|
||||
|
26
spark-webapp-runtime/resources/css/webkit-scrollbar.css
Normal file
26
spark-webapp-runtime/resources/css/webkit-scrollbar.css
Normal file
@ -0,0 +1,26 @@
|
||||
::-webkit-scrollbar {
|
||||
width: 12px;
|
||||
height: 12px;
|
||||
background-color: transparent
|
||||
}
|
||||
|
||||
::-webkit-scrollbar-thumb {
|
||||
border: 2px solid transparent;
|
||||
border-radius: 99px;
|
||||
background-clip: padding-box;
|
||||
background-color: rgba(80, 80, 80, 0.3);
|
||||
-webkit-transition: background 0.2s cubic-bezier(0.34, 0.69, 0.1, 1);
|
||||
transition: background 0.2s cubic-bezier(0.34, 0.69, 0.1, 1)
|
||||
}
|
||||
|
||||
::-webkit-scrollbar-button {
|
||||
display: none
|
||||
}
|
||||
|
||||
::-webkit-scrollbar-corner {
|
||||
display: none
|
||||
}
|
||||
|
||||
::-webkit-scrollbar-thumb:hover {
|
||||
background-color: rgba(80, 80, 80, 0.6)!important
|
||||
}
|
@ -1,5 +1,6 @@
|
||||
<RCC>
|
||||
<qresource prefix="/">
|
||||
<file>css/webkit-scrollbar.css</file>
|
||||
<file>images/spark-webapp-runtime.svg</file>
|
||||
<file>images/Logo-Spark.png</file>
|
||||
<file>images/go-previous-24.svg</file>
|
||||
|
@ -1,4 +1,4 @@
|
||||
QT += core gui webenginewidgets svg concurrent dbus
|
||||
QT += core gui webenginewidgets concurrent dbus
|
||||
|
||||
greaterThan(QT_MAJOR_VERSION, 5): QT += widgets
|
||||
|
||||
@ -6,6 +6,13 @@ TEMPLATE = app
|
||||
|
||||
DEFINES += QT_DEPRECATED_WARNINGS
|
||||
|
||||
DEFINES += PROJECT_NAME=\\\"'$${TARGET}'\\\"
|
||||
|
||||
# Get build version from qmake
|
||||
VERSION = $$BUILD_VERSION
|
||||
isEmpty(VERSION): VERSION = 1.0
|
||||
DEFINES += APP_VERSION=\\\"'$${VERSION}'\\\"
|
||||
|
||||
CONFIG += c++11 link_pkgconfig
|
||||
PKGCONFIG += dtkcore dtkgui dtkwidget
|
||||
|
||||
@ -31,10 +38,10 @@ SOURCES += \
|
||||
webengineurlrequestinterceptor.cpp
|
||||
|
||||
RESOURCES += \
|
||||
resources/resources.qrc
|
||||
resources/resources.qrc
|
||||
|
||||
TRANSLATIONS += \
|
||||
translations/spark-webapp-runtime_zh_CN.ts
|
||||
translations/$${TARGET}_zh_CN.ts
|
||||
|
||||
# Default rules for deployment.
|
||||
qnx: target.path = /tmp/$${TARGET}/bin
|
||||
|
@ -1,109 +1,96 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!DOCTYPE TS>
|
||||
<TS version="2.1" language="zh_CN">
|
||||
<context>
|
||||
<name>DAboutDialog</name>
|
||||
<message>
|
||||
<location filename="../application.cpp" line="82"/>
|
||||
<source>Version: %1</source>
|
||||
<translation>版本:%1</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../application.cpp" line="98"/>
|
||||
<source>%1 is released under %2</source>
|
||||
<translation>%1遵循%2协议发布</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>QObject</name>
|
||||
<message>
|
||||
<location filename="../application.cpp" line="90"/>
|
||||
<location filename="../main.cpp" line="186"/>
|
||||
<location filename="../application.cpp" line="33"/>
|
||||
<location filename="../main.cpp" line="165"/>
|
||||
<source>Presented By Spark developers # HadesStudio</source>
|
||||
<translation>由 星火开发者联盟 @ 花心胡萝卜 提供</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../main.cpp" line="60"/>
|
||||
<location filename="../main.cpp" line="42"/>
|
||||
<source>Description: %1</source>
|
||||
<translation>描述:%1</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../main.cpp" line="66"/>
|
||||
<location filename="../main.cpp" line="48"/>
|
||||
<source>Enable CommandLineParser. Default is false.</source>
|
||||
<translation>启用参数解析方式。默认顺序解析方式。</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../main.cpp" line="71"/>
|
||||
<location filename="../main.cpp" line="53"/>
|
||||
<source>The Title of Application. Default is %1.</source>
|
||||
<translation>设置程序的运行标题。默认是 %1。</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../main.cpp" line="78"/>
|
||||
<location filename="../main.cpp" line="60"/>
|
||||
<source>The target URL. Default is Blank.</source>
|
||||
<translation>设置要打开的目标 URL。默认是空。</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../main.cpp" line="85"/>
|
||||
<location filename="../main.cpp" line="67"/>
|
||||
<source>The Width of Application. Default is %1.</source>
|
||||
<translation>设置应用的窗口宽度。默认是 %1。</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../main.cpp" line="92"/>
|
||||
<location filename="../main.cpp" line="74"/>
|
||||
<source>The Height of Application. Default is %1.</source>
|
||||
<translation>设置应用的窗口高度。默认是 %1。</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../main.cpp" line="99"/>
|
||||
<location filename="../main.cpp" line="81"/>
|
||||
<source>Enable Tray Icon. Default is false.</source>
|
||||
<translation>启用托盘图标。默认不启用。</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../main.cpp" line="103"/>
|
||||
<location filename="../main.cpp" line="85"/>
|
||||
<source>Run in Fullscreen Mode. Default is false.</source>
|
||||
<translation>以全屏模式运行。默认关闭该功能。</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../main.cpp" line="107"/>
|
||||
<location filename="../main.cpp" line="89"/>
|
||||
<source>Fix Window Size. Default is false.</source>
|
||||
<translation>固定窗口大小。默认关闭该功能。</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../main.cpp" line="111"/>
|
||||
<location filename="../main.cpp" line="93"/>
|
||||
<source>Hide Control Buttons. Default is false.</source>
|
||||
<translation>隐藏控制按钮。默认关闭该此功能。</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../main.cpp" line="116"/>
|
||||
<location filename="../main.cpp" line="98"/>
|
||||
<source>The ICON of Application.</source>
|
||||
<translation>设置应用的图标。</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../main.cpp" line="123"/>
|
||||
<location filename="../main.cpp" line="105"/>
|
||||
<source>The Description of Application.</source>
|
||||
<translation>设置应用的描述信息。</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../main.cpp" line="130"/>
|
||||
<location filename="../main.cpp" line="112"/>
|
||||
<source>The Configuration file of Application.</source>
|
||||
<translation>设置应用的配置文件。</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../main.cpp" line="137"/>
|
||||
<location filename="../main.cpp" line="119"/>
|
||||
<source>The root path of the program web service.</source>
|
||||
<translation>设置内置 WebServer 的根路径。</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../main.cpp" line="144"/>
|
||||
<location filename="../main.cpp" line="126"/>
|
||||
<source>The port number of the program web service.</source>
|
||||
<translation>设置内置 WebServer 的监听端口号。</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../main.cpp" line="151"/>
|
||||
<location filename="../main.cpp" line="133"/>
|
||||
<source>To use GPU instead of CPU to decoding. Default True.</source>
|
||||
<translation>启用GPU渲染,默认开启。</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../main.cpp" line="159"/>
|
||||
<location filename="../main.cpp" line="141"/>
|
||||
<source>The ssl port number of the program web service.</source>
|
||||
<translation>设置内置 WebServer 的 SSL 协议的监听端口号。</translation>
|
||||
</message>
|
||||
@ -113,102 +100,89 @@
|
||||
<translation>星火网页应用运行环境</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../mainwindow.cpp" line="47"/>
|
||||
<location filename="../mainwindow.cpp" line="45"/>
|
||||
<source>Full Screen</source>
|
||||
<translation>全屏显示</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../mainwindow.cpp" line="48"/>
|
||||
<location filename="../mainwindow.cpp" line="46"/>
|
||||
<source>Fix Size</source>
|
||||
<translation>固定大小</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../mainwindow.cpp" line="49"/>
|
||||
<location filename="../mainwindow.cpp" line="47"/>
|
||||
<source>Hide Buttons</source>
|
||||
<translation>隐藏按钮</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../mainwindow.cpp" line="50"/>
|
||||
<location filename="../mainwindow.cpp" line="48"/>
|
||||
<source>Clear Cache</source>
|
||||
<translation>清理缓存</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../mainwindow.cpp" line="52"/>
|
||||
<location filename="../mainwindow.cpp" line="50"/>
|
||||
<source>Show MainWindow</source>
|
||||
<translation>显示主界面</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../mainwindow.cpp" line="59"/>
|
||||
<location filename="../mainwindow.cpp" line="57"/>
|
||||
<source>Pause</source>
|
||||
<translation>暂停</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../mainwindow.cpp" line="60"/>
|
||||
<location filename="../mainwindow.cpp" line="58"/>
|
||||
<source>Resume</source>
|
||||
<translation>继续</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../mainwindow.cpp" line="61"/>
|
||||
<location filename="../mainwindow.cpp" line="59"/>
|
||||
<source>Cancel</source>
|
||||
<translation>取消</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../mainwindow.cpp" line="381"/>
|
||||
<location filename="../mainwindow.cpp" line="374"/>
|
||||
<source>Save As</source>
|
||||
<translation>另存为</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../mainwindow.cpp" line="445"/>
|
||||
<location filename="../mainwindow.cpp" line="437"/>
|
||||
<source>%1Start downloading %2</source>
|
||||
<translation>%1开始下载 %2</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../mainwindow.cpp" line="456"/>
|
||||
<location filename="../mainwindow.cpp" line="448"/>
|
||||
<source>%1Wait for previous download to complete!</source>
|
||||
<translation>%1请等待上一个下载任务完成!</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../mainwindow.cpp" line="478"/>
|
||||
<location filename="../mainwindow.cpp" line="470"/>
|
||||
<source>Open</source>
|
||||
<translation>打开</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../mainwindow.cpp" line="482"/>
|
||||
<location filename="../mainwindow.cpp" line="474"/>
|
||||
<source>download finished.</source>
|
||||
<translation>下载完成。</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../mainwindow.cpp" line="482"/>
|
||||
<location filename="../mainwindow.cpp" line="474"/>
|
||||
<source>Show in file manager?</source>
|
||||
<translation>是否在文件管理器中显示?</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../mainwindow.cpp" line="520"/>
|
||||
<location filename="../mainwindow.cpp" line="512"/>
|
||||
<source>%1Download canceled!</source>
|
||||
<translation>%1下载取消!</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../mainwindow.cpp" line="525"/>
|
||||
<location filename="../mainwindow.cpp" line="517"/>
|
||||
<source>%1Load error occurred!</source>
|
||||
<translation>%1加载存在错误!</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../webengineview.cpp" line="79"/>
|
||||
<location filename="../webengineview.cpp" line="82"/>
|
||||
<source>View</source>
|
||||
<translation>查看</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>TitleBarMenu</name>
|
||||
<message>
|
||||
<location filename="../mainwindow.cpp" line="53"/>
|
||||
<source>About</source>
|
||||
<translation>关于</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../mainwindow.cpp" line="54"/>
|
||||
<source>Exit</source>
|
||||
<translation>退出</translation>
|
||||
</message>
|
||||
</context>
|
||||
</TS>
|
||||
|
@ -1,10 +1,15 @@
|
||||
#include "webenginepage.h"
|
||||
|
||||
#include <QFile>
|
||||
#include <QWebEngineScript>
|
||||
#include <QWebEngineScriptCollection>
|
||||
#include <QDesktopServices>
|
||||
|
||||
WebEnginePage::WebEnginePage(QObject *parent)
|
||||
: QWebEnginePage(parent)
|
||||
{
|
||||
initScrollBarStyle();
|
||||
|
||||
connect(this, &QWebEnginePage::featurePermissionRequested, [&](const QUrl &origin, QWebEnginePage::Feature feature) {
|
||||
if (feature != QWebEnginePage::Notifications) {
|
||||
return;
|
||||
@ -37,6 +42,30 @@ QWebEnginePage *WebEnginePage::createWindow(QWebEnginePage::WebWindowType type)
|
||||
return page;
|
||||
}
|
||||
|
||||
void WebEnginePage::initScrollBarStyle()
|
||||
{
|
||||
//自定义浏览器滚动条样式
|
||||
QFile file(":/css/webkit-scrollbar.css");
|
||||
if (file.open(QFile::ReadOnly)) {
|
||||
QString scrollbarStyleJS = QString("(function() {"
|
||||
" css = document.createElement('style');"
|
||||
" css.type = 'text/css';"
|
||||
" css.id = '%1';"
|
||||
" document.head.appendChild(css);"
|
||||
" css.innerText = '%2';"
|
||||
"})()\n")
|
||||
.arg("scrollbarStyle")
|
||||
.arg(QString::fromUtf8(file.readAll()).simplified());
|
||||
file.close();
|
||||
|
||||
QWebEngineScript script;
|
||||
script.setWorldId(QWebEngineScript::MainWorld);
|
||||
script.setSourceCode(scrollbarStyleJS);
|
||||
scripts().insert(script);
|
||||
runJavaScript(scrollbarStyleJS, QWebEngineScript::ApplicationWorld);
|
||||
}
|
||||
}
|
||||
|
||||
void WebEnginePage::slotUrlChanged(const QUrl &url)
|
||||
{
|
||||
if (m_currentUrl == url) {
|
||||
|
@ -16,6 +16,9 @@ public:
|
||||
protected:
|
||||
QWebEnginePage *createWindow(WebWindowType type) override;
|
||||
|
||||
private:
|
||||
void initScrollBarStyle();
|
||||
|
||||
private slots:
|
||||
void slotUrlChanged(const QUrl &url);
|
||||
|
||||
|
@ -34,7 +34,7 @@ void WebEngineView::handleChromiumFlags()
|
||||
DGuiApplicationHelper::ColorType themeType = DGuiApplicationHelper::instance()->themeType();
|
||||
|
||||
QString env = qgetenv("QTWEBENGINE_CHROMIUM_FLAGS");
|
||||
QStringList flags = env.split(" ", QString::SkipEmptyParts);
|
||||
QStringList flags = env.split(" ", Qt::SkipEmptyParts);
|
||||
|
||||
/**
|
||||
* --blink-settings=preferredColorScheme=0 强制 prefers-color-scheme=dark (>= 5.14)
|
||||
|
@ -2,16 +2,19 @@
|
||||
#include "webengineview.h"
|
||||
#include "webenginepage.h"
|
||||
|
||||
#include <QDir>
|
||||
#include <QWebEngineProfile>
|
||||
#include <DApplication>
|
||||
|
||||
DWIDGET_USE_NAMESPACE
|
||||
|
||||
Widget::Widget(QString szUrl, QWidget *parent)
|
||||
Widget::Widget(QString szUrl, QWidget *parent, QString szTitle)
|
||||
: QWidget(parent)
|
||||
, m_webEngineView(new WebEngineView(this))
|
||||
, m_spinner(new DSpinner(this))
|
||||
, mainLayout(new QStackedLayout(this))
|
||||
, m_szUrl(szUrl)
|
||||
, m_szTitle(szTitle)
|
||||
{
|
||||
initUI();
|
||||
initConnections();
|
||||
@ -54,6 +57,15 @@ void Widget::initUI()
|
||||
page->setUrl(QUrl());
|
||||
if (!m_szUrl.isEmpty()) {
|
||||
page->setUrl(QUrl(m_szUrl));
|
||||
// 设置新的 cookie 路径以防止冲突(https://gitee.com/spark-store-project/spark-web-app-runtime/issues/IA759Q)
|
||||
QString cookiePath = QDir::homePath() +
|
||||
"/.config/spark-webapp-runtime/" +
|
||||
QUrl::toPercentEncoding(m_szTitle); // 使用 url 转移以便正确将标题做为文件名
|
||||
QWebEngineProfile *profile = page->profile();
|
||||
if (!QDir(cookiePath).exists()) {
|
||||
QDir().mkpath(cookiePath);
|
||||
}
|
||||
profile->setPersistentStoragePath(cookiePath);
|
||||
}
|
||||
|
||||
QWidget *spinnerWidget = new QWidget(this);
|
||||
|
@ -17,7 +17,7 @@ class Widget : public QWidget
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
explicit Widget(QString szUrl = nullptr, QWidget *parent = nullptr);
|
||||
explicit Widget(QString szUrl = nullptr, QWidget *parent = nullptr, QString szTitle = nullptr);
|
||||
~Widget();
|
||||
|
||||
QWebEnginePage *getPage();
|
||||
@ -46,6 +46,7 @@ private:
|
||||
QStackedLayout *mainLayout = nullptr;
|
||||
|
||||
QString m_szUrl;
|
||||
QString m_szTitle;
|
||||
};
|
||||
|
||||
#endif // WIDGET_H
|
||||
|
Loading…
x
Reference in New Issue
Block a user