From a93ab235be155e8b7107a40d68ba34c160887b86 Mon Sep 17 00:00:00 2001 From: Max Paperno Date: Wed, 19 Sep 2018 17:21:38 -0400 Subject: [PATCH] [Companion][MdiChild] En/disable radio settings and model copy/paste actions when clipboard changes externally (another MDI window or CPN instance). --- companion/src/mdichild.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/companion/src/mdichild.cpp b/companion/src/mdichild.cpp index ba64488f8..d0d3e1869 100644 --- a/companion/src/mdichild.cpp +++ b/companion/src/mdichild.cpp @@ -80,6 +80,7 @@ MdiChild::MdiChild(QWidget * parent, QWidget * parentWin, Qt::WindowFlags f): connect(ui->modelsList, &QTreeView::customContextMenuRequested, this, &MdiChild::showModelsListContextMenu); connect(ui->modelsList, &QTreeView::pressed, this, &MdiChild::onItemSelected); connect(ui->modelsList->selectionModel(), &QItemSelectionModel::currentRowChanged, this, &MdiChild::onCurrentItemChanged); + connect(QGuiApplication::clipboard(), &QClipboard::dataChanged, this, &MdiChild::updateNavigation); if (!(isMaximized() || isMinimized())) { QByteArray geo = g.mdiWinGeo(); @@ -1093,7 +1094,6 @@ void MdiChild::copyGeneralSettings() QMimeData * mimeData = modelsListModel->getGeneralMimeData(); modelsListModel->getHeaderMimeData(mimeData); QApplication::clipboard()->setMimeData(mimeData, QClipboard::Clipboard); - updateNavigation(); } void MdiChild::pasteGeneralSettings() @@ -1112,9 +1112,7 @@ void MdiChild::copy() QMimeData * mimeData = modelsListModel->getModelsMimeData(ui->modelsList->selectionModel()->selectedRows()); modelsListModel->getHeaderMimeData(mimeData); QApplication::clipboard()->setMimeData(mimeData, QClipboard::Clipboard); - clearCutList(); // clear the list by default, populate afterwards, eg. in cut(). - updateNavigation(); } void MdiChild::cut()