@@ -903,45 +903,50 @@ QString QgsExpression::formatPreviewString( const QVariant &value )
903
903
}
904
904
else if ( value.type () == QVariant::Map )
905
905
{
906
- QString mapStr = QStringLiteral ( " { " );
906
+ QString mapStr = QStringLiteral ( " {" );
907
907
const QVariantMap map = value.toMap ();
908
908
QString separator;
909
909
for ( QVariantMap::const_iterator it = map.constBegin (); it != map.constEnd (); ++it )
910
910
{
911
911
mapStr.append ( separator );
912
912
if ( separator.isEmpty () )
913
- separator = QStringLiteral ( " , " );
913
+ separator = QStringLiteral ( " ," );
914
914
915
- mapStr.append ( QStringLiteral ( " %1: %2" ).arg ( quotedValue ( it.key () ), formatPreviewString ( it.value () ) ) );
916
- if ( mapStr.length () > MAX_PREVIEW + 5 )
915
+ mapStr.append ( QStringLiteral ( " %1: %2" ).arg ( quotedValue ( it.key () ), formatPreviewString ( it.value () ) ) );
916
+ if ( mapStr.length () > MAX_PREVIEW - 3 )
917
917
{
918
- mapStr = tr ( " %1…" ).arg ( mapStr.left ( MAX_PREVIEW ) );
918
+ mapStr = tr ( " %1…" ).arg ( mapStr.left ( MAX_PREVIEW - 2 ) );
919
919
break ;
920
920
}
921
921
}
922
- mapStr += QStringLiteral ( " }" );
923
- return tr ( " <i><%1></i>" ).arg ( mapStr );
922
+ if ( !map.empty () )
923
+ mapStr += QStringLiteral ( " " );
924
+ mapStr += QStringLiteral ( " }" );
925
+ return mapStr;
924
926
}
925
927
else if ( value.type () == QVariant::List || value.type () == QVariant::StringList )
926
928
{
927
- QString listStr = QStringLiteral ( " [ " );
929
+ QString listStr = QStringLiteral ( " [" );
928
930
const QVariantList list = value.toList ();
929
931
QString separator;
930
932
for ( const QVariant &arrayValue : list )
931
933
{
932
934
listStr.append ( separator );
933
935
if ( separator.isEmpty () )
934
- separator = QStringLiteral ( " , " );
936
+ separator = QStringLiteral ( " ," );
935
937
938
+ listStr.append ( " " );
936
939
listStr.append ( formatPreviewString ( arrayValue ) );
937
- if ( listStr.length () > MAX_PREVIEW + 5 )
940
+ if ( listStr.length () > MAX_PREVIEW - 3 )
938
941
{
939
- listStr = QString ( tr ( " %1…" ) ).arg ( listStr.left ( MAX_PREVIEW ) );
942
+ listStr = QString ( tr ( " %1…" ) ).arg ( listStr.left ( MAX_PREVIEW - 2 ) );
940
943
break ;
941
944
}
942
945
}
943
- listStr += QStringLiteral ( " ]" );
944
- return tr ( " <i><%1></i>" ).arg ( listStr );
946
+ if ( !list.empty () )
947
+ listStr += QStringLiteral ( " " );
948
+ listStr += QStringLiteral ( " ]" );
949
+ return listStr;
945
950
}
946
951
else
947
952
{
0 commit comments