|
@@ -21,10 +21,9 @@ MainWindow::MainWindow(QWidget *parent)
|
|
: QMainWindow(parent)
|
|
: QMainWindow(parent)
|
|
, ui(new Ui::MainWindow)
|
|
, ui(new Ui::MainWindow)
|
|
{
|
|
{
|
|
- //TODO:把用到的默认本地文件变成项目资源文件
|
|
|
|
- jsonTemp = new ReadJsonSrc("/Users/menglanluo/redFiles/template.json");
|
|
|
|
|
|
+ jsonTemp = new ReadJsonSrc(":/file/file/template.json");
|
|
ui->setupUi(this);
|
|
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));
|
|
ui->label_pic->setPixmap(pix.scaled(50,50,Qt::KeepAspectRatio));
|
|
this->setAcceptDrops(true);
|
|
this->setAcceptDrops(true);
|
|
ui->tableWidget_animation->setHorizontalHeaderLabels({"名称","资源","时间线","z-Order"});
|
|
ui->tableWidget_animation->setHorizontalHeaderLabels({"名称","资源","时间线","z-Order"});
|
|
@@ -287,7 +286,7 @@ void MainWindow::on_pushButton_addElem_clicked()
|
|
}
|
|
}
|
|
elemName = "新加元素" + QString::number(id++);
|
|
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->addItem(item);
|
|
// ui->listWidget_elem->item(ui->listWidget_elem->count() - 1)->setSelected(true); // 设置选中
|
|
// ui->listWidget_elem->item(ui->listWidget_elem->count() - 1)->setSelected(true); // 设置选中
|
|
// ui->listWidget_elem->scrollToBottom();
|
|
// 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)
|
|
void MainWindow::on_listWidget_elem_currentItemChanged(QListWidgetItem *current, QListWidgetItem *previous)
|
|
{
|
|
{
|
|
- //每一步改变基本都会触发保存,但是表格内嵌的组件如combobox暂时没找到触发保存的办法
|
|
|
|
setUi(elements[current->text()]);
|
|
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)
|
|
void MainWindow::on_comboBox_animationType_currentTextChanged(const QString &arg1)
|
|
{
|
|
{
|
|
if(ui->listWidget_elem->currentItem() == nullptr || ui->listWidget_collectAnim->currentItem() == nullptr || isSetUi) return;
|
|
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()
|
|
void MainWindow::on_reloadTempFile_triggered()
|
|
{
|
|
{
|
|
ReadJsonSrc* tmp = jsonTemp;
|
|
ReadJsonSrc* tmp = jsonTemp;
|
|
- jsonTemp = new ReadJsonSrc("/Users/menglanluo/redFiles/template.json");
|
|
|
|
|
|
+ jsonTemp = new ReadJsonSrc(":/file/file/template.json");
|
|
delete tmp;
|
|
delete tmp;
|
|
updateTempRelatedUi();
|
|
updateTempRelatedUi();
|
|
}
|
|
}
|