Skip to content

Commit 454a936

Browse files
committed
[Plugin manager] Tabular layout for the details view
1 parent 92becc4 commit 454a936

File tree

1 file changed

+31
-22
lines changed

1 file changed

+31
-22
lines changed

src/app/pluginmanager/qgspluginmanager.cpp

+31-22
Original file line numberDiff line numberDiff line change
@@ -651,7 +651,7 @@ void QgsPluginManager::showPluginDetails( QStandardItem *item )
651651
" padding:0px;"
652652
" margin:0px;"
653653
" font-family:Verdana, Sans-serif;"
654-
" font-size: 10pt;"
654+
" font-size:10pt;"
655655
" }"
656656
" a {"
657657
" color:#08c;"
@@ -666,8 +666,17 @@ void QgsPluginManager::showPluginDetails( QStandardItem *item )
666666
" margin-left:98px;"
667667
" padding-top:3px;"
668668
" }"
669-
" span.version {"
670-
" cursor: pointer;"
669+
" td {"
670+
" vertical-align:top;"
671+
" }"
672+
" td.key {"
673+
" font-weight: bold;"
674+
" white-space:nowrap;"
675+
" padding-right:10px;"
676+
" text-align:right;"
677+
" }"
678+
" td.version {"
679+
" cursor:pointer;"
671680
" }"
672681
"</style>";
673682

@@ -681,6 +690,7 @@ void QgsPluginManager::showPluginDetails( QStandardItem *item )
681690
" background-size: 92px 16px;"
682691
" width:92px;"
683692
" height:16px;"
693+
" margin-bottom:24px;"
684694
" }"
685695
" div#stars {"
686696
" background-image: url('qrc:/images/themes/default/stars_full.svg');"
@@ -825,7 +835,8 @@ void QgsPluginManager::showPluginDetails( QStandardItem *item )
825835

826836
// Now the metadata
827837

828-
html += QLatin1String( "<table cellspacing=\"4\" width=\"100%\"><tr><td>" );
838+
html += QLatin1String( "<table cellspacing='4' width='100%'>" );
839+
html += QLatin1String( "<tr><td colspan='2'>" );
829840

830841
QString iconPath = metadata->value( QStringLiteral( "icon" ) );
831842

@@ -854,10 +865,9 @@ void QgsPluginManager::showPluginDetails( QStandardItem *item )
854865
{
855866
QString about = metadata->value( QStringLiteral( "about" ) );
856867
html += about.replace( '\n', QLatin1String( "<br/>" ) );
868+
html += QLatin1String( "<br/><br/>" );
857869
}
858870

859-
html += QLatin1String( "<br/><br/>" );
860-
861871
QString votes;
862872
#ifndef WITH_QTWEBKIT
863873
votes += tr( "Average rating %1" ).arg( metadata->value( "average_vote" ).toFloat(), 0, 'f', 1 );
@@ -884,20 +894,22 @@ void QgsPluginManager::showPluginDetails( QStandardItem *item )
884894
#else
885895
voteRating->setText( votes );
886896
#endif
887-
html += QLatin1String( "</td></tr><tr><td>" );
888-
html += QLatin1String( "<br/>" );
897+
898+
html += QLatin1String( "</td></tr>" );
899+
html += QLatin1String( "<tr><td width='1%'> </td><td width='99%'> </td></tr>" );
889900

890901
if ( ! metadata->value( QStringLiteral( "category" ) ).isEmpty() )
891902
{
892-
html += QStringLiteral( "%1: %2 <br/>" ).arg( tr( "Category" ), metadata->value( QStringLiteral( "category" ) ) );
903+
html += QStringLiteral( "<tr><td class='key'>%1 </td><td>%2</td></tr>" ).arg( tr( "Category" ), metadata->value( QStringLiteral( "category" ) ) );
893904
}
894905
if ( ! metadata->value( QStringLiteral( "tags" ) ).isEmpty() )
895906
{
896-
html += QStringLiteral( "%1: %2 <br/>" ).arg( tr( "Tags" ), metadata->value( QStringLiteral( "tags" ) ) );
907+
html += QStringLiteral( "<tr><td class='key'>%1 </td><td>%2</td></tr>" ).arg( tr( "Tags" ), metadata->value( QStringLiteral( "tags" ) ) );
897908
}
909+
898910
if ( ! metadata->value( QStringLiteral( "homepage" ) ).isEmpty() || ! metadata->value( QStringLiteral( "tracker" ) ).isEmpty() || ! metadata->value( QStringLiteral( "code_repository" ) ).isEmpty() )
899911
{
900-
html += QStringLiteral( "%1: " ).arg( tr( "More info" ) );
912+
html += QStringLiteral( "<tr><td class='key'>%1 </td><td>" ).arg( tr( "More info" ) );
901913
if ( ! metadata->value( QStringLiteral( "homepage" ) ).isEmpty() )
902914
{
903915
html += QStringLiteral( "<a href='%1'>%2</a> &nbsp; " ).arg( metadata->value( QStringLiteral( "homepage" ) ), tr( "homepage" ) );
@@ -910,43 +922,40 @@ void QgsPluginManager::showPluginDetails( QStandardItem *item )
910922
{
911923
html += QStringLiteral( "<a href='%1'>%2</a>" ).arg( metadata->value( QStringLiteral( "code_repository" ) ), tr( "code repository" ) );
912924
}
913-
html += QLatin1String( "<br/>" );
925+
html += QLatin1String( "</td></tr>" );
914926
}
915-
html += QLatin1String( "<br/>" );
916927

917928
if ( ! metadata->value( QStringLiteral( "author_email" ) ).isEmpty() )
918929
{
919-
html += QStringLiteral( "%1: <a href='mailto:%2'>%3</a>" ).arg( tr( "Author" ), metadata->value( QStringLiteral( "author_email" ) ), metadata->value( QStringLiteral( "author_name" ) ) );
920-
html += QLatin1String( "<br/><br/>" );
930+
html += QStringLiteral( "<tr><td class='key'>%1 </td><td><a href='mailto:%2'>%3</a></td></tr>" ).arg( tr( "Author" ), metadata->value( QStringLiteral( "author_email" ) ), metadata->value( QStringLiteral( "author_name" ) ) );
921931
}
922932
else if ( ! metadata->value( QStringLiteral( "author_name" ) ).isEmpty() )
923933
{
924-
html += QStringLiteral( "%1: %2" ).arg( tr( "Author" ), metadata->value( QStringLiteral( "author_name" ) ) );
925-
html += QLatin1String( "<br/><br/>" );
934+
html += QStringLiteral( "<tr><td class='key'>%1 </td><td>%2</td></tr>" ).arg( tr( "Author" ), metadata->value( QStringLiteral( "author_name" ) ) );
926935
}
927936

928937
if ( ! metadata->value( QStringLiteral( "version_installed" ) ).isEmpty() )
929938
{
930939
QString ver = metadata->value( QStringLiteral( "version_installed" ) );
931940
if ( ver == QLatin1String( "-1" ) ) ver = '?';
932-
html += QStringLiteral( "%1 <span class='version' title='%2 %3'> %4 </span><br/>" ).arg( tr( "Installed version:" ),
941+
html += QStringLiteral( "<tr><td class='key'>%1 </td><td class='version' title='%2 %3'> %4 </td></tr>" ).arg( tr( "Installed version" ),
933942
tr( "in" ),
934943
metadata->value( QStringLiteral( "library" ) ),
935944
ver );
936945
}
937946
if ( ! metadata->value( QStringLiteral( "version_available" ) ).isEmpty() )
938947
{
939-
html += QStringLiteral( "%1 <span class='version' title='%2 %3'> %4 </span><br/>" ).arg( tr( "Available version:" ),
948+
html += QStringLiteral( "<tr><td class='key'>%1 </td><td class='version' title='%2 %3'> %4 </td></tr>" ).arg( tr( "Available version" ),
940949
tr( "in" ),
941950
metadata->value( QStringLiteral( "zip_repository" ) ),
942951
metadata->value( QStringLiteral( "version_available" ) ) );
943952
}
944953

945954
if ( ! metadata->value( QStringLiteral( "changelog" ) ).isEmpty() )
946955
{
947-
html += QLatin1String( "<br/>" );
948-
QString changelog = QStringLiteral( "%1:<br/>%2 <br/>" ).arg( tr( "Changelog" ), metadata->value( QStringLiteral( "changelog" ) ) );
949-
html += changelog.replace( '\n', QLatin1String( "<br/>" ) );
956+
QString changelog = metadata->value( QStringLiteral( "changelog" ) );
957+
changelog = changelog.trimmed().replace( '\n', QLatin1String( "<br/>" ) );
958+
html += QStringLiteral( "<tr><td class='key'>%1 </td><td>%2</td></tr>" ).arg( tr( "Changelog" ), changelog );
950959
}
951960

952961
html += QLatin1String( "</td></tr></table>" );

0 commit comments

Comments
 (0)