diff --git a/src/plugins/mcusupport/mcusupportoptions.cpp b/src/plugins/mcusupport/mcusupportoptions.cpp index 4352f49f1fd..cb1981c42d0 100644 --- a/src/plugins/mcusupport/mcusupportoptions.cpp +++ b/src/plugins/mcusupport/mcusupportoptions.cpp @@ -425,11 +425,12 @@ static bool isDesktop(const BoardOptions* board) return board->qulPlatform() == "Qt"; } -static void setKitProperties(ProjectExplorer::Kit *k, const BoardOptions* board) +static void setKitProperties(const McuSupportOptions *options, ProjectExplorer::Kit *k, + const BoardOptions* board) { using namespace ProjectExplorer; - k->setUnexpandedDisplayName("QtMCU - " + board->model()); + k->setUnexpandedDisplayName(options->kitName(board)); k->setValue(Constants::KIT_BOARD_VENDOR_KEY, board->vendor()); k->setValue(Constants::KIT_BOARD_MODEL_KEY, board->model()); k->setAutoDetected(false); @@ -527,6 +528,12 @@ static void setKitCMakeOptions(ProjectExplorer::Kit *k, const BoardOptions* boar CMakeGeneratorKitAspect::setGenerator(k, "NMake Makefiles JOM"); } +QString McuSupportOptions::kitName(const BoardOptions *board) const +{ + // TODO: get version from qulSdkPackage and insert into name + return QString::fromLatin1("QtMCU - %1 %2").arg(board->vendor(), board->model()); +} + ProjectExplorer::Kit *McuSupportOptions::kit(const BoardOptions* board) { using namespace ProjectExplorer; @@ -536,10 +543,10 @@ ProjectExplorer::Kit *McuSupportOptions::kit(const BoardOptions* board) }); if (!kit) { const QString armGccPath = toolchainPackage->path(); - const auto init = [board, &armGccPath](Kit *k) { + const auto init = [this, board, &armGccPath](Kit *k) { KitGuard kitGuard(k); - setKitProperties(k, board); + setKitProperties(this, k, board); if (!isDesktop(board)) { setKitToolchains(k, armGccPath); setKitDebugger(k, armGccPath); diff --git a/src/plugins/mcusupport/mcusupportoptions.h b/src/plugins/mcusupport/mcusupportoptions.h index f7f2d84b390..57281b274bb 100644 --- a/src/plugins/mcusupport/mcusupportoptions.h +++ b/src/plugins/mcusupport/mcusupportoptions.h @@ -132,6 +132,8 @@ public: QVector boards; PackageOptions *toolchainPackage = nullptr; + QString kitName(const BoardOptions* board) const; + ProjectExplorer::Kit *kit(const BoardOptions* board); signals: diff --git a/src/plugins/mcusupport/mcusupportoptionspage.cpp b/src/plugins/mcusupport/mcusupportoptionspage.cpp index 02c2044cf40..e764113f311 100644 --- a/src/plugins/mcusupport/mcusupportoptionspage.cpp +++ b/src/plugins/mcusupport/mcusupportoptionspage.cpp @@ -96,26 +96,22 @@ McuSupportOptionsWidget::McuSupportOptionsWidget(const McuSupportOptions *option showBoardPackages(m_currentBoardIndex); } -static QString ulOfBoardModels(const QVector &validBoards) -{ - return ""; -} - void McuSupportOptionsWidget::updateStatus() { const QVector validBoards = m_options->validBoards(); - m_statusLabel->setText(validBoards.isEmpty() - ? McuSupportOptionsPage::tr("No kits can currently be generated. " - "Select a target and provide the package paths. " - "Afterwards, press Apply to generate a kit for " - "your board.") - : McuSupportOptionsPage::tr("Kits for the following targets can be generated: " - "%1 " - "Press Apply to generate a kit for " - "your target.").arg(ulOfBoardModels(validBoards))); + + QString list("
    "); + for (auto board : validBoards) + list.append("
  • " + m_options->kitName(board) + "
  • "); + list.append("
"); + + m_statusLabel->setText( + validBoards.isEmpty() + ? QString::fromLatin1("No kits can currently be generated. " + "Select a target and provide the package paths. " + "Afterwards, press Apply to generate a kit for your target.") + : QString::fromLatin1("The following Kits can be generated: %1 " + "Press Apply to generate a kit for your target.").arg(list)); } void McuSupportOptionsWidget::showBoardPackages(int boardIndex)