From f0ad0b3b404b30a775a80a4b3be0cb62f2f3883d Mon Sep 17 00:00:00 2001 From: Marcus Tillmanns Date: Fri, 25 Apr 2025 08:04:45 +0200 Subject: [PATCH] Docker: Fix DockerDevice creator Set defaultDisplayName and improve function naming. Change-Id: Ifff4a8ae78620d79249c70d97e977b94e5dcb9f0 Reviewed-by: hjk --- src/plugins/docker/dockerdevice.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/plugins/docker/dockerdevice.cpp b/src/plugins/docker/dockerdevice.cpp index a2ee0fab67c..8a69aacac8f 100644 --- a/src/plugins/docker/dockerdevice.cpp +++ b/src/plugins/docker/dockerdevice.cpp @@ -1289,7 +1289,7 @@ public: m_process->start(); } - IDevice::Ptr device() const + DockerDevice::Ptr createDevice() const { const QModelIndexList selectedRows = m_view->selectionModel()->selectedRows(); QTC_ASSERT(selectedRows.size() == 1, return {}); @@ -1297,10 +1297,13 @@ public: m_proxyModel->mapToSource(selectedRows.front())); QTC_ASSERT(item, return {}); - auto device = DockerDevice::create(); + DockerDevice::Ptr device = DockerDevice::create(); device->repo.setValue(item->repo); device->tag.setValue(item->tag); device->imageId.setValue(item->imageId); + device->setDefaultDisplayName(Tr::tr("Docker Image \"%1\" (%2)") + .arg(device->repoAndTag()) + .arg(device->imageId.value())); if (const auto env = device->d->fetchEnvironment(); !env) qCWarning(dockerDeviceLog) << "Failed to fetch environment:" << env.error(); @@ -1332,7 +1335,7 @@ DockerDeviceFactory::DockerDeviceFactory() DockerDeviceSetupWizard wizard; if (wizard.exec() != QDialog::Accepted) return IDevice::Ptr(); - auto device = std::static_pointer_cast(wizard.device()); + DockerDevice::Ptr device = wizard.createDevice(); m_existingDevices.writeLocked()->push_back(device); return std::static_pointer_cast(device); });