sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-10-16 00:05:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7908 from borysiasty/nicer_plugin_links

Browse Source 
[Plugin manager][needs-docs] More unified links to the installed and available version.
This commit is contained in:
Borys Jurgiel 2018-09-18 10:13:25 +02:00 committed by GitHub
commit b5024c32c2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
images/images.qrc
View File

@ -149,7 +149,6 @@
<file>themes/default/copyright_label.svg</file>
<file>themes/default/dbmanager.svg</file>
<file>themes/default/extents.svg</file>
<file>themes/default/externalLink.svg</file>
<file>themes/default/gpsicons/barchart.svg</file>
<file>themes/default/gpsicons/polarchart.svg</file>
<file>themes/default/grass_location.svg</file>

1
images/themes/default/externalLink.svg
View File

@ -1 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 -256 1850 1850"><path d="M1504 819v320q0 119-88 203t-213 84H332q-124 0-213-84-88-84-88-203V307q0-119 88-203t213-84h737q15 0 24 9t9 23v64q0 14-9 23t-24 9H332q-69 0-118 47t-49 113v832q0 66 49 113t118 47h871q69 0 118-47t49-113V820q0-14 9-23t24-9h67q15 0 24 9t9 23z" fill="currentColor"/><path d="M400 1003l130 151 964-829 174 182V23h-436l130 151" fill="currentColor"/></svg>
Side by Side

Before

Width:  |  Height:  |  Size: 422 B

22
src/app/pluginmanager/qgspluginmanager.cpp
View File

@ -537,7 +537,6 @@ void QgsPluginManager::reloadModelData()
mypDetailItem->setData( author, PLUGIN_AUTHOR_ROLE );
mypDetailItem->setData( it->value( QStringLiteral( "tags" ) ), PLUGIN_TAGS_ROLE );
mypDetailItem->setData( it->value( QStringLiteral( "downloads" ) ).rightJustified( 10, '0' ), PLUGIN_DOWNLOADS_ROLE );
mypDetailItem->setData( it->value( QStringLiteral( "zip_repository" ) ), PLUGIN_REPOSITORY_ROLE );
mypDetailItem->setData( it->value( QStringLiteral( "average_vote" ) ), PLUGIN_VOTE_ROLE );
if ( QFileInfo( iconPath ).isFile() )
@ -677,9 +676,6 @@ void QgsPluginManager::showPluginDetails( QStandardItem *item )
" padding-right:10px;"
" text-align:right;"
" }"
" td.version img {"
" height:0.8em;"
" }"
"</style>";
if ( !metadata->value( QStringLiteral( "plugin_id" ) ).isEmpty() )
@ -948,14 +944,11 @@ void QgsPluginManager::showPluginDetails( QStandardItem *item )
{
localDir = QFileInfo( localDir ).absolutePath();
}
html += QStringLiteral( "<tr><td class='key'>%1 </td><td class='version' title='%2 %3'> %4 <a href=\"%5\">"
"<img src=\"qrc:/images/themes/default/externalLink.svg\"></a></td></tr>"
html += QStringLiteral( "<tr><td class='key'>%1 </td><td title='%2'><a href='%3'>%4</a></td></tr>"
).arg( tr( "Installed version" ),
tr( "in" ),
metadata->value( QStringLiteral( "library" ) ),
ver,
QUrl::fromLocalFile( localDir ).toString() );
QUrl::fromLocalFile( localDir ).toString(),
ver );
}
if ( ! metadata->value( QStringLiteral( "version_available" ) ).isEmpty() )
{
@ -966,13 +959,10 @@ void QgsPluginManager::showPluginDetails( QStandardItem *item )
downloadUrl = downloadUrl.replace( QStringLiteral( "download/" ), QString() );
}
html += QStringLiteral( "<tr><td class='key'>%1 </td><td class='version' title='%2 %3'> %4 <a href=\"%5\">"
"<img src=\"qrc:/images/themes/default/externalLink.svg\"></a></td></tr>"
html += QStringLiteral( "<tr><td class='key'>%1 </td><td title='%2'><a href='%2'>%3</a></td></tr>"
).arg( tr( "Available version" ),
tr( "in" ),
metadata->value( QStringLiteral( "zip_repository" ) ),
metadata->value( QStringLiteral( "version_available" ) ),
downloadUrl );
downloadUrl,
metadata->value( QStringLiteral( "version_available" ) ) );
}
if ( ! metadata->value( QStringLiteral( "changelog" ) ).isEmpty() )

1
src/app/pluginmanager/qgspluginsortfilterproxymodel.h
View File

@ -29,7 +29,6 @@ const int PLUGIN_ERROR_ROLE = Qt::UserRole + 5; // for filtering
const int PLUGIN_STATUS_ROLE = Qt::UserRole + 6; // for filtering and sorting
const int PLUGIN_DOWNLOADS_ROLE = Qt::UserRole + 7; // for sorting
const int PLUGIN_VOTE_ROLE = Qt::UserRole + 8; // for sorting
const int PLUGIN_REPOSITORY_ROLE = Qt::UserRole + 9; // for sorting
const int SPACER_ROLE = Qt::UserRole + 20; // for sorting