feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Docker: Fix DockerDevice creator

Browse Source 
Set defaultDisplayName and improve function naming.

Change-Id: Ifff4a8ae78620d79249c70d97e977b94e5dcb9f0
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Marcus Tillmanns
2025-04-25 08:04:45 +02:00
parent c2fff26f3c
commit f0ad0b3b40
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/docker/dockerdevice.cpp
View File

@@ -1289,7 +1289,7 @@ public:
m_process->start(); m_process->start();
} }
IDevice::Ptr device() const DockerDevice::Ptr createDevice() const
{ {
const QModelIndexList selectedRows = m_view->selectionModel()->selectedRows(); const QModelIndexList selectedRows = m_view->selectionModel()->selectedRows();
QTC_ASSERT(selectedRows.size() == 1, return {}); QTC_ASSERT(selectedRows.size() == 1, return {});
@@ -1297,10 +1297,13 @@ public:
m_proxyModel->mapToSource(selectedRows.front())); m_proxyModel->mapToSource(selectedRows.front()));
QTC_ASSERT(item, return {}); QTC_ASSERT(item, return {});
auto device = DockerDevice::create(); DockerDevice::Ptr device = DockerDevice::create();
device->repo.setValue(item->repo); device->repo.setValue(item->repo);
device->tag.setValue(item->tag); device->tag.setValue(item->tag);
device->imageId.setValue(item->imageId); 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) if (const auto env = device->d->fetchEnvironment(); !env)
qCWarning(dockerDeviceLog) << "Failed to fetch environment:" << env.error(); qCWarning(dockerDeviceLog) << "Failed to fetch environment:" << env.error();
@@ -1332,7 +1335,7 @@ DockerDeviceFactory::DockerDeviceFactory()
DockerDeviceSetupWizard wizard; DockerDeviceSetupWizard wizard;
if (wizard.exec() != QDialog::Accepted) if (wizard.exec() != QDialog::Accepted)
return IDevice::Ptr(); return IDevice::Ptr();
auto device = std::static_pointer_cast<DockerDevice>(wizard.device()); DockerDevice::Ptr device = wizard.createDevice();
m_existingDevices.writeLocked()->push_back(device); m_existingDevices.writeLocked()->push_back(device);
return std::static_pointer_cast<IDevice>(device); return std::static_pointer_cast<IDevice>(device);
}); });