Compare commits

..

28 Commits

Author SHA1 Message Date
42cafb7487 !293 431
Merge pull request !293 from shenmo/dev
2024-10-14 06:23:34 +00:00
fd7fa2da30 !290 43f5
Merge pull request !290 from shenmo/dev
2024-09-23 05:04:07 +00:00
102f35b0cf !286 430
Merge pull request !286 from shenmo/dev
2024-08-19 08:33:46 +00:00
7a25c3c542 !279 4.3
Merge pull request !279 from shenmo/dev
2024-08-17 06:16:52 +00:00
c6aea69d86 !274 4213
Merge pull request !274 from shenmo/dev
2024-06-23 07:50:19 +00:00
132c2cf35f !272 readme
Merge pull request !272 from shenmo/dev
2024-06-20 04:06:15 +00:00
3da39f1276 !269 4213
Merge pull request !269 from shenmo/dev
2024-06-20 04:03:00 +00:00
e08c7a37bd !266 LICENSE sync
Merge pull request !266 from shenmo/dev
2024-04-28 15:07:24 +00:00
c55529aa8c !261 4212
Merge pull request !261 from shenmo/dev
2024-04-27 11:12:57 +00:00
5cbc41f1ce !256 4.2.11
Merge pull request !256 from shenmo/dev
2024-04-17 08:57:35 +00:00
6c108aecca !253 4210 x86
Merge pull request !253 from shenmo/dev
2024-01-11 15:29:45 +00:00
7cd2977032 !250 429
Merge pull request !250 from shenmo/dev
2023-11-15 10:17:51 +00:00
94a6532509 !244 4281
Merge pull request !244 from shenmo/dev
2023-11-02 14:41:03 +00:00
9acf7cc8d4 !242 428
Merge pull request !242 from shenmo/dev
2023-10-31 14:35:54 +00:00
75b73088b4 !238 4273
Merge pull request !238 from shenmo/dev
2023-09-17 00:49:44 +00:00
dd0629bc8d !235 4272
Merge pull request !235 from shenmo/dev
2023-09-13 10:25:17 +00:00
39be4cdf6f !233 4271+1
Merge pull request !233 from shenmo/dev
2023-09-01 14:59:52 +00:00
fc58de0325 !230 4271
Merge pull request !230 from shenmo/dev
2023-08-31 14:58:24 +00:00
ba00b208f0 !228 4.2.7
Merge pull request !228 from shenmo/dev
2023-08-14 04:38:46 +00:00
2cca83a34b !226 4266
Merge pull request !226 from shenmo/dev
2023-08-02 03:41:43 +00:00
ea7baa9ab0 !224 4265
Merge pull request !224 from shenmo/dev
2023-07-24 08:03:03 +00:00
c228706144 !222 4264 社群入口修复
Merge pull request !222 from shenmo/dev
2023-07-13 03:01:38 +00:00
c030bf9e6e !220 4263
Merge pull request !220 from shenmo/dev
2023-07-05 03:59:36 +00:00
9ac0c67a25 !216 4262
Merge pull request !216 from shenmo/dev
2023-04-25 14:07:41 +00:00
fd4b52e384 !214 426
Merge pull request !214 from shenmo/dev
2023-04-22 05:58:34 +00:00
db79a59fb6 !212 4251
Merge pull request !212 from shenmo/dev
2023-04-20 12:46:27 +00:00
6891fc5b87 !211 4.2.5
Merge pull request !211 from shenmo/dev
2023-04-12 05:20:09 +00:00
62f52451b7 !210 424
Merge pull request !210 from shenmo/dev
2023-03-23 06:25:48 +00:00
19 changed files with 761 additions and 872 deletions

View File

@@ -1,13 +0,0 @@
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,25 +1,3 @@
spark-store (4.3.2.2) UNRELEASED; urgency=medium
* 修复点击更新需要输入密码的问题
-- 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 spark-store (4.3.1) UNRELEASED; urgency=medium
* 修复自提权更新问题 * 修复自提权更新问题

View File

@@ -1 +1 @@
3.0 (native) 1.0

View File

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

View File

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

View File

@@ -13,10 +13,53 @@
<property name="windowTitle"> <property name="windowTitle">
<string>MainWindow</string> <string>MainWindow</string>
</property> </property>
<layout class="QVBoxLayout" name="m_mainWindowLayout"> <layout class="QGridLayout" name="gridLayout">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<property name="spacing"> <property name="spacing">
<number>0</number> <number>0</number>
</property> </property>
<item row="1" column="1">
<widget class="QWidget" name="mainpage" native="true">
<property name="autoFillBackground">
<bool>true</bool>
</property>
<property name="styleSheet">
<string notr="true">.QWidget#mainpage {
background: transparent;
border-radius: 14px;
}</string>
</property>
<layout class="QGridLayout" name="gridLayout_2">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item row="0" column="0">
<widget class="QStackedWidget" name="stackedWidget">
<property name="currentIndex">
<number>3</number>
</property>
<widget class="QWidget" name="page_1">
<layout class="QVBoxLayout" name="verticalLayout_2">
<property name="leftMargin"> <property name="leftMargin">
<number>0</number> <number>0</number>
</property> </property>
@@ -30,26 +73,12 @@
<number>0</number> <number>0</number>
</property> </property>
<item> <item>
<widget class="DTitlebar" name="titlebar" native="true"> <widget class="AppListPage" name="applistpage" native="true"/>
<property name="sizePolicy"> </item>
<sizepolicy hsizetype="Expanding" vsizetype="Fixed"> </layout>
<horstretch>0</horstretch> </widget>
<verstretch>0</verstretch> <widget class="QWidget" name="page_3">
</sizepolicy> <layout class="QVBoxLayout" name="verticalLayout_3">
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>16777215</height>
</size>
</property>
<layout class="QHBoxLayout" name="horizontalLayout">
<property name="leftMargin"> <property name="leftMargin">
<number>0</number> <number>0</number>
</property> </property>
@@ -62,34 +91,55 @@
<property name="bottomMargin"> <property name="bottomMargin">
<number>0</number> <number>0</number>
</property> </property>
<item>
<widget class="AppListPage" name="applistpage_1" native="true"/>
</item>
</layout>
</widget>
<widget class="QWidget" name="page_2">
<layout class="QVBoxLayout" name="verticalLayout_4">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="AppIntoPage" name="appintopage" native="true"/>
</item>
</layout>
</widget>
<widget class="QWidget" name="page_4">
<layout class="QGridLayout" name="gridLayout_3">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item row="0" column="0">
<widget class="SettingsPage" name="settingspage" native="true"/>
</item>
</layout>
</widget>
</widget>
</item>
</layout> </layout>
</widget> </widget>
</item> </item>
<item> <item row="1" column="0">
<widget class="QWidget" name="centralWidget" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<layout class="QHBoxLayout" name="m_centralLayout">
<property name="spacing">
<number>0</number>
</property>
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="QWidget" name="leftbar" native="true"> <widget class="QWidget" name="leftbar" native="true">
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
@@ -518,18 +568,21 @@
</layout> </layout>
</widget> </widget>
</item> </item>
<item> <item row="0" column="0" colspan="2">
<widget class="QWidget" name="mainpage" native="true"> <widget class="DTitlebar" name="titlebar" native="true">
<property name="autoFillBackground"> <property name="minimumSize">
<bool>false</bool> <size>
<width>0</width>
<height>50</height>
</size>
</property> </property>
<property name="styleSheet"> <property name="maximumSize">
<string notr="true">.QWidget#mainpage { <size>
background: transparent; <width>16777215</width>
border-radius: 14px; <height>50</height>
}</string> </size>
</property> </property>
<layout class="QGridLayout" name="gridLayout_2"> <layout class="QHBoxLayout" name="horizontalLayout">
<property name="leftMargin"> <property name="leftMargin">
<number>0</number> <number>0</number>
</property> </property>
@@ -542,92 +595,6 @@
<property name="bottomMargin"> <property name="bottomMargin">
<number>0</number> <number>0</number>
</property> </property>
<item row="0" column="0">
<widget class="QStackedWidget" name="stackedWidget">
<property name="currentIndex">
<number>0</number>
</property>
<widget class="QWidget" name="page_1">
<layout class="QVBoxLayout" name="verticalLayout_2">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="AppListPage" name="applistpage" native="true"/>
</item>
</layout>
</widget>
<widget class="QWidget" name="page_3">
<layout class="QVBoxLayout" name="verticalLayout_3">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="AppListPage" name="applistpage_1" native="true"/>
</item>
</layout>
</widget>
<widget class="QWidget" name="page_2">
<layout class="QVBoxLayout" name="verticalLayout_4">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="AppIntoPage" name="appintopage" native="true"/>
</item>
</layout>
</widget>
<widget class="QWidget" name="page_4">
<layout class="QGridLayout" name="gridLayout_3">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item row="0" column="0">
<widget class="SettingsPage" name="settingspage" native="true"/>
</item>
</layout>
</widget>
</widget>
</item>
</layout>
</widget>
</item>
</layout> </layout>
</widget> </widget>
</item> </item>

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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