diff --git a/src/app/tape/dialogs/dialogmdatabase.cpp b/src/app/tape/dialogs/dialogmdatabase.cpp index ebe92decc..c6f591b0a 100644 --- a/src/app/tape/dialogs/dialogmdatabase.cpp +++ b/src/app/tape/dialogs/dialogmdatabase.cpp @@ -61,6 +61,11 @@ DialogMDataBase::DialogMDataBase(const QStringList &list, QWidget *parent) groupQ(nullptr) { ui->setupUi(this); + +#if defined(Q_OS_MAC) + setWindowFlags(Qt::Window); +#endif + InitDataBase(list); ui->treeWidget->installEventFilter(this); @@ -99,6 +104,11 @@ DialogMDataBase::DialogMDataBase(QWidget *parent) { ui->setupUi(this); + +#if defined(Q_OS_MAC) + setWindowFlags(Qt::Window); +#endif + InitDataBase(); ui->treeWidget->installEventFilter(this); diff --git a/src/app/tape/dialogs/dialogtapepreferences.cpp b/src/app/tape/dialogs/dialogtapepreferences.cpp index a7a77fbd4..8f4eff643 100644 --- a/src/app/tape/dialogs/dialogtapepreferences.cpp +++ b/src/app/tape/dialogs/dialogtapepreferences.cpp @@ -45,6 +45,10 @@ DialogTapePreferences::DialogTapePreferences(QWidget *parent) { ui->setupUi(this); +#if defined(Q_OS_MAC) + setWindowFlags(Qt::Window); +#endif + qApp->Settings()->GetOsSeparator() ? setLocale(QLocale()) : setLocale(QLocale::c()); QPushButton *bOk = ui->buttonBox->button(QDialogButtonBox::Ok); diff --git a/src/app/valentina/dialogs/dialogfinalmeasurements.cpp b/src/app/valentina/dialogs/dialogfinalmeasurements.cpp index 1bd3bc260..59b73a33e 100644 --- a/src/app/valentina/dialogs/dialogfinalmeasurements.cpp +++ b/src/app/valentina/dialogs/dialogfinalmeasurements.cpp @@ -75,6 +75,10 @@ DialogFinalMeasurements::DialogFinalMeasurements(VPattern *doc, QWidget *parent) { ui->setupUi(this); +#if defined(Q_OS_MAC) + setWindowFlags(Qt::Window); +#endif + ui->lineEditName->setClearButtonEnabled(true); ui->lineEditFind->setClearButtonEnabled(true); diff --git a/src/app/valentina/dialogs/dialogincrements.cpp b/src/app/valentina/dialogs/dialogincrements.cpp index 1883fce62..8321f2d31 100644 --- a/src/app/valentina/dialogs/dialogincrements.cpp +++ b/src/app/valentina/dialogs/dialogincrements.cpp @@ -69,6 +69,10 @@ DialogIncrements::DialogIncrements(VContainer *data, VPattern *doc, QWidget *par { ui->setupUi(this); +#if defined(Q_OS_MAC) + setWindowFlags(Qt::Window); +#endif + ui->lineEditName->setClearButtonEnabled(true); ui->lineEditFind->setClearButtonEnabled(true); ui->lineEditNamePC->setClearButtonEnabled(true); diff --git a/src/app/valentina/dialogs/dialogincrements.ui b/src/app/valentina/dialogs/dialogincrements.ui index 795d939b8..1480267c2 100644 --- a/src/app/valentina/dialogs/dialogincrements.ui +++ b/src/app/valentina/dialogs/dialogincrements.ui @@ -45,6 +45,9 @@ Increments + + Increments + @@ -484,6 +487,9 @@ Preview calculations + + Preview calculations + @@ -923,6 +929,9 @@ Lines + + Lines + @@ -962,6 +971,9 @@ Lines angles + + Lines angles + @@ -1001,6 +1013,9 @@ Lengths curves + + Lengths curves + @@ -1040,6 +1055,9 @@ Curves control point lengths + + Curves control point lengths + @@ -1079,6 +1097,9 @@ Angles curves + + Angles curves + @@ -1118,6 +1139,9 @@ Radiuses arcs + + Radiuses arcs + diff --git a/src/app/valentina/dialogs/dialogpatternproperties.cpp b/src/app/valentina/dialogs/dialogpatternproperties.cpp index 42aa3bfc1..24aa3e8b8 100644 --- a/src/app/valentina/dialogs/dialogpatternproperties.cpp +++ b/src/app/valentina/dialogs/dialogpatternproperties.cpp @@ -75,6 +75,10 @@ DialogPatternProperties::DialogPatternProperties(VPattern *doc, VContainer *pat { ui->setupUi(this); +#if defined(Q_OS_MAC) + setWindowFlags(Qt::Window); +#endif + SCASSERT(doc != nullptr) VSettings *settings = qApp->ValentinaSettings(); diff --git a/src/app/valentina/dialogs/dialogpreferences.cpp b/src/app/valentina/dialogs/dialogpreferences.cpp index 849b4dbbb..d37a9f83d 100644 --- a/src/app/valentina/dialogs/dialogpreferences.cpp +++ b/src/app/valentina/dialogs/dialogpreferences.cpp @@ -46,6 +46,11 @@ DialogPreferences::DialogPreferences(QWidget *parent) m_pathPage(new PreferencesPathPage) { ui->setupUi(this); + +#if defined(Q_OS_MAC) + setWindowFlags(Qt::Window); +#endif + qApp->Settings()->GetOsSeparator() ? setLocale(QLocale()) : setLocale(QLocale::c()); QPushButton *bOk = ui->buttonBox->button(QDialogButtonBox::Ok); diff --git a/src/app/valentina/dialogs/dialogsavelayout.cpp b/src/app/valentina/dialogs/dialogsavelayout.cpp index 07dc5e424..d6b236d47 100644 --- a/src/app/valentina/dialogs/dialogsavelayout.cpp +++ b/src/app/valentina/dialogs/dialogsavelayout.cpp @@ -61,6 +61,10 @@ DialogSaveLayout::DialogSaveLayout(int count, Draw mode, const QString &fileName { ui->setupUi(this); +#if defined(Q_OS_MAC) + setWindowFlags(Qt::Window); +#endif + ui->lineEditPath->setClearButtonEnabled(true); ui->lineEditFileName->setClearButtonEnabled(true); diff --git a/src/libs/vtools/dialogs/support/dialogeditwrongformula.cpp b/src/libs/vtools/dialogs/support/dialogeditwrongformula.cpp index de9ba7b49..c30e988f4 100644 --- a/src/libs/vtools/dialogs/support/dialogeditwrongformula.cpp +++ b/src/libs/vtools/dialogs/support/dialogeditwrongformula.cpp @@ -78,6 +78,11 @@ DialogEditWrongFormula::DialogEditWrongFormula(const VContainer *data, const qui checkZero(false), checkLessThanZero(false), postfix(QString()), restoreCursor(false) { ui->setupUi(this); + +#if defined(Q_OS_MAC) + setWindowFlags(Qt::Window); +#endif + InitVariables(); InitFormulaUI(ui); this->formulaBaseHeight = ui->plainTextEditFormula->height();