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

[FS family] follow up of the log. message changes,

Browse Source 
display a confirmation if user wants to see all the details

Based on RPs comment here: https://discordapp.com/channels/539048679160676382/594962359441948682/674013220687577109
This commit is contained in:
Klaus Basan
2020-02-04 19:46:44 +01:00
committed by Mat Sutcliffe
parent 00ed15f111
commit 655209333c
1 changed files with 28 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/blackgui/components/dbownmodelscomponent.cpp
View File

@@ -649,7 +649,7 @@ namespace BlackGui
const CStatusMessage loadingMsg = CStatusMessage(this).info(u"%1 loading: %2") << simulator.toQString(true) << message; const CStatusMessage loadingMsg = CStatusMessage(this).info(u"%1 loading: %2") << simulator.toQString(true) << message;
this->showOverlayHTMLMessage(loadingMsg, 5000); this->showOverlayHTMLMessage(loadingMsg, 5000);
ui->tvp_OwnAircraftModels->showLoadIndicatorWithTimeout(5000); // trigger new load indicator ui->tvp_OwnAircraftModels->showLoadIndicatorWithTimeout(5000); // trigger new load indicator
Q_UNUSED(progress); Q_UNUSED(progress)
} }
void CDbOwnModelsComponent::onModelLoaderLoadingFinished(const CStatusMessageList &statusMessages, const CSimulatorInfo &simulator, IAircraftModelLoader::LoadFinishedInfo info) void CDbOwnModelsComponent::onModelLoaderLoadingFinished(const CStatusMessageList &statusMessages, const CSimulatorInfo &simulator, IAircraftModelLoader::LoadFinishedInfo info)
@@ -657,27 +657,29 @@ namespace BlackGui
Q_ASSERT_X(simulator.isSingleSimulator(), Q_FUNC_INFO, "Expect single simulator"); Q_ASSERT_X(simulator.isSingleSimulator(), Q_FUNC_INFO, "Expect single simulator");
bool hideIndicator = false; // hide in case loading failed bool hideIndicator = false; // hide in case loading failed
CStatusMessage summaryMsg;
if (IAircraftModelLoader::isLoadedInfo(info) && m_modelLoader) if (IAircraftModelLoader::isLoadedInfo(info) && m_modelLoader)
{ {
const CAircraftModelList models(m_modelLoader->getCachedModels(simulator)); const CAircraftModelList models(m_modelLoader->getCachedModels(simulator));
const int modelsLoaded = models.size(); const int modelsLoaded = models.size();
ui->tvp_OwnAircraftModels->updateContainerMaybeAsync(models); ui->tvp_OwnAircraftModels->updateContainerMaybeAsync(models);
CStatusMessage m;
if (modelsLoaded < 1) if (modelsLoaded < 1)
{ {
// loading ok, but no data // loading ok, but no data
m = CLogMessage(this).warning(u"Loading completed for simulator '%1', but no models") << simulator; summaryMsg = CLogMessage(this).warning(u"Loading completed for simulator '%1', but no models") << simulator;
hideIndicator = true; hideIndicator = true;
} }
else else
{ {
m = CLogMessage(this).info(u"Loading completed for simulator '%1' with %2 models") << simulator << modelsLoaded; summaryMsg = CLogMessage(this).info(u"Loading completed for simulator '%1' with %2 models") << simulator << modelsLoaded;
} }
// overlay // overlay
if (!m.isEmpty() && info == IAircraftModelLoader::ParsedData) if (!summaryMsg.isEmpty() && info == IAircraftModelLoader::ParsedData)
{ {
this->showOverlayHTMLMessage(m, 5000); this->showOverlayHTMLMessage(summaryMsg, 5000);
} }
// signal // signal
@@ -696,18 +698,33 @@ namespace BlackGui
} }
// with errors we make sure errors are on top // with errors we make sure errors are on top
int timeoutMs = -1;
if (statusMessages.hasErrorMessages()) if (statusMessages.hasErrorMessages())
{ {
this->setOverlayMessagesSorting(CStatusMessage::IndexSeverityAsIcon, Qt::DescendingOrder); this->setOverlayMessagesSorting(CStatusMessage::IndexSeverityAsIcon, Qt::DescendingOrder);
this->showOverlayMessages(statusMessages, false, -1);
} }
else if (!statusMessages.hasWarningOrErrorMessages()) else
{ {
// no issues // no issues, directly hide
timeoutMs = 5000; const int timeoutMs = statusMessages.hasWarningOrErrorMessages() ? -1 : 7500;
if (statusMessages.size() < 50)
{
// small number of messages
this->showOverlayMessages(statusMessages, false, timeoutMs);
}
else
{
QPointer<CDbOwnModelsComponent> myself(this);
const QString confirmMessage = QStringLiteral("Do you want to see the %1 detailled messages?").arg(statusMessages.size());
this->showOverlayMessagesWithConfirmation(summaryMsg, false, confirmMessage, [ = ]
{
if (!myself) { return; }
myself->showOverlayMessages(statusMessages);
});
}
} }
this->showOverlayMessages(statusMessages, false, timeoutMs);
if (hideIndicator) { ui->tvp_OwnAircraftModels->hideLoadIndicatorForced(); } if (hideIndicator) { ui->tvp_OwnAircraftModels->hideLoadIndicatorForced(); }
// cache loads may occur in background, do not adjust UI settings // cache loads may occur in background, do not adjust UI settings