netease-im · nmgwddj · Mar 1, 2021 · May 24, 2019 · May 30, 2019 · Jun 6, 2019
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,14 +1,20 @@
 ---
-name: ȱ�ݷ���
-about: �ṩһ��ȱ�ݸ��ֲ�����������޸�����
+name: 缺陷反馈
+about: 提供一个缺陷复现步骤帮助我们修复问题
 ---
 
-<!-- ���ύ�������ǰ��ȷ����ǰ issue ��û����ͬ������ -->
-<!-- ��ʹ�����°汾�Ĵ���ȷ���㷴����������δ�޸� -->
+<!-- 在提交这个反馈前请确保当前 Issue 中没有相同的问题 -->
+<!-- 请使用最新版本的代码确保你反馈的问题尚未修复 -->
 
-## ��������
+## 问题现象
 
-## ���ֲ���
+<!-- 请描述您遇到问题的直接现象或截图 -->
+
+## 预期结果
+
+<!-- 您遇到的问题预期应该是什么结果？ -->
+
+## 重现步骤
+
+<!-- 请用详细的步骤描述这个问题是如何出现的，让我们能根据您提供的步骤快速重现问题。 -->
 
-1.
-2.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -1,8 +1,9 @@
 ---
-name: ���ܽ���
-about: �ύ�κκõĽ����������������Ŀ
+name: 功能建议
+about: 提交任何好的建议帮助我们完善项目
 ---
 
-<!-- ���ύ�������ǰ��ȷ����ǰ issue ��û����ͬ������ -->
+<!-- 在提交这个反馈前请确保当前 issue 中没有相同的问题 -->
+
+<!-- 描述你想要的功能 -->
 
-<!-- ��������Ҫ�Ĺ��� -->
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -0,0 +1,6 @@
+<!-- 这里写下您的 PR 修复了什么问题或新增了什么功能 -->
+Fixed #
+
+<!-- 请确保您的拉取求情提交至开发分（development）支而不是主分支（master） -->
+<!-- 请仔细查看您的提交确保同文件下使用的是与原项目相同的缩进方式和代码风格 -->
+<!-- 写下您的 PR 工作的具体内容，比如解决问题的思路和新功能的作用 -->
diff --git a/README.md b/README.md
@@ -3,7 +3,7 @@
 NIM Duilib 包含了一整套桌面软件的开发部件，与其说这是一个界面库，不如说它是一个开发框架。从原有 Duilib 基础上拓展了一些新的能力，并整合了 Google base 基础类库（线程、内存、闭包等）。您完全可以直接使用这个框架来开发任何你想要的桌面应用。
 
 ![GitHub](https://img.shields.io/badge/license-MIT-green.svg)
-![Build status](https://ci.appveyor.com/api/projects/status/u29yl0j7pasopm3h/branch/master?svg=true)
+[![Build status](https://ci.appveyor.com/api/projects/status/u29yl0j7pasopm3h?svg=true)](https://ci.appveyor.com/project/nmgwddj/nim-duilib-framework)
 
 [English](README_en-US.md)
 
@@ -19,7 +19,7 @@ NIM Duilib 包含了一整套桌面软件的开发部件，与其说这是一个
 
 ## 预览
 
-![preview](docs/PREVIEW.png)
+![preview](docs/PREVIEW.gif)
 
 ## 开始
 
@@ -29,27 +29,26 @@ 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 即可编译所有示例程序
 
 ## 文档
 
+ - [快速上手](docs/GETTING-STARTED.md)
  - [中文文档](docs/SUMMARY.md)
 
 ## 目录
 
+├─`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
@@ -3,7 +3,7 @@
 NIM Duilib is a UI development framework for Windows, extend some new features based on the original [Duilib](https://github.com/duilib/duilib). Integrated Google base library with threads/memory/closures. You can use this framework to develop any desktop application you want.
 
 ![GitHub](https://img.shields.io/badge/license-MIT-green.svg)
-![Build status](https://ci.appveyor.com/api/projects/status/u29yl0j7pasopm3h/branch/master?svg=true)
+[![Build status](https://ci.appveyor.com/api/projects/status/u29yl0j7pasopm3h?svg=true)](https://ci.appveyor.com/project/nmgwddj/nim-duilib-framework)
 
 [中文介绍](README.md)
 
@@ -19,7 +19,7 @@ NIM Duilib is a UI development framework for Windows, extend some new features b
 
 ## Preview
 
-![preview](docs/PREVIEW.png)
+![preview](docs/PREVIEW.gif)
 
 ## Start
 
@@ -29,27 +29,26 @@ 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
 
+ - [Getting Started](docs/GETTING-STARTED.md)
  - [Docs](docs/SUMMARY.md)
 
 ## 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.
- - Report: File a bug in GitHub issues
+ - 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
@@ -11,6 +11,7 @@
 
 namespace nbase
 {
+
 class MessageLoop;
 class MessageLoopProxy;
 

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/bin/resources.zip b/bin/resources.zip
diff --git a/bin/resources/themes/default/cef/cef.xml b/bin/resources/themes/default/cef/cef.xml
@@ -14,7 +14,7 @@
     <HBox height="auto">
       <Button class="btn_global_blue_80x30" name="btn_back" text="后退" width="60"/>
       <Button class="btn_global_blue_80x30" name="btn_forward" text="前进" width="60" margin="5,0,5"/>
-      <RichEdit class="simple prompt input" name="edit_url" width="stretch" height="28" valign="center" padding="5,5,5,5" font="1" prompttext="请输入网址"/>
+      <RichEdit class="simple prompt input" name="edit_url" width="stretch" height="28" valign="center" padding="5,5,5,5" prompttext="请输入网址"/>
       <Button class="btn_global_blue_80x30" name="btn_navigate" text="转到" width="60" margin="5"/>
       <Button class="btn_global_blue_80x30" name="btn_refresh" text="刷新" width="60" margin="5"/>
     </HBox>

diff --git a/bin/resources/themes/default/controls/controls.xml b/bin/resources/themes/default/controls/controls.xml
@@ -35,27 +35,39 @@
         </VBox>
         <!-- List -->
         <VListBox class="list" name="list" padding="5,3,5,3">
-
         </VListBox>
         <!-- TreeView -->
         <TreeView class="list" name="tree" padding="5,3,5,3" margin="20">
-
         </TreeView>
       </HBox>
       <Control class="splitline_hor_level1"/>
-      <!-- Progress -->
-      <HBox margin="0,10" height="30">
-        <Control width="auto" height="auto" bkimage="../public/animation/ani_loading.gif" valign="center"/>
-        <Progress class="progress_blue" name="progress" value="0" margin="10"/>
-      </HBox>
-      <HBox margin="0,0,0,10" height="30">
-        <Control width="auto" height="auto" bkimage="set_speaker.png" valign="center"/>
-        <Slider class="slider_green" value="70" margin="10"/>
+      <HBox height="85">
+        <VBox margin="0,0,10">
+          <Combo class="list" name="combo" height="30" margin="0,12,0,0" padding="6" bkimage="file='../public/combo/normal.png' corner='5,5,30,5'"/>
+          <RichEdit class="simple input" height="30" margin="0,3" padding="6,6,6" promptmode="true" prompttext="Single line text control" promptcolor="lightcolor"/>
+        </VBox>
+        <!-- Progress -->
+        <VBox>
+          <HBox margin="0,10" height="32">
+            <Control width="auto" height="auto" bkimage="../public/animation/ani_loading.gif" valign="center"/>
+            <Progress class="progress_blue" name="progress" value="0" margin="10"/>
+          </HBox>
+          <HBox margin="0,0,0,10" height="32">
+            <Control width="auto" height="auto" bkimage="set_speaker.png" valign="center"/>
+            <Slider class="slider_green" value="70" margin="10"/>
+          </HBox>
+        </VBox>
+		<VBox width="120">
+             <CircleProgress name="circleprogress" circular="true"  height="80" width="80" 
+             circlewidth="10" bgcolor="gray" fgcolor="green"  clockwise="true"  min="1" max="100" value="75" margin="10"
+             textpadding="10,32,10,10" normaltextcolor="darkcolor" indicator="logo_18x18.png"/>
+		</VBox>
       </HBox>
+
       <Control class="splitline_hor_level1"/>
       <!-- RichEdit -->
       <RichEdit class="prompt" name="edit" bkcolor="bk_wnd_lightcolor" width="stretch" height="stretch" 
-                  font="1" multiline="true" vscrollbar="true" hscrollbar="true" autovscroll="true" 
+                  multiline="true" vscrollbar="true" hscrollbar="true" autovscroll="true" 
                   normaltextcolor="darkcolor" wantreturnmsg="true" rich="true"/>
     </VBox>
   </VBox>
-Original file line number
+Diff line change
@@ Expand Up / @@ -11,6 +11,7 @@ @@
     namespace nbase
     {
     class MessageLoop;
     class MessageLoopProxy;
@@ Expand Down @@