Seth/sethLabels
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Make ColorHistory more robust to change in format.

Browse Source
This commit is contained in:
Jim Evins
2019-08-03 14:10:01 -04:00
parent 2c1c865f53
commit 48bfb68837
2 changed files with 47 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
glabels/ColorHistory.cpp
+28 -2
View File
@@ -77,7 +77,20 @@ namespace glabels
for ( QString& nameColor : readNameColorList() )
{
QStringList v = nameColor.split( ':' );
colorList << QColor( v[1] );
if ( v.size() == 2 )
{
colorList << QColor( v[1] );
}
else if ( v.size() == 1 )
{
// Old-style, no name
colorList << QColor( v[0] );
}
else
{
// Should not happen
qWarning() << "Invalid color history.";
}
}
return colorList;
@@ -91,7 +104,20 @@ namespace glabels
for ( QString& nameColor : readNameColorList() )
{
QStringList v = nameColor.split( ':' );
nameList << v[0];
if ( v.size() == 2 )
{
nameList << v[0];
}
else if ( v.size() == 1 )
{
// Old-style, no name
nameList << QString(tr("color %1")).arg( v[0] );
}
else
{
// Should not happen
qWarning() << "Invalid color history.";
}
}
return nameList;