452 |
} |
} |
453 |
|
|
454 |
// Try to restore old window positioning and initial visibility. |
// Try to restore old window positioning and initial visibility. |
455 |
m_pOptions->loadWidgetGeometry(this); |
m_pOptions->loadWidgetGeometry(this, true); |
456 |
m_pOptions->loadWidgetGeometry(m_pInstrumentListForm); |
m_pOptions->loadWidgetGeometry(m_pInstrumentListForm); |
457 |
m_pOptions->loadWidgetGeometry(m_pDeviceForm); |
m_pOptions->loadWidgetGeometry(m_pDeviceForm); |
458 |
|
|
496 |
// And the children, and the main windows state,. |
// And the children, and the main windows state,. |
497 |
m_pOptions->saveWidgetGeometry(m_pDeviceForm); |
m_pOptions->saveWidgetGeometry(m_pDeviceForm); |
498 |
m_pOptions->saveWidgetGeometry(m_pInstrumentListForm); |
m_pOptions->saveWidgetGeometry(m_pInstrumentListForm); |
499 |
m_pOptions->saveWidgetGeometry(this); |
m_pOptions->saveWidgetGeometry(this, true); |
500 |
// Close popup widgets. |
// Close popup widgets. |
501 |
if (m_pInstrumentListForm) |
if (m_pInstrumentListForm) |
502 |
m_pInstrumentListForm->close(); |
m_pInstrumentListForm->close(); |
545 |
QListIterator<QUrl> iter(pMimeData->urls()); |
QListIterator<QUrl> iter(pMimeData->urls()); |
546 |
while (iter.hasNext()) { |
while (iter.hasNext()) { |
547 |
const QString& sPath = iter.next().toLocalFile(); |
const QString& sPath = iter.next().toLocalFile(); |
548 |
if (Channel::isInstrumentFile(sPath)) { |
// if (Channel::isDlsInstrumentFile(sPath)) { |
549 |
|
if (QFileInfo(sPath).exists()) { |
550 |
// Try to create a new channel from instrument file... |
// Try to create a new channel from instrument file... |
551 |
Channel *pChannel = new Channel(); |
Channel *pChannel = new Channel(); |
552 |
if (pChannel == NULL) |
if (pChannel == NULL) |