From 3dc0c5670e43141afb76d4169b127a5621cda616 Mon Sep 17 00:00:00 2001
From: Borys Jurgiel <info@borysjurgiel.pl>
Date: Fri, 14 Sep 2018 18:39:28 +0200
Subject: [PATCH] [Plugin manager][needs-docs] Better looking links to the
 installed and available version. Remove no longer used code.

---
 images/images.qrc                             |  1 -
 images/themes/default/externalLink.svg        |  1 -
 src/app/pluginmanager/qgspluginmanager.cpp    | 22 +++++--------------
 .../qgspluginsortfilterproxymodel.h           |  1 -
 4 files changed, 6 insertions(+), 19 deletions(-)
 delete mode 100644 images/themes/default/externalLink.svg

diff --git a/images/images.qrc b/images/images.qrc
index 07466bf2871c..683dd2d03032 100755
--- a/images/images.qrc
+++ b/images/images.qrc
@@ -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>
diff --git a/images/themes/default/externalLink.svg b/images/themes/default/externalLink.svg
deleted file mode 100644
index 4f34b684d700..000000000000
--- a/images/themes/default/externalLink.svg
+++ /dev/null
@@ -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>
\ No newline at end of file
diff --git a/src/app/pluginmanager/qgspluginmanager.cpp b/src/app/pluginmanager/qgspluginmanager.cpp
index 4879c9617927..6d40e2a4ad7a 100644
--- a/src/app/pluginmanager/qgspluginmanager.cpp
+++ b/src/app/pluginmanager/qgspluginmanager.cpp
@@ -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() )
diff --git a/src/app/pluginmanager/qgspluginsortfilterproxymodel.h b/src/app/pluginmanager/qgspluginsortfilterproxymodel.h
index d2e2b229ad7c..a9bbe17996bd 100644
--- a/src/app/pluginmanager/qgspluginsortfilterproxymodel.h
+++ b/src/app/pluginmanager/qgspluginsortfilterproxymodel.h
@@ -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