From dd27b1fc0a6cb6f7c5ed9f44c26fb554481c8555 Mon Sep 17 00:00:00 2001
From: Neltulz <neilvmoore@gmail.com>
Date: Mon, 23 Dec 2019 07:16:15 -0600
Subject: [PATCH] v1.0.5 - Sidebar Panel Improvements

- Set default sidebar tab name to "Neltulz" so that all Neltulz related sidebars from various Neltulz add-ons will be organized here.

- Changed operator bl_idnames to improve organization. This may break things if you've added operators to any custom pie menus. Sorry for the inconvenience.

- Improved sidebar panel significantly. Better use of space.

- Set default iteration count to 4 instead of 1. This provides better results most situations.
---
 README_Neltulz_Edge_Curve_Plus.html | 18 +++++--
 __init__.py                         |  4 +-
 addon_preferences.py                | 17 ++-----
 keymaps.py                          | 15 +-----
 main_ot.py                          | 20 ++------
 misc_layout.py                      | 68 ++++++++++++++++++++++++++
 misc_ot.py                          | 42 ++++++++--------
 panels.py                           | 76 ++++++++++++++++-------------
 properties.py                       | 60 +++++++++++++++--------
 9 files changed, 193 insertions(+), 127 deletions(-)
 create mode 100644 misc_layout.py

diff --git a/README_Neltulz_Edge_Curve_Plus.html b/README_Neltulz_Edge_Curve_Plus.html
index c13f7c0..9f31b4a 100644
--- a/README_Neltulz_Edge_Curve_Plus.html
+++ b/README_Neltulz_Edge_Curve_Plus.html
@@ -10,11 +10,11 @@
         <meta name="twitter:card" value="summary">
 
         <!-- Open Graph data -->
-        <meta property="og:title" content="Neltulz - Edge Curve Plus v1.0.4" />
+        <meta property="og:title" content="Neltulz - Edge Curve Plus v1.0.5" />
         <meta property="og:type" content="website" />
         <meta property="og:url" content="https://www.logichaos.com/neltulz_blender_addons/neltulz_edge_curve_plus/README_Neltulz_Edge_Curve_Plus"/>
         <meta property="og:image" content="https://www.logichaos.com/neltulz_blender_addons/neltulz_edge_curve_plus/readme_html_files/img/logo.png" />
-        <meta property="og:description" content="Updated: 8/27/2019 - Blender Addon that allows you to quickly insert edge loops with flow. (Requires the EdgeFlow addon for Blender)" />
+        <meta property="og:description" content="Updated: 12/23/2019 - Blender Addon that allows you to quickly insert edge loops with flow. (Requires the EdgeFlow addon for Blender)" />
 
         <link href="readme_html_files/fontawesome-free-5.10.1-web/css/all.min.css" rel="stylesheet">
         <link rel="stylesheet" href="readme_html_files/css/bootstrap-reboot.min.css">
@@ -79,7 +79,7 @@
             </picture>
 
             <h1 class="pageTitle">
-                Neltulz - Edge Curve Plus<br><span class="versionNum">Version: 1.0.4<br>Last Update: 9/3/2019</span>
+                Neltulz - Edge Curve Plus<br><span class="versionNum">Version: 1.0.5<br>Last Update: 12/23/2019</span>
             </h1>
 
             <div class="versionAndDownloadBar">
@@ -249,8 +249,8 @@ <h5>Hotkeys</h5>
                         <tr>
                             <td class="hotkey primary">ALT+SHIFT+E</td>
                             <td class="result success">Insert Edge Loop(s) with Flow</td>
-                            <td class="command">object.neltulz_edge_curve_plus</td>
-                            <td class="properties">numSegments = 1<br>useEdgeFlow = True<br>tension = 180<br>numIterations = 1<br>minAngle = 0</td>
+                            <td class="command">ntz_edg_curv.insertedges</td>
+                            <td class="properties">numSegments = 1<br>useEdgeFlow = True<br>tension = 180<br>numIterations = 4<br>minAngle = 0</td>
                         </tr>
 
                     </tbody>
@@ -352,6 +352,14 @@ <h1>From the GNU GPL v3.0:</h1>
             <h3 id="changelog">Changelog</h3>
 
                 <ul>
+                    <li>2019-12-23
+                        <ul>
+                            <li>Set default sidebar tab name to "Neltulz" so that all Neltulz related sidebars from various Neltulz add-ons will be organized here.</li>
+                            <li>Changed operator bl_idnames to improve organization. This may break things if you've added operators to any custom pie menus.  Sorry for the inconvenience.</li>
+                            <li>Improved sidebar panel significantly.  Better use of space.</li>
+                            <li>Set default iteration count to 4 instead of 1.  This provides better results most situations.</li>
+                        </ul>
+                    </li>
                     <li>2019-09-03
                         <ul>
                             <li>Removed addon_utils.py</li>
diff --git a/__init__.py b/__init__.py
index 30950d8..3629720 100644
--- a/__init__.py
+++ b/__init__.py
@@ -3,7 +3,7 @@
     "author" : "Neil V. Moore",
     "description" : "Allows you to quickly insert edge loops with flow (Requires edge flow addon)",
     "blender" : (2, 80, 0),
-    "version" : (1, 0, 4),
+    "version" : (1, 0, 5),
     "location" : "View3D",
     "warning" : "",
     "category" : "3D View",
@@ -77,4 +77,4 @@ def unregister():
     register()
 
     # test call
-    bpy.ops.object.neltulz_edge_curve_plus()
\ No newline at end of file
+    bpy.ops.ntz_edg_curv.insertedges()
\ No newline at end of file
diff --git a/addon_preferences.py b/addon_preferences.py
index 0621a28..0d54aaf 100644
--- a/addon_preferences.py
+++ b/addon_preferences.py
@@ -4,19 +4,8 @@
 import bpy
 from . panels import OBJECT_PT_NeltulzEdgeCurvePlus
 
-from bpy.props import (StringProperty,
-                       BoolProperty,
-                       IntProperty,
-                       FloatProperty,
-                       FloatVectorProperty,
-                       EnumProperty,
-                       PointerProperty,
-                       )
-from bpy.types import (Panel,
-                       Operator,
-                       AddonPreferences,
-                       PropertyGroup,
-                       )
+from bpy.props import (StringProperty, BoolProperty, IntProperty, FloatProperty, FloatVectorProperty, EnumProperty, PointerProperty)
+from bpy.types import (Panel, Operator, AddonPreferences, PropertyGroup)
 
 # Define Panel classes for updating
 panels = (
@@ -50,7 +39,7 @@ class OBJECT_OT_NeltulzEdgeCurvePlus_Preferences(AddonPreferences):
     category: StringProperty(
             name="Tab Category",
             description="Choose a name for the category of the panel",
-            default="Edge Curve+",
+            default="Neltulz",
             update=update_panel
             )
 
diff --git a/keymaps.py b/keymaps.py
index 4862caf..64eda73 100644
--- a/keymaps.py
+++ b/keymaps.py
@@ -11,24 +11,13 @@ def neltulz_edge_curve_plus_register_keymaps(addon_keymaps):
 
     def createEdgeCurvePlusKeymap():
         #create shortcuts for keymap
-        kmi = km.keymap_items.new("object.neltulz_edge_curve_plus", type = "E", ctrl=False, shift=True, alt=True, value = "PRESS")
+        kmi = km.keymap_items.new("ntz_edg_curv.insertedges", type = "E", ctrl=False, shift=True, alt=True, value = "PRESS")
         kmi.properties.numSegments = 1
         kmi.properties.useEdgeFlow = True
         kmi.properties.tension = 180
-        kmi.properties.numIterations = 1
+        kmi.properties.numIterations = 4
         kmi.properties.minAngle = 0
 
-    #------------------------------Object Mode----------------------------------------------------------------------------
-
-    #create new keymap
-    km = wm.keyconfigs.addon.keymaps.new(name="Object Mode", space_type="EMPTY")
-
-    createEdgeCurvePlusKeymap()
-
-
-    #add list of keymaps
-    addon_keymaps.append(km)
-
     #------------------------------Mesh Mode----------------------------------------------------------------------------
 
     #create new keymap
diff --git a/main_ot.py b/main_ot.py
index f39decc..b67f8a8 100644
--- a/main_ot.py
+++ b/main_ot.py
@@ -2,19 +2,8 @@
 from . properties import NeltulzEdgeCurvePlus_IgnitProperties
 from . import misc_functions
 
-from bpy.props import (StringProperty,
-                       BoolProperty,
-                       IntProperty,
-                       FloatProperty,
-                       FloatVectorProperty,
-                       EnumProperty,
-                       PointerProperty,
-                       )
-from bpy.types import (Panel,
-                       Operator,
-                       AddonPreferences,
-                       PropertyGroup,
-                       )
+from bpy.props import (StringProperty, BoolProperty, IntProperty, FloatProperty, FloatVectorProperty, EnumProperty, PointerProperty)
+from bpy.types import (Panel, Operator, AddonPreferences, PropertyGroup)
 
 # -----------------------------------------------------------------------------
 #    Main Addon Operator
@@ -22,10 +11,10 @@
 
 class OBJECT_OT_NeltulzEdgeCurvePlus(bpy.types.Operator):
     """Tooltip"""
-    bl_idname = "object.neltulz_edge_curve_plus"
+    bl_idname = "ntz_edg_curv.insertedges"
     bl_label = "Neltulz - Edge Curve Plus"
     bl_description = "Allows you to quick insert edges with flow"
-    bl_options = {'REGISTER', 'UNDO'}
+    bl_options = {'REGISTER', 'UNDO', 'PRESET'}
 
     numSegments : IntProperty(
         name="Segment Number",
@@ -41,7 +30,6 @@ class OBJECT_OT_NeltulzEdgeCurvePlus(bpy.types.Operator):
         default = True
     )
 
-
     tension : IntProperty(
         name="Tension",
         description="Tension (Default: 180)",
diff --git a/misc_layout.py b/misc_layout.py
new file mode 100644
index 0000000..7a0769d
--- /dev/null
+++ b/misc_layout.py
@@ -0,0 +1,68 @@
+import bpy
+
+#Show hide section with arrow, optional checkbox, and text
+def createShowHide(self, context, scene, properties, showHideBool, optionalCheckboxBool, text, layout):
+
+    if scene is not None:
+        data = eval( f"scene.{properties}" )
+        boolThing = eval( f"scene.{properties}.{showHideBool}" )
+    else:
+        data = self
+        boolThing = eval( f"self.{showHideBool}")
+
+    if boolThing:
+        showHideIcon = "TRIA_DOWN"
+    else:
+        showHideIcon = "TRIA_RIGHT"
+
+    row = layout.row(align=True)
+
+    downArrow = row.column(align=True)
+    downArrow.alignment = "LEFT"
+    downArrow.prop(data, showHideBool, text="", icon=showHideIcon, emboss=False )
+
+    if optionalCheckboxBool is not None:
+        checkbox = row.column(align=True)
+        checkbox.alignment = "LEFT"
+        checkbox.prop(data, optionalCheckboxBool, text="" )
+
+    textRow = row.column(align=True)
+    textRow.alignment = "LEFT"
+    textRow.prop(data, showHideBool, text=text, emboss=False )
+
+    emptySpace = row.column(align=True)
+    emptySpace.alignment = "EXPAND"
+    emptySpace.prop(data, showHideBool, text=" ", emboss=False)
+
+def createPropWithHideButton(self, context, scene, properties, propName, propNameVisibilityBool, customPropText, layout):
+
+    propRow = layout.row(align=True)
+    propVisible = eval(f"scene.{properties}.{propNameVisibilityBool}")
+
+    if propVisible:
+         propXButtonIcon = "X"
+         propEditButtonIcon = "BLANK1"
+         propEnabled = True
+
+    else:
+        propXButtonIcon = "BLANK1"
+        propEditButtonIcon = "GREASEPENCIL"
+        propEnabled = False
+
+    data                    = eval( f"scene.{properties}" )
+
+    propEditButton          = propRow.column(align=True)
+    propEditButton.prop     ( data, propNameVisibilityBool, text="", icon=propEditButtonIcon, emboss=False )
+    propEditButton.enabled  = not(propEnabled)
+    propEditButton.active   = False
+
+    propRow.separator()
+
+    propCol                 = propRow.column(align=True)
+    propCol.prop            ( data, propName, text=customPropText)
+    propCol.enabled         = propEnabled
+    propRow.separator()
+    
+    propXButton             = propRow.column(align=True)
+    propXButton.prop        ( data, propNameVisibilityBool, text="", icon=propXButtonIcon,    emboss=False )
+    propXButton.enabled     = propEnabled
\ No newline at end of file
diff --git a/misc_ot.py b/misc_ot.py
index de88b6e..f3ebc8b 100644
--- a/misc_ot.py
+++ b/misc_ot.py
@@ -2,21 +2,8 @@
 from . properties import NeltulzEdgeCurvePlus_IgnitProperties
 from . import misc_functions
 
-from bpy.props import (StringProperty,
-                       BoolProperty,
-                       IntProperty,
-                       FloatProperty,
-                       FloatVectorProperty,
-                       EnumProperty,
-                       PointerProperty,
-                       )
-from bpy.types import (Panel,
-                       Operator,
-                       AddonPreferences,
-                       PropertyGroup,
-                       )
-
-
+from bpy.props import (StringProperty, BoolProperty, IntProperty, FloatProperty, FloatVectorProperty, EnumProperty, PointerProperty)
+from bpy.types import (Panel, Operator, AddonPreferences, PropertyGroup)
 
 # -----------------------------------------------------------------------------
 #   Reset All Settings
@@ -24,8 +11,8 @@
 
 class OBJECT_OT_NeltulzEdgeCurvePlus_ResetAllSettings(bpy.types.Operator):
     """Tooltip"""
-    bl_idname = "object.neltulz_edge_curve_plus_reset_all"
-    bl_label = "Neltulz - Edge Curve Plus - Reset All Settings"
+    bl_idname = "ntz_edg_curv.resetallsettings"
+    bl_label = "Neltulz - Edge Curve Plus : Reset All Settings"
     bl_description = "Resets all settings"
 
     @classmethod
@@ -36,12 +23,21 @@ def execute(self, context):
 
         scene = context.scene
 
-        scene.neltulzEdgeCurvePlus.numSegmentsSlider = 1
-        scene.neltulzEdgeCurvePlus.useEdgeFlowCheckbox = True
-        scene.neltulzEdgeCurvePlus.tensionSlider = 180
-        scene.neltulzEdgeCurvePlus.numIterationsSlider = 1
-        scene.neltulzEdgeCurvePlus.minAngleSlider = 0
+        scene.neltulzEdgeCurvePlus.numSegmentsSlider_Enable     = True
+        scene.neltulzEdgeCurvePlus.numSegmentsSlider            = 1
+
+        scene.neltulzEdgeCurvePlus.useEdgeFlowCheckbox_Enable   = True
+        scene.neltulzEdgeCurvePlus.useEdgeFlowCheckbox          = True
+        
+        scene.neltulzEdgeCurvePlus.tensionSlider_Enable         = True
+        scene.neltulzEdgeCurvePlus.tensionSlider                = 180
+        
+        scene.neltulzEdgeCurvePlus.numIterationsSlider_Enable   = True
+        scene.neltulzEdgeCurvePlus.numIterationsSlider          = 4
+        
+        scene.neltulzEdgeCurvePlus.minAngleSlider_Enable        = True
+        scene.neltulzEdgeCurvePlus.minAngleSlider               = 0
 
         return {'FINISHED'}
     # END execute()
-# END Operator()
+# END Operator()
\ No newline at end of file
diff --git a/panels.py b/panels.py
index 3166773..b0f7f31 100644
--- a/panels.py
+++ b/panels.py
@@ -1,20 +1,10 @@
 import bpy
 from . properties import NeltulzEdgeCurvePlus_IgnitProperties
 from . import misc_functions
+from . import misc_layout
 
-from bpy.props import (StringProperty,
-                       BoolProperty,
-                       IntProperty,
-                       FloatProperty,
-                       FloatVectorProperty,
-                       EnumProperty,
-                       PointerProperty,
-                       )
-from bpy.types import (Panel,
-                       Operator,
-                       AddonPreferences,
-                       PropertyGroup,
-                       )
+from bpy.props import (StringProperty, BoolProperty, IntProperty, FloatProperty, FloatVectorProperty, EnumProperty, PointerProperty)
+from bpy.types import (Panel, Operator, AddonPreferences, PropertyGroup)
 
 # -----------------------------------------------------------------------------
 #   Panel
@@ -22,9 +12,9 @@
 
 class OBJECT_PT_NeltulzEdgeCurvePlus(Panel):
 
-    bl_idname = "object.neltulz_edge_curve_plus_panel"
-    bl_label = "Edge Curve Plus v1.0.4"
-    bl_category = "Edge Curve+"
+    bl_idname = "ntz_edg_curv.panel"
+    bl_label = "Edge Curve Plus v1.0.5"
+    bl_category = "Neltulz"
     bl_space_type = "VIEW_3D"
     bl_region_type = "UI"
 
@@ -34,32 +24,48 @@ def draw(self, context):
         scene = context.scene
         obj = context.object
 
-        col = layout.column(align=True)
+        insertEdgesRow = layout.row(align=True)
+        insertEdgesRow.scale_y = 1.5
+        
+        op = insertEdgesRow.operator('ntz_edg_curv.insertedges', text="Insert Edge(s)", icon="OUTLINER_OB_CURVE")
+        
+        if scene.neltulzEdgeCurvePlus.numSegmentsSlider_Enable:      op.numSegments          = scene.neltulzEdgeCurvePlus.numSegmentsSlider
+        if scene.neltulzEdgeCurvePlus.useEdgeFlowCheckbox_Enable:    op.useEdgeFlow          = scene.neltulzEdgeCurvePlus.useEdgeFlowCheckbox
+        if scene.neltulzEdgeCurvePlus.tensionSlider_Enable:          op.tension              = scene.neltulzEdgeCurvePlus.tensionSlider
+        if scene.neltulzEdgeCurvePlus.numIterationsSlider_Enable:    op.numIterations        = scene.neltulzEdgeCurvePlus.numIterationsSlider
+        if scene.neltulzEdgeCurvePlus.minAngleSlider_Enable:         op.minAngle             = scene.neltulzEdgeCurvePlus.minAngleSlider
 
-        col.prop(context.scene.neltulzEdgeCurvePlus, "numSegmentsSlider", text="Number of segments" )
+        optionsSectionWrapper = layout.column(align=True)
 
-        col.separator()
+        #create show/hide toggle for options section
+        misc_layout.createShowHide(self, context, scene, "neltulzEdgeCurvePlus", "bShowOptions", None, "Options", optionsSectionWrapper)
 
-        col = layout.column(align=True)
+        if scene.neltulzEdgeCurvePlus.bShowOptions:
 
-        col.prop(context.scene.neltulzEdgeCurvePlus, "useEdgeFlowCheckbox", text="Use Edge Flow" )
+            optionsSectionRow = optionsSectionWrapper.row(align=True)
 
-        if scene.neltulzEdgeCurvePlus.useEdgeFlowCheckbox:
+            spacer = optionsSectionRow.column(align=True)
+            spacer.label(text="", icon="BLANK1")
 
-            col = layout.column(align=True)
+            optionsSection = optionsSectionRow.column(align=True)
 
-            col.prop(context.scene.neltulzEdgeCurvePlus, "tensionSlider", text="Tension" )
-            col.prop(context.scene.neltulzEdgeCurvePlus, "numIterationsSlider", text="Number of iterations" )
-            col.prop(context.scene.neltulzEdgeCurvePlus, "minAngleSlider", text="Min Angle" )
+            optionsSection.separator()
 
-        col = layout.column(align=True)
-        row = col.row(align=True)
+            misc_layout.createPropWithHideButton(self, context, scene, "neltulzEdgeCurvePlus", "numSegmentsSlider", "numSegmentsSlider_Enable", None, optionsSection)
+            optionsSection.separator()
 
-        op = row.operator('object.neltulz_edge_curve_plus', text="Insert Edge(s)")
-        op.numSegments = scene.neltulzEdgeCurvePlus.numSegmentsSlider
-        op.useEdgeFlow = scene.neltulzEdgeCurvePlus.useEdgeFlowCheckbox
-        op.tension = scene.neltulzEdgeCurvePlus.tensionSlider
-        op.numIterations = scene.neltulzEdgeCurvePlus.numIterationsSlider
-        op.minAngle = scene.neltulzEdgeCurvePlus.minAngleSlider
+            misc_layout.createPropWithHideButton(self, context, scene, "neltulzEdgeCurvePlus", "useEdgeFlowCheckbox", "useEdgeFlowCheckbox_Enable", None, optionsSection)
+            optionsSection.separator()
 
-        op = row.operator('object.neltulz_edge_curve_plus_reset_all', text="Reset All Settings")
+            if scene.neltulzEdgeCurvePlus.useEdgeFlowCheckbox:
+
+                edgeFlowProperties = optionsSection.column(align=True)
+
+                misc_layout.createPropWithHideButton(self, context, scene, "neltulzEdgeCurvePlus", "tensionSlider",       "tensionSlider_Enable",       None,      edgeFlowProperties)
+                misc_layout.createPropWithHideButton(self, context, scene, "neltulzEdgeCurvePlus", "numIterationsSlider", "numIterationsSlider_Enable", None,      edgeFlowProperties)
+                misc_layout.createPropWithHideButton(self, context, scene, "neltulzEdgeCurvePlus", "minAngleSlider",      "minAngleSlider_Enable",      None,      edgeFlowProperties)
+
+            optionsSection.separator()
+            
+            resetButton = optionsSection.column(align=True)
+            op = resetButton.operator('ntz_edg_curv.resetallsettings', text="Reset All Settings")
diff --git a/properties.py b/properties.py
index 09972c6..5b41c8d 100644
--- a/properties.py
+++ b/properties.py
@@ -1,24 +1,22 @@
 import bpy
 from . import misc_functions
 
-from bpy.props import (StringProperty,
-                       BoolProperty,
-                       IntProperty,
-                       FloatProperty,
-                       FloatVectorProperty,
-                       EnumProperty,
-                       PointerProperty,
-                       )
-from bpy.types import (Panel,
-                       Operator,
-                       AddonPreferences,
-                       PropertyGroup,
-                       )
-
+from bpy.props import (StringProperty, BoolProperty, IntProperty, FloatProperty, FloatVectorProperty, EnumProperty, PointerProperty)
+from bpy.types import (Panel, Operator, AddonPreferences, PropertyGroup)
 
+class NeltulzEdgeCurvePlus_IgnitProperties(bpy.types.PropertyGroup):
 
+    bShowOptions : BoolProperty (
+        name="Show Options",
+        description="Reveals options.",
+        default = False,
+    )
 
-class NeltulzEdgeCurvePlus_IgnitProperties(bpy.types.PropertyGroup):
+    useEdgeFlowCheckbox_Enable : BoolProperty(
+        name="Enable Use Edge Flow",
+        description='Enables the "Use Edge Flow Checkbox" (Default: True)',
+        default = True
+    )
 
     useEdgeFlowCheckbox : BoolProperty(
         name="Use Edge Flow",
@@ -26,22 +24,40 @@ class NeltulzEdgeCurvePlus_IgnitProperties(bpy.types.PropertyGroup):
         default = True
     )
 
+    numSegmentsSlider_Enable : BoolProperty (
+        name="Enable Num Segments Slider",
+        description="Enables the Num Segments Slider (Default: True)",
+        default = True
+    )
+
     numSegmentsSlider : IntProperty(
-        name="Segment Number",
+        name="Segment Num",
         description="Number of segments to add. (Default: 1)",
         default = 1,
         min = 1,
         soft_max = 16
     )
 
+    numIterationsSlider_Enable : BoolProperty (
+        name="Enable numIterationsSlider",
+        description="Enables the numIterationsSlider (Default: True)",
+        default = True
+    )
+
     numIterationsSlider : IntProperty(
-        name="Number of Iterations",
+        name="Num Iterations",
         description="Number of iterations. (Default: 1)",
-        default = 1,
+        default = 4,
         min = 1,
         soft_max = 128
     )
 
+    tensionSlider_Enable : BoolProperty (
+        name="Enable Tension",
+        description="Enables the Tension slider",
+        default = True
+    )
+
     tensionSlider : IntProperty(
         name="Tension",
         description="Tension (Default: 180)",
@@ -50,10 +66,16 @@ class NeltulzEdgeCurvePlus_IgnitProperties(bpy.types.PropertyGroup):
         min = -500
     )
 
+    minAngleSlider_Enable : BoolProperty (
+        name="Enable minAngleSlider",
+        description="Enables the minAngleSlider",
+        default = True
+    )
+
     minAngleSlider : IntProperty(
         name="Minimum Angle",
         description="Minimum Angle (Default: 0)",
         default = 0,
         max = 180,
         min = 0
-    )
+    )
\ No newline at end of file