mirror of
https://github.com/fralx/LimeReport.git
synced 2025-01-12 01:21:03 +03:00
Finish 1.4.114
# Conflicts: # limereport/lrbasedesignintf.cpp
This commit is contained in:
commit
c00b8aa50c
@ -1180,13 +1180,6 @@ void BaseDesignIntf::showEditorDialog(){
|
|||||||
QWidget *editor = defaultEditor();
|
QWidget *editor = defaultEditor();
|
||||||
if (editor) {
|
if (editor) {
|
||||||
editor->setStyleSheet(findRootWidget(scene()->views().at(0))->styleSheet());
|
editor->setStyleSheet(findRootWidget(scene()->views().at(0))->styleSheet());
|
||||||
|
|
||||||
#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
|
||||||
@ -1201,7 +1194,6 @@ void BaseDesignIntf::showEditorDialog(){
|
|||||||
connect(editor,SIGNAL(destroyed()),dialog,SLOT(close()));
|
connect(editor,SIGNAL(destroyed()),dialog,SLOT(close()));
|
||||||
dialog->setWindowTitle(editor->windowTitle());
|
dialog->setWindowTitle(editor->windowTitle());
|
||||||
dialog->exec();
|
dialog->exec();
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user