diff --git a/src/app/valentina/dialogs/dialoghistory.cpp b/src/app/valentina/dialogs/dialoghistory.cpp index 2a29ac1c2..1d4007b6d 100644 --- a/src/app/valentina/dialogs/dialoghistory.cpp +++ b/src/app/valentina/dialogs/dialoghistory.cpp @@ -86,7 +86,7 @@ void DialogHistory::DialogAccepted() QTableWidgetItem *item = ui->tableWidget->item(cursorToolRecordRow, 0); quint32 id = qvariant_cast(item->data(Qt::UserRole)); emit ShowHistoryTool(id, false); - emit DialogClosed(QDialog::Accepted); + accept(); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/app/valentina/dialogs/dialogincrements.cpp b/src/app/valentina/dialogs/dialogincrements.cpp index 73c79ca12..d605ddfde 100644 --- a/src/app/valentina/dialogs/dialogincrements.cpp +++ b/src/app/valentina/dialogs/dialogincrements.cpp @@ -1321,7 +1321,7 @@ void DialogIncrements::closeEvent(QCloseEvent *event) ui->plainTextEditDescription->blockSignals(true); emit UpdateProperties(); - emit DialogClosed(QDialog::Accepted); + accept(); event->accept(); } diff --git a/src/app/valentina/mainwindow.cpp b/src/app/valentina/mainwindow.cpp index 27aac5b83..70e0940e7 100644 --- a/src/app/valentina/mainwindow.cpp +++ b/src/app/valentina/mainwindow.cpp @@ -661,7 +661,7 @@ void MainWindow::SetToolButton(bool checked, Tool t, const QString &cursor, cons connect(scene, &VMainGraphicsScene::ChoosedObject, dialogTool.data(), &DialogTool::ChosenObject); connect(scene, &VMainGraphicsScene::SelectedObject, dialogTool.data(), &DialogTool::SelectedObject); - connect(dialogTool.data(), &DialogTool::DialogClosed, this, closeDialogSlot); + connect(dialogTool.data(), &DialogTool::finished, this, closeDialogSlot); connect(dialogTool.data(), &DialogTool::ToolTip, this, &MainWindow::ShowToolTip); emit ui->view->itemClicked(nullptr); } @@ -4205,7 +4205,7 @@ void MainWindow::CreateActions() dialogHistory = new DialogHistory(pattern, doc, this); dialogHistory->setWindowFlags(Qt::Window); connect(this, &MainWindow::RefreshHistory, dialogHistory.data(), &DialogHistory::UpdateHistory); - connect(dialogHistory.data(), &DialogHistory::DialogClosed, this, [this]() + connect(dialogHistory.data(), &DialogHistory::finished, this, [this]() { ui->actionHistory->setChecked(false); delete dialogHistory; @@ -4253,7 +4253,7 @@ void MainWindow::CreateActions() dialogTable = new DialogIncrements(pattern, doc, this); connect(dialogTable.data(), &DialogIncrements::UpdateProperties, toolOptions, &VToolOptionsPropertyBrowser::RefreshOptions); - connect(dialogTable.data(), &DialogIncrements::DialogClosed, this, [this]() + connect(dialogTable.data(), &DialogIncrements::finished, this, [this]() { ui->actionTable->setChecked(false); delete dialogTable; diff --git a/src/libs/vtools/dialogs/support/dialogeditwrongformula.cpp b/src/libs/vtools/dialogs/support/dialogeditwrongformula.cpp index 183fee2e2..914af665f 100644 --- a/src/libs/vtools/dialogs/support/dialogeditwrongformula.cpp +++ b/src/libs/vtools/dialogs/support/dialogeditwrongformula.cpp @@ -133,15 +133,7 @@ DialogEditWrongFormula::~DialogEditWrongFormula() void DialogEditWrongFormula::DialogAccepted() { formula = ui->plainTextEditFormula->toPlainText(); - emit DialogClosed(QDialog::Accepted); - emit accepted(); -} - -//--------------------------------------------------------------------------------------------------------------------- -void DialogEditWrongFormula::DialogRejected() -{ - emit DialogClosed(QDialog::Rejected); - emit rejected(); + accept(); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/libs/vtools/dialogs/support/dialogeditwrongformula.h b/src/libs/vtools/dialogs/support/dialogeditwrongformula.h index 9777bb0b8..92fc94be6 100644 --- a/src/libs/vtools/dialogs/support/dialogeditwrongformula.h +++ b/src/libs/vtools/dialogs/support/dialogeditwrongformula.h @@ -72,7 +72,6 @@ public: void SetPreviewCalculationsMode(); public slots: virtual void DialogAccepted() Q_DECL_OVERRIDE; - virtual void DialogRejected() Q_DECL_OVERRIDE; virtual void EvalFormula() Q_DECL_OVERRIDE; void ValChanged(int row); void PutHere(); diff --git a/src/libs/vtools/dialogs/tools/dialogtool.cpp b/src/libs/vtools/dialogs/tools/dialogtool.cpp index b2f087136..86e69df00 100644 --- a/src/libs/vtools/dialogs/tools/dialogtool.cpp +++ b/src/libs/vtools/dialogs/tools/dialogtool.cpp @@ -183,7 +183,7 @@ DialogTool::~DialogTool() */ void DialogTool::closeEvent(QCloseEvent *event) { - DialogRejected(); + reject(); event->accept(); } @@ -1181,7 +1181,7 @@ void DialogTool::ChangeColor(QWidget *widget, const QColor &color) void DialogTool::DialogAccepted() { SaveData(); - emit DialogClosed(QDialog::Accepted); + accept(); } //--------------------------------------------------------------------------------------------------------------------- @@ -1191,15 +1191,6 @@ void DialogTool::DialogApply() emit DialogApplied(); } -//--------------------------------------------------------------------------------------------------------------------- -/** - * @brief DialogRejected emit signal dialog rejected - */ -void DialogTool::DialogRejected() -{ - emit DialogClosed(QDialog::Rejected); -} - //--------------------------------------------------------------------------------------------------------------------- /** * @brief formula check formula diff --git a/src/libs/vtools/dialogs/tools/dialogtool.h b/src/libs/vtools/dialogs/tools/dialogtool.h index ee80baec3..b00e72810 100644 --- a/src/libs/vtools/dialogs/tools/dialogtool.h +++ b/src/libs/vtools/dialogs/tools/dialogtool.h @@ -97,11 +97,6 @@ public: static void MoveListRowDown(QListWidget *list); static void MoveListRowBottom(QListWidget *list); signals: - /** - * @brief DialogClosed signal dialog closed - * @param result keep result - */ - void DialogClosed(int result); /** * @brief DialogApplied emit signal dialog apply changes */ @@ -120,7 +115,6 @@ public slots: * @brief DialogApply save data and emit signal DialogApplied. */ virtual void DialogApply(); - virtual void DialogRejected(); void FormulaChanged(); /** * @brief FormulaChangedPlainText check formula (plain text editor editor) @@ -367,7 +361,7 @@ inline void DialogTool::InitOkCancel(T *ui) QPushButton *bCancel = ui->buttonBox->button(QDialogButtonBox::Cancel); SCASSERT(bCancel != nullptr) - connect(bCancel, &QPushButton::clicked, this, &DialogTool::DialogRejected); + connect(bCancel, &QPushButton::clicked, this, &DialogTool::reject); qApp->Settings()->GetOsSeparator() ? setLocale(QLocale()) : setLocale(QLocale::c()); } diff --git a/src/libs/vtools/dialogs/tools/piece/dialogseamallowance.cpp b/src/libs/vtools/dialogs/tools/piece/dialogseamallowance.cpp index 6b781b5fb..318bd1c51 100644 --- a/src/libs/vtools/dialogs/tools/piece/dialogseamallowance.cpp +++ b/src/libs/vtools/dialogs/tools/piece/dialogseamallowance.cpp @@ -713,7 +713,7 @@ void DialogSeamAllowance::ShowCustomSAContextMenu(const QPoint &pos) dialog->EnbleShowMode(true); m_dialog = dialog; m_dialog->setModal(true); - connect(m_dialog.data(), &DialogTool::DialogClosed, this, &DialogSeamAllowance::PathDialogClosed); + connect(m_dialog.data(), &DialogTool::finished, this, &DialogSeamAllowance::PathDialogClosed); m_dialog->show(); } } @@ -749,7 +749,7 @@ void DialogSeamAllowance::ShowInternalPathsContextMenu(const QPoint &pos) dialog->EnbleShowMode(true); m_dialog = dialog; m_dialog->setModal(true); - connect(m_dialog.data(), &DialogTool::DialogClosed, this, &DialogSeamAllowance::PathDialogClosed); + connect(m_dialog.data(), &DialogTool::finished, this, &DialogSeamAllowance::PathDialogClosed); m_dialog->show(); } } @@ -846,7 +846,7 @@ void DialogSeamAllowance::ShowPlaceLabelsContextMenu(const QPoint &pos) dialog->EnbleShowMode(true); m_dialog = dialog; m_dialog->setModal(true); - connect(m_dialog.data(), &DialogTool::DialogClosed, this, &DialogSeamAllowance::PlaceLabelDialogClosed); + connect(m_dialog.data(), &DialogTool::finished, this, &DialogSeamAllowance::PlaceLabelDialogClosed); m_dialog->show(); } else if (selectedAction == actionSegment) diff --git a/src/libs/vtools/tools/drawTools/vdrawtool.h b/src/libs/vtools/tools/drawTools/vdrawtool.h index 79da4bf2e..517ffbadb 100644 --- a/src/libs/vtools/tools/drawTools/vdrawtool.h +++ b/src/libs/vtools/tools/drawTools/vdrawtool.h @@ -263,7 +263,7 @@ void VDrawTool::ContextMenu(QGraphicsSceneContextMenuEvent *event, quint32 itemI m_dialog = QSharedPointer(new Dialog(getData(), m_id, qApp->getMainWindow())); m_dialog->setModal(true); - connect(m_dialog.data(), &DialogTool::DialogClosed, this, &VDrawTool::FullUpdateFromGuiOk); + connect(m_dialog.data(), &DialogTool::finished, this, &VDrawTool::FullUpdateFromGuiOk); connect(m_dialog.data(), &DialogTool::DialogApplied, this, &VDrawTool::FullUpdateFromGuiApply); this->setDialog(); diff --git a/src/libs/vtools/tools/vtoolseamallowance.cpp b/src/libs/vtools/tools/vtoolseamallowance.cpp index e57da355e..50a473acf 100644 --- a/src/libs/vtools/tools/vtoolseamallowance.cpp +++ b/src/libs/vtools/tools/vtoolseamallowance.cpp @@ -1470,7 +1470,7 @@ void VToolSeamAllowance::ShowOptions() dialog->EnableApply(true); m_dialog = dialog; m_dialog->setModal(true); - connect(m_dialog.data(), &DialogTool::DialogClosed, this, &VToolSeamAllowance::FullUpdateFromGuiOk); + connect(m_dialog.data(), &DialogTool::finished, this, &VToolSeamAllowance::FullUpdateFromGuiOk); connect(m_dialog.data(), &DialogTool::DialogApplied, this, &VToolSeamAllowance::FullUpdateFromGuiApply); SetDialog(); m_dialog->show();