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

QmlDesigner: Add "NOT" option to binding editor

Browse Source 
* Add "NOT" CheckBox in binding editor if boolean target
* Fix wrong node assignment in binding editor context menu call
* Fix connection editor state iteration source
* Cleanup redundant code

Task-number: QDS-2872
Change-Id: I8780bb1507f991b52aacfb011b889896d74ccb4f
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
Henning Gruendl
2020-11-13 10:55:23 +01:00
committed by Henning Gründl
parent 6d5e302157
commit d3ab7a89f9
5 changed files with 104 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
src/plugins/qmldesigner/components/bindingeditor/bindingeditordialog.cpp
View File

@@ -37,6 +37,7 @@
#include <QVBoxLayout>
#include <QHBoxLayout>
#include <QComboBox>
#include <QCheckBox>
#include <QPlainTextEdit>
namespace QmlDesigner {
@@ -50,6 +51,8 @@ BindingEditorDialog::BindingEditorDialog(QWidget *parent)
this, &BindingEditorDialog::itemIDChanged);
QObject::connect(m_comboBoxProperty, QOverload<int>::of(&QComboBox::currentIndexChanged),
this, &BindingEditorDialog::propertyIDChanged);
QObject::connect(m_checkBoxNot, QOverload<int>::of(&QCheckBox::stateChanged),
this, &BindingEditorDialog::checkBoxChanged);
}
BindingEditorDialog::~BindingEditorDialog()
@@ -58,7 +61,12 @@ BindingEditorDialog::~BindingEditorDialog()
void BindingEditorDialog::adjustProperties()
{
const QString expression = editorValue();
QString expression = editorValue().trimmed();
m_checkBoxNot->setChecked(expression.startsWith("!"));
if (m_checkBoxNot->isChecked())
expression.remove(0, 1);
QString item;
QString property;
QStringList expressionElements = expression.split(".");
@@ -94,12 +102,14 @@ void BindingEditorDialog::adjustProperties()
m_comboBoxProperty->setCurrentText(property);
}
void BindingEditorDialog::setAllBindings(QList<BindingOption> bindings)
void BindingEditorDialog::setAllBindings(const QList<BindingOption> &bindings, const TypeName &type)
{
m_lock = true;
m_bindings = bindings;
m_type = type;
setupComboBoxes();
setupCheckBox();
adjustProperties();
m_lock = false;
@@ -109,11 +119,15 @@ void BindingEditorDialog::setupUIComponents()
{
m_comboBoxItem = new QComboBox(this);
m_comboBoxProperty = new QComboBox(this);
m_checkBoxNot = new QCheckBox(this);
m_checkBoxNot->setText(tr("NOT"));
m_checkBoxNot->setVisible(false);
m_checkBoxNot->setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed));
m_checkBoxNot->setToolTip(tr("Invert the boolean expression."));
m_comboBoxLayout->addWidget(m_comboBoxItem);
m_comboBoxLayout->addWidget(m_comboBoxProperty);
//this->resize(660, 240);
m_comboBoxLayout->addWidget(m_checkBoxNot);
}
void BindingEditorDialog::setupComboBoxes()
@@ -125,6 +139,12 @@ void BindingEditorDialog::setupComboBoxes()
m_comboBoxItem->addItem(bind.item);
}
void BindingEditorDialog::setupCheckBox()
{
const bool visible = (m_type == "bool");
m_checkBoxNot->setVisible(visible);
}
void BindingEditorDialog::itemIDChanged(int itemID)
{
const QString previousProperty = m_comboBoxProperty->currentText();
@@ -148,12 +168,31 @@ void BindingEditorDialog::propertyIDChanged(int propertyID)
const int itemID = m_comboBoxItem->currentIndex();
if (!m_lock)
if (!m_comboBoxProperty->currentText().isEmpty() && (m_comboBoxProperty->currentText() != undefinedString))
setEditorValue(m_comboBoxItem->itemText(itemID) + "." + m_comboBoxProperty->itemText(propertyID));
if (!m_comboBoxProperty->currentText().isEmpty() && (m_comboBoxProperty->currentText() != undefinedString)) {
QString expression = m_comboBoxItem->itemText(itemID) + "." + m_comboBoxProperty->itemText(propertyID);
if (m_checkBoxNot->isChecked())
expression.prepend("!");
setEditorValue(expression);
}
const int undefinedProperty = m_comboBoxProperty->findText(undefinedString);
if ((undefinedProperty != -1) && (m_comboBoxProperty->itemText(propertyID) != undefinedString))
m_comboBoxProperty->removeItem(undefinedProperty);
}
void BindingEditorDialog::checkBoxChanged(int state)
{
if (m_lock)
return;
QString expression = editorValue().trimmed();
if (state == Qt::Checked)
expression.prepend("!");
else
expression.remove(0, 1);
setEditorValue(expression);
}
} // QmlDesigner namespace