flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-21 04:45:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ref T419, update component

Browse Source 
* warning about different platform
* using Qt::QueuedConnection
* style
This commit is contained in:
Klaus Basan
2019-03-04 17:55:15 +01:00
committed by Mat Sutcliffe
parent 162cb3163c
commit aabc975889
1 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/blackgui/components/updateinfocomponent.cpp
View File

@@ -35,10 +35,10 @@ namespace BlackGui
ui->setupUi(this); ui->setupUi(this);
Q_ASSERT_X(sGui, Q_FUNC_INFO, "Need sGui"); Q_ASSERT_X(sGui, Q_FUNC_INFO, "Need sGui");
connect(sGui, &CGuiApplication::updateInfoAvailable, this, &CUpdateInfoComponent::changedUpdateInfo); connect(sGui, &CGuiApplication::updateInfoAvailable, this, &CUpdateInfoComponent::changedUpdateInfo, Qt::QueuedConnection);
connect(ui->pb_CheckForUpdates, &QPushButton::pressed, this, &CUpdateInfoComponent::requestLoadOfSetup); connect(ui->pb_CheckForUpdates, &QPushButton::pressed, this, &CUpdateInfoComponent::requestLoadOfSetup, Qt::QueuedConnection);
connect(ui->pb_DownloadXSwiftBus, &QPushButton::pressed, this, &CUpdateInfoComponent::downloadXSwiftBusDialog); connect(ui->pb_DownloadXSwiftBus, &QPushButton::pressed, this, &CUpdateInfoComponent::downloadXSwiftBusDialog, Qt::QueuedConnection);
connect(ui->pb_DownloadInstaller, &QPushButton::pressed, this, &CUpdateInfoComponent::downloadInstallerDialog); connect(ui->pb_DownloadInstaller, &QPushButton::pressed, this, &CUpdateInfoComponent::downloadInstallerDialog, Qt::QueuedConnection);
// use version signal as trigger for completion // use version signal as trigger for completion
if (!m_updateInfo.get().isEmpty()) { this->changedUpdateInfo(); } if (!m_updateInfo.get().isEmpty()) { this->changedUpdateInfo(); }
@@ -73,7 +73,7 @@ namespace BlackGui
void CUpdateInfoComponent::requestLoadOfSetup() void CUpdateInfoComponent::requestLoadOfSetup()
{ {
if (!sGui) { return; } if (!sGui || sGui->isShuttingDown()) { return; }
const CStatusMessageList msgs(sGui->requestReloadOfSetupAndVersion()); const CStatusMessageList msgs(sGui->requestReloadOfSetupAndVersion());
CLogMessage::preformatted(msgs); CLogMessage::preformatted(msgs);
} }
@@ -110,8 +110,8 @@ namespace BlackGui
if (distributions.containsChannel(settings.front())) { ui->cb_Channels->setCurrentText(settings.front()); } if (distributions.containsChannel(settings.front())) { ui->cb_Channels->setCurrentText(settings.front()); }
this->uiSelectionChanged(); this->uiSelectionChanged();
connect(ui->cb_Platforms, &QComboBox::currentTextChanged, this, &CUpdateInfoComponent::platformChanged); connect(ui->cb_Platforms, &QComboBox::currentTextChanged, this, &CUpdateInfoComponent::platformChanged, Qt::QueuedConnection);
connect(ui->cb_Channels, &QComboBox::currentTextChanged, this, &CUpdateInfoComponent::channelChanged); connect(ui->cb_Channels, &QComboBox::currentTextChanged, this, &CUpdateInfoComponent::channelChanged, Qt::QueuedConnection);
// emit via digest signal // emit via digest signal
m_dsDistributionAvailable.inputSignal(); m_dsDistributionAvailable.inputSignal();
@@ -134,7 +134,19 @@ namespace BlackGui
{ {
const CUpdateInfo update(m_updateInfo.get()); const CUpdateInfo update(m_updateInfo.get());
const QString currentVersion = ui->cb_ArtifactsPilotClient->currentText(); const QString currentVersion = ui->cb_ArtifactsPilotClient->currentText();
const CArtifact artifact = update.getArtifactsPilotClient().findFirstByVersionOrDefault(currentVersion); const QString platform = ui->cb_Platforms->currentText();
if (!CPlatform::isCurrentPlatform(platform))
{
const QMessageBox::StandardButton ret = QMessageBox::warning(this, tr("Download installer"),
QStringLiteral(
"The platform '%1' does not match your current platform '%2'.\n"
"Do you want to continue?").arg(platform, CPlatform::currentPlatform().getPlatformName()),
QMessageBox::Yes | QMessageBox::No);
if (ret != QMessageBox::Yes) { return; }
}
// find artifcat
const CArtifact artifact = update.getArtifactsPilotClient().findByMatchingPlatform(platform).findFirstByVersionOrDefault(currentVersion);
if (!m_downloadDialog) if (!m_downloadDialog)
{ {
@@ -197,6 +209,7 @@ namespace BlackGui
ui->cb_ArtifactsXsb->insertItems(0, sortedXsbVersions); ui->cb_ArtifactsXsb->insertItems(0, sortedXsbVersions);
ui->pb_DownloadXSwiftBus->setEnabled(!artifactsXsb.isEmpty()); ui->pb_DownloadXSwiftBus->setEnabled(!artifactsXsb.isEmpty());
//! \fixme hardcoded stylesheet color
const bool newer = this->isNewPilotClientVersionAvailable(); const bool newer = this->isNewPilotClientVersionAvailable();
ui->lbl_StatusInfo->setText(newer ? "New version available" : "Nothing new"); ui->lbl_StatusInfo->setText(newer ? "New version available" : "Nothing new");
ui->lbl_StatusInfo->setStyleSheet(newer ? ui->lbl_StatusInfo->setStyleSheet(newer ?