diff --git a/src/app/valentina/mainwindow.cpp b/src/app/valentina/mainwindow.cpp index 6c36508a7..b4517e3fe 100644 --- a/src/app/valentina/mainwindow.cpp +++ b/src/app/valentina/mainwindow.cpp @@ -1392,7 +1392,7 @@ void MainWindow::LoadIndividual() doc->SetPath(RelativeMPath(curFile, mPath)); watcher->addPath(mPath); PatternChangesWereSaved(false); - ui->actionShowM->setEnabled(true); + ui->actionEditCurrent->setEnabled(true); helpLabel->setText(tr("Measurements loaded")); doc->LiteParseTree(Document::LiteParse); @@ -1432,7 +1432,7 @@ void MainWindow::LoadStandard() doc->SetPath(RelativeMPath(curFile, mPath)); watcher->addPath(mPath); PatternChangesWereSaved(false); - ui->actionShowM->setEnabled(true); + ui->actionEditCurrent->setEnabled(true); helpLabel->setText(tr("Measurements loaded")); doc->LiteParseTree(Document::LiteParse); @@ -1468,7 +1468,7 @@ void MainWindow::UnloadMeasurements() watcher->removePath(AbsoluteMPath(curFile, doc->MPath())); doc->SetPath(QString()); PatternChangesWereSaved(false); - ui->actionShowM->setEnabled(false); + ui->actionEditCurrent->setEnabled(false); ui->actionUnloadMeasurements->setDisabled(true); helpLabel->setText(tr("Measurements unloaded")); @@ -1518,7 +1518,7 @@ void MainWindow::ShowMeasurements() } else { - ui->actionShowM->setEnabled(false); + ui->actionEditCurrent->setEnabled(false); } } @@ -2593,7 +2593,7 @@ void MainWindow::Clear() ui->actionLoadIndividual->setEnabled(false); ui->actionLoadStandard->setEnabled(false); ui->actionUnloadMeasurements->setEnabled(false); - ui->actionShowM->setEnabled(false); + ui->actionEditCurrent->setEnabled(false); SetEnableTool(false); qApp->setPatternUnit(Unit::Cm); qApp->setPatternType(MeasurementsType::Unknown); @@ -3781,7 +3781,7 @@ void MainWindow::CreateActions() connect(ui->actionLoadIndividual, &QAction::triggered, this, &MainWindow::LoadIndividual); connect(ui->actionLoadStandard, &QAction::triggered, this, &MainWindow::LoadStandard); - connect(ui->actionCreateNew, &QAction::triggered, RECEIVER(this)[this]() + connect(ui->actionOpenTape, &QAction::triggered, RECEIVER(this)[this]() { const QString tape = qApp->TapeFilePath(); const QString workingDirectory = QFileInfo(tape).absoluteDir().absolutePath(); @@ -3795,7 +3795,7 @@ void MainWindow::CreateActions() QProcess::startDetached(tape, arguments, workingDirectory); }); - connect(ui->actionShowM, &QAction::triggered, this, &MainWindow::ShowMeasurements); + connect(ui->actionEditCurrent, &QAction::triggered, this, &MainWindow::ShowMeasurements); connect(ui->actionExportAs, &QAction::triggered, this, &MainWindow::ExportLayoutAs); connect(ui->actionPrintPreview, &QAction::triggered, this, &MainWindow::PrintPreviewOrigin); connect(ui->actionPrintPreviewTiled, &QAction::triggered, this, &MainWindow::PrintPreviewTiled); @@ -4007,7 +4007,7 @@ bool MainWindow::LoadPattern(const QString &fileName, const QString& customMeasu { ui->actionUnloadMeasurements->setEnabled(true); watcher->addPath(path); - ui->actionShowM->setEnabled(true); + ui->actionEditCurrent->setEnabled(true); } } diff --git a/src/app/valentina/mainwindow.ui b/src/app/valentina/mainwindow.ui index 712936cf8..a094dc919 100644 --- a/src/app/valentina/mainwindow.ui +++ b/src/app/valentina/mainwindow.ui @@ -55,7 +55,7 @@ 0 0 - 100 + 117 358 @@ -427,7 +427,7 @@ 0 0 - 100 + 130 110 @@ -536,7 +536,7 @@ 0 0 - 100 + 130 248 @@ -798,7 +798,7 @@ 0 0 - 100 + 130 248 @@ -1063,7 +1063,7 @@ 0 0 - 100 + 130 58 @@ -1321,7 +1321,7 @@ 0 0 - 100 + 130 150 @@ -1456,8 +1456,8 @@ 0 0 - 100 - 58 + 130 + 326 @@ -1616,13 +1616,13 @@ Measurements - + + + - - - + @@ -2072,10 +2072,10 @@ :/icon/32x32/table.png:/icon/32x32/table.png - Table of variables + Variables Table - Tables of variables + Contains information about increments and internal variables Ctrl+T @@ -2475,7 +2475,10 @@ false - Load Individual ... + Load Individual + + + Load Individual measurements file @@ -2489,21 +2492,13 @@ false - Load Standard ... + Load Multisize - - - - - QAction::NoRole - - - - - Create/Edit + + Load Multisize - Create/edit measurements + Load multisize measurements file @@ -2512,15 +2507,29 @@ QAction::NoRole - + + + Open Tape + + + Open Tape app for creating or editing measurements file + + + + + + QAction::NoRole + + + false - Show ... + Edit Current - Show measurements + Edit linked to the pattern measurements @@ -2538,7 +2547,10 @@ :/icon/32x32/syncM.png:/icon/32x32/syncM.png - Sync measurements + Sync + + + Synchronize linked to the pattern measurements after change @@ -2552,10 +2564,10 @@ false - Unload measurements + Unload Current - Unload measurements if they was not used in a pattern file. + Unload measurements if they were not used in a pattern file @@ -2574,8 +2586,8 @@ - +