diff options
| author | Marco Bubke <marco.bubke@digia.com> | 2013-05-23 15:30:43 +0200 |
|---|---|---|
| committer | Marco Bubke <marco.bubke@digia.com> | 2013-05-23 15:37:14 +0200 |
| commit | 9a1a0065f1b7db60be5ed6006cd64c853cecc001 (patch) | |
| tree | e177070813a864fa177dc24bbe74fbcbeaf7f36f /src/plugins/qmldesigner/settingspage.cpp | |
| parent | 61828eda74569224ca64b8cff6317f7b0f134be3 (diff) | |
QmlDesigner: Rename margins to padding
The old name was misleading.
Change-Id: I253b21530e0f2c7c68c4850190d791aeb8567172
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
Diffstat (limited to 'src/plugins/qmldesigner/settingspage.cpp')
| -rw-r--r-- | src/plugins/qmldesigner/settingspage.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/qmldesigner/settingspage.cpp b/src/plugins/qmldesigner/settingspage.cpp index 941cb4b5597..3cf0e6cc0ec 100644 --- a/src/plugins/qmldesigner/settingspage.cpp +++ b/src/plugins/qmldesigner/settingspage.cpp @@ -50,7 +50,7 @@ DesignerSettings SettingsPageWidget::settings() const { DesignerSettings designerSettings; designerSettings.itemSpacing = m_ui.spinItemSpacing->value(); - designerSettings.snapMargin = m_ui.spinSnapMargin->value(); + designerSettings.containerPadding = m_ui.spinSnapMargin->value(); designerSettings.canvasWidth = m_ui.spinCanvasWidth->value(); designerSettings.canvasHeight = m_ui.spinCanvasHeight->value(); designerSettings.warningsInDesigner = m_ui.designerWarningsCheckBox->isChecked(); @@ -64,7 +64,7 @@ DesignerSettings SettingsPageWidget::settings() const void SettingsPageWidget::setSettings(const DesignerSettings &designerSettings) { m_ui.spinItemSpacing->setValue(designerSettings.itemSpacing); - m_ui.spinSnapMargin->setValue(designerSettings.snapMargin); + m_ui.spinSnapMargin->setValue(designerSettings.containerPadding); m_ui.spinCanvasWidth->setValue(designerSettings.canvasWidth); m_ui.spinCanvasHeight->setValue(designerSettings.canvasHeight); m_ui.designerWarningsCheckBox->setChecked(designerSettings.warningsInDesigner); |