Compare commits

..

28 Commits

Author SHA1 Message Date
fdc7bf2551 !301 4321
Merge pull request !301 from shenmo/dev
2024-10-28 14:06:12 +00:00
ed3db29806 add: GXDE Builder 2024-10-28 22:04:40 +08:00
81ab122d6b fix: now we don't need root to policy/search 2024-10-28 21:59:25 +08:00
bab1b1cb0a fix: In ACE you can't use updater 2024-10-25 13:10:25 +08:00
15e826898b Merge branch 'Reason' of gitee.com:spark-store-project/spark-store into dev
Signed-off-by: shenmo <jifengshenmo@outlook.com>
2024-10-22 11:46:44 +00:00
62642cc0a6 !299 4320
Merge pull request !299 from shenmo/dev
2024-10-22 11:45:49 +00:00
7c1e44010c export DEBIAN_FRONTEND=noninteractive
Signed-off-by: shenmo <jifengshenmo@outlook.com>
2024-10-22 11:43:59 +00:00
4bb389e378 update debian/changelog.
Signed-off-by: shenmo <jifengshenmo@outlook.com>
2024-10-22 11:43:15 +00:00
22ea57c263 update tool/update-upgrade/ss-do-upgrade-worker.sh.
Signed-off-by: shenmo <jifengshenmo@outlook.com>
2024-10-22 09:58:18 +00:00
zty199
019f20dcba fix: wrong back button position
mistakenly use setSpacing in layout

Log: delete setSpacing operation; adjust layout margin
2024-10-21 22:35:33 +08:00
zty199
f4fa07d589 fix: incorrect download water drop animation start position
use rect().center() instead of event->rect().center() in WaterDrop::paintEvent;
all coordinate calculation should use float instead of int

Log: fix incorrect download water drop animation start position
2024-10-21 21:41:18 +08:00
44d04c5bcb !298 fix: abandon dpkg
Merge pull request !298 from shenmo/auto-4915358-Reason-22474d88-1
2024-10-20 18:45:27 +00:00
e7d15f903d fix: abandon dpkg 2024-10-21 02:45:13 +08:00
c865643e8d !297 fix: no dpkg
Merge pull request !297 from shenmo/auto-4915358-Flamescion-8343e2b9-1
2024-10-20 18:44:22 +00:00
0b4733c08c fix: no dpkg 2024-10-21 02:41:51 +08:00
fb01686527 fix: Now only use apt but not dpkg
Signed-off-by: shenmo <jifengshenmo@outlook.com>
2024-10-20 18:41:27 +00:00
7ad606bbd4 update debian/changelog.
Signed-off-by: shenmo <jifengshenmo@outlook.com>
2024-10-20 18:29:42 +00:00
723475ca9c !296 432
Merge pull request !296 from shenmo/dev
2024-10-20 18:29:38 +00:00
f74e936aa5 !295 432
Merge pull request !295 from shenmo/dev
2024-10-20 18:29:25 +00:00
6fee032bd1 fix:quotes 2024-10-21 02:06:34 +08:00
f3a690d9ae try fix install won't fix dependencies 2024-10-21 01:57:34 +08:00
120793dbcc bump version to 4.3.2 2024-10-21 01:47:53 +08:00
39a2f74f2e update aptss 4.3.2 2024-10-21 01:47:00 +08:00
zty199
b49ea2c71f fix: compatible with deepin V23 compact mode
modify titlebar layout, widget size and animation;
modify whole window layout, allow titlebar to resize automatically

Log: compatible with deepin V23 compact mode
2024-10-21 00:12:10 +08:00
3647d80037 !294 431
Merge pull request !294 from shenmo/dev
2024-10-14 06:24:32 +00:00
94f555bfa6 !291 43f5
Merge pull request !291 from shenmo/dev
2024-09-23 05:04:29 +00:00
c8759e8284 !285 430
Merge pull request !285 from shenmo/dev
2024-08-19 08:33:42 +00:00
506ead11f9 !280 4.3
Merge pull request !280 from shenmo/dev
2024-08-17 06:16:49 +00:00
18 changed files with 869 additions and 759 deletions

13
.github/workflows/program-builder.yml vendored Normal file
View 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

22
debian/changelog vendored
View File

@@ -1,3 +1,25 @@
spark-store (4.3.2.1) UNRELEASED; urgency=medium
* 修复 aptss policy / aptss search 需要root的问题
-- shenmo <shenmo@spark-app.store> Tue, 24 Sep 2024 11:27:08 +0800
spark-store (4.3.2.0) UNRELEASED; urgency=medium
* 后续更新请从4.3.2.0版本号开始4.3.2版本仅用于GXDE测试
* 支持dummyapps 安装包安装
* 支持紧凑模式
* 修复部分情况下升级安装失败的问题
-- shenmo <shenmo@spark-app.store> Tue, 24 Sep 2024 11:27:08 +0800
spark-store (4.3.2) UNRELEASED; urgency=medium
* ssinstall支持安装conflict包
* 支持紧凑模式
-- shenmo <shenmo@spark-app.store> Tue, 24 Sep 2024 11:27:08 +0800
spark-store (4.3.1) UNRELEASED; urgency=medium
* 修复自提权更新问题

View File

@@ -22,9 +22,6 @@
#define AppPageSearchlist 1
#define AppPageAppdetail 2
#define AppPageSettings 3
#define WaylandSearchCenter 1
#define OtherSearchCenter 2
#define RightSearchSpace 1
#define UploadServerUrl "https://upload.deepinos.org.cn/"
MainWindow::MainWindow(QWidget *parent)
@@ -126,6 +123,16 @@ void MainWindow::closeEvent(QCloseEvent *event)
BaseWidgetOpacity::closeEvent(event);
}
void MainWindow::changeEvent(QEvent *event)
{
if (event->type() != QEvent::StyleChange) {
return BaseWidgetOpacity::changeEvent(event);
}
BaseWidgetOpacity::changeEvent(event);
downloadButton->setFixedSize(searchEdit->sizeHint().height(), searchEdit->sizeHint().height());
}
void MainWindow::initUI()
{
QSettings config(QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation) + "/config.ini", QSettings::IniFormat);
@@ -159,8 +166,9 @@ void MainWindow::initTitleBar()
ui->titlebar->setBackgroundTransparent(true);
// 初始化标题栏控件
DLabel *title = new DLabel(ui->titlebar);
title->setText(tr("Spark Store"));
DLabel *titleLabel = new DLabel(ui->titlebar);
titleLabel->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
titleLabel->setText(tr("Spark Store"));
backButton = new DPushButton(ui->titlebar);
@@ -170,34 +178,37 @@ void MainWindow::initTitleBar()
searchEdit->lineEdit()->setFixedWidth(350);
downloadButton = new ProgressButton(ui->titlebar);
downloadButton->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
downloadButton->setDownloadListWidget(downloadlistwidget);
downloadButton->setFocusPolicy(Qt::FocusPolicy::ClickFocus);
downloadButton->setFixedSize(searchEdit->sizeHint().height(), searchEdit->sizeHint().height());
downloadlistwidget->setFocusProxy(downloadButton);
QWidget *w_titlebar = new QWidget(ui->titlebar);
QHBoxLayout *ly_titlebar = new QHBoxLayout(w_titlebar);
ly_titlebar->addWidget(title);
ly_titlebar->addWidget(backButton);
// Check wayland configs
QSettings config(QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation) + "/config.ini", QSettings::IniFormat);
if (!config.value("runtime/isDDE").toBool() && config.value("runtime/useWayland").toBool())
{
// Wayland 搜索栏居中
ly_titlebar->addStretch(WaylandSearchCenter);
}
else
{
// dwayland dxcb 搜索栏顶部右侧居中
ly_titlebar->addStretch(OtherSearchCenter);
}
ly_titlebar->addWidget(searchEdit);
ly_titlebar->addWidget(downloadButton);
ly_titlebar->addStretch(RightSearchSpace);
ui->titlebar->setCustomWidget(w_titlebar);
QWidget *customWidget = new QWidget(ui->titlebar);
customWidget->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
ui->titlebar->setCustomWidget(customWidget);
QHBoxLayout *customWidgetLayout = new QHBoxLayout(customWidget);
customWidgetLayout->setContentsMargins(8, 0, 0, 0);
customWidgetLayout->setSpacing(0);
customWidgetLayout->addWidget(titleLabel, 0, Qt::AlignLeft);
customWidgetLayout->addSpacing(8);
customWidgetLayout->addWidget(backButton, 0, Qt::AlignLeft);
QWidget *centralWidget = new QWidget(customWidget);
centralWidget->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
customWidgetLayout->addWidget(centralWidget, 1, Qt::AlignHCenter);
QHBoxLayout *centralLayout = new QHBoxLayout(centralWidget);
centralLayout->setContentsMargins(20, 0, 10, 0);
centralLayout->setSpacing(0);
centralLayout->addWidget(searchEdit, 0, Qt::AlignHCenter);
centralLayout->addSpacing(10);
centralLayout->addWidget(downloadButton, 0, Qt::AlignHCenter);
initTitleBarMenu();
backButton->hide();
backButton->setDisabled(true);
downloadlistwidget->hide();
}
@@ -353,9 +364,9 @@ void MainWindow::initConnections()
ui->stackedWidget->setCurrentIndex(pageHistory.at(pageHistory.count() - 2));
pageHistory.removeLast();
if (pageHistory.count() > 1) {
backButton->show();
backButton->setEnabled(true);
} else {
backButton->hide();
backButton->setDisabled(true);
} });
// 搜索事件
@@ -446,11 +457,11 @@ void MainWindow::switchPage(int now) // 临时方案,回家后修改
qDebug() << pageHistory.count();
if (pageHistory.count() >= 1)
{
backButton->show();
backButton->setEnabled(true);
}
else
{
backButton->hide();
backButton->setDisabled(true);
}
ui->stackedWidget->setCurrentIndex(now);
ui->stackedWidget->currentWidget()->setFocus();

View File

@@ -34,6 +34,7 @@ public:
protected:
void closeEvent(QCloseEvent *event) override;
void changeEvent(QEvent *event) override;
private:
void initUI();

File diff suppressed because it is too large Load Diff

View File

@@ -9,10 +9,6 @@
ProgressButton::ProgressButton(QWidget *parent)
: QWidget{parent}
{
// this->setWindowFlags(Qt::FramelessWindowHint);
// this->setAttribute(Qt::WA_TranslucentBackground, true);
setMinimumSize(36, 36);
svgPath = "";
backColor = Qt::transparent;
@@ -37,7 +33,7 @@ void ProgressButton::setProgress(int progress)
buttonState = state::closeProgress;
update();
WaterDrop *waterDrop = new WaterDrop(parentWidget());
waterDrop->move(geometry().center());
waterDrop->move(QRectF(geometry()).center());
waterDrop->show();
}
repaint();
@@ -77,12 +73,9 @@ void ProgressButton::mousePressEvent(QMouseEvent *event)
void ProgressButton::mouseReleaseEvent(QMouseEvent *event)
{
if (buttonState == state::hover || buttonState == state::normal)
{
widthChangeValue = (this->width() - 6) / 2;
update();
}
else if (buttonState == state::closeProgress)
if (buttonState == state::hover
|| buttonState == state::normal
|| buttonState == state::closeProgress)
{
update();
}
@@ -131,19 +124,15 @@ void ProgressButton::paintEvent(QPaintEvent *event)
{
QPainter painter(this);
painter.setRenderHint(QPainter::Antialiasing, true);
QRect rect = event->rect();
QRectF rect = this->rect();
if (buttonState == state::normal || buttonState == state::hover)
{
int radius = (rect.height() - 6) / 2;
qreal radius = rect.height() / 2;
painter.translate(rect.center());
painter.setPen(Qt::transparent);
painter.setBrush(QColor(buttonState == state::normal ? color : color.darker()));
// painter.drawEllipse(QPoint(0, 0), radius, radius);
// radiu -= 3;
painter.setBrush(backColor);
painter.drawEllipse(QPoint(0, 0), radius, radius);
painter.drawEllipse(QPointF(0, 0), radius, radius);
QSvgRenderer m_svgRender;
m_svgRender.load(svgPath);
@@ -151,42 +140,34 @@ void ProgressButton::paintEvent(QPaintEvent *event)
}
else if (buttonState == state::openProgress)
{
qreal radius = rect.height() / 2 - 1;
painter.translate(rect.center());
int radius = (rect.height() - 6) / 2 - 3;
painter.setPen(QPen(backColor.darker(), 2));
painter.setBrush(backColor);
painter.setPen(QPen(backColor, 3));
painter.drawEllipse(QPoint(0, 0), radius, radius);
painter.drawEllipse(QPointF(0, 0), radius, radius);
painter.setPen(QPen(backColor, 3));
QRectF rectF = QRectF(-radius, -radius, radius * 2, radius * 2);
painter.setPen(QPen(color.darker(100), 2));
qreal angle = progress * 360 / 100 * 1.0;
painter.drawArc(rectF, 90 * 16, -qIntCast(angle * 16));
QSvgRenderer m_svgRender;
m_svgRender.load(svgPath);
m_svgRender.render(&painter, QRectF(-radius / 2, -radius / 2, radius, radius));
QRect rect = QRect(-radius, -radius,
radius * 2, radius * 2);
painter.setPen(QPen(color.darker(100), 3));
qreal angle = progress * 360 / 100 * 1.0;
painter.drawArc(rect.adjusted(-3, -3, 3, 3), 90 * 16, -qIntCast(angle * 16));
}
else if (buttonState == state::closeProgress)
{
auto radius = (rect.height() - 6) / 2;
qreal radius = rect.height() / 2 - 1;
painter.translate(rect.center());
painter.setPen(Qt::transparent);
painter.setBrush(QColor(0, 0, 0, 63));
painter.drawEllipse(QPoint(0, 0), radius, radius);
radius -= 3;
painter.setPen(QPen(color.darker(100), 2));
painter.setBrush(backColor);
painter.drawEllipse(QPoint(0, 0), radius, radius);
painter.drawEllipse(QPointF(0, 0), radius, radius);
painter.setPen(QPen(color, 3, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin));
painter.drawLine(QPoint(-radius / 3, 0),
QPoint(-radius / 5, radius / 3));
painter.drawLine(QPoint(-radius / 5, radius / 3),
QPoint(radius / 4, -radius / 4));
painter.setPen(QPen(color, 2, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin));
painter.drawLine(QPointF(-radius / 3, 0),
QPointF(-radius / 5, radius / 3));
painter.drawLine(QPointF(-radius / 5, radius / 3),
QPointF(radius / 4, -radius / 4));
}
QWidget::paintEvent(event);
}
@@ -195,7 +176,7 @@ void ProgressButton::operationProcessing()
{
}
const int RADIUS = 60;
const int RADIUS = 30;
WaterDrop::WaterDrop(QWidget *parent)
: QWidget(parent)
, m_waterDropAnimation(new QVariantAnimation(this))
@@ -210,20 +191,20 @@ WaterDrop::WaterDrop(QWidget *parent)
}
// 把鼠标点击的点转换为圆心点坐标
void WaterDrop::move(const QPoint &point)
void WaterDrop::move(const QPointF &point)
{
QPoint translatePoint = point - QPoint(RADIUS, RADIUS);
QWidget::move(translatePoint);
QPointF translatePoint = point - QRectF(rect()).center();
QWidget::move(qRound(translatePoint.x()), qRound(translatePoint.y()));
}
void WaterDrop::show()
{
m_waterDropAnimation->setStartValue(0);
m_waterDropAnimation->setEndValue(RADIUS);
m_waterDropAnimation->setEndValue(RADIUS - 2);
m_waterDropAnimation->setDuration(350);
connect(m_waterDropAnimation, &QVariantAnimation::valueChanged, this, &WaterDrop::onRadiusChanged);
connect(m_waterDropAnimation, &QVariantAnimation::finished, this, &WaterDrop::close);
connect(m_waterDropAnimation, &QVariantAnimation::finished, this, &WaterDrop::deleteLater);
m_waterDropAnimation->start(QVariantAnimation::DeleteWhenStopped);
QWidget::show();
}
@@ -232,10 +213,9 @@ void WaterDrop::paintEvent(QPaintEvent *event)
{
QPainter painter(this);
painter.setRenderHint(QPainter::Antialiasing);
QPen pen(QBrush(QColor("#ffff80")), 5.0);
pen.setWidth(5);
QPen pen(QBrush(QColor("#ffff80")), 4.0);
painter.setPen(pen);
painter.drawEllipse(event->rect().center(), m_animationRadius, m_animationRadius);
painter.drawEllipse(QRectF(rect()).center(), m_animationRadius, m_animationRadius);
QWidget::paintEvent(event);
}

View File

@@ -52,7 +52,6 @@ private:
QColor backColor;
QColor color;
QString svgPath;
int widthChangeValue{0};
int progress{0};//处理百分比
bool m_mouseMoved = false;
@@ -66,7 +65,7 @@ class WaterDrop : public QWidget
public:
explicit WaterDrop(QWidget *parent = nullptr);
void show();
void move(const QPoint &point);
void move(const QPointF &point);
protected:
void paintEvent(QPaintEvent *event);

View File

@@ -52,7 +52,7 @@ for argument in "$@"; do
option="source"
root=0
;;
changelog)
changelog|search|policy)
root=0
;;
esac

View File

@@ -2,6 +2,7 @@
source /opt/durapps/spark-store/bin/bashimport/transhell.amber
load_transhell_debug
export DEBIAN_FRONTEND=noninteractive
case $(arch) in
x86_64)
@@ -122,7 +123,7 @@ DEBPATH=$(realpath "$1")
exit "$try_run_ret"
fi
dpkg -i "$DEBPATH" || aptss install -yf
aptss install "$DEBPATH" -yf --reinstall
if [ "$?" = "0" ] && [ "$2" = "--delete-after-install" ]; then
if dpkg -s "$package_name" >/dev/null 2>&1; then

View File

@@ -2,6 +2,7 @@
source /opt/durapps/spark-store/bin/bashimport/transhell.amber
load_transhell_debug
export DEBIAN_FRONTEND=noninteractive
trap 'unlock_file $DEBPATH' EXIT
case $(arch) in
@@ -165,7 +166,7 @@ if [ ! -z "$IS_SHA512SUM_CHECKED" ]; then
exit "$try_run_ret"
fi
dpkg -i "$DEBPATH" || aptss install -yf
aptss install "$DEBPATH" -yf --reinstall
unlock_file "$DEBPATH"

45
tool/store-helper/pass-auth.sh Executable file
View File

@@ -0,0 +1,45 @@
#!/bin/bash
# We use sudo twice to avoid ACE bug here
# https://gitee.com/amber-ce/amber-ce-bookworm/commit/43e1a1599ede474b37e41aa10c53fd8afc4d35a1
function zenity() {
if [[ -e /usr/bin/garma ]]; then
garma "$@"
else
$(command -v zenity) "$@"
fi
}
# 检查sudo是否需要密码
if sudo sudo -n true 2>/dev/null; then
echo "sudo 无需密码,继续执行"
else
# 循环输入密码直到成功或用户取消
while true; do
# 使用zenity弹出密码输入框
PASSWORD=$(zenity --password --title="需要sudo权限" )
# 检查用户是否取消输入
if [ -z "$PASSWORD" ]; then
zenity --error --text="操作已取消"
exit 1
fi
# 尝试使用输入的密码执行sudo命令
echo "$PASSWORD" | sudo sudo -S true 2>/dev/null
# 检查sudo是否成功
if [ $? -eq 0 ]; then
echo "密码正确,继续执行"
break
else
zenity --error --text="密码错误,请重新输入"
fi
done
fi
echo "$PASSWORD" | sudo sudo -S "$@"

View File

@@ -1,6 +1,6 @@
#!/bin/bash
export LANGUAGE=en_US
export DEBIAN_FRONTEND=noninteractive
case $1 in
ssupdate)
if [ "$(id -u)" != "0" ] ; then

View File

@@ -1,7 +1,11 @@
#!/bin/bash
if [ "$(id -u)" != "0" ] ; then
pkexec "$0" "$@"
exit
if [[ IS_ACE_ENV="1" ]];then
/opt/durapps/spark-store/bin/store-helper/pass-auth.sh "$0" "$@"
else
pkexec "$0" "$@"
exit
fi
fi
trap "rm -f /tmp/spark-store/upgradeStatus.txt" EXIT
source /opt/durapps/spark-store/bin/bashimport/transhell.amber

View File

@@ -411,103 +411,103 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.ui" line="166"/>
<location filename="../src/mainwindow-dtk.ui" line="116"/>
<source>Home</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.ui" line="203"/>
<location filename="../src/mainwindow-dtk.ui" line="153"/>
<source>Network</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.ui" line="231"/>
<location filename="../src/mainwindow-dtk.ui" line="181"/>
<source>Chat</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.ui" line="259"/>
<location filename="../src/mainwindow-dtk.ui" line="209"/>
<source>Music</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.ui" line="287"/>
<location filename="../src/mainwindow-dtk.ui" line="237"/>
<source>Video</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.ui" line="315"/>
<location filename="../src/mainwindow-dtk.ui" line="265"/>
<source>Picture</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.ui" line="343"/>
<location filename="../src/mainwindow-dtk.ui" line="293"/>
<source>Game</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.ui" line="371"/>
<location filename="../src/mainwindow-dtk.ui" line="321"/>
<source>Office</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.ui" line="399"/>
<location filename="../src/mainwindow-dtk.ui" line="349"/>
<source>Reading</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.ui" line="427"/>
<location filename="../src/mainwindow-dtk.ui" line="377"/>
<source>Development</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.ui" line="455"/>
<location filename="../src/mainwindow-dtk.ui" line="405"/>
<source>Tool</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.ui" line="483"/>
<location filename="../src/mainwindow-dtk.ui" line="433"/>
<source>Theme</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.ui" line="511"/>
<location filename="../src/mainwindow-dtk.ui" line="461"/>
<source>Other</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.ui" line="539"/>
<location filename="../src/mainwindow-dtk.ui" line="489"/>
<source>APP Upgrade</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.cpp" line="206"/>
<location filename="../src/mainwindow-dtk.cpp" line="217"/>
<source>Submit App</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.cpp" line="207"/>
<location filename="../src/mainwindow-dtk.cpp" line="218"/>
<source>Submit App with client(Recommanded)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.cpp" line="208"/>
<location filename="../src/mainwindow-dtk.cpp" line="219"/>
<source>Settings</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.cpp" line="209"/>
<location filename="../src/mainwindow-dtk.cpp" line="220"/>
<source>APP Upgrade and Install Settings</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.cpp" line="163"/>
<location filename="../src/mainwindow-dtk.cpp" line="260"/>
<location filename="../src/mainwindow-dtk.cpp" line="171"/>
<location filename="../src/mainwindow-dtk.cpp" line="271"/>
<source>Spark Store</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.cpp" line="168"/>
<location filename="../src/mainwindow-dtk.cpp" line="176"/>
<source>Search or enter spk://</source>
<translation type="unfinished"></translation>
</message>
@@ -517,7 +517,7 @@
<message>
<location filename="../src/application.cpp" line="36"/>
<location filename="../src/application.cpp" line="37"/>
<location filename="../src/mainwindow-dtk.cpp" line="142"/>
<location filename="../src/mainwindow-dtk.cpp" line="149"/>
<source>Spark Store</source>
<translation type="unfinished"></translation>
</message>
@@ -537,7 +537,7 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.cpp" line="263"/>
<location filename="../src/mainwindow-dtk.cpp" line="274"/>
<source>Show MainWindow</source>
<translation type="unfinished"></translation>
</message>
@@ -658,12 +658,12 @@
<context>
<name>TitleBarMenu</name>
<message>
<location filename="../src/mainwindow-dtk.cpp" line="264"/>
<location filename="../src/mainwindow-dtk.cpp" line="275"/>
<source>About</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.cpp" line="265"/>
<location filename="../src/mainwindow-dtk.cpp" line="276"/>
<source>Exit</source>
<translation type="unfinished"></translation>
</message>

View File

@@ -411,103 +411,103 @@
<translation>Ventana principal</translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.ui" line="166"/>
<location filename="../src/mainwindow-dtk.ui" line="116"/>
<source>Home</source>
<translation>Casa</translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.ui" line="203"/>
<location filename="../src/mainwindow-dtk.ui" line="153"/>
<source>Network</source>
<translation>Red</translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.ui" line="231"/>
<location filename="../src/mainwindow-dtk.ui" line="181"/>
<source>Chat</source>
<translation>Charla</translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.ui" line="259"/>
<location filename="../src/mainwindow-dtk.ui" line="209"/>
<source>Music</source>
<translation>Música</translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.ui" line="287"/>
<location filename="../src/mainwindow-dtk.ui" line="237"/>
<source>Video</source>
<translation>Vídeo</translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.ui" line="315"/>
<location filename="../src/mainwindow-dtk.ui" line="265"/>
<source>Picture</source>
<translation>Foto</translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.ui" line="343"/>
<location filename="../src/mainwindow-dtk.ui" line="293"/>
<source>Game</source>
<translation>Juego</translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.ui" line="371"/>
<location filename="../src/mainwindow-dtk.ui" line="321"/>
<source>Office</source>
<translation>Oficina</translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.ui" line="399"/>
<location filename="../src/mainwindow-dtk.ui" line="349"/>
<source>Reading</source>
<translation>Leer</translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.ui" line="427"/>
<location filename="../src/mainwindow-dtk.ui" line="377"/>
<source>Development</source>
<translation>Desarrollo</translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.ui" line="455"/>
<location filename="../src/mainwindow-dtk.ui" line="405"/>
<source>Tool</source>
<translation>Herramientas</translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.ui" line="483"/>
<location filename="../src/mainwindow-dtk.ui" line="433"/>
<source>Theme</source>
<translation>Tema</translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.ui" line="511"/>
<location filename="../src/mainwindow-dtk.ui" line="461"/>
<source>Other</source>
<translation>Además</translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.ui" line="539"/>
<location filename="../src/mainwindow-dtk.ui" line="489"/>
<source>APP Upgrade</source>
<translation>Actualización de app</translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.cpp" line="206"/>
<location filename="../src/mainwindow-dtk.cpp" line="217"/>
<source>Submit App</source>
<translation>Presentación de la aplicación</translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.cpp" line="207"/>
<location filename="../src/mainwindow-dtk.cpp" line="218"/>
<source>Submit App with client(Recommanded)</source>
<translation>Enviar la aplicación al cliente (recomendación)</translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.cpp" line="208"/>
<location filename="../src/mainwindow-dtk.cpp" line="219"/>
<source>Settings</source>
<translation>Configuración</translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.cpp" line="209"/>
<location filename="../src/mainwindow-dtk.cpp" line="220"/>
<source>APP Upgrade and Install Settings</source>
<translation>Actualización e instalación de app</translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.cpp" line="163"/>
<location filename="../src/mainwindow-dtk.cpp" line="260"/>
<location filename="../src/mainwindow-dtk.cpp" line="171"/>
<location filename="../src/mainwindow-dtk.cpp" line="271"/>
<source>Spark Store</source>
<translation>SPARK Store</translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.cpp" line="168"/>
<location filename="../src/mainwindow-dtk.cpp" line="176"/>
<source>Search or enter spk://</source>
<translation>Buscar o introducir spk: /%</translation>
</message>
@@ -517,7 +517,7 @@
<message>
<location filename="../src/application.cpp" line="36"/>
<location filename="../src/application.cpp" line="37"/>
<location filename="../src/mainwindow-dtk.cpp" line="142"/>
<location filename="../src/mainwindow-dtk.cpp" line="149"/>
<source>Spark Store</source>
<translation>SPARK Store</translation>
</message>
@@ -537,7 +537,7 @@
<translation>Descargar lista</translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.cpp" line="263"/>
<location filename="../src/mainwindow-dtk.cpp" line="274"/>
<source>Show MainWindow</source>
<translation>Mostrar la ventana principal</translation>
</message>
@@ -658,12 +658,12 @@
<context>
<name>TitleBarMenu</name>
<message>
<location filename="../src/mainwindow-dtk.cpp" line="264"/>
<location filename="../src/mainwindow-dtk.cpp" line="275"/>
<source>About</source>
<translation>Sobre</translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.cpp" line="265"/>
<location filename="../src/mainwindow-dtk.cpp" line="276"/>
<source>Exit</source>
<translation>Exportaciones</translation>
</message>

View File

@@ -411,103 +411,103 @@
<translation>Fenêtre principale</translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.ui" line="166"/>
<location filename="../src/mainwindow-dtk.ui" line="116"/>
<source>Home</source>
<translation>Maison</translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.ui" line="203"/>
<location filename="../src/mainwindow-dtk.ui" line="153"/>
<source>Network</source>
<translation>Réseau</translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.ui" line="231"/>
<location filename="../src/mainwindow-dtk.ui" line="181"/>
<source>Chat</source>
<translation>Bavarder</translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.ui" line="259"/>
<location filename="../src/mainwindow-dtk.ui" line="209"/>
<source>Music</source>
<translation>Musique</translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.ui" line="287"/>
<location filename="../src/mainwindow-dtk.ui" line="237"/>
<source>Video</source>
<translation>Vidéo</translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.ui" line="315"/>
<location filename="../src/mainwindow-dtk.ui" line="265"/>
<source>Picture</source>
<translation>Photos</translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.ui" line="343"/>
<location filename="../src/mainwindow-dtk.ui" line="293"/>
<source>Game</source>
<translation>Jeux</translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.ui" line="371"/>
<location filename="../src/mainwindow-dtk.ui" line="321"/>
<source>Office</source>
<translation>Bureaux</translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.ui" line="399"/>
<location filename="../src/mainwindow-dtk.ui" line="349"/>
<source>Reading</source>
<translation>Lire</translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.ui" line="427"/>
<location filename="../src/mainwindow-dtk.ui" line="377"/>
<source>Development</source>
<translation>Développement</translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.ui" line="455"/>
<location filename="../src/mainwindow-dtk.ui" line="405"/>
<source>Tool</source>
<translation>Outils</translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.ui" line="483"/>
<location filename="../src/mainwindow-dtk.ui" line="433"/>
<source>Theme</source>
<translation>Thèmes</translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.ui" line="511"/>
<location filename="../src/mainwindow-dtk.ui" line="461"/>
<source>Other</source>
<translation>En outre</translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.ui" line="539"/>
<location filename="../src/mainwindow-dtk.ui" line="489"/>
<source>APP Upgrade</source>
<translation>Mise à niveau app</translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.cpp" line="206"/>
<location filename="../src/mainwindow-dtk.cpp" line="217"/>
<source>Submit App</source>
<translation>Soumettre une application</translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.cpp" line="207"/>
<location filename="../src/mainwindow-dtk.cpp" line="218"/>
<source>Submit App with client(Recommanded)</source>
<translation>Soumettre une demande au client (recommandé)</translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.cpp" line="208"/>
<location filename="../src/mainwindow-dtk.cpp" line="219"/>
<source>Settings</source>
<translation>Paramètres</translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.cpp" line="209"/>
<location filename="../src/mainwindow-dtk.cpp" line="220"/>
<source>APP Upgrade and Install Settings</source>
<translation>Paramètres de mise à niveau et d&apos;installation de l&apos;app</translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.cpp" line="163"/>
<location filename="../src/mainwindow-dtk.cpp" line="260"/>
<location filename="../src/mainwindow-dtk.cpp" line="171"/>
<location filename="../src/mainwindow-dtk.cpp" line="271"/>
<source>Spark Store</source>
<translation>Le Spark store</translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.cpp" line="168"/>
<location filename="../src/mainwindow-dtk.cpp" line="176"/>
<source>Search or enter spk://</source>
<translation>Rechercher ou entrer SPK /</translation>
</message>
@@ -517,7 +517,7 @@
<message>
<location filename="../src/application.cpp" line="36"/>
<location filename="../src/application.cpp" line="37"/>
<location filename="../src/mainwindow-dtk.cpp" line="142"/>
<location filename="../src/mainwindow-dtk.cpp" line="149"/>
<source>Spark Store</source>
<translation>Le Spark store</translation>
</message>
@@ -537,7 +537,7 @@
<translation>Télécharger la Liste</translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.cpp" line="263"/>
<location filename="../src/mainwindow-dtk.cpp" line="274"/>
<source>Show MainWindow</source>
<translation>Afficher la fenêtre principale</translation>
</message>
@@ -658,12 +658,12 @@
<context>
<name>TitleBarMenu</name>
<message>
<location filename="../src/mainwindow-dtk.cpp" line="264"/>
<location filename="../src/mainwindow-dtk.cpp" line="275"/>
<source>About</source>
<translation>À propos</translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.cpp" line="265"/>
<location filename="../src/mainwindow-dtk.cpp" line="276"/>
<source>Exit</source>
<translation>Exportations</translation>
</message>

View File

@@ -411,103 +411,103 @@
<translation></translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.ui" line="166"/>
<location filename="../src/mainwindow-dtk.ui" line="116"/>
<source>Home</source>
<translation></translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.ui" line="203"/>
<location filename="../src/mainwindow-dtk.ui" line="153"/>
<source>Network</source>
<translation></translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.ui" line="231"/>
<location filename="../src/mainwindow-dtk.ui" line="181"/>
<source>Chat</source>
<translation></translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.ui" line="259"/>
<location filename="../src/mainwindow-dtk.ui" line="209"/>
<source>Music</source>
<translation></translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.ui" line="287"/>
<location filename="../src/mainwindow-dtk.ui" line="237"/>
<source>Video</source>
<translation></translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.ui" line="315"/>
<location filename="../src/mainwindow-dtk.ui" line="265"/>
<source>Picture</source>
<translation></translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.ui" line="343"/>
<location filename="../src/mainwindow-dtk.ui" line="293"/>
<source>Game</source>
<translation></translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.ui" line="371"/>
<location filename="../src/mainwindow-dtk.ui" line="321"/>
<source>Office</source>
<translation></translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.ui" line="399"/>
<location filename="../src/mainwindow-dtk.ui" line="349"/>
<source>Reading</source>
<translation></translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.ui" line="427"/>
<location filename="../src/mainwindow-dtk.ui" line="377"/>
<source>Development</source>
<translation></translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.ui" line="455"/>
<location filename="../src/mainwindow-dtk.ui" line="405"/>
<source>Tool</source>
<translation></translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.ui" line="483"/>
<location filename="../src/mainwindow-dtk.ui" line="433"/>
<source>Theme</source>
<translation></translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.ui" line="511"/>
<location filename="../src/mainwindow-dtk.ui" line="461"/>
<source>Other</source>
<translation></translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.ui" line="539"/>
<location filename="../src/mainwindow-dtk.ui" line="489"/>
<source>APP Upgrade</source>
<translation></translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.cpp" line="206"/>
<location filename="../src/mainwindow-dtk.cpp" line="217"/>
<source>Submit App</source>
<translation></translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.cpp" line="207"/>
<location filename="../src/mainwindow-dtk.cpp" line="218"/>
<source>Submit App with client(Recommanded)</source>
<translation>使稿</translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.cpp" line="208"/>
<location filename="../src/mainwindow-dtk.cpp" line="219"/>
<source>Settings</source>
<translation></translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.cpp" line="209"/>
<location filename="../src/mainwindow-dtk.cpp" line="220"/>
<source>APP Upgrade and Install Settings</source>
<translation></translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.cpp" line="163"/>
<location filename="../src/mainwindow-dtk.cpp" line="260"/>
<location filename="../src/mainwindow-dtk.cpp" line="171"/>
<location filename="../src/mainwindow-dtk.cpp" line="271"/>
<source>Spark Store</source>
<translation></translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.cpp" line="168"/>
<location filename="../src/mainwindow-dtk.cpp" line="176"/>
<source>Search or enter spk://</source>
<translation></translation>
</message>
@@ -517,7 +517,7 @@
<message>
<location filename="../src/application.cpp" line="36"/>
<location filename="../src/application.cpp" line="37"/>
<location filename="../src/mainwindow-dtk.cpp" line="142"/>
<location filename="../src/mainwindow-dtk.cpp" line="149"/>
<source>Spark Store</source>
<translation></translation>
</message>
@@ -537,7 +537,7 @@
<translation></translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.cpp" line="263"/>
<location filename="../src/mainwindow-dtk.cpp" line="274"/>
<source>Show MainWindow</source>
<translation></translation>
</message>
@@ -658,12 +658,12 @@
<context>
<name>TitleBarMenu</name>
<message>
<location filename="../src/mainwindow-dtk.cpp" line="264"/>
<location filename="../src/mainwindow-dtk.cpp" line="275"/>
<source>About</source>
<translation></translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.cpp" line="265"/>
<location filename="../src/mainwindow-dtk.cpp" line="276"/>
<source>Exit</source>
<translation>退</translation>
</message>

View File

@@ -411,103 +411,103 @@
<translation></translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.ui" line="166"/>
<location filename="../src/mainwindow-dtk.ui" line="116"/>
<source>Home</source>
<translation></translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.ui" line="203"/>
<location filename="../src/mainwindow-dtk.ui" line="153"/>
<source>Network</source>
<translation></translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.ui" line="231"/>
<location filename="../src/mainwindow-dtk.ui" line="181"/>
<source>Chat</source>
<translation></translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.ui" line="259"/>
<location filename="../src/mainwindow-dtk.ui" line="209"/>
<source>Music</source>
<translation></translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.ui" line="287"/>
<location filename="../src/mainwindow-dtk.ui" line="237"/>
<source>Video</source>
<translation></translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.ui" line="315"/>
<location filename="../src/mainwindow-dtk.ui" line="265"/>
<source>Picture</source>
<translation></translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.ui" line="343"/>
<location filename="../src/mainwindow-dtk.ui" line="293"/>
<source>Game</source>
<translation></translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.ui" line="371"/>
<location filename="../src/mainwindow-dtk.ui" line="321"/>
<source>Office</source>
<translation></translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.ui" line="399"/>
<location filename="../src/mainwindow-dtk.ui" line="349"/>
<source>Reading</source>
<translation></translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.ui" line="427"/>
<location filename="../src/mainwindow-dtk.ui" line="377"/>
<source>Development</source>
<translation></translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.ui" line="455"/>
<location filename="../src/mainwindow-dtk.ui" line="405"/>
<source>Tool</source>
<translation></translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.ui" line="483"/>
<location filename="../src/mainwindow-dtk.ui" line="433"/>
<source>Theme</source>
<translation></translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.ui" line="511"/>
<location filename="../src/mainwindow-dtk.ui" line="461"/>
<source>Other</source>
<translation></translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.ui" line="539"/>
<location filename="../src/mainwindow-dtk.ui" line="489"/>
<source>APP Upgrade</source>
<translation></translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.cpp" line="206"/>
<location filename="../src/mainwindow-dtk.cpp" line="217"/>
<source>Submit App</source>
<translation></translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.cpp" line="207"/>
<location filename="../src/mainwindow-dtk.cpp" line="218"/>
<source>Submit App with client(Recommanded)</source>
<translation>()</translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.cpp" line="208"/>
<location filename="../src/mainwindow-dtk.cpp" line="219"/>
<source>Settings</source>
<translation></translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.cpp" line="209"/>
<location filename="../src/mainwindow-dtk.cpp" line="220"/>
<source>APP Upgrade and Install Settings</source>
<translation> </translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.cpp" line="163"/>
<location filename="../src/mainwindow-dtk.cpp" line="260"/>
<location filename="../src/mainwindow-dtk.cpp" line="171"/>
<location filename="../src/mainwindow-dtk.cpp" line="271"/>
<source>Spark Store</source>
<translation></translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.cpp" line="168"/>
<location filename="../src/mainwindow-dtk.cpp" line="176"/>
<source>Search or enter spk://</source>
<translation></translation>
</message>
@@ -517,7 +517,7 @@
<message>
<location filename="../src/application.cpp" line="36"/>
<location filename="../src/application.cpp" line="37"/>
<location filename="../src/mainwindow-dtk.cpp" line="142"/>
<location filename="../src/mainwindow-dtk.cpp" line="149"/>
<source>Spark Store</source>
<translation></translation>
</message>
@@ -537,7 +537,7 @@
<translation></translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.cpp" line="263"/>
<location filename="../src/mainwindow-dtk.cpp" line="274"/>
<source>Show MainWindow</source>
<translation></translation>
</message>
@@ -658,12 +658,12 @@
<context>
<name>TitleBarMenu</name>
<message>
<location filename="../src/mainwindow-dtk.cpp" line="264"/>
<location filename="../src/mainwindow-dtk.cpp" line="275"/>
<source>About</source>
<translation></translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.cpp" line="265"/>
<location filename="../src/mainwindow-dtk.cpp" line="276"/>
<source>Exit</source>
<translation>退</translation>
</message>