rename icon.png to vfkPluginIcon.png to avoid conflicts

ctu-fgis · Apr 9, 2016 · 0db16db · 0db16db
1 parent 581e403
commit 0db16db
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 4 deletions.
diff --git a/Makefile b/Makefile
@@ -50,7 +50,7 @@ PY_FILES = \
 
 UI_FILES = vfkPlugin_dialog_base.ui
 
-EXTRAS = icon.png metadata.txt
+EXTRAS = vfkPluginIcon.png metadata.txt
 
 COMPILED_RESOURCE_FILES = resources_rc.py
 

diff --git a/data/icon.png → data/vfkPluginIcon.png b/data/icon.png → data/vfkPluginIcon.png
diff --git a/metadata.txt b/metadata.txt
@@ -27,7 +27,7 @@ homepage=http://freegis.fsv.cvut.cz/gwiki/VFK_/_QGIS_plugin
 tracker=https://github.com/ctu-osgeorel/qgis-vfk-plugin/issues
 repository=https://github.com/ctu-osgeorel/qgis-vfk-plugin.git
 category=Plugins
-icon=icon.png
+icon=vfkPluginIcon.png
 # experimental flag
 experimental=False
 

diff --git a/pb_tool.cfg b/pb_tool.cfg
@@ -54,7 +54,7 @@ compiled_ui_files:
 resource_files: resources.qrc
 
 # Other files required for the plugin
-extras: icon.png metadata.txt
+extras: vfkPluginIcon.png metadata.txt
 
 # Other directories to be deployed with the plugin.
 # These must be subdirectories under the plugin directory

diff --git a/vfkPlugin.py b/vfkPlugin.py
@@ -158,7 +158,7 @@ def add_action(
     def initGui(self):
         """Create the menu entries and toolbar icons inside the QGIS GUI."""
 
-        icon_path = ':/icon.png'
+        icon_path = ':/vfkPluginIcon.png'
         self.add_action(
             icon_path,
             text=self.tr(u'VFK Plugin'),