diff options
author | Thomas Hartmann <Thomas.Hartmann@digia.com> | 2012-10-26 13:57:58 +0200 |
---|---|---|
committer | Thomas Hartmann <Thomas.Hartmann@digia.com> | 2012-11-21 15:58:57 +0100 |
commit | 2e3e97c4eca776accb90994cb0f2ccb78182e2b9 (patch) | |
tree | ca895e97c4f5cf0c97d7a20b9bf54f1c4a359335 /src/plugins/qmldesigner/designersettings.cpp | |
parent | 091d1116a27879a880b9f0756a96e1dbb4fa22df (diff) | |
download | qt-creator-2e3e97c4eca776accb90994cb0f2ccb78182e2b9.tar.gz |
QmlDesigner: adding a nice dialog for warnings
This patch also includes options to turn the warnings off.
Change-Id: I540bc19f5a4f23f441af0fd08b072dbcbf067a20
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
Diffstat (limited to 'src/plugins/qmldesigner/designersettings.cpp')
-rw-r--r-- | src/plugins/qmldesigner/designersettings.cpp | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/src/plugins/qmldesigner/designersettings.cpp b/src/plugins/qmldesigner/designersettings.cpp index 27867b1c7f..31ddb46568 100644 --- a/src/plugins/qmldesigner/designersettings.cpp +++ b/src/plugins/qmldesigner/designersettings.cpp @@ -39,7 +39,9 @@ DesignerSettings::DesignerSettings() itemSpacing(0), snapMargin(0), canvasWidth(10000), - canvasHeight(10000) + canvasHeight(10000), + warningsInDesigner(true), + designerWarningsInEditor(false) {} void DesignerSettings::fromSettings(QSettings *settings) @@ -55,6 +57,11 @@ void DesignerSettings::fromSettings(QSettings *settings) QLatin1String(QmlDesigner::Constants::QML_SNAPMARGIN_KEY), QVariant(0)).toInt(); canvasWidth = settings->value(QLatin1String(QmlDesigner::Constants::QML_CANVASWIDTH_KEY), QVariant(10000)).toInt(); canvasHeight = settings->value(QLatin1String(QmlDesigner::Constants::QML_CANVASHEIGHT_KEY), QVariant(10000)).toInt(); + warningsInDesigner = settings->value( + QLatin1String(QmlDesigner::Constants::QML_WARNIN_FOR_FEATURES_IN_DESIGNER_KEY), QVariant(true)).toBool(); + designerWarningsInEditor = settings->value( + QLatin1String(QmlDesigner::Constants::QML_WARNIN_FOR_DESIGNER_FEATURES_IN_EDITOR_KEY), QVariant(false)).toBool(); + settings->endGroup(); settings->endGroup(); } @@ -68,6 +75,9 @@ void DesignerSettings::toSettings(QSettings *settings) const settings->setValue(QLatin1String(QmlDesigner::Constants::QML_SNAPMARGIN_KEY), snapMargin); settings->setValue(QLatin1String(QmlDesigner::Constants::QML_CANVASWIDTH_KEY), canvasWidth); settings->setValue(QLatin1String(QmlDesigner::Constants::QML_CANVASHEIGHT_KEY), canvasHeight); + settings->setValue(QLatin1String(QmlDesigner::Constants::QML_WARNIN_FOR_FEATURES_IN_DESIGNER_KEY), warningsInDesigner); + settings->setValue(QLatin1String(QmlDesigner::Constants::QML_WARNIN_FOR_DESIGNER_FEATURES_IN_EDITOR_KEY), designerWarningsInEditor); + settings->endGroup(); settings->endGroup(); } @@ -77,5 +87,7 @@ bool DesignerSettings::equals(const DesignerSettings &other) const return openDesignMode == other.openDesignMode && snapMargin == other.snapMargin && canvasWidth == other.canvasWidth - && canvasHeight == other.canvasHeight; + && canvasHeight == other.canvasHeight + && warningsInDesigner == other.warningsInDesigner + && designerWarningsInEditor == other.designerWarningsInEditor; } |