[Companion][AutoComboBox] Add updateValue() function in line with other Auto* widgets; Add currentDataChanged() signal.

This commit is contained in:
Max Paperno
2018-06-30 10:24:08 -04:00
parent 316a2508a5
commit 86fb88cdee
+21 -18
View File
@@ -63,50 +63,53 @@ class AutoComboBox: public QComboBox
{ {
lock = true; lock = true;
QComboBox::addItem(item, value); QComboBox::addItem(item, value);
if (field && *field==value) {
setCurrentIndex(count()-1);
}
lock = false; lock = false;
updateValue();
} }
void setField(unsigned int & field, GenericPanel * panel=NULL) void setField(unsigned int & field, GenericPanel * panel=NULL)
{ {
this->field = (int *)&field; this->field = (int *)&field;
this->panel = panel; this->panel = panel;
for (int i=0; i<count(); ++i) { updateValue();
if ((int)field == itemData(i))
setCurrentIndex(i);
}
} }
void setField(int & field, GenericPanel * panel=NULL) void setField(int & field, GenericPanel * panel=NULL)
{ {
this->field = &field; this->field = &field;
this->panel = panel; this->panel = panel;
for (int i=0; i<count(); ++i) { updateValue();
if ((int)field == itemData(i))
setCurrentIndex(i);
}
} }
void setAutoIndexes() void setAutoIndexes()
{ {
for (int i=0; i<count(); ++i) { for (int i=0; i<count(); ++i)
setItemData(i, i); setItemData(i, i);
if (this->field && *this->field == i) updateValue();
setCurrentIndex(i);
}
} }
void updateValue()
{
if (!field)
return;
lock = true;
setCurrentIndex(findData(*field));
lock = false;
}
signals:
void currentDataChanged(int value);
protected slots: protected slots:
void onCurrentIndexChanged(int index) void onCurrentIndexChanged(int index)
{ {
const int val = itemData(index).toInt();
if (field && !lock) { if (field && !lock) {
*field = itemData(index).toInt(); *field = val;
if (panel) { if (panel)
emit panel->modified(); emit panel->modified();
}
} }
emit currentDataChanged(val);
} }
protected: protected: