From 6a1a5be10c1b5cf67029a47acda198a6673004db Mon Sep 17 00:00:00 2001 From: hjk Date: Mon, 13 May 2019 09:49:34 +0200 Subject: [PATCH] Remove unused files Change-Id: Ib6b32129d8fc8ccc35f6911a340abf9b5beb2432 Reviewed-by: Orgad Shaneh --- .../cmakekitconfigwidget.cpp | 493 ---------------- .../kitinformationconfigwidget.cpp | 529 ------------------ .../qmakekitconfigwidget.cpp | 86 --- src/plugins/qtsupport/qtkitconfigwidget.cpp | 156 ------ 4 files changed, 1264 deletions(-) delete mode 100644 src/plugins/cmakeprojectmanager/cmakekitconfigwidget.cpp delete mode 100644 src/plugins/projectexplorer/kitinformationconfigwidget.cpp delete mode 100644 src/plugins/qmakeprojectmanager/qmakekitconfigwidget.cpp delete mode 100644 src/plugins/qtsupport/qtkitconfigwidget.cpp diff --git a/src/plugins/cmakeprojectmanager/cmakekitconfigwidget.cpp b/src/plugins/cmakeprojectmanager/cmakekitconfigwidget.cpp deleted file mode 100644 index 1d3f4e53cd4..00000000000 --- a/src/plugins/cmakeprojectmanager/cmakekitconfigwidget.cpp +++ /dev/null @@ -1,493 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 Canonical Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of Qt Creator. -** -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -****************************************************************************/ - -#include "cmakeprojectconstants.h" -#include "cmakekitconfigwidget.h" -#include "cmakekitinformation.h" -#include "cmaketoolmanager.h" -#include "cmaketool.h" - -#include -#include -#include -#include - -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -using namespace ProjectExplorer; - -namespace CMakeProjectManager { -namespace Internal { - -// -------------------------------------------------------------------- -// CMakeKitAspectWidget: -// -------------------------------------------------------------------- - -CMakeKitAspectWidget::CMakeKitAspectWidget(Kit *kit, - const KitAspect *ki) : - KitAspectWidget(kit, ki), - m_comboBox(new QComboBox), - m_manageButton(new QPushButton(KitAspectWidget::msgManage())) -{ - m_comboBox->setSizePolicy(QSizePolicy::Ignored, m_comboBox->sizePolicy().verticalPolicy()); - m_comboBox->setEnabled(false); - m_comboBox->setToolTip(toolTip()); - - foreach (CMakeTool *tool, CMakeToolManager::cmakeTools()) - cmakeToolAdded(tool->id()); - - updateComboBox(); - - refresh(); - connect(m_comboBox, static_cast(&QComboBox::currentIndexChanged), - this, &CMakeKitAspectWidget::currentCMakeToolChanged); - - m_manageButton->setContentsMargins(0, 0, 0, 0); - connect(m_manageButton, &QPushButton::clicked, - this, &CMakeKitAspectWidget::manageCMakeTools); - - CMakeToolManager *cmakeMgr = CMakeToolManager::instance(); - connect(cmakeMgr, &CMakeToolManager::cmakeAdded, - this, &CMakeKitAspectWidget::cmakeToolAdded); - connect(cmakeMgr, &CMakeToolManager::cmakeRemoved, - this, &CMakeKitAspectWidget::cmakeToolRemoved); - connect(cmakeMgr, &CMakeToolManager::cmakeUpdated, - this, &CMakeKitAspectWidget::cmakeToolUpdated); -} - -CMakeKitAspectWidget::~CMakeKitAspectWidget() -{ - delete m_comboBox; - delete m_manageButton; -} - -QString CMakeKitAspectWidget::displayName() const -{ - return tr("CMake Tool"); -} - -void CMakeKitAspectWidget::makeReadOnly() -{ - m_comboBox->setEnabled(false); -} - -void CMakeKitAspectWidget::refresh() -{ - CMakeTool *tool = CMakeKitAspect::cmakeTool(m_kit); - m_comboBox->setCurrentIndex(tool ? indexOf(tool->id()) : -1); -} - -QWidget *CMakeKitAspectWidget::mainWidget() const -{ - return m_comboBox; -} - -QWidget *CMakeKitAspectWidget::buttonWidget() const -{ - return m_manageButton; -} - -QString CMakeKitAspectWidget::toolTip() const -{ - return tr("The CMake Tool to use when building a project with CMake.
" - "This setting is ignored when using other build systems."); -} - -int CMakeKitAspectWidget::indexOf(const Core::Id &id) -{ - for (int i = 0; i < m_comboBox->count(); ++i) { - if (id == Core::Id::fromSetting(m_comboBox->itemData(i))) - return i; - } - return -1; -} - -void CMakeKitAspectWidget::cmakeToolAdded(const Core::Id &id) -{ - const CMakeTool *tool = CMakeToolManager::findById(id); - QTC_ASSERT(tool, return); - - m_comboBox->addItem(tool->displayName(), tool->id().toSetting()); - updateComboBox(); - refresh(); -} - -void CMakeKitAspectWidget::cmakeToolUpdated(const Core::Id &id) -{ - const int pos = indexOf(id); - QTC_ASSERT(pos >= 0, return); - - const CMakeTool *tool = CMakeToolManager::findById(id); - QTC_ASSERT(tool, return); - - m_comboBox->setItemText(pos, tool->displayName()); -} - -void CMakeKitAspectWidget::cmakeToolRemoved(const Core::Id &id) -{ - const int pos = indexOf(id); - QTC_ASSERT(pos >= 0, return); - - // do not handle the current index changed signal - m_removingItem = true; - m_comboBox->removeItem(pos); - m_removingItem = false; - - // update the checkbox and set the current index - updateComboBox(); - refresh(); -} - -void CMakeKitAspectWidget::updateComboBox() -{ - // remove unavailable cmake tool: - int pos = indexOf(Core::Id()); - if (pos >= 0) - m_comboBox->removeItem(pos); - - if (m_comboBox->count() == 0) { - m_comboBox->addItem(tr(""), - Core::Id().toSetting()); - m_comboBox->setEnabled(false); - } else { - m_comboBox->setEnabled(true); - } -} - -void CMakeKitAspectWidget::currentCMakeToolChanged(int index) -{ - if (m_removingItem) - return; - - const Core::Id id = Core::Id::fromSetting(m_comboBox->itemData(index)); - CMakeKitAspect::setCMakeTool(m_kit, id); -} - -void CMakeKitAspectWidget::manageCMakeTools() -{ - Core::ICore::showOptionsDialog(Constants::CMAKE_SETTINGSPAGE_ID, - buttonWidget()); -} - -// -------------------------------------------------------------------- -// CMakeGeneratorKitAspectWidget: -// -------------------------------------------------------------------- - - -CMakeGeneratorKitAspectWidget::CMakeGeneratorKitAspectWidget(Kit *kit, - const KitAspect *ki) : - KitAspectWidget(kit, ki), - m_label(new QLabel), - m_changeButton(new QPushButton) -{ - m_label->setToolTip(toolTip()); - m_changeButton->setText(tr("Change...")); - - refresh(); - connect(m_changeButton, &QPushButton::clicked, - this, &CMakeGeneratorKitAspectWidget::changeGenerator); -} - -CMakeGeneratorKitAspectWidget::~CMakeGeneratorKitAspectWidget() -{ - delete m_label; - delete m_changeButton; -} - -QString CMakeGeneratorKitAspectWidget::displayName() const -{ - return tr("CMake generator"); -} - -void CMakeGeneratorKitAspectWidget::makeReadOnly() -{ - m_changeButton->setEnabled(false); -} - -void CMakeGeneratorKitAspectWidget::refresh() -{ - if (m_ignoreChange) - return; - - CMakeTool *const tool = CMakeKitAspect::cmakeTool(m_kit); - if (tool != m_currentTool) - m_currentTool = tool; - - m_changeButton->setEnabled(m_currentTool); - const QString generator = CMakeGeneratorKitAspect::generator(kit()); - const QString extraGenerator = CMakeGeneratorKitAspect::extraGenerator(kit()); - const QString platform = CMakeGeneratorKitAspect::platform(kit()); - const QString toolset = CMakeGeneratorKitAspect::toolset(kit()); - - const QString message = tr("%1 - %2, Platform: %3, Toolset: %4") - .arg(extraGenerator.isEmpty() ? tr("") : extraGenerator) - .arg(generator.isEmpty() ? tr("") : generator) - .arg(platform.isEmpty() ? tr("") : platform) - .arg(toolset.isEmpty() ? tr("") : toolset); - m_label->setText(message); -} - -QWidget *CMakeGeneratorKitAspectWidget::mainWidget() const -{ - return m_label; -} - -QWidget *CMakeGeneratorKitAspectWidget::buttonWidget() const -{ - return m_changeButton; -} - -QString CMakeGeneratorKitAspectWidget::toolTip() const -{ - return tr("CMake generator defines how a project is built when using CMake.
" - "This setting is ignored when using other build systems."); -} - -void CMakeGeneratorKitAspectWidget::changeGenerator() -{ - QPointer changeDialog = new QDialog(m_changeButton); - - // Disable help button in titlebar on windows: - Qt::WindowFlags flags = changeDialog->windowFlags(); - flags &= ~Qt::WindowContextHelpButtonHint; - flags |= Qt::MSWindowsFixedSizeDialogHint; - changeDialog->setWindowFlags(flags); - - changeDialog->setWindowTitle(tr("CMake Generator")); - - auto *layout = new QGridLayout(changeDialog); - layout->setSizeConstraint(QLayout::SetFixedSize); - - auto *cmakeLabel = new QLabel; - cmakeLabel->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed); - - auto *generatorCombo = new QComboBox; - auto *extraGeneratorCombo = new QComboBox; - auto *platformEdit = new QLineEdit; - auto *toolsetEdit = new QLineEdit; - - int row = 0; - layout->addWidget(new QLabel(QLatin1String("Executable:"))); - layout->addWidget(cmakeLabel, row, 1); - - ++row; - layout->addWidget(new QLabel(tr("Generator:")), row, 0); - layout->addWidget(generatorCombo, row, 1); - - ++row; - layout->addWidget(new QLabel(tr("Extra generator:")), row, 0); - layout->addWidget(extraGeneratorCombo, row, 1); - - ++row; - layout->addWidget(new QLabel(tr("Platform:")), row, 0); - layout->addWidget(platformEdit, row, 1); - - ++row; - layout->addWidget(new QLabel(tr("Toolset:")), row, 0); - layout->addWidget(toolsetEdit, row, 1); - - ++row; - auto *bb = new QDialogButtonBox(QDialogButtonBox::Ok|QDialogButtonBox::Cancel); - layout->addWidget(bb, row, 0, 1, 2); - - connect(bb, &QDialogButtonBox::accepted, changeDialog.data(), &QDialog::accept); - connect(bb, &QDialogButtonBox::rejected, changeDialog.data(), &QDialog::reject); - - cmakeLabel->setText(m_currentTool->cmakeExecutable().toUserOutput()); - - QList generatorList = m_currentTool->supportedGenerators(); - Utils::sort(generatorList, &CMakeTool::Generator::name); - - for (auto it = generatorList.constBegin(); it != generatorList.constEnd(); ++it) - generatorCombo->addItem(it->name); - - auto updateDialog = [&generatorList, generatorCombo, extraGeneratorCombo, - platformEdit, toolsetEdit](const QString &name) { - auto it = std::find_if(generatorList.constBegin(), generatorList.constEnd(), - [name](const CMakeTool::Generator &g) { return g.name == name; }); - QTC_ASSERT(it != generatorList.constEnd(), return); - generatorCombo->setCurrentText(name); - - extraGeneratorCombo->clear(); - extraGeneratorCombo->addItem(tr(""), QString()); - foreach (const QString &eg, it->extraGenerators) - extraGeneratorCombo->addItem(eg, eg); - extraGeneratorCombo->setEnabled(extraGeneratorCombo->count() > 1); - - platformEdit->setEnabled(it->supportsPlatform); - toolsetEdit->setEnabled(it->supportsToolset); - }; - - updateDialog(CMakeGeneratorKitAspect::generator(kit())); - - generatorCombo->setCurrentText(CMakeGeneratorKitAspect::generator(kit())); - extraGeneratorCombo->setCurrentText(CMakeGeneratorKitAspect::extraGenerator(kit())); - platformEdit->setText(platformEdit->isEnabled() ? CMakeGeneratorKitAspect::platform(kit()) : QLatin1String("")); - toolsetEdit->setText(toolsetEdit->isEnabled() ? CMakeGeneratorKitAspect::toolset(kit()) : QLatin1String("")); - - connect(generatorCombo, &QComboBox::currentTextChanged, updateDialog); - - if (changeDialog->exec() == QDialog::Accepted) { - if (!changeDialog) - return; - - CMakeGeneratorKitAspect::set(kit(), generatorCombo->currentText(), - extraGeneratorCombo->currentData().toString(), - platformEdit->isEnabled() ? platformEdit->text() : QString(), - toolsetEdit->isEnabled() ? toolsetEdit->text() : QString()); - } -} - -// -------------------------------------------------------------------- -// CMakeConfigurationKitAspectWidget: -// -------------------------------------------------------------------- - -CMakeConfigurationKitAspectWidget::CMakeConfigurationKitAspectWidget(Kit *kit, - const KitAspect *ki) : - KitAspectWidget(kit, ki), - m_summaryLabel(new Utils::ElidingLabel), - m_manageButton(new QPushButton) -{ - refresh(); - m_manageButton->setText(tr("Change...")); - connect(m_manageButton, &QAbstractButton::clicked, - this, &CMakeConfigurationKitAspectWidget::editConfigurationChanges); -} - -QString CMakeConfigurationKitAspectWidget::displayName() const -{ - return tr("CMake Configuration"); -} - -void CMakeConfigurationKitAspectWidget::makeReadOnly() -{ - m_manageButton->setEnabled(false); - if (m_dialog) - m_dialog->reject(); -} - -void CMakeConfigurationKitAspectWidget::refresh() -{ - const QStringList current = CMakeConfigurationKitAspect::toStringList(kit()); - - m_summaryLabel->setText(current.join("; ")); - if (m_editor) - m_editor->setPlainText(current.join('\n')); -} - -QWidget *CMakeConfigurationKitAspectWidget::mainWidget() const -{ - return m_summaryLabel; -} - -QWidget *CMakeConfigurationKitAspectWidget::buttonWidget() const -{ - return m_manageButton; -} - -QString CMakeConfigurationKitAspectWidget::toolTip() const -{ - return tr("Default configuration passed to CMake when setting up a project."); -} - -void CMakeConfigurationKitAspectWidget::editConfigurationChanges() -{ - if (m_dialog) { - m_dialog->activateWindow(); - m_dialog->raise(); - return; - } - - QTC_ASSERT(!m_editor, return); - - m_dialog = new QDialog(m_summaryLabel->window()); - m_dialog->setWindowTitle(tr("Edit CMake Configuration")); - auto layout = new QVBoxLayout(m_dialog); - m_editor = new QPlainTextEdit; - m_editor->setToolTip(tr("Enter one variable per line with the variable name " - "separated from the variable value by \"=\".
" - "You may provide a type hint by adding \":TYPE\" before the \"=\".")); - m_editor->setMinimumSize(800, 200); - - auto chooser = new Core::VariableChooser(m_dialog); - chooser->addSupportedWidget(m_editor); - chooser->addMacroExpanderProvider([this]() { return kit()->macroExpander(); }); - - auto buttons = new QDialogButtonBox(QDialogButtonBox::Ok|QDialogButtonBox::Apply - |QDialogButtonBox::Reset|QDialogButtonBox::Cancel); - - layout->addWidget(m_editor); - layout->addWidget(buttons); - - connect(buttons, &QDialogButtonBox::accepted, m_dialog, &QDialog::accept); - connect(buttons, &QDialogButtonBox::rejected, m_dialog, &QDialog::reject); - connect(buttons, &QDialogButtonBox::clicked, m_dialog, [buttons, this](QAbstractButton *button) { - if (button != buttons->button(QDialogButtonBox::Reset)) - return; - CMakeConfigurationKitAspect::setConfiguration(kit(), - CMakeConfigurationKitAspect::defaultConfiguration(kit())); - }); - connect(m_dialog, &QDialog::accepted, this, &CMakeConfigurationKitAspectWidget::acceptChangesDialog); - connect(m_dialog, &QDialog::rejected, this, &CMakeConfigurationKitAspectWidget::closeChangesDialog); - connect(buttons->button(QDialogButtonBox::Apply), &QAbstractButton::clicked, - this, &CMakeConfigurationKitAspectWidget::applyChanges); - - refresh(); - m_dialog->show(); -} - -void CMakeConfigurationKitAspectWidget::applyChanges() -{ - QTC_ASSERT(m_editor, return); - CMakeConfigurationKitAspect::fromStringList(kit(), m_editor->toPlainText().split(QLatin1Char('\n'))); -} - -void CMakeConfigurationKitAspectWidget::closeChangesDialog() -{ - m_dialog->deleteLater(); - m_dialog = nullptr; - m_editor = nullptr; -} - -void CMakeConfigurationKitAspectWidget::acceptChangesDialog() -{ - applyChanges(); - closeChangesDialog(); -} - -} // namespace Internal -} // namespace CMakeProjectManager diff --git a/src/plugins/projectexplorer/kitinformationconfigwidget.cpp b/src/plugins/projectexplorer/kitinformationconfigwidget.cpp deleted file mode 100644 index 57ebc2f9b89..00000000000 --- a/src/plugins/projectexplorer/kitinformationconfigwidget.cpp +++ /dev/null @@ -1,529 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of Qt Creator. -** -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -****************************************************************************/ - -#include "kitinformationconfigwidget.h" - -#include "devicesupport/devicemanager.h" -#include "devicesupport/devicemanagermodel.h" -#include "devicesupport/idevicefactory.h" -#include "projectexplorerconstants.h" -#include "kit.h" -#include "kitinformation.h" -#include "toolchain.h" -#include "toolchainmanager.h" -#include "environmentwidget.h" - -#include -#include - -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -using namespace Core; - -namespace ProjectExplorer { -namespace Internal { - -// -------------------------------------------------------------------------- -// SysRootKitAspectWidget: -// -------------------------------------------------------------------------- - -SysRootKitAspectWidget::SysRootKitAspectWidget(Kit *k, const KitAspect *ki) : - KitAspectWidget(k, ki) -{ - m_chooser = new Utils::PathChooser; - m_chooser->setExpectedKind(Utils::PathChooser::ExistingDirectory); - m_chooser->setHistoryCompleter(QLatin1String("PE.SysRoot.History")); - m_chooser->setFileName(SysRootKitAspect::sysRoot(k)); - connect(m_chooser, &Utils::PathChooser::pathChanged, - this, &SysRootKitAspectWidget::pathWasChanged); -} - -SysRootKitAspectWidget::~SysRootKitAspectWidget() -{ - delete m_chooser; -} - -QString SysRootKitAspectWidget::displayName() const -{ - return tr("Sysroot"); -} - -QString SysRootKitAspectWidget::toolTip() const -{ - return tr("The root directory of the system image to use.
" - "Leave empty when building for the desktop."); -} - -void SysRootKitAspectWidget::setPalette(const QPalette &p) -{ - KitAspectWidget::setPalette(p); - m_chooser->setOkColor(p.color(QPalette::Active, QPalette::Text)); -} - -void SysRootKitAspectWidget::refresh() -{ - if (!m_ignoreChange) - m_chooser->setFileName(SysRootKitAspect::sysRoot(m_kit)); -} - -void SysRootKitAspectWidget::makeReadOnly() -{ - m_chooser->setReadOnly(true); -} - -QWidget *SysRootKitAspectWidget::mainWidget() const -{ - return m_chooser->lineEdit(); -} - -QWidget *SysRootKitAspectWidget::buttonWidget() const -{ - return m_chooser->buttonAtIndex(0); -} - -void SysRootKitAspectWidget::pathWasChanged() -{ - m_ignoreChange = true; - SysRootKitAspect::setSysRoot(m_kit, m_chooser->fileName()); - m_ignoreChange = false; -} - -// -------------------------------------------------------------------------- -// ToolChainKitAspectWidget: -// -------------------------------------------------------------------------- - -ToolChainKitAspectWidget::ToolChainKitAspectWidget(Kit *k, const KitAspect *ki) : - KitAspectWidget(k, ki) -{ - m_mainWidget = new QWidget; - m_mainWidget->setContentsMargins(0, 0, 0, 0); - - auto layout = new QGridLayout(m_mainWidget); - layout->setContentsMargins(0, 0, 0, 0); - layout->setColumnStretch(1, 2); - - int row = 0; - QList languageList = ToolChainManager::allLanguages().toList(); - Utils::sort(languageList, [](Core::Id l1, Core::Id l2) { - return ToolChainManager::displayNameOfLanguageId(l1) < ToolChainManager::displayNameOfLanguageId(l2); - }); - - QTC_ASSERT(!languageList.isEmpty(), return); - - foreach (Core::Id l, languageList) { - layout->addWidget(new QLabel(ToolChainManager::displayNameOfLanguageId(l) + ':'), row, 0); - auto cb = new QComboBox; - cb->setSizePolicy(QSizePolicy::Ignored, cb->sizePolicy().verticalPolicy()); - cb->setToolTip(toolTip()); - - m_languageComboboxMap.insert(l, cb); - layout->addWidget(cb, row, 1); - ++row; - - connect(cb, static_cast(&QComboBox::currentIndexChanged), - this, [this, l](int idx) { currentToolChainChanged(l, idx); }); - } - - refresh(); - - m_manageButton = new QPushButton(KitAspectWidget::msgManage()); - m_manageButton->setContentsMargins(0, 0, 0, 0); - connect(m_manageButton, &QAbstractButton::clicked, - this, &ToolChainKitAspectWidget::manageToolChains); -} - -ToolChainKitAspectWidget::~ToolChainKitAspectWidget() -{ - delete m_mainWidget; - delete m_manageButton; -} - -QString ToolChainKitAspectWidget::displayName() const -{ - return tr("Compiler"); -} - -QString ToolChainKitAspectWidget::toolTip() const -{ - return tr("The compiler to use for building.
" - "Make sure the compiler will produce binaries compatible with the target device, " - "Qt version and other libraries used."); -} - -void ToolChainKitAspectWidget::refresh() -{ - m_ignoreChanges = true; - - foreach (Core::Id l, m_languageComboboxMap.keys()) { - const QList ltcList - = ToolChainManager::toolChains(Utils::equal(&ToolChain::language, l)); - - QComboBox *cb = m_languageComboboxMap.value(l); - cb->clear(); - cb->addItem(tr(""), QByteArray()); - - foreach (ToolChain *tc, ltcList) - cb->addItem(tc->displayName(), tc->id()); - - cb->setEnabled(cb->count() > 1 && !m_isReadOnly); - const int index = indexOf(cb, ToolChainKitAspect::toolChain(m_kit, l)); - cb->setCurrentIndex(index); - } - m_ignoreChanges = false; -} - -void ToolChainKitAspectWidget::makeReadOnly() -{ - m_isReadOnly = true; - foreach (Core::Id l, m_languageComboboxMap.keys()) { - m_languageComboboxMap.value(l)->setEnabled(false); - } -} - -QWidget *ToolChainKitAspectWidget::mainWidget() const -{ - return m_mainWidget; -} - -QWidget *ToolChainKitAspectWidget::buttonWidget() const -{ - return m_manageButton; -} - -void ToolChainKitAspectWidget::manageToolChains() -{ - ICore::showOptionsDialog(Constants::TOOLCHAIN_SETTINGS_PAGE_ID, buttonWidget()); -} - -void ToolChainKitAspectWidget::currentToolChainChanged(Id language, int idx) -{ - if (m_ignoreChanges || idx < 0) - return; - - const QByteArray id = m_languageComboboxMap.value(language)->itemData(idx).toByteArray(); - ToolChain *tc = ToolChainManager::findToolChain(id); - QTC_ASSERT(!tc || tc->language() == language, return); - if (tc) - ToolChainKitAspect::setToolChain(m_kit, tc); - else - ToolChainKitAspect::clearToolChain(m_kit, language); -} - -int ToolChainKitAspectWidget::indexOf(QComboBox *cb, const ToolChain *tc) -{ - const QByteArray id = tc ? tc->id() : QByteArray(); - for (int i = 0; i < cb->count(); ++i) { - if (id == cb->itemData(i).toByteArray()) - return i; - } - return -1; -} - -// -------------------------------------------------------------------------- -// DeviceTypeKitAspectWidget: -// -------------------------------------------------------------------------- - -DeviceTypeKitAspectWidget::DeviceTypeKitAspectWidget(Kit *workingCopy, const KitAspect *ki) : - KitAspectWidget(workingCopy, ki), m_comboBox(new QComboBox) -{ - for (IDeviceFactory *factory : IDeviceFactory::allDeviceFactories()) - m_comboBox->addItem(factory->displayName(), factory->deviceType().toSetting()); - - m_comboBox->setToolTip(toolTip()); - - refresh(); - connect(m_comboBox, static_cast(&QComboBox::currentIndexChanged), - this, &DeviceTypeKitAspectWidget::currentTypeChanged); -} - -DeviceTypeKitAspectWidget::~DeviceTypeKitAspectWidget() -{ - delete m_comboBox; -} - -QWidget *DeviceTypeKitAspectWidget::mainWidget() const -{ - return m_comboBox; -} - -QString DeviceTypeKitAspectWidget::displayName() const -{ - return tr("Device type"); -} - -QString DeviceTypeKitAspectWidget::toolTip() const -{ - return tr("The type of device to run applications on."); -} - -void DeviceTypeKitAspectWidget::refresh() -{ - Id devType = DeviceTypeKitAspect::deviceTypeId(m_kit); - if (!devType.isValid()) - m_comboBox->setCurrentIndex(-1); - for (int i = 0; i < m_comboBox->count(); ++i) { - if (m_comboBox->itemData(i) == devType.toSetting()) { - m_comboBox->setCurrentIndex(i); - break; - } - } -} - -void DeviceTypeKitAspectWidget::makeReadOnly() -{ - m_comboBox->setEnabled(false); -} - -void DeviceTypeKitAspectWidget::currentTypeChanged(int idx) -{ - Id type = idx < 0 ? Id() : Id::fromSetting(m_comboBox->itemData(idx)); - DeviceTypeKitAspect::setDeviceTypeId(m_kit, type); -} - -// -------------------------------------------------------------------------- -// DeviceKitAspectWidget: -// -------------------------------------------------------------------------- - -DeviceKitAspectWidget::DeviceKitAspectWidget(Kit *workingCopy, const KitAspect *ki) : - KitAspectWidget(workingCopy, ki), - m_comboBox(new QComboBox), - m_model(new DeviceManagerModel(DeviceManager::instance())) -{ - m_comboBox->setSizePolicy(QSizePolicy::Ignored, m_comboBox->sizePolicy().verticalPolicy()); - m_comboBox->setModel(m_model); - - m_manageButton = new QPushButton(KitAspectWidget::msgManage()); - - refresh(); - m_comboBox->setToolTip(toolTip()); - - connect(m_model, &QAbstractItemModel::modelAboutToBeReset, - this, &DeviceKitAspectWidget::modelAboutToReset); - connect(m_model, &QAbstractItemModel::modelReset, - this, &DeviceKitAspectWidget::modelReset); - connect(m_comboBox, static_cast(&QComboBox::currentIndexChanged), - this, &DeviceKitAspectWidget::currentDeviceChanged); - connect(m_manageButton, &QAbstractButton::clicked, - this, &DeviceKitAspectWidget::manageDevices); -} - -DeviceKitAspectWidget::~DeviceKitAspectWidget() -{ - delete m_comboBox; - delete m_model; - delete m_manageButton; -} - -QWidget *DeviceKitAspectWidget::mainWidget() const -{ - return m_comboBox; -} - -QString DeviceKitAspectWidget::displayName() const -{ - return tr("Device"); -} - -QString DeviceKitAspectWidget::toolTip() const -{ - return tr("The device to run the applications on."); -} - -void DeviceKitAspectWidget::refresh() -{ - m_model->setTypeFilter(DeviceTypeKitAspect::deviceTypeId(m_kit)); - m_comboBox->setCurrentIndex(m_model->indexOf(DeviceKitAspect::device(m_kit))); -} - -void DeviceKitAspectWidget::makeReadOnly() -{ - m_comboBox->setEnabled(false); -} - -QWidget *DeviceKitAspectWidget::buttonWidget() const -{ - return m_manageButton; -} - -void DeviceKitAspectWidget::manageDevices() -{ - ICore::showOptionsDialog(Constants::DEVICE_SETTINGS_PAGE_ID, buttonWidget()); -} - -void DeviceKitAspectWidget::modelAboutToReset() -{ - m_selectedId = m_model->deviceId(m_comboBox->currentIndex()); - m_ignoreChange = true; -} - -void DeviceKitAspectWidget::modelReset() -{ - m_comboBox->setCurrentIndex(m_model->indexForId(m_selectedId)); - m_ignoreChange = false; -} - -void DeviceKitAspectWidget::currentDeviceChanged() -{ - if (m_ignoreChange) - return; - DeviceKitAspect::setDeviceId(m_kit, m_model->deviceId(m_comboBox->currentIndex())); -} - -// -------------------------------------------------------------------- -// EnvironmentKitAspectWidget: -// -------------------------------------------------------------------- - -EnvironmentKitAspectWidget::EnvironmentKitAspectWidget(Kit *workingCopy, const KitAspect *ki) : - KitAspectWidget(workingCopy, ki), - m_summaryLabel(new QLabel), - m_manageButton(new QPushButton), - m_mainWidget(new QWidget) -{ - auto *layout = new QVBoxLayout; - layout->setContentsMargins(0, 0, 0, 0); - layout->addWidget(m_summaryLabel); - if (Utils::HostOsInfo::isWindowsHost()) - initMSVCOutputSwitch(layout); - - m_mainWidget->setLayout(layout); - - refresh(); - m_manageButton->setText(tr("Change...")); - connect(m_manageButton, &QAbstractButton::clicked, - this, &EnvironmentKitAspectWidget::editEnvironmentChanges); -} - -QWidget *EnvironmentKitAspectWidget::mainWidget() const -{ - return m_mainWidget; -} - -QString EnvironmentKitAspectWidget::displayName() const -{ - return tr("Environment"); -} - -QString EnvironmentKitAspectWidget::toolTip() const -{ - return tr("Additional build environment settings when using this kit."); -} - -void EnvironmentKitAspectWidget::refresh() -{ - const QList changes = currentEnvironment(); - QString shortSummary = Utils::EnvironmentItem::toStringList(changes).join(QLatin1String("; ")); - QFontMetrics fm(m_summaryLabel->font()); - shortSummary = fm.elidedText(shortSummary, Qt::ElideRight, m_summaryLabel->width()); - m_summaryLabel->setText(shortSummary.isEmpty() ? tr("No changes to apply.") : shortSummary); -} - -void EnvironmentKitAspectWidget::makeReadOnly() -{ - m_manageButton->setEnabled(false); -} - -QList EnvironmentKitAspectWidget::currentEnvironment() const -{ - QList changes = EnvironmentKitAspect::environmentChanges(m_kit); - - if (Utils::HostOsInfo::isWindowsHost()) { - const Utils::EnvironmentItem forceMSVCEnglishItem("VSLANG", "1033"); - if (changes.indexOf(forceMSVCEnglishItem) >= 0) { - m_vslangCheckbox->setCheckState(Qt::Checked); - changes.removeAll(forceMSVCEnglishItem); - } - } - - Utils::sort(changes, [](const Utils::EnvironmentItem &lhs, const Utils::EnvironmentItem &rhs) - { return QString::localeAwareCompare(lhs.name, rhs.name) < 0; }); - return changes; -} - -void EnvironmentKitAspectWidget::editEnvironmentChanges() -{ - bool ok; - Utils::MacroExpander *expander = m_kit->macroExpander(); - Utils::EnvironmentDialog::Polisher polisher = [expander](QWidget *w) { - Core::VariableChooser::addSupportForChildWidgets(w, expander); - }; - QList - changes = Utils::EnvironmentDialog::getEnvironmentItems(&ok, - m_summaryLabel, - currentEnvironment(), - QString(), - polisher); - if (!ok) - return; - - if (Utils::HostOsInfo::isWindowsHost()) { - const Utils::EnvironmentItem forceMSVCEnglishItem("VSLANG", "1033"); - if (m_vslangCheckbox->isChecked() && changes.indexOf(forceMSVCEnglishItem) < 0) - changes.append(forceMSVCEnglishItem); - } - - EnvironmentKitAspect::setEnvironmentChanges(m_kit, changes); -} - -QWidget *EnvironmentKitAspectWidget::buttonWidget() const -{ - return m_manageButton; -} - -void EnvironmentKitAspectWidget::initMSVCOutputSwitch(QVBoxLayout *layout) -{ - m_vslangCheckbox = new QCheckBox(tr("Force UTF-8 MSVC compiler output")); - layout->addWidget(m_vslangCheckbox); - m_vslangCheckbox->setToolTip(tr("Either switches MSVC to English or keeps the language and " - "just forces UTF-8 output (may vary depending on the used MSVC " - "compiler).")); - connect(m_vslangCheckbox, &QCheckBox::toggled, this, [this](bool checked) { - QList changes - = EnvironmentKitAspect::environmentChanges(m_kit); - const Utils::EnvironmentItem forceMSVCEnglishItem("VSLANG", "1033"); - if (!checked && changes.indexOf(forceMSVCEnglishItem) >= 0) - changes.removeAll(forceMSVCEnglishItem); - if (checked && changes.indexOf(forceMSVCEnglishItem) < 0) - changes.append(forceMSVCEnglishItem); - EnvironmentKitAspect::setEnvironmentChanges(m_kit, changes); - }); -} - -} // namespace Internal -} // namespace ProjectExplorer diff --git a/src/plugins/qmakeprojectmanager/qmakekitconfigwidget.cpp b/src/plugins/qmakeprojectmanager/qmakekitconfigwidget.cpp deleted file mode 100644 index 6675cbca5e6..00000000000 --- a/src/plugins/qmakeprojectmanager/qmakekitconfigwidget.cpp +++ /dev/null @@ -1,86 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of Qt Creator. -** -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -****************************************************************************/ - -#include "qmakekitconfigwidget.h" - -#include "qmakekitinformation.h" - -#include - -#include - -namespace QmakeProjectManager { -namespace Internal { - -QmakeKitAspectWidget::QmakeKitAspectWidget(ProjectExplorer::Kit *k, const ProjectExplorer::KitAspect *ki) : - ProjectExplorer::KitAspectWidget(k, ki), - m_lineEdit(new QLineEdit) -{ - refresh(); // set up everything according to kit - m_lineEdit->setToolTip(toolTip()); - connect(m_lineEdit, &QLineEdit::textEdited, this, &QmakeKitAspectWidget::mkspecWasChanged); -} - -QmakeKitAspectWidget::~QmakeKitAspectWidget() -{ - delete m_lineEdit; -} - -QWidget *QmakeKitAspectWidget::mainWidget() const -{ - return m_lineEdit; -} - -QString QmakeKitAspectWidget::displayName() const -{ - return tr("Qt mkspec"); -} - -QString QmakeKitAspectWidget::toolTip() const -{ - return tr("The mkspec to use when building the project with qmake.
" - "This setting is ignored when using other build systems."); -} - -void QmakeKitAspectWidget::makeReadOnly() -{ - m_lineEdit->setEnabled(false); -} - -void QmakeKitAspectWidget::refresh() -{ - if (!m_ignoreChange) - m_lineEdit->setText(QmakeKitAspect::mkspec(m_kit).toUserOutput()); -} - -void QmakeKitAspectWidget::mkspecWasChanged(const QString &text) -{ - m_ignoreChange = true; - QmakeKitAspect::setMkspec(m_kit, Utils::FileName::fromString(text)); - m_ignoreChange = false; -} - -} // namespace Internal -} // namespace QmakeProjectManager diff --git a/src/plugins/qtsupport/qtkitconfigwidget.cpp b/src/plugins/qtsupport/qtkitconfigwidget.cpp deleted file mode 100644 index e2376074dc2..00000000000 --- a/src/plugins/qtsupport/qtkitconfigwidget.cpp +++ /dev/null @@ -1,156 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of Qt Creator. -** -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -****************************************************************************/ - -#include "qtkitconfigwidget.h" - -#include "qtsupportconstants.h" -#include "qtkitinformation.h" -#include "qtversionmanager.h" - -#include - -#include -#include - -#include -#include - -namespace QtSupport { -namespace Internal { - -QtKitAspectWidget::QtKitAspectWidget(ProjectExplorer::Kit *k, const ProjectExplorer::KitAspect *ki) : - KitAspectWidget(k, ki) -{ - m_combo = new QComboBox; - m_combo->setSizePolicy(QSizePolicy::Ignored, m_combo->sizePolicy().verticalPolicy()); - m_combo->addItem(tr("None"), -1); - - QList versionIds = Utils::transform(QtVersionManager::versions(), &BaseQtVersion::uniqueId); - versionsChanged(versionIds, QList(), QList()); - - m_manageButton = new QPushButton(KitAspectWidget::msgManage()); - - refresh(); - m_combo->setToolTip(toolTip()); - - connect(m_combo, static_cast(&QComboBox::currentIndexChanged), - this, &QtKitAspectWidget::currentWasChanged); - - connect(QtVersionManager::instance(), &QtVersionManager::qtVersionsChanged, - this, &QtKitAspectWidget::versionsChanged); - - connect(m_manageButton, &QAbstractButton::clicked, this, &QtKitAspectWidget::manageQtVersions); -} - -QtKitAspectWidget::~QtKitAspectWidget() -{ - delete m_combo; - delete m_manageButton; -} - -QString QtKitAspectWidget::displayName() const -{ - return tr("Qt version"); -} - -QString QtKitAspectWidget::toolTip() const -{ - return tr("The Qt library to use for all projects using this kit.
" - "A Qt version is required for qmake-based projects " - "and optional when using other build systems."); -} - -void QtKitAspectWidget::makeReadOnly() -{ - m_combo->setEnabled(false); -} - -void QtKitAspectWidget::refresh() -{ - m_combo->setCurrentIndex(findQtVersion(QtKitAspect::qtVersionId(m_kit))); -} - -QWidget *QtKitAspectWidget::mainWidget() const -{ - return m_combo; -} - -QWidget *QtKitAspectWidget::buttonWidget() const -{ - return m_manageButton; -} - -static QString itemNameFor(const BaseQtVersion *v) -{ - QTC_ASSERT(v, return QString()); - QString name = v->displayName(); - if (!v->isValid()) - name = QCoreApplication::translate("QtSupport::Internal::QtKitConfigWidget", "%1 (invalid)").arg(v->displayName()); - return name; -} - -void QtKitAspectWidget::versionsChanged(const QList &added, const QList &removed, - const QList &changed) -{ - foreach (const int id, added) { - BaseQtVersion *v = QtVersionManager::version(id); - QTC_CHECK(v); - QTC_CHECK(findQtVersion(id) < 0); - m_combo->addItem(itemNameFor(v), id); - } - foreach (const int id, removed) { - int pos = findQtVersion(id); - if (pos >= 0) // We do not include invalid Qt versions, so do not try to remove those. - m_combo->removeItem(pos); - } - foreach (const int id, changed) { - BaseQtVersion *v = QtVersionManager::version(id); - int pos = findQtVersion(id); - QTC_CHECK(pos >= 0); - m_combo->setItemText(pos, itemNameFor(v)); - } -} - -void QtKitAspectWidget::manageQtVersions() -{ - Core::ICore::showOptionsDialog(Constants::QTVERSION_SETTINGS_PAGE_ID, buttonWidget()); -} - -void QtKitAspectWidget::currentWasChanged(int idx) -{ - QtKitAspect::setQtVersionId(m_kit, m_combo->itemData(idx).toInt()); -} - -int QtKitAspectWidget::findQtVersion(const int id) const -{ - for (int i = 0; i < m_combo->count(); ++i) { - if (id == m_combo->itemData(i).toInt()) - return i; - } - return -1; -} - -} // namespace Internal -} // namespace QtSupport