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

Docker: Add an option to auto-detect in PATH plus additional directories

Browse Source 
Change-Id: I95e4676ac01143301f2c9f11a6de2269d5c17467
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2022-07-28 11:27:55 +02:00
parent d7c95cb2a2
commit 0b376d9145
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/plugins/docker/dockerdevicewidget.cpp
View File

@@ -122,6 +122,7 @@ DockerDeviceWidget::DockerDeviceWidget(const IDevice::Ptr &device)
auto searchDirsComboBox = new QComboBox; auto searchDirsComboBox = new QComboBox;
searchDirsComboBox->addItem(Tr::tr("Search in PATH")); searchDirsComboBox->addItem(Tr::tr("Search in PATH"));
searchDirsComboBox->addItem(Tr::tr("Search in Selected Directories")); searchDirsComboBox->addItem(Tr::tr("Search in Selected Directories"));
searchDirsComboBox->addItem(Tr::tr("Search in PATH and Additional Directories"));
auto searchDirsLineEdit = new FancyLineEdit; auto searchDirsLineEdit = new FancyLineEdit;
@@ -132,9 +133,10 @@ DockerDeviceWidget::DockerDeviceWidget(const IDevice::Ptr &device)
auto searchPaths = [searchDirsComboBox, searchDirsLineEdit, dockerDevice] { auto searchPaths = [searchDirsComboBox, searchDirsLineEdit, dockerDevice] {
FilePaths paths; FilePaths paths;
if (searchDirsComboBox->currentIndex() == 0) { const int idx = searchDirsComboBox->currentIndex();
paths = dockerDevice->systemEnvironment().path(); if (idx == 0 || idx == 2)
} else { paths += dockerDevice->systemEnvironment().path();
if (idx == 1 || idx == 2) {
for (const QString &path : searchDirsLineEdit->text().split(';')) for (const QString &path : searchDirsLineEdit->text().split(';'))
paths.append(FilePath::fromString(path.trimmed())); paths.append(FilePath::fromString(path.trimmed()));
} }
@@ -184,6 +186,7 @@ DockerDeviceWidget::DockerDeviceWidget(const IDevice::Ptr &device)
Column { Column {
Space(20), Space(20),
Row { Row {
Tr::tr("Search Locations:"),
searchDirsComboBox, searchDirsComboBox,
searchDirsLineEdit searchDirsLineEdit
}, },
@@ -200,8 +203,8 @@ DockerDeviceWidget::DockerDeviceWidget(const IDevice::Ptr &device)
searchDirsLineEdit->setVisible(false); searchDirsLineEdit->setVisible(false);
auto updateDirectoriesLineEdit = [searchDirsLineEdit](int index) { auto updateDirectoriesLineEdit = [searchDirsLineEdit](int index) {
searchDirsLineEdit->setVisible(index == 1); searchDirsLineEdit->setVisible(index == 1 || index == 2);
if (index == 1) if (index == 1 || index == 2)
searchDirsLineEdit->setFocus(); searchDirsLineEdit->setFocus();
}; };
QObject::connect(searchDirsComboBox, &QComboBox::activated, this, updateDirectoriesLineEdit); QObject::connect(searchDirsComboBox, &QComboBox::activated, this, updateDirectoriesLineEdit);