From 0f4e4730e26f89044a1809d191768ed34a9acb90 Mon Sep 17 00:00:00 2001
From: tim <59872808+trhyder@users.noreply.github.com>
Date: Mon, 7 Oct 2024 21:24:56 -0400
Subject: [PATCH] Progress on Selected Type Preview (#5535)

* Remove length from wall tool

No longer relevant with the new draw method

* Selected Type Preview and Launch Type Manager

Redesign of thumbnail preview

* Update to Type Manager

Moved Create new type to end of paginated loop
Added Predefined type label under thumbnail

* No Types Found

Modified to match Types Manager tiles
Quick Default icon added

* No Types Found

Modified to match Types Manager tiles
Quick Default icon added

* Description in thumbnail linked to value

---------

Co-authored-by: tim <tjrhyder@gmail.com>
---
 .../bim/data/icons/dm_quick_default.png       | Bin 0 -> 1196 bytes
 .../bim/data/icons/lm_quick_default.png       | Bin 0 -> 1211 bytes
 src/bonsai/bonsai/bim/module/model/ui.py      |  30 ++--
 .../bonsai/bim/module/model/workspace.py      | 141 +++++++++++++-----
 src/bonsai/scripts/bonsai_icons.svg           | 109 +++++++++++++-
 5 files changed, 227 insertions(+), 53 deletions(-)
 create mode 100644 src/bonsai/bonsai/bim/data/icons/dm_quick_default.png
 create mode 100644 src/bonsai/bonsai/bim/data/icons/lm_quick_default.png

diff --git a/src/bonsai/bonsai/bim/data/icons/dm_quick_default.png b/src/bonsai/bonsai/bim/data/icons/dm_quick_default.png
new file mode 100644
index 0000000000000000000000000000000000000000..763b103a4c07fd2e7421893d0a321d85d1a7d064
GIT binary patch
literal 1196
zcmV;d1XKHoP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000id
z000id0mpBsWB>pF8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H11UX4W
zK~z|UwU=FNR7DiWe`oJ*DN2EABx<Tg16Awprl5ubF@C;iG#Zi;KY~PSf@uWnlcn3T
zsol1U4GK+A3_(qcL<uAsOpFPML`?Jnio3Nbjgevt)sk8Zt!;Pj-s8hvO1s^Uy9Lg}
zO=jkQ&iw9~$;=s1Rh*iHx2{CutspCaZlE3Y>{Wko&~cFDm`(wtv-UQWPGDiu&@iw`
zeW87G0dP51TJmO!$pH$1c8S#Olj9pb*ABpi1;l{}N*hWW@I5eO3-m?uZaN@c^?BC@
z!0WC?C<EF75b{AfP<b8UWuOOm7BjXd7XU|lK*BW-foms1X-a`|1~ddxhERb@mHHcY
zTs?qD?K$9<?BR4b$Oy0*p;*14zHA=OmOwe~NQZ1hM1W(!R!1I=GVuH6dHh$f9+CSH
z83XM{<xe0AS_pVSp9Fc(cAyF64Ghyq$$Nc7suweqe^DO^nkfM!vZYXc&BM<AG6U#u
zfk&}qKd=NCMVLg%2Nu|EIfQ8jwY0f+%7^fld%(3_eW9mP20gIOz*}5|Nh#n1P7^f`
z>;3PJq||o?)}iuc2F^jS9#&sdcLE^r8SoNVPpGfyD1e-LyMReg1wuKn9GIUJWE|mB
zENM}H!|53S9rd^3j-AZ_0MN&Lk5`ulF9_kl-`FXe1Px-u_Y-%23wW~x0f?f~N-WlJ
zDI?NZcQ2}44tzgUU+66%9GC#+O&f>-xgM#1A=DG|e1kjI1Z;5NGl9n{62gHK*lBiR
zW5D$}!lgHrDi_FZ#}2|cXe;pVRRIuv&S2ML9Sm9pzzV>f#pODXQXmMdV&>A##THE+
zL~^oj8HV;abR0so8I_hR1Q@w|6pxSf=iqoFxcu1H@!U=HizxtIwS622J9bum0nxTB
zsyMUui}s^>2+^n2+gO>j=CTX)V}}SHkQ;ytq^^`e^b_?qRsu*@{Q@lsjwVZH-iF<$
z_5fcy1OST%fD>s(W0=;qON~^M&jQf$ui`|{m!kyiA|sp0T^Rt{re8W~BV@Xc<=2{G
zT*exd3PjhWkPM(~L-=53x1Ph)QeED3{)zymM2HZnsRel_X=oUz2Bsfoy{JB;{>IL%
zfyr?2NVs+bXc6wb9mE1981f6Mdx2M{$zmW13iju7qGnaPt2*U8sWKqF_4!<kjRMBB
z?h#a0B6<?YPxSSGw1BQf<s)3U!MYP%Q7q2D#1ZwsKbAWHB18hmfYnJubtuIM>l5uG
z5HClJ5Xvjet{eVAs8nw#ZGn<@4<w3`O$d(zi?Gvu6tR9p<#0mw19r81cZQ#wAZp&6
zwt~v#aSDk7b$sCf_LD5x;vi>1mvDKR2GGf6>6XIz%P3*Gbmt_(!KCh=5uV5JELLB`
z9SnI2z*>#SYZzu(rhSle1^}e1`gY>RPauDw(yac5?{W^3u>S!&KBuTnH0sF!0000<
KMNUMnLSTXsT@{7^

literal 0
HcmV?d00001

diff --git a/src/bonsai/bonsai/bim/data/icons/lm_quick_default.png b/src/bonsai/bonsai/bim/data/icons/lm_quick_default.png
new file mode 100644
index 0000000000000000000000000000000000000000..e9cc93d1519892886aba3a46e95a0236b48f35c0
GIT binary patch
literal 1211
zcmV;s1VsCZP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000id
z000id0mpBsWB>pF8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H11V~9l
zK~z|UwU>WLoOKw$KhO8x^Q`Hd3r2)%6m9gwg-J2nhzR<lq9_K+{Bb(Hv6Zx1{|)*f
z)!0I$+Jsq7J-gG5DGiE(2v!7()*ow8BZhypnYxv+nNHF3?%t<AUQ_S9JKx*d1NX=K
zeSUr3=lkCGdA_2mxD^T3ZbG#cC`I%<N)KMsrT);U>mbQ7-2zCkaxH3|16C#~7(>~u
z4dLGF0WhvD)%)s_<N!(`&?CXxUTNRuy?Fqr4a9+8LBr0EuYoI$TC4C(^-F(6&dmWB
zx@Rv)86rIZh~y%iMf62fYJmYnp66OlM>YViz5(g>KSrEG2qkGu1`+n5lmP*hJsJof
zbOYe70yf7pBnMcBas(lUYBR!n60BVN{{bLpT$w4m5E0N**w$OFBD>mx)>nMwjrmb|
z0A&hc7{ec^%wlUHP>kr)z$0@m`+=8<nT_lW4bfJ$iqT8gwCUSeN&soAF4UKL$6UQ-
zCeW_xC%_y7)&P@01jq&Q=AKVrtR~$ayg2Veu<~AP&->aCekNtm{t6Eh-XaVo*q)7u
zULY3vLU;C!r-txX0LL?Mj$-1E>-MAP9e}QyZj@?7p49r#cTSK%K12c_<-kM0ElEM9
zfgrZD=#J2ZM1aaWz#7Q_0LTzNyI8AxCWOwKzi>(xL1`jxj$zqf0>znw05A*EN^Iuc
z|0*IKwfAB4x8+^sLv0AXCUn-!0KP?<D3I-u`X|WS5d9pn_M_Cf@R`9fMFvQw&6Ip9
z&HC-2ZD5VKOb(Ds)UGioAG>q_m<DMD{>j28y%=8bP`dRj1y}QdQovfq<yN2sXaXK3
zaqF@dp<w<XlJ4sD*k-_`>lM%gAT2ip0OJcs@rvkh7LK=pJc!eduV0j-^8i}jHx2xf
zg?lBU;bm;%Ed5@F5j}zOtOml3iF>XbM)=4jfEUba&<RpaN>03X4TKv3<ZwlvHug;>
zn<RF_m5~lqKXVBHYCnwdQyOg)kJUVHnj-lU04?u}6JJpdybcU5Pat=rX#hmRi<?f`
z2$|Zk9I4xYWp6<V09#U+Tn23h`5<Zi65=h<`mVok2w>g_5xQ#L0NzPbjDhS$b<ts_
z7g6(^214hS4NQiEM>=cjFcdL8dk|mM{fPdEm@ZTs7IF~<TS1&B^b=yUd(yS)lzCEB
zK)UO5v15~fXVLOFunG7XXUG5;0Br%;3bbL1g|Y9#>5_wZ<)r#U>H0?o0H@@qfXxXC
zl{XQ41Bica<s=ci9G}?-)U#x6kgJH@sP#Q*2b7dUsiF!wPvQI<zCq*+!fA}=p|TK6
z@Zd8)0F6tN1L$g0x~09MARU0~yWzZpGoW6cyOJeK9AN}y4GY_J8LzBQw-s4j%^cC)
zha%W~nn=ZIM7J>$S*7*ibqo#XgV_wSgP1AH^c`ef0RU;QyA#X)9{3&QfCj=}WgTQr
Z{smWbraI#FT$lg=002ovPDHLkV1lCYEV%#x

literal 0
HcmV?d00001

diff --git a/src/bonsai/bonsai/bim/module/model/ui.py b/src/bonsai/bonsai/bim/module/model/ui.py
index 12e88a46fd..1a9ef5a4c9 100644
--- a/src/bonsai/bonsai/bim/module/model/ui.py
+++ b/src/bonsai/bonsai/bim/module/model/ui.py
@@ -107,20 +107,23 @@ class LaunchTypeManager(bpy.types.Operator):
 
     def draw(self, context):
         props = context.scene.BIMModelProperties
-
         row = self.layout.row(align=True)
-        prop_with_search(row, props, "ifc_class", text="", should_click_ok_to_validate=True)
-        row.operator("bim.launch_add_element", icon="ADD", text="")
+        if AuthoringData.data['total_types'] > 1:
+            text = f"{AuthoringData.data['total_types']} {AuthoringData.data['ifc_element_type']}s"
+        else:
+            text = f"{AuthoringData.data['total_types']} {AuthoringData.data['ifc_element_type']}"
+        row.label(text=text, icon="FILE_VOLUME")
+        # prop_with_search(row, props, "ifc_class", text="", should_click_ok_to_validate=True)
         row.menu("BIM_MT_type_manager_menu", text="", icon="PREFERENCES")
+        row = self.layout.row(align=True)
+        row.operator("bim.launch_add_element", text=f"Create New {AuthoringData.data['ifc_element_type']}", icon="ADD")
 
         columns = self.layout.column_flow(columns=3)
-        row = columns.row()
-        row.alignment = "LEFT"
-        row.label(text=f"{AuthoringData.data['total_types']} Types", icon="FILE_VOLUME")
-
         row = columns.row(align=True)
         row.alignment = "CENTER"
-        # In case you want something here in the future
+        ### In case you want something here in the future
+
+        ###
 
         row = columns.row(align=True)
         row.alignment = "RIGHT"
@@ -140,10 +143,10 @@ class LaunchTypeManager(bpy.types.Operator):
             box = outer_col.box()
 
             row = box.row(align=True)
-            op = row.operator("bim.set_active_type", text=relating_type["name"], icon="FILE_3D")
+            op = row.operator("bim.set_active_type", text=relating_type["name"], icon="BLANK1", emboss=False)
             op.relating_type = relating_type["id"]
 
-            op = row.operator("bim.launch_type_menu", icon="DOWNARROW_HLT", text="")
+            op = row.operator("bim.launch_type_menu", icon="DOWNARROW_HLT", text="", emboss=False)
             op.relating_type_id = relating_type["id"]
 
             row = box.row()
@@ -163,8 +166,13 @@ class LaunchTypeManager(bpy.types.Operator):
                 row2.operator("bim.set_active_type", text="", emboss=False).relating_type = relating_type["id"]
             else:
                 row = box.row()
-                op = box.operator("bim.load_type_thumbnails", text="Load Thumbnails", icon="FILE_REFRESH")
+                op = box.operator("bim.load_type_thumbnails", text="", icon="FILE_REFRESH", emboss=False)
                 op.ifc_class = props.ifc_class
+            
+            row = box.row()
+            row.alignment = "CENTER"
+            op = row.operator("bim.set_active_type", text=relating_type["predefined_type"], emboss=False)
+            op.relating_type = relating_type["id"]
 
 
 class BIM_PT_authoring(Panel):
diff --git a/src/bonsai/bonsai/bim/module/model/workspace.py b/src/bonsai/bonsai/bim/module/model/workspace.py
index 1997df2849..34a48b00c3 100644
--- a/src/bonsai/bonsai/bim/module/model/workspace.py
+++ b/src/bonsai/bonsai/bim/module/model/workspace.py
@@ -339,9 +339,9 @@ class CreateObjectUI:
             cls.layout.label(text=tool_name, icon="TOOL_SETTINGS")
 
         if AuthoringData.data["ifc_classes"] and AuthoringData.data["relating_type_id"]:
-            cls.draw_add_object(context)
-            cls.draw_thumbnail() if context.region.type != "TOOL_HEADER" else cls
+            cls.draw_thumbnail(context) 
             cls.draw_add_object_parameters(context)
+            cls.draw_add_object(context)
         else:
             cls.draw_type_manager_launcher(context)
 
@@ -355,42 +355,60 @@ class CreateObjectUI:
 
     @classmethod
     def draw_type_manager_launcher(cls, context):
+        ui_context = context.region.type
         row = cls.layout.row(align=True)
-        row.label(text="No Element Types Found", icon="ERROR")
-        row = cls.layout.row(align=True)
-        row.operator("bim.add_element", icon_value=bonsai.bim.icons["IFC"].icon_id, text="Add New Type")
-        if AuthoringData.data["ifc_element_type"]:
-            row = cls.layout.row(align=True)
-            op = row.operator(
-                "bim.add_default_type",
-                icon_value=custom_icon_previews["ADD_TYPE"].icon_id,
-                text=f"Quick Create Default {AuthoringData.data['ifc_element_type']}",
+        box = cls.layout.box()
+        row1 = box.row(align=True)
+        row1.operator(
+            "bim.launch_type_manager",
+            icon="ERROR",
+            text=f"No {AuthoringData.data['ifc_element_type']}s Found",
+            emboss=False,
+        )
+        row1.operator(
+                "bim.launch_type_manager",
+                icon=tool.Blender.TYPE_MANAGER_ICON, #"DOWNARROW_HLT", 
+                text="",
+                emboss=False,
             )
-            op.ifc_element_type = AuthoringData.data["ifc_element_type"]
+
+        if ui_context != "TOOL_HEADER":
+
+            row = box.row(align=True)
+            row.alignment = "CENTER"
+            row.template_icon(icon_value=0, scale=3.3)
+
+            row = box.row(align=True)
+            row.alignment = "CENTER"
+            row.operator(
+                "bim.launch_add_element",
+                text=f"Create New {AuthoringData.data['ifc_element_type']}",
+                )
+
+            row = box.row(align=True)
+
+            if not AuthoringData.data["ifc_element_type"]:
+                row = box.row(align=True)
+                row.alignment = "CENTER"
+                row.template_icon(icon_value=0, scale=1)
+
+            row = box.row(align=True)
+            row.alignment = "CENTER"
+            row.template_icon(icon_value=0, scale=3.5)
+        elif AuthoringData.data["ifc_element_type"]:
+                row = cls.layout.row(align=True)
+                op = row.operator(
+                    "bim.add_default_type",
+                    icon_value=custom_icon_previews["QUICK_DEFAULT"].icon_id,
+                    text=f"Quick Create {AuthoringData.data['ifc_element_type']}",
+                    )
+                op.ifc_element_type = AuthoringData.data["ifc_element_type"]
 
     @classmethod
     def draw_add_object(cls, context):
         ui_context = str(context.region.type)
-        if not AuthoringData.data["ifc_element_type"]:
-            row = cls.layout.row(align=True)
-            prop_with_search(row, cls.props, "ifc_class", text="Type Class" if ui_context != "TOOL_HEADER" else "")
+        row = cls.layout.row(align=True)
         if AuthoringData.data["relating_type_id"]:
-            row = cls.layout.row(align=True)
-            box = row.box()
-            # This trick creates a fake dropdown
-            row2 = box.row(align=True)
-            row2.operator(
-                "bim.launch_type_manager",
-                icon="FILE_3D",
-                text=AuthoringData.data["relating_type_name"],
-                emboss=False,
-            )
-            row2.operator(
-                "bim.launch_type_manager",
-                icon="DOWNARROW_HLT",
-                text="",
-                emboss=False,
-            )
             row = cls.layout.row(align=True) if ui_context != "TOOL_HEADER" else row
             op = row.operator("bim.hotkey", text="Add", icon_value=custom_icon_previews["ADD"].icon_id)
             op.hotkey = "S_A"
@@ -409,8 +427,6 @@ class CreateObjectUI:
             row = cls.layout.row(align=True) if ui_context != "TOOL_HEADER" else row
             row.prop(data=cls.props, property="extrusion_depth", text="Height" if ui_context != "TOOL_HEADER" else "H")
             row = cls.layout.row(align=True) if ui_context != "TOOL_HEADER" else row
-            row.prop(data=cls.props, property="length", text="Length" if ui_context != "TOOL_HEADER" else "L")
-            row = cls.layout.row(align=True) if ui_context != "TOOL_HEADER" else row
             row.prop(data=cls.props, property="x_angle", text="Slope") if ui_context != "TOOL_HEADER" else "A"
 
         elif cls.props.ifc_class in ("IfcSlabType", "IfcRampType", "IfcRoofType"):
@@ -452,15 +468,64 @@ class CreateObjectUI:
             row.prop(data=cls.props, property="rl_mode", text="RL Mode" if ui_context != "TOOL_HEADER" else "RL")
 
     @classmethod
-    def draw_thumbnail(cls):
+    def draw_thumbnail(cls, context):
+        ui_context = context.region.type
+        row = cls.layout.row(align=True)
+        if not AuthoringData.data["ifc_element_type"]:
+            prop_with_search(row, cls.props, "ifc_class", text="Type Class" if ui_context != "TOOL_HEADER" else "")
         if AuthoringData.data["ifc_classes"]:
             if cls.props.ifc_class:
                 box = cls.layout.box()
-                if AuthoringData.data["type_thumbnail"]:
-                    box.template_icon(icon_value=AuthoringData.data["type_thumbnail"], scale=5)
+                # This trick creates a fake dropdown
+                row1 = box.row(align=True)
+                if AuthoringData.data["type_thumbnail"] and ui_context == "TOOL_HEADER":
+                    row1.ui_units_y = 0.01
+                    row1.template_icon(icon_value=AuthoringData.data["type_thumbnail"], scale=1)
+                    row2 = box.column(align=True)
+                    row2.operator("bim.launch_type_manager", text="", emboss=False)
+                    row1.operator("bim.launch_type_manager", text=AuthoringData.data["relating_type_name"], emboss=False)
                 else:
-                    op = box.operator("bim.load_type_thumbnails", text="Load Thumbnails", icon="FILE_REFRESH")
-                    op.ifc_class = cls.props.ifc_class
+                    row1.operator(
+                        "bim.launch_type_manager",
+                        icon="BLANK1",
+                        text=AuthoringData.data["relating_type_name"],
+                        emboss=False,
+                    )
+
+                row1.operator(
+                    "bim.launch_type_manager",
+                    icon=tool.Blender.TYPE_MANAGER_ICON, #"DOWNARROW_HLT", 
+                    text="",
+                    emboss=False,
+                )
+
+                if ui_context != "TOOL_HEADER":
+                    row = box.row(align=True)
+                    row.alignment = "CENTER"
+                    row.operator("bim.launch_type_manager", text=AuthoringData.data["relating_type_description"], emboss=False,)
+
+                    if AuthoringData.data["type_thumbnail"]:
+                        row1 = box.row()
+                        row1.ui_units_y = 0.01
+                        row1.template_icon(icon_value=AuthoringData.data["type_thumbnail"], scale=4)
+                        row2 = box.column(align=True)
+                        row2.ui_units_y = 4
+                        row2.operator("bim.launch_type_manager", text="", emboss=False)
+                    else:
+                        op = box.operator(
+                            "bim.load_type_thumbnails",
+                            text="", icon="FILE_REFRESH",
+                            emboss=False,
+                            )
+                        op.ifc_class = cls.props.ifc_class
+                    
+                    row = box.row(align=True)
+                    row.alignment = "CENTER"
+                    row.operator(
+                        "bim.launch_type_manager",
+                        text=AuthoringData.data["predefined_type"],
+                        emboss=False,
+                        )
 
 
 class EditObjectUI:
diff --git a/src/bonsai/scripts/bonsai_icons.svg b/src/bonsai/scripts/bonsai_icons.svg
index 89deb64240..035dfdea5d 100644
--- a/src/bonsai/scripts/bonsai_icons.svg
+++ b/src/bonsai/scripts/bonsai_icons.svg
@@ -28,15 +28,27 @@
      inkscape:deskcolor="#d1d1d1"
      inkscape:document-units="px"
      showgrid="true"
+<<<<<<< HEAD
      inkscape:zoom="22.627417"
-     inkscape:cx="14.097941"
-     inkscape:cy="9.7006212"
+     inkscape:cx="5.7894368"
+     inkscape:cy="9.7448153"
      inkscape:window-width="2326"
      inkscape:window-height="1555"
-     inkscape:window-x="592"
+     inkscape:window-x="1548"
+     inkscape:window-y="26"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="g1418"
+=======
+     inkscape:zoom="16"
+     inkscape:cx="18.4375"
+     inkscape:cy="13.21875"
+     inkscape:window-width="2328"
+     inkscape:window-height="1555"
+     inkscape:window-x="590"
      inkscape:window-y="25"
      inkscape:window-maximized="0"
-     inkscape:current-layer="g1622"
+     inkscape:current-layer="g776"
+>>>>>>> origin/Type-Manager-UI
      showguides="true"><inkscape:grid
        type="axonomgrid"
        id="grid5114"
@@ -377,6 +389,94 @@
        d="M 6.3376284,4.233333 6.7182939,5.7245206 8.1379048,6.1037675 6.6467171,6.4844329 6.2674703,7.9040438 5.8868048,6.4128561 4.4671939,6.0336093 5.9583816,5.6529438 Z"
        transform="matrix(0.5045571,0,0,0.5045571,4.360629,1.715138)" /></g><g
      inkscape:groupmode="layer"
+<<<<<<< HEAD
+     id="g1622"
+     inkscape:label="reset_vertex"
+     style="display:none;stroke-width:0.529167;stroke-dasharray:none"><g
+       id="g1635"
+       transform="matrix(-1,0,0,1,8.4666676,0)"
+       style="display:inline"><path
+         id="path1612"
+         style="color:#000000;fill:#00d27b;stroke-linejoin:round;stroke-miterlimit:0;-inkscape-stroke:none;paint-order:stroke fill markers"
+         d="m 4.2322998,0.79271647 c -1.8962705,0 -3.43958333,1.54331273 -3.43958333,3.43958333 0,1.8962705 1.54331283,3.4416504 3.43958333,3.4416504 0.5526674,0 1.0754694,-0.131382 1.5389242,-0.3643189 L 5.5185262,6.8032023 c -0.386732,0.1933362 -0.8233795,0.3023071 -1.2862264,0.3023071 -1.5901009,0 -2.8726929,-1.2831086 -2.8726929,-2.8732096 0,-1.5901011 1.282592,-2.8726929 2.8726929,-2.8726929 1.2342128,0 2.2829816,0.7728658 2.6907918,1.8624187 l 0.5963461,-0.00879 C 7.0835409,1.8128107 5.7739374,0.79271647 4.2322998,0.79271647 Z"
+         inkscape:label="circle-path" /><path
+         style="display:inline;fill:#000000;fill-opacity:0;stroke:#00d27b;stroke-width:0.440014;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
+         d="M 5.5116727,3.2431535 H 7.4529091 V 1.3019173"
+         id="path1614"
+         inkscape:label="Arrow_head 1" /><path
+         sodipodi:type="star"
+         style="fill:#ffffff;fill-opacity:1;stroke:#00d27b;stroke-width:0;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:0;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
+         id="path1616"
+         inkscape:flatsided="false"
+         sodipodi:sides="4"
+         sodipodi:cx="6.3025494"
+         sodipodi:cy="6.0686884"
+         sodipodi:r1="1.8356906"
+         sodipodi:r2="0.5397175"
+         sodipodi:arg1="-1.5516857"
+         sodipodi:arg2="-0.69148437"
+         inkscape:rounded="0"
+         inkscape:randomized="0"
+         d="M 6.3376284,4.233333 6.7182939,5.7245206 8.1379048,6.1037675 6.6467171,6.4844329 6.2674703,7.9040438 5.8868048,6.4128561 4.4671939,6.0336093 5.9583816,5.6529438 Z"
+         transform="matrix(0.72079571,0,0,0.72079571,0.11602734,-0.22857096)" /><path
+         sodipodi:type="star"
+         style="display:inline;fill:#ffffff;fill-opacity:1;stroke:#00d27b;stroke-width:0;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:0;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
+         id="path1618"
+         inkscape:flatsided="false"
+         sodipodi:sides="4"
+         sodipodi:cx="6.3025494"
+         sodipodi:cy="6.0686884"
+         sodipodi:r1="1.8356906"
+         sodipodi:r2="0.5397175"
+         sodipodi:arg1="-1.5516857"
+         sodipodi:arg2="-0.69148437"
+         inkscape:rounded="0"
+         inkscape:randomized="0"
+         d="M 6.3376284,4.233333 6.7182939,5.7245206 8.1379048,6.1037675 6.6467171,6.4844329 6.2674703,7.9040438 5.8868048,6.4128561 4.4671939,6.0336093 5.9583816,5.6529438 Z"
+         transform="matrix(1.009114,0,0,1.009114,-0.07417958,-0.06494846)" /><path
+         sodipodi:type="star"
+         style="display:inline;fill:#ffffff;fill-opacity:1;stroke:#00d27b;stroke-width:0;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:0;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
+         id="path1620"
+         inkscape:flatsided="false"
+         sodipodi:sides="4"
+         sodipodi:cx="6.3025494"
+         sodipodi:cy="6.0686884"
+         sodipodi:r1="1.8356906"
+         sodipodi:r2="0.5397175"
+         sodipodi:arg1="-1.5516857"
+         sodipodi:arg2="-0.69148437"
+         inkscape:rounded="0"
+         inkscape:randomized="0"
+         d="M 6.3376284,4.233333 6.7182939,5.7245206 8.1379048,6.1037675 6.6467171,6.4844329 6.2674703,7.9040438 5.8868048,6.4128561 4.4671939,6.0336093 5.9583816,5.6529438 Z"
+         transform="matrix(0.5045571,0,0,0.5045571,4.360629,1.715138)" /></g></g><g
+     id="g1418"
+     style="display:inline;stroke-width:0.529167;stroke-dasharray:none"
+     inkscape:label="quick_default"><path
+       style="display:inline;fill:#00d27b;fill-opacity:1;stroke-width:0.00695213;stroke-dasharray:none"
+       d="m 3.1326475,7.5887335 c 0,0 -0.069864,0.00256 -0.1265286,0.00933 -0.560101,0.06697 -0.9165797,0.030086 -1.1771341,-0.1309849 -0.1138471,-0.070378 -0.2057477,-0.1759621 -0.242721,-0.2788592 -0.031476,-0.0876 -0.0215,-0.2342448 0.021198,-0.311592 0.064856,-0.1174853 0.1545523,-0.1684811 0.2784956,-0.158335 0.093797,0.00768 0.1346531,0.025966 0.2339471,0.1047173 0.1398999,0.1109559 0.304856,0.087742 0.5574005,-0.066363 L 2.729776,6.7246287 C 2.7978,6.7592855 2.9809136,7.1288222 3.0244711,7.2148062"
+       id="path802-5"
+       sodipodi:nodetypes="cssssssscc"
+       inkscape:label="bunny_foot" /><path
+       style="display:inline;fill:#00d27b;fill-opacity:1;stroke-width:0.00713863;stroke-dasharray:none"
+       d="M 3.7657511,8.4297643 C 3.7116054,8.3959799 3.639953,8.3029436 3.589315,8.2006726 3.5464833,8.1141681 3.4602565,7.8699963 3.4153265,7.7079833 3.3958372,7.6377066 3.3753828,7.5728002 3.3698721,7.5637468 3.2679031,7.2569724 3.2730501,7.2367467 3.1028764,6.8739253 3.0169558,6.6867578 2.7884579,6.4409936 2.5900779,6.3223776 2.4200094,6.2206896 2.3137607,6.1876326 1.8602584,6.0953103 1.5756979,6.0373807 1.4332524,5.9716553 1.2516025,5.8144726 0.93792911,5.5430492 0.7593636,5.1255002 0.76524033,4.6771873 0.76748974,4.5055897 0.77015247,4.5112023 0.68846883,4.5153623 0.54997359,4.5224153 0.33770319,4.3887108 0.21937446,4.2198895 0.1143564,4.0700591 0.03002154,3.8507646 0.00776001,3.6696325 -0.00861391,3.5364051 -0.00140295,3.3045273 0.05196783,3.1481707 0.14188169,2.8847565 0.26067076,2.703958 0.34762411,2.6198678 c 0.0711318,-0.06879 0.0967494,-0.065239 0.0899667,0.012474 -0.00655,0.07505 0.012716,0.1827354 0.0471834,0.2637288 0.0418864,0.098427 0.11275735,0.2025886 0.2852565,0.3177419 0.0880593,0.058784 0.22622419,0.1326589 0.29440109,0.192594 0.068177,0.059935 0.1239679,0.071372 0.130826,0.067544 0.00686,-0.00384 0.027776,-0.049421 0.061543,-0.094523 C 1.55795,2.9772085 2.15965,2.9273539 2.6267516,2.8632421 2.791317,2.8406547 3.0415716,2.7349997 3.2237854,2.7870334 3.3575648,2.8252375 3.5345228,2.8835809 3.6069491,2.9133653 3.9145964,3.0329116 4.2267658,3.2125964 4.479627,3.3568455 4.484587,3.357269 4.555444,3.4001685 4.7305781,3.5087817 5.01765,3.6868112 5.103893,3.7161976 5.2436272,3.6835946 5.3754304,3.6528421 5.4708476,3.5359694 5.5130021,3.3781286 5.5448038,3.2590523 5.5392362,3.1286196 5.5365303,2.9793086 5.4785269,2.6472479 5.3088316,2.5166735 5.07167,2.3961151 4.9541465,2.328503 4.7375337,2.2622903 4.4897213,2.2182289 4.2863103,2.1820623 4.0981682,2.1762008 3.7961541,2.1966216 3.5646443,2.2122753 3.506174,2.2196346 3.2859759,2.2608351 3.1133192,2.2931402 2.8448975,2.2702109 2.721206,2.212591 2.4829053,2.101582 2.3487557,1.9026618 2.3885386,1.7193041 2.4204172,1.5723777 2.5228336,1.4741011 2.7439033,1.378304 3.1867553,1.186401 3.5604645,1.1167971 3.9609397,1.1516292 4.3297707,1.1837089 4.6272127,1.2955835 4.9684375,1.5305733 5.2364469,1.7151418 5.189201,1.7182135 5.6678629,2.2571296 5.8330708,2.443134 5.8951557,2.5021109 5.9189606,2.4956568 5.9626702,2.4838066 5.6649892,1.962614 5.4488878,1.7435707 5.0593348,1.3487143 4.6887702,1.1216057 4.2333333,0.99859124 4.1051245,0.96396184 3.7656766,0.93214564 3.6448068,0.94342924 3.4627266,0.96042684 3.2428812,1.0052086 3.1391322,1.0464333 2.9699007,1.1136778 2.8992086,1.1127668 2.8180196,1.0422956 2.7240054,0.96069194 2.7012471,0.81064604 2.7571721,0.64112717 2.7949861,0.52650653 2.8216586,0.47697936 2.9150986,0.34787795 3.0556285,0.15371456 3.2224465,0.04237523 3.422237,0.0093985 3.6601499,-0.02987062 4.009938,0.05570989 4.3343183,0.23255101 4.5384688,0.34848089 4.727556,0.4851588 4.9131776,0.62871187 5.2522677,0.91670634 5.523033,1.2412844 5.7564746,1.5622699 c 0.066829,0.1202577 0.1275513,0.2439746 0.1922175,0.3513884 0.082995,0.1462937 0.1509345,0.2888166 0.178044,0.3771976 0.031013,0.1011069 0.078317,0.1729888 0.2795959,0.1140254 0.3764411,-0.1102756 0.7517631,-0.040598 1.128726,0.2095465 0.5657988,0.4551401 0.7771865,1.1447578 0.9022632,1.6092677 0.028384,0.1517442 0.032543,0.2027182 0.027519,0.3373 C 8.4600602,4.6892652 8.4540532,4.7249137 8.4236872,4.805601 8.3572223,4.9821958 8.290569,4.9960493 8.1007332,5.0967543 7.9906727,5.1551397 7.9203023,5.1831283 7.8123753,5.2114453 7.6870229,5.244333 7.5433397,5.2711637 7.4177535,5.2851324 7.1027263,5.3201755 6.9676036,5.3085125 6.4555353,5.2750765 l -0.1394664,-0.0091 -0.052426,0.1110198 C 6.0697447,5.7876011 5.9344168,6.1698777 5.5869353,6.4802442 5.4150887,6.6337356 5.0497171,6.8540484 4.8614477,6.9626238 c -0.140777,0.081186 -0.4386288,0.2175095 -0.469479,0.2148745 -0.007,-5.974e-4 -0.00633,-0.108525 0.00155,-0.2515324 C 4.4070787,6.6798391 4.4069717,6.5969785 4.3927505,6.3268666 4.3856643,6.1922762 4.3834037,6.1681684 4.3599139,5.9766935 4.306379,5.5403093 4.1951436,5.1300007 3.9853712,4.7843274 3.7264962,4.3577401 3.3900226,4.0547693 3.1386667,3.9533335 2.9781826,3.8885695 2.9619568,3.9153845 3.1056725,4.0078603 c 0.1781218,0.1146153 0.3473652,0.2765498 0.5093798,0.4873834 0.083373,0.108496 0.169393,0.2274972 0.1911547,0.2644472 0.1008292,0.1712026 0.2362262,0.5011871 0.2851684,0.6950025 0.010464,0.041437 0.023353,0.08847 0.028642,0.1045183 0.034777,0.105512 0.08606,0.4880242 0.09999,0.7458123 0.016127,0.2984462 -0.021809,0.8867829 -0.072283,1.1210017 -0.012377,0.057429 -0.025105,0.1314728 -0.028289,0.164543 l -0.00579,0.060127 0.083533,-0.088932 C 4.7417662,7.070445 5.2738212,6.9504144 5.881894,7.0425639 6.1280017,7.0972466 6.2560011,7.1458368 6.3891339,7.2351183 6.5976164,7.3749314 6.6949964,7.584535 6.6375578,7.7698332 6.3559804,8.2685828 5.9835352,7.9710533 5.6291813,7.9141047 5.378907,7.8927284 5.3012281,7.9000649 5.0617526,7.9676921 4.8746942,8.020518 4.735271,8.0820208 4.4123378,8.254164 4.06417,8.4397592 3.9756942,8.4743748 3.8724984,8.4653732 3.8407352,8.4626034 3.792699,8.4465785 3.7657511,8.4297643 Z"
+       id="path802"
+       sodipodi:nodetypes="sssccsssssssssssssccsscccssccssssssssssssssssssccccssccscsscccssssssssssssscssscccsccssss"
+       inkscape:label="bunny_body" /></g><g
+=======
+     id="g776"
+     inkscape:label="quick_default"
+     style="display:inline;stroke-width:0.529167;stroke-dasharray:none"><path
+       style="display:inline;fill:#00d27b;fill-opacity:1;stroke-width:0.00713863"
+       d="M 3.7657511,8.4297643 C 3.7116054,8.3959799 3.639953,8.3029436 3.589315,8.2006726 3.5464833,8.1141681 3.4602565,7.8699963 3.4153265,7.7079833 3.3958372,7.6377066 3.3753828,7.5728002 3.3698721,7.5637468 3.2679031,7.2569724 3.2730501,7.2367467 3.1028764,6.8739253 3.0169558,6.6867578 2.7884579,6.4409936 2.5900779,6.3223776 2.4200094,6.2206896 2.3137607,6.1876326 1.8602584,6.0953103 1.5756979,6.0373807 1.4332524,5.9716553 1.2516025,5.8144726 0.93792911,5.5430492 0.7593636,5.1255002 0.76524033,4.6771873 0.76748974,4.5055897 0.77015247,4.5112023 0.68846883,4.5153623 0.54997359,4.5224153 0.33770319,4.3887108 0.21937446,4.2198895 0.1143564,4.0700591 0.03002154,3.8507646 0.00776001,3.6696325 -0.00861391,3.5364051 -0.00140295,3.3045273 0.05196783,3.1481707 0.14188169,2.8847565 0.26067076,2.703958 0.34762411,2.6198678 c 0.0711318,-0.06879 0.0967494,-0.065239 0.0899667,0.012474 -0.00655,0.07505 0.012716,0.1827354 0.0471834,0.2637288 0.0418864,0.098427 0.11275735,0.2025886 0.2852565,0.3177419 0.0880593,0.058784 0.22622419,0.1326589 0.29440109,0.192594 0.068177,0.059935 0.1239679,0.071372 0.130826,0.067544 0.00686,-0.00384 0.027776,-0.049421 0.061543,-0.094523 C 1.55795,2.9772085 2.15965,2.9273539 2.6267516,2.8632421 2.791317,2.8406547 3.0415716,2.7349997 3.2237854,2.7870334 3.3575648,2.8252375 3.5345228,2.8835809 3.6069491,2.9133653 3.9145964,3.0329116 4.2267658,3.2125964 4.479627,3.3568455 4.484587,3.357269 4.555444,3.4001685 4.7305781,3.5087817 5.01765,3.6868112 5.103893,3.7161976 5.2436272,3.6835946 5.3754304,3.6528421 5.4708476,3.5359694 5.5130021,3.3781286 5.5448038,3.2590523 5.5392362,3.1286196 5.5365303,2.9793086 5.4785269,2.6472479 5.3088316,2.5166735 5.07167,2.3961151 4.9541465,2.328503 4.7375337,2.2622903 4.4897213,2.2182289 4.2863103,2.1820623 4.0981682,2.1762008 3.7961541,2.1966216 3.5646443,2.2122753 3.506174,2.2196346 3.2859759,2.2608351 3.1133192,2.2931402 2.8448975,2.2702109 2.721206,2.212591 2.4829053,2.101582 2.3487557,1.9026618 2.3885386,1.7193041 2.4204172,1.5723777 2.5228336,1.4741011 2.7439033,1.378304 3.1867553,1.186401 3.5604645,1.1167971 3.9609397,1.1516292 4.3297707,1.1837089 4.6272127,1.2955835 4.9684375,1.5305733 5.2364469,1.7151418 5.189201,1.7182135 5.6678629,2.2571296 5.8330708,2.443134 5.8951557,2.5021109 5.9189606,2.4956568 5.9626702,2.4838066 5.6649892,1.962614 5.4488878,1.7435707 5.0593348,1.3487143 4.6887702,1.1216057 4.2333333,0.99859124 4.1051245,0.96396184 3.7656766,0.93214564 3.6448068,0.94342924 3.4627266,0.96042684 3.2428812,1.0052086 3.1391322,1.0464333 2.9699007,1.1136778 2.8992086,1.1127668 2.8180196,1.0422956 2.7240054,0.96069194 2.7012471,0.81064604 2.7571721,0.64112717 2.7949861,0.52650653 2.8216586,0.47697936 2.9150986,0.34787795 3.0556285,0.15371456 3.2224465,0.04237523 3.422237,0.0093985 3.6601499,-0.02987062 4.009938,0.05570989 4.3343183,0.23255101 4.5384688,0.34848089 4.727556,0.4851588 4.9131776,0.62871187 5.2522677,0.91670634 5.523033,1.2412844 5.7564746,1.5622699 c 0.066829,0.1202577 0.1275513,0.2439746 0.1922175,0.3513884 0.082995,0.1462937 0.1509345,0.2888166 0.178044,0.3771976 0.031013,0.1011069 0.078317,0.1729888 0.2795959,0.1140254 0.3764411,-0.1102756 0.7517631,-0.040598 1.128726,0.2095465 0.5657988,0.4551401 0.7771865,1.1447578 0.9022632,1.6092677 0.028384,0.1517442 0.032543,0.2027182 0.027519,0.3373 C 8.4600602,4.6892652 8.4540532,4.7249137 8.4236872,4.805601 8.3572223,4.9821958 8.290569,4.9960493 8.1007332,5.0967543 7.9906727,5.1551397 7.9203023,5.1831283 7.8123753,5.2114453 7.6870229,5.244333 7.5433397,5.2711637 7.4177535,5.2851324 7.1027263,5.3201755 6.9676036,5.3085125 6.4555353,5.2750765 l -0.1394664,-0.0091 -0.052426,0.1110198 C 6.0697447,5.7876011 5.9344168,6.1698777 5.5869353,6.4802442 5.4150887,6.6337356 5.0497171,6.8540484 4.8614477,6.9626238 c -0.140777,0.081186 -0.4386288,0.2175095 -0.469479,0.2148745 -0.007,-5.974e-4 -0.00633,-0.108525 0.00155,-0.2515324 C 4.4070787,6.6798391 4.4069717,6.5969785 4.3927505,6.3268666 4.3856643,6.1922762 4.3834037,6.1681684 4.3599139,5.9766935 4.306379,5.5403093 4.1951436,5.1300007 3.9853712,4.7843274 3.7264962,4.3577401 3.3900226,4.0547693 3.1386667,3.9533335 2.9781826,3.8885695 2.9619568,3.9153845 3.1056725,4.0078603 c 0.1781218,0.1146153 0.3473652,0.2765498 0.5093798,0.4873834 0.083373,0.108496 0.169393,0.2274972 0.1911547,0.2644472 0.1008292,0.1712026 0.2362262,0.5011871 0.2851684,0.6950025 0.010464,0.041437 0.023353,0.08847 0.028642,0.1045183 0.034777,0.105512 0.08606,0.4880242 0.09999,0.7458123 0.016127,0.2984462 -0.021809,0.8867829 -0.072283,1.1210017 -0.012377,0.057429 -0.025105,0.1314728 -0.028289,0.164543 l -0.00579,0.060127 0.083533,-0.088932 C 4.7417662,7.070445 5.2738212,6.9504144 5.881894,7.0425639 6.1280017,7.0972466 6.2560011,7.1458368 6.3891339,7.2351183 6.5976164,7.3749314 6.6949964,7.584535 6.6375578,7.7698332 6.3559804,8.2685828 5.9835352,7.9710533 5.6291813,7.9141047 5.378907,7.8927284 5.3012281,7.9000649 5.0617526,7.9676921 4.8746942,8.020518 4.735271,8.0820208 4.4123378,8.254164 4.06417,8.4397592 3.9756942,8.4743748 3.8724984,8.4653732 3.8407352,8.4626034 3.792699,8.4465785 3.7657511,8.4297643 Z"
+       id="path802"
+       sodipodi:nodetypes="sssccsssssssssssssccsscccssccssssssssssssssssssccccssccscsscccssssssssssssscssscccsccssss" /><path
+       style="display:inline;fill:#00d27b;fill-opacity:1;stroke-width:0.00695213;stroke-dasharray:none"
+       d="m 3.1326475,7.5887335 c 0,0 -0.069864,0.00256 -0.1265286,0.00933 -0.560101,0.06697 -0.9165797,0.030086 -1.1771341,-0.1309849 -0.1138471,-0.070378 -0.2057477,-0.1759621 -0.242721,-0.2788592 -0.031476,-0.0876 -0.0215,-0.2342448 0.021198,-0.311592 0.064856,-0.1174853 0.1545523,-0.1684811 0.2784956,-0.158335 0.093797,0.00768 0.1346531,0.025966 0.2339471,0.1047173 0.1398999,0.1109559 0.304856,0.087742 0.5574005,-0.066363 L 2.729776,6.7246287 C 2.7978,6.7592855 2.9809136,7.1288222 3.0244711,7.2148062"
+       id="path802-5"
+       sodipodi:nodetypes="cssssssscc" /></g><g
+<<<<<<< HEAD
+>>>>>>> origin/Type-Manager-UI
+=======
      id="g1622"
      inkscape:label="reset_vertex"
      style="display:inline;stroke-width:0.529167;stroke-dasharray:none"><g
@@ -435,6 +535,7 @@
          inkscape:randomized="0"
          d="M 6.3376284,4.233333 6.7182939,5.7245206 8.1379048,6.1037675 6.6467171,6.4844329 6.2674703,7.9040438 5.8868048,6.4128561 4.4671939,6.0336093 5.9583816,5.6529438 Z"
          transform="matrix(0.5045571,0,0,0.5045571,4.360629,1.715138)" /></g></g><g
+>>>>>>> origin/Type-Manager-UI
      inkscape:groupmode="layer"
      id="layer2"
      inkscape:label="refresh"