From 0e364fb132417f7e439f9779a43dd507b08a81bf Mon Sep 17 00:00:00 2001 From: like Date: Thu, 20 Jun 2024 15:37:44 +0800 Subject: [PATCH 1/5] =?UTF-8?q?IA67NF=20=E3=80=90=E4=B8=BB=E9=A2=98?= =?UTF-8?q?=E5=88=B6=E4=BD=9C=E5=B7=A5=E5=9D=8A=E3=80=91=E3=80=90=E4=B8=BB?= =?UTF-8?q?=E8=A6=81=E3=80=91=E3=80=90grub=E8=83=8C=E6=99=AF=E3=80=91?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E7=AC=A6=E5=90=88=E8=A6=81=E6=B1=82=E7=9A=84?= =?UTF-8?q?png=E5=9B=BE=E7=89=87=EF=BC=8C=E6=8F=90=E7=A4=BA=E8=AF=A5?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B8=8D=E6=98=AFjpg=E6=96=87=E4=BB=B6?= =?UTF-8?q?=EF=BC=8C=E5=AF=BC=E8=87=B4=E6=97=A0=E6=B3=95=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E5=9B=BE=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/module/grubthemewidget.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/module/grubthemewidget.cpp b/src/module/grubthemewidget.cpp index 074f5b1..4102720 100644 --- a/src/module/grubthemewidget.cpp +++ b/src/module/grubthemewidget.cpp @@ -147,7 +147,7 @@ void GrubThemeWidget::initEditWidget() // 如果选择的文件路径不为空 if (!newFilePath.isEmpty()) { // 判断选择的文件是否是合法的壁纸文件 - if(FileCheck::isLegalWallPaperFile(newFilePath,"wallpaper")){ + if(FileCheck::isLegalWallPaperFile(newFilePath,"grub")){ // 更新背景预览 m_preview->updateBackground(newFilePath); // 加载图片文件并创建一个QPixmap对象 From 4968be10484a64dbba1a762a1acb53ac153e92fb Mon Sep 17 00:00:00 2001 From: like Date: Fri, 21 Jun 2024 09:53:11 +0800 Subject: [PATCH 2/5] =?UTF-8?q?fix=20IA6AU3=E3=80=90=E4=B8=BB=E9=A2=98?= =?UTF-8?q?=E5=88=B6=E4=BD=9C=E5=B7=A5=E5=9D=8A=E3=80=91=E3=80=90=E6=AC=A1?= =?UTF-8?q?=E8=A6=81=E3=80=91=E3=80=90=E5=9B=BE=E6=A0=87=E4=B8=BB=E9=A2=98?= =?UTF-8?q?=E3=80=91=E5=88=9B=E5=BB=BA=E7=B3=BB=E7=BB=9F=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E4=B8=BB=E9=A2=98=E5=90=8E=E5=AE=89=E8=A3=85=E5=BA=94=E7=94=A8?= =?UTF-8?q?=EF=BC=8C=E6=8E=A7=E5=88=B6=E9=9D=A2=E6=9D=BF=E9=A6=96=E9=A1=B5?= =?UTF-8?q?=E5=90=84=E9=80=89=E9=A1=B9=E5=9B=BE=E6=A0=87=E4=B8=8E=E4=B8=8A?= =?UTF-8?q?=E4=BC=A0=E7=9A=84=E5=9B=BE=E7=89=87=E4=B8=8D=E5=AF=B9=E5=BA=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/module/iconthemewidget.cpp | 31 +++++++++++++++++++++++++------ 1 file changed, 25 insertions(+), 6 deletions(-) diff --git a/src/module/iconthemewidget.cpp b/src/module/iconthemewidget.cpp index 2d10d83..247d368 100644 --- a/src/module/iconthemewidget.cpp +++ b/src/module/iconthemewidget.cpp @@ -382,15 +382,34 @@ void IconThemeWidget::initSystemEditWidget() QVBoxLayout *mainLayout = new QVBoxLayout(viewportWidget); viewportWidget->setLayout(mainLayout); - QMap* appicon_name_CH = new QMap; - QList keys = m_systemiconpathmap->keys(); - appicon_name_CH = m_preview->initSystemIconName(appicon_name_CH,keys); + QList> sortedList1; for (auto it = m_systemiconpathmap->begin(); it != m_systemiconpathmap->end(); ++it) { - const QString& widgetName = it.key(); - const QString& filePath = it.value(); + sortedList1.append(qMakePair(it.key(), it.value())); + } + std::sort(sortedList1.begin(), sortedList1.end(), [](const QPair& pair1, const QPair& pair2){ + // 按照指定顺序进行排序 + QStringList order = QStringList() << "kylin-settings-account" << "kylin-settings-system" << "kylin-settings-devices" << "kylin-settings-network" << "kylin-settings-personalized" + << "kylin-settings-datetime"<< "kylin-settings-update" << "kylin-settings-security" + << "kylin-settings-application" << "kylin-settings-search" << "kylin-settings-commoninfo"; + return order.indexOf(pair1.first) < order.indexOf(pair2.first); + }); + + + + QMap* appicon_name_CH = new QMap; + QList keys; + keys << "kylin-settings-account" << "kylin-settings-system" << "kylin-settings-devices" << "kylin-settings-network" << "kylin-settings-personalized" + << "kylin-settings-datetime"<< "kylin-settings-update" << "kylin-settings-security" + << "kylin-settings-application" << "kylin-settings-search" << "kylin-settings-commoninfo";; + appicon_name_CH = m_preview->initSystemIconName(appicon_name_CH,keys); + for (const auto& pair : sortedList1) { + qDebug()<setdefaulticon(filePath); - widget->setdefaulticonname(appicon_name_CH->value(it.key())); + widget->setdefaulticonname(appicon_name_CH->value(pair.first)); +// widget->setdefaulticonname(tr(widgetName)); widget->setProperty("widgetname",widgetName); QPushButton *line = new QPushButton(); line->setDisabled(true); From 73048f8e6d43b59f25c65fee0b5781f728587f3a Mon Sep 17 00:00:00 2001 From: like Date: Fri, 21 Jun 2024 14:55:02 +0800 Subject: [PATCH 3/5] =?UTF-8?q?IA6AU3=E3=80=90=E4=B8=BB=E9=A2=98=E5=88=B6?= =?UTF-8?q?=E4=BD=9C=E5=B7=A5=E5=9D=8A=E3=80=91=E3=80=90=E6=AC=A1=E8=A6=81?= =?UTF-8?q?=E3=80=91=E3=80=90=E5=9B=BE=E6=A0=87=E4=B8=BB=E9=A2=98=E3=80=91?= =?UTF-8?q?=E5=88=9B=E5=BB=BA=E7=B3=BB=E7=BB=9F=E8=AE=BE=E7=BD=AE=E4=B8=BB?= =?UTF-8?q?=E9=A2=98=E5=90=8E=E5=AE=89=E8=A3=85=E5=BA=94=E7=94=A8=EF=BC=8C?= =?UTF-8?q?=E6=8E=A7=E5=88=B6=E9=9D=A2=E6=9D=BF=E9=A6=96=E9=A1=B5=E5=90=84?= =?UTF-8?q?=E9=80=89=E9=A1=B9=E5=9B=BE=E6=A0=87=E4=B8=8E=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E7=9A=84=E5=9B=BE=20=E7=89=87=E4=B8=8D=E5=AF=B9=E5=BA=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/module/iconthemewidget.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/module/iconthemewidget.cpp b/src/module/iconthemewidget.cpp index 247d368..4acfef9 100644 --- a/src/module/iconthemewidget.cpp +++ b/src/module/iconthemewidget.cpp @@ -770,6 +770,13 @@ void IconThemeWidget::initBatchEditWidget() } } FileProcess::g_isBatchImport = false; + //FIX m_systempreview sorterror + if(m_info.historytime == nullptr){ + m_systempreview->updateIconMap(m_systemiconpathmap,"systemicon"); + }else{ + m_systempreview->updateIconMap(m_historysystemiconmap,"systemicon"); + } + }); // connect(bacthButton,&DropBatchButton::droprealbatchicon,this,[=](const QString& folderPath){ // // 打开文件对话框，选中文件夹，filecheck之后把对应文件update到相应位置上 From 969ca44c20abd4d4eb04a1a6a6240be6f891c832 Mon Sep 17 00:00:00 2001 From: like Date: Fri, 21 Jun 2024 16:02:31 +0800 Subject: [PATCH 4/5] =?UTF-8?q?IA6ZRM=E3=80=90=E4=B8=BB=E9=A2=98=E5=88=B6?= =?UTF-8?q?=E4=BD=9C=E5=B7=A5=E5=9D=8A=E3=80=91=E3=80=90=E6=AC=A1=E8=A6=81?= =?UTF-8?q?=E3=80=91=E3=80=90=E5=85=A8=E5=B1=80=E4=B8=BB=E9=A2=98=E3=80=91?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=85=A8=E5=B1=80=E4=B8=BB=E9=A2=98=E6=95=88?= =?UTF-8?q?=E6=9E=9C=E5=9B=BE=E5=90=8E=E5=88=9B=E5=BB=BA=E5=AE=89=E8=A3=85?= =?UTF-8?q?=E8=AF=A5=E4=B8=BB=E9=A2=98=EF=BC=8C=E9=87=8D=E6=96=B0=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E9=99=A4=E4=BA=86=E5=85=A8=E5=B1=80=E4=B8=BB=E9=A2=98?= =?UTF-8?q?=E6=95=88=E6=9E=9C=E5=9B=BE=E5=A4=96=E7=9A=84=E5=86=85=E5=AE=B9?= =?UTF-8?q?=E5=90=8E=E5=88=9B=E5=BB=BA=E5=AE=89=E8=A3=85=EF=BC=8C=E6=8E=A7?= =?UTF-8?q?=E5=88=B6=E9=9D=A2=E6=9D=BF-=E4=B8=BB=E9=A2=98=E5=B0=81?= =?UTF-8?q?=E9=9D=A2=E4=BE=9D=E7=84=B6=E4=BC=9A=E6=98=BE=E7=A4=BA=E5=9B=BE?= =?UTF-8?q?=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/fileProcess/bridge.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/fileProcess/bridge.cpp b/src/fileProcess/bridge.cpp index 469dd00..f833b74 100644 --- a/src/fileProcess/bridge.cpp +++ b/src/fileProcess/bridge.cpp @@ -42,13 +42,16 @@ void Bridge::wallpaperPathChanged(QString path) // +m_time + "/src/globalTheme/theme.conf"); m_configfilemanager->copyPictoCacheDir(m_wallpaperpath,QDir::homePath()+"/.cache/theme-build/" +m_time+"/src/globalTheme","wallpaper"); + m_wallpaperpath = ":/resource/background/1-openkylin.jpg"; } + void Bridge::coverPathChanged(QString path) { m_coverpath = path; m_configfilemanager->copyPictoCacheDir(m_coverpath,QDir::homePath()+"/.cache/theme-build/" +m_time+"/src/globalTheme","cover"); + m_coverpath = ":/resource/background/custom-preview.png"; } void Bridge::radiusChanged(int radius) From d6a55c17e7ce208de6309555ef319439bbf01713 Mon Sep 17 00:00:00 2001 From: like Date: Fri, 21 Jun 2024 17:03:21 +0800 Subject: [PATCH 5/5] update changelog --- debian/changelog | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/debian/changelog b/debian/changelog index bb0277d..97a34c8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +kylin-theme-builder (1.0.0.1-ok2.6) nile; urgency=medium + + * BUG: + #IA67NF 【主题制作工坊】【主要】【grub背景】导入符合要求的png图片，提示该文件不是jpg文件，导致无法导入图片 + #IA6AU3 【主题制作工坊】【次要】【图标主题】创建系统设置主题后安装应用，控制面板首页各选项图标与上传的图片不对应 + #IA6ZRM 【主题制作工坊】【次要】【全局主题】上传全局主题效果图后创建安装该主题，重新修改除了全局主题效果图外的内容后创建安装，控制面板-主题封面依然会显示图片 + * 需求号:无 + * 其他改动说明:无 + * 其他改动说明影响域:无 + + -- 李柯 Fri, 21 Jun 2024 14:56:29 +0800 + kylin-theme-builder (1.0.0.1-ok2.5) nile; urgency=medium * BUG: