mirror of
https://gitee.com/spark-store-project/spark-store
synced 2025-07-19 03:52:22 +08:00
Merge remote-tracking branch 'refs/remotes/origin/Thunder' into Thunder
This commit is contained in:
commit
8f6e6a9f37
3
debian/changelog
vendored
3
debian/changelog
vendored
@ -1,6 +1,7 @@
|
||||
spark-store (4.7.1~test1) UNRELEASED; urgency=medium
|
||||
spark-store (4.8.0~test1) UNRELEASED; urgency=medium
|
||||
|
||||
* ssinstall升级，支持安装到ACE和自动安装到ACE
|
||||
* 商店支持展示ACE标识，支持识别 native amber-ce-bookworm amber-ce-trixie
|
||||
|
||||
-- shenmo <shenmo@spark-app.store> Tue, 24 Sep 2024 11:27:08 +0800
|
||||
|
||||
|
||||
@ -74,5 +74,13 @@
|
||||
<file>tags/uos.svg</file>
|
||||
<file>translations/qtwebengine_zh.qm</file>
|
||||
<file>icon/sparky.png</file>
|
||||
<file>tags/amber-ce-bookworm_full.svg</file>
|
||||
<file>tags/amber-ce-bookworm.svg</file>
|
||||
<file>tags/amber-ce-sid_full.svg</file>
|
||||
<file>tags/amber-ce-sid.svg</file>
|
||||
<file>tags/amber-ce-trixie_full.svg</file>
|
||||
<file>tags/amber-ce-trixie.svg</file>
|
||||
<file>tags/native_full.svg</file>
|
||||
<file>tags/native.svg</file>
|
||||
</qresource>
|
||||
</RCC>
|
||||
|
||||
@ -234,6 +234,9 @@ void AppIntoPage::clear()
|
||||
ui->tag_debian->hide();
|
||||
ui->tag_ubuntu->hide();
|
||||
ui->tag_community->hide();
|
||||
ui->tag_native->hide();
|
||||
ui->tag_amber_ce_bookworm->hide();
|
||||
ui->tag_amber_ce_trixie->hide();
|
||||
ui->icon->clear();
|
||||
ui->title->clear();
|
||||
ui->version->clear();
|
||||
@ -404,33 +407,17 @@ void AppIntoPage::setAppinfoTags(const QStringList &tagList)
|
||||
bool deepinSupport = false;
|
||||
bool uosSupport = false;
|
||||
bool debianSupport = false;
|
||||
bool hasAmberTag = false;
|
||||
|
||||
foreach (const QString &tag, tagList)
|
||||
{
|
||||
if (tag == "community")
|
||||
if (tag.isEmpty()) {
|
||||
continue;
|
||||
}
|
||||
else if (tag == "community")
|
||||
{
|
||||
ui->tag_community->show();
|
||||
}
|
||||
else if (tag == "debian")
|
||||
{
|
||||
ui->tag_debian->show();
|
||||
debianSupport = true;
|
||||
}
|
||||
else if (tag == "ubuntu")
|
||||
{
|
||||
ui->tag_ubuntu->show();
|
||||
ubuntuSupport = true;
|
||||
}
|
||||
else if (tag == "deepin")
|
||||
{
|
||||
ui->tag_deepin->show();
|
||||
deepinSupport = true;
|
||||
}
|
||||
else if (tag == "uos")
|
||||
{
|
||||
ui->tag_uos->show();
|
||||
uosSupport = true;
|
||||
|
||||
}
|
||||
else if (tag == "dtk5")
|
||||
{
|
||||
ui->tag_dtk5->show();
|
||||
@ -447,10 +434,53 @@ void AppIntoPage::setAppinfoTags(const QStringList &tagList)
|
||||
{
|
||||
ui->tag_a2d->show();
|
||||
}
|
||||
else if (tag == "native")
|
||||
{
|
||||
ui->tag_native->show();
|
||||
}
|
||||
else if (tag == "amber-ce-bookworm")
|
||||
{
|
||||
ui->tag_amber_ce_bookworm->show();
|
||||
hasAmberTag = true;
|
||||
}
|
||||
else if (tag == "amber-ce-trixie")
|
||||
{
|
||||
ui->tag_amber_ce_trixie->show();
|
||||
hasAmberTag = true;
|
||||
}
|
||||
else if (!hasAmberTag) // Only process distro tags if we haven't found an amber tag
|
||||
{
|
||||
|
||||
if (tag == "debian")
|
||||
{
|
||||
ui->tag_debian->show();
|
||||
debianSupport = true;
|
||||
}
|
||||
else if (tag == "ubuntu")
|
||||
{
|
||||
ui->tag_ubuntu->show();
|
||||
ubuntuSupport = true;
|
||||
}
|
||||
else if (tag == "deepin")
|
||||
{
|
||||
ui->tag_deepin->show();
|
||||
deepinSupport = true;
|
||||
}
|
||||
else if (tag == "uos")
|
||||
{
|
||||
ui->tag_uos->show();
|
||||
uosSupport = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (!hasAmberTag)
|
||||
{
|
||||
notifyUserUnsupportedTags(ubuntuSupport, deepinSupport, uosSupport, debianSupport);
|
||||
}
|
||||
notifyUserUnsupportedTags(ubuntuSupport, deepinSupport, uosSupport ,debianSupport);
|
||||
}
|
||||
|
||||
|
||||
void AppIntoPage::notifyUserUnsupportedTags(bool ubuntuSupport, bool deepinSupport, bool uosSupport, bool debianSupport)
|
||||
{
|
||||
if (!SettingsPage::needUncompatibleNotification) {
|
||||
|
||||
@ -385,8 +385,8 @@
|
||||
</property>
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>184</width>
|
||||
<height>20</height>
|
||||
<width>20</width>
|
||||
<height>37</height>
|
||||
</size>
|
||||
</property>
|
||||
</spacer>
|
||||
@ -467,6 +467,63 @@
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QLabel" name="tag_native">
|
||||
<property name="maximumSize">
|
||||
<size>
|
||||
<width>40</width>
|
||||
<height>40</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="toolTip">
|
||||
<string><html><head/><body><p>This app can only be installed natively</p></body></html></string>
|
||||
</property>
|
||||
<property name="whatsThis">
|
||||
<string><html><head/><body><p>This app can only be installed natively</p></body></html></string>
|
||||
</property>
|
||||
<property name="pixmap">
|
||||
<pixmap resource="../assets/assets.qrc">:/tags/native.svg</pixmap>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QLabel" name="tag_amber_ce_bookworm">
|
||||
<property name="maximumSize">
|
||||
<size>
|
||||
<width>40</width>
|
||||
<height>40</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="toolTip">
|
||||
<string><html><head/><body><p>This app will be installed to debian12 ACE</p></body></html></string>
|
||||
</property>
|
||||
<property name="whatsThis">
|
||||
<string><html><head/><body><p>This app will be installed to debian12 ACE</p></body></html></string>
|
||||
</property>
|
||||
<property name="pixmap">
|
||||
<pixmap resource="../assets/assets.qrc">:/tags/amber-ce-bookworm.svg</pixmap>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QLabel" name="tag_amber_ce_trixie">
|
||||
<property name="maximumSize">
|
||||
<size>
|
||||
<width>40</width>
|
||||
<height>40</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="toolTip">
|
||||
<string><html><head/><body><p>This app will be installed to debian13 ACE</p></body></html></string>
|
||||
</property>
|
||||
<property name="whatsThis">
|
||||
<string><html><head/><body><p>This app will be installed to debian13 ACE</p></body></html></string>
|
||||
</property>
|
||||
<property name="pixmap">
|
||||
<pixmap resource="../assets/assets.qrc">:/tags/amber-ce-trixie.svg</pixmap>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<spacer name="horizontalSpacer_5">
|
||||
<property name="orientation">
|
||||
@ -474,8 +531,8 @@
|
||||
</property>
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>184</width>
|
||||
<height>20</height>
|
||||
<width>20</width>
|
||||
<height>37</height>
|
||||
</size>
|
||||
</property>
|
||||
</spacer>
|
||||
@ -718,7 +775,7 @@
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>524</width>
|
||||
<width>482</width>
|
||||
<height>601</height>
|
||||
</rect>
|
||||
</property>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user