From b8fa32dbc0dfdcc3418dab9cc85c66b79d66e6cf Mon Sep 17 00:00:00 2001 From: Walzer Date: Mon, 30 Jul 2012 22:57:59 +0800 Subject: [PATCH] use extensions/GUI instead of extensions/UI --- extensions/Android.mk | 26 ++++----- extensions/CCBReader/CCControlButtonLoader.h | 2 +- extensions/CCBReader/CCControlLoader.h | 2 +- extensions/CCBReader/CCNodeLoader.h | 2 +- extensions/CCBReader/CCScale9SpriteLoader.h | 2 +- extensions/CCBReader/CCScrollViewLoader.h | 2 +- .../CCControlExtension/CCControl.cpp | 0 .../CCControlExtension/CCControl.h | 0 .../CCControlExtension/CCControlButton.cpp | 0 .../CCControlExtension/CCControlButton.h | 0 .../CCControlColourPicker.cpp | 0 .../CCControlColourPicker.h | 0 .../CCControlExtension/CCControlExtensions.h | 0 .../CCControlExtension/CCControlHuePicker.cpp | 0 .../CCControlExtension/CCControlHuePicker.h | 0 .../CCControlSaturationBrightnessPicker.cpp | 0 .../CCControlSaturationBrightnessPicker.h | 0 .../CCControlExtension/CCControlSlider.cpp | 0 .../CCControlExtension/CCControlSlider.h | 0 .../CCControlExtension/CCControlSwitch.cpp | 0 .../CCControlExtension/CCControlSwitch.h | 0 .../CCControlExtension/CCControlUtils.cpp | 0 .../CCControlExtension/CCControlUtils.h | 0 .../CCControlExtension/CCInvocation.cpp | 0 .../CCControlExtension/CCInvocation.h | 0 .../CCControlExtension/CCMenuPassive.cpp | 0 .../CCControlExtension/CCMenuPassive.h | 0 .../CCControlExtension/CCScale9Sprite.cpp | 0 .../CCControlExtension/CCScale9Sprite.h | 0 .../CCControlExtension/CCSpacer.cpp | 0 .../{UI => GUI}/CCControlExtension/CCSpacer.h | 0 .../{UI => GUI}/CCScrollView/CCScrollView.cpp | 0 .../{UI => GUI}/CCScrollView/CCScrollView.h | 0 extensions/cocos-ext.h | 24 ++++---- extensions/proj.win32/libExtensions.vcproj | 56 +++++++++---------- extensions/proj.win32/libExtensions.vcxproj | 56 +++++++++---------- .../proj.win32/libExtensions.vcxproj.filters | 56 +++++++++---------- .../project.pbxproj.REMOVED.git-id | 2 +- .../project.pbxproj.REMOVED.git-id | 2 +- 39 files changed, 116 insertions(+), 116 deletions(-) rename extensions/{UI => GUI}/CCControlExtension/CCControl.cpp (100%) rename extensions/{UI => GUI}/CCControlExtension/CCControl.h (100%) rename extensions/{UI => GUI}/CCControlExtension/CCControlButton.cpp (100%) rename extensions/{UI => GUI}/CCControlExtension/CCControlButton.h (100%) rename extensions/{UI => GUI}/CCControlExtension/CCControlColourPicker.cpp (100%) rename extensions/{UI => GUI}/CCControlExtension/CCControlColourPicker.h (100%) rename extensions/{UI => GUI}/CCControlExtension/CCControlExtensions.h (100%) rename extensions/{UI => GUI}/CCControlExtension/CCControlHuePicker.cpp (100%) rename extensions/{UI => GUI}/CCControlExtension/CCControlHuePicker.h (100%) rename extensions/{UI => GUI}/CCControlExtension/CCControlSaturationBrightnessPicker.cpp (100%) rename extensions/{UI => GUI}/CCControlExtension/CCControlSaturationBrightnessPicker.h (100%) rename extensions/{UI => GUI}/CCControlExtension/CCControlSlider.cpp (100%) rename extensions/{UI => GUI}/CCControlExtension/CCControlSlider.h (100%) rename extensions/{UI => GUI}/CCControlExtension/CCControlSwitch.cpp (100%) rename extensions/{UI => GUI}/CCControlExtension/CCControlSwitch.h (100%) rename extensions/{UI => GUI}/CCControlExtension/CCControlUtils.cpp (100%) rename extensions/{UI => GUI}/CCControlExtension/CCControlUtils.h (100%) rename extensions/{UI => GUI}/CCControlExtension/CCInvocation.cpp (100%) rename extensions/{UI => GUI}/CCControlExtension/CCInvocation.h (100%) rename extensions/{UI => GUI}/CCControlExtension/CCMenuPassive.cpp (100%) rename extensions/{UI => GUI}/CCControlExtension/CCMenuPassive.h (100%) rename extensions/{UI => GUI}/CCControlExtension/CCScale9Sprite.cpp (100%) rename extensions/{UI => GUI}/CCControlExtension/CCScale9Sprite.h (100%) rename extensions/{UI => GUI}/CCControlExtension/CCSpacer.cpp (100%) rename extensions/{UI => GUI}/CCControlExtension/CCSpacer.h (100%) rename extensions/{UI => GUI}/CCScrollView/CCScrollView.cpp (100%) rename extensions/{UI => GUI}/CCScrollView/CCScrollView.h (100%) diff --git a/extensions/Android.mk b/extensions/Android.mk index 1c7d37a369..d734526085 100644 --- a/extensions/Android.mk +++ b/extensions/Android.mk @@ -22,19 +22,19 @@ CCBReader/CCParticleSystemQuadLoader.cpp \ CCBReader/CCScale9SpriteLoader.cpp \ CCBReader/CCScrollViewLoader.cpp \ CCBReader/CCSpriteLoader.cpp \ -UI/CCControlExtension/CCControl.cpp \ -UI/CCControlExtension/CCControlButton.cpp \ -UI/CCControlExtension/CCControlColourPicker.cpp \ -UI/CCControlExtension/CCControlHuePicker.cpp \ -UI/CCControlExtension/CCControlSaturationBrightnessPicker.cpp \ -UI/CCControlExtension/CCControlSlider.cpp \ -UI/CCControlExtension/CCControlSwitch.cpp \ -UI/CCControlExtension/CCControlUtils.cpp \ -UI/CCControlExtension/CCInvocation.cpp \ -UI/CCControlExtension/CCMenuPassive.cpp \ -UI/CCControlExtension/CCScale9Sprite.cpp \ -UI/CCControlExtension/CCSpacer.cpp \ -UI/CCScrollView/CCScrollView.cpp +GUI/CCControlExtension/CCControl.cpp \ +GUI/CCControlExtension/CCControlButton.cpp \ +GUI/CCControlExtension/CCControlColourPicker.cpp \ +GUI/CCControlExtension/CCControlHuePicker.cpp \ +GUI/CCControlExtension/CCControlSaturationBrightnessPicker.cpp \ +GUI/CCControlExtension/CCControlSlider.cpp \ +GUI/CCControlExtension/CCControlSwitch.cpp \ +GUI/CCControlExtension/CCControlUtils.cpp \ +GUI/CCControlExtension/CCInvocation.cpp \ +GUI/CCControlExtension/CCMenuPassive.cpp \ +GUI/CCControlExtension/CCScale9Sprite.cpp \ +GUI/CCControlExtension/CCSpacer.cpp \ +GUI/CCScrollView/CCScrollView.cpp LOCAL_WHOLE_STATIC_LIBRARIES := cocos2dx_static diff --git a/extensions/CCBReader/CCControlButtonLoader.h b/extensions/CCBReader/CCControlButtonLoader.h index 40d41d6102..418d7153e3 100644 --- a/extensions/CCBReader/CCControlButtonLoader.h +++ b/extensions/CCBReader/CCControlButtonLoader.h @@ -2,7 +2,7 @@ #define _CCB_CCCONTROLBUTTONLOADER_H_ #include "CCControlLoader.h" -#include "../UI/CCControlExtension/CCControlButton.h" +#include "../GUI/CCControlExtension/CCControlButton.h" NS_CC_EXT_BEGIN diff --git a/extensions/CCBReader/CCControlLoader.h b/extensions/CCBReader/CCControlLoader.h index d097106aa8..9e8b9d2183 100644 --- a/extensions/CCBReader/CCControlLoader.h +++ b/extensions/CCBReader/CCControlLoader.h @@ -2,7 +2,7 @@ #define _CCB_CCCONTROLLOADER_H_ #include "CCNodeLoader.h" -#include "../UI/CCControlExtension/CCControl.h" +#include "../GUI/CCControlExtension/CCControl.h" NS_CC_EXT_BEGIN diff --git a/extensions/CCBReader/CCNodeLoader.h b/extensions/CCBReader/CCNodeLoader.h index 10b04b3456..e74e7c012a 100644 --- a/extensions/CCBReader/CCNodeLoader.h +++ b/extensions/CCBReader/CCNodeLoader.h @@ -1,7 +1,7 @@ #ifndef _CCB_CCNODELOADER_H_ #define _CCB_CCNODELOADER_H_ -#include "../UI/CCControlExtension/CCInvocation.h" +#include "../GUI/CCControlExtension/CCInvocation.h" #include "cocos2d.h" #include "CCBReader.h" diff --git a/extensions/CCBReader/CCScale9SpriteLoader.h b/extensions/CCBReader/CCScale9SpriteLoader.h index 3b606f819a..042f8c1b67 100644 --- a/extensions/CCBReader/CCScale9SpriteLoader.h +++ b/extensions/CCBReader/CCScale9SpriteLoader.h @@ -3,7 +3,7 @@ #include "CCNodeLoader.h" #include "CCScale9SpriteLoader.h" -#include "../UI/CCControlExtension/CCScale9Sprite.h" +#include "../GUI/CCControlExtension/CCScale9Sprite.h" NS_CC_EXT_BEGIN diff --git a/extensions/CCBReader/CCScrollViewLoader.h b/extensions/CCBReader/CCScrollViewLoader.h index b52ba6845d..b415e656b6 100644 --- a/extensions/CCBReader/CCScrollViewLoader.h +++ b/extensions/CCBReader/CCScrollViewLoader.h @@ -2,7 +2,7 @@ #define _CCB_CCSCROLLVIEWLOADER_H_ #include "CCNodeLoader.h" -#include "../UI/CCScrollView/CCScrollView.h" +#include "../GUI/CCScrollView/CCScrollView.h" NS_CC_EXT_BEGIN diff --git a/extensions/UI/CCControlExtension/CCControl.cpp b/extensions/GUI/CCControlExtension/CCControl.cpp similarity index 100% rename from extensions/UI/CCControlExtension/CCControl.cpp rename to extensions/GUI/CCControlExtension/CCControl.cpp diff --git a/extensions/UI/CCControlExtension/CCControl.h b/extensions/GUI/CCControlExtension/CCControl.h similarity index 100% rename from extensions/UI/CCControlExtension/CCControl.h rename to extensions/GUI/CCControlExtension/CCControl.h diff --git a/extensions/UI/CCControlExtension/CCControlButton.cpp b/extensions/GUI/CCControlExtension/CCControlButton.cpp similarity index 100% rename from extensions/UI/CCControlExtension/CCControlButton.cpp rename to extensions/GUI/CCControlExtension/CCControlButton.cpp diff --git a/extensions/UI/CCControlExtension/CCControlButton.h b/extensions/GUI/CCControlExtension/CCControlButton.h similarity index 100% rename from extensions/UI/CCControlExtension/CCControlButton.h rename to extensions/GUI/CCControlExtension/CCControlButton.h diff --git a/extensions/UI/CCControlExtension/CCControlColourPicker.cpp b/extensions/GUI/CCControlExtension/CCControlColourPicker.cpp similarity index 100% rename from extensions/UI/CCControlExtension/CCControlColourPicker.cpp rename to extensions/GUI/CCControlExtension/CCControlColourPicker.cpp diff --git a/extensions/UI/CCControlExtension/CCControlColourPicker.h b/extensions/GUI/CCControlExtension/CCControlColourPicker.h similarity index 100% rename from extensions/UI/CCControlExtension/CCControlColourPicker.h rename to extensions/GUI/CCControlExtension/CCControlColourPicker.h diff --git a/extensions/UI/CCControlExtension/CCControlExtensions.h b/extensions/GUI/CCControlExtension/CCControlExtensions.h similarity index 100% rename from extensions/UI/CCControlExtension/CCControlExtensions.h rename to extensions/GUI/CCControlExtension/CCControlExtensions.h diff --git a/extensions/UI/CCControlExtension/CCControlHuePicker.cpp b/extensions/GUI/CCControlExtension/CCControlHuePicker.cpp similarity index 100% rename from extensions/UI/CCControlExtension/CCControlHuePicker.cpp rename to extensions/GUI/CCControlExtension/CCControlHuePicker.cpp diff --git a/extensions/UI/CCControlExtension/CCControlHuePicker.h b/extensions/GUI/CCControlExtension/CCControlHuePicker.h similarity index 100% rename from extensions/UI/CCControlExtension/CCControlHuePicker.h rename to extensions/GUI/CCControlExtension/CCControlHuePicker.h diff --git a/extensions/UI/CCControlExtension/CCControlSaturationBrightnessPicker.cpp b/extensions/GUI/CCControlExtension/CCControlSaturationBrightnessPicker.cpp similarity index 100% rename from extensions/UI/CCControlExtension/CCControlSaturationBrightnessPicker.cpp rename to extensions/GUI/CCControlExtension/CCControlSaturationBrightnessPicker.cpp diff --git a/extensions/UI/CCControlExtension/CCControlSaturationBrightnessPicker.h b/extensions/GUI/CCControlExtension/CCControlSaturationBrightnessPicker.h similarity index 100% rename from extensions/UI/CCControlExtension/CCControlSaturationBrightnessPicker.h rename to extensions/GUI/CCControlExtension/CCControlSaturationBrightnessPicker.h diff --git a/extensions/UI/CCControlExtension/CCControlSlider.cpp b/extensions/GUI/CCControlExtension/CCControlSlider.cpp similarity index 100% rename from extensions/UI/CCControlExtension/CCControlSlider.cpp rename to extensions/GUI/CCControlExtension/CCControlSlider.cpp diff --git a/extensions/UI/CCControlExtension/CCControlSlider.h b/extensions/GUI/CCControlExtension/CCControlSlider.h similarity index 100% rename from extensions/UI/CCControlExtension/CCControlSlider.h rename to extensions/GUI/CCControlExtension/CCControlSlider.h diff --git a/extensions/UI/CCControlExtension/CCControlSwitch.cpp b/extensions/GUI/CCControlExtension/CCControlSwitch.cpp similarity index 100% rename from extensions/UI/CCControlExtension/CCControlSwitch.cpp rename to extensions/GUI/CCControlExtension/CCControlSwitch.cpp diff --git a/extensions/UI/CCControlExtension/CCControlSwitch.h b/extensions/GUI/CCControlExtension/CCControlSwitch.h similarity index 100% rename from extensions/UI/CCControlExtension/CCControlSwitch.h rename to extensions/GUI/CCControlExtension/CCControlSwitch.h diff --git a/extensions/UI/CCControlExtension/CCControlUtils.cpp b/extensions/GUI/CCControlExtension/CCControlUtils.cpp similarity index 100% rename from extensions/UI/CCControlExtension/CCControlUtils.cpp rename to extensions/GUI/CCControlExtension/CCControlUtils.cpp diff --git a/extensions/UI/CCControlExtension/CCControlUtils.h b/extensions/GUI/CCControlExtension/CCControlUtils.h similarity index 100% rename from extensions/UI/CCControlExtension/CCControlUtils.h rename to extensions/GUI/CCControlExtension/CCControlUtils.h diff --git a/extensions/UI/CCControlExtension/CCInvocation.cpp b/extensions/GUI/CCControlExtension/CCInvocation.cpp similarity index 100% rename from extensions/UI/CCControlExtension/CCInvocation.cpp rename to extensions/GUI/CCControlExtension/CCInvocation.cpp diff --git a/extensions/UI/CCControlExtension/CCInvocation.h b/extensions/GUI/CCControlExtension/CCInvocation.h similarity index 100% rename from extensions/UI/CCControlExtension/CCInvocation.h rename to extensions/GUI/CCControlExtension/CCInvocation.h diff --git a/extensions/UI/CCControlExtension/CCMenuPassive.cpp b/extensions/GUI/CCControlExtension/CCMenuPassive.cpp similarity index 100% rename from extensions/UI/CCControlExtension/CCMenuPassive.cpp rename to extensions/GUI/CCControlExtension/CCMenuPassive.cpp diff --git a/extensions/UI/CCControlExtension/CCMenuPassive.h b/extensions/GUI/CCControlExtension/CCMenuPassive.h similarity index 100% rename from extensions/UI/CCControlExtension/CCMenuPassive.h rename to extensions/GUI/CCControlExtension/CCMenuPassive.h diff --git a/extensions/UI/CCControlExtension/CCScale9Sprite.cpp b/extensions/GUI/CCControlExtension/CCScale9Sprite.cpp similarity index 100% rename from extensions/UI/CCControlExtension/CCScale9Sprite.cpp rename to extensions/GUI/CCControlExtension/CCScale9Sprite.cpp diff --git a/extensions/UI/CCControlExtension/CCScale9Sprite.h b/extensions/GUI/CCControlExtension/CCScale9Sprite.h similarity index 100% rename from extensions/UI/CCControlExtension/CCScale9Sprite.h rename to extensions/GUI/CCControlExtension/CCScale9Sprite.h diff --git a/extensions/UI/CCControlExtension/CCSpacer.cpp b/extensions/GUI/CCControlExtension/CCSpacer.cpp similarity index 100% rename from extensions/UI/CCControlExtension/CCSpacer.cpp rename to extensions/GUI/CCControlExtension/CCSpacer.cpp diff --git a/extensions/UI/CCControlExtension/CCSpacer.h b/extensions/GUI/CCControlExtension/CCSpacer.h similarity index 100% rename from extensions/UI/CCControlExtension/CCSpacer.h rename to extensions/GUI/CCControlExtension/CCSpacer.h diff --git a/extensions/UI/CCScrollView/CCScrollView.cpp b/extensions/GUI/CCScrollView/CCScrollView.cpp similarity index 100% rename from extensions/UI/CCScrollView/CCScrollView.cpp rename to extensions/GUI/CCScrollView/CCScrollView.cpp diff --git a/extensions/UI/CCScrollView/CCScrollView.h b/extensions/GUI/CCScrollView/CCScrollView.h similarity index 100% rename from extensions/UI/CCScrollView/CCScrollView.h rename to extensions/GUI/CCScrollView/CCScrollView.h diff --git a/extensions/cocos-ext.h b/extensions/cocos-ext.h index 71049409bd..4b9f2e4e84 100644 --- a/extensions/cocos-ext.h +++ b/extensions/cocos-ext.h @@ -1,8 +1,8 @@ -#ifndef __COCOS2D_EXT_H__ -#define __COCOS2D_EXT_H__ - -#include "ExtensionMacros.h" - +#ifndef __COCOS2D_EXT_H__ +#define __COCOS2D_EXT_H__ + +#include "ExtensionMacros.h" + #include "CCBReader/CCBFileLoader.h" #include "CCBReader/CCBMemberVariableAssigner.h" #include "CCBReader/CCBReader.h" @@ -23,10 +23,10 @@ #include "CCBReader/CCParticleSystemQuadLoader.h" #include "CCBReader/CCScale9SpriteLoader.h" #include "CCBReader/CCScrollViewLoader.h" -#include "CCBReader/CCSpriteLoader.h" - -#include "UI/CCControlExtension/CCControlExtensions.h" -#include "UI/CCScrollView/CCScrollView.h" - -#endif /* __COCOS2D_EXT_H__ */ - +#include "CCBReader/CCSpriteLoader.h" + +#include "GUI/CCControlExtension/CCControlExtensions.h" +#include "GUI/CCScrollView/CCScrollView.h" + +#endif /* __COCOS2D_EXT_H__ */ + diff --git a/extensions/proj.win32/libExtensions.vcproj b/extensions/proj.win32/libExtensions.vcproj index b38aaacb34..9f38fd6c49 100644 --- a/extensions/proj.win32/libExtensions.vcproj +++ b/extensions/proj.win32/libExtensions.vcproj @@ -304,109 +304,109 @@ @@ -414,11 +414,11 @@ Name="CCScrollView" > diff --git a/extensions/proj.win32/libExtensions.vcxproj b/extensions/proj.win32/libExtensions.vcxproj index 7848846401..9d757e0d63 100644 --- a/extensions/proj.win32/libExtensions.vcxproj +++ b/extensions/proj.win32/libExtensions.vcxproj @@ -1,4 +1,4 @@ - + @@ -96,19 +96,19 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + @@ -132,20 +132,20 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + diff --git a/extensions/proj.win32/libExtensions.vcxproj.filters b/extensions/proj.win32/libExtensions.vcxproj.filters index 5f60101601..19e11451ea 100644 --- a/extensions/proj.win32/libExtensions.vcxproj.filters +++ b/extensions/proj.win32/libExtensions.vcxproj.filters @@ -1,4 +1,4 @@ - + @@ -66,43 +66,43 @@ CCBReader - + UI\CCControlExtension - + UI\CCControlExtension - + UI\CCControlExtension - + UI\CCControlExtension - + UI\CCControlExtension - + UI\CCControlExtension - + UI\CCControlExtension - + UI\CCControlExtension - + UI\CCControlExtension - + UI\CCControlExtension - + UI\CCControlExtension - + UI\CCControlExtension - + UI\CCScrollView @@ -170,46 +170,46 @@ CCBReader - + UI\CCControlExtension - + UI\CCControlExtension - + UI\CCControlExtension - + UI\CCControlExtension - + UI\CCControlExtension - + UI\CCControlExtension - + UI\CCControlExtension - + UI\CCControlExtension - + UI\CCControlExtension - + UI\CCControlExtension - + UI\CCControlExtension - + UI\CCControlExtension - + UI\CCControlExtension - + UI\CCScrollView diff --git a/samples/TestCpp/proj.ios/TestCpp.xcodeproj/project.pbxproj.REMOVED.git-id b/samples/TestCpp/proj.ios/TestCpp.xcodeproj/project.pbxproj.REMOVED.git-id index a7122f3cb8..d64a5dc114 100644 --- a/samples/TestCpp/proj.ios/TestCpp.xcodeproj/project.pbxproj.REMOVED.git-id +++ b/samples/TestCpp/proj.ios/TestCpp.xcodeproj/project.pbxproj.REMOVED.git-id @@ -1 +1 @@ -da857ec78bd3072e568563ae4ee25a23c63295f9 \ No newline at end of file +7dea09f758e229595c7992fee3cc0a0f0fb49f79 \ No newline at end of file diff --git a/samples/TestCpp/proj.mac/TestCpp.xcodeproj/project.pbxproj.REMOVED.git-id b/samples/TestCpp/proj.mac/TestCpp.xcodeproj/project.pbxproj.REMOVED.git-id index 08a23bc302..f3891d0888 100644 --- a/samples/TestCpp/proj.mac/TestCpp.xcodeproj/project.pbxproj.REMOVED.git-id +++ b/samples/TestCpp/proj.mac/TestCpp.xcodeproj/project.pbxproj.REMOVED.git-id @@ -1 +1 @@ -a1f5db702a5ea17ba27ce7c12c5e4873be9c09e5 \ No newline at end of file +8873b812fe12491ceee455a2c4f997fdaea432d6 \ No newline at end of file