BigC
/
ArchitectureColoredPainting
4
2
Fork 0
Code Issues 6 Pull Requests Projects Releases 5 Wiki Activity

Compare commits

base: BigC:3aebd3f2e9f929077dec18243ab055c0f9def8bc
Branches Tags
BigC:main
BigC:dev-wuyize
BigC:dev-yyq
BigC:dev-LayerStyle
BigC:TaoZhang-Branch
BigC:dev-VirtualTexture
BigC:v0.2.0
BigC:v0.1.3
BigC:v0.1.2
BigC:v0.1.1
BigC:v0.1.0
..
compare: BigC:b4d29f15da2fc6229fad9c31c1e30ed8fdc083bc
Branches Tags
BigC:main
BigC:dev-wuyize
BigC:dev-yyq
BigC:dev-LayerStyle
BigC:TaoZhang-Branch
BigC:dev-VirtualTexture
BigC:v0.2.0
BigC:v0.1.3
BigC:v0.1.2
BigC:v0.1.1
BigC:v0.1.0

No commits in common. "3aebd3f2e9f929077dec18243ab055c0f9def8bc" and "b4d29f15da2fc6229fad9c31c1e30ed8fdc083bc" have entirely different histories.
3aebd3f2e9 ... b4d29f15da

2 changed files with 2 additions and 4 deletions
Show Stats Expand all files Collapse all files

2
ArchitectureColoredPainting/src/Editor/EditorWidgetComponent/LayerCreateWidget.cpp
View File

@ -6,8 +6,6 @@ LayerCreateWidget::LayerCreateWidget(ElementManager* elementManager, FolderLayer
{ {
this->elementManager = elementManager; this->elementManager = elementManager;
ui.setupUi(this); ui.setupUi(this);
ui.name->setPlaceholderText(QString::fromLocal8Bit(""));
ui.name->setText(QString::fromLocal8Bit("×Óͼ²ã-") + QString::number(folderLayer->children.size() + 1));
connect(ui.buttonBox, SIGNAL(accepted()), this, SLOT(accept())); connect(ui.buttonBox, SIGNAL(accepted()), this, SLOT(accept()));
connect(ui.buttonBox, SIGNAL(rejected()), this, SLOT(reject())); connect(ui.buttonBox, SIGNAL(rejected()), this, SLOT(reject()));
connect(ui.comboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(onCurrentIndexChanged(int))); connect(ui.comboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(onCurrentIndexChanged(int)));

4
ArchitectureColoredPainting/src/Editor/RightBar/LayerTreeWidget.cpp
View File

@ -93,13 +93,13 @@ void LayerTreeWidget::popMenu(const QPoint &pos)
} }
} }
if (typeid(*layer) == typeid(FolderLayerWrapper) && ((FolderLayerWrapper*)layer)->getReferencedBy() == -1) { if (typeid(*layer) == typeid(FolderLayerWrapper) && ((FolderLayerWrapper*)layer)->getReferencedBy() == -1) {
menu.addAction(QString::fromLocal8Bit("´´½¨×éºÏÔªËØ"), this, [this, layer]() { menu.addAction(QString::fromLocal8Bit("´´½¨×éºÏÔªËØ"), this, [this]() {
auto layer = dynamic_cast<FolderLayerWrapper*>(this->selectedItem->data(0, Qt::UserRole).value<LayerWrapper*>()); auto layer = dynamic_cast<FolderLayerWrapper*>(this->selectedItem->data(0, Qt::UserRole).value<LayerWrapper*>());
if (layer != nullptr) { if (layer != nullptr) {
bool ok; bool ok;
QString name = QInputDialog::getText(this, QString::fromLocal8Bit("´´½¨×éºÏÔªËØ"), QString name = QInputDialog::getText(this, QString::fromLocal8Bit("´´½¨×éºÏÔªËØ"),
QString::fromLocal8Bit("×éºÏÔªËØÃû³Æ:"), QLineEdit::Normal, QString::fromLocal8Bit("×éºÏÔªËØÃû³Æ:"), QLineEdit::Normal,
QString::fromLocal8Bit("ͼԴ") + layer->property.name, &ok); "", &ok);
if (ok && !name.isEmpty()) { if (ok && !name.isEmpty()) {
elementManager->createGroupElement(name, layer); elementManager->createGroupElement(name, layer);
emit triggerCentralRefresh(); emit triggerCentralRefresh();