Merge pull request #5681 from andyque/fix_gui_to_ui

Rename 'gui' folder to 'ui'

CMakeLists.txt

@@ -246,8 +246,8 @@ add_subdirectory(cocos/storage)
 endif(BUILD_STORAGE)
 
 if(BUILD_GUI)
-# gui
-add_subdirectory(cocos/gui)
+# ui
+add_subdirectory(cocos/ui)
 endif(BUILD_GUI)
 
 if(BUILD_NETWORK)

build/cocos2d-win32.vc2012.sln

@@ -1,6 +1,6 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Express 2012 for Windows Desktop
+# Visual Studio 2012
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libAudio", "..\cocos\audio\proj.win32\CocosDenshion.vcxproj", "{F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcocos2d", "..\cocos\2d\cocos2d.vcxproj", "{98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}"
@@ -17,8 +17,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libCocosBuilder", "..\cocos
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libCocosStudio", "..\cocos\editor-support\cocostudio\proj.win32\libCocosStudio.vcxproj", "{B57CF53F-2E49-4031-9822-047CC0E6BDE2}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libGUI", "..\cocos\gui\proj.win32\libGUI.vcxproj", "{7E06E92C-537A-442B-9E4A-4761C84F8A1A}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libNetwork", "..\cocos\network\proj.win32\libNetwork.vcxproj", "{DF2638C0-8128-4847-867C-6EAFE3DEE7B5}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libSpine", "..\cocos\editor-support\spine\proj.win32\libSpine.vcxproj", "{B7C2A162-DEC9-4418-972E-240AB3CBFCAE}"
@@ -29,6 +27,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liblua", "..\cocos\scriptin
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestLua", "..\tests\lua-tests\project\proj.win32\TestLua.win32.vcxproj", "{4E6A7A0E-DDD8-4BAA-8B22-C964069364ED}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libGUI", "..\cocos\ui\proj.win32\libGUI.vcxproj", "{7E06E92C-537A-442B-9E4A-4761C84F8A1A}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -67,10 +67,6 @@ Global
 		{B57CF53F-2E49-4031-9822-047CC0E6BDE2}.Debug|Win32.Build.0 = Debug|Win32
 		{B57CF53F-2E49-4031-9822-047CC0E6BDE2}.Release|Win32.ActiveCfg = Release|Win32
 		{B57CF53F-2E49-4031-9822-047CC0E6BDE2}.Release|Win32.Build.0 = Release|Win32
-		{7E06E92C-537A-442B-9E4A-4761C84F8A1A}.Debug|Win32.ActiveCfg = Debug|Win32
-		{7E06E92C-537A-442B-9E4A-4761C84F8A1A}.Debug|Win32.Build.0 = Debug|Win32
-		{7E06E92C-537A-442B-9E4A-4761C84F8A1A}.Release|Win32.ActiveCfg = Release|Win32
-		{7E06E92C-537A-442B-9E4A-4761C84F8A1A}.Release|Win32.Build.0 = Release|Win32
 		{DF2638C0-8128-4847-867C-6EAFE3DEE7B5}.Debug|Win32.ActiveCfg = Debug|Win32
 		{DF2638C0-8128-4847-867C-6EAFE3DEE7B5}.Debug|Win32.Build.0 = Debug|Win32
 		{DF2638C0-8128-4847-867C-6EAFE3DEE7B5}.Release|Win32.ActiveCfg = Release|Win32
@@ -91,6 +87,10 @@ Global
 		{4E6A7A0E-DDD8-4BAA-8B22-C964069364ED}.Debug|Win32.Build.0 = Debug|Win32
 		{4E6A7A0E-DDD8-4BAA-8B22-C964069364ED}.Release|Win32.ActiveCfg = Release|Win32
 		{4E6A7A0E-DDD8-4BAA-8B22-C964069364ED}.Release|Win32.Build.0 = Release|Win32
+		{7E06E92C-537A-442B-9E4A-4761C84F8A1A}.Debug|Win32.ActiveCfg = Debug|Win32
+		{7E06E92C-537A-442B-9E4A-4761C84F8A1A}.Debug|Win32.Build.0 = Debug|Win32
+		{7E06E92C-537A-442B-9E4A-4761C84F8A1A}.Release|Win32.ActiveCfg = Release|Win32
+		{7E06E92C-537A-442B-9E4A-4761C84F8A1A}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

build/cocos2d_libs.xcodeproj/project.pbxproj.REMOVED.git-id

@@ -1 +1 @@
-c9621114b4eae679324c1a95f5ae9a1b7e9acc17
+71a61fb97a4db05adaabc4cc03035fe419cc35d6

build/cocos2d_tests.xcodeproj/project.pbxproj.REMOVED.git-id

@@ -1 +1 @@
-1c0cfb1ac4272e26690b9265c721c0a7e5ae83c3
+08fd638cd925dfad54a49df207a72130942102d3

cocos/editor-support/cocostudio/Android.mk

@@ -68,11 +68,11 @@ LOCAL_EXPORT_CFLAGS += -Wno-psabi
 
 LOCAL_WHOLE_STATIC_LIBRARIES := cocos2dx_static
 LOCAL_WHOLE_STATIC_LIBRARIES += cocosdenshion_static
-LOCAL_WHOLE_STATIC_LIBRARIES += cocos_gui_static
+LOCAL_WHOLE_STATIC_LIBRARIES += cocos_ui_static
 
 include $(BUILD_STATIC_LIBRARY)
 
 $(call import-module,2d)
 $(call import-module,audio/android)
-$(call import-module,gui)
+$(call import-module,ui)
 

cocos/editor-support/cocostudio/CCActionNode.cpp

@@ -25,8 +25,8 @@ THE SOFTWARE.
 #include "cocostudio/CCActionNode.h"
 #include "cocostudio/CCActionFrameEasing.h"
 #include "cocostudio/DictionaryHelper.h"
-#include "gui/UIWidget.h"
-#include "gui/UIHelper.h"
+#include "ui/UIWidget.h"
+#include "ui/UIHelper.h"
 
 using namespace cocos2d;
 using namespace ui;

cocos/editor-support/cocostudio/CCSGUIReader.cpp

@@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 ****************************************************************************/
 #include "cocostudio/CCSGUIReader.h"
-#include "gui/CocosGUI.h"
+#include "ui/CocosGUI.h"
 #include "cocostudio/CCActionManagerEx.h"
 #include <fstream>
 #include <iostream>

cocos/editor-support/cocostudio/CCSGUIReader.h

@@ -25,7 +25,7 @@ THE SOFTWARE.
 #ifndef __CCSGUIREADER_H__
 #define __CCSGUIREADER_H__
 
-#include "gui/UIWidget.h"
+#include "ui/UIWidget.h"
 #include "cocostudio/DictionaryHelper.h"
 #include "WidgetReader/WidgetReaderProtocol.h"
 #include "ObjectFactory.h"

cocos/editor-support/cocostudio/CCSSceneReader.cpp

@@ -23,7 +23,7 @@ THE SOFTWARE.
 ****************************************************************************/
 
 #include "cocostudio/CocoStudio.h"
-#include "gui/CocosGUI.h"
+#include "ui/CocosGUI.h"
 #include "SimpleAudioEngine.h"
 #include "ObjectFactory.h"
 

cocos/editor-support/cocostudio/ObjectFactory.cpp

@@ -23,7 +23,7 @@ THE SOFTWARE.
 ****************************************************************************/
 
 #include "ObjectFactory.h"
-#include "gui/UIWidget.h"
+#include "ui/UIWidget.h"
 #include "cocostudio/WidgetReader/WidgetReaderProtocol.h"
 
 using namespace cocos2d;
@@ -199,4 +199,4 @@ void ObjectFactory::registerType(const TInfo &t)
     _typeMap.insert(std::make_pair(t._class, t));
 }
 
-}
+}

cocos/editor-support/cocostudio/WidgetReader/ButtonReader/ButtonReader.cpp

@@ -1,7 +1,7 @@
 
 
 #include "ButtonReader.h"
-#include "gui/UIButton.h"
+#include "ui/UIButton.h"
 
 USING_NS_CC;
 using namespace ui;

cocos/editor-support/cocostudio/WidgetReader/CheckBoxReader/CheckBoxReader.cpp

@@ -1,7 +1,7 @@
 
 
 #include "CheckBoxReader.h"
-#include "gui/UICheckBox.h"
+#include "ui/UICheckBox.h"
 
 USING_NS_CC;
 using namespace ui;

cocos/editor-support/cocostudio/WidgetReader/ImageViewReader/ImageViewReader.cpp

@@ -1,7 +1,7 @@
 
 
 #include "ImageViewReader.h"
-#include "gui/UIImageView.h"
+#include "ui/UIImageView.h"
 
 USING_NS_CC;
 using namespace ui;

cocos/editor-support/cocostudio/WidgetReader/LayoutReader/LayoutReader.cpp

@@ -1,7 +1,7 @@
 
 
 #include "LayoutReader.h"
-#include "gui/UILayout.h"
+#include "ui/UILayout.h"
 
 USING_NS_CC;
 using namespace ui;

cocos/editor-support/cocostudio/WidgetReader/ListViewReader/ListViewReader.cpp

@@ -1,7 +1,7 @@
 
 
 #include "ListViewReader.h"
-#include "gui/UIListView.h"
+#include "ui/UIListView.h"
 
 USING_NS_CC;
 using namespace ui;

cocos/editor-support/cocostudio/WidgetReader/LoadingBarReader/LoadingBarReader.cpp

@@ -1,7 +1,7 @@
 
 
 #include "LoadingBarReader.h"
-#include "gui/UILoadingBar.h"
+#include "ui/UILoadingBar.h"
 
 USING_NS_CC;
 using namespace ui;

cocos/editor-support/cocostudio/WidgetReader/PageViewReader/PageViewReader.cpp

@@ -1,7 +1,7 @@
 
 
 #include "PageViewReader.h"
-#include "gui/UIPageView.h"
+#include "ui/UIPageView.h"
 
 USING_NS_CC;
 using namespace ui;

cocos/editor-support/cocostudio/WidgetReader/ScrollViewReader/ScrollViewReader.cpp

@@ -1,7 +1,7 @@
 
 
 #include "ScrollViewReader.h"
-#include "gui/UIScrollView.h"
+#include "ui/UIScrollView.h"
 
 USING_NS_CC;
 using namespace ui;

cocos/editor-support/cocostudio/WidgetReader/SliderReader/SliderReader.cpp

@@ -1,7 +1,7 @@
 
 
 #include "SliderReader.h"
-#include "gui/UISlider.h"
+#include "ui/UISlider.h"
 
 USING_NS_CC;
 using namespace ui;

cocos/editor-support/cocostudio/WidgetReader/TextAtlasReader/TextAtlasReader.cpp

@@ -1,7 +1,7 @@
 
 
 #include "TextAtlasReader.h"
-#include "gui/UITextAtlas.h"
+#include "ui/UITextAtlas.h"
 
 USING_NS_CC;
 using namespace ui;

cocos/editor-support/cocostudio/WidgetReader/TextBMFontReader/TextBMFontReader.cpp

@@ -1,7 +1,7 @@
 
 
 #include "TextBMFontReader.h"
-#include "gui/UITextBMFont.h"
+#include "ui/UITextBMFont.h"
 
 USING_NS_CC;
 using namespace ui;

cocos/editor-support/cocostudio/WidgetReader/TextFieldReader/TextFieldReader.cpp

@@ -1,7 +1,7 @@
 
 
 #include "TextFieldReader.h"
-#include "gui/UITextField.h"
+#include "ui/UITextField.h"
 
 USING_NS_CC;
 using namespace ui;

cocos/editor-support/cocostudio/WidgetReader/TextReader/TextReader.cpp

@@ -1,7 +1,7 @@
 
 
 #include "TextReader.h"
-#include "gui/UIText.h"
+#include "ui/UIText.h"
 
 USING_NS_CC;
 using namespace ui;

cocos/editor-support/cocostudio/WidgetReader/WidgetReader.h

@@ -27,8 +27,8 @@
 
 #include "WidgetReaderProtocol.h"
 #include "../CCSGUIReader.h"
-#include "gui/GUIDefine.h"
-#include "gui/UIWidget.h"
+#include "ui/GUIDefine.h"
+#include "ui/UIWidget.h"
 
 namespace cocostudio
 {

cocos/scripting/lua-bindings/Android.mk

@@ -20,7 +20,7 @@ LOCAL_SRC_FILES := manual/CCLuaBridge.cpp \
           manual/lua_cocos2dx_manual.cpp \
           manual/lua_cocos2dx_extension_manual.cpp \
           manual/lua_cocos2dx_coco_studio_manual.cpp \
-          manual/lua_cocos2dx_gui_manual.cpp \
+          manual/lua_cocos2dx_ui_manual.cpp \
           manual/lua_cocos2dx_spine_manual.cpp \
           manual/lua_cocos2dx_physics_manual.cpp \
           manual/lua_cocos2dx_deprecated.cpp \
@@ -32,7 +32,7 @@ LOCAL_SRC_FILES := manual/CCLuaBridge.cpp \
           auto/lua_cocos2dx_auto.cpp \
           auto/lua_cocos2dx_extension_auto.cpp \
           auto/lua_cocos2dx_studio_auto.cpp \
-          auto/lua_cocos2dx_gui_auto.cpp \
+          auto/lua_cocos2dx_ui_auto.cpp \
           auto/lua_cocos2dx_spine_auto.cpp \
           auto/lua_cocos2dx_physics_auto.cpp \
           ../../../external/lua/tolua/tolua_event.c \
@@ -65,7 +65,7 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../../external/lua/tolua \
                     $(LOCAL_PATH)/../../editor-support/spine \
                     $(LOCAL_PATH)/../../editor-support/cocosbuilder \
                     $(LOCAL_PATH)/../../editor-support/cocostudio \
-                    $(LOCAL_PATH)/../../gui \
+                    $(LOCAL_PATH)/../../ui \
                     $(LOCAL_PATH)/auto \
                     $(LOCAL_PATH)/manual \
                     $(LOCAL_PATH)/manual/platform/android \

cocos/scripting/lua-bindings/CMakeLists.txt

@@ -2,7 +2,7 @@ set(LUABINDING_SRC
   auto/lua_cocos2dx_auto.cpp
   auto/lua_cocos2dx_extension_auto.cpp
   auto/lua_cocos2dx_studio_auto.cpp
-  auto/lua_cocos2dx_gui_auto.cpp
+  auto/lua_cocos2dx_ui_auto.cpp
   auto/lua_cocos2dx_spine_auto.cpp
   auto/lua_cocos2dx_physics_auto.cpp
   manual/tolua_fix.cpp
@@ -18,7 +18,7 @@ set(LUABINDING_SRC
   manual/lua_cocos2dx_manual.cpp
   manual/lua_cocos2dx_extension_manual.cpp
   manual/lua_cocos2dx_coco_studio_manual.cpp
-  manual/lua_cocos2dx_gui_manual.cpp
+  manual/lua_cocos2dx_ui_manual.cpp
   manual/lua_cocos2dx_spine_manual.cpp
   manual/lua_cocos2dx_physics_manual.cpp
   manual/lua_cocos2dx_deprecated.cpp
@@ -32,7 +32,7 @@ include_directories(
   ../../editor-support/cocosbuilder
   ../../editor-support/cocostudio
   ../../editor-support/spine
-  ../../gui
+  ../../ui
   ../../../external/lua/lua
   ../../../external/lua/tolua
 )

cocos/scripting/lua-bindings/auto/api/lua_cocos2dx_gui_auto_api.lua

@@ -1,94 +0,0 @@
---------------------------------
--- @module ccui
-
---------------------------------------------------------
--- the ccui LayoutParameter
--- @field [parent=#ccui] LayoutParameter#LayoutParameter LayoutParameter preloaded module
-
-
---------------------------------------------------------
--- the ccui LinearLayoutParameter
--- @field [parent=#ccui] LinearLayoutParameter#LinearLayoutParameter LinearLayoutParameter preloaded module
-
-
---------------------------------------------------------
--- the ccui RelativeLayoutParameter
--- @field [parent=#ccui] RelativeLayoutParameter#RelativeLayoutParameter RelativeLayoutParameter preloaded module
-
-
---------------------------------------------------------
--- the ccui Widget
--- @field [parent=#ccui] Widget#Widget Widget preloaded module
-
-
---------------------------------------------------------
--- the ccui Layout
--- @field [parent=#ccui] Layout#Layout Layout preloaded module
-
-
---------------------------------------------------------
--- the ccui Button
--- @field [parent=#ccui] Button#Button Button preloaded module
-
-
---------------------------------------------------------
--- the ccui CheckBox
--- @field [parent=#ccui] CheckBox#CheckBox CheckBox preloaded module
-
-
---------------------------------------------------------
--- the ccui ImageView
--- @field [parent=#ccui] ImageView#ImageView ImageView preloaded module
-
-
---------------------------------------------------------
--- the ccui Text
--- @field [parent=#ccui] Text#Text Text preloaded module
-
-
---------------------------------------------------------
--- the ccui TextAtlas
--- @field [parent=#ccui] TextAtlas#TextAtlas TextAtlas preloaded module
-
-
---------------------------------------------------------
--- the ccui LoadingBar
--- @field [parent=#ccui] LoadingBar#LoadingBar LoadingBar preloaded module
-
-
---------------------------------------------------------
--- the ccui ScrollView
--- @field [parent=#ccui] ScrollView#ScrollView ScrollView preloaded module
-
-
---------------------------------------------------------
--- the ccui ListView
--- @field [parent=#ccui] ListView#ListView ListView preloaded module
-
-
---------------------------------------------------------
--- the ccui Slider
--- @field [parent=#ccui] Slider#Slider Slider preloaded module
-
-
---------------------------------------------------------
--- the ccui TextField
--- @field [parent=#ccui] TextField#TextField TextField preloaded module
-
-
---------------------------------------------------------
--- the ccui TextBMFont
--- @field [parent=#ccui] TextBMFont#TextBMFont TextBMFont preloaded module
-
-
---------------------------------------------------------
--- the ccui PageView
--- @field [parent=#ccui] PageView#PageView PageView preloaded module
-
-
---------------------------------------------------------
--- the ccui Helper
--- @field [parent=#ccui] Helper#Helper Helper preloaded module
-
-
-return nil

cocos/scripting/lua-bindings/auto/lua_cocos2dx_gui_auto.cpp.REMOVED.git-id

@@ -1 +0,0 @@
-8a35e56a7f283d9816a34997ab75c41201e1c1da

cocos/scripting/lua-bindings/auto/lua_cocos2dx_ui_auto.cpp.REMOVED.git-id

@@ -0,0 +1 @@
+7ce0f269261b418b148cd10d428bafe18a36d58e

cocos/scripting/lua-bindings/manual/CCLuaEngine.cpp

@@ -33,7 +33,7 @@
 #include "lua_cocos2dx_manual.hpp"
 #include "lua_cocos2dx_extension_manual.h"
 #include "lua_cocos2dx_coco_studio_manual.hpp"
-#include "lua_cocos2dx_gui_manual.hpp"
+#include "lua_cocos2dx_ui_manual.hpp"
 
 NS_CC_BEGIN
 

cocos/scripting/lua-bindings/manual/CCLuaStack.cpp

@@ -63,8 +63,8 @@ extern "C" {
 #include "lua_cocos2dx_spine_manual.hpp"
 #include "lua_cocos2dx_physics_auto.hpp"
 #include "lua_cocos2dx_physics_manual.hpp"
-#include "lua_cocos2dx_gui_auto.hpp"
-#include "lua_cocos2dx_gui_manual.hpp"
+#include "lua_cocos2dx_ui_auto.hpp"
+#include "lua_cocos2dx_ui_manual.hpp"
 
 namespace {
 int lua_print(lua_State * luastate)

cocos/scripting/lua-bindings/manual/lua_cocos2dx_ui_manual.cpp

@@ -21,13 +21,13 @@
  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  THE SOFTWARE.
  ****************************************************************************/
-#include "lua_cocos2dx_gui_manual.hpp"
+#include "lua_cocos2dx_ui_manual.hpp"
 #include "cocos2d.h"
 #include "tolua_fix.h"
 #include "LuaBasicConversions.h"
 #include "LuaScriptHandlerMgr.h"
 #include "CCLuaValue.h"
-#include "CocosGUI.h"
+#include "ui/CocosGUI.h"
 #include "CCLuaEngine.h"
 
 using namespace ui;

cocos/scripting/lua-bindings/proj.ios_mac/cocos2d_lua_bindings.xcodeproj/project.pbxproj

@@ -17,10 +17,6 @@
 		1AACE7BC18BC45C200215002 /* lua_cocos2dx_extension_auto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AACE74C18BC45C200215002 /* lua_cocos2dx_extension_auto.cpp */; };
 		1AACE7BD18BC45C200215002 /* lua_cocos2dx_extension_auto.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 1AACE74D18BC45C200215002 /* lua_cocos2dx_extension_auto.hpp */; };
 		1AACE7BE18BC45C200215002 /* lua_cocos2dx_extension_auto.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 1AACE74D18BC45C200215002 /* lua_cocos2dx_extension_auto.hpp */; };
-		1AACE7C118BC45C200215002 /* lua_cocos2dx_gui_auto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AACE74F18BC45C200215002 /* lua_cocos2dx_gui_auto.cpp */; };
-		1AACE7C218BC45C200215002 /* lua_cocos2dx_gui_auto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AACE74F18BC45C200215002 /* lua_cocos2dx_gui_auto.cpp */; };
-		1AACE7C318BC45C200215002 /* lua_cocos2dx_gui_auto.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 1AACE75018BC45C200215002 /* lua_cocos2dx_gui_auto.hpp */; };
-		1AACE7C418BC45C200215002 /* lua_cocos2dx_gui_auto.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 1AACE75018BC45C200215002 /* lua_cocos2dx_gui_auto.hpp */; };
 		1AACE7C718BC45C200215002 /* lua_cocos2dx_physics_auto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AACE75218BC45C200215002 /* lua_cocos2dx_physics_auto.cpp */; };
 		1AACE7C818BC45C200215002 /* lua_cocos2dx_physics_auto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AACE75218BC45C200215002 /* lua_cocos2dx_physics_auto.cpp */; };
 		1AACE7C918BC45C200215002 /* lua_cocos2dx_physics_auto.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 1AACE75318BC45C200215002 /* lua_cocos2dx_physics_auto.hpp */; };
@@ -69,10 +65,6 @@
 		1AACE7FA18BC45C200215002 /* lua_cocos2dx_extension_manual.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AACE76E18BC45C200215002 /* lua_cocos2dx_extension_manual.cpp */; };
 		1AACE7FB18BC45C200215002 /* lua_cocos2dx_extension_manual.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AACE76F18BC45C200215002 /* lua_cocos2dx_extension_manual.h */; };
 		1AACE7FC18BC45C200215002 /* lua_cocos2dx_extension_manual.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AACE76F18BC45C200215002 /* lua_cocos2dx_extension_manual.h */; };
-		1AACE7FD18BC45C200215002 /* lua_cocos2dx_gui_manual.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AACE77018BC45C200215002 /* lua_cocos2dx_gui_manual.cpp */; };
-		1AACE7FE18BC45C200215002 /* lua_cocos2dx_gui_manual.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AACE77018BC45C200215002 /* lua_cocos2dx_gui_manual.cpp */; };
-		1AACE7FF18BC45C200215002 /* lua_cocos2dx_gui_manual.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 1AACE77118BC45C200215002 /* lua_cocos2dx_gui_manual.hpp */; };
-		1AACE80018BC45C200215002 /* lua_cocos2dx_gui_manual.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 1AACE77118BC45C200215002 /* lua_cocos2dx_gui_manual.hpp */; };
 		1AACE80118BC45C200215002 /* lua_cocos2dx_manual.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AACE77218BC45C200215002 /* lua_cocos2dx_manual.cpp */; };
 		1AACE80218BC45C200215002 /* lua_cocos2dx_manual.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AACE77218BC45C200215002 /* lua_cocos2dx_manual.cpp */; };
 		1AACE80318BC45C200215002 /* lua_cocos2dx_manual.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 1AACE77318BC45C200215002 /* lua_cocos2dx_manual.hpp */; };
@@ -207,6 +199,14 @@
 		1ABCA26F18CD8F7D0087CE3A /* usocket.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ABCA22E18CD8F7D0087CE3A /* usocket.h */; };
 		1ABCA27018CD8F7D0087CE3A /* usocket.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ABCA22E18CD8F7D0087CE3A /* usocket.h */; };
 		1ABCA36318CD9D7F0087CE3A /* libluajit.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1ABCA1F618CD8F5F0087CE3A /* libluajit.a */; };
+		2905FAD018CF12E600240AA3 /* lua_cocos2dx_ui_auto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905FACE18CF12E600240AA3 /* lua_cocos2dx_ui_auto.cpp */; };
+		2905FAD118CF12E600240AA3 /* lua_cocos2dx_ui_auto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905FACE18CF12E600240AA3 /* lua_cocos2dx_ui_auto.cpp */; };
+		2905FAD218CF12E600240AA3 /* lua_cocos2dx_ui_auto.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 2905FACF18CF12E600240AA3 /* lua_cocos2dx_ui_auto.hpp */; };
+		2905FAD318CF12E600240AA3 /* lua_cocos2dx_ui_auto.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 2905FACF18CF12E600240AA3 /* lua_cocos2dx_ui_auto.hpp */; };
+		2905FAD618CF143800240AA3 /* lua_cocos2dx_ui_manual.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905FAD418CF143800240AA3 /* lua_cocos2dx_ui_manual.cpp */; };
+		2905FAD718CF143800240AA3 /* lua_cocos2dx_ui_manual.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905FAD418CF143800240AA3 /* lua_cocos2dx_ui_manual.cpp */; };
+		2905FAD818CF143800240AA3 /* lua_cocos2dx_ui_manual.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 2905FAD518CF143800240AA3 /* lua_cocos2dx_ui_manual.hpp */; };
+		2905FAD918CF143800240AA3 /* lua_cocos2dx_ui_manual.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 2905FAD518CF143800240AA3 /* lua_cocos2dx_ui_manual.hpp */; };
 		C0FEF4D618BE0E70001F446C /* lua_debugger.c in Sources */ = {isa = PBXBuildFile; fileRef = C0FEF4D418BE0E70001F446C /* lua_debugger.c */; };
 		C0FEF4D718BE0E70001F446C /* lua_debugger.c in Sources */ = {isa = PBXBuildFile; fileRef = C0FEF4D418BE0E70001F446C /* lua_debugger.c */; };
 		C0FEF4D818BE0E70001F446C /* lua_debugger.h in Headers */ = {isa = PBXBuildFile; fileRef = C0FEF4D518BE0E70001F446C /* lua_debugger.h */; };
@@ -221,8 +221,6 @@
 		1AACE74A18BC45C200215002 /* lua_cocos2dx_auto.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = lua_cocos2dx_auto.hpp; sourceTree = "<group>"; };
 		1AACE74C18BC45C200215002 /* lua_cocos2dx_extension_auto.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = lua_cocos2dx_extension_auto.cpp; sourceTree = "<group>"; };
 		1AACE74D18BC45C200215002 /* lua_cocos2dx_extension_auto.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = lua_cocos2dx_extension_auto.hpp; sourceTree = "<group>"; };
-		1AACE74F18BC45C200215002 /* lua_cocos2dx_gui_auto.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = lua_cocos2dx_gui_auto.cpp; sourceTree = "<group>"; };
-		1AACE75018BC45C200215002 /* lua_cocos2dx_gui_auto.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = lua_cocos2dx_gui_auto.hpp; sourceTree = "<group>"; };
 		1AACE75218BC45C200215002 /* lua_cocos2dx_physics_auto.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = lua_cocos2dx_physics_auto.cpp; sourceTree = "<group>"; };
 		1AACE75318BC45C200215002 /* lua_cocos2dx_physics_auto.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = lua_cocos2dx_physics_auto.hpp; sourceTree = "<group>"; };
 		1AACE75518BC45C200215002 /* lua_cocos2dx_spine_auto.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = lua_cocos2dx_spine_auto.cpp; sourceTree = "<group>"; };
@@ -247,8 +245,6 @@
 		1AACE76D18BC45C200215002 /* lua_cocos2dx_deprecated.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = lua_cocos2dx_deprecated.h; sourceTree = "<group>"; };
 		1AACE76E18BC45C200215002 /* lua_cocos2dx_extension_manual.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = lua_cocos2dx_extension_manual.cpp; sourceTree = "<group>"; };
 		1AACE76F18BC45C200215002 /* lua_cocos2dx_extension_manual.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = lua_cocos2dx_extension_manual.h; sourceTree = "<group>"; };
-		1AACE77018BC45C200215002 /* lua_cocos2dx_gui_manual.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = lua_cocos2dx_gui_manual.cpp; sourceTree = "<group>"; };
-		1AACE77118BC45C200215002 /* lua_cocos2dx_gui_manual.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = lua_cocos2dx_gui_manual.hpp; sourceTree = "<group>"; };
 		1AACE77218BC45C200215002 /* lua_cocos2dx_manual.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = lua_cocos2dx_manual.cpp; sourceTree = "<group>"; };
 		1AACE77318BC45C200215002 /* lua_cocos2dx_manual.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = lua_cocos2dx_manual.hpp; sourceTree = "<group>"; };
 		1AACE77418BC45C200215002 /* lua_cocos2dx_physics_manual.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = lua_cocos2dx_physics_manual.cpp; sourceTree = "<group>"; };
@@ -317,6 +313,10 @@
 		1ABCA22C18CD8F7D0087CE3A /* unix.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = unix.h; sourceTree = "<group>"; };
 		1ABCA22D18CD8F7D0087CE3A /* usocket.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = usocket.c; sourceTree = "<group>"; };
 		1ABCA22E18CD8F7D0087CE3A /* usocket.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = usocket.h; sourceTree = "<group>"; };
+		2905FACE18CF12E600240AA3 /* lua_cocos2dx_ui_auto.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = lua_cocos2dx_ui_auto.cpp; sourceTree = "<group>"; };
+		2905FACF18CF12E600240AA3 /* lua_cocos2dx_ui_auto.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = lua_cocos2dx_ui_auto.hpp; sourceTree = "<group>"; };
+		2905FAD418CF143800240AA3 /* lua_cocos2dx_ui_manual.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = lua_cocos2dx_ui_manual.cpp; sourceTree = "<group>"; };
+		2905FAD518CF143800240AA3 /* lua_cocos2dx_ui_manual.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = lua_cocos2dx_ui_manual.hpp; sourceTree = "<group>"; };
 		C0FEF4D418BE0E70001F446C /* lua_debugger.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = lua_debugger.c; sourceTree = "<group>"; };
 		C0FEF4D518BE0E70001F446C /* lua_debugger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = lua_debugger.h; sourceTree = "<group>"; };
 /* End PBXFileReference section */
@@ -355,12 +355,12 @@
 		1AACE74818BC45C200215002 /* auto */ = {
 			isa = PBXGroup;
 			children = (
+				2905FACE18CF12E600240AA3 /* lua_cocos2dx_ui_auto.cpp */,
+				2905FACF18CF12E600240AA3 /* lua_cocos2dx_ui_auto.hpp */,
 				1AACE74918BC45C200215002 /* lua_cocos2dx_auto.cpp */,
 				1AACE74A18BC45C200215002 /* lua_cocos2dx_auto.hpp */,
 				1AACE74C18BC45C200215002 /* lua_cocos2dx_extension_auto.cpp */,
 				1AACE74D18BC45C200215002 /* lua_cocos2dx_extension_auto.hpp */,
-				1AACE74F18BC45C200215002 /* lua_cocos2dx_gui_auto.cpp */,
-				1AACE75018BC45C200215002 /* lua_cocos2dx_gui_auto.hpp */,
 				1AACE75218BC45C200215002 /* lua_cocos2dx_physics_auto.cpp */,
 				1AACE75318BC45C200215002 /* lua_cocos2dx_physics_auto.hpp */,
 				1AACE75518BC45C200215002 /* lua_cocos2dx_spine_auto.cpp */,
@@ -375,6 +375,8 @@
 		1AACE75B18BC45C200215002 /* manual */ = {
 			isa = PBXGroup;
 			children = (
+				2905FAD418CF143800240AA3 /* lua_cocos2dx_ui_manual.cpp */,
+				2905FAD518CF143800240AA3 /* lua_cocos2dx_ui_manual.hpp */,
 				1AACE75E18BC45C200215002 /* CCBProxy.cpp */,
 				C0FEF4D418BE0E70001F446C /* lua_debugger.c */,
 				C0FEF4D518BE0E70001F446C /* lua_debugger.h */,
@@ -395,8 +397,6 @@
 				1AACE76D18BC45C200215002 /* lua_cocos2dx_deprecated.h */,
 				1AACE76E18BC45C200215002 /* lua_cocos2dx_extension_manual.cpp */,
 				1AACE76F18BC45C200215002 /* lua_cocos2dx_extension_manual.h */,
-				1AACE77018BC45C200215002 /* lua_cocos2dx_gui_manual.cpp */,
-				1AACE77118BC45C200215002 /* lua_cocos2dx_gui_manual.hpp */,
 				1AACE77218BC45C200215002 /* lua_cocos2dx_manual.cpp */,
 				1AACE77318BC45C200215002 /* lua_cocos2dx_manual.hpp */,
 				1AACE77418BC45C200215002 /* lua_cocos2dx_physics_manual.cpp */,
@@ -581,10 +581,10 @@
 				1ABCA24418CD8F7D0087CE3A /* luasocket_buffer.h in Headers */,
 				1AACE82418BC45C200215002 /* LuaScriptHandlerMgr.h in Headers */,
 				1AACE7FC18BC45C200215002 /* lua_cocos2dx_extension_manual.h in Headers */,
-				1AACE80018BC45C200215002 /* lua_cocos2dx_gui_manual.hpp in Headers */,
+				2905FAD318CF12E600240AA3 /* lua_cocos2dx_ui_auto.hpp in Headers */,
 				1AACE7EC18BC45C200215002 /* CCLuaValue.h in Headers */,
+				2905FAD918CF143800240AA3 /* lua_cocos2dx_ui_manual.hpp in Headers */,
 				1AACE80C18BC45C200215002 /* lua_cocos2dx_spine_manual.hpp in Headers */,
-				1AACE7C418BC45C200215002 /* lua_cocos2dx_gui_auto.hpp in Headers */,
 				1ABCA25018CD8F7D0087CE3A /* options.h in Headers */,
 				1ABCA1F118CD8F470087CE3A /* lualib.h in Headers */,
 				1ABCA20318CD8F6E0087CE3A /* tolua_event.h in Headers */,
@@ -639,10 +639,10 @@
 				1ABCA24318CD8F7D0087CE3A /* luasocket_buffer.h in Headers */,
 				1AACE82318BC45C200215002 /* LuaScriptHandlerMgr.h in Headers */,
 				1AACE7FB18BC45C200215002 /* lua_cocos2dx_extension_manual.h in Headers */,
-				1AACE7FF18BC45C200215002 /* lua_cocos2dx_gui_manual.hpp in Headers */,
+				2905FAD218CF12E600240AA3 /* lua_cocos2dx_ui_auto.hpp in Headers */,
 				1AACE7EB18BC45C200215002 /* CCLuaValue.h in Headers */,
+				2905FAD818CF143800240AA3 /* lua_cocos2dx_ui_manual.hpp in Headers */,
 				1AACE80B18BC45C200215002 /* lua_cocos2dx_spine_manual.hpp in Headers */,
-				1AACE7C318BC45C200215002 /* lua_cocos2dx_gui_auto.hpp in Headers */,
 				1ABCA24F18CD8F7D0087CE3A /* options.h in Headers */,
 				1ABCA1F018CD8F470087CE3A /* lualib.h in Headers */,
 				1ABCA20218CD8F6E0087CE3A /* tolua_event.h in Headers */,
@@ -741,7 +741,6 @@
 				1ABCA24E18CD8F7D0087CE3A /* options.c in Sources */,
 				1A262AB918BEEF5900D2DB92 /* tolua_fix.cpp in Sources */,
 				1AACE81E18BC45C200215002 /* LuaOpengl.cpp in Sources */,
-				1AACE7C218BC45C200215002 /* lua_cocos2dx_gui_auto.cpp in Sources */,
 				1AACE7CE18BC45C200215002 /* lua_cocos2dx_spine_auto.cpp in Sources */,
 				1AACE80218BC45C200215002 /* lua_cocos2dx_manual.cpp in Sources */,
 				1ABCA24618CD8F7D0087CE3A /* luasocket_io.c in Sources */,
@@ -752,6 +751,7 @@
 				1ABCA26618CD8F7D0087CE3A /* udp.c in Sources */,
 				1AACE82218BC45C200215002 /* LuaScriptHandlerMgr.cpp in Sources */,
 				1ABCA23618CD8F7D0087CE3A /* except.c in Sources */,
+				2905FAD718CF143800240AA3 /* lua_cocos2dx_ui_manual.cpp in Sources */,
 				1ABCA26A18CD8F7D0087CE3A /* unix.c in Sources */,
 				1AACE7F218BC45C200215002 /* lua_cocos2dx_coco_studio_manual.cpp in Sources */,
 				1AACE80E18BC45C200215002 /* lua_extensions.c in Sources */,
@@ -769,6 +769,7 @@
 				1AACE7DA18BC45C200215002 /* CCBProxy.cpp in Sources */,
 				1AACE81618BC45C200215002 /* lua_xml_http_request.cpp in Sources */,
 				1ABCA23A18CD8F7D0087CE3A /* inet.c in Sources */,
+				2905FAD118CF12E600240AA3 /* lua_cocos2dx_ui_auto.cpp in Sources */,
 				1AACE7E218BC45C200215002 /* CCLuaEngine.cpp in Sources */,
 				1ABCA26E18CD8F7D0087CE3A /* usocket.c in Sources */,
 				1AACE81218BC45C200215002 /* Lua_web_socket.cpp in Sources */,
@@ -783,7 +784,6 @@
 				1ABCA20718CD8F6E0087CE3A /* tolua_map.c in Sources */,
 				1ABCA25618CD8F7D0087CE3A /* serial.c in Sources */,
 				1ABCA20B18CD8F6E0087CE3A /* tolua_to.c in Sources */,
-				1AACE7FE18BC45C200215002 /* lua_cocos2dx_gui_manual.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -798,7 +798,6 @@
 				1ABCA24D18CD8F7D0087CE3A /* options.c in Sources */,
 				1A262AB818BEEF5900D2DB92 /* tolua_fix.cpp in Sources */,
 				1AACE81D18BC45C200215002 /* LuaOpengl.cpp in Sources */,
-				1AACE7C118BC45C200215002 /* lua_cocos2dx_gui_auto.cpp in Sources */,
 				1AACE7CD18BC45C200215002 /* lua_cocos2dx_spine_auto.cpp in Sources */,
 				1AACE80118BC45C200215002 /* lua_cocos2dx_manual.cpp in Sources */,
 				1ABCA24518CD8F7D0087CE3A /* luasocket_io.c in Sources */,
@@ -809,6 +808,7 @@
 				1ABCA26518CD8F7D0087CE3A /* udp.c in Sources */,
 				1AACE82118BC45C200215002 /* LuaScriptHandlerMgr.cpp in Sources */,
 				1ABCA23518CD8F7D0087CE3A /* except.c in Sources */,
+				2905FAD618CF143800240AA3 /* lua_cocos2dx_ui_manual.cpp in Sources */,
 				1ABCA26918CD8F7D0087CE3A /* unix.c in Sources */,
 				1AACE7F118BC45C200215002 /* lua_cocos2dx_coco_studio_manual.cpp in Sources */,
 				1AACE80D18BC45C200215002 /* lua_extensions.c in Sources */,
@@ -826,6 +826,7 @@
 				1AACE7D918BC45C200215002 /* CCBProxy.cpp in Sources */,
 				1AACE81518BC45C200215002 /* lua_xml_http_request.cpp in Sources */,
 				1ABCA23918CD8F7D0087CE3A /* inet.c in Sources */,
+				2905FAD018CF12E600240AA3 /* lua_cocos2dx_ui_auto.cpp in Sources */,
 				1AACE7E118BC45C200215002 /* CCLuaEngine.cpp in Sources */,
 				1ABCA26D18CD8F7D0087CE3A /* usocket.c in Sources */,
 				1AACE81118BC45C200215002 /* Lua_web_socket.cpp in Sources */,
@@ -840,7 +841,6 @@
 				1ABCA20618CD8F6E0087CE3A /* tolua_map.c in Sources */,
 				1ABCA25518CD8F7D0087CE3A /* serial.c in Sources */,
 				1ABCA20A18CD8F6E0087CE3A /* tolua_to.c in Sources */,
-				1AACE7FD18BC45C200215002 /* lua_cocos2dx_gui_manual.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -881,7 +881,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = macosx;
 				SKIP_INSTALL = YES;
-				USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/../../../.. $(SRCROOT)/../../.. $(SRCROOT)/../../../base $(SRCROOT)/../../../2d $(SRCROOT)/../../../physics $(SRCROOT)/../../../math/kazmath $(SRCROOT)/../../../2d/platform $(SRCROOT)/../../../audio/include $(SRCROOT)/../../../editor-support $(SRCROOT)/../../../editor-support/spine $(SRCROOT)/../../../editor-support/cocostudio $(SRCROOT)/../../../editor-support/cocosbuilder $(SRCROOT)/../../../gui $(SRCROOT)/../../../storage $(SRCROOT)/../../../../extensions $(SRCROOT)/../../../../external $(SRCROOT)/../../../../external/chipmunk/include/chipmunk $(SRCROOT)/../../../../external/lua $(SRCROOT)/../../../../external/lua/luajit/include $(SRCROOT)/../../../../external/lua/tolua";
+				USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/../../../.. $(SRCROOT)/../../.. $(SRCROOT)/../../../base $(SRCROOT)/../../../2d $(SRCROOT)/../../../physics $(SRCROOT)/../../../math/kazmath $(SRCROOT)/../../../2d/platform $(SRCROOT)/../../../audio/include $(SRCROOT)/../../../editor-support $(SRCROOT)/../../../editor-support/spine $(SRCROOT)/../../../editor-support/cocostudio $(SRCROOT)/../../../editor-support/cocosbuilder $(SRCROOT)/../../../ui $(SRCROOT)/../../../storage $(SRCROOT)/../../../../extensions $(SRCROOT)/../../../../external $(SRCROOT)/../../../../external/chipmunk/include/chipmunk $(SRCROOT)/../../../../external/lua $(SRCROOT)/../../../../external/lua/luajit/include $(SRCROOT)/../../../../external/lua/tolua";
 			};
 			name = Debug;
 		};
@@ -914,7 +914,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = macosx;
 				SKIP_INSTALL = YES;
-				USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/../../../.. $(SRCROOT)/../../.. $(SRCROOT)/../../../base $(SRCROOT)/../../../2d $(SRCROOT)/../../../physics $(SRCROOT)/../../../math/kazmath $(SRCROOT)/../../../2d/platform $(SRCROOT)/../../../audio/include $(SRCROOT)/../../../editor-support $(SRCROOT)/../../../editor-support/spine $(SRCROOT)/../../../editor-support/cocostudio $(SRCROOT)/../../../editor-support/cocosbuilder $(SRCROOT)/../../../gui $(SRCROOT)/../../../storage $(SRCROOT)/../../../../extensions $(SRCROOT)/../../../../external $(SRCROOT)/../../../../external/chipmunk/include/chipmunk $(SRCROOT)/../../../../external/lua $(SRCROOT)/../../../../external/lua/luajit/include $(SRCROOT)/../../../../external/lua/tolua";
+				USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/../../../.. $(SRCROOT)/../../.. $(SRCROOT)/../../../base $(SRCROOT)/../../../2d $(SRCROOT)/../../../physics $(SRCROOT)/../../../math/kazmath $(SRCROOT)/../../../2d/platform $(SRCROOT)/../../../audio/include $(SRCROOT)/../../../editor-support $(SRCROOT)/../../../editor-support/spine $(SRCROOT)/../../../editor-support/cocostudio $(SRCROOT)/../../../editor-support/cocosbuilder $(SRCROOT)/../../../ui $(SRCROOT)/../../../storage $(SRCROOT)/../../../../extensions $(SRCROOT)/../../../../external $(SRCROOT)/../../../../external/chipmunk/include/chipmunk $(SRCROOT)/../../../../external/lua $(SRCROOT)/../../../../external/lua/luajit/include $(SRCROOT)/../../../../external/lua/tolua";
 				VALIDATE_PRODUCT = YES;
 			};
 			name = Release;

cocos/scripting/lua-bindings/proj.win32/liblua.vcxproj

@@ -32,10 +32,10 @@
     <ClCompile Include="..\..\..\..\external\lua\tolua\tolua_to.c" />
     <ClCompile Include="..\auto\lua_cocos2dx_auto.cpp" />
     <ClCompile Include="..\auto\lua_cocos2dx_extension_auto.cpp" />
-    <ClCompile Include="..\auto\lua_cocos2dx_gui_auto.cpp" />
     <ClCompile Include="..\auto\lua_cocos2dx_physics_auto.cpp" />
     <ClCompile Include="..\auto\lua_cocos2dx_spine_auto.cpp" />
     <ClCompile Include="..\auto\lua_cocos2dx_studio_auto.cpp" />
+    <ClCompile Include="..\auto\lua_cocos2dx_ui_auto.cpp" />
     <ClCompile Include="..\manual\CCBProxy.cpp" />
     <ClCompile Include="..\manual\CCLuaBridge.cpp" />
     <ClCompile Include="..\manual\CCLuaEngine.cpp" />
@@ -49,10 +49,10 @@
     <ClCompile Include="..\manual\lua_cocos2dx_coco_studio_manual.cpp" />
     <ClCompile Include="..\manual\lua_cocos2dx_deprecated.cpp" />
     <ClCompile Include="..\manual\lua_cocos2dx_extension_manual.cpp" />
-    <ClCompile Include="..\manual\lua_cocos2dx_gui_manual.cpp" />
     <ClCompile Include="..\manual\lua_cocos2dx_manual.cpp" />
     <ClCompile Include="..\manual\lua_cocos2dx_physics_manual.cpp" />
     <ClCompile Include="..\manual\lua_cocos2dx_spine_manual.cpp" />
+    <ClCompile Include="..\manual\lua_cocos2dx_ui_manual.cpp" />
     <ClCompile Include="..\manual\lua_debugger.c" />
     <ClCompile Include="..\manual\lua_extensions.c" />
     <ClCompile Include="..\manual\Lua_web_socket.cpp" />
@@ -83,10 +83,10 @@
     <ClInclude Include="..\..\..\..\external\lua\tolua\tolua_event.h" />
     <ClInclude Include="..\auto\lua_cocos2dx_auto.hpp" />
     <ClInclude Include="..\auto\lua_cocos2dx_extension_auto.hpp" />
-    <ClInclude Include="..\auto\lua_cocos2dx_gui_auto.hpp" />
     <ClInclude Include="..\auto\lua_cocos2dx_physics_auto.hpp" />
     <ClInclude Include="..\auto\lua_cocos2dx_spine_auto.hpp" />
     <ClInclude Include="..\auto\lua_cocos2dx_studio_auto.hpp" />
+    <ClInclude Include="..\auto\lua_cocos2dx_ui_auto.hpp" />
     <ClInclude Include="..\manual\CCBProxy.h" />
     <ClInclude Include="..\manual\CCLuaBridge.h" />
     <ClInclude Include="..\manual\CCLuaEngine.h" />
@@ -100,10 +100,10 @@
     <ClInclude Include="..\manual\lua_cocos2dx_coco_studio_manual.hpp" />
     <ClInclude Include="..\manual\lua_cocos2dx_deprecated.h" />
     <ClInclude Include="..\manual\lua_cocos2dx_extension_manual.h" />
-    <ClInclude Include="..\manual\lua_cocos2dx_gui_manual.hpp" />
     <ClInclude Include="..\manual\lua_cocos2dx_manual.hpp" />
     <ClInclude Include="..\manual\lua_cocos2dx_physics_manual.hpp" />
     <ClInclude Include="..\manual\lua_cocos2dx_spine_manual.hpp" />
+    <ClInclude Include="..\manual\lua_cocos2dx_ui_manual.hpp" />
     <ClInclude Include="..\manual\lua_debugger.h" />
     <ClInclude Include="..\manual\lua_extensions.h" />
     <ClInclude Include="..\manual\Lua_web_socket.h" />

cocos/scripting/lua-bindings/proj.win32/liblua.vcxproj.filters

@@ -21,7 +21,7 @@
     <ClCompile Include="..\auto\lua_cocos2dx_extension_auto.cpp">
       <Filter>auto</Filter>
     </ClCompile>
-    <ClCompile Include="..\auto\lua_cocos2dx_gui_auto.cpp">
+    <ClCompile Include="..\auto\lua_cocos2dx_ui_auto.cpp">
       <Filter>auto</Filter>
     </ClCompile>
     <ClCompile Include="..\auto\lua_cocos2dx_physics_auto.cpp">
@@ -60,7 +60,7 @@
     <ClCompile Include="..\manual\lua_cocos2dx_extension_manual.cpp">
       <Filter>manual</Filter>
     </ClCompile>
-    <ClCompile Include="..\manual\lua_cocos2dx_gui_manual.cpp">
+    <ClCompile Include="..\manual\lua_cocos2dx_ui_manual.cpp">
       <Filter>manual</Filter>
     </ClCompile>
     <ClCompile Include="..\manual\lua_cocos2dx_manual.cpp">
@@ -164,7 +164,7 @@
     <ClInclude Include="..\auto\lua_cocos2dx_extension_auto.hpp">
       <Filter>auto</Filter>
     </ClInclude>
-    <ClInclude Include="..\auto\lua_cocos2dx_gui_auto.hpp">
+    <ClInclude Include="..\auto\lua_cocos2dx_ui_auto.hpp">
       <Filter>auto</Filter>
     </ClInclude>
     <ClInclude Include="..\auto\lua_cocos2dx_physics_auto.hpp">
@@ -203,7 +203,7 @@
     <ClInclude Include="..\manual\lua_cocos2dx_extension_manual.h">
       <Filter>manual</Filter>
     </ClInclude>
-    <ClInclude Include="..\manual\lua_cocos2dx_gui_manual.hpp">
+    <ClInclude Include="..\manual\lua_cocos2dx_ui_manual.hpp">
       <Filter>manual</Filter>
     </ClInclude>
     <ClInclude Include="..\manual\lua_cocos2dx_manual.hpp">
@@ -362,4 +362,4 @@
       <Filter>script</Filter>
     </None>
   </ItemGroup>
-</Project>
+</Project>

cocos/ui/Android.mk

@@ -1,9 +1,9 @@
 LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 
-LOCAL_MODULE := cocos_gui_static
+LOCAL_MODULE := cocos_ui_static
 
-LOCAL_MODULE_FILENAME := libgui
+LOCAL_MODULE_FILENAME := libui
 
 LOCAL_SRC_FILES := \
 UIWidget.cpp \

cocos/ui/CMakeLists.txt

@@ -20,11 +20,11 @@ set(GUI_SRC
   UIRichText.cpp
 )
 
-add_library(gui STATIC
+add_library(ui STATIC
   ${GUI_SRC}
 )
 
-set_target_properties(gui
+set_target_properties(ui
     PROPERTIES
     ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
     LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"

cocos/ui/CocosGUI.cpp

@@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 ****************************************************************************/
 
-#include "gui/CocosGUI.h"
+#include "ui/CocosGUI.h"
 
 NS_CC_BEGIN
 

cocos/ui/CocosGUI.h

@@ -26,22 +26,22 @@ THE SOFTWARE.
 #define __COCOSGUI_H__
 
 
-#include "gui/UIWidget.h"
-#include "gui/UILayout.h"
-#include "gui/UIButton.h"
-#include "gui/UICheckBox.h"
-#include "gui/UIImageView.h"
-#include "gui/UIText.h"
-#include "gui/UITextAtlas.h"
-#include "gui/UILoadingBar.h"
-#include "gui/UIScrollView.h"
-#include "gui/UIListView.h"
-#include "gui/UISlider.h"
-#include "gui/UITextField.h"
-#include "gui/UITextBMFont.h"
-#include "gui/UIPageView.h"
-#include "gui/UIHelper.h"
-#include "gui/UIRichText.h"
+#include "ui/UIWidget.h"
+#include "ui/UILayout.h"
+#include "ui/UIButton.h"
+#include "ui/UICheckBox.h"
+#include "ui/UIImageView.h"
+#include "ui/UIText.h"
+#include "ui/UITextAtlas.h"
+#include "ui/UILoadingBar.h"
+#include "ui/UIScrollView.h"
+#include "ui/UIListView.h"
+#include "ui/UISlider.h"
+#include "ui/UITextField.h"
+#include "ui/UITextBMFont.h"
+#include "ui/UIPageView.h"
+#include "ui/UIHelper.h"
+#include "ui/UIRichText.h"
 
 NS_CC_BEGIN
 namespace ui {

cocos/ui/UIButton.cpp

@@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 ****************************************************************************/
 
-#include "gui/UIButton.h"
+#include "ui/UIButton.h"
 #include "extensions/GUI/CCControlExtension/CCScale9Sprite.h"
 
 NS_CC_BEGIN

cocos/ui/UIButton.h

@@ -25,7 +25,7 @@ THE SOFTWARE.
 #ifndef __UIBUTTON_H__
 #define __UIBUTTON_H__
 
-#include "gui/UIWidget.h"
+#include "ui/UIWidget.h"
 
 NS_CC_BEGIN
 

cocos/ui/UICheckBox.cpp

@@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 ****************************************************************************/
 
-#include "gui/UICheckBox.h"
+#include "ui/UICheckBox.h"
 
 NS_CC_BEGIN
 

cocos/ui/UICheckBox.h

@@ -25,7 +25,7 @@ THE SOFTWARE.
 #ifndef __UICHECKBOX_H__
 #define __UICHECKBOX_H__
 
-#include "gui/UIWidget.h"
+#include "ui/UIWidget.h"
 
 NS_CC_BEGIN
 

cocos/ui/UIImageView.cpp

@@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 ****************************************************************************/
 
-#include "gui/UIImageView.h"
+#include "ui/UIImageView.h"
 #include "extensions/GUI/CCControlExtension/CCScale9Sprite.h"
 
 NS_CC_BEGIN

cocos/ui/UIImageView.h

@@ -25,7 +25,7 @@ THE SOFTWARE.
 #ifndef __UIIMAGEVIEW_H__
 #define __UIIMAGEVIEW_H__
 
-#include "gui/UIWidget.h"
+#include "ui/UIWidget.h"
 
 NS_CC_BEGIN
 

cocos/ui/UILayout.cpp

@@ -22,8 +22,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 ****************************************************************************/
 
-#include "gui/UILayout.h"
-#include "gui/UIHelper.h"
+#include "ui/UILayout.h"
+#include "ui/UIHelper.h"
 #include "extensions/GUI/CCControlExtension/CCScale9Sprite.h"
 #include "kazmath/GL/matrix.h"
 #include "CCGLProgram.h"

cocos/ui/UILayout.h

@@ -25,7 +25,7 @@ THE SOFTWARE.
 #ifndef __LAYOUT_H__
 #define __LAYOUT_H__
 
-#include "gui/UIWidget.h"
+#include "ui/UIWidget.h"
 
 NS_CC_BEGIN
 

cocos/ui/UILayoutParameter.cpp

@@ -22,8 +22,8 @@
  THE SOFTWARE.
  ****************************************************************************/
 
-#include "gui/UILayoutParameter.h"
-#include "gui/UILayout.h"
+#include "ui/UILayoutParameter.h"
+#include "ui/UILayout.h"
 
 NS_CC_BEGIN
 

cocos/ui/UILayoutParameter.h

@@ -25,7 +25,7 @@
 #ifndef __LAYOUTPARMETER_H__
 #define __LAYOUTPARMETER_H__
 
-#include "gui/UILayoutDefine.h"
+#include "ui/UILayoutDefine.h"
 
 NS_CC_BEGIN
 

cocos/ui/UIListView.cpp

@@ -22,8 +22,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 ****************************************************************************/
 
-#include "gui/UIListView.h"
-#include "gui/UIHelper.h"
+#include "ui/UIListView.h"
+#include "ui/UIHelper.h"
 #include "extensions/GUI/CCControlExtension/CCScale9Sprite.h"
 
 NS_CC_BEGIN

cocos/ui/UIListView.h

@@ -26,7 +26,7 @@ THE SOFTWARE.
 #ifndef __UILISTVIEW_H__
 #define __UILISTVIEW_H__
 
-#include "gui/UIScrollView.h"
+#include "ui/UIScrollView.h"
 
 NS_CC_BEGIN
 

cocos/ui/UILoadingBar.cpp

@@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 ****************************************************************************/
 
-#include "gui/UILoadingBar.h"
+#include "ui/UILoadingBar.h"
 #include "extensions/GUI/CCControlExtension/CCScale9Sprite.h"
 
 NS_CC_BEGIN

cocos/ui/UILoadingBar.h

@@ -25,7 +25,7 @@ THE SOFTWARE.
 #ifndef __UILOADINGBAR_H__
 #define __UILOADINGBAR_H__
 
-#include "gui/UIWidget.h"
+#include "ui/UIWidget.h"
 
 NS_CC_BEGIN
 

cocos/ui/UIPageView.cpp

@@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 ****************************************************************************/
 
-#include "gui/UIPageView.h"
+#include "ui/UIPageView.h"
 
 NS_CC_BEGIN
 

cocos/ui/UIPageView.h

@@ -25,8 +25,8 @@ THE SOFTWARE.
 #ifndef __UIPAGEVIEW_H__
 #define __UIPAGEVIEW_H__
 
-#include "gui/UILayout.h"
-#include "gui/UIScrollInterface.h"
+#include "ui/UILayout.h"
+#include "ui/UIScrollInterface.h"
 
 NS_CC_BEGIN
 

cocos/ui/UIRichText.h

@@ -25,7 +25,7 @@
 #ifndef __UIRICHTEXT_H__
 #define __UIRICHTEXT_H__
 
-#include "gui/UIWidget.h"
+#include "ui/UIWidget.h"
 
 NS_CC_BEGIN
 

cocos/ui/UIScrollInterface.h

@@ -25,7 +25,7 @@ THE SOFTWARE.
 #ifndef __UISCROLLDELEGATE_H__
 #define __UISCROLLDELEGATE_H__
 
-#include "gui/UIWidget.h"
+#include "ui/UIWidget.h"
 
 NS_CC_BEGIN
 

cocos/ui/UIScrollView.cpp

@@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 ****************************************************************************/
 
-#include "gui/UIScrollView.h"
+#include "ui/UIScrollView.h"
 
 NS_CC_BEGIN
 

cocos/ui/UIScrollView.h

@@ -25,8 +25,8 @@ THE SOFTWARE.
 #ifndef __UISCROLLVIEW_H__
 #define __UISCROLLVIEW_H__
 
-#include "gui/UILayout.h"
-#include "gui/UIScrollInterface.h"
+#include "ui/UILayout.h"
+#include "ui/UIScrollInterface.h"
 
 NS_CC_BEGIN
 

cocos/ui/UISlider.cpp

@@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 ****************************************************************************/
 
-#include "gui/UISlider.h"
+#include "ui/UISlider.h"
 #include "extensions/GUI/CCControlExtension/CCScale9Sprite.h"
 
 NS_CC_BEGIN

cocos/ui/UISlider.h

@@ -25,7 +25,7 @@ THE SOFTWARE.
 #ifndef __UISLIDER_H__
 #define __UISLIDER_H__
 
-#include "gui/UIWidget.h"
+#include "ui/UIWidget.h"
 
 NS_CC_BEGIN
 

cocos/ui/UIText.cpp

@@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 ****************************************************************************/
 
-#include "gui/UIText.h"
+#include "ui/UIText.h"
 
 NS_CC_BEGIN
 

cocos/ui/UIText.h

@@ -25,7 +25,7 @@ THE SOFTWARE.
 #ifndef __UILABEL_H__
 #define __UILABEL_H__
 
-#include "gui/UIWidget.h"
+#include "ui/UIWidget.h"
 
 NS_CC_BEGIN
 

cocos/ui/UITextAtlas.cpp

@@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 ****************************************************************************/
 
-#include "gui/UITextAtlas.h"
+#include "ui/UITextAtlas.h"
 
 NS_CC_BEGIN
 

cocos/ui/UITextAtlas.h

@@ -25,7 +25,7 @@ THE SOFTWARE.
 #ifndef __UILABELATLAS_H__
 #define __UILABELATLAS_H__
 
-#include "gui/UIWidget.h"
+#include "ui/UIWidget.h"
 
 NS_CC_BEGIN
 

cocos/ui/UITextBMFont.cpp

@@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 ****************************************************************************/
 
-#include "gui/UITextBMFont.h"
+#include "ui/UITextBMFont.h"
 
 NS_CC_BEGIN
 

cocos/ui/UITextBMFont.h

@@ -25,7 +25,7 @@ THE SOFTWARE.
 #ifndef __UILABELBMFONT_H__
 #define __UILABELBMFONT_H__
 
-#include "gui/UIWidget.h"
+#include "ui/UIWidget.h"
 
 NS_CC_BEGIN
 

cocos/ui/UITextField.cpp

@@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 ****************************************************************************/
 
-#include "gui/UITextField.h"
+#include "ui/UITextField.h"
 
 NS_CC_BEGIN
 

cocos/ui/UITextField.h

@@ -25,7 +25,7 @@ THE SOFTWARE.
 #ifndef __UITEXTFIELD_H__
 #define __UITEXTFIELD_H__
 
-#include "gui/UIWidget.h"
+#include "ui/UIWidget.h"
 
 NS_CC_BEGIN
 

cocos/ui/UIWidget.cpp

@@ -22,9 +22,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 ****************************************************************************/
 
-#include "gui/UIWidget.h"
-#include "gui/UILayout.h"
-#include "gui/UIHelper.h"
+#include "ui/UIWidget.h"
+#include "ui/UILayout.h"
+#include "ui/UIHelper.h"
 
 NS_CC_BEGIN
 

cocos/ui/UIWidget.h

@@ -26,9 +26,9 @@ THE SOFTWARE.
 #define __UIWIDGET_H__
 
 #include "CCNode.h"
-#include "gui/UILayoutDefine.h"
-#include "gui/UILayoutParameter.h"
-#include "gui/GUIDefine.h"
+#include "ui/UILayoutDefine.h"
+#include "ui/UILayoutParameter.h"
+#include "ui/GUIDefine.h"
 
 NS_CC_BEGIN
 

cocos/ui/WidgetReader/ButtonReader/ButtonReader.cpp

@@ -1,7 +1,7 @@
 
 
 #include "ButtonReader.h"
-#include "gui/UIButton.h"
+#include "ui/UIButton.h"
 
 namespace cocostudio
 {

cocos/ui/WidgetReader/CheckBoxReader/CheckBoxReader.cpp

@@ -1,12 +1,12 @@
 
 
 #include "CheckBoxReader.h"
-#include "gui/UICheckBox.h"
+#include "ui/UICheckBox.h"
 
 namespace cocostudio
 {
     static CheckBoxReader* instanceCheckBoxReader = NULL;
-    
+    using cocos2d::ui::CheckBox;
     IMPLEMENT_CLASS_WIDGET_READER_INFO(CheckBoxReader)
     
     CheckBoxReader::CheckBoxReader()

cocos/ui/WidgetReader/ImageViewReader/ImageViewReader.cpp

@@ -1,7 +1,7 @@
 
 
 #include "ImageViewReader.h"
-#include "gui/UIImageView.h"
+#include "ui/UIImageView.h"
 
 namespace cocostudio
 {

cocos/ui/WidgetReader/LayoutReader/LayoutReader.cpp

@@ -1,7 +1,7 @@
 
 
 #include "LayoutReader.h"
-#include "gui/UILayout.h"
+#include "ui/UILayout.h"
 
 namespace cocostudio
 {
@@ -28,7 +28,7 @@ namespace cocostudio
         return instanceLayoutReader;
     }
     
-    void LayoutReader::setPropsFromJsonDictionary(gui::Widget *widget, const rapidjson::Value &options)
+    void LayoutReader::setPropsFromJsonDictionary(ui::Widget *widget, const rapidjson::Value &options)
     {
         WidgetReader::setPropsFromJsonDictionary(widget, options);
         

cocos/ui/WidgetReader/ListViewReader/ListViewReader.cpp

@@ -1,7 +1,7 @@
 
 
 #include "ListViewReader.h"
-#include "gui/UIListView.h"
+#include "ui/UIListView.h"
 
 namespace cocostudio
 {
@@ -28,7 +28,7 @@ namespace cocostudio
         return instanceListViewReader;
     }
     
-    void ListViewReader::setPropsFromJsonDictionary(gui::Widget *widget, const rapidjson::Value &options)
+    void ListViewReader::setPropsFromJsonDictionary(ui::Widget *widget, const rapidjson::Value &options)
     {
         ScrollViewReader::setPropsFromJsonDictionary(widget, options);
         

cocos/ui/WidgetReader/LoadingBarReader/LoadingBarReader.cpp

@@ -1,7 +1,7 @@
 
 
 #include "LoadingBarReader.h"
-#include "gui/UILoadingBar.h"
+#include "ui/UILoadingBar.h"
 
 namespace cocostudio
 {

cocos/ui/WidgetReader/PageViewReader/PageViewReader.cpp

@@ -1,7 +1,7 @@
 
 
 #include "PageViewReader.h"
-#include "gui/UIPageView.h"
+#include "ui/UIPageView.h"
 
 namespace cocostudio
 {
@@ -28,7 +28,7 @@ namespace cocostudio
         return instancePageViewReader;
     }
     
-    void PageViewReader::setPropsFromJsonDictionary(gui::Widget *widget, const rapidjson::Value &options)
+    void PageViewReader::setPropsFromJsonDictionary(ui::Widget *widget, const rapidjson::Value &options)
     {
         LayoutReader::setPropsFromJsonDictionary(widget, options);
     }

cocos/ui/WidgetReader/PageViewReader/PageViewReader.h

@@ -40,7 +40,7 @@ namespace cocostudio
         static PageViewReader* getInstance();
         static void purge();
         
-        virtual void setPropsFromJsonDictionary(gui::Widget* widget, const rapidjson::Value& options);
+        virtual void setPropsFromJsonDictionary(ui::Widget* widget, const rapidjson::Value& options);
     };
 }
 

cocos/ui/WidgetReader/ScrollViewReader/ScrollViewReader.cpp

@@ -1,7 +1,7 @@
 
 
 #include "ScrollViewReader.h"
-#include "gui/UIScrollView.h"
+#include "ui/UIScrollView.h"
 
 namespace cocostudio
 {

cocos/ui/WidgetReader/SliderReader/SliderReader.cpp

@@ -1,7 +1,7 @@
 
 
 #include "SliderReader.h"
-#include "gui/UISlider.h"
+#include "ui/UISlider.h"
 
 namespace cocostudio
 {

cocos/ui/WidgetReader/TextAtlasReader/TextAtlasReader.cpp

@@ -1,7 +1,7 @@
 
 
 #include "TextAtlasReader.h"
-#include "gui/UITextAtlas.h"
+#include "ui/UITextAtlas.h"
 
 namespace cocostudio
 {

cocos/ui/WidgetReader/TextBMFontReader/TextBMFontReader.cpp

@@ -1,7 +1,7 @@
 
 
 #include "TextBMFontReader.h"
-#include "gui/UITextBMFont.h"
+#include "ui/UITextBMFont.h"
 
 namespace cocostudio
 {