Merge remote-tracking branch 'refs/remotes/origin/dev' into dev

This commit is contained in:
shenmo 2022-12-13 18:28:48 +08:00
commit 375243503f
3 changed files with 11 additions and 29 deletions

View File

@ -8,6 +8,8 @@
我们创建了这个应用商店广泛收录大家需要的软件包搜集优质小工具主动适配wine应用存放到储存库供大家获取
我们支持Deepin 20 ; Ubuntu 22.04 LTS / Ubuntu 20.04 LTS(将会逐渐停止支持) ; UOS Home 21
## 关于协作:分支相关的文档见 [这里](https://deepin-community-store.gitee.io/spark-wiki/#/Dev/Spark-Store-Git-Repo)
*关于OpenKylin和deepin 23*
支持计划将会在对应系统发布正式版之后开始评估和执行

View File

@ -115,33 +115,7 @@ MainWindow::MainWindow(QWidget *parent)
i++;
}
}
for(int i = 0; i < ui->buttonGroup->buttons().length(); i++)
{
if(themeType == DGuiApplicationHelper::DarkType)
{
// 中文环境菜单文字居中,其他则左对齐
if(QLocale::system().name() == "zh_CN")
{
ui->buttonGroup->buttons()[i]->setStyleSheet("color: #FFFFFF; border: 0px;");
}
else
{
ui->buttonGroup->buttons()[i]->setStyleSheet("color: #FFFFFF; border: 0px; text-align: left; padding-left: 15px;");
}
}
else
{
if(QLocale::system().name() == "zh_CN")
{
ui->buttonGroup->buttons()[i]->setStyleSheet("color: #252525; border: 0px;");
}
else
{
ui->buttonGroup->buttons()[i]->setStyleSheet("color: #252525; border: 0px; text-align: left; padding-left: 15px;");
}
}
}
ui->pushButton_14->setStyleSheet(ui->pushButton_4->styleSheet());
ui->applistpage->setTheme(themeType == DGuiApplicationHelper::DarkType);
ui->applistpage_1->setTheme(themeType == DGuiApplicationHelper::DarkType);
ui->appintopage->setTheme(themeType == DGuiApplicationHelper::DarkType);

View File

@ -116,7 +116,7 @@
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@ -128,9 +128,15 @@
</item>
<item>
<widget class="QWidget" name="widget" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>280</width>
<width>0</width>
<height>0</height>
</size>
</property>