hashtags/lmms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Consolidate error messages while loading project (#5269)

Browse Source
This commit is contained in:
Raine M. Ekman
2020-06-04 08:21:30 +03:00
committed by GitHub
parent 97680e081e
commit a05306131b
2 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/Song.h
View File

@@ -441,7 +441,7 @@ private:
SaveOptions m_saveOptions;
QStringList m_errors;
QHash<QString, int> m_errors;
PlayModes m_playMode;
PlayPos m_playPos[Mode_Count];

19
src/core/Song.cpp
View File

@@ -1421,21 +1421,34 @@ void Song::clearErrors()
void Song::collectError( const QString error )
{
m_errors.append( error );
if (!m_errors.contains(error)) { m_errors[error] = 1; }
else { m_errors[ error ]++; }
}
bool Song::hasErrors()
{
return ( m_errors.length() > 0 );
return !(m_errors.isEmpty());
}
QString Song::errorSummary()
{
QString errors = m_errors.join("\n") + '\n';
QString errors;
auto i = m_errors.constBegin();
while (i != m_errors.constEnd())
{
errors.append( i.key() );
if( i.value() > 1 )
{
errors.append( tr(" (repeated %1 times)").arg( i.value() ) );
}
errors.append("\n");
++i;
}
errors.prepend( "\n\n" );
errors.prepend( tr( "The following errors occurred while loading: " ) );