Merge pull request #3850 from opentx/3djc/companion-fixes-port2-next
Port fixes by elecpower to next
This commit is contained in:
@@ -48,11 +48,11 @@ void HeliPanel::update()
|
|||||||
lock = true;
|
lock = true;
|
||||||
|
|
||||||
ui->swashType->setCurrentIndex(model->swashRingData.type);
|
ui->swashType->setCurrentIndex(model->swashRingData.type);
|
||||||
populateSourceCB(ui->swashCollectiveSource, model->swashRingData.collectiveSource, generalSettings, model, POPULATE_SOURCES | POPULATE_VIRTUAL_INPUTS | POPULATE_SWITCHES | POPULATE_TRIMS);
|
populateSourceCB(ui->swashCollectiveSource, model->swashRingData.collectiveSource, generalSettings, model, POPULATE_NONE | POPULATE_SOURCES | POPULATE_VIRTUAL_INPUTS | POPULATE_SWITCHES | POPULATE_TRIMS);
|
||||||
ui->swashRingVal->setValue(model->swashRingData.value);
|
ui->swashRingVal->setValue(model->swashRingData.value);
|
||||||
if (firmware->getCapability(VirtualInputs)) {
|
if (firmware->getCapability(VirtualInputs)) {
|
||||||
populateSourceCB(ui->swashElevatorSource, model->swashRingData.elevatorSource, generalSettings, model, POPULATE_SOURCES | POPULATE_VIRTUAL_INPUTS | POPULATE_SWITCHES | POPULATE_TRIMS);
|
populateSourceCB(ui->swashElevatorSource, model->swashRingData.elevatorSource, generalSettings, model, POPULATE_NONE | POPULATE_SOURCES | POPULATE_VIRTUAL_INPUTS | POPULATE_SWITCHES | POPULATE_TRIMS);
|
||||||
populateSourceCB(ui->swashAileronSource, model->swashRingData.aileronSource, generalSettings, model, POPULATE_SOURCES | POPULATE_VIRTUAL_INPUTS | POPULATE_SWITCHES | POPULATE_TRIMS);
|
populateSourceCB(ui->swashAileronSource, model->swashRingData.aileronSource, generalSettings, model, POPULATE_NONE | POPULATE_SOURCES | POPULATE_VIRTUAL_INPUTS | POPULATE_SWITCHES | POPULATE_TRIMS);
|
||||||
ui->swashElevatorWeight->setValue(model->swashRingData.elevatorWeight);
|
ui->swashElevatorWeight->setValue(model->swashRingData.elevatorWeight);
|
||||||
ui->swashAileronWeight->setValue(model->swashRingData.aileronWeight);
|
ui->swashAileronWeight->setValue(model->swashRingData.aileronWeight);
|
||||||
ui->swashCollectiveWeight->setValue(model->swashRingData.collectiveWeight);
|
ui->swashCollectiveWeight->setValue(model->swashRingData.collectiveWeight);
|
||||||
|
|||||||
@@ -281,10 +281,17 @@ void InputsPanel::exposCopy()
|
|||||||
QApplication::clipboard()->setMimeData(mimeData,QClipboard::Clipboard);
|
QApplication::clipboard()->setMimeData(mimeData,QClipboard::Clipboard);
|
||||||
}
|
}
|
||||||
|
|
||||||
void InputsPanel::mimeExpoDropped(int index, const QMimeData *data, Qt::DropAction /*action*/)
|
void InputsPanel::mimeExpoDropped(int index, const QMimeData *data, Qt::DropAction action)
|
||||||
{
|
{
|
||||||
int idx = ExposlistWidget->item(index > 0 ? index-1 : 0)->data(Qt::UserRole).toByteArray().at(0);
|
int idx = ExposlistWidget->item(index > 0 ? index-1 : 0)->data(Qt::UserRole).toByteArray().at(0);
|
||||||
|
if (action==Qt::CopyAction) {
|
||||||
pasteExpoMimeData(data, idx);
|
pasteExpoMimeData(data, idx);
|
||||||
|
}
|
||||||
|
else if (action==Qt::MoveAction) {
|
||||||
|
QList<int> list = createExpoListFromSelected();
|
||||||
|
exposDeleteList(list);
|
||||||
|
pasteExpoMimeData(data, idx);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void InputsPanel::pasteExpoMimeData(const QMimeData * mimeData, int destIdx)
|
void InputsPanel::pasteExpoMimeData(const QMimeData * mimeData, int destIdx)
|
||||||
|
|||||||
Reference in New Issue
Block a user