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

QmlDesigner: Show default condition as empty

Browse Source 
Change-Id: I33f217bf02035414b2d69c863c7039c485161579
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
This commit is contained in:
Thomas Hartmann
2023-09-13 17:30:26 +02:00
parent 9bf4a084b8
commit c216dff156
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/plugins/qmldesigner/components/connectioneditor/connectionmodel.cpp
View File

@@ -27,6 +27,8 @@
namespace { namespace {
const char defaultCondition[] = "condition";
QStringList propertyNameListToStringList(const QmlDesigner::PropertyNameList &propertyNameList) QStringList propertyNameListToStringList(const QmlDesigner::PropertyNameList &propertyNameList)
{ {
QStringList stringList; QStringList stringList;
@@ -693,7 +695,7 @@ void ConnectionModelBackendDelegate::addCondition()
ConnectionEditorStatements::MatchedCondition newCondition; ConnectionEditorStatements::MatchedCondition newCondition;
ConnectionEditorStatements::Variable variable; ConnectionEditorStatements::Variable variable;
variable.nodeId = "condition"; variable.nodeId = defaultCondition;
newCondition.statements.append(variable); newCondition.statements.append(variable);
ConnectionEditorStatements::ConditionalStatement conditionalStatement; ConnectionEditorStatements::ConditionalStatement conditionalStatement;
@@ -1067,8 +1069,6 @@ void ConnectionModelBackendDelegate::handleConditionChanged()
condition = m_conditionListModel.condition(); //why? condition = m_conditionListModel.condition(); //why?
QString newSource = ConnectionEditorStatements::toJavascript(m_handler); QString newSource = ConnectionEditorStatements::toJavascript(m_handler);
qDebug() << Q_FUNC_INFO << "new source" << newSource;
commitNewSource(newSource); commitNewSource(newSource);
} }
@@ -1830,6 +1830,12 @@ void ConditionListModel::internalSetup()
if (m_condition.statements.size() != m_condition.tokens.size() + 1) if (m_condition.statements.size() != m_condition.tokens.size() + 1)
return; return;
if (m_condition.statements.size() == 1 && m_condition.tokens.isEmpty()) {
auto token = tokenFromComparativeStatement(m_condition.statements.first());
if (token.value == defaultCondition)
return;
}
auto s_it = m_condition.statements.begin(); auto s_it = m_condition.statements.begin();
auto o_it = m_condition.tokens.begin(); auto o_it = m_condition.tokens.begin();
@@ -1842,9 +1848,6 @@ void ConditionListModel::internalSetup()
} }
m_tokens.append(tokenFromComparativeStatement(*s_it)); m_tokens.append(tokenFromComparativeStatement(*s_it));
for (const auto &token : m_tokens)
qDebug() << token.value;
setValid(); setValid();
} }