Skip to content

Commit e155522

Browse files
borysiastyborysiasty
authored
Merge pull request #6422 from borysiasty/nicer_manager
[Plugin manager] A little bit nicer details view
2 parents 23951f3 + 92060a8 commit e155522

File tree

1 file changed

+47
-26
lines changed

1 file changed

+47
-26
lines changed

‎src/app/pluginmanager/qgspluginmanager.cpp

+47-26
Original file line numberDiff line numberDiff line change
@@ -644,19 +644,39 @@ void QgsPluginManager::showPluginDetails( QStandardItem *item )
644644
}
645645

646646
QString html = "<style>"
647+
" body {"
648+
" background-color:white;"
649+
" }"
647650
" body, table {"
648651
" padding:0px;"
649652
" margin:0px;"
650-
" font-family:verdana;"
651-
" font-size: 10pt;"
653+
" font-family:Verdana, Sans-serif;"
654+
" font-size:10pt;"
655+
" }"
656+
" a {"
657+
" color:#08c;"
658+
" text-decoration:none;"
659+
" }"
660+
" a:hover,a:focus {"
661+
" color:#005580;"
662+
" text-decoration:underline;"
652663
" }"
653664
" div#votes {"
654665
" width:360px;"
655666
" margin-left:98px;"
656667
" padding-top:3px;"
657668
" }"
658-
" span.version {"
659-
" 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;"
660680
" }"
661681
"</style>";
662682

@@ -670,6 +690,7 @@ void QgsPluginManager::showPluginDetails( QStandardItem *item )
670690
" background-size: 92px 16px;"
671691
" width:92px;"
672692
" height:16px;"
693+
" margin-bottom:16px;"
673694
" }"
674695
" div#stars {"
675696
" background-image: url('qrc:/images/themes/default/stars_full.svg');"
@@ -814,7 +835,8 @@ void QgsPluginManager::showPluginDetails( QStandardItem *item )
814835

815836
// Now the metadata
816837

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

819841
QString iconPath = metadata->value( QStringLiteral( "icon" ) );
820842

@@ -843,10 +865,9 @@ void QgsPluginManager::showPluginDetails( QStandardItem *item )
843865
{
844866
QString about = metadata->value( QStringLiteral( "about" ) );
845867
html += about.replace( '\n', QLatin1String( "<br/>" ) );
868+
html += QLatin1String( "<br/><br/>" );
846869
}
847870

848-
html += QLatin1String( "<br/><br/>" );
849-
850871
QString votes;
851872
#ifndef WITH_QTWEBKIT
852873
votes += tr( "Average rating %1" ).arg( metadata->value( "average_vote" ).toFloat(), 0, 'f', 1 );
@@ -873,69 +894,68 @@ void QgsPluginManager::showPluginDetails( QStandardItem *item )
873894
#else
874895
voteRating->setText( votes );
875896
#endif
876-
html += QLatin1String( "</td></tr><tr><td>" );
877-
html += QLatin1String( "<br/>" );
897+
898+
html += QLatin1String( "</td></tr>" );
899+
html += QLatin1String( "<tr><td width='1%'> </td><td width='99%'> </td></tr>" );
878900

879901
if ( ! metadata->value( QStringLiteral( "category" ) ).isEmpty() )
880902
{
881-
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" ) ) );
882904
}
883905
if ( ! metadata->value( QStringLiteral( "tags" ) ).isEmpty() )
884906
{
885-
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" ) ) );
886908
}
909+
887910
if ( ! metadata->value( QStringLiteral( "homepage" ) ).isEmpty() || ! metadata->value( QStringLiteral( "tracker" ) ).isEmpty() || ! metadata->value( QStringLiteral( "code_repository" ) ).isEmpty() )
888911
{
889-
html += QStringLiteral( "%1: " ).arg( tr( "More info" ) );
912+
html += QStringLiteral( "<tr><td class='key'>%1 </td><td>" ).arg( tr( "More info" ) );
890913
if ( ! metadata->value( QStringLiteral( "homepage" ) ).isEmpty() )
891914
{
892915
html += QStringLiteral( "<a href='%1'>%2</a> &nbsp; " ).arg( metadata->value( QStringLiteral( "homepage" ) ), tr( "homepage" ) );
893916
}
894917
if ( ! metadata->value( QStringLiteral( "tracker" ) ).isEmpty() )
895918
{
896-
html += QStringLiteral( "<a href='%1'>%2</a> &nbsp; " ).arg( metadata->value( QStringLiteral( "tracker" ) ), tr( "bug_tracker" ) );
919+
html += QStringLiteral( "<a href='%1'>%2</a> &nbsp; " ).arg( metadata->value( QStringLiteral( "tracker" ) ), tr( "bug tracker" ) );
897920
}
898921
if ( ! metadata->value( QStringLiteral( "code_repository" ) ).isEmpty() )
899922
{
900-
html += QStringLiteral( "<a href='%1'>%2</a>" ).arg( metadata->value( QStringLiteral( "code_repository" ) ), tr( "code_repository" ) );
923+
html += QStringLiteral( "<a href='%1'>%2</a>" ).arg( metadata->value( QStringLiteral( "code_repository" ) ), tr( "code repository" ) );
901924
}
902-
html += QLatin1String( "<br/>" );
925+
html += QLatin1String( "</td></tr>" );
903926
}
904-
html += QLatin1String( "<br/>" );
905927

906928
if ( ! metadata->value( QStringLiteral( "author_email" ) ).isEmpty() )
907929
{
908-
html += QStringLiteral( "%1: <a href='mailto:%2'>%3</a>" ).arg( tr( "Author" ), metadata->value( QStringLiteral( "author_email" ) ), metadata->value( QStringLiteral( "author_name" ) ) );
909-
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" ) ) );
910931
}
911932
else if ( ! metadata->value( QStringLiteral( "author_name" ) ).isEmpty() )
912933
{
913-
html += QStringLiteral( "%1: %2" ).arg( tr( "Author" ), metadata->value( QStringLiteral( "author_name" ) ) );
914-
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" ) ) );
915935
}
916936

917937
if ( ! metadata->value( QStringLiteral( "version_installed" ) ).isEmpty() )
918938
{
919939
QString ver = metadata->value( QStringLiteral( "version_installed" ) );
920940
if ( ver == QLatin1String( "-1" ) ) ver = '?';
921-
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" ),
922942
tr( "in" ),
923943
metadata->value( QStringLiteral( "library" ) ),
924944
ver );
925945
}
926946
if ( ! metadata->value( QStringLiteral( "version_available" ) ).isEmpty() )
927947
{
928-
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" ),
929949
tr( "in" ),
930950
metadata->value( QStringLiteral( "zip_repository" ) ),
931951
metadata->value( QStringLiteral( "version_available" ) ) );
932952
}
933953

934954
if ( ! metadata->value( QStringLiteral( "changelog" ) ).isEmpty() )
935955
{
936-
html += QLatin1String( "<br/>" );
937-
QString changelog = QStringLiteral( "%1:<br/>%2 <br/>" ).arg( tr( "Changelog" ), metadata->value( QStringLiteral( "changelog" ) ) );
938-
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 );
939959
}
940960

941961
html += QLatin1String( "</td></tr></table>" );
@@ -1177,8 +1197,9 @@ void QgsPluginManager::setCurrentTab( int idx )
11771197
{
11781198
tabInfoHTML += "<style>"
11791199
" body, p {"
1200+
" background-color: white;"
11801201
" margin: 2px;"
1181-
" font-family: verdana;"
1202+
" font-family: Verdana, Sans-serif;"
11821203
" font-size: 10pt;"
11831204
" }"
11841205
"</style>";

0 commit comments

Comments
 (0)