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

McuSupport: Unify, simplify and improve kit name creation

Browse Source 
Change-Id: I27ffa3d89226eedc8396c37249e124f846a630d3
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Alessandro Portale
2019-11-12 15:14:20 +01:00
parent 89732c361e
commit ce83b2a93c
3 changed files with 26 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/plugins/mcusupport/mcusupportoptionspage.cpp
View File

@@ -96,26 +96,22 @@ McuSupportOptionsWidget::McuSupportOptionsWidget(const McuSupportOptions *option
showBoardPackages(m_currentBoardIndex);
}
static QString ulOfBoardModels(const QVector<BoardOptions*> &validBoards)
{
return "<ul><li>"
+ Utils::transform<QStringList>(validBoards,[](BoardOptions* board)
{return board->model();}).join("</li><li>")
+ "</li></ul>";
}
void McuSupportOptionsWidget::updateStatus()
{
const QVector<BoardOptions*> 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("<ul>");
for (auto board : validBoards)
list.append("<li>" + m_options->kitName(board) + "</li>");
list.append("</ul>");
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)