!139 fix some errors

Merge pull request !139 from likehomedream/UIFIX

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 【主题制作工坊】【次要】【全局主题】上传全局主题效果图后创建安装该主题，重新修改除了全局主题效果图外的内容后创建安装，控制面板-主题封面依然会显示图片
+  * 需求号:无
+  * 其他改动说明:无
+  * 其他改动说明影响域:无
+
+ -- 李柯 <like1@kylinos.cn>  Fri, 21 Jun 2024 14:56:29 +0800
+
 kylin-theme-builder (1.0.0.1-ok2.5) nile; urgency=medium
 
   * BUG:

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)

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对象

src/module/iconthemewidget.cpp

@@ -382,15 +382,34 @@ void IconThemeWidget::initSystemEditWidget()
     QVBoxLayout *mainLayout = new QVBoxLayout(viewportWidget);
     viewportWidget->setLayout(mainLayout);
 
-    QMap<QString,QString>* appicon_name_CH = new QMap<QString,QString>;
-    QList<QString> keys = m_systemiconpathmap->keys();
-    appicon_name_CH = m_preview->initSystemIconName(appicon_name_CH,keys);
+    QList<QPair<QString, QString>> 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<QString, QString>& pair1, const QPair<QString, QString>& 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<QString,QString>* appicon_name_CH = new QMap<QString,QString>;
+    QList<QString> 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()<<pair.first<<"-------------------------------------"<<pair.second;
+        const QString& widgetName = pair.first;
+        const QString& filePath = pair.second;
         IconEditWidget* widget = new IconEditWidget(viewportWidget);
         widget->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);
@@ -751,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到相应位置上