diff --git a/plugin/bgtinlooptool/.gitignore b/QGIS_plugin/bgtinlooptool/.gitignore similarity index 100% rename from plugin/bgtinlooptool/.gitignore rename to QGIS_plugin/bgtinlooptool/.gitignore diff --git a/plugin/bgtinlooptool/BGTInloopTool.py b/QGIS_plugin/bgtinlooptool/BGTInloopTool.py similarity index 100% rename from plugin/bgtinlooptool/BGTInloopTool.py rename to QGIS_plugin/bgtinlooptool/BGTInloopTool.py diff --git a/plugin/bgtinlooptool/BGTInloopTool_dialog.py b/QGIS_plugin/bgtinlooptool/BGTInloopTool_dialog.py similarity index 100% rename from plugin/bgtinlooptool/BGTInloopTool_dialog.py rename to QGIS_plugin/bgtinlooptool/BGTInloopTool_dialog.py diff --git a/plugin/bgtinlooptool/BGTInloopTool_dialog_base.ui b/QGIS_plugin/bgtinlooptool/BGTInloopTool_dialog_base.ui similarity index 100% rename from plugin/bgtinlooptool/BGTInloopTool_dialog_base.ui rename to QGIS_plugin/bgtinlooptool/BGTInloopTool_dialog_base.ui diff --git a/plugin/bgtinlooptool/Makefile b/QGIS_plugin/bgtinlooptool/Makefile similarity index 100% rename from plugin/bgtinlooptool/Makefile rename to QGIS_plugin/bgtinlooptool/Makefile diff --git a/plugin/bgtinlooptool/__init__.py b/QGIS_plugin/bgtinlooptool/__init__.py similarity index 100% rename from plugin/bgtinlooptool/__init__.py rename to QGIS_plugin/bgtinlooptool/__init__.py diff --git a/QGIS_plugin/bgtinlooptool/bgtinlooptool.zip b/QGIS_plugin/bgtinlooptool/bgtinlooptool.zip new file mode 100644 index 0000000..608e2a9 Binary files /dev/null and b/QGIS_plugin/bgtinlooptool/bgtinlooptool.zip differ diff --git a/plugin/bgtinlooptool/compile.bat b/QGIS_plugin/bgtinlooptool/compile.bat similarity index 100% rename from plugin/bgtinlooptool/compile.bat rename to QGIS_plugin/bgtinlooptool/compile.bat diff --git a/plugin/bgtinlooptool/help/Makefile b/QGIS_plugin/bgtinlooptool/help/Makefile similarity index 100% rename from plugin/bgtinlooptool/help/Makefile rename to QGIS_plugin/bgtinlooptool/help/Makefile diff --git a/plugin/bgtinlooptool/help/make.bat b/QGIS_plugin/bgtinlooptool/help/make.bat similarity index 100% rename from plugin/bgtinlooptool/help/make.bat rename to QGIS_plugin/bgtinlooptool/help/make.bat diff --git a/plugin/bgtinlooptool/help/source/conf.py b/QGIS_plugin/bgtinlooptool/help/source/conf.py similarity index 100% rename from plugin/bgtinlooptool/help/source/conf.py rename to QGIS_plugin/bgtinlooptool/help/source/conf.py diff --git a/plugin/bgtinlooptool/help/source/index.rst b/QGIS_plugin/bgtinlooptool/help/source/index.rst similarity index 100% rename from plugin/bgtinlooptool/help/source/index.rst rename to QGIS_plugin/bgtinlooptool/help/source/index.rst diff --git a/plugin/bgtinlooptool/icon.png b/QGIS_plugin/bgtinlooptool/icon.png similarity index 100% rename from plugin/bgtinlooptool/icon.png rename to QGIS_plugin/bgtinlooptool/icon.png diff --git a/plugin/bgtinlooptool/metadata.txt b/QGIS_plugin/bgtinlooptool/metadata.txt similarity index 89% rename from plugin/bgtinlooptool/metadata.txt rename to QGIS_plugin/bgtinlooptool/metadata.txt index 4eb9bd2..ff27a4e 100644 --- a/plugin/bgtinlooptool/metadata.txt +++ b/QGIS_plugin/bgtinlooptool/metadata.txt @@ -2,8 +2,8 @@ name=BGT Inlooptool qgisMinimumVersion=3.10 description=BGT Inlooptool -version=1.1 -author=Emile de Badts, Leendert van Wolfswinkel, Chris Kerklaan +version=1.2 +author=Emile de Badts, Leendert van Wolfswinkel, Chris Kerklaan, Ruben van der Zaag, Sjon van Dijk email=bgtinlooptool@nelen-schuurmans.nl about=Bereken afwateringskenmerken BGT vlakken. diff --git a/plugin/bgtinlooptool/ogr2qgis.py b/QGIS_plugin/bgtinlooptool/ogr2qgis.py similarity index 100% rename from plugin/bgtinlooptool/ogr2qgis.py rename to QGIS_plugin/bgtinlooptool/ogr2qgis.py diff --git a/plugin/bgtinlooptool/pb_tool.cfg b/QGIS_plugin/bgtinlooptool/pb_tool.cfg similarity index 100% rename from plugin/bgtinlooptool/pb_tool.cfg rename to QGIS_plugin/bgtinlooptool/pb_tool.cfg diff --git a/plugin/bgtinlooptool/plugin_upload.py b/QGIS_plugin/bgtinlooptool/plugin_upload.py similarity index 100% rename from plugin/bgtinlooptool/plugin_upload.py rename to QGIS_plugin/bgtinlooptool/plugin_upload.py diff --git a/plugin/bgtinlooptool/pylintrc b/QGIS_plugin/bgtinlooptool/pylintrc similarity index 100% rename from plugin/bgtinlooptool/pylintrc rename to QGIS_plugin/bgtinlooptool/pylintrc diff --git a/plugin/bgtinlooptool/resources.py b/QGIS_plugin/bgtinlooptool/resources.py similarity index 92% rename from plugin/bgtinlooptool/resources.py rename to QGIS_plugin/bgtinlooptool/resources.py index 2ca7985..d3ed339 100644 --- a/plugin/bgtinlooptool/resources.py +++ b/QGIS_plugin/bgtinlooptool/resources.py @@ -84,10 +84,10 @@ \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\x34\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\ -\x00\x00\x01\x76\x2e\x2d\x56\x8b\ +\x00\x00\x01\x80\xb8\x9c\x9e\x0a\ " -qt_version = [int(v) for v in QtCore.qVersion().split(".")] +qt_version = [int(v) for v in QtCore.qVersion().split('.')] if qt_version < [5, 8, 0]: rcc_version = 1 qt_resource_struct = qt_resource_struct_v1 @@ -95,17 +95,10 @@ 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(rcc_version, 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(rcc_version, qt_resource_struct, qt_resource_name, qt_resource_data) qInitResources() diff --git a/plugin/bgtinlooptool/resources.qrc b/QGIS_plugin/bgtinlooptool/resources.qrc similarity index 100% rename from plugin/bgtinlooptool/resources.qrc rename to QGIS_plugin/bgtinlooptool/resources.qrc diff --git a/plugin/bgtinlooptool/scripts/compile-strings.sh b/QGIS_plugin/bgtinlooptool/scripts/compile-strings.sh similarity index 100% rename from plugin/bgtinlooptool/scripts/compile-strings.sh rename to QGIS_plugin/bgtinlooptool/scripts/compile-strings.sh diff --git a/plugin/bgtinlooptool/scripts/run-env-linux.sh b/QGIS_plugin/bgtinlooptool/scripts/run-env-linux.sh similarity index 100% rename from plugin/bgtinlooptool/scripts/run-env-linux.sh rename to QGIS_plugin/bgtinlooptool/scripts/run-env-linux.sh diff --git a/plugin/bgtinlooptool/scripts/update-strings.sh b/QGIS_plugin/bgtinlooptool/scripts/update-strings.sh similarity index 100% rename from plugin/bgtinlooptool/scripts/update-strings.sh rename to QGIS_plugin/bgtinlooptool/scripts/update-strings.sh diff --git a/plugin/bgtinlooptool/style/bgt_inlooptabel.qml b/QGIS_plugin/bgtinlooptool/style/bgt_inlooptabel.qml similarity index 100% rename from plugin/bgtinlooptool/style/bgt_inlooptabel.qml rename to QGIS_plugin/bgtinlooptool/style/bgt_inlooptabel.qml diff --git a/plugin/bgtinlooptool/style/bgt_oppervlakken.qml b/QGIS_plugin/bgtinlooptool/style/bgt_oppervlakken.qml similarity index 100% rename from plugin/bgtinlooptool/style/bgt_oppervlakken.qml rename to QGIS_plugin/bgtinlooptool/style/bgt_oppervlakken.qml diff --git a/plugin/bgtinlooptool/style/gwsw_lijn.qml b/QGIS_plugin/bgtinlooptool/style/gwsw_lijn.qml similarity index 100% rename from plugin/bgtinlooptool/style/gwsw_lijn.qml rename to QGIS_plugin/bgtinlooptool/style/gwsw_lijn.qml diff --git a/plugin/bgtinlooptool/test/__init__.py b/QGIS_plugin/bgtinlooptool/test/__init__.py similarity index 100% rename from plugin/bgtinlooptool/test/__init__.py rename to QGIS_plugin/bgtinlooptool/test/__init__.py diff --git a/plugin/bgtinlooptool/test/qgis_interface.py b/QGIS_plugin/bgtinlooptool/test/qgis_interface.py similarity index 100% rename from plugin/bgtinlooptool/test/qgis_interface.py rename to QGIS_plugin/bgtinlooptool/test/qgis_interface.py diff --git a/plugin/bgtinlooptool/test/tenbytenraster.asc b/QGIS_plugin/bgtinlooptool/test/tenbytenraster.asc similarity index 100% rename from plugin/bgtinlooptool/test/tenbytenraster.asc rename to QGIS_plugin/bgtinlooptool/test/tenbytenraster.asc diff --git a/plugin/bgtinlooptool/test/tenbytenraster.asc.aux.xml b/QGIS_plugin/bgtinlooptool/test/tenbytenraster.asc.aux.xml similarity index 100% rename from plugin/bgtinlooptool/test/tenbytenraster.asc.aux.xml rename to QGIS_plugin/bgtinlooptool/test/tenbytenraster.asc.aux.xml diff --git a/plugin/bgtinlooptool/test/tenbytenraster.keywords b/QGIS_plugin/bgtinlooptool/test/tenbytenraster.keywords similarity index 100% rename from plugin/bgtinlooptool/test/tenbytenraster.keywords rename to QGIS_plugin/bgtinlooptool/test/tenbytenraster.keywords diff --git a/plugin/bgtinlooptool/test/tenbytenraster.lic b/QGIS_plugin/bgtinlooptool/test/tenbytenraster.lic similarity index 100% rename from plugin/bgtinlooptool/test/tenbytenraster.lic rename to QGIS_plugin/bgtinlooptool/test/tenbytenraster.lic diff --git a/plugin/bgtinlooptool/test/tenbytenraster.prj b/QGIS_plugin/bgtinlooptool/test/tenbytenraster.prj similarity index 100% rename from plugin/bgtinlooptool/test/tenbytenraster.prj rename to QGIS_plugin/bgtinlooptool/test/tenbytenraster.prj diff --git a/plugin/bgtinlooptool/test/tenbytenraster.qml b/QGIS_plugin/bgtinlooptool/test/tenbytenraster.qml similarity index 100% rename from plugin/bgtinlooptool/test/tenbytenraster.qml rename to QGIS_plugin/bgtinlooptool/test/tenbytenraster.qml diff --git a/plugin/bgtinlooptool/test/test_BGTInloopTool_dialog.py b/QGIS_plugin/bgtinlooptool/test/test_BGTInloopTool_dialog.py similarity index 100% rename from plugin/bgtinlooptool/test/test_BGTInloopTool_dialog.py rename to QGIS_plugin/bgtinlooptool/test/test_BGTInloopTool_dialog.py diff --git a/test_scripts/remove_geometries_out_of_extent.py b/QGIS_plugin/bgtinlooptool/test/test_badtest_remove_geometries_out_of_extent.py similarity index 100% rename from test_scripts/remove_geometries_out_of_extent.py rename to QGIS_plugin/bgtinlooptool/test/test_badtest_remove_geometries_out_of_extent.py diff --git a/plugin/bgtinlooptool/test/test_init.py b/QGIS_plugin/bgtinlooptool/test/test_init.py similarity index 100% rename from plugin/bgtinlooptool/test/test_init.py rename to QGIS_plugin/bgtinlooptool/test/test_init.py diff --git a/plugin/bgtinlooptool/test/test_qgis_environment.py b/QGIS_plugin/bgtinlooptool/test/test_qgis_environment.py similarity index 100% rename from plugin/bgtinlooptool/test/test_qgis_environment.py rename to QGIS_plugin/bgtinlooptool/test/test_qgis_environment.py diff --git a/plugin/bgtinlooptool/test/test_resources.py b/QGIS_plugin/bgtinlooptool/test/test_resources.py similarity index 100% rename from plugin/bgtinlooptool/test/test_resources.py rename to QGIS_plugin/bgtinlooptool/test/test_resources.py diff --git a/plugin/bgtinlooptool/test/test_translations.py b/QGIS_plugin/bgtinlooptool/test/test_translations.py similarity index 100% rename from plugin/bgtinlooptool/test/test_translations.py rename to QGIS_plugin/bgtinlooptool/test/test_translations.py diff --git a/plugin/bgtinlooptool/test/utilities.py b/QGIS_plugin/bgtinlooptool/test/utilities.py similarity index 100% rename from plugin/bgtinlooptool/test/utilities.py rename to QGIS_plugin/bgtinlooptool/test/utilities.py diff --git a/plugin/bgtinlooptool/zip.py b/QGIS_plugin/bgtinlooptool/zip.py similarity index 100% rename from plugin/bgtinlooptool/zip.py rename to QGIS_plugin/bgtinlooptool/zip.py