Changes to support version 2.10; add new template support; rename res…

…ources_rc to resources to prevent issues when editing dialogs using Qt Designer
g-sherman · Aug 19, 2015 · 34f0783 · 34f0783
1 parent 0bcd32a
commit 34f0783
Show file tree

Hide file tree

Showing 13 changed files with 10 additions and 10 deletions.
diff --git a/help/source/conf.py b/help/source/conf.py
@@ -48,9 +48,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '2.8.1'
+version = '2.10'
 # The full version, including alpha/beta/rc tags.
-release = '2.8.1'
+release = '2.10'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/help/source/images/plugin_results.png b/help/source/images/plugin_results.png
diff --git a/help/source/images/plugin_test.png b/help/source/images/plugin_test.png
diff --git a/help/source/images/wizard_about.png b/help/source/images/wizard_about.png
diff --git a/help/source/images/wizard_helpers.png b/help/source/images/wizard_helpers.png
diff --git a/help/source/images/wizard_publication_info.png b/help/source/images/wizard_publication_info.png
diff --git a/help/source/images/wizard_required_info.png b/help/source/images/wizard_required_info.png
diff --git a/help/source/images/wizard_template.png b/help/source/images/wizard_template.png
diff --git a/metadata.txt b/metadata.txt
@@ -9,10 +9,10 @@
 name=Plugin Builder
 about=Create a template for a QGIS plugin
 description=Creates a QGIS plugin template for use as a starting point in plugin development
-version=Version 2.8.3
+version=Version 2.10
 qgisMinimumVersion=2.0
 
-changelog=2015-03-17 Remove win32api requirement on Windows
+changelog=2015-08-18 Add wizard and templates for different types of plugins; rename resources_rc to resources to prevent issues when editing dialog(s) with Qt Designer
 
 homepage=http://g-sherman.github.io/Qgis-Plugin-Builder
 tracker=https://github.com/g-sherman/Qgis-Plugin-Builder/issues

diff --git a/plugin_templates/shared/Makefile.tmpl b/plugin_templates/shared/Makefile.tmpl
@@ -52,7 +52,7 @@ EXTRAS = metadata.txt ${TemplateExtraFiles}
 
 COMPILED_RESOURCE_FILES = ${TemplateRcFiles}
 
-PEP8EXCLUDE=pydev,resources_rc.py,conf.py,third_party,ui
+PEP8EXCLUDE=pydev,resources.py,conf.py,third_party,ui
 
 
 #################################################
@@ -71,8 +71,8 @@ default: compile
 
 compile: $$(COMPILED_RESOURCE_FILES)
 
-%_rc.py : %.qrc $$(RESOURCES_SRC)
-	pyrcc4 -o $$*_rc.py  $$<
+%.py : %.qrc $$(RESOURCES_SRC)
+	pyrcc4 -o $$*.py  $$<
 
 %.qm : %.ts
 	$$(LRELEASE) $$<

diff --git a/plugin_templates/toolbutton_with_dialog/plugin_template.py b/plugin_templates/toolbutton_with_dialog/plugin_template.py
@@ -50,7 +50,7 @@ def template_map(self, specification, dialog):
             'TemplateUiFiles': '%s_dialog_base.ui' % specification.module_name,
             'TemplateExtraFiles': 'icon.png',
             'TemplateQrcFiles': 'resources.qrc',
-            'TemplateRcFiles': "resources_rc.py",
+            'TemplateRcFiles': "resources.py",
             # Menu
             'TemplateMenuText': menu_text,
             'TemplateMenuAddMethod': add_method,

diff --git a/plugin_templates/toolbutton_with_dialog/template/module_name.tmpl b/plugin_templates/toolbutton_with_dialog/template/module_name.tmpl
@@ -23,7 +23,7 @@
 from PyQt4.QtCore import QSettings, QTranslator, qVersion, QCoreApplication
 from PyQt4.QtGui import QAction, QIcon
 # Initialize Qt resources from file resources.py
-import resources_rc
+import resources
 # Import the code for the dialog
 from ${TemplateModuleName}_dialog import ${TemplateClass}Dialog
 import os.path

diff --git a/test/test_builder.py b/test/test_builder.py
@@ -93,7 +93,7 @@ def __init__(self):
             'TemplateUiFiles': '%s_dialog_base.ui' % self.module_name,
             'TemplateExtraFiles': 'icon.png',
             'TemplateQrcFiles': 'resources.qrc',
-            'TemplateRcFiles': "resources_rc.py",
+            'TemplateRcFiles': "resources.py",
             # Menu
             'TemplateMenuText': self.menu_text,
             'TemplateMenuAddMethod': 'addPluginToMenu',