diff options
Diffstat (limited to 'src/designer/src/components/formeditor/formwindowsettings.cpp')
| -rw-r--r-- | src/designer/src/components/formeditor/formwindowsettings.cpp | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/src/designer/src/components/formeditor/formwindowsettings.cpp b/src/designer/src/components/formeditor/formwindowsettings.cpp index 63fabf615..4ccd7210b 100644 --- a/src/designer/src/components/formeditor/formwindowsettings.cpp +++ b/src/designer/src/components/formeditor/formwindowsettings.cpp @@ -67,6 +67,7 @@ struct FormWindowData { bool hasFormGrid{false}; Grid grid; bool idBasedTranslations{false}; + bool connectSlotsByName{true}; }; inline bool operator==(const FormWindowData &fd1, const FormWindowData &fd2) { return fd1.equals(fd2); } @@ -80,6 +81,7 @@ QDebug operator<<(QDebug str, const FormWindowData &d) << d.pixFunction << " Author=" << d.author << " Hints=" << d.includeHints << " Grid=" << d.hasFormGrid << d.grid.deltaX() << d.grid.deltaY() << " ID-based translations" << d.idBasedTranslations + << " Connect slots by name" << d.connectSlotsByName << '\n'; return str; } @@ -97,7 +99,8 @@ bool FormWindowData::equals(const FormWindowData &rhs) const includeHints == rhs.includeHints && hasFormGrid == rhs.hasFormGrid && grid == rhs.grid && - idBasedTranslations == rhs.idBasedTranslations; + idBasedTranslations == rhs.idBasedTranslations && + connectSlotsByName == rhs.connectSlotsByName; } void FormWindowData::fromFormWindow(FormWindowBase* fw) @@ -108,9 +111,9 @@ void FormWindowData::fromFormWindow(FormWindowBase* fw) QStyle *style = fw->formContainer()->style(); layoutDefaultEnabled = defaultMargin != INT_MIN || defaultSpacing != INT_MIN; if (defaultMargin == INT_MIN) - defaultMargin = style->pixelMetric(QStyle::PM_DefaultChildMargin, 0); + defaultMargin = style->pixelMetric(QStyle::PM_DefaultChildMargin, nullptr); if (defaultSpacing == INT_MIN) - defaultSpacing = style->pixelMetric(QStyle::PM_DefaultLayoutSpacing, 0); + defaultSpacing = style->pixelMetric(QStyle::PM_DefaultLayoutSpacing, nullptr); marginFunction.clear(); @@ -128,6 +131,7 @@ void FormWindowData::fromFormWindow(FormWindowBase* fw) hasFormGrid = fw->hasFormGrid(); grid = hasFormGrid ? fw->designerGrid() : FormWindowBase::defaultDesignerGrid(); idBasedTranslations = fw->useIdBasedTranslations(); + connectSlotsByName = fw->connectSlotsByName(); } void FormWindowData::applyToFormWindow(FormWindowBase* fw) const @@ -154,6 +158,7 @@ void FormWindowData::applyToFormWindow(FormWindowBase* fw) const if (hasFormGrid || hadFormGrid != hasFormGrid) fw->setDesignerGrid(hasFormGrid ? grid : FormWindowBase::defaultDesignerGrid()); fw->setUseIdBasedTranslations(idBasedTranslations); + fw->setConnectSlotsByName(connectSlotsByName); } // -------------------------- FormWindowSettings @@ -220,6 +225,7 @@ FormWindowData FormWindowSettings::data() const rc.hasFormGrid = m_ui->gridPanel->isChecked(); rc.grid = m_ui->gridPanel->grid(); rc.idBasedTranslations = m_ui->idBasedTranslationsCheckBox->isChecked(); + rc.connectSlotsByName = m_ui->connectSlotsByNameCheckBox->isChecked(); return rc; } @@ -247,6 +253,7 @@ void FormWindowSettings::setData(const FormWindowData &data) m_ui->gridPanel->setChecked(data.hasFormGrid); m_ui->gridPanel->setGrid(data.grid); m_ui->idBasedTranslationsCheckBox->setChecked(data.idBasedTranslations); + m_ui->connectSlotsByNameCheckBox->setChecked(data.connectSlotsByName); } void FormWindowSettings::accept() |