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

JsonWizard: Make checkbox default values true and false

Browse Source 
That is closer to what a user expects than the "0" and "1" used
before.

Change-Id: I08b3a7b0361dd54b75ee7b2213b3d120fb016bf5
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
This commit is contained in:
Tobias Hunger
2015-05-28 15:51:05 +02:00
parent f76b9b549c
commit f68704f8fd
7 changed files with 3 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
share/qtcreator/templates/wizards/files/js/file.js
View File

@@ -1,4 +1,4 @@
@if '%{Stateless}'
@if %{Stateless}
.pragma library
@endif

2
share/qtcreator/templates/wizards/files/js/wizard.json
View File

@@ -29,8 +29,6 @@
"span": true,
"data":
{
"checkedValue": "yes",
"uncheckedValue": "",
"checked": false
}
}

2
share/qtcreator/templates/wizards/projects/qmake/qtquickapplication/wizard.json
View File

@@ -73,8 +73,6 @@
"type": "CheckBox",
"data":
{
"checkedValue": true,
"uncheckedValue": false,
"checked": false
}
}

4
share/qtcreator/templates/wizards/projects/qmake/qtquickcontrolsapplication/wizard.json
View File

@@ -81,8 +81,6 @@
"type": "CheckBox",
"data":
{
"checkedValue": true,
"uncheckedValue": false,
"checked": true
}
},
@@ -92,8 +90,6 @@
"type": "CheckBox",
"data":
{
"checkedValue": true,
"uncheckedValue": false,
"checked": true
}
}

2
share/qtcreator/templates/wizards/projects/qmlproject/qtquickapplication/wizard.json
View File

@@ -73,8 +73,6 @@
"type": "CheckBox",
"data":
{
"checkedValue": true,
"uncheckedValue": false,
"checked": false
}
}

2
share/qtcreator/templates/wizards/projects/qmlproject/qtquickcontrolsapplication/wizard.json
View File

@@ -81,8 +81,6 @@
"type": "CheckBox",
"data":
{
"checkedValue": true,
"uncheckedValue": false,
"checked": true
}
}

4
src/plugins/projectexplorer/jsonwizard/jsonfieldpage.cpp
View File

@@ -617,8 +617,8 @@ bool JsonFieldPage::CheckBoxField::parseData(const QVariant &data, QString *erro
QVariantMap tmp = data.toMap();
m_checkedValue = tmp.value(QLatin1String("checkedValue"), QLatin1String("0")).toString();
m_uncheckedValue = tmp.value(QLatin1String("uncheckedValue"), QLatin1String("1")).toString();
m_checkedValue = tmp.value(QLatin1String("checkedValue"), true).toString();
m_uncheckedValue = tmp.value(QLatin1String("uncheckedValue"), false).toString();
if (m_checkedValue == m_uncheckedValue) {
*errorMessage= QCoreApplication::translate("ProjectExplorer::JsonFieldPage",
"CheckBox values for checked and unchecked state are identical.");