*misc

3 files changed, 105 insertions, 105 deletions

diff --git a/Build/Asura.Editor/Asura.Editor.vcxproj b/Build/Asura.Editor/Asura.Editor.vcxproj
index 892c3e3..7886653 100644
--- a/Build/Asura.Editor/Asura.Editor.vcxproj
+++ b/Build/Asura.Editor/Asura.Editor.vcxproj
@@ -117,25 +117,36 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="..\..\source\Asura.Editor\controls\binding\_button.cpp" />
+    <ClCompile Include="..\..\source\Asura.Editor\controls\button.cpp" />
+    <ClCompile Include="..\..\source\Asura.Editor\controls\checkbox.cpp" />
+    <ClCompile Include="..\..\source\Asura.Editor\controls\hslider.cpp" />
+    <ClCompile Include="..\..\source\Asura.Editor\controls\hvslider.cpp" />
+    <ClCompile Include="..\..\source\Asura.Editor\controls\label.cpp" />
+    <ClCompile Include="..\..\source\Asura.Editor\controls\panel.cpp" />
+    <ClCompile Include="..\..\source\Asura.Editor\controls\progress.cpp" />
+    <ClCompile Include="..\..\source\Asura.Editor\controls\radio_button.cpp" />
+    <ClCompile Include="..\..\source\Asura.Editor\controls\textbox.cpp" />
+    <ClCompile Include="..\..\source\Asura.Editor\controls\vslider.cpp" />
     <ClCompile Include="..\..\source\Asura.Editor\dui_module.cpp" />
     <ClCompile Include="..\..\source\Asura.Editor\editor.cpp" />
     <ClCompile Include="..\..\source\Asura.Editor\layout\horizontal_layout.cpp" />
     <ClCompile Include="..\..\source\Asura.Editor\layout\vertical_layout.cpp" />
     <ClCompile Include="..\..\source\Asura.Editor\main.cpp" />
     <ClCompile Include="..\..\source\Asura.Editor\system\file_watcher.cpp" />
-    <ClCompile Include="..\..\source\Asura.Editor\widgets\binding\_button.cpp" />
-    <ClCompile Include="..\..\source\Asura.Editor\widgets\button.cpp" />
-    <ClCompile Include="..\..\source\Asura.Editor\widgets\checkbox.cpp" />
-    <ClCompile Include="..\..\source\Asura.Editor\widgets\hslider.cpp" />
-    <ClCompile Include="..\..\source\Asura.Editor\widgets\hvslider.cpp" />
-    <ClCompile Include="..\..\source\Asura.Editor\widgets\label.cpp" />
-    <ClCompile Include="..\..\source\Asura.Editor\widgets\panel.cpp" />
-    <ClCompile Include="..\..\source\Asura.Editor\widgets\progress.cpp" />
-    <ClCompile Include="..\..\source\Asura.Editor\widgets\radio_button.cpp" />
-    <ClCompile Include="..\..\source\Asura.Editor\widgets\textbox.cpp" />
-    <ClCompile Include="..\..\source\Asura.Editor\widgets\vslider.cpp" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="..\..\source\Asura.Editor\controls\button.h" />
+    <ClInclude Include="..\..\source\Asura.Editor\controls\checkbox.h" />
+    <ClInclude Include="..\..\source\Asura.Editor\controls\hslider.h" />
+    <ClInclude Include="..\..\source\Asura.Editor\controls\hvslider.h" />
+    <ClInclude Include="..\..\source\Asura.Editor\controls\label.h" />
+    <ClInclude Include="..\..\source\Asura.Editor\controls\panel.h" />
+    <ClInclude Include="..\..\source\Asura.Editor\controls\progress.h" />
+    <ClInclude Include="..\..\source\Asura.Editor\controls\radio_button.h" />
+    <ClInclude Include="..\..\source\Asura.Editor\controls\textbox.h" />
+    <ClInclude Include="..\..\source\Asura.Editor\controls\vslider.h" />
+    <ClInclude Include="..\..\source\Asura.Editor\controls\widget.h" />
     <ClInclude Include="..\..\source\Asura.Editor\core\slot.h" />
     <ClInclude Include="..\..\source\Asura.Editor\core\signal.h" />
     <ClInclude Include="..\..\source\Asura.Editor\dui_module.h" />
@@ -143,17 +154,6 @@
     <ClInclude Include="..\..\source\Asura.Editor\layout\horizontal_layout.h" />
     <ClInclude Include="..\..\source\Asura.Editor\layout\vertical_layout.h" />
     <ClInclude Include="..\..\source\Asura.Editor\system\file_watcher.h" />
-    <ClInclude Include="..\..\source\Asura.Editor\widgets\button.h" />
-    <ClInclude Include="..\..\source\Asura.Editor\widgets\checkbox.h" />
-    <ClInclude Include="..\..\source\Asura.Editor\widgets\hslider.h" />
-    <ClInclude Include="..\..\source\Asura.Editor\widgets\hvslider.h" />
-    <ClInclude Include="..\..\source\Asura.Editor\widgets\label.h" />
-    <ClInclude Include="..\..\source\Asura.Editor\widgets\panel.h" />
-    <ClInclude Include="..\..\source\Asura.Editor\widgets\progress.h" />
-    <ClInclude Include="..\..\source\Asura.Editor\widgets\radio_button.h" />
-    <ClInclude Include="..\..\source\Asura.Editor\widgets\textbox.h" />
-    <ClInclude Include="..\..\source\Asura.Editor\widgets\vslider.h" />
-    <ClInclude Include="..\..\source\Asura.Editor\widgets\widget.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/Build/Asura.Editor/Asura.Editor.vcxproj.filters b/Build/Asura.Editor/Asura.Editor.vcxproj.filters
index 940a465..937f9a2 100644
--- a/Build/Asura.Editor/Asura.Editor.vcxproj.filters
+++ b/Build/Asura.Editor/Asura.Editor.vcxproj.filters
@@ -1,109 +1,76 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <Filter Include="widgets">
-      <UniqueIdentifier>{a4345092-d09c-424c-8d7c-c076914fb6a2}</UniqueIdentifier>
-    </Filter>
     <Filter Include="layout">
       <UniqueIdentifier>{7654ef3d-54c4-490f-bb24-e6a67bd63e1e}</UniqueIdentifier>
     </Filter>
     <Filter Include="core">
       <UniqueIdentifier>{f67906bd-4f7c-4ac6-bca1-019617435a8b}</UniqueIdentifier>
     </Filter>
-    <Filter Include="widgets\binding">
-      <UniqueIdentifier>{4be11763-e2f9-47a4-8947-5326a517e286}</UniqueIdentifier>
-    </Filter>
     <Filter Include="system">
       <UniqueIdentifier>{48600309-cddd-49cd-b939-7a19a2b1eaa3}</UniqueIdentifier>
     </Filter>
+    <Filter Include="controls">
+      <UniqueIdentifier>{a4345092-d09c-424c-8d7c-c076914fb6a2}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="controls\binding">
+      <UniqueIdentifier>{1e378398-d7f0-4616-a986-b6a86faeaa8c}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\source\Asura.Editor\widgets\button.cpp">
-      <Filter>widgets</Filter>
+    <ClCompile Include="..\..\source\Asura.Editor\layout\horizontal_layout.cpp">
+      <Filter>layout</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\source\Asura.Editor\widgets\checkbox.cpp">
-      <Filter>widgets</Filter>
+    <ClCompile Include="..\..\source\Asura.Editor\layout\vertical_layout.cpp">
+      <Filter>layout</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\source\Asura.Editor\widgets\hslider.cpp">
-      <Filter>widgets</Filter>
+    <ClCompile Include="..\..\source\Asura.Editor\editor.cpp" />
+    <ClCompile Include="..\..\source\Asura.Editor\main.cpp" />
+    <ClCompile Include="..\..\source\Asura.Editor\dui_module.cpp" />
+    <ClCompile Include="..\..\source\Asura.Editor\system\file_watcher.cpp">
+      <Filter>system</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\source\Asura.Editor\widgets\hvslider.cpp">
-      <Filter>widgets</Filter>
+    <ClCompile Include="..\..\source\Asura.Editor\controls\button.cpp">
+      <Filter>controls</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\source\Asura.Editor\widgets\label.cpp">
-      <Filter>widgets</Filter>
+    <ClCompile Include="..\..\source\Asura.Editor\controls\checkbox.cpp">
+      <Filter>controls</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\source\Asura.Editor\widgets\panel.cpp">
-      <Filter>widgets</Filter>
+    <ClCompile Include="..\..\source\Asura.Editor\controls\hslider.cpp">
+      <Filter>controls</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\source\Asura.Editor\widgets\textbox.cpp">
-      <Filter>widgets</Filter>
+    <ClCompile Include="..\..\source\Asura.Editor\controls\hvslider.cpp">
+      <Filter>controls</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\source\Asura.Editor\widgets\vslider.cpp">
-      <Filter>widgets</Filter>
+    <ClCompile Include="..\..\source\Asura.Editor\controls\label.cpp">
+      <Filter>controls</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\source\Asura.Editor\widgets\progress.cpp">
-      <Filter>widgets</Filter>
+    <ClCompile Include="..\..\source\Asura.Editor\controls\panel.cpp">
+      <Filter>controls</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\source\Asura.Editor\layout\horizontal_layout.cpp">
-      <Filter>layout</Filter>
+    <ClCompile Include="..\..\source\Asura.Editor\controls\progress.cpp">
+      <Filter>controls</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\source\Asura.Editor\layout\vertical_layout.cpp">
-      <Filter>layout</Filter>
+    <ClCompile Include="..\..\source\Asura.Editor\controls\radio_button.cpp">
+      <Filter>controls</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\source\Asura.Editor\widgets\radio_button.cpp">
-      <Filter>widgets</Filter>
+    <ClCompile Include="..\..\source\Asura.Editor\controls\textbox.cpp">
+      <Filter>controls</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\source\Asura.Editor\editor.cpp" />
-    <ClCompile Include="..\..\source\Asura.Editor\main.cpp" />
-    <ClCompile Include="..\..\source\Asura.Editor\dui_module.cpp" />
-    <ClCompile Include="..\..\source\Asura.Editor\widgets\binding\_button.cpp">
-      <Filter>widgets\binding</Filter>
+    <ClCompile Include="..\..\source\Asura.Editor\controls\vslider.cpp">
+      <Filter>controls</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\source\Asura.Editor\system\file_watcher.cpp">
-      <Filter>system</Filter>
+    <ClCompile Include="..\..\source\Asura.Editor\controls\binding\_button.cpp">
+      <Filter>controls\binding</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\source\Asura.Editor\widgets\button.h">
-      <Filter>widgets</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\source\Asura.Editor\widgets\checkbox.h">
-      <Filter>widgets</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\source\Asura.Editor\widgets\hslider.h">
-      <Filter>widgets</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\source\Asura.Editor\widgets\hvslider.h">
-      <Filter>widgets</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\source\Asura.Editor\widgets\label.h">
-      <Filter>widgets</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\source\Asura.Editor\widgets\panel.h">
-      <Filter>widgets</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\source\Asura.Editor\widgets\textbox.h">
-      <Filter>widgets</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\source\Asura.Editor\widgets\vslider.h">
-      <Filter>widgets</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\source\Asura.Editor\widgets\widget.h">
-      <Filter>widgets</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\source\Asura.Editor\widgets\progress.h">
-      <Filter>widgets</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\source\Asura.Editor\layout\horizontal_layout.h">
       <Filter>layout</Filter>
     </ClInclude>
     <ClInclude Include="..\..\source\Asura.Editor\layout\vertical_layout.h">
       <Filter>layout</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\source\Asura.Editor\widgets\radio_button.h">
-      <Filter>widgets</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\source\Asura.Editor\editor.h" />
     <ClInclude Include="..\..\source\Asura.Editor\dui_module.h" />
     <ClInclude Include="..\..\source\Asura.Editor\core\signal.h">
@@ -115,5 +82,38 @@
     <ClInclude Include="..\..\source\Asura.Editor\system\file_watcher.h">
       <Filter>system</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\source\Asura.Editor\controls\button.h">
+      <Filter>controls</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\source\Asura.Editor\controls\checkbox.h">
+      <Filter>controls</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\source\Asura.Editor\controls\hslider.h">
+      <Filter>controls</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\source\Asura.Editor\controls\hvslider.h">
+      <Filter>controls</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\source\Asura.Editor\controls\label.h">
+      <Filter>controls</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\source\Asura.Editor\controls\panel.h">
+      <Filter>controls</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\source\Asura.Editor\controls\progress.h">
+      <Filter>controls</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\source\Asura.Editor\controls\radio_button.h">
+      <Filter>controls</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\source\Asura.Editor\controls\textbox.h">
+      <Filter>controls</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\source\Asura.Editor\controls\vslider.h">
+      <Filter>controls</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\source\Asura.Editor\controls\widget.h">
+      <Filter>controls</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Build/Asura.sln b/Build/Asura.sln
index 66cb6d4..779d30e 100644
--- a/Build/Asura.sln
+++ b/Build/Asura.sln
@@ -75,8 +75,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "asura-lib-json", "libs\asur
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "asura-lib-xml", "libs\asura-lib-xml\asura-lib-xml.vcxproj", "{AB4F8F4A-73B5-4EFF-BD5D-448A3E39C60A}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "asura-lib-log", "libs\asura-lib-log\asura-lib-log.vcxproj", "{73B0F8AB-EF5A-412A-9E34-0FD2574766B7}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Preprocessor", "Preprocessor\Preprocessor.vcxproj", "{983F6496-7BB2-48E3-B8F4-68C2600EA315}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "asura-lib-steam", "libs\asura-lib-steam\asura-lib-steam.vcxproj", "{129C3826-B418-4C80-A126-0319C7E2A857}"
@@ -101,6 +99,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Plotscript", "3rd-party\Plo
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "uuid4", "3rd-party\uuid4\uuid4.vcxproj", "{49F7847E-219E-4A7B-8484-2A33DAC29DD0}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "asura-lib-plot", "libs\asura-lib-plot\asura-lib-plot.vcxproj", "{F248C936-2169-45DF-8FC4-60E56EA23ECC}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -441,16 +441,6 @@ Global
 		{AB4F8F4A-73B5-4EFF-BD5D-448A3E39C60A}.Release|x64.Build.0 = Release|x64
 		{AB4F8F4A-73B5-4EFF-BD5D-448A3E39C60A}.Release|x86.ActiveCfg = Release|Win32
 		{AB4F8F4A-73B5-4EFF-BD5D-448A3E39C60A}.Release|x86.Build.0 = Release|Win32
-		{73B0F8AB-EF5A-412A-9E34-0FD2574766B7}.Debug|Any CPU.ActiveCfg = Debug|Win32
-		{73B0F8AB-EF5A-412A-9E34-0FD2574766B7}.Debug|x64.ActiveCfg = Debug|x64
-		{73B0F8AB-EF5A-412A-9E34-0FD2574766B7}.Debug|x64.Build.0 = Debug|x64
-		{73B0F8AB-EF5A-412A-9E34-0FD2574766B7}.Debug|x86.ActiveCfg = Debug|Win32
-		{73B0F8AB-EF5A-412A-9E34-0FD2574766B7}.Debug|x86.Build.0 = Debug|Win32
-		{73B0F8AB-EF5A-412A-9E34-0FD2574766B7}.Release|Any CPU.ActiveCfg = Release|Win32
-		{73B0F8AB-EF5A-412A-9E34-0FD2574766B7}.Release|x64.ActiveCfg = Release|x64
-		{73B0F8AB-EF5A-412A-9E34-0FD2574766B7}.Release|x64.Build.0 = Release|x64
-		{73B0F8AB-EF5A-412A-9E34-0FD2574766B7}.Release|x86.ActiveCfg = Release|Win32
-		{73B0F8AB-EF5A-412A-9E34-0FD2574766B7}.Release|x86.Build.0 = Release|Win32
 		{983F6496-7BB2-48E3-B8F4-68C2600EA315}.Debug|Any CPU.ActiveCfg = Debug|Win32
 		{983F6496-7BB2-48E3-B8F4-68C2600EA315}.Debug|x64.ActiveCfg = Debug|x64
 		{983F6496-7BB2-48E3-B8F4-68C2600EA315}.Debug|x64.Build.0 = Debug|x64
@@ -563,6 +553,16 @@ Global
 		{49F7847E-219E-4A7B-8484-2A33DAC29DD0}.Release|x64.Build.0 = Release|x64
 		{49F7847E-219E-4A7B-8484-2A33DAC29DD0}.Release|x86.ActiveCfg = Release|Win32
 		{49F7847E-219E-4A7B-8484-2A33DAC29DD0}.Release|x86.Build.0 = Release|Win32
+		{F248C936-2169-45DF-8FC4-60E56EA23ECC}.Debug|Any CPU.ActiveCfg = Debug|Win32
+		{F248C936-2169-45DF-8FC4-60E56EA23ECC}.Debug|x64.ActiveCfg = Debug|x64
+		{F248C936-2169-45DF-8FC4-60E56EA23ECC}.Debug|x64.Build.0 = Debug|x64
+		{F248C936-2169-45DF-8FC4-60E56EA23ECC}.Debug|x86.ActiveCfg = Debug|Win32
+		{F248C936-2169-45DF-8FC4-60E56EA23ECC}.Debug|x86.Build.0 = Debug|Win32
+		{F248C936-2169-45DF-8FC4-60E56EA23ECC}.Release|Any CPU.ActiveCfg = Release|Win32
+		{F248C936-2169-45DF-8FC4-60E56EA23ECC}.Release|x64.ActiveCfg = Release|x64
+		{F248C936-2169-45DF-8FC4-60E56EA23ECC}.Release|x64.Build.0 = Release|x64
+		{F248C936-2169-45DF-8FC4-60E56EA23ECC}.Release|x86.ActiveCfg = Release|Win32
+		{F248C936-2169-45DF-8FC4-60E56EA23ECC}.Release|x86.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -596,7 +596,6 @@ Global
 		{38090AEB-3AA9-489B-BBEC-0CEDF9EAC0DE} = {E068D138-C824-4365-B5A3-27C65E8FD0B5}
 		{1B83A353-9694-42E0-997E-79E150E1C2E5} = {CD115016-E377-4AC1-8595-DB2836CEFE7E}
 		{AB4F8F4A-73B5-4EFF-BD5D-448A3E39C60A} = {CD115016-E377-4AC1-8595-DB2836CEFE7E}
-		{73B0F8AB-EF5A-412A-9E34-0FD2574766B7} = {CD115016-E377-4AC1-8595-DB2836CEFE7E}
 		{129C3826-B418-4C80-A126-0319C7E2A857} = {CD115016-E377-4AC1-8595-DB2836CEFE7E}
 		{5BECAAB3-9C80-4A62-99BB-E48F4667D9CD} = {E068D138-C824-4365-B5A3-27C65E8FD0B5}
 		{95CAC424-D558-43D0-88B0-C67AF1C4EE90} = {25C8D2F8-989B-4742-859D-E2FDBB14EC2F}
@@ -607,6 +606,7 @@ Global
 		{E15D111A-9E02-4E0D-86FE-62BFCD3C211E} = {64D4E4B2-4A60-46F4-A500-370EFED4524F}
 		{2822F737-EEFA-4C74-872C-1EE0793E2221} = {64D4E4B2-4A60-46F4-A500-370EFED4524F}
 		{49F7847E-219E-4A7B-8484-2A33DAC29DD0} = {64D4E4B2-4A60-46F4-A500-370EFED4524F}
+		{F248C936-2169-45DF-8FC4-60E56EA23ECC} = {CD115016-E377-4AC1-8595-DB2836CEFE7E}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {331032D8-F7CC-43E3-A03B-67108767F96B}