Sfoglia il codice sorgente

将项目中用到的图标和配置文件添加为资源文件

Menglan_Luo 2 anni fa
parent
commit
1e3510b8f5
6 ha cambiato i file con 77 aggiunte e 8 eliminazioni
  1. 3 0
      ConfigurableTool.pro
  2. 9 0
      Resources.qrc
  3. 61 0
      file/template.json
  4. BIN
      icon/pic.png
  5. BIN
      icon/菜狗.png
  6. 4 8
      mainwindow.cpp

+ 3 - 0
ConfigurableTool.pro

@@ -316,3 +316,6 @@ else: unix:!android: target.path = /opt/$${TARGET}/bin
 
 DISTFILES += \
     boost/license.txt
+
+RESOURCES += \
+    Resources.qrc

+ 9 - 0
Resources.qrc

@@ -0,0 +1,9 @@
+<RCC>
+    <qresource prefix="/icon">
+        <file>icon/菜狗.png</file>
+        <file>icon/pic.png</file>
+    </qresource>
+    <qresource prefix="/file">
+        <file>file/template.json</file>
+    </qresource>
+</RCC>

+ 61 - 0
file/template.json

@@ -0,0 +1,61 @@
+{
+        "pool_template":[
+                {
+                        "name":"随机",
+                        "id":"1"
+                },
+                {
+                        "name":"按颜色",
+                        "id":"2"
+                }
+        ],
+        "coll_template":[
+                {
+                        "name":"贝塞尔飞行收集",
+                        "id":"bezier",
+                        "fields":{
+                                "动画":{"id":"anim","type":"list", "src":"animations"},
+                                "曲度":{"id":"p1","type":"input","default":"1.2"},
+                                "下探幅度":{"id":"p2","type":"input","default":"1.0"},
+                                "节点":{"id":"node","type":"input"},
+                                "阴影":{"id":"shade","type":"input"}
+                        }
+                },
+                {
+                        "name":"直线飞行收集",
+                        "id":"line",
+                        "fields":{
+                                "动画":{"id":"anim","type":"list", "src":"animations"},
+                                "节点":{"id":"node","type":"input"},
+                                "阴影":{"id":"shade","type":"input"}
+                        }
+                }
+        ],
+        "event_template": [
+                {
+                        "name":"旁消",
+                        "id":"adj"
+                },
+                {
+                        "name":"特殊消",
+                        "id":"stamp"
+                }
+        ],
+        "action_template":[
+                {
+                        "name":"目标达成",
+                        "id":"goalFinished",
+                        "fields":{
+                                "执行动作":{"id":"action","type":"list","src":"animations","default":""}
+                        }
+                },
+                {
+                        "name":"消除后生成其他",
+                        "id":"spawn",
+                        "fields":{
+                                "生成类型":{"id":"type","type":"input"},
+                                "生成数量":{"id":"num","type":"input"}
+                        }
+                }
+        ]
+}

BIN
icon/pic.png


BIN
icon/菜狗.png


+ 4 - 8
mainwindow.cpp

@@ -21,10 +21,9 @@ MainWindow::MainWindow(QWidget *parent)
     : QMainWindow(parent)
     , ui(new Ui::MainWindow)
 {
-    //TODO:把用到的默认本地文件变成项目资源文件
-    jsonTemp = new ReadJsonSrc("/Users/menglanluo/redFiles/template.json");
+    jsonTemp = new ReadJsonSrc(":/file/file/template.json");
     ui->setupUi(this);
-    QPixmap pix("/Users/menglanluo/pic.png");
+    QPixmap pix(":/icon/icon/pic.png");
     ui->label_pic->setPixmap(pix.scaled(50,50,Qt::KeepAspectRatio));
     this->setAcceptDrops(true);
     ui->tableWidget_animation->setHorizontalHeaderLabels({"名称","资源","时间线","z-Order"});
@@ -287,7 +286,7 @@ void MainWindow::on_pushButton_addElem_clicked()
         }
         elemName = "新加元素" + QString::number(id++);
     }
-    QListWidgetItem* item = new QListWidgetItem(QIcon("/Users/menglanluo/菜狗.png"),elemName);
+    QListWidgetItem* item = new QListWidgetItem(QIcon(":/icon/icon/菜狗.png"),elemName);
     ui->listWidget_elem->addItem(item);
 //    ui->listWidget_elem->item(ui->listWidget_elem->count() - 1)->setSelected(true); // 设置选中
 //    ui->listWidget_elem->scrollToBottom();
@@ -365,10 +364,8 @@ void MainWindow::on_spinBox_drop_valueChanged(int arg1)
 }
 
 
-//TODO: 保存当前元素的所有数据,界面加载当前元素数据
 void MainWindow::on_listWidget_elem_currentItemChanged(QListWidgetItem *current, QListWidgetItem *previous)
 {
-    //每一步改变基本都会触发保存,但是表格内嵌的组件如combobox暂时没找到触发保存的办法
    setUi(elements[current->text()]);
 }
 
@@ -696,7 +693,6 @@ void MainWindow::on_listWidget_collectAnim_itemDoubleClicked(QListWidgetItem *it
     }
 }
 
-//TODO: 动画类型的修改伴随界面的更新
 void MainWindow::on_comboBox_animationType_currentTextChanged(const QString &arg1)
 {
     if(ui->listWidget_elem->currentItem() == nullptr || ui->listWidget_collectAnim->currentItem() ==  nullptr || isSetUi) return;
@@ -1446,7 +1442,7 @@ void MainWindow::updateTempRelatedUi()
 void MainWindow::on_reloadTempFile_triggered()
 {
     ReadJsonSrc* tmp = jsonTemp;
-    jsonTemp = new ReadJsonSrc("/Users/menglanluo/redFiles/template.json");
+    jsonTemp = new ReadJsonSrc(":/file/file/template.json");
     delete tmp;
     updateTempRelatedUi();
 }