Cleanup and restructuring

Cleaned the files a bit, improved the directory names
nens · Nov 8, 2023 · 0efb048 · 0efb048
1 parent ce9119c
commit 0efb048
Show file tree

Hide file tree

Showing 42 changed files with 6 additions and 13 deletions.
diff --git a/plugin/bgtinlooptool/.gitignore → QGIS_plugin/bgtinlooptool/.gitignore b/plugin/bgtinlooptool/.gitignore → QGIS_plugin/bgtinlooptool/.gitignore
diff --git a/plugin/bgtinlooptool/BGTInloopTool.py → QGIS_plugin/bgtinlooptool/BGTInloopTool.py b/plugin/bgtinlooptool/BGTInloopTool.py → QGIS_plugin/bgtinlooptool/BGTInloopTool.py
diff --git a/plugin/bgtinlooptool/BGTInloopTool_dialog.py → ...gin/bgtinlooptool/BGTInloopTool_dialog.py b/plugin/bgtinlooptool/BGTInloopTool_dialog.py → ...gin/bgtinlooptool/BGTInloopTool_dialog.py
diff --git a/...gtinlooptool/BGTInloopTool_dialog_base.ui → ...gtinlooptool/BGTInloopTool_dialog_base.ui b/...gtinlooptool/BGTInloopTool_dialog_base.ui → ...gtinlooptool/BGTInloopTool_dialog_base.ui
diff --git a/plugin/bgtinlooptool/Makefile → QGIS_plugin/bgtinlooptool/Makefile b/plugin/bgtinlooptool/Makefile → QGIS_plugin/bgtinlooptool/Makefile
diff --git a/plugin/bgtinlooptool/__init__.py → QGIS_plugin/bgtinlooptool/__init__.py b/plugin/bgtinlooptool/__init__.py → QGIS_plugin/bgtinlooptool/__init__.py
diff --git a/QGIS_plugin/bgtinlooptool/bgtinlooptool.zip b/QGIS_plugin/bgtinlooptool/bgtinlooptool.zip
diff --git a/plugin/bgtinlooptool/compile.bat → QGIS_plugin/bgtinlooptool/compile.bat b/plugin/bgtinlooptool/compile.bat → QGIS_plugin/bgtinlooptool/compile.bat
diff --git a/plugin/bgtinlooptool/help/Makefile → QGIS_plugin/bgtinlooptool/help/Makefile b/plugin/bgtinlooptool/help/Makefile → QGIS_plugin/bgtinlooptool/help/Makefile
diff --git a/plugin/bgtinlooptool/help/make.bat → QGIS_plugin/bgtinlooptool/help/make.bat b/plugin/bgtinlooptool/help/make.bat → QGIS_plugin/bgtinlooptool/help/make.bat
diff --git a/plugin/bgtinlooptool/help/source/conf.py → ..._plugin/bgtinlooptool/help/source/conf.py b/plugin/bgtinlooptool/help/source/conf.py → ..._plugin/bgtinlooptool/help/source/conf.py
diff --git a/plugin/bgtinlooptool/help/source/index.rst → ...lugin/bgtinlooptool/help/source/index.rst b/plugin/bgtinlooptool/help/source/index.rst → ...lugin/bgtinlooptool/help/source/index.rst
diff --git a/plugin/bgtinlooptool/icon.png → QGIS_plugin/bgtinlooptool/icon.png b/plugin/bgtinlooptool/icon.png → QGIS_plugin/bgtinlooptool/icon.png
diff --git a/plugin/bgtinlooptool/metadata.txt → QGIS_plugin/bgtinlooptool/metadata.txt b/plugin/bgtinlooptool/metadata.txt → 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 protected]
 
 about=Bereken afwateringskenmerken BGT vlakken.

diff --git a/plugin/bgtinlooptool/ogr2qgis.py → QGIS_plugin/bgtinlooptool/ogr2qgis.py b/plugin/bgtinlooptool/ogr2qgis.py → QGIS_plugin/bgtinlooptool/ogr2qgis.py
diff --git a/plugin/bgtinlooptool/pb_tool.cfg → QGIS_plugin/bgtinlooptool/pb_tool.cfg b/plugin/bgtinlooptool/pb_tool.cfg → QGIS_plugin/bgtinlooptool/pb_tool.cfg
diff --git a/plugin/bgtinlooptool/plugin_upload.py → QGIS_plugin/bgtinlooptool/plugin_upload.py b/plugin/bgtinlooptool/plugin_upload.py → QGIS_plugin/bgtinlooptool/plugin_upload.py
diff --git a/plugin/bgtinlooptool/pylintrc → QGIS_plugin/bgtinlooptool/pylintrc b/plugin/bgtinlooptool/pylintrc → QGIS_plugin/bgtinlooptool/pylintrc
diff --git a/plugin/bgtinlooptool/resources.py → QGIS_plugin/bgtinlooptool/resources.py b/plugin/bgtinlooptool/resources.py → QGIS_plugin/bgtinlooptool/resources.py
@@ -84,28 +84,21 @@
 \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
 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(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 → QGIS_plugin/bgtinlooptool/resources.qrc b/plugin/bgtinlooptool/resources.qrc → QGIS_plugin/bgtinlooptool/resources.qrc
diff --git a/.../bgtinlooptool/scripts/compile-strings.sh → .../bgtinlooptool/scripts/compile-strings.sh b/.../bgtinlooptool/scripts/compile-strings.sh → .../bgtinlooptool/scripts/compile-strings.sh
diff --git a/...in/bgtinlooptool/scripts/run-env-linux.sh → ...in/bgtinlooptool/scripts/run-env-linux.sh b/...in/bgtinlooptool/scripts/run-env-linux.sh → ...in/bgtinlooptool/scripts/run-env-linux.sh
diff --git a/...n/bgtinlooptool/scripts/update-strings.sh → ...n/bgtinlooptool/scripts/update-strings.sh b/...n/bgtinlooptool/scripts/update-strings.sh → ...n/bgtinlooptool/scripts/update-strings.sh
diff --git a/...n/bgtinlooptool/style/bgt_inlooptabel.qml → ...n/bgtinlooptool/style/bgt_inlooptabel.qml b/...n/bgtinlooptool/style/bgt_inlooptabel.qml → ...n/bgtinlooptool/style/bgt_inlooptabel.qml
diff --git a/.../bgtinlooptool/style/bgt_oppervlakken.qml → .../bgtinlooptool/style/bgt_oppervlakken.qml b/.../bgtinlooptool/style/bgt_oppervlakken.qml → .../bgtinlooptool/style/bgt_oppervlakken.qml
diff --git a/plugin/bgtinlooptool/style/gwsw_lijn.qml → ..._plugin/bgtinlooptool/style/gwsw_lijn.qml b/plugin/bgtinlooptool/style/gwsw_lijn.qml → ..._plugin/bgtinlooptool/style/gwsw_lijn.qml
diff --git a/plugin/bgtinlooptool/test/__init__.py → QGIS_plugin/bgtinlooptool/test/__init__.py b/plugin/bgtinlooptool/test/__init__.py → QGIS_plugin/bgtinlooptool/test/__init__.py
diff --git a/plugin/bgtinlooptool/test/qgis_interface.py → ...ugin/bgtinlooptool/test/qgis_interface.py b/plugin/bgtinlooptool/test/qgis_interface.py → ...ugin/bgtinlooptool/test/qgis_interface.py
diff --git a/plugin/bgtinlooptool/test/tenbytenraster.asc → ...gin/bgtinlooptool/test/tenbytenraster.asc b/plugin/bgtinlooptool/test/tenbytenraster.asc → ...gin/bgtinlooptool/test/tenbytenraster.asc
diff --git a/...nlooptool/test/tenbytenraster.asc.aux.xml → ...nlooptool/test/tenbytenraster.asc.aux.xml b/...nlooptool/test/tenbytenraster.asc.aux.xml → ...nlooptool/test/tenbytenraster.asc.aux.xml
diff --git a/...gtinlooptool/test/tenbytenraster.keywords → ...gtinlooptool/test/tenbytenraster.keywords b/...gtinlooptool/test/tenbytenraster.keywords → ...gtinlooptool/test/tenbytenraster.keywords
diff --git a/plugin/bgtinlooptool/test/tenbytenraster.lic → ...gin/bgtinlooptool/test/tenbytenraster.lic b/plugin/bgtinlooptool/test/tenbytenraster.lic → ...gin/bgtinlooptool/test/tenbytenraster.lic
diff --git a/plugin/bgtinlooptool/test/tenbytenraster.prj → ...gin/bgtinlooptool/test/tenbytenraster.prj b/plugin/bgtinlooptool/test/tenbytenraster.prj → ...gin/bgtinlooptool/test/tenbytenraster.prj
diff --git a/plugin/bgtinlooptool/test/tenbytenraster.qml → ...gin/bgtinlooptool/test/tenbytenraster.qml b/plugin/bgtinlooptool/test/tenbytenraster.qml → ...gin/bgtinlooptool/test/tenbytenraster.qml
diff --git a/...ooptool/test/test_BGTInloopTool_dialog.py → ...ooptool/test/test_BGTInloopTool_dialog.py b/...ooptool/test/test_BGTInloopTool_dialog.py → ...ooptool/test/test_BGTInloopTool_dialog.py
diff --git a/...cripts/remove_geometries_out_of_extent.py → ...adtest_remove_geometries_out_of_extent.py b/...cripts/remove_geometries_out_of_extent.py → ...adtest_remove_geometries_out_of_extent.py
diff --git a/plugin/bgtinlooptool/test/test_init.py → QGIS_plugin/bgtinlooptool/test/test_init.py b/plugin/bgtinlooptool/test/test_init.py → QGIS_plugin/bgtinlooptool/test/test_init.py
diff --git a/...tinlooptool/test/test_qgis_environment.py → ...tinlooptool/test/test_qgis_environment.py b/...tinlooptool/test/test_qgis_environment.py → ...tinlooptool/test/test_qgis_environment.py
diff --git a/plugin/bgtinlooptool/test/test_resources.py → ...ugin/bgtinlooptool/test/test_resources.py b/plugin/bgtinlooptool/test/test_resources.py → ...ugin/bgtinlooptool/test/test_resources.py
diff --git a/...n/bgtinlooptool/test/test_translations.py → ...n/bgtinlooptool/test/test_translations.py b/...n/bgtinlooptool/test/test_translations.py → ...n/bgtinlooptool/test/test_translations.py
diff --git a/plugin/bgtinlooptool/test/utilities.py → QGIS_plugin/bgtinlooptool/test/utilities.py b/plugin/bgtinlooptool/test/utilities.py → QGIS_plugin/bgtinlooptool/test/utilities.py
diff --git a/plugin/bgtinlooptool/zip.py → QGIS_plugin/bgtinlooptool/zip.py b/plugin/bgtinlooptool/zip.py → QGIS_plugin/bgtinlooptool/zip.py