Compare commits

...

30 Commits

Author SHA1 Message Date
2bd9c4a440 !198 4.2.3
Merge pull request !198 from shenmo/dev
2023-03-02 15:34:05 +00:00
f494f15922 !202 Merge remote-tracking branch 'refs/remotes/origin/dev' into dev
Merge pull request !202 from shenmo/auto-4915358-dev-47465fb4
2023-03-02 15:33:49 +00:00
d5df4057e9 Merge remote-tracking branch 'refs/remotes/origin/dev' into dev 2023-03-02 23:33:27 +08:00
dc07b7cb02 changelog 2023-03-02 23:33:16 +08:00
1bb0bf7d71 !201 Merge remote-tracking branch 'refs/remotes/origin/dev' into dev
Merge pull request !201 from shenmo/auto-4915358-dev-844840b2
2023-03-02 15:32:32 +00:00
cf00d54355 Merge remote-tracking branch 'refs/remotes/origin/dev' into dev 2023-03-02 23:32:04 +08:00
1ea7067379 ci构建线程是2 2023-03-02 23:31:31 +08:00
29ad3cc72d !200 完全修复prerm崩溃
Merge pull request !200 from shenmo/auto-4915358-dev-8846a8bc
2023-03-02 15:27:29 +00:00
dfe57bf2c3 !199 fix: 修复软件构建依赖缺失
Merge pull request !199 from Pluto/auto-5304420-dev-2c49bfa9
2023-03-02 15:26:13 +00:00
b37f8d7f7e 完全修复prerm崩溃 2023-03-02 23:25:49 +08:00
b51b248566 fix: 修复软件构建依赖缺失 2023-03-02 23:13:49 +08:00
21baf598d7 修复prerm崩溃 2023-03-02 23:09:00 +08:00
2c6d706c58 423 2023-03-02 22:40:08 +08:00
1b1f7578d0 changelog 2023-02-24 22:13:40 +08:00
9275425bdf feat: 一键编译并安装脚本 2023-02-24 01:07:09 +08:00
22b1d66c07 fix: 删除不应该删除的指针造成闪退 2023-02-24 00:10:19 +08:00
a3e1d19ac3 !197 feat: 后台安装结束后退出任务栏驻留
* fix: 没有下载的时候直接退出客户端
* feat: 后台安装结束后退出任务栏驻留
* feat: 更新的时候关闭旧实例
2023-02-23 12:50:44 +00:00
762caae49f !196 fix: QtWebEngine
* fix: QtWebEngine
2023-02-23 08:41:14 +00:00
4e4ee205de !195 aptss加入对sdu镜像package文件识别;修改版本号到323t4
Merge pull request !195 from shenmo/auto-4915358-dev-a949fd8a
2023-02-21 07:49:06 +00:00
9d4e19e606 aptss加入对sdu镜像package文件识别;修改版本号到323t4 2023-02-21 15:48:12 +08:00
4d142ec614 !194 fix: ssinstall 失去作用
Merge pull request !194 from Pluto/auto-5304420-dev-cf41f4bd
2023-02-21 06:45:29 +00:00
80cf746f90 fix: ssinstall 失去作用 2023-02-21 14:38:38 +08:00
ee0d3f87ec !185 4.2.3test2
Merge pull request !185 from shenmo/dev
2023-02-13 07:37:43 +00:00
4ce19e25e5 !182 4.2.2
Merge pull request !182 from shenmo/dev
2023-01-31 04:31:43 +00:00
41a6a3fc04 !181 4.2.1
Merge pull request !181 from shenmo/dev
2023-01-27 09:51:15 +00:00
682a6e38d6 !180 4.2 正式
Merge pull request !180 from shenmo/dev
2023-01-16 09:11:11 +00:00
36d273dd5e !179 4.1.2 正式版
Merge pull request !179 from shenmo/dev
2023-01-06 09:43:45 +00:00
8850cfd4a3 update dtk-build-release-tag-20220425.yml 2022-12-25 07:45:19 +00:00
bec8a14baf !177 将默认的README改为英文
Merge pull request !177 from shenmo/dev
2022-12-25 04:46:51 +00:00
8918e63484 !171 4.1.1-real
Merge pull request !171 from shenmo/dev
2022-12-21 16:18:05 +00:00
27 changed files with 245 additions and 88 deletions

View File

@@ -32,8 +32,7 @@ stages:
- cd ..
- rm -rf dtk-old-bundle
- 'mk-build-deps --install --tool "apt-get -o Debug::pkgProblemResolver=yes -y" '
- sed -i 's/-j$(JOBS)/-j2/g' debian/rules
- dpkg-buildpackage -b -us -uc
- dpkg-buildpackage -j2 -b -us -uc
- cd ..
- ls -all
- pwd

View File

@@ -33,8 +33,7 @@ stages:
- rm -rf dtk-old-bundle
- ''
- 'mk-build-deps --install --tool "apt-get -o Debug::pkgProblemResolver=yes -y" '
- sed -i 's/-j$(JOBS)/-j2/g' debian/rules
- dpkg-buildpackage -b -us -uc
- dpkg-buildpackage -j2 -b -us -uc
- cd ..
- ls -all
- pwd

View File

@@ -51,7 +51,14 @@ Then
```shell
git clone https://gitee.com/deepin-community-store/spark-store.git
cd spark-store
dpkg-buildpackage
dpkg-buildpackage -j
```
Or:
```shell
git clone https://gitee.com/deepin-community-store/spark-store.git
cd spark-store
./build_and_install.sh
```

View File

@@ -34,13 +34,13 @@
Deepin V20/UOS 21 系统下, 安装依赖
```shell
sudo apt install git qt5-default debhelper pkg-config qtchooser libqt5core5a libqt5gui5 libqt5widgets5 libqt5network5 libqt5concurrent5 libdtkcore-dev libdtkgui-dev libdtkwidget-dev qttools5-private-dev libnotify-dev qtwebengine5-dev fakeroot qtwayland5 qtwayland5-dev-tools dde-qt5wayland-plugin
sudo apt install git qt5-default debhelper pkg-config qtchooser libqt5core5a libqt5gui5 libqt5widgets5 libqt5network5 libqt5concurrent5 libdtkcore-dev libdtkgui-dev libdtkwidget-dev qttools5-private-dev libnotify-dev qtwebengine5-dev fakeroot qtwayland5 qtwayland5-dev-tools dde-qt5wayland-plugin libqt5svg5*
```
Ubuntu 22.04 系统下, 安装依赖
```shell
sudo apt install git qtbase5-dev debhelper pkg-config qtchooser libqt5core5a libqt5gui5 libqt5widgets5 libqt5network5 libqt5concurrent5 libdtkcore-dev libdtkgui-dev libdtkwidget-dev qttools5-private-dev libnotify-dev qtwebengine5-dev qtwayland5 qtwayland5-dev-tools
sudo apt install git qtbase5-dev debhelper pkg-config qtchooser libqt5core5a libqt5gui5 libqt5widgets5 libqt5network5 libqt5concurrent5 libdtkcore-dev libdtkgui-dev libdtkwidget-dev qttools5-private-dev libnotify-dev qtwebengine5-dev qtwayland5 qtwayland5-dev-tools libqt5svg5*
```
@@ -48,9 +48,15 @@ sudo apt install git qtbase5-dev debhelper pkg-config qtchooser libqt5core5a lib
```shell
git clone https://gitee.com/deepin-community-store/spark-store.git
cd spark-store
dpkg-buildpackage
dpkg-buildpackage -j
```
或者: 编译并安装
```shell
git clone https://gitee.com/deepin-community-store/spark-store.git
cd spark-store
./build_and_install.sh
```
## 🚀 协作

24
build_and_install.sh Executable file
View File

@@ -0,0 +1,24 @@
# Deepin V20/UOS 21 系统下, 安装依赖
# ```shell
# sudo apt install git qt5-default debhelper pkg-config qtchooser libqt5core5a libqt5gui5 libqt5widgets5 libqt5network5 libqt5concurrent5 libdtkcore-dev libdtkgui-dev libdtkwidget-dev qttools5-private-dev libnotify-dev qtwebengine5-dev fakeroot qtwayland5 qtwayland5-dev-tools dde-qt5wayland-plugin
# ```
# Ubuntu 22.04 系统下, 安装依赖
# ```shell
# sudo apt install git qtbase5-dev debhelper pkg-config qtchooser libqt5core5a libqt5gui5 libqt5widgets5 libqt5network5 libqt5concurrent5 libdtkcore-dev libdtkgui-dev libdtkwidget-dev qttools5-private-dev libnotify-dev qtwebengine5-dev qtwayland5 qtwayland5-dev-tools
# ```
echo "Deepin V20/UOS 21 系统下, 安装依赖"
echo "sudo apt install git qt5-default debhelper pkg-config qtchooser libqt5core5a libqt5gui5 libqt5widgets5 libqt5network5 libqt5concurrent5 libdtkcore-dev libdtkgui-dev libdtkwidget-dev qttools5-private-dev libnotify-dev qtwebengine5-dev fakeroot qtwayland5 qtwayland5-dev-tools dde-qt5wayland-plugin"
echo "Ubuntu 22.04 系统下, 安装依赖"
echo "sudo apt install git qtbase5-dev debhelper pkg-config qtchooser libqt5core5a libqt5gui5 libqt5widgets5 libqt5network5 libqt5concurrent5 libdtkcore-dev libdtkgui-dev libdtkwidget-dev qttools5-private-dev libnotify-dev qtwebengine5-dev qtwayland5 qtwayland5-dev-tools"
dpkg-buildpackage -j
sudo apt reinstall ../spark-store_*.deb
rm ../spark-store_*

15
debian/changelog vendored
View File

@@ -1,3 +1,18 @@
spark-store (4.2.3) stable; urgency=medium
* 修复: 编译依赖不全
* 修复: prerm导致的dpkg崩溃
* 新增: aptss 检查package配置增加sdustore
* 新增: 一键编译并安装脚本
* 新增: 后台安装结束后退出任务栏驻留
-- shenmo <shenmo@spark-app.store> Fri, 30 Jan 2022 00:00:00 +0800
spark-store (4.2.3~test4) stable; urgency=medium
* 修复: aptss 无法安装
-- shenmo <shenmo@spark-app.store> Fri, 30 Jan 2022 00:00:00 +0800
spark-store (4.2.3~test3) stable; urgency=medium
* 调整:打包时从 debian/changelog 自动获取构建版本号并写入关于窗口保证与deb一致

1
debian/control vendored
View File

@@ -14,6 +14,7 @@ Build-Depends:
libdtkcore-dev(>=5.0),
libdtkgui-dev(>=5.0),
libdtkwidget-dev(>=5.0),
libqt5svg5-dev,
qttools5-private-dev,
qtwebengine5-dev,
qtwayland5,

2
debian/rules vendored
View File

@@ -24,7 +24,7 @@ override_dh_auto_configure:
-o $(CURDIR)/build/
override_dh_auto_build:
make MAKEFLAGS="$(MAKEFLAGS)" -C $(CURDIR)/build
make MAKEFLAGS="$(MAKEFLAGS)" -C $(CURDIR)/build
override_dh_auto_install:
make -C $(CURDIR)/build install \

View File

@@ -1,4 +1,4 @@
#!/bin/sh
#!/bin/bash
case "$1" in
configure)

View File

@@ -1,4 +1,4 @@
#!/bin/sh
#!/bin/bash
# Update certain caches
update-icon-caches /usr/share/icons/hicolor || true

View File

@@ -1,4 +1,14 @@
#!/bin/sh
#!/bin/bash
function notify-send()
{
#Detect the user using such display
local user=$(who | awk '{print $1}' | head -n 1)
#Detect the id of the user
local uid=$(id -u $user)
sudo -u $user DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/$uid/bus notify-send "$@"
}
if [ "$1" = "remove" ] || [ "$1" = "purge" ] ; then
# Remove residual symbol links
@@ -32,4 +42,12 @@ if [ "$1" = "remove" ] || [ "$1" = "purge" ] ; then
apt-key del '9D9A A859 F750 24B1 A1EC E16E 0E41 D354 A29A 440C'
else
echo "非卸载操作,不进行配置清理"
if [ ! -z "`pidof spark-store`" ];then
echo "关闭已有 spark-store.."
notify-send "正在升级星火商店" "请在升级结束后重启星火商店" -i spark-store
killall spark-store
else
echo "继续安装 spark-store.."
fi
fi

View File

@@ -7,7 +7,7 @@
TARGET = spark-store
TEMPLATE = subdirs
CONFIG += ordered
#CONFIG += ordered
CONFIG += wayland-compositor
SUBDIRS += \

View File

@@ -113,6 +113,11 @@ void Application::setMainWindow(MainWindow *window)
#endif
}
MainWindow *Application::mainWindow()
{
return m_mainWindow;
}
void Application::initAboutDialog()
{
if (m_mainWindow == nullptr)

View File

@@ -20,7 +20,9 @@ public:
static void checkAppConfigLocation();
void setBuildDateTime(const QString &buildDateTime);
void setMainWindow(MainWindow *window);
MainWindow *mainWindow();
private:
void initAboutDialog();

View File

@@ -11,6 +11,7 @@
#include <QSettings>
#include <QFile>
#include <QStandardPaths>
#include <QSurfaceFormat>
DCORE_USE_NAMESPACE
DWIDGET_USE_NAMESPACE
@@ -35,15 +36,47 @@ int main(int argc, char *argv[])
// 龙芯机器配置,使得 DApplication 能正确加载 QTWEBENGINE
qputenv("DTK_FORCE_RASTER_WIDGETS", "FALSE");
// qputenv("QTWEBENGINE_CHROMIUM_FLAGS", "--disable-features=UseModernMediaControls");
// qputenv("QTWEBENGINE_CHROMIUM_FLAGS", "--disable-web-security");
// qputenv("QTWEBENGINE_CHROMIUM_FLAGS", "--disable-features=UseModernMediaControls");
// qputenv("QTWEBENGINE_CHROMIUM_FLAGS", "--disable-web-security");
// 浏览器开启 GPU 支持
#ifdef __sw_64__
qputenv("QTWEBENGINE_CHROMIUM_FLAGS", "--ignore-gpu-blocklist --enable-gpu-rasterization --enable-native-gpu-memory-buffers --enable-accelerated-video-decode --no-sandbox");
#else
qputenv("QTWEBENGINE_CHROMIUM_FLAGS", "--ignore-gpu-blocklist --enable-gpu-rasterization --enable-native-gpu-memory-buffers --enable-accelerated-video-decode");
qputenv("QTWEBENGINE_CHROMIUM_FLAGS", "--no-sandbox");
#endif
/**
* FIXME: 对于麒麟 CPU 设备,调用 QtWebEngine 会导致客户端崩溃;
* 暂时不对 CPU 进行判断,对 wayland 环境下统一处理
*/
if (Utils::isWayland()) {
QString env = QString::fromUtf8(qgetenv("QTWEBENGINE_CHROMIUM_FLAGS"));
env = env.trimmed();
/**
* NOTE: 参考帮助手册代码,对于麒麟 CPU 设备,
* --disable-gpu 保证 wayland 环境下网页正常显示
* --single-process 避免 wayland 环境下 QtWebEngine 崩溃(可选)
*/
env += " --disable-gpu";
qputenv("QTWEBENGINE_CHROMIUM_FLAGS", env.trimmed().toUtf8());
/**
* NOTE: 参考帮助手册代码,对于麒麟 CPU 设备,
* 避免 wayland 环境下 QtWebEngine 崩溃
*/
qputenv("QT_WAYLAND_SHELL_INTEGRATION", "kwayland-shell");
QSurfaceFormat format;
format.setRenderableType(QSurfaceFormat::OpenGLES);
QSurfaceFormat::setDefaultFormat(format);
/**
* NOTE: https://zhuanlan.zhihu.com/p/550285855
* 避免 wayland 环境下从 QtWebEngine 后退回到 QWidget 时黑屏闪烁
*/
qputenv("QMLSCENE_DEVICE", "softwarecontext");
DApplication::setAttribute(Qt::AA_UseSoftwareOpenGL);
}
DApplication::setAttribute(Qt::AA_EnableHighDpiScaling); // 开启 Hidpi 支持
// 强制使用 DTK 平台插件

View File

@@ -104,6 +104,22 @@ void MainWindow::openUrl(const QString &url)
}
}
bool MainWindow::isCloseWindowAnimation()
{
return closeWindowAnimation;
}
void MainWindow::closeEvent(QCloseEvent *event)
{
// 判断下载任务数量,如果没有要下载的,就直接退出主程序
if(!downloadlistwidget->isDownloadInProcess()){
// 已经全部下载完成
qApp->quit();
}
BaseWidgetOpacity::closeEvent(event);
}
void MainWindow::initUI()
{
setWindowTitle(QObject::tr("Spark Store"));

View File

@@ -29,6 +29,11 @@ public:
void openUrl(const QString &url);
bool isCloseWindowAnimation();
protected:
void closeEvent(QCloseEvent *event) override;
private:
void initUI();
void initTitleBar();

View File

@@ -43,6 +43,7 @@ void BaseWidgetOpacity::closeEvent(QCloseEvent *event)
bool isWayland = Utils::isWayland();
if (isWayland)
{
closeWindowAnimation = true;
return DBlurEffectWidget::closeEvent(event);
}

View File

@@ -111,7 +111,7 @@ void DownloadItem::setSpeed(QString s)
/***************************************************************
* @brief 安装当前应用
* @param int t, t为安装方式可以为 0,1,2
* @note 备注
* @note 执行这个函数时,需要已经检查是否可以安装,但该函数仍然会再检测一次!
* @Sample usage: DownloadItem::install(0);
**************************************************************/
void DownloadItem::install(int t)

View File

@@ -5,6 +5,7 @@
#include "backend/downloadworker.h"
#include "utils/utils.h"
#include "application.h"
#include "mainwindow-dtk.h"
#include <QDesktopServices>
#include <QtConcurrent>
@@ -70,6 +71,15 @@ DownloadListWidget::~DownloadListWidget()
delete ui;
}
bool DownloadListWidget::isDownloadInProcess()
{
if (toDownload > 0)
{
return true;
}
return false;
}
void DownloadListWidget::clearItem()
{
ui->listWidget->clear();
@@ -83,6 +93,7 @@ DownloadItem* DownloadListWidget::addItem(QString name, QString fileName, QStrin
}
urList.append(downloadurl);
allDownload += 1;
toDownload += 1;
DownloadItem *di = new DownloadItem;
dlist << downloadurl;
downloaditemlist << di;
@@ -126,8 +137,7 @@ void DownloadListWidget::startRequest(QUrl url, QString fileName)
{
downloadController = new DownloadController; // 并发下载,在第一次点击下载按钮的时候才会初始化
}
if (downloadController)
else
{
downloadController->disconnect();
downloadController->stopDownload();
@@ -153,17 +163,30 @@ void DownloadListWidget::httpFinished() // 完成下载
QtConcurrent::run([=]()
{
while (downloaditemlist[nowDownload - 1]->readyInstall() == -1)
while (downloaditemlist[nowDownload - 1]->readyInstall() == -1) // 安装当前应用堵塞安装后面的下载suspend
{
continue;
}
toDownload -= 1; // 安装完以后减少待安装数目
qDebug() << "Download: 还没有下载的数目:" << toDownload;
if (toDownload == 0)
{
Application *app = qobject_cast<Application *>(qApp);
MainWindow *mainWindow = app->mainWindow();
if (mainWindow->isCloseWindowAnimation() == true)
{
qDebug() << "Download: 后台安装结束,退出程序";
qApp->quit();
}
}
downloaditemlist[nowDownload - 1]->free = true;
emit downloadFinished();
if (nowDownload < allDownload)
{
// 如果有排队则下载下一个
qDebug() << "切换下一个下载...";
qDebug() << "Download: 切换下一个下载...";
nowDownload += 1;
while (downloaditemlist[nowDownload - 1]->close)
{

View File

@@ -22,12 +22,15 @@ public:
DownloadItem *addItem(QString name, QString fileName, QString pkgName, const QPixmap icon, QString downloadurl);
int nowDownload = 0;
int allDownload = 0;
int toDownload = 0;
QList<DownloadItem *> getDIList();
QList<QUrl> getUrlList();
void m_move(int x, int y);
explicit DownloadListWidget(QWidget *parent = nullptr);
~DownloadListWidget() override;
bool isDownloadInProcess();
protected:
void mouseMoveEvent(QMouseEvent *event) override;

View File

@@ -14,7 +14,7 @@ chmod -R 755 /tmp/aptss-conf
fi
if [ ! -e "/var/lib/apt/lists/d.store.deepinos.org.cn_Packages" ] && [ ! -e "/var/lib/apt/lists/d.store.deepinos.org.cn_store_Packages" ];then
if [ ! -e "/var/lib/apt/lists/d.spark-app.store_store_Packages" ] && [ ! -e "/var/lib/apt/lists/d.store.deepinos.org.cn_store_Packages" ] && [ ! -e "/var/lib/apt/lists/mirrors.sdu.edu.cn_spark-store-repository_store_Packages" ];then
echo "接收星火仓库软件信息中..."
mkdir -p /tmp/aptss-conf/

View File

@@ -61,10 +61,10 @@ fi
### 选择包信息位置
if [ -e "/var/lib/apt/lists/d.store.deepinos.org.cn_store_Packages" ];then
PACKAGES_DATA_PATH="/var/lib/apt/lists/d.store.deepinos.org.cn_store_Packages"
echo "星火仓库的Packages位置为 $PACKAGES_DATA_PATH是单目录仓库配置"
elif [ -e "/var/lib/apt/lists/d.store.deepinos.org.cn_Packages" ]
if [ -e "/var/lib/apt/lists/d.spark-app.store_store_Packages" ];then
PACKAGES_DATA_PATH="/var/lib/apt/lists/d.spark-app.store_store_Packages"
echo "星火仓库的Packages位置为 $PACKAGES_DATA_PATH星火域名单目录仓库配置"
elif [ -e "/var/lib/apt/lists/d.store.deepinos.org.cn_Packages" ];then
PACKAGES_DATA_PATH="/var/lib/apt/lists/d.store.deepinos.org.cn_Packages"
echo "星火仓库的Packages位置为 $PACKAGES_DATA_PATH是根目录仓库配置"
else

View File

@@ -240,12 +240,12 @@
<context>
<name>DAboutDialog</name>
<message>
<location filename="../src/application.cpp" line="133"/>
<location filename="../src/application.cpp" line="138"/>
<source>Version: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/application.cpp" line="143"/>
<location filename="../src/application.cpp" line="148"/>
<source>%1 is released under %2</source>
<translation type="unfinished"></translation>
</message>
@@ -452,33 +452,33 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.cpp" line="170"/>
<location filename="../src/mainwindow-dtk.cpp" line="186"/>
<source>Submit App</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.cpp" line="171"/>
<location filename="../src/mainwindow-dtk.cpp" line="187"/>
<source>Submit App with client(Recommanded)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.cpp" line="172"/>
<location filename="../src/mainwindow-dtk.cpp" line="188"/>
<source>Settings</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.cpp" line="173"/>
<location filename="../src/mainwindow-dtk.cpp" line="189"/>
<source>APP Upgrade and Install Settings</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.cpp" line="129"/>
<location filename="../src/mainwindow-dtk.cpp" line="224"/>
<location filename="../src/mainwindow-dtk.cpp" line="145"/>
<location filename="../src/mainwindow-dtk.cpp" line="240"/>
<source>Spark Store</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.cpp" line="134"/>
<location filename="../src/mainwindow-dtk.cpp" line="150"/>
<source>Search or enter spk://</source>
<translation type="unfinished"></translation>
</message>
@@ -488,7 +488,7 @@
<message>
<location filename="../src/application.cpp" line="33"/>
<location filename="../src/application.cpp" line="34"/>
<location filename="../src/mainwindow-dtk.cpp" line="109"/>
<location filename="../src/mainwindow-dtk.cpp" line="125"/>
<source>Spark Store</source>
<translation type="unfinished"></translation>
</message>
@@ -498,17 +498,17 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/application.cpp" line="140"/>
<location filename="../src/application.cpp" line="145"/>
<source>Spark Project</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/widgets/downloadlistwidget.cpp" line="17"/>
<location filename="../src/widgets/downloadlistwidget.cpp" line="18"/>
<source>Download list</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.cpp" line="227"/>
<location filename="../src/mainwindow-dtk.cpp" line="243"/>
<source>Show MainWindow</source>
<translation type="unfinished"></translation>
</message>
@@ -619,12 +619,12 @@
<context>
<name>TitleBarMenu</name>
<message>
<location filename="../src/mainwindow-dtk.cpp" line="228"/>
<location filename="../src/mainwindow-dtk.cpp" line="244"/>
<source>About</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.cpp" line="229"/>
<location filename="../src/mainwindow-dtk.cpp" line="245"/>
<source>Exit</source>
<translation type="unfinished"></translation>
</message>

View File

@@ -240,12 +240,12 @@
<context>
<name>DAboutDialog</name>
<message>
<location filename="../src/application.cpp" line="133"/>
<location filename="../src/application.cpp" line="138"/>
<source>Version: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/application.cpp" line="143"/>
<location filename="../src/application.cpp" line="148"/>
<source>%1 is released under %2</source>
<translation type="unfinished"></translation>
</message>
@@ -452,33 +452,33 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.cpp" line="170"/>
<location filename="../src/mainwindow-dtk.cpp" line="186"/>
<source>Submit App</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.cpp" line="171"/>
<location filename="../src/mainwindow-dtk.cpp" line="187"/>
<source>Submit App with client(Recommanded)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.cpp" line="172"/>
<location filename="../src/mainwindow-dtk.cpp" line="188"/>
<source>Settings</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.cpp" line="173"/>
<location filename="../src/mainwindow-dtk.cpp" line="189"/>
<source>APP Upgrade and Install Settings</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.cpp" line="129"/>
<location filename="../src/mainwindow-dtk.cpp" line="224"/>
<location filename="../src/mainwindow-dtk.cpp" line="145"/>
<location filename="../src/mainwindow-dtk.cpp" line="240"/>
<source>Spark Store</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.cpp" line="134"/>
<location filename="../src/mainwindow-dtk.cpp" line="150"/>
<source>Search or enter spk://</source>
<translation type="unfinished"></translation>
</message>
@@ -488,7 +488,7 @@
<message>
<location filename="../src/application.cpp" line="33"/>
<location filename="../src/application.cpp" line="34"/>
<location filename="../src/mainwindow-dtk.cpp" line="109"/>
<location filename="../src/mainwindow-dtk.cpp" line="125"/>
<source>Spark Store</source>
<translation type="unfinished"></translation>
</message>
@@ -498,17 +498,17 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/application.cpp" line="140"/>
<location filename="../src/application.cpp" line="145"/>
<source>Spark Project</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/widgets/downloadlistwidget.cpp" line="17"/>
<location filename="../src/widgets/downloadlistwidget.cpp" line="18"/>
<source>Download list</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.cpp" line="227"/>
<location filename="../src/mainwindow-dtk.cpp" line="243"/>
<source>Show MainWindow</source>
<translation type="unfinished"></translation>
</message>
@@ -619,12 +619,12 @@
<context>
<name>TitleBarMenu</name>
<message>
<location filename="../src/mainwindow-dtk.cpp" line="228"/>
<location filename="../src/mainwindow-dtk.cpp" line="244"/>
<source>About</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.cpp" line="229"/>
<location filename="../src/mainwindow-dtk.cpp" line="245"/>
<source>Exit</source>
<translation type="unfinished"></translation>
</message>

View File

@@ -240,12 +240,12 @@
<context>
<name>DAboutDialog</name>
<message>
<location filename="../src/application.cpp" line="133"/>
<location filename="../src/application.cpp" line="138"/>
<source>Version: %1</source>
<translation>%1</translation>
</message>
<message>
<location filename="../src/application.cpp" line="143"/>
<location filename="../src/application.cpp" line="148"/>
<source>%1 is released under %2</source>
<translation>%1%2</translation>
</message>
@@ -452,33 +452,33 @@
<translation></translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.cpp" line="170"/>
<location filename="../src/mainwindow-dtk.cpp" line="186"/>
<source>Submit App</source>
<translation></translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.cpp" line="171"/>
<location filename="../src/mainwindow-dtk.cpp" line="187"/>
<source>Submit App with client(Recommanded)</source>
<translation>使稿</translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.cpp" line="172"/>
<location filename="../src/mainwindow-dtk.cpp" line="188"/>
<source>Settings</source>
<translation></translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.cpp" line="173"/>
<location filename="../src/mainwindow-dtk.cpp" line="189"/>
<source>APP Upgrade and Install Settings</source>
<translation></translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.cpp" line="129"/>
<location filename="../src/mainwindow-dtk.cpp" line="224"/>
<location filename="../src/mainwindow-dtk.cpp" line="145"/>
<location filename="../src/mainwindow-dtk.cpp" line="240"/>
<source>Spark Store</source>
<translation></translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.cpp" line="134"/>
<location filename="../src/mainwindow-dtk.cpp" line="150"/>
<source>Search or enter spk://</source>
<translation></translation>
</message>
@@ -488,7 +488,7 @@
<message>
<location filename="../src/application.cpp" line="33"/>
<location filename="../src/application.cpp" line="34"/>
<location filename="../src/mainwindow-dtk.cpp" line="109"/>
<location filename="../src/mainwindow-dtk.cpp" line="125"/>
<source>Spark Store</source>
<translation></translation>
</message>
@@ -498,17 +498,17 @@
<translation>&lt;span style=&apos; font-size:10pt;font-weight:60;&apos;&gt;&lt;/span&gt;&lt;br/&gt;&lt;a href=&apos;https://www.spark-app.store/&apos;&gt;https://www.spark-app.store&lt;/a&gt;&lt;br/&gt;&lt;span style=&apos; font-size:12pt;&apos;&gt;星火计划开发者&lt;/span&gt;</translation>
</message>
<message>
<location filename="../src/application.cpp" line="140"/>
<location filename="../src/application.cpp" line="145"/>
<source>Spark Project</source>
<translation></translation>
</message>
<message>
<location filename="../src/widgets/downloadlistwidget.cpp" line="17"/>
<location filename="../src/widgets/downloadlistwidget.cpp" line="18"/>
<source>Download list</source>
<translation></translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.cpp" line="227"/>
<location filename="../src/mainwindow-dtk.cpp" line="243"/>
<source>Show MainWindow</source>
<translation></translation>
</message>
@@ -619,12 +619,12 @@
<context>
<name>TitleBarMenu</name>
<message>
<location filename="../src/mainwindow-dtk.cpp" line="228"/>
<location filename="../src/mainwindow-dtk.cpp" line="244"/>
<source>About</source>
<translation></translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.cpp" line="229"/>
<location filename="../src/mainwindow-dtk.cpp" line="245"/>
<source>Exit</source>
<translation>退</translation>
</message>

View File

@@ -240,12 +240,12 @@
<context>
<name>DAboutDialog</name>
<message>
<location filename="../src/application.cpp" line="133"/>
<location filename="../src/application.cpp" line="138"/>
<source>Version: %1</source>
<translation>%1</translation>
</message>
<message>
<location filename="../src/application.cpp" line="143"/>
<location filename="../src/application.cpp" line="148"/>
<source>%1 is released under %2</source>
<translation>%1%2</translation>
</message>
@@ -452,33 +452,33 @@
<translation></translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.cpp" line="170"/>
<location filename="../src/mainwindow-dtk.cpp" line="186"/>
<source>Submit App</source>
<translation></translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.cpp" line="171"/>
<location filename="../src/mainwindow-dtk.cpp" line="187"/>
<source>Submit App with client(Recommanded)</source>
<translation>()</translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.cpp" line="172"/>
<location filename="../src/mainwindow-dtk.cpp" line="188"/>
<source>Settings</source>
<translation></translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.cpp" line="173"/>
<location filename="../src/mainwindow-dtk.cpp" line="189"/>
<source>APP Upgrade and Install Settings</source>
<translation> </translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.cpp" line="129"/>
<location filename="../src/mainwindow-dtk.cpp" line="224"/>
<location filename="../src/mainwindow-dtk.cpp" line="145"/>
<location filename="../src/mainwindow-dtk.cpp" line="240"/>
<source>Spark Store</source>
<translation></translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.cpp" line="134"/>
<location filename="../src/mainwindow-dtk.cpp" line="150"/>
<source>Search or enter spk://</source>
<translation></translation>
</message>
@@ -488,7 +488,7 @@
<message>
<location filename="../src/application.cpp" line="33"/>
<location filename="../src/application.cpp" line="34"/>
<location filename="../src/mainwindow-dtk.cpp" line="109"/>
<location filename="../src/mainwindow-dtk.cpp" line="125"/>
<source>Spark Store</source>
<translation></translation>
</message>
@@ -498,17 +498,17 @@
<translation>&lt;span style=&apos; font-size:10pt;font-weight:60;&apos;&gt;&lt;/span&gt;&lt;br/&gt;&lt;a href=&apos;https://www.spark-app.store/&apos;&gt;https://www.spark-app.store&lt;/a&gt;&lt;br/&gt;&lt;span style=&apos; font-size:12pt;&apos;&gt;星火计划开发者&lt;/span&gt;</translation>
</message>
<message>
<location filename="../src/application.cpp" line="140"/>
<location filename="../src/application.cpp" line="145"/>
<source>Spark Project</source>
<translation></translation>
</message>
<message>
<location filename="../src/widgets/downloadlistwidget.cpp" line="17"/>
<location filename="../src/widgets/downloadlistwidget.cpp" line="18"/>
<source>Download list</source>
<translation></translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.cpp" line="227"/>
<location filename="../src/mainwindow-dtk.cpp" line="243"/>
<source>Show MainWindow</source>
<translation></translation>
</message>
@@ -619,12 +619,12 @@
<context>
<name>TitleBarMenu</name>
<message>
<location filename="../src/mainwindow-dtk.cpp" line="228"/>
<location filename="../src/mainwindow-dtk.cpp" line="244"/>
<source>About</source>
<translation></translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.cpp" line="229"/>
<location filename="../src/mainwindow-dtk.cpp" line="245"/>
<source>Exit</source>
<translation>退</translation>
</message>