[Companion] Fix some Special/Global Functions editor source selection lists being broken and Action selector disappearing for simple actions with no parameters (fixes #4775 and #4779).
This commit is contained in:
@@ -563,7 +563,7 @@ void CustomFunctionsPanel::refreshCustomFunction(int i, bool modified)
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
fswtchFunc[i]->setVisible(widgetsMask);
|
fswtchFunc[i]->setVisible(cfn.swtch.toValue());
|
||||||
fswtchParam[i]->setVisible(widgetsMask & CUSTOM_FUNCTION_NUMERIC_PARAM);
|
fswtchParam[i]->setVisible(widgetsMask & CUSTOM_FUNCTION_NUMERIC_PARAM);
|
||||||
fswtchParamTime[i]->setVisible(widgetsMask & CUSTOM_FUNCTION_TIME_PARAM);
|
fswtchParamTime[i]->setVisible(widgetsMask & CUSTOM_FUNCTION_TIME_PARAM);
|
||||||
fswtchParamGV[i]->setVisible(widgetsMask & CUSTOM_FUNCTION_GV_TOOGLE);
|
fswtchParamGV[i]->setVisible(widgetsMask & CUSTOM_FUNCTION_GV_TOOGLE);
|
||||||
@@ -701,7 +701,7 @@ void CustomFunctionsPanel::populateGVmodeCB(QComboBox *b, unsigned int value)
|
|||||||
void CustomFunctionsPanel::populateFuncParamCB(QComboBox *b, uint function, unsigned int value, unsigned int adjustmode)
|
void CustomFunctionsPanel::populateFuncParamCB(QComboBox *b, uint function, unsigned int value, unsigned int adjustmode)
|
||||||
{
|
{
|
||||||
QStringList qs;
|
QStringList qs;
|
||||||
b->clear();
|
b->setModel(new QStandardItemModel(b)); // clear combo box but not any shared item model
|
||||||
if (function==FuncPlaySound) {
|
if (function==FuncPlaySound) {
|
||||||
CustomFunctionData::populatePlaySoundParams(qs);
|
CustomFunctionData::populatePlaySoundParams(qs);
|
||||||
b->addItems(qs);
|
b->addItems(qs);
|
||||||
|
|||||||
Reference in New Issue
Block a user