*misc

3 files changed, 157 insertions, 9 deletions

diff --git a/Build/Asura.Editor/Asura.Editor.vcxproj b/Build/Asura.Editor/Asura.Editor.vcxproj
index c16be0a..cc38c61 100644
--- a/Build/Asura.Editor/Asura.Editor.vcxproj
+++ b/Build/Asura.Editor/Asura.Editor.vcxproj
@@ -76,6 +76,7 @@
       <Optimization>Disabled</Optimization>
       <SDLCheck>true</SDLCheck>
       <ConformanceMode>true</ConformanceMode>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\source\3rd-party;$(SolutionDir)..\source\libs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -108,6 +109,7 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
       <ConformanceMode>true</ConformanceMode>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\source\3rd-party;$(SolutionDir)..\source\libs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -115,6 +117,38 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <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\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\dui_module.h" />
+    <ClInclude Include="..\..\source\Asura.Editor\editor.h" />
+    <ClInclude Include="..\..\source\Asura.Editor\layout\horizontal_layout.h" />
+    <ClInclude Include="..\..\source\Asura.Editor\layout\vertical_layout.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 3c6f4fd..53931f0 100644
--- a/Build/Asura.Editor/Asura.Editor.vcxproj.filters
+++ b/Build/Asura.Editor/Asura.Editor.vcxproj.filters
@@ -1,17 +1,98 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <Filter Include="源文件">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    <Filter Include="widgets">
+      <UniqueIdentifier>{a4345092-d09c-424c-8d7c-c076914fb6a2}</UniqueIdentifier>
     </Filter>
-    <Filter Include="头文件">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hh;hpp;hxx;hm;inl;inc;ipp;xsd</Extensions>
+    <Filter Include="layout">
+      <UniqueIdentifier>{7654ef3d-54c4-490f-bb24-e6a67bd63e1e}</UniqueIdentifier>
     </Filter>
-    <Filter Include="资源文件">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    <Filter Include="core">
+      <UniqueIdentifier>{f67906bd-4f7c-4ac6-bca1-019617435a8b}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\source\Asura.Editor\widgets\button.cpp">
+      <Filter>widgets</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\Asura.Editor\widgets\checkbox.cpp">
+      <Filter>widgets</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\Asura.Editor\widgets\hslider.cpp">
+      <Filter>widgets</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\Asura.Editor\widgets\hvslider.cpp">
+      <Filter>widgets</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\Asura.Editor\widgets\label.cpp">
+      <Filter>widgets</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\Asura.Editor\widgets\panel.cpp">
+      <Filter>widgets</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\Asura.Editor\widgets\textbox.cpp">
+      <Filter>widgets</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\Asura.Editor\widgets\vslider.cpp">
+      <Filter>widgets</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\Asura.Editor\widgets\progress.cpp">
+      <Filter>widgets</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\Asura.Editor\layout\horizontal_layout.cpp">
+      <Filter>layout</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\Asura.Editor\layout\vertical_layout.cpp">
+      <Filter>layout</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\Asura.Editor\widgets\radio_button.cpp">
+      <Filter>widgets</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\Asura.Editor\editor.cpp" />
+    <ClCompile Include="..\..\source\Asura.Editor\main.cpp" />
+    <ClCompile Include="..\..\source\Asura.Editor\dui_module.cpp" />
+  </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" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Build/Asura.sln b/Build/Asura.sln
index f7ee2f4..fa2e5ca 100644
--- a/Build/Asura.sln
+++ b/Build/Asura.sln
@@ -75,6 +75,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Asura", "Asura\Asura.vcxpro
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "asura-lib-json", "libs\asura-lib-json\asura-lib-json.vcxproj", "{1B83A353-9694-42E0-997E-79E150E1C2E5}"
 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}") = "tinyxml2", "3rd-party\tinyxml2\tinyxml2.vcxproj", "{883BC26A-4C9E-44B3-B5C0-7F3E4EDC0226}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "asura-lib-log", "libs\asura-lib-log\asura-lib-log.vcxproj", "{73B0F8AB-EF5A-412A-9E34-0FD2574766B7}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|x64 = Debug|x64
@@ -347,6 +353,30 @@ Global
 		{1B83A353-9694-42E0-997E-79E150E1C2E5}.Release|x64.Build.0 = Release|x64
 		{1B83A353-9694-42E0-997E-79E150E1C2E5}.Release|x86.ActiveCfg = Release|Win32
 		{1B83A353-9694-42E0-997E-79E150E1C2E5}.Release|x86.Build.0 = Release|Win32
+		{AB4F8F4A-73B5-4EFF-BD5D-448A3E39C60A}.Debug|x64.ActiveCfg = Debug|x64
+		{AB4F8F4A-73B5-4EFF-BD5D-448A3E39C60A}.Debug|x64.Build.0 = Debug|x64
+		{AB4F8F4A-73B5-4EFF-BD5D-448A3E39C60A}.Debug|x86.ActiveCfg = Debug|Win32
+		{AB4F8F4A-73B5-4EFF-BD5D-448A3E39C60A}.Debug|x86.Build.0 = Debug|Win32
+		{AB4F8F4A-73B5-4EFF-BD5D-448A3E39C60A}.Release|x64.ActiveCfg = Release|x64
+		{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
+		{883BC26A-4C9E-44B3-B5C0-7F3E4EDC0226}.Debug|x64.ActiveCfg = Debug|x64
+		{883BC26A-4C9E-44B3-B5C0-7F3E4EDC0226}.Debug|x64.Build.0 = Debug|x64
+		{883BC26A-4C9E-44B3-B5C0-7F3E4EDC0226}.Debug|x86.ActiveCfg = Debug|Win32
+		{883BC26A-4C9E-44B3-B5C0-7F3E4EDC0226}.Debug|x86.Build.0 = Debug|Win32
+		{883BC26A-4C9E-44B3-B5C0-7F3E4EDC0226}.Release|x64.ActiveCfg = Release|x64
+		{883BC26A-4C9E-44B3-B5C0-7F3E4EDC0226}.Release|x64.Build.0 = Release|x64
+		{883BC26A-4C9E-44B3-B5C0-7F3E4EDC0226}.Release|x86.ActiveCfg = Release|Win32
+		{883BC26A-4C9E-44B3-B5C0-7F3E4EDC0226}.Release|x86.Build.0 = Release|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|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
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -380,6 +410,9 @@ Global
 		{41599A7C-B1F2-4D95-90CF-DB74AC4C7FA5} = {E068D138-C824-4365-B5A3-27C65E8FD0B5}
 		{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}
+		{883BC26A-4C9E-44B3-B5C0-7F3E4EDC0226} = {64D4E4B2-4A60-46F4-A500-370EFED4524F}
+		{73B0F8AB-EF5A-412A-9E34-0FD2574766B7} = {CD115016-E377-4AC1-8595-DB2836CEFE7E}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {331032D8-F7CC-43E3-A03B-67108767F96B}