merge recent changes and bugfixes #44

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged

tmgast merged 10 commits into main from f/safe-merge

Dec 26, 2024

.gitignore

-Original file line number
+Diff line change
@@ -1,6 +1,7 @@
-    settings.json
+    preferences.json
     bin
     deploy.sh
     __pycache__/
     venv
     .venv
+    settings.json

README.md

Large diffs are not rendered by default.

__init__.py

-Original file line number
+Diff line change
@@ Expand Up / @@ -15,35 +15,34 @@ @@
     #  Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
     #
     # ##### END GPL LICENSE BLOCK #####
-    import bpy
-    from . import lib
-    from .Settings import MenuModeGroup, OverlaySettings
     bl_info = {
         "name": "Touch Viewport",
-        "description": "Creates active touch zones over View 2D and 3D areas for"
-        "easier viewport navigation with touch screens and pen tablets.",
-        "author": "NENDO",
-        "version": (4, 0, 5),
+        "description": "Creates active touch zones over View 2D and 3D areas for easier viewport navigation with touch screens and pen tablets.",
+        "author": "NENDO, Karan(b3dhub)",
         "blender": (2, 93, 0),
+        "version": (4, 2, 0),
+        "category": "3D View",
         "location": "View3D > Tools > NENDO",
         "warning": "",
-        "doc_url": "",
+        "doc_url": "https://github.com/nendotools/touchview",
         "tracker_url": "https://github.com/nendotools/touchview/issues",
-        "category": "3D View",
     }
+    import bpy
+    from . import preferences, source
     def register():
-        bpy.utils.register_class(MenuModeGroup)
-        bpy.utils.register_class(OverlaySettings)
-        bpy.context.preferences.addons[__package__.split(".")[0]].preferences.load()  # type: ignore
-        lib.register()
+        source.register()
+        preferences.register()
+        bpy.context.preferences.addons[__package__].preferences.load()  # type: ignore
     def unregister():
-        lib.unregister()
-        bpy.context.preferences.addons[__package__.split(".")[0]].preferences.save()  # type: ignore
-        bpy.utils.unregister_class(OverlaySettings)
-        bpy.utils.unregister_class(MenuModeGroup)
+        bpy.context.preferences.addons[__package__].preferences.save()  # type: ignore
+        source.unregister()
+        preferences.unregister()

blender_manifest.toml

-Original file line number
+Diff line change
@@ -0,0 +1,36 @@
+    schema_version = "1.0.0"
+    id = "touchview"
+    version = "4.2.0"
+    name = "Touch Viewport"
+    tagline = "Creates active touch zones over View 2D and 3D areas for easier viewport navigation with touch screens and pen tablets"
+    maintainer = "NENDO, Karan(b3dhub)"
+    type = "add-on"
+    permissions = ["files"]
+    website = "https://github.com/nendotools/touchview"
+    # Optional list defined by Blender and server, see:
+    # https://docs.blender.org/manual/en/dev/extensions/tags.html
+    tags = ["3D View", "User Interface"]
+    blender_version_min = "4.2.0"
+    # License conforming to https://spdx.org/licenses/ (use "SPDX: prefix)
+    license = ["SPDX:GPL-2.0-or-later"]
+    [build]
+    paths_exclude_pattern = [
+      "__pycache__/",
+      "/.git/",
+      "docs/",
+      ".gitignore",
+      "/*.zip",
+      "/bin",
+      "settings.json",
+      "bundle.sh",
+      "mypy.ini",
+      "requirements.txt",
+      "README.md"
+    ]

bundle.sh

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -5,8 +5,8 @@ bundle ()
  
        dir="bin/touchview"

        mkdir -p "$dir"

        cp "__init__.py" "$dir"

        cp "Settings.py" "$dir"

        cp -r "lib" "$dir"

        cp "preferences.py" "$dir"

        cp -r "source" "$dir"

        cd "$dest"

        zip -r "touchview.zip" "touchview"

        cd ".."

lib/Panel.py

This file was deleted.

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

merge recent changes and bugfixes #44

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!

Uh oh!

Uh oh!