Compare commits

..

No commits in common. "0543a02dfb24693b5ca13841e20394cb8210b409" and "bf71d17b5d31abe029fa35e38ad21e55b70936ed" have entirely different histories.

2 changed files with 2 additions and 4 deletions

View File

@ -6,8 +6,6 @@ LayerCreateWidget::LayerCreateWidget(ElementManager* elementManager, FolderLayer
{
this->elementManager = elementManager;
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(rejected()), this, SLOT(reject()));
connect(ui.comboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(onCurrentIndexChanged(int)));

View File

@ -93,13 +93,13 @@ void LayerTreeWidget::popMenu(const QPoint &pos)
}
}
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*>());
if (layer != nullptr) {
bool ok;
QString name = QInputDialog::getText(this, QString::fromLocal8Bit("´´½¨×éºÏÔªËØ"),
QString::fromLocal8Bit("×éºÏÔªËØÃû³Æ:"), QLineEdit::Normal,
QString::fromLocal8Bit("ͼԴ") + layer->property.name, &ok);
"", &ok);
if (ok && !name.isEmpty()) {
elementManager->createGroupElement(name, layer);
emit triggerCentralRefresh();