feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner: Fixing DocumentWarningWidget

Browse Source 
* Connect was missing
* The check box contains the opposite truth value of the setting.

Change-Id: If6ef86e0e1107ce537ee05ddf983131f65ee9e20
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
This commit is contained in:
Thomas Hartmann
2016-06-23 14:38:39 +02:00
parent e54b53cdaa
commit 78be4281c1
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/qmldesigner/documentwarningwidget.cpp
View File

@@ -86,6 +86,8 @@ DocumentWarningWidget::DocumentWarningWidget(QWidget *parent)
} }
}); });
connect(m_ignoreWarningsCheckBox, &QCheckBox::toggled, this, &DocumentWarningWidget::ignoreCheckBoxToggled);
QVBoxLayout *layout = new QVBoxLayout(this); QVBoxLayout *layout = new QVBoxLayout(this);
layout->addWidget(m_headerLabel); layout->addWidget(m_headerLabel);
QVBoxLayout *messageLayout = new QVBoxLayout; QVBoxLayout *messageLayout = new QVBoxLayout;
@@ -117,7 +119,9 @@ void DocumentWarningWidget::refreshContent()
m_continueButton->setText(tr("OK")); m_continueButton->setText(tr("OK"));
} else { } else {
m_headerLabel->setText(tr("This QML file contains features which are not supported by Qt Quick Designer at:")); m_headerLabel->setText(tr("This QML file contains features which are not supported by Qt Quick Designer at:"));
bool block = m_ignoreWarningsCheckBox->blockSignals(true);
m_ignoreWarningsCheckBox->setChecked(!warningsEnabled()); m_ignoreWarningsCheckBox->setChecked(!warningsEnabled());
m_ignoreWarningsCheckBox->blockSignals(block);
m_ignoreWarningsCheckBox->show(); m_ignoreWarningsCheckBox->show();
m_continueButton->setText(tr("Ignore")); m_continueButton->setText(tr("Ignore"));
} }
@@ -184,7 +188,7 @@ bool DocumentWarningWidget::warningsEnabled() const
void DocumentWarningWidget::ignoreCheckBoxToggled(bool b) void DocumentWarningWidget::ignoreCheckBoxToggled(bool b)
{ {
DesignerSettings settings = QmlDesignerPlugin::instance()->settings(); DesignerSettings settings = QmlDesignerPlugin::instance()->settings();
settings.insert(DesignerSettingsKey::WARNING_FOR_FEATURES_IN_DESIGNER, b); settings.insert(DesignerSettingsKey::WARNING_FOR_FEATURES_IN_DESIGNER, !b);
QmlDesignerPlugin::instance()->setSettings(settings); QmlDesignerPlugin::instance()->setSettings(settings);
} }