fix: loading issue

Author: RivinHD

src/__init__.py

@@ -15,7 +15,7 @@
     "name": "Script To Button",
     "author": "RivinHD",
     "blender": (4, 2, 0),
-    "version": (2, 3, 3),
+    "version": (2, 3, 4),
     "location": "View3D",
     "category": "System",
     "doc_url": "https://github.com/RivinHD/ScriptToButton/wiki",

src/blender_manifest.toml

@@ -3,7 +3,7 @@ schema_version = "1.0.0"
 # Example of manifest file for a Blender extension
 # Change the values according to your extension
 id = "script_to_button"
-version = "2.3.3"
+version = "2.3.4"
 name = "Script To Button"
 tagline = "Converts scripts to buttons"
 maintainer = "RivinHD"

src/dynamic_panels.py

@@ -45,7 +45,11 @@ def poll(self, context: Context) -> bool:
                 area = context.area.ui_type
                 panel = panel_names[self.bl_order]
                 return any(
-                    (button.panel == panel and area in button.areas) for button in stb
+                    (
+                        button.panel == panel
+                        and (len(button.areas) == 0 or area in button.areas)
+                    )
+                    for button in stb
                 )
 
             def draw_header(self, context: Context):
@@ -57,7 +61,10 @@ def draw(self, context):
                 area = context.area.ui_type
                 panel = panel_names[self.bl_order]
                 buttons = filter(
-                    lambda x: area in x.areas and x.panel == panel, context.scene.stb
+                    lambda x: (
+                        (len(x.areas) == 0 or area in x.areas) and x.panel == panel
+                    ),
+                    context.scene.stb,
                 )
                 for button in sorted(buttons, key=lambda x: x.name):
                     row = layout.row(align=True)
@@ -96,7 +103,11 @@ def poll(self, context: Context) -> bool:
             area = context.area.ui_type
             panel = panel_names[self.bl_order]
             return any(
-                (button.panel == panel and area in button.areas) for button in stb
+                (
+                    button.panel == panel
+                    and (len(button.areas) == 0 or area in button.areas)
+                )
+                for button in stb
             )
 
         def draw(self, context: Context):

src/functions.py

@@ -22,17 +22,6 @@
 
 classes = []
 NotOneStart = [False]
-ALL_AREAS = [
-    "3D_Viewport",
-    "UV_Editor",
-    "Compositor",
-    "Video_Sequencer",
-    "Movie_Clip_Editor",
-    "Dope_Sheet",
-    "Graph_Editor",
-    "Nonlinear_Animation",
-    "Text_Editor",
-]
 
 
 def get_preferences(context: Context) -> STB_preferences:
@@ -140,7 +129,7 @@ def get_areas(text: str) -> list:
             area_types.append(comment.split("-")[2])
     if len(area_types):
         return area_types
-    return ALL_AREAS
+    return []  # Empty = All Areas
 
 
 AREA_PARSE_DICT = {
@@ -371,8 +360,21 @@ def add_prop(button: STB_button_properties, property) -> bool:
 
 def add_button(context: Context, name: str, textname: str, description: str):
     STB_pref = get_preferences(context)
+    index = context.scene.stb.find(name)
     texts = bpy.data.texts
     text = texts[textname].as_string()  # Get selected Text
+    if index != -1:
+        context.scene.stb.remove(index)
+    new = context.scene.stb.add()  # Create new Instance
+    new.name = check_for_duplicates(get_all_button_names(context), name)
+    if description != "":
+        new.description = description
+    fails = add_areas_and_props(new, text)
+    if new.panel not in panels.panel_names:
+        panels.register_button_panel(new.panel)
+
+    update_text_header(texts[textname], new)
+    text = texts[textname].as_string()  # Get selected Text
     if STB_pref.autosave:
         save_text(texts[textname], name)
         if STB_pref.autoload:
@@ -383,19 +385,42 @@ def add_button(context: Context, name: str, textname: str, description: str):
         else:
             texts[textname].clear()
         texts[textname].write(text)  # Write to Text
-    index = context.scene.stb.find(name)
-    if index != -1:
-        context.scene.stb.remove(index)
-    new = context.scene.stb.add()  # Create new Instance
-    new.name = check_for_duplicates(get_all_button_names(context), name)
-    if description != "":
-        new.description = description
-    fails = add_areas_and_props(new, text)
-    if new.panel not in panels.panel_names:
-        panels.register_button_panel(new.panel)
+
     return fails
 
 
+def update_text_header(text: bpy.types.Text, button: STB_button_properties):
+    lines = [line.body for line in text.lines]
+    if len(button.areas):
+        if lines[0].strip().startswith("#STB"):
+            line = ""
+        else:
+            line = ""
+            lines.insert(0, line)
+        line += " /// ".join(
+            map(
+                lambda x: "#STB-Area-%s" % AREA_PARSE_DICT_INVERSE[x.name], button.areas
+            )
+        )
+        lines[0] = line
+
+    if button.description != "":
+        escaped_description = button.description.replace('"', '\\"')
+        if lines[0].strip().startswith("#STB-Area"):
+            line = lines[0]
+            line += " /// "
+        elif lines[0].strip().startswith("#STB-Tooltip"):
+            line = ""
+        else:
+            line = ""
+            lines.insert(0, line)
+        line += f'#STB-Tooltip-"{escaped_description}"'
+        lines[0] = line
+
+    text.clear()
+    text.write("\n".join(lines))
+
+
 def remove_button(context: Context, delete_file: bool, delete_text: bool):
     STB_pref = get_preferences(context)
     name = STB_pref.selected_button
@@ -413,6 +438,9 @@ def remove_button(context: Context, delete_file: bool, delete_text: bool):
     stb.remove(index)
     if index - 1 >= 0:
         stb[index - 1].selected = True
+    else:
+        scene = bpy.context.scene
+        scene["stb_button.selected_name"] = ""
     panel_names = set(button.panel for button in stb)
     for panel in set(panels.panel_names).difference(panel_names):
         panels.unregister_button_panel(panel)
@@ -528,12 +556,6 @@ def add_areas_and_props(button: STB_button_properties, text: str) -> tuple[list,
             new = button.areas.add()
             new.name = pars
             new.area = pars
-    if len(areas) == len(failed_areas):  # failed to add areas
-        for ele in ALL_AREAS:
-            pars = area_parser(ele)
-            new = button.areas.add()
-            new.name = pars
-            new.area = pars
 
     prop_list_dict = get_props(text)  # Get Props
     failed_props = []

src/operators.py

@@ -45,8 +45,11 @@ def get_description(self):
             else:
                 STB_pref = get_preferences(bpy.context)
                 text_name = STB_pref.texts_list
-            text = bpy.data.texts[text_name].as_string()  # Get selected Text
-            return functions.get_description(text)
+            if bpy.data.texts.find(text_name) != -1:
+                text = bpy.data.texts[text_name].as_string()  # Get selected Text
+                return functions.get_description(text)
+            else:
+                return ""
         return value
 
     description: StringProperty(
@@ -110,6 +113,7 @@ def execute(self, context: Context) -> set[str]:
         elif STB_pref.texts_list == "":
             self.report({"ERROR"}, "You need to select a Text")
             return {"FINISHED"}
+
         fails = functions.add_button(context, self.name, txt, self.description)
         if len(fails[0]) or len(fails[1]):
             self.report(
@@ -684,7 +688,6 @@ def execute(self, context):
 
         STB_pref = get_preferences(context)
         button: STB_button_properties = context.scene.stb[STB_pref.selected_button]
-        property_changed = False
 
         text_index = bpy.data.texts.find(STB_pref.selected_button)
         if text_index == -1:
@@ -693,35 +696,28 @@ def execute(self, context):
         else:
             text = bpy.data.texts[text_index]
         lines = [line.body for line in text.lines]
+        first_line = ""
 
         if len(self.stb_areas):
-            property_changed = True
-            if lines[0].strip().startswith("#STB"):
-                line = ""
-            else:
-                line = ""
-                lines.insert(0, line)
-            line += " /// ".join(map(lambda x: "#STB-Area-%s" % x.name, self.stb_areas))
-            lines[0] = line
-
-        if button.description != self.description:
-            property_changed = True
-            button.description = self.description
-            escaped_description = self.description.replace('"', '\\"')
-            if lines[0].strip().startswith("#STB-Area"):
-                line = lines[0]
-                line += " /// "
-            elif lines[0].strip().startswith("#STB-Tooltip"):
-                line = ""
-            else:
-                line = ""
-                lines.insert(0, line)
-            line += f'#STB-Tooltip-"{escaped_description}"'
-            lines[0] = line
+            if not (lines[0].strip() == "" or lines[0].strip().startswith("#STB")):
+                lines.insert(0, first_line)
+            first_line += " /// ".join(
+                map(lambda x: "#STB-Area-%s" % x.name, self.stb_areas)
+            )
+
+        button.description = self.description
+        escaped_description = self.description.replace('"', '\\"')
+        if first_line != "":
+            first_line += " /// "
+        elif not (lines[0].strip() == "" or lines[0].strip().startswith("#STB")):
+            lines.insert(0, first_line)
+        first_line += f'#STB-Tooltip-"{escaped_description}"'
+
+        if first_line != "":
+            lines[0] = first_line
 
         edited_lines = []
         for prop in filter(lambda x: x.use_delete, self.stb_properties):
-            property_changed = True
             line: str = lines[prop.line - 1]
             line_start = line.find("#STB")
             if line_start == -1:
@@ -759,10 +755,9 @@ def execute(self, context):
             if line.strip() == "":
                 lines.pop(i)
 
-        if property_changed:
-            text.clear()
-            text.write("\n".join(lines))
-            bpy.ops.stb.reload()
+        text.clear()
+        text.write("\n".join(lines))
+        bpy.ops.stb.reload()
         context.area.tag_redraw()
         return {"FINISHED"}
 
@@ -821,10 +816,12 @@ def text_properties_items(self, context):
     @classmethod
     def poll(cls, context: Context):
         STB_pref = get_preferences(context)
-        area = context.area.ui_type
-        button = context.scene.stb[STB_pref.selected_button]
-        is_visible = area in button.areas
-        return STB_pref.selected_button != "" and is_visible
+        if STB_pref.selected_button != "":
+            button = context.scene.stb[STB_pref.selected_button]
+            area = context.area.ui_type
+            is_visible = len(button.areas) == 0 or area in button.areas
+            return is_visible
+        return False
 
     def invoke(self, context: Context, event: Event):
         STB_pref = get_preferences(context)

src/panels.py

@@ -81,7 +81,7 @@ def draw(self, context):
                     return
                 area = context.area.ui_type
                 button = stb[STB_pref.selected_button]
-                is_visible = area in button.areas
+                is_visible = len(button.areas) == 0 or area in button.areas
                 if not is_visible:
                     layout.label(text="Selected button is hidden in this Area.")
                     return