mirror of
https://github.com/fralx/LimeReport.git
synced 2024-12-25 00:54:39 +03:00
Default editor dialog execution is unified
This commit is contained in:
parent
1489aeb7d6
commit
4f0bde628b
@ -1135,13 +1135,6 @@ void BaseDesignIntf::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
|
|||||||
void BaseDesignIntf::showEditorDialog(){
|
void BaseDesignIntf::showEditorDialog(){
|
||||||
QWidget *editor = defaultEditor();
|
QWidget *editor = defaultEditor();
|
||||||
if (editor) {
|
if (editor) {
|
||||||
|
|
||||||
#ifdef Q_OS_WIN
|
|
||||||
editor->setAttribute(Qt::WA_DeleteOnClose);
|
|
||||||
editor->setWindowFlags(Qt::Dialog);
|
|
||||||
editor->setWindowModality(Qt::ApplicationModal);
|
|
||||||
editor->show();
|
|
||||||
#else
|
|
||||||
QDialog* dialog = new QDialog(QApplication::activeWindow());
|
QDialog* dialog = new QDialog(QApplication::activeWindow());
|
||||||
dialog->setAttribute(Qt::WA_DeleteOnClose);
|
dialog->setAttribute(Qt::WA_DeleteOnClose);
|
||||||
#ifdef Q_OS_MAC
|
#ifdef Q_OS_MAC
|
||||||
@ -1155,7 +1148,6 @@ void BaseDesignIntf::showEditorDialog(){
|
|||||||
dialog->layout()->addWidget(editor);
|
dialog->layout()->addWidget(editor);
|
||||||
connect(editor,SIGNAL(destroyed()),dialog,SLOT(close()));
|
connect(editor,SIGNAL(destroyed()),dialog,SLOT(close()));
|
||||||
dialog->exec();
|
dialog->exec();
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user