From 532a5d94033931a5aafdbe864c73a912382f3eec Mon Sep 17 00:00:00 2001 From: mauroalberti Date: Tue, 7 Aug 2018 19:01:24 +0200 Subject: [PATCH] Fixed missing icon in button --- DirectionalSlope.py | 6 ++++-- DirectionalSlope_dialog.py | 4 ++-- metadata.txt | 9 +++++---- resources.py | 29 ++++------------------------- 4 files changed, 15 insertions(+), 33 deletions(-) diff --git a/DirectionalSlope.py b/DirectionalSlope.py index c977ff1..a9ef027 100644 --- a/DirectionalSlope.py +++ b/DirectionalSlope.py @@ -52,8 +52,10 @@ def initGui(self): # Create action that will start plugin configuration - self.action = QAction(QIcon(":/plugins/DirectionalSlope/icon.png"), \ - "DirectionalSlope", self.iface.mainWindow()) + self.action = QAction( + QIcon(":/plugins/DirectionalSlope/icons/icon.png"), + "DirectionalSlope", + self.iface.mainWindow()) # connect the action to the run method diff --git a/DirectionalSlope_dialog.py b/DirectionalSlope_dialog.py index b68bc09..68ba57c 100644 --- a/DirectionalSlope_dialog.py +++ b/DirectionalSlope_dialog.py @@ -255,11 +255,11 @@ def setupAboutTab(self): "\n" "

\n" "

Directional Slope

\n" -"

Vers. 1.3 - July, 20, 2018.

\n" +"

Vers. 1.3.1 - August, 7, 2018.

\n" "

Created by Mauro Alberti - alberti.m65@gmail.com

\n" "

License: GPL vers. 3.

\n" "

\n" -"

See www.malg.eu for updates.

") +"") self.about_textBrwsr.setOpenExternalLinks(True) diff --git a/metadata.txt b/metadata.txt index f641f8a..2476d5f 100644 --- a/metadata.txt +++ b/metadata.txt @@ -3,7 +3,7 @@ name=DirectionalSlope description=Calculates directional slope along given and variable orientations about=This plugin allows to calculate directional slope along uniform or spatially-variable orientations, from a source DEM category=Plugins -version=1.3 +version=1.3.1 experimental=False qgisMinimumVersion=3.0 author=Mauro Alberti @@ -14,9 +14,10 @@ repository=https://github.com/mauroalberti/directionalslope ; start of optional metadata changelog= - 1.2.0: version compatible with QGis 2.0 - 1.2.1: corrected erroneous concept in Help; minor code reformatting - 1.3 : ported to QGIS3 + 1.2.0 : version compatible with QGis 2.0 + 1.2.1 : corrected erroneous concept in Help; minor code reformatting + 1.3.0 : ported to QGIS3 + 1.3.1 : fixed missing icon in menu button ; tags are in comma separated value format, spaces are allowed tags=directional slope,dem,geomorphology diff --git a/resources.py b/resources.py index 8606660..363d070 100644 --- a/resources.py +++ b/resources.py @@ -2,7 +2,7 @@ # Resource object code # -# Created by: The Resource Compiler for PyQt5 (Qt v5.9.3) +# Created by: The Resource Compiler for PyQt5 (Qt v5.5.1) # # WARNING! All changes made in this file will be lost! @@ -114,7 +114,7 @@ \x00\x63\x00\x6f\x00\x6e\x00\x2e\x00\x70\x00\x6e\x00\x67\ " -qt_resource_struct_v1 = b"\ +qt_resource_struct = b"\ \x00\x00\x00\x00\x00\x02\x00\x00\x00\x01\x00\x00\x00\x01\ \x00\x00\x00\x00\x00\x02\x00\x00\x00\x01\x00\x00\x00\x02\ \x00\x00\x00\x14\x00\x02\x00\x00\x00\x01\x00\x00\x00\x03\ @@ -122,31 +122,10 @@ \x00\x00\x00\x4a\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\ " -qt_resource_struct_v2 = b"\ -\x00\x00\x00\x00\x00\x02\x00\x00\x00\x01\x00\x00\x00\x01\ -\x00\x00\x00\x00\x00\x00\x00\x00\ -\x00\x00\x00\x00\x00\x02\x00\x00\x00\x01\x00\x00\x00\x02\ -\x00\x00\x00\x00\x00\x00\x00\x00\ -\x00\x00\x00\x14\x00\x02\x00\x00\x00\x01\x00\x00\x00\x03\ -\x00\x00\x00\x00\x00\x00\x00\x00\ -\x00\x00\x00\x3a\x00\x02\x00\x00\x00\x01\x00\x00\x00\x04\ -\x00\x00\x00\x00\x00\x00\x00\x00\ -\x00\x00\x00\x4a\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\ -\x00\x00\x01\x64\xa4\x7f\x54\xb7\ -" - -qt_version = QtCore.qVersion().split('.') -if qt_version < ['5', '8', '0']: - rcc_version = 1 - qt_resource_struct = qt_resource_struct_v1 -else: - rcc_version = 2 - qt_resource_struct = qt_resource_struct_v2 - def qInitResources(): - QtCore.qRegisterResourceData(rcc_version, qt_resource_struct, qt_resource_name, qt_resource_data) + QtCore.qRegisterResourceData(0x01, qt_resource_struct, qt_resource_name, qt_resource_data) def qCleanupResources(): - QtCore.qUnregisterResourceData(rcc_version, qt_resource_struct, qt_resource_name, qt_resource_data) + QtCore.qUnregisterResourceData(0x01, qt_resource_struct, qt_resource_name, qt_resource_data) qInitResources()