update

debian/changelog

@@ -1,3 +1,13 @@
+kylin-theme-builder (1.0.0.1-ok1.1) nile; urgency=medium
+
+  * BUG:无
+  * 需求号: 无
+  * 其他改动说明：处理编译报错
+                  处理主题打包、界面流程、界面显示等问题
+  * 其他改动影响域:无
+
+ -- Kevin Duan <duankaiwen@kylinos.cn>  Wed, 22 Nov 2023 11:14:26 +0800
+
 kylin-theme-builder (1.0.0.1-ok1.0) nile; urgency=medium
 
   * BUG:无

debian/control

@@ -3,10 +3,13 @@ Section: x11
 Priority: optional
 Maintainer: kevin <kevin@unknown>
 Build-Depends: debhelper-compat (= 13),
+               qt5-qmake,
+               qtbase5-dev,
                libqt5core5a,
                libqt5gui5,
                libqt5svg5,
-               libkf5windowsystem5
+               libkf5windowsystem5,
+               qt5multermedia5-dev
 Standards-Version: 4.6.0
 Homepage: https://gitee.com/openkylin/kylin-theme-builder
 #Vcs-Browser: https://salsa.debian.org/debian/kylin-theme-builder

src/build/buildWidget.cpp

@@ -57,16 +57,12 @@ buildWidget::buildWidget(QWidget *parent)
 
                 qDebug() << "File copied successfully:" << debFile;
             }
-            //清空日期缓存
-            FileProcess::g_date = nullptr;
-            FileProcess::g_themeENName = nullptr;
-            FileProcess::g_createThemeType = nullptr;
             //完成返回界面
             buildResultWidget *m_buildResult = new buildResultWidget();
             m_buildResult->show();
 
             connect(m_buildResult,&buildResultWidget::gohomesignals, this,[=](){
-                //发送返回主界面信号
+                //发送返回主界面信号buildcheckwidget
                 emit gohomesignals();
             });
         }

src/build/buildcheckwidget.cpp

@@ -665,7 +665,7 @@ void buildCheckWidget::buildCheck(QDir m_buildPath){
             m_buildWidget->show();
 
             connect(m_buildWidget, &buildWidget::gohomesignals, this,[=](){
-                //发送返回主界面信号
+                //发送返回主界面信号给infocreatewidget
                 emit gohomesignals();
             });
 //        } else {

src/build/buildresultwidget.cpp

@@ -18,7 +18,7 @@ buildResultWidget::buildResultWidget(QWidget *parent)
     this->setLayout(m_buildResultLayout);
 
     connect(m_backHomeBtn, &QPushButton::clicked, this,[=](){
-        //发送返回主界面信号
+        //发送返回主界面信号给buildwidget
         emit gohomesignals();
         this->close();
     });

src/maininterface.cpp

@@ -133,6 +133,7 @@ void MainInterface::init()
         info->show();
         connect(info,&InfoCreateWidget::readytoBuild,this,&MainInterface::startCopy);
         connect(info,&InfoCreateWidget::gohomesignals,this,[=](){
+            //发送返回主界面信号给mainwindow
             emit gohomesignals();
         });
     });
@@ -310,13 +311,18 @@ QMap<QString, QString> *MainInterface::getTimeCurosrMap()
  */
 void MainInterface::refresh(QString themeType)
 {
-    if("global" == themeType){
+    if(themeType == "global"){
         m_globalthemewidget->refresh();
-    }else if("icon" == themeType){
+    } else if(themeType == "icon"){
         m_iconthemewidget->refresh();
-    }else if("cursor" == themeType){
+    } else if(themeType == "cursor"){
         m_cursorthemewidget->refresh();
-    }
+    }/* else if(themeType == "plymouth"){
+    +        m_plymouththemewidget->refresh();
+    +    } else if(themeType == "grub"){
+    +        m_grubthemewidget->refresh();
+    +    }*/
+
 
 
 

src/mainwindow.cpp

@@ -266,7 +266,11 @@ void MainWindow::onGoHomeClicked()
             m_cacheConfirmedWidget->show();
             //根据询问界面返回信号处理历史记录
             connect(m_cacheConfirmedWidget, &cacheConfirmedWidget::cacheClean, this, [=](){
-                m_stackedWidget->setCurrentIndex(0);
+                m_stackedWidget->setCurrentIndex(0);+
+                //返回主界面前 清除全局变量
+                FileProcess::g_createThemeType = nullptr;
+                FileProcess::g_date = nullptr;
+                FileProcess::g_themeENName = nullptr;
                 CursorThemeWidget::g_themeChange = false;
                 ImageWidget::g_themeChange = false;
                 PlymouthThemeWidget::g_themeChange = false;
@@ -276,6 +280,9 @@ void MainWindow::onGoHomeClicked()
             connect(m_cacheConfirmedWidget, &cacheConfirmedWidget::cacheSave, this, [=](){
                 m_historywidget->updateHistoryDir();
                 m_stackedWidget->setCurrentIndex(0);
+                FileProcess::g_createThemeType = nullptr;
+                FileProcess::g_date = nullptr;
+                FileProcess::g_themeENName = nullptr;
                 CursorThemeWidget::g_themeChange = false;
                 ImageWidget::g_themeChange = false;
                 PlymouthThemeWidget::g_themeChange = false;
@@ -286,6 +293,14 @@ void MainWindow::onGoHomeClicked()
             //无修改时，删除时间戳目录
             FileProcess m_fileClean;
             m_fileClean.FileClean(FileProcess::g_date);
+            FileProcess::g_createThemeType = nullptr;
+            FileProcess::g_date = nullptr;
+            FileProcess::g_themeENName = nullptr;
+            CursorThemeWidget::g_themeChange = false;
+            ImageWidget::g_themeChange = false;
+            PlymouthThemeWidget::g_themeChange = false;
+            GrubThemeWidget::g_themeChange = false;
+            GlobalThemeWidget::g_themeChange = false;
             m_stackedWidget->setCurrentIndex(0);
         }
     } else {

src/module/infocreatewidget.cpp

@@ -249,7 +249,7 @@ void InfoCreateWidget::InfoProcess(){
         m_buildCheckWidget->buildCheck(QDir::homePath() + "/.cache/theme-build/" + FileProcess::g_date + "/src");
 
         connect(m_buildCheckWidget, &buildCheckWidget::gohomesignals, this,[=](){
-            //发送返回主界面信号
+            //发送返回主界面信号给maininterface
             emit gohomesignals();
         });
     });