Remove dependency on shared

Signed-off-by: jiajia_deng <[email protected]>
netease-im · Sep 20, 2019 · 4933d1f · 4933d1f
1 parent 57f53ae
commit 4933d1f
Show file tree

Hide file tree

Showing 430 changed files with 1,954 additions and 6,128 deletions.
diff --git a/README.md b/README.md
@@ -29,7 +29,7 @@ NIM Duilib 包含了一整套桌面软件的开发部件，与其说这是一个
 git clone https://github.com/netease-im/NIM_Duilib_Framework
 ```
 
-进入 `NIM_Duilib_Framework/samples` 目录，使用 Visual Studio 2013 Update 5 以上版本 IDE 打开 `samples.sln`，按下 F7 即可编译所有示例程序
+进入 `NIM_Duilib_Framework/examples` 目录，使用 Visual Studio 2013 Update 5 以上版本 IDE 打开 `examples.sln`，按下 F7 即可编译所有示例程序
 
 ## 文档
 
@@ -38,19 +38,17 @@ git clone https://github.com/netease-im/NIM_Duilib_Framework
 
 ## 目录
 
+├─`base` 基础类库  
 ├─`bin` 各个示例程序输出目录，包含预设的皮肤和语言文件以及 CEF 依赖  
 ├─`docs` duilib 接口的说明文档  
+├─`duilib` duilib 核心代码，依赖 base 但不依赖 shared  
 ├─`libs` 静态库编译后的输出目录，包含预设的一些 CEF 组件静态库  
-├─`samples` 各类示例程序  
+├─`examples` 各类示例程序源代码  
 ├─`third_party` 第三方库，目前仅有 cef_control 有依赖  
-├─`toolkits`       
-│  ├─`base` 基础类库  
-│  ├─`duilib` duilib 核心代码，依赖 base 但不依赖 shared  
-│  ├─`shared` 包含一些工具的封装，如命令行解析、日志、路径处理等  
-│  ├─`ui_components` 基于 duilib 封装的常用组件库如 `msgbox`、`toast`、`cef_control` 等  
+├─`ui_components` 基于 duilib 封装的常用组件库如 `msgbox`、`toast`、`cef_control` 等  
 
 ## 交流
 
- - 遇到问题：欢迎查看我们整理过的[中文文档](docs/SUMMARY.md)参考[示例程序](samples/README.md)来帮助你解决疑惑
+ - 遇到问题：欢迎查看我们整理过的[中文文档](docs/SUMMARY.md)参考[示例程序](examples/README.md)来帮助你解决疑惑
  - 提交缺陷：在确保使用最新版本依然存在问题时请尽量以简洁的语言描述清楚复现该问题的步骤并提交 issue
  - 功能建议：如果你有什么好的想法或者提案，欢迎提交 issue 与我们交流
diff --git a/README_en-US.md b/README_en-US.md
@@ -29,7 +29,7 @@ Clone the repo into your disk.
 git clone https://github.com/netease-im/NIM_Duilib_Framework
 ```
 
-Enter the `NIM_Duilib_Framework/samples` directory，Open `samples.sln` with Visual Studio 2013 Update 5 or higher ，press `F7` to compile all projects.
+Enter the `NIM_Duilib_Framework/examples` directory，Open `examples.sln` with Visual Studio 2013 Update 5 or higher ，press `F7` to compile all projects.
 
 ## Documentation
 
@@ -38,19 +38,17 @@ Enter the `NIM_Duilib_Framework/samples` directory，Open `samples.sln` with Vis
 
 ## Structure
 
-├─`bin` Samples output directories，include skin and language files and CEF dependencies.  
+├─`base` Base libraries.  
+├─`bin` Examples output directories，include skin and language files and CEF dependencies.  
 ├─`docs` Documentation of Duilib.  
+├─`duilib` Duilib core, depend on base project.  
 ├─`libs` Static library output directories, include CEF static library.  
-├─`samples` Samples of Duilib.  
+├─`examples` Examples of Duilib.  
 ├─`third_party` Third party for CEF.  
-├─`toolkits`  
-│  ├─`base` Base libraries.  
-│  ├─`duilib` Duilib core, depend on base project.  
-│  ├─`shared` Utils, such as logs/string/path utils.  
-│  ├─`ui_components` UI components based on Duilib, such as `msgbox`,`toast`,`cef_control`  
+├─`ui_components` UI components based on Duilib, such as `msgbox`,`toast`,`cef_control`  
 
 ## Communication
 
- - Question: Read the [Documentation](docs/SUMMARY.md) and [Samples code](samples/README.md) to help you.
+ - Question: Read the [Documentation](docs/SUMMARY.md) and [Examples code](examples/README.md) to help you.
  - Report: File a bug in GitHub issues.
  - Suggestion: Request a new feature in Github issues.
diff --git a/tool_kits/base/base.h → base/base.h b/tool_kits/base/base.h → base/base.h
diff --git a/tool_kits/base/base.vcxproj → base/base.vcxproj b/tool_kits/base/base.vcxproj → base/base.vcxproj
@@ -175,28 +175,28 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>..\..\libs\</OutDir>
+    <OutDir>$(ProjectDir)..\libs\</OutDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <IntDir>$(ProjectDir)..\..\tmp\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
+    <IntDir>$(ProjectDir)..\tmp\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
     <TargetName>$(ProjectName)_d</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <TargetName>$(ProjectName)_d</TargetName>
-    <OutDir>..\..\libs\x64\</OutDir>
-    <IntDir>$(ProjectDir)..\..\tmp\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
+    <OutDir>$(ProjectDir)..\libs\x64\</OutDir>
+    <IntDir>$(ProjectDir)..\tmp\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>..\..\libs\</OutDir>
+    <OutDir>$(ProjectDir)..\libs\</OutDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <IntDir>$(ProjectDir)..\..\tmp\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
+    <IntDir>$(ProjectDir)..\tmp\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>..\..\libs\x64\</OutDir>
-    <IntDir>$(ProjectDir)..\..\tmp\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
+    <OutDir>$(ProjectDir)..\libs\x64\</OutDir>
+    <IntDir>$(ProjectDir)..\tmp\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>

diff --git a/tool_kits/base/base.vcxproj.filters → base/base.vcxproj.filters b/tool_kits/base/base.vcxproj.filters → base/base.vcxproj.filters
diff --git a/tool_kits/base/base_config.h → base/base_config.h b/tool_kits/base/base_config.h → base/base_config.h
diff --git a/tool_kits/base/base_export.h → base/base_export.h b/tool_kits/base/base_export.h → base/base_export.h
diff --git a/tool_kits/base/base_types.h → base/base_types.h b/tool_kits/base/base_types.h → base/base_types.h
diff --git a/tool_kits/base/callback/callback.h → base/callback/callback.h b/tool_kits/base/callback/callback.h → base/callback/callback.h
diff --git a/tool_kits/base/compiler_specific.h → base/compiler_specific.h b/tool_kits/base/compiler_specific.h → base/compiler_specific.h
diff --git a/tool_kits/base/encrypt/des.cpp → base/encrypt/des.cpp b/tool_kits/base/encrypt/des.cpp → base/encrypt/des.cpp
diff --git a/tool_kits/base/encrypt/des.h → base/encrypt/des.h b/tool_kits/base/encrypt/des.h → base/encrypt/des.h
diff --git a/tool_kits/base/encrypt/encrypt.h → base/encrypt/encrypt.h b/tool_kits/base/encrypt/encrypt.h → base/encrypt/encrypt.h
diff --git a/tool_kits/base/encrypt/encrypt_impl.h → base/encrypt/encrypt_impl.h b/tool_kits/base/encrypt/encrypt_impl.h → base/encrypt/encrypt_impl.h
diff --git a/tool_kits/base/error.h → base/error.h b/tool_kits/base/error.h → base/error.h
diff --git a/tool_kits/base/file/file_path.h → base/file/file_path.h b/tool_kits/base/file/file_path.h → base/file/file_path.h
diff --git a/tool_kits/base/file/file_util.cpp → base/file/file_util.cpp b/tool_kits/base/file/file_util.cpp → base/file/file_util.cpp
diff --git a/tool_kits/base/file/file_util.h → base/file/file_util.h b/tool_kits/base/file/file_util.h → base/file/file_util.h
diff --git a/tool_kits/base/file/file_util_posix.cpp → base/file/file_util_posix.cpp b/tool_kits/base/file/file_util_posix.cpp → base/file/file_util_posix.cpp
diff --git a/tool_kits/base/file/file_util_win.cpp → base/file/file_util_win.cpp b/tool_kits/base/file/file_util_win.cpp → base/file/file_util_win.cpp
diff --git a/...s/base/framework/default_message_pump.cpp → base/framework/default_message_pump.cpp b/...s/base/framework/default_message_pump.cpp → base/framework/default_message_pump.cpp
diff --git a/...its/base/framework/default_message_pump.h → base/framework/default_message_pump.h b/...its/base/framework/default_message_pump.h → base/framework/default_message_pump.h
diff --git a/tool_kits/base/framework/message_loop.cpp → base/framework/message_loop.cpp b/tool_kits/base/framework/message_loop.cpp → base/framework/message_loop.cpp
diff --git a/tool_kits/base/framework/message_loop.h → base/framework/message_loop.h b/tool_kits/base/framework/message_loop.h → base/framework/message_loop.h
diff --git a/...its/base/framework/message_loop_proxy.cpp → base/framework/message_loop_proxy.cpp b/...its/base/framework/message_loop_proxy.cpp → base/framework/message_loop_proxy.cpp
diff --git a/..._kits/base/framework/message_loop_proxy.h → base/framework/message_loop_proxy.h b/..._kits/base/framework/message_loop_proxy.h → base/framework/message_loop_proxy.h
diff --git a/tool_kits/base/framework/message_pump.cpp → base/framework/message_pump.cpp b/tool_kits/base/framework/message_pump.cpp → base/framework/message_pump.cpp
diff --git a/tool_kits/base/framework/message_pump.h → base/framework/message_pump.h b/tool_kits/base/framework/message_pump.h → base/framework/message_pump.h
diff --git a/tool_kits/base/framework/observer_list.h → base/framework/observer_list.h b/tool_kits/base/framework/observer_list.h → base/framework/observer_list.h
diff --git a/tool_kits/base/framework/readme.txt → base/framework/readme.txt b/tool_kits/base/framework/readme.txt → base/framework/readme.txt
diff --git a/tool_kits/base/framework/task.h → base/framework/task.h b/tool_kits/base/framework/task.h → base/framework/task.h
diff --git a/...ts/base/framework/win_io_message_pump.cpp → base/framework/win_io_message_pump.cpp b/...ts/base/framework/win_io_message_pump.cpp → base/framework/win_io_message_pump.cpp
diff --git a/...kits/base/framework/win_io_message_pump.h → base/framework/win_io_message_pump.h b/...kits/base/framework/win_io_message_pump.h → base/framework/win_io_message_pump.h
diff --git a/..._kits/base/framework/win_message_pump.cpp → base/framework/win_message_pump.cpp b/..._kits/base/framework/win_message_pump.cpp → base/framework/win_message_pump.cpp
diff --git a/tool_kits/base/framework/win_message_pump.h → base/framework/win_message_pump.h b/tool_kits/base/framework/win_message_pump.h → base/framework/win_message_pump.h
diff --git a/...ts/base/framework/win_ui_message_pump.cpp → base/framework/win_ui_message_pump.cpp b/...ts/base/framework/win_ui_message_pump.cpp → base/framework/win_ui_message_pump.cpp
diff --git a/...kits/base/framework/win_ui_message_pump.h → base/framework/win_ui_message_pump.h b/...kits/base/framework/win_ui_message_pump.h → base/framework/win_ui_message_pump.h
diff --git a/tool_kits/base/hardware/cpu.cpp → base/hardware/cpu.cpp b/tool_kits/base/hardware/cpu.cpp → base/hardware/cpu.cpp
diff --git a/tool_kits/base/hardware/cpu.h → base/hardware/cpu.h b/tool_kits/base/hardware/cpu.h → base/hardware/cpu.h
diff --git a/tool_kits/base/macros.h → base/macros.h b/tool_kits/base/macros.h → base/macros.h
diff --git a/tool_kits/base/memory/blockbuffer.h → base/memory/blockbuffer.h b/tool_kits/base/memory/blockbuffer.h → base/memory/blockbuffer.h
diff --git a/tool_kits/base/memory/deleter.h → base/memory/deleter.h b/tool_kits/base/memory/deleter.h → base/memory/deleter.h
diff --git a/tool_kits/base/memory/lazy_instance.h → base/memory/lazy_instance.h b/tool_kits/base/memory/lazy_instance.h → base/memory/lazy_instance.h
diff --git a/tool_kits/base/memory/singleton.h → base/memory/singleton.h b/tool_kits/base/memory/singleton.h → base/memory/singleton.h
diff --git a/tool_kits/base/network/network_util.cpp → base/network/network_util.cpp b/tool_kits/base/network/network_util.cpp → base/network/network_util.cpp
diff --git a/tool_kits/base/network/network_util.h → base/network/network_util.h b/tool_kits/base/network/network_util.h → base/network/network_util.h
diff --git a/tool_kits/base/network/nio_base.h → base/network/nio_base.h b/tool_kits/base/network/nio_base.h → base/network/nio_base.h
diff --git a/tool_kits/base/port.h → base/port.h b/tool_kits/base/port.h → base/port.h
diff --git a/tool_kits/base/synchronization/lock.h → base/synchronization/lock.h b/tool_kits/base/synchronization/lock.h → base/synchronization/lock.h
diff --git a/..._kits/base/synchronization/lock_posix.cpp → base/synchronization/lock_posix.cpp b/..._kits/base/synchronization/lock_posix.cpp → base/synchronization/lock_posix.cpp
diff --git a/tool_kits/base/synchronization/lock_win.cpp → base/synchronization/lock_win.cpp b/tool_kits/base/synchronization/lock_win.cpp → base/synchronization/lock_win.cpp
diff --git a/tool_kits/base/synchronization/semaphore.h → base/synchronization/semaphore.h b/tool_kits/base/synchronization/semaphore.h → base/synchronization/semaphore.h
diff --git a/.../base/synchronization/semaphore_posix.cpp → base/synchronization/semaphore_posix.cpp b/.../base/synchronization/semaphore_posix.cpp → base/synchronization/semaphore_posix.cpp
diff --git a/...ts/base/synchronization/semaphore_win.cpp → base/synchronization/semaphore_win.cpp b/...ts/base/synchronization/semaphore_win.cpp → base/synchronization/semaphore_win.cpp
diff --git a/...its/base/synchronization/waitable_event.h → base/synchronization/waitable_event.h b/...its/base/synchronization/waitable_event.h → base/synchronization/waitable_event.h
diff --git a/.../synchronization/waitable_event_posix.cpp → .../synchronization/waitable_event_posix.cpp b/.../synchronization/waitable_event_posix.cpp → .../synchronization/waitable_event_posix.cpp
diff --git a/...se/synchronization/waitable_event_win.cpp → base/synchronization/waitable_event_win.cpp b/...se/synchronization/waitable_event_win.cpp → base/synchronization/waitable_event_win.cpp
diff --git a/..._kits/base/third_party/chrome/atomicops.h → base/third_party/chrome/atomicops.h b/..._kits/base/third_party/chrome/atomicops.h → base/third_party/chrome/atomicops.h
diff --git a/...arty/chrome/atomicops_internals_arm_gcc.h → ...arty/chrome/atomicops_internals_arm_gcc.h b/...arty/chrome/atomicops_internals_arm_gcc.h → ...arty/chrome/atomicops_internals_arm_gcc.h
diff --git a/...e/atomicops_internals_atomicword_compat.h → ...e/atomicops_internals_atomicword_compat.h b/...e/atomicops_internals_atomicword_compat.h → ...e/atomicops_internals_atomicword_compat.h
diff --git a/...rty/chrome/atomicops_internals_x86_gcc.cc → ...rty/chrome/atomicops_internals_x86_gcc.cc b/...rty/chrome/atomicops_internals_x86_gcc.cc → ...rty/chrome/atomicops_internals_x86_gcc.cc
diff --git a/...arty/chrome/atomicops_internals_x86_gcc.h → ...arty/chrome/atomicops_internals_x86_gcc.h b/...arty/chrome/atomicops_internals_x86_gcc.h → ...arty/chrome/atomicops_internals_x86_gcc.h
diff --git a/...y/chrome/atomicops_internals_x86_macosx.h → ...y/chrome/atomicops_internals_x86_macosx.h b/...y/chrome/atomicops_internals_x86_macosx.h → ...y/chrome/atomicops_internals_x86_macosx.h
diff --git a/...rty/chrome/atomicops_internals_x86_msvc.h → ...rty/chrome/atomicops_internals_x86_msvc.h b/...rty/chrome/atomicops_internals_x86_msvc.h → ...rty/chrome/atomicops_internals_x86_msvc.h
diff --git a/...base/third_party/convert_utf/ConvertUTF.c → base/third_party/convert_utf/ConvertUTF.c b/...base/third_party/convert_utf/ConvertUTF.c → base/third_party/convert_utf/ConvertUTF.c
diff --git a/...base/third_party/convert_utf/ConvertUTF.h → base/third_party/convert_utf/ConvertUTF.h b/...base/third_party/convert_utf/ConvertUTF.h → base/third_party/convert_utf/ConvertUTF.h
diff --git a/...s/base/third_party/convert_utf/readme.txt → base/third_party/convert_utf/readme.txt b/...s/base/third_party/convert_utf/readme.txt → base/third_party/convert_utf/readme.txt
diff --git a/...kits/base/third_party/modp_b64/Readme.txt → base/third_party/modp_b64/Readme.txt b/...kits/base/third_party/modp_b64/Readme.txt → base/third_party/modp_b64/Readme.txt
diff --git a/...its/base/third_party/modp_b64/modp_b64.cc → base/third_party/modp_b64/modp_b64.cc b/...its/base/third_party/modp_b64/modp_b64.cc → base/third_party/modp_b64/modp_b64.cc
diff --git a/...kits/base/third_party/modp_b64/modp_b64.h → base/third_party/modp_b64/modp_b64.h b/...kits/base/third_party/modp_b64/modp_b64.h → base/third_party/modp_b64/modp_b64.h
diff --git a/...base/third_party/modp_b64/modp_b64_data.h → base/third_party/modp_b64/modp_b64_data.h b/...base/third_party/modp_b64/modp_b64_data.h → base/third_party/modp_b64/modp_b64_data.h
diff --git a/tool_kits/base/thread/framework_thread.cpp → base/thread/framework_thread.cpp b/tool_kits/base/thread/framework_thread.cpp → base/thread/framework_thread.cpp
diff --git a/tool_kits/base/thread/framework_thread.h → base/thread/framework_thread.h b/tool_kits/base/thread/framework_thread.h → base/thread/framework_thread.h
diff --git a/tool_kits/base/thread/thread.h → base/thread/thread.h b/tool_kits/base/thread/thread.h → base/thread/thread.h
diff --git a/tool_kits/base/thread/thread_local.h → base/thread/thread_local.h b/tool_kits/base/thread/thread_local.h → base/thread/thread_local.h
diff --git a/tool_kits/base/thread/thread_local_posix.cpp → base/thread/thread_local_posix.cpp b/tool_kits/base/thread/thread_local_posix.cpp → base/thread/thread_local_posix.cpp
diff --git a/tool_kits/base/thread/thread_local_win.cpp → base/thread/thread_local_win.cpp b/tool_kits/base/thread/thread_local_win.cpp → base/thread/thread_local_win.cpp
diff --git a/tool_kits/base/thread/thread_manager.cpp → base/thread/thread_manager.cpp b/tool_kits/base/thread/thread_manager.cpp → base/thread/thread_manager.cpp
diff --git a/tool_kits/base/thread/thread_manager.h → base/thread/thread_manager.h b/tool_kits/base/thread/thread_manager.h → base/thread/thread_manager.h
@@ -9,6 +9,16 @@
 #include "base/thread/framework_thread.h"
 #include "base/memory/singleton.h"
 
+/**
+ * 一些预定义的线程 ID 值，提供开发者使用
+ */
+enum ThreadIds
+{
+	kThreadMain,
+	kThreadDatabase,
+	kThreadGlobalMisc,
+};
+
 namespace nbase
 {
 class MessageLoop;

diff --git a/tool_kits/base/thread/thread_posix.cpp → base/thread/thread_posix.cpp b/tool_kits/base/thread/thread_posix.cpp → base/thread/thread_posix.cpp
diff --git a/tool_kits/base/thread/thread_win.cpp → base/thread/thread_win.cpp b/tool_kits/base/thread/thread_win.cpp → base/thread/thread_win.cpp
diff --git a/tool_kits/base/time/time.cpp → base/time/time.cpp b/tool_kits/base/time/time.cpp → base/time/time.cpp
diff --git a/tool_kits/base/time/time.h → base/time/time.h b/tool_kits/base/time/time.h → base/time/time.h
diff --git a/tool_kits/base/time/time_posix.cpp → base/time/time_posix.cpp b/tool_kits/base/time/time_posix.cpp → base/time/time_posix.cpp
diff --git a/tool_kits/base/time/time_win.cpp → base/time/time_win.cpp b/tool_kits/base/time/time_win.cpp → base/time/time_win.cpp
diff --git a/tool_kits/base/util/at_exit.cpp → base/util/at_exit.cpp b/tool_kits/base/util/at_exit.cpp → base/util/at_exit.cpp
diff --git a/tool_kits/base/util/at_exit.h → base/util/at_exit.h b/tool_kits/base/util/at_exit.h → base/util/at_exit.h
diff --git a/tool_kits/base/util/base64.cpp → base/util/base64.cpp b/tool_kits/base/util/base64.cpp → base/util/base64.cpp
diff --git a/tool_kits/base/util/base64.h → base/util/base64.h b/tool_kits/base/util/base64.h → base/util/base64.h
diff --git a/tool_kits/base/util/callback_unittest.cpp → base/util/callback_unittest.cpp b/tool_kits/base/util/callback_unittest.cpp → base/util/callback_unittest.cpp
diff --git a/tool_kits/base/util/cmd_line_args.cpp → base/util/cmd_line_args.cpp b/tool_kits/base/util/cmd_line_args.cpp → base/util/cmd_line_args.cpp
diff --git a/tool_kits/base/util/cmd_line_args.h → base/util/cmd_line_args.h b/tool_kits/base/util/cmd_line_args.h → base/util/cmd_line_args.h
diff --git a/...s/base/util/string_number_conversions.cpp → base/util/string_number_conversions.cpp b/...s/base/util/string_number_conversions.cpp → base/util/string_number_conversions.cpp
diff --git a/...its/base/util/string_number_conversions.h → base/util/string_number_conversions.h b/...its/base/util/string_number_conversions.h → base/util/string_number_conversions.h
diff --git a/tool_kits/base/util/string_util.cpp → base/util/string_util.cpp b/tool_kits/base/util/string_util.cpp → base/util/string_util.cpp
diff --git a/tool_kits/base/util/string_util.h → base/util/string_util.h b/tool_kits/base/util/string_util.h → base/util/string_util.h
diff --git a/tool_kits/base/util/stringize_macros.h → base/util/stringize_macros.h b/tool_kits/base/util/stringize_macros.h → base/util/stringize_macros.h
diff --git a/tool_kits/base/util/template_util.h → base/util/template_util.h b/tool_kits/base/util/template_util.h → base/util/template_util.h
diff --git a/tool_kits/base/util/unicode.h → base/util/unicode.h b/tool_kits/base/util/unicode.h → base/util/unicode.h
diff --git a/tool_kits/base/util/valuemap.h → base/util/valuemap.h b/tool_kits/base/util/valuemap.h → base/util/valuemap.h
diff --git a/tool_kits/base/win32/object_watcher.cpp → base/win32/object_watcher.cpp b/tool_kits/base/win32/object_watcher.cpp → base/win32/object_watcher.cpp
diff --git a/tool_kits/base/win32/object_watcher.h → base/win32/object_watcher.h b/tool_kits/base/win32/object_watcher.h → base/win32/object_watcher.h
diff --git a/tool_kits/base/win32/path_util.cpp → base/win32/path_util.cpp b/tool_kits/base/win32/path_util.cpp → base/win32/path_util.cpp
diff --git a/tool_kits/base/win32/path_util.h → base/win32/path_util.h b/tool_kits/base/win32/path_util.h → base/win32/path_util.h
diff --git a/..._kits/base/win32/platform_string_util.cpp → base/win32/platform_string_util.cpp b/..._kits/base/win32/platform_string_util.cpp → base/win32/platform_string_util.cpp
diff --git a/tool_kits/base/win32/platform_string_util.h → base/win32/platform_string_util.h b/tool_kits/base/win32/platform_string_util.h → base/win32/platform_string_util.h
diff --git a/tool_kits/base/win32/scoped_win_handle.h → base/win32/scoped_win_handle.h b/tool_kits/base/win32/scoped_win_handle.h → base/win32/scoped_win_handle.h
diff --git a/tool_kits/base/win32/security_util.cpp → base/win32/security_util.cpp b/tool_kits/base/win32/security_util.cpp → base/win32/security_util.cpp
diff --git a/tool_kits/base/win32/security_util.h → base/win32/security_util.h b/tool_kits/base/win32/security_util.h → base/win32/security_util.h
diff --git a/tool_kits/base/win32/shared_memory.cpp → base/win32/shared_memory.cpp b/tool_kits/base/win32/shared_memory.cpp → base/win32/shared_memory.cpp
diff --git a/tool_kits/base/win32/shared_memory.h → base/win32/shared_memory.h b/tool_kits/base/win32/shared_memory.h → base/win32/shared_memory.h
diff --git a/tool_kits/base/win32/win_util.cpp → base/win32/win_util.cpp b/tool_kits/base/win32/win_util.cpp → base/win32/win_util.cpp
diff --git a/tool_kits/base/win32/win_util.h → base/win32/win_util.h b/tool_kits/base/win32/win_util.h → base/win32/win_util.h
diff --git a/tool_kits/build/build_config.h → build/build_config.h b/tool_kits/build/build_config.h → build/build_config.h
diff --git a/tool_kits/build/stdafx.cpp → build/stdafx.cpp b/tool_kits/build/stdafx.cpp → build/stdafx.cpp
diff --git a/tool_kits/build/stdafx.h → build/stdafx.h b/tool_kits/build/stdafx.h → build/stdafx.h
diff --git a/...kits/build/uac_require_admin_win.manifest → build/uac_require_admin_win.manifest b/...kits/build/uac_require_admin_win.manifest → build/uac_require_admin_win.manifest
diff --git a/tool_kits/build/winsdk_config.h → build/winsdk_config.h b/tool_kits/build/winsdk_config.h → build/winsdk_config.h
diff --git a/tool_kits/build/xp_style_manifest_win.h → build/xp_style_manifest_win.h b/tool_kits/build/xp_style_manifest_win.h → build/xp_style_manifest_win.h
diff --git a/docs/PREVIEW.gif b/docs/PREVIEW.gif
diff --git a/...its/duilib/Animation/AnimationManager.cpp → duilib/Animation/AnimationManager.cpp b/...its/duilib/Animation/AnimationManager.cpp → duilib/Animation/AnimationManager.cpp
diff --git a/..._kits/duilib/Animation/AnimationManager.h → duilib/Animation/AnimationManager.h b/..._kits/duilib/Animation/AnimationManager.h → duilib/Animation/AnimationManager.h
diff --git a/...kits/duilib/Animation/AnimationPlayer.cpp → duilib/Animation/AnimationPlayer.cpp b/...kits/duilib/Animation/AnimationPlayer.cpp → duilib/Animation/AnimationPlayer.cpp
diff --git a/tool_kits/duilib/Animation/AnimationPlayer.h → duilib/Animation/AnimationPlayer.h b/tool_kits/duilib/Animation/AnimationPlayer.h → duilib/Animation/AnimationPlayer.h
diff --git a/tool_kits/duilib/Box/ChildBox.cpp → duilib/Box/ChildBox.cpp b/tool_kits/duilib/Box/ChildBox.cpp → duilib/Box/ChildBox.cpp
diff --git a/tool_kits/duilib/Box/ChildBox.h → duilib/Box/ChildBox.h b/tool_kits/duilib/Box/ChildBox.h → duilib/Box/ChildBox.h
diff --git a/tool_kits/duilib/Box/HBox.cpp → duilib/Box/HBox.cpp b/tool_kits/duilib/Box/HBox.cpp → duilib/Box/HBox.cpp
diff --git a/tool_kits/duilib/Box/HBox.h → duilib/Box/HBox.h b/tool_kits/duilib/Box/HBox.h → duilib/Box/HBox.h
diff --git a/tool_kits/duilib/Box/TabBox.cpp → duilib/Box/TabBox.cpp b/tool_kits/duilib/Box/TabBox.cpp → duilib/Box/TabBox.cpp
diff --git a/tool_kits/duilib/Box/TabBox.h → duilib/Box/TabBox.h b/tool_kits/duilib/Box/TabBox.h → duilib/Box/TabBox.h
diff --git a/tool_kits/duilib/Box/TileBox.cpp → duilib/Box/TileBox.cpp b/tool_kits/duilib/Box/TileBox.cpp → duilib/Box/TileBox.cpp
diff --git a/tool_kits/duilib/Box/TileBox.h → duilib/Box/TileBox.h b/tool_kits/duilib/Box/TileBox.h → duilib/Box/TileBox.h
diff --git a/tool_kits/duilib/Box/VBox.cpp → duilib/Box/VBox.cpp b/tool_kits/duilib/Box/VBox.cpp → duilib/Box/VBox.cpp
diff --git a/tool_kits/duilib/Box/VBox.h → duilib/Box/VBox.h b/tool_kits/duilib/Box/VBox.h → duilib/Box/VBox.h
diff --git a/tool_kits/duilib/Control/Button.h → duilib/Control/Button.h b/tool_kits/duilib/Control/Button.h → duilib/Control/Button.h
diff --git a/tool_kits/duilib/Control/CheckBox.h → duilib/Control/CheckBox.h b/tool_kits/duilib/Control/CheckBox.h → duilib/Control/CheckBox.h