diff --git a/src/app/dialogs/app/dialogsavelayout.cpp b/src/app/dialogs/app/dialogsavelayout.cpp index fc04d1f22..dec9d2d02 100644 --- a/src/app/dialogs/app/dialogsavelayout.cpp +++ b/src/app/dialogs/app/dialogsavelayout.cpp @@ -35,7 +35,7 @@ #include //--------------------------------------------------------------------------------------------------------------------- -DialogSaveLayout::DialogSaveLayout(const QMap &formates, int count, const QString &mask, +DialogSaveLayout::DialogSaveLayout(const QMap &formates, int count, const QString &fileName, QWidget *parent) :QDialog(parent), ui(new Ui::DialogSaveLAyout), count(count) { @@ -46,8 +46,8 @@ DialogSaveLayout::DialogSaveLayout(const QMap &formates, int c bOk->setEnabled(false); QRegExpValidator *validator = new QRegExpValidator(QRegExp("^[\\w\\-. ]+$"), this); - ui->lineEditMask->setValidator(validator); - ui->lineEditMask->setText(mask); + ui->lineEditFileName->setValidator(validator); + ui->lineEditFileName->setText(fileName); QMap::const_iterator i = formates.constBegin(); while (i != formates.constEnd()) @@ -57,7 +57,7 @@ DialogSaveLayout::DialogSaveLayout(const QMap &formates, int c } connect(bOk, &QPushButton::clicked, this, &DialogSaveLayout::Save); - connect(ui->lineEditMask, &QLineEdit::textChanged, this, &DialogSaveLayout::ShowExample); + connect(ui->lineEditFileName, &QLineEdit::textChanged, this, &DialogSaveLayout::ShowExample); connect(ui->comboBoxFormat, static_cast(&QComboBox::currentIndexChanged), this, &DialogSaveLayout::ShowExample); connect(ui->pushButtonBrowse, &QPushButton::clicked, this, &DialogSaveLayout::Browse); @@ -79,9 +79,9 @@ QString DialogSaveLayout::Path() const } //--------------------------------------------------------------------------------------------------------------------- -QString DialogSaveLayout::Mask() const +QString DialogSaveLayout::FileName() const { - return ui->lineEditMask->text(); + return ui->lineEditFileName->text(); } //--------------------------------------------------------------------------------------------------------------------- @@ -95,7 +95,7 @@ void DialogSaveLayout::Save() { for (int i=0; i < count; ++i) { - const QString name = Path()+"/"+Mask()+QString::number(i+1)+Formate(); + const QString name = Path()+"/"+FileName()+QString::number(i+1)+Formate(); if (QFile::exists(name)) { QMessageBox::StandardButton res = QMessageBox::question(this, tr("Name conflict"), @@ -117,7 +117,7 @@ void DialogSaveLayout::Save() //--------------------------------------------------------------------------------------------------------------------- void DialogSaveLayout::ShowExample() { - ui->labelExample->setText(tr("Example:") + Mask() + "1" + Formate()); + ui->labelExample->setText(tr("Example:") + FileName() + "1" + Formate()); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/app/dialogs/app/dialogsavelayout.h b/src/app/dialogs/app/dialogsavelayout.h index d1e083ed2..1dbdb02f8 100644 --- a/src/app/dialogs/app/dialogsavelayout.h +++ b/src/app/dialogs/app/dialogsavelayout.h @@ -41,12 +41,12 @@ class DialogSaveLayout : public QDialog Q_OBJECT public: - DialogSaveLayout(const QMap &formates, int count, const QString &mask = QString(), + DialogSaveLayout(const QMap &formates, int count, const QString &fileName = QString(), QWidget *parent = 0); ~DialogSaveLayout(); QString Path() const; - QString Mask() const; + QString FileName() const; QString Formate() const; public slots: diff --git a/src/app/dialogs/app/dialogsavelayout.ui b/src/app/dialogs/app/dialogsavelayout.ui index cc1ecd863..ea4082c46 100644 --- a/src/app/dialogs/app/dialogsavelayout.ui +++ b/src/app/dialogs/app/dialogsavelayout.ui @@ -28,7 +28,7 @@ - Mask: + File name: @@ -73,7 +73,7 @@ - + diff --git a/src/app/tablewindow.cpp b/src/app/tablewindow.cpp index e92268020..fe3974934 100644 --- a/src/app/tablewindow.cpp +++ b/src/app/tablewindow.cpp @@ -71,7 +71,7 @@ TableWindow::TableWindow(QWidget *parent) connect(ui->actionZoomIn, &QAction::triggered, ui->view, &VTableGraphicsView::ZoomIn); connect(ui->actionZoomOut, &QAction::triggered, ui->view, &VTableGraphicsView::ZoomOut); connect(ui->actionStop, &QAction::triggered, this, &TableWindow::StopTable); - connect(ui->actionSave, &QAction::triggered, this, &TableWindow::saveScene); + connect(ui->actionSave, &QAction::triggered, this, &TableWindow::SaveLayout); connect(ui->actionLayout, &QAction::triggered, this, &TableWindow::Layout); connect(ui->listWidget, &QListWidget::currentRowChanged, this, &TableWindow::ShowPaper); } @@ -161,7 +161,7 @@ void TableWindow::StopTable() /** * @brief saveScene save created layout. */ -void TableWindow::saveScene() +void TableWindow::SaveLayout() { QMap extByMessage = InitFormates(); DialogSaveLayout dialog(extByMessage, scenes.size(), fileName, this); @@ -175,7 +175,7 @@ void TableWindow::saveScene() suf.replace(".", ""); QString path = dialog.Path(); - QString mask = dialog.Mask(); + QString mask = dialog.FileName(); for (int i=0; i < scenes.size(); ++i) { diff --git a/src/app/tablewindow.h b/src/app/tablewindow.h index 4687256f1..f704c5e1d 100644 --- a/src/app/tablewindow.h +++ b/src/app/tablewindow.h @@ -58,7 +58,7 @@ public slots: const QString &description); void Layout(); void StopTable(); - void saveScene(); + void SaveLayout(); void ShowPaper(int index); signals: