Some dialogs should behave like windows on mac.
--HG-- branch : develop
This commit is contained in:
parent
20840667bb
commit
a2c54fc7f3
|
@ -61,6 +61,11 @@ DialogMDataBase::DialogMDataBase(const QStringList &list, QWidget *parent)
|
||||||
groupQ(nullptr)
|
groupQ(nullptr)
|
||||||
{
|
{
|
||||||
ui->setupUi(this);
|
ui->setupUi(this);
|
||||||
|
|
||||||
|
#if defined(Q_OS_MAC)
|
||||||
|
setWindowFlags(Qt::Window);
|
||||||
|
#endif
|
||||||
|
|
||||||
InitDataBase(list);
|
InitDataBase(list);
|
||||||
|
|
||||||
ui->treeWidget->installEventFilter(this);
|
ui->treeWidget->installEventFilter(this);
|
||||||
|
@ -99,6 +104,11 @@ DialogMDataBase::DialogMDataBase(QWidget *parent)
|
||||||
|
|
||||||
{
|
{
|
||||||
ui->setupUi(this);
|
ui->setupUi(this);
|
||||||
|
|
||||||
|
#if defined(Q_OS_MAC)
|
||||||
|
setWindowFlags(Qt::Window);
|
||||||
|
#endif
|
||||||
|
|
||||||
InitDataBase();
|
InitDataBase();
|
||||||
|
|
||||||
ui->treeWidget->installEventFilter(this);
|
ui->treeWidget->installEventFilter(this);
|
||||||
|
|
|
@ -45,6 +45,10 @@ DialogTapePreferences::DialogTapePreferences(QWidget *parent)
|
||||||
{
|
{
|
||||||
ui->setupUi(this);
|
ui->setupUi(this);
|
||||||
|
|
||||||
|
#if defined(Q_OS_MAC)
|
||||||
|
setWindowFlags(Qt::Window);
|
||||||
|
#endif
|
||||||
|
|
||||||
qApp->Settings()->GetOsSeparator() ? setLocale(QLocale()) : setLocale(QLocale::c());
|
qApp->Settings()->GetOsSeparator() ? setLocale(QLocale()) : setLocale(QLocale::c());
|
||||||
|
|
||||||
QPushButton *bOk = ui->buttonBox->button(QDialogButtonBox::Ok);
|
QPushButton *bOk = ui->buttonBox->button(QDialogButtonBox::Ok);
|
||||||
|
|
|
@ -75,6 +75,10 @@ DialogFinalMeasurements::DialogFinalMeasurements(VPattern *doc, QWidget *parent)
|
||||||
{
|
{
|
||||||
ui->setupUi(this);
|
ui->setupUi(this);
|
||||||
|
|
||||||
|
#if defined(Q_OS_MAC)
|
||||||
|
setWindowFlags(Qt::Window);
|
||||||
|
#endif
|
||||||
|
|
||||||
ui->lineEditName->setClearButtonEnabled(true);
|
ui->lineEditName->setClearButtonEnabled(true);
|
||||||
ui->lineEditFind->setClearButtonEnabled(true);
|
ui->lineEditFind->setClearButtonEnabled(true);
|
||||||
|
|
||||||
|
|
|
@ -69,6 +69,10 @@ DialogIncrements::DialogIncrements(VContainer *data, VPattern *doc, QWidget *par
|
||||||
{
|
{
|
||||||
ui->setupUi(this);
|
ui->setupUi(this);
|
||||||
|
|
||||||
|
#if defined(Q_OS_MAC)
|
||||||
|
setWindowFlags(Qt::Window);
|
||||||
|
#endif
|
||||||
|
|
||||||
ui->lineEditName->setClearButtonEnabled(true);
|
ui->lineEditName->setClearButtonEnabled(true);
|
||||||
ui->lineEditFind->setClearButtonEnabled(true);
|
ui->lineEditFind->setClearButtonEnabled(true);
|
||||||
ui->lineEditNamePC->setClearButtonEnabled(true);
|
ui->lineEditNamePC->setClearButtonEnabled(true);
|
||||||
|
|
|
@ -45,6 +45,9 @@
|
||||||
<attribute name="title">
|
<attribute name="title">
|
||||||
<string>Increments</string>
|
<string>Increments</string>
|
||||||
</attribute>
|
</attribute>
|
||||||
|
<attribute name="toolTip">
|
||||||
|
<string>Increments</string>
|
||||||
|
</attribute>
|
||||||
<layout class="QVBoxLayout" name="verticalLayout_4">
|
<layout class="QVBoxLayout" name="verticalLayout_4">
|
||||||
<item>
|
<item>
|
||||||
<layout class="QHBoxLayout" name="horizontalLayout_4">
|
<layout class="QHBoxLayout" name="horizontalLayout_4">
|
||||||
|
@ -484,6 +487,9 @@
|
||||||
<attribute name="title">
|
<attribute name="title">
|
||||||
<string>Preview calculations</string>
|
<string>Preview calculations</string>
|
||||||
</attribute>
|
</attribute>
|
||||||
|
<attribute name="toolTip">
|
||||||
|
<string>Preview calculations</string>
|
||||||
|
</attribute>
|
||||||
<layout class="QVBoxLayout" name="verticalLayout_2">
|
<layout class="QVBoxLayout" name="verticalLayout_2">
|
||||||
<item>
|
<item>
|
||||||
<layout class="QHBoxLayout" name="horizontalLayout_8">
|
<layout class="QHBoxLayout" name="horizontalLayout_8">
|
||||||
|
@ -923,6 +929,9 @@
|
||||||
<attribute name="title">
|
<attribute name="title">
|
||||||
<string>Lines</string>
|
<string>Lines</string>
|
||||||
</attribute>
|
</attribute>
|
||||||
|
<attribute name="toolTip">
|
||||||
|
<string>Lines</string>
|
||||||
|
</attribute>
|
||||||
<layout class="QGridLayout" name="gridLayout_3">
|
<layout class="QGridLayout" name="gridLayout_3">
|
||||||
<item row="0" column="0">
|
<item row="0" column="0">
|
||||||
<widget class="QTableWidget" name="tableWidgetLines">
|
<widget class="QTableWidget" name="tableWidgetLines">
|
||||||
|
@ -962,6 +971,9 @@
|
||||||
<attribute name="title">
|
<attribute name="title">
|
||||||
<string>Lines angles</string>
|
<string>Lines angles</string>
|
||||||
</attribute>
|
</attribute>
|
||||||
|
<attribute name="toolTip">
|
||||||
|
<string>Lines angles</string>
|
||||||
|
</attribute>
|
||||||
<layout class="QGridLayout" name="gridLayout_6">
|
<layout class="QGridLayout" name="gridLayout_6">
|
||||||
<item row="0" column="0">
|
<item row="0" column="0">
|
||||||
<widget class="QTableWidget" name="tableWidgetLinesAngles">
|
<widget class="QTableWidget" name="tableWidgetLinesAngles">
|
||||||
|
@ -1001,6 +1013,9 @@
|
||||||
<attribute name="title">
|
<attribute name="title">
|
||||||
<string>Lengths curves</string>
|
<string>Lengths curves</string>
|
||||||
</attribute>
|
</attribute>
|
||||||
|
<attribute name="toolTip">
|
||||||
|
<string>Lengths curves</string>
|
||||||
|
</attribute>
|
||||||
<layout class="QGridLayout" name="gridLayout_4">
|
<layout class="QGridLayout" name="gridLayout_4">
|
||||||
<item row="0" column="0">
|
<item row="0" column="0">
|
||||||
<widget class="QTableWidget" name="tableWidgetSplines">
|
<widget class="QTableWidget" name="tableWidgetSplines">
|
||||||
|
@ -1040,6 +1055,9 @@
|
||||||
<attribute name="title">
|
<attribute name="title">
|
||||||
<string>Curves control point lengths</string>
|
<string>Curves control point lengths</string>
|
||||||
</attribute>
|
</attribute>
|
||||||
|
<attribute name="toolTip">
|
||||||
|
<string>Curves control point lengths</string>
|
||||||
|
</attribute>
|
||||||
<layout class="QVBoxLayout" name="verticalLayout_3">
|
<layout class="QVBoxLayout" name="verticalLayout_3">
|
||||||
<item>
|
<item>
|
||||||
<widget class="QTableWidget" name="tableWidgetCLength">
|
<widget class="QTableWidget" name="tableWidgetCLength">
|
||||||
|
@ -1079,6 +1097,9 @@
|
||||||
<attribute name="title">
|
<attribute name="title">
|
||||||
<string>Angles curves</string>
|
<string>Angles curves</string>
|
||||||
</attribute>
|
</attribute>
|
||||||
|
<attribute name="toolTip">
|
||||||
|
<string>Angles curves</string>
|
||||||
|
</attribute>
|
||||||
<layout class="QGridLayout" name="gridLayout_8">
|
<layout class="QGridLayout" name="gridLayout_8">
|
||||||
<item row="0" column="0">
|
<item row="0" column="0">
|
||||||
<widget class="QTableWidget" name="tableWidgetAnglesCurves">
|
<widget class="QTableWidget" name="tableWidgetAnglesCurves">
|
||||||
|
@ -1118,6 +1139,9 @@
|
||||||
<attribute name="title">
|
<attribute name="title">
|
||||||
<string>Radiuses arcs</string>
|
<string>Radiuses arcs</string>
|
||||||
</attribute>
|
</attribute>
|
||||||
|
<attribute name="toolTip">
|
||||||
|
<string>Radiuses arcs</string>
|
||||||
|
</attribute>
|
||||||
<layout class="QGridLayout" name="gridLayout_7">
|
<layout class="QGridLayout" name="gridLayout_7">
|
||||||
<item row="0" column="0">
|
<item row="0" column="0">
|
||||||
<widget class="QTableWidget" name="tableWidgetRadiusesArcs">
|
<widget class="QTableWidget" name="tableWidgetRadiusesArcs">
|
||||||
|
|
|
@ -75,6 +75,10 @@ DialogPatternProperties::DialogPatternProperties(VPattern *doc, VContainer *pat
|
||||||
{
|
{
|
||||||
ui->setupUi(this);
|
ui->setupUi(this);
|
||||||
|
|
||||||
|
#if defined(Q_OS_MAC)
|
||||||
|
setWindowFlags(Qt::Window);
|
||||||
|
#endif
|
||||||
|
|
||||||
SCASSERT(doc != nullptr)
|
SCASSERT(doc != nullptr)
|
||||||
|
|
||||||
VSettings *settings = qApp->ValentinaSettings();
|
VSettings *settings = qApp->ValentinaSettings();
|
||||||
|
|
|
@ -46,6 +46,11 @@ DialogPreferences::DialogPreferences(QWidget *parent)
|
||||||
m_pathPage(new PreferencesPathPage)
|
m_pathPage(new PreferencesPathPage)
|
||||||
{
|
{
|
||||||
ui->setupUi(this);
|
ui->setupUi(this);
|
||||||
|
|
||||||
|
#if defined(Q_OS_MAC)
|
||||||
|
setWindowFlags(Qt::Window);
|
||||||
|
#endif
|
||||||
|
|
||||||
qApp->Settings()->GetOsSeparator() ? setLocale(QLocale()) : setLocale(QLocale::c());
|
qApp->Settings()->GetOsSeparator() ? setLocale(QLocale()) : setLocale(QLocale::c());
|
||||||
|
|
||||||
QPushButton *bOk = ui->buttonBox->button(QDialogButtonBox::Ok);
|
QPushButton *bOk = ui->buttonBox->button(QDialogButtonBox::Ok);
|
||||||
|
|
|
@ -61,6 +61,10 @@ DialogSaveLayout::DialogSaveLayout(int count, Draw mode, const QString &fileName
|
||||||
{
|
{
|
||||||
ui->setupUi(this);
|
ui->setupUi(this);
|
||||||
|
|
||||||
|
#if defined(Q_OS_MAC)
|
||||||
|
setWindowFlags(Qt::Window);
|
||||||
|
#endif
|
||||||
|
|
||||||
ui->lineEditPath->setClearButtonEnabled(true);
|
ui->lineEditPath->setClearButtonEnabled(true);
|
||||||
ui->lineEditFileName->setClearButtonEnabled(true);
|
ui->lineEditFileName->setClearButtonEnabled(true);
|
||||||
|
|
||||||
|
|
|
@ -78,6 +78,11 @@ DialogEditWrongFormula::DialogEditWrongFormula(const VContainer *data, const qui
|
||||||
checkZero(false), checkLessThanZero(false), postfix(QString()), restoreCursor(false)
|
checkZero(false), checkLessThanZero(false), postfix(QString()), restoreCursor(false)
|
||||||
{
|
{
|
||||||
ui->setupUi(this);
|
ui->setupUi(this);
|
||||||
|
|
||||||
|
#if defined(Q_OS_MAC)
|
||||||
|
setWindowFlags(Qt::Window);
|
||||||
|
#endif
|
||||||
|
|
||||||
InitVariables();
|
InitVariables();
|
||||||
InitFormulaUI(ui);
|
InitFormulaUI(ui);
|
||||||
this->formulaBaseHeight = ui->plainTextEditFormula->height();
|
this->formulaBaseHeight = ui->plainTextEditFormula->height();
|
||||||
|
|
Loading…
Reference in New Issue
Block a user