diff --git a/src/app/tape/tmainwindow.cpp b/src/app/tape/tmainwindow.cpp index ca3e7feb5..1a632e3be 100644 --- a/src/app/tape/tmainwindow.cpp +++ b/src/app/tape/tmainwindow.cpp @@ -462,6 +462,13 @@ void TMainWindow::CreateFromExisting() } } +//--------------------------------------------------------------------------------------------------------------------- +void TMainWindow::Preferences() +{ + TapeConfigDialog dlg(this); + dlg.exec(); +} + //--------------------------------------------------------------------------------------------------------------------- void TMainWindow::closeEvent(QCloseEvent *event) { @@ -1734,11 +1741,7 @@ void TMainWindow::SetupMenu() connect(ui->actionExportToCSV, &QAction::triggered, this, &TMainWindow::ExportToCSV); connect(ui->actionReadOnly, &QAction::triggered, this, &TMainWindow::ReadOnly); - connect(ui->actionPreferences, &QAction::triggered, [this]() - { - TapeConfigDialog dlg(this); - dlg.exec(); - }); + connect(ui->actionPreferences, &QAction::triggered, this, &TMainWindow::Preferences); for (int i = 0; i < MaxRecentFiles; ++i) { diff --git a/src/app/tape/tmainwindow.h b/src/app/tape/tmainwindow.h index 80683d98f..c9a5eb8ae 100644 --- a/src/app/tape/tmainwindow.h +++ b/src/app/tape/tmainwindow.h @@ -75,6 +75,7 @@ private slots: void OpenStandard(); void OpenTemplate(); void CreateFromExisting(); + void Preferences(); void FileSave(); void FileSaveAs(); diff --git a/src/app/valentina/mainwindow.cpp b/src/app/valentina/mainwindow.cpp index 03e8cbb00..dcae0ecf1 100644 --- a/src/app/valentina/mainwindow.cpp +++ b/src/app/valentina/mainwindow.cpp @@ -3553,18 +3553,7 @@ void MainWindow::CreateActions() connect(ui->actionExit, &QAction::triggered, this, &MainWindow::close); - connect(ui->actionPreferences, &QAction::triggered, [this]() - { - ConfigDialog dlg(this); - connect(&dlg, &ConfigDialog::UpdateProperties, this, &MainWindow::WindowsLocale); // Must be first - connect(&dlg, &ConfigDialog::UpdateProperties, toolOptions, &VToolOptionsPropertyBrowser::RefreshOptions); - connect(&dlg, &ConfigDialog::UpdateProperties, this, &MainWindow::ToolBarStyles); - if (dlg.exec() == QDialog::Accepted) - { - InitAutoSave(); - } - }); - + connect(ui->actionPreferences, &QAction::triggered, this, &MainWindow::Preferences); connect(ui->actionReportBug, &QAction::triggered, [this]() { qCDebug(vMainWindow, "Reporting bug"); @@ -3954,6 +3943,27 @@ void MainWindow::ShowPaper(int index) ui->view->fitInView(ui->view->scene()->sceneRect(), Qt::KeepAspectRatio); } +//--------------------------------------------------------------------------------------------------------------------- +void MainWindow::Preferences() +{ + ConfigDialog dlg(this); + connect(&dlg, &ConfigDialog::UpdateProperties, this, &MainWindow::WindowsLocale); // Must be first + connect(&dlg, &ConfigDialog::UpdateProperties, toolOptions, &VToolOptionsPropertyBrowser::RefreshOptions); + connect(&dlg, &ConfigDialog::UpdateProperties, this, &MainWindow::ToolBarStyles); + if (dlg.exec() == QDialog::Accepted) + { + InitAutoSave(); + } +} + +//--------------------------------------------------------------------------------------------------------------------- +void MainWindow::CreateMeasurements() +{ + const QString tape = qApp->TapeFilePath(); + const QString workingDirectory = QFileInfo(tape).absoluteDir().absolutePath(); + QProcess::startDetached(tape, QStringList(), workingDirectory); +} + //--------------------------------------------------------------------------------------------------------------------- void MainWindow::ToolBarStyle(QToolBar *bar) { diff --git a/src/app/valentina/mainwindow.h b/src/app/valentina/mainwindow.h index 11bf1f229..581159fae 100644 --- a/src/app/valentina/mainwindow.h +++ b/src/app/valentina/mainwindow.h @@ -111,6 +111,8 @@ private slots: void WindowsLocale(); void ToolBarStyles(); void ShowPaper(int index); + void Preferences(); + void CreateMeasurements(); void ArrowTool(); void ToolEndLine(bool checked);