UI Subsystem

Source/Atomic/Engine/Engine.cpp

@@ -56,7 +56,7 @@
 #endif
 
 #ifdef ATOMIC_TBUI
-#include "../UI/TBUI.h"
+#include "../UI/UI.h"
 #endif
 
 #include "../Core/WorkQueue.h"
@@ -130,12 +130,9 @@ Engine::Engine(Context* context) :
     context_->RegisterSubsystem(new Audio(context_));
 
     #ifdef ATOMIC_TBUI
-    // will render before UI
-    context_->RegisterSubsystem(new TBUI(context_));
+    context_->RegisterSubsystem(new UI(context_));
     #endif
 
-    //context_->RegisterSubsystem(new UI(context_));
-
     // Register object factories for libraries which are not automatically registered along with subsystem creation
     RegisterSceneLibrary(context_);
 
@@ -683,7 +680,7 @@ void Engine::Render()
     GetSubsystem<Renderer>()->Render();
 
 #ifdef ATOMIC_TBUI
-    GetSubsystem<TBUI>()->Render();
+    GetSubsystem<UI>()->Render();
 #endif
 
     graphics->EndFrame();

Source/Atomic/Graphics/Renderer.cpp

@@ -674,7 +674,7 @@ void Renderer::Render()
         graphics_->SetStencilTest(false);
         graphics_->ResetRenderTargets();
 
-        // ATOMIC: Do not clear, as this will clear the TBUI backbuffer
+        // ATOMIC: Do not clear, as this will clear the UI backbuffer
         //graphics_->Clear(CLEAR_COLOR | CLEAR_DEPTH | CLEAR_STENCIL, defaultZone_->GetFogColor());
         
         numPrimitives_ = 0;

Source/Atomic/UI/TBUI.cpp

@@ -1,87 +0,0 @@
-#include "Precompiled.h"
-
-#ifdef ATOMIC_TBUI
-
-#include "../Core/Context.h"
-#include "../Core/CoreEvents.h"
-#include "../Core/Profiler.h"
-#include "../IO/Log.h"
-#include "../IO/File.h"
-#include "../Resource/ResourceCache.h"
-#include "../Graphics/Graphics.h"
-#include "../Graphics/GraphicsEvents.h"
-#include "../Graphics/Texture2D.h"
-#include "../Graphics/VertexBuffer.h"
-#include "../Input/Input.h"
-#include "../Input/InputEvents.h"
-#include "../UI/TBUI.h"
-
-#include <TurboBadger/tb_core.h>
-#include <TurboBadger/tb_system.h>
-
-#include "UIState.h"
-
-using namespace tb;
-
-namespace tb
-{
-
-void TBSystem::RescheduleTimer(double fire_time)
-{
-
-}
-
-}
-
-namespace Atomic
-{
-
-TBUI::TBUI(Context* context) :
-    Object(context)
-{
-
-}
-
-TBUI::~TBUI()
-{
-
-}
-
-void TBUI::Render()
-{
-    theView_->Render();
-}
-
-tb::TBWidget* TBUI::GetRootWidget()
-{
-    return theView_->GetRootWidget();
-}
-
-bool TBUI::LoadResourceFile(tb::TBWidget* widget, const String& filename)
-{
-    return theView_->LoadResourceFile(widget, filename);
-}
-
-void TBUI::Shutdown()
-{
-    theView_->SetInputDisabled(true);
-    theView_ = 0;
-}
-
-
-void TBUI::Initialize()
-{
-    theView_ = new UIState(context_);
-
-}
-
-
-
-
-
-
-
-
-}
-
-#endif

Source/Atomic/UI/TBUI.h

@@ -1,44 +0,0 @@
-#pragma once
-
-#ifdef ATOMIC_TBUI
-
-#include "../Core/Object.h"
-namespace tb
-{
-
-class TBWidget;
-
-}
-
-namespace Atomic
-{
-
-class UIState;
-
-class ATOMIC_API TBUI : public Object
-{
-    OBJECT(TBUI)
-
-public:
-    /// Construct.
-    TBUI(Context* context);
-    /// Destruct.
-    virtual ~TBUI();
-
-    void Render();
-    tb::TBWidget* GetRootWidget();
-    bool LoadResourceFile(tb::TBWidget* widget, const String& filename);
-
-    void Initialize();
-
-    void Shutdown();
-
-private:
-
-    SharedPtr<UIState> theView_;
-
-};
-
-}
-
-#endif

Source/Atomic/UI/UIState.cpp → Source/Atomic/UI/UI.cpp

@@ -25,44 +25,62 @@ using namespace tb;
 #include "../Graphics/VertexBuffer.h"
 
 #include "UIRenderer.h"
-#include "UIState.h"
+#include "UI.h"
+
+namespace tb
+{
+
+void TBSystem::RescheduleTimer(double fire_time)
+{
+
+}
+
+}
+
 
 namespace Atomic
 {
 
-WeakPtr<Context> UIState::readerContext_;
+WeakPtr<Context> UI::readerContext_;
 
 
-UIState::UIState(Context* context) :
+UI::UI(Context* context) :
     Object(context),
     rootWidget_(0),
     inputDisabled_(false),
-    keyboardDisabled_(false)
+    keyboardDisabled_(false),
+    initialized_(false)
 {
-    Graphics* graphics = GetSubsystem<Graphics>();
-    assert(graphics);
-    assert(graphics->IsInitialized());
-    graphics_ = graphics;
 
-    vertexBuffer_ = new VertexBuffer(context_);
+}
 
-    Initialize();
+UI::~UI()
+{
+    if (initialized_)
+    {
+        tb::TBWidgetsAnimationManager::Shutdown();
+        delete rootWidget_;
+        // leak
+        //delete TBUIRenderer::renderer_;
+        tb_core_shutdown();
+    }
 
 }
 
-UIState::~UIState()
+void UI::Shutdown()
 {
-    tb::TBWidgetsAnimationManager::Shutdown();
-    delete rootWidget_;
-    // leak
-    //delete TBUIRenderer::renderer_;
-    tb_core_shutdown();
-
+    SetInputDisabled(true);
 }
 
-// refactor
-void UIState::Initialize()
+void UI::Initialize()
 {
+    Graphics* graphics = GetSubsystem<Graphics>();
+    assert(graphics);
+    assert(graphics->IsInitialized());
+    graphics_ = graphics;
+
+    vertexBuffer_ = new VertexBuffer(context_);
+
     readerContext_ = context_;
     TBFile::SetReaderFunction(TBFileReader);
 
@@ -104,22 +122,24 @@ void UIState::Initialize()
 
     rootWidget_->SetVisibilility(tb::WIDGET_VISIBILITY_VISIBLE);
 
-    SubscribeToEvent(E_MOUSEBUTTONDOWN, HANDLER(UIState, HandleMouseButtonDown));
-    SubscribeToEvent(E_MOUSEBUTTONUP, HANDLER(UIState, HandleMouseButtonUp));
-    SubscribeToEvent(E_MOUSEMOVE, HANDLER(UIState, HandleMouseMove));
-    SubscribeToEvent(E_MOUSEWHEEL, HANDLER(UIState, HandleMouseWheel));
-    SubscribeToEvent(E_KEYDOWN, HANDLER(UIState, HandleKeyDown));
-    SubscribeToEvent(E_KEYUP, HANDLER(UIState, HandleKeyUp));
-    SubscribeToEvent(E_TEXTINPUT, HANDLER(UIState, HandleTextInput));
-    SubscribeToEvent(E_UPDATE, HANDLER(UIState, HandleUpdate));
+    SubscribeToEvent(E_MOUSEBUTTONDOWN, HANDLER(UI, HandleMouseButtonDown));
+    SubscribeToEvent(E_MOUSEBUTTONUP, HANDLER(UI, HandleMouseButtonUp));
+    SubscribeToEvent(E_MOUSEMOVE, HANDLER(UI, HandleMouseMove));
+    SubscribeToEvent(E_MOUSEWHEEL, HANDLER(UI, HandleMouseWheel));
+    SubscribeToEvent(E_KEYDOWN, HANDLER(UI, HandleKeyDown));
+    SubscribeToEvent(E_KEYUP, HANDLER(UI, HandleKeyUp));
+    SubscribeToEvent(E_TEXTINPUT, HANDLER(UI, HandleTextInput));
+    SubscribeToEvent(E_UPDATE, HANDLER(UI, HandleUpdate));
+
+    SubscribeToEvent(E_RENDERUPDATE, HANDLER(UI, HandleRenderUpdate));
 
-    SubscribeToEvent(E_RENDERUPDATE, HANDLER(UIState, HandleRenderUpdate));
+    initialized_ = true;
 
     //TB_DEBUG_SETTING(LAYOUT_BOUNDS) = 1;
 }
 
 
-void UIState::Render(VertexBuffer* buffer, const PODVector<UIBatch>& batches, unsigned batchStart, unsigned batchEnd)
+void UI::Render(VertexBuffer* buffer, const PODVector<UIBatch>& batches, unsigned batchStart, unsigned batchEnd)
 {
 
     if (batches.Empty())
@@ -203,7 +223,7 @@ void UIState::Render(VertexBuffer* buffer, const PODVector<UIBatch>& batches, un
     }
 }
 
-void UIState::SetVertexData(VertexBuffer* dest, const PODVector<float>& vertexData)
+void UI::SetVertexData(VertexBuffer* dest, const PODVector<float>& vertexData)
 {
     if (vertexData.Empty())
         return;
@@ -218,13 +238,13 @@ void UIState::SetVertexData(VertexBuffer* dest, const PODVector<float>& vertexDa
 }
 
 
-void UIState::Render()
+void UI::Render()
 {
     SetVertexData(vertexBuffer_, vertexData_);
     Render(vertexBuffer_, batches_, 0, batches_.Size());
 }
 
-void UIState::HandleRenderUpdate(StringHash eventType, VariantMap& eventData)
+void UI::HandleRenderUpdate(StringHash eventType, VariantMap& eventData)
 {
     // Get rendering batches from the non-modal UI elements
     batches_.Clear();
@@ -237,7 +257,7 @@ void UIState::HandleRenderUpdate(StringHash eventType, VariantMap& eventData)
 
 }
 
-void UIState::GetBatches(PODVector<UIBatch>& batches, PODVector<float>& vertexData, const IntRect& currentScissor)
+void UI::GetBatches(PODVector<UIBatch>& batches, PODVector<float>& vertexData, const IntRect& currentScissor)
 {
     //if (!initialized_)
     //    return;
@@ -257,7 +277,7 @@ void UIState::GetBatches(PODVector<UIBatch>& batches, PODVector<float>& vertexDa
     tb::g_renderer->EndPaint();
 }
 
-void UIState::SubmitBatchVertexData(Texture* texture, const PODVector<float>& vertexData)
+void UI::SubmitBatchVertexData(Texture* texture, const PODVector<float>& vertexData)
 {
     UIBatch b(BLEND_ALPHA , renderer_->currentScissor_, texture, &vertexData_);
 
@@ -275,7 +295,7 @@ void UIState::SubmitBatchVertexData(Texture* texture, const PODVector<float>& ve
 
 }
 
-void UIState::TBFileReader(const char* filename, void** data, unsigned* length)
+void UI::TBFileReader(const char* filename, void** data, unsigned* length)
 {
     *data = 0;
     *length = 0;
@@ -305,12 +325,11 @@ void UIState::TBFileReader(const char* filename, void** data, unsigned* length)
 
 }
 
-bool UIState::LoadResourceFile(TBWidget* widget, const String& filename)
+bool UI::LoadResourceFile(TBWidget* widget, const String& filename)
 {
 
     tb::TBNode node;
 
-    // TODO: use Urho resources
     if (!node.ReadFile(filename.CString()))
         return false;
 
@@ -319,7 +338,7 @@ bool UIState::LoadResourceFile(TBWidget* widget, const String& filename)
 }
 
 
-void UIState::HandleScreenMode(StringHash eventType, VariantMap& eventData)
+void UI::HandleScreenMode(StringHash eventType, VariantMap& eventData)
 {
     using namespace ScreenMode;
     rootWidget_->SetSize(eventData[P_WIDTH].GetInt(), eventData[P_HEIGHT].GetInt());
@@ -328,7 +347,7 @@ void UIState::HandleScreenMode(StringHash eventType, VariantMap& eventData)
 
 
 
-void UIState::HandleUpdate(StringHash eventType, VariantMap& eventData)
+void UI::HandleUpdate(StringHash eventType, VariantMap& eventData)
 {
     TBMessageHandler::ProcessMessages();
 }

Source/Atomic/UI/UIState.h → Source/Atomic/UI/UI.h

@@ -15,16 +15,16 @@ namespace Atomic
 class VertexBuffer;
 class UIRenderer;
 
-class UIState : public Object
+class UI : public Object
 {
-    OBJECT(UIState)
+    OBJECT(UI)
 
 public:
 
     /// Construct.
-    UIState(Context* context);
+    UI(Context* context);
     /// Destruct.
-    virtual ~UIState();
+    virtual ~UI();
 
     tb::TBWidget* GetRootWidget() { return rootWidget_; }
     bool LoadResourceFile(tb::TBWidget* widget, const String& filename);
@@ -36,9 +36,10 @@ public:
     void GetBatches(PODVector<UIBatch>& batches, PODVector<float>& vertexData, const IntRect& currentScissor);
     void SubmitBatchVertexData(Texture* texture, const PODVector<float>& vertexData);
 
-private:
-
     void Initialize();
+    void Shutdown();
+
+private:
 
     static WeakPtr<Context> readerContext_;
     static void TBFileReader(const char* filename, void** data, unsigned* length);
@@ -60,6 +61,7 @@ private:
 
     bool inputDisabled_;
     bool keyboardDisabled_;
+    bool initialized_;
 
     // Events
     void HandleScreenMode(StringHash eventType, VariantMap& eventData);

Source/Atomic/UI/UIStateInput.cpp → Source/Atomic/UI/UIInput.cpp

@@ -6,7 +6,7 @@ using namespace tb;
 #include "../Input/Input.h"
 #include "../Input/InputEvents.h"
 
-#include "UIState.h"
+#include "UI.h"
 
 namespace Atomic
 {
@@ -30,7 +30,7 @@ static int toupr_ascii(int ascii)
     return ascii;
 }
 
-void UIState::HandleMouseButtonDown(StringHash eventType, VariantMap& eventData)
+void UI::HandleMouseButtonDown(StringHash eventType, VariantMap& eventData)
 {
     if (inputDisabled_)
         return;
@@ -74,7 +74,7 @@ void UIState::HandleMouseButtonDown(StringHash eventType, VariantMap& eventData)
 }
 
 
-void UIState::HandleMouseButtonUp(StringHash eventType, VariantMap& eventData)
+void UI::HandleMouseButtonUp(StringHash eventType, VariantMap& eventData)
 {
     if (inputDisabled_)
         return;
@@ -104,7 +104,7 @@ void UIState::HandleMouseButtonUp(StringHash eventType, VariantMap& eventData)
 }
 
 
-void UIState::HandleMouseMove(StringHash eventType, VariantMap& eventData)
+void UI::HandleMouseMove(StringHash eventType, VariantMap& eventData)
 {
     using namespace MouseMove;
 
@@ -119,7 +119,7 @@ void UIState::HandleMouseMove(StringHash eventType, VariantMap& eventData)
 }
 
 
-void UIState::HandleMouseWheel(StringHash eventType, VariantMap& eventData)
+void UI::HandleMouseWheel(StringHash eventType, VariantMap& eventData)
 {
     if (inputDisabled_)
         return;
@@ -209,7 +209,7 @@ static bool InvokeKey(TBWidget* root, unsigned int key, SPECIAL_KEY special_key,
 }
 
 
-void UIState::HandleKey(bool keydown, int keycode, int scancode)
+void UI::HandleKey(bool keydown, int keycode, int scancode)
 {
 
 #ifdef ATOMIC_PLATFORM_WINDOWS
@@ -323,7 +323,7 @@ void UIState::HandleKey(bool keydown, int keycode, int scancode)
 
 }
 
-void UIState::HandleKeyDown(StringHash eventType, VariantMap& eventData)
+void UI::HandleKeyDown(StringHash eventType, VariantMap& eventData)
 {
     if (inputDisabled_ || keyboardDisabled_)
         return;
@@ -337,7 +337,7 @@ void UIState::HandleKeyDown(StringHash eventType, VariantMap& eventData)
 
 }
 
-void UIState::HandleKeyUp(StringHash eventType, VariantMap& eventData)
+void UI::HandleKeyUp(StringHash eventType, VariantMap& eventData)
 {
     if (inputDisabled_ || keyboardDisabled_)
         return;
@@ -351,7 +351,7 @@ void UIState::HandleKeyUp(StringHash eventType, VariantMap& eventData)
 
 }
 
-void UIState::HandleTextInput(StringHash eventType, VariantMap& eventData)
+void UI::HandleTextInput(StringHash eventType, VariantMap& eventData)
 {
     if (inputDisabled_ || keyboardDisabled_)
         return;

Source/Atomic/UI/UIRenderer.h

@@ -15,11 +15,11 @@ class TBRect;
 namespace Atomic
 {
 
-class TBUI;
+class UI;
 
 class UIRenderer : public tb::TBRendererBatcher
 {
-    friend class UIState;
+    friend class UI;
 public:
 
     UIRenderer(Context* context);

Source/AtomicEditor/Source/AEApplication.cpp

@@ -20,7 +20,7 @@
 
 #include <Atomic/Input/Input.h>
 
-#include <Atomic/UI/TBUI.h>
+#include <Atomic/UI/UI.h>
 #include <Atomic/Environment/Environment.h>
 #include <Atomic/Graphics/Renderer.h>
 
@@ -79,7 +79,7 @@ void AEApplication::Start()
     cache->AddPackageFile(editorResources);
 
     // initialize after EditorResources set
-    TBUI* tbui = GetSubsystem<TBUI>();
+    UI* tbui = GetSubsystem<UI>();
     tbui->Initialize();
 
     Input* input = GetSubsystem<Input>();

Source/AtomicEditor/Source/AEEditor.cpp

@@ -8,7 +8,7 @@
 #include <Atomic/IO/FileSystem.h>
 #include <Atomic/Resource/ResourceCache.h>
 #include <Atomic/Input/Input.h>
-#include <Atomic/UI/TBUI.h>
+#include <Atomic/UI/UI.h>
 #include <Atomic/Core/CoreEvents.h>
 
 #include <AtomicJS/Javascript/Javascript.h>
@@ -169,7 +169,7 @@ void Editor::HandlePlayStop(StringHash eventType, VariantMap& eventData)
     if (!player_)
         return;
 
-    //TBUI* tbui = GetSubsystem<TBUI>();
+    //UI* tbui = GetSubsystem<UI>();
     //tbui->SetKeyboardDisabled(false);
     if (player_->GetMode() != AE_PLAYERMODE_WIDGET)
     {
@@ -269,7 +269,7 @@ void Editor::HandlePlayRequest(StringHash eventType, VariantMap& eventData)
 
     AEPlayerMode mode = (AEPlayerMode) eventData[EditorPlayStarted::P_MODE].GetUInt();
 
-    TBUI* tbui = GetSubsystem<TBUI>();
+    UI* tbui = GetSubsystem<UI>();
     //tbui->SetKeyboardDisabled(true);
 
     if (mode != AE_PLAYERMODE_WIDGET)
@@ -320,7 +320,7 @@ void Editor::HandleExitRequested(StringHash eventType, VariantMap& eventData)
 
     TBAnimationManager::BeginBlockAnimations();
 
-    TBUI* tbui = GetSubsystem<TBUI>();
+    UI* tbui = GetSubsystem<UI>();
     tbui->Shutdown();
 
     context_->RemoveSubsystem(Javascript::GetBaseTypeStatic());

Source/AtomicEditor/Source/Editors/JSResourceEditor.cpp

@@ -4,7 +4,7 @@
 
 #include "AtomicEditor.h"
 #include <Atomic/Container/ArrayPtr.h>
-#include <Atomic/UI/TBUI.h>
+#include <Atomic/UI/UI.h>
 #include <Atomic/IO/Log.h>
 #include <Atomic/IO/File.h>
 #include <Atomic/IO/FileSystem.h>

Source/AtomicEditor/Source/Editors/ModelResourceEditor.cpp

@@ -23,7 +23,7 @@
 
 #include "ModelResourceEditor.h"
 
-#include <Atomic/UI/TBUI.h>
+#include <Atomic/UI/UI.h>
 
 namespace AtomicEditor
 {

Source/AtomicEditor/Source/Editors/SceneEditor3D/SceneEditor3D.cpp

@@ -21,7 +21,7 @@
 #include "AEEvents.h"
 
 #include <Atomic/Input/Input.h>
-#include <Atomic/UI/TBUI.h>
+#include <Atomic/UI/UI.h>
 
 #include "SceneEditor3D.h"
 

Source/AtomicEditor/Source/Editors/SceneEditor3D/SceneView3D.cpp

@@ -28,7 +28,7 @@
 
 #include "SceneView3D.h"
 #include "SceneEditor3D.h"
-#include <Atomic/UI/TBUI.h>
+#include <Atomic/UI/UI.h>
 
 namespace AtomicEditor
 {

Source/AtomicEditor/Source/Editors/TextResourceEditor.cpp

@@ -4,7 +4,7 @@
 
 #include "AtomicEditor.h"
 #include <Atomic/Container/ArrayPtr.h>
-#include <Atomic/UI/TBUI.h>
+#include <Atomic/UI/UI.h>
 #include <Atomic/IO/Log.h>
 #include <Atomic/IO/File.h>
 #include <Atomic/IO/FileSystem.h>

Source/AtomicEditor/Source/License/UIActivation.cpp

@@ -12,7 +12,7 @@
 
 #include <Atomic/Core/Context.h>
 #include <Atomic/IO/Log.h>
-#include <Atomic/UI/TBUI.h>
+#include <Atomic/UI/UI.h>
 
 #include "../Resources/AEResourceOps.h"
 #include "../AEPreferences.h"
@@ -34,7 +34,7 @@ UIActivation::UIActivation(Context* context):
     UIModalOpWindow(context),
     licenseKey_(0)
 {
-    TBUI* tbui = GetSubsystem<TBUI>();
+    UI* tbui = GetSubsystem<UI>();
     window_->DisableCloseButton();
     window_->SetText("Product Activation");
     tbui->LoadResourceFile(window_->GetContentRoot(), "AtomicEditor/editor/ui/activation.tb.txt");

Source/AtomicEditor/Source/License/UIActivationSuccess.cpp

@@ -11,7 +11,7 @@
 #include <TurboBadger/tb_editfield.h>
 
 #include <Atomic/Core/Context.h>
-#include <Atomic/UI/TBUI.h>
+#include <Atomic/UI/UI.h>
 
 #include "../Resources/AEResourceOps.h"
 #include "../AEPreferences.h"
@@ -33,7 +33,7 @@ namespace AtomicEditor
 UIActivationSuccess::UIActivationSuccess(Context* context):
     UIModalOpWindow(context)
 {
-    TBUI* tbui = GetSubsystem<TBUI>();
+    UI* tbui = GetSubsystem<UI>();
     window_->SetText("Product Activation Successful");
     tbui->LoadResourceFile(window_->GetContentRoot(), "AtomicEditor/editor/ui/activationsuccess.tb.txt");
 

Source/AtomicEditor/Source/License/UIEulaAgreement.cpp

@@ -15,7 +15,7 @@
 #include <Atomic/IO/File.h>
 #include <Atomic/Resource/ResourceCache.h>
 #include <Atomic/Input/InputEvents.h>
-#include <Atomic/UI/TBUI.h>
+#include <Atomic/UI/UI.h>
 
 #include "Resources/AEResourceOps.h"
 #include "AEPreferences.h"
@@ -36,7 +36,7 @@ namespace AtomicEditor
 UIEulaAgreement::UIEulaAgreement(Context* context):
     UIModalOpWindow(context)
 {
-    TBUI* tbui = GetSubsystem<TBUI>();
+    UI* tbui = GetSubsystem<UI>();
     window_->DisableCloseButton();
     window_->SetText("License Agreement");
     tbui->LoadResourceFile(window_->GetContentRoot(), "AtomicEditor/editor/ui/eulaagreement.tb.txt");

Source/AtomicEditor/Source/License/UIManageLicense.cpp

@@ -12,7 +12,7 @@
 #include <TurboBadger/tb_message_window.h>
 
 #include <Atomic/Core/Context.h>
-#include <Atomic/UI/TBUI.h>
+#include <Atomic/UI/UI.h>
 
 #include "Resources/AEResourceOps.h"
 #include "AEPreferences.h"
@@ -37,7 +37,7 @@ UIManageLicense::UIManageLicense(Context* context):
     Editor* editor = GetSubsystem<Editor>();
     Project* project = editor->GetProject();
 
-    TBUI* tbui = GetSubsystem<TBUI>();
+    UI* tbui = GetSubsystem<UI>();
     window_->SetText("Manage License");
     tbui->LoadResourceFile(window_->GetContentRoot(), "AtomicEditor/editor/ui/managelicense.tb.txt");
 

Source/AtomicEditor/Source/Player/AEPlayer.cpp

@@ -8,7 +8,7 @@
 #include <Atomic/IO/FileSystem.h>
 #include <Atomic/Input/Input.h>
 #include <Atomic/Resource/ResourceCache.h>
-#include <Atomic/UI/TBUI.h>
+#include <Atomic/UI/UI.h>
 #include <AtomicJS/Javascript/Javascript.h>
 #include <AtomicJS/Javascript/JSVM.h>
 #include <AtomicJS/Javascript/JSEvents.h>

Source/AtomicEditor/Source/Player/UIPlayer.cpp

@@ -11,7 +11,7 @@
 #include <Atomic/Core/Context.h>
 #include <Atomic/Core/CoreEvents.h>
 #include <Atomic/IO/Log.h>
-#include <Atomic/UI/TBUI.h>
+#include <Atomic/UI/UI.h>
 
 #include <Atomic/Graphics/Graphics.h>
 #include <Atomic/Graphics/Viewport.h>
@@ -48,7 +48,7 @@ UIPlayer::UIPlayer(Context* context):
     aePlayer_ = GetSubsystem<AEPlayer>();
     aePlayer_->SetUIPlayer(this);
 
-    TBUI* tbui = GetSubsystem<TBUI>();
+    UI* tbui = GetSubsystem<UI>();
 
     // FIXME: disabling close button as having the widget die is currently bad
     window_->DisableCloseButton();

Source/AtomicEditor/Source/UI/AEWidget.cpp

@@ -5,7 +5,7 @@
 #include "AtomicEditor.h"
 
 #include <Atomic/IO/Log.h>
-#include <Atomic/UI/TBUI.h>
+#include <Atomic/UI/UI.h>
 
 #include <TurboBadger/tb_widgets.h>
 #include <TurboBadger/tb_window.h>

Source/AtomicEditor/Source/UI/Modal/UIAbout.cpp

@@ -13,7 +13,7 @@
 #include <Atomic/IO/File.h>
 #include <Atomic/Resource/ResourceCache.h>
 #include <Atomic/Input/InputEvents.h>
-#include <Atomic/UI/TBUI.h>
+#include <Atomic/UI/UI.h>
 
 #include "Resources/AEResourceOps.h"
 #include "AEPreferences.h"
@@ -33,7 +33,7 @@ namespace AtomicEditor
 UIAbout::UIAbout(Context* context):
     UIModalOpWindow(context)
 {
-    TBUI* tbui = GetSubsystem<TBUI>();
+    UI* tbui = GetSubsystem<UI>();
     window_->SetText("About the Atomic Game Engine");
     tbui->LoadResourceFile(window_->GetContentRoot(), "AtomicEditor/editor/ui/about.tb.txt");
 

Source/AtomicEditor/Source/UI/Modal/UIBuild.cpp

@@ -9,7 +9,7 @@
 #include <TurboBadger/tb_editfield.h>
 
 #include <Atomic/Core/Context.h>
-#include <Atomic/UI/TBUI.h>
+#include <Atomic/UI/UI.h>
 
 #include "Resources/AEResourceOps.h"
 #include "AEPreferences.h"
@@ -33,7 +33,7 @@ UIBuild::UIBuild(Context* context):
     Editor* editor = GetSubsystem<Editor>();
     Project* project = editor->GetProject();
 
-    TBUI* tbui = GetSubsystem<TBUI>();
+    UI* tbui = GetSubsystem<UI>();
     window_->SetText("Build Player");
     tbui->LoadResourceFile(window_->GetContentRoot(), "AtomicEditor/editor/ui/build.tb.txt");
 

Source/AtomicEditor/Source/UI/Modal/UIBuildComplete.cpp

@@ -15,7 +15,7 @@
 #include <TurboBadger/tb_message_window.h>
 #include <TurboBadger/tb_editfield.h>
 
-#include <Atomic/UI/TBUI.h>
+#include <Atomic/UI/UI.h>
 
 #include <Build/BuildSystem.h>
 #include <Project/ProjectUtils.h>
@@ -35,7 +35,7 @@ UIBuildComplete::UIBuildComplete(Context* context, const String &title, const St
     buildFolder_ = buildFolder;
     success_ = success;
 
-    TBUI* tbui = GetSubsystem<TBUI>();
+    UI* tbui = GetSubsystem<UI>();
     dimmer_ = new TBDimmer();
 
     window_ = new TBWindow();
@@ -99,7 +99,7 @@ void UIBuildComplete::SetMessage(const String& message)
 
 void UIBuildComplete::Center()
 {
-    TBUI* tbui = GetSubsystem<TBUI>();
+    UI* tbui = GetSubsystem<UI>();
     TBRect rect = window_->GetRect();
     TBWidget* root = tbui->GetRootWidget();
     TBRect bounds(0, 0, root->GetRect().w, root->GetRect().h);
@@ -111,7 +111,7 @@ void UIBuildComplete::Center()
 void UIBuildComplete::Show()
 {
     assert(!dimmer_->GetParent());
-    TBUI* tbui = GetSubsystem<TBUI>();
+    UI* tbui = GetSubsystem<UI>();
     TBWidget* root = tbui->GetRootWidget();
     root->AddChild(dimmer_);
     root->AddChild(delegate_);
@@ -120,7 +120,7 @@ void UIBuildComplete::Show()
 
 void UIBuildComplete::Hide()
 {
-    TBUI* tbui = GetSubsystem<TBUI>();
+    UI* tbui = GetSubsystem<UI>();
     tbui->GetRootWidget()->SetFocusRecursive(WIDGET_FOCUS_REASON_UNKNOWN);
 
     if (dimmer_->GetParent())

Source/AtomicEditor/Source/UI/Modal/UIBuildSettings.cpp

@@ -9,7 +9,7 @@
 #include <TurboBadger/tb_editfield.h>
 
 #include <Atomic/Core/Context.h>
-#include <Atomic/UI/TBUI.h>
+#include <Atomic/UI/UI.h>
 
 #include "AEEvents.h"
 #include "AEEditor.h"
@@ -35,7 +35,7 @@ UIBuildSettings::UIBuildSettings(Context* context):
     macSettings_(new UIBuildSettingsMac(context)),
     platformIndicator_(0)
 {
-    TBUI* tbui = GetSubsystem<TBUI>();
+    UI* tbui = GetSubsystem<UI>();
     window_->SetText("Atomic Player - Build Settings");
     tbui->LoadResourceFile(window_->GetContentRoot(), "AtomicEditor/editor/ui/buildsettings.tb.txt");
 

Source/AtomicEditor/Source/UI/Modal/UIBuildSettingsAndroid.cpp

@@ -10,7 +10,7 @@
 #include <Atomic/IO/Log.h>
 #include <Atomic/IO/FileSystem.h>
 #include <Atomic/IO/MemoryBuffer.h>
-#include <Atomic/UI/TBUI.h>
+#include <Atomic/UI/UI.h>
 
 #include "AEEditor.h"
 #include "AEEvents.h"
@@ -28,7 +28,7 @@ namespace AtomicEditor
 UIBuildSettingsAndroid::UIBuildSettingsAndroid(Context* context) :
     AEWidget(context)
 {
-    TBUI* tbui = GetSubsystem<TBUI>();
+    UI* tbui = GetSubsystem<UI>();
     tbui->LoadResourceFile(delegate_, "AtomicEditor/editor/ui/buildsettings_android.tb.txt");
 
     appNameEdit_ = delegate_->GetWidgetByIDAndType<TBEditField>(TBIDC("app_name"));

Source/AtomicEditor/Source/UI/Modal/UIBuildSettingsIOS.cpp

@@ -11,7 +11,7 @@
 #include <Atomic/IO/Log.h>
 #include <Atomic/IO/FileSystem.h>
 #include <Atomic/IO/MemoryBuffer.h>
-#include <Atomic/UI/TBUI.h>
+#include <Atomic/UI/UI.h>
 
 #include "AEEditor.h"
 #include "AEEvents.h"
@@ -30,7 +30,7 @@ namespace AtomicEditor
 UIBuildSettingsIOS::UIBuildSettingsIOS(Context* context) :
     AEWidget(context)
 {
-    TBUI* tbui = GetSubsystem<TBUI>();
+    UI* tbui = GetSubsystem<UI>();
     tbui->LoadResourceFile(delegate_, "AtomicEditor/editor/ui/buildsettings_ios.tb.txt");
 
     appNameEdit_ = delegate_->GetWidgetByIDAndType<TBEditField>(TBIDC("app_name"));

Source/AtomicEditor/Source/UI/Modal/UIBuildSettingsMac.cpp

@@ -9,7 +9,7 @@
 
 #include <Atomic/Core/Context.h>
 #include <Atomic/IO/Log.h>
-#include <Atomic/UI/TBUI.h>
+#include <Atomic/UI/UI.h>
 
 #include "Build/BuildSystem.h"
 #include "UIBuildSettingsMac.h"
@@ -20,7 +20,7 @@ namespace AtomicEditor
 UIBuildSettingsMac::UIBuildSettingsMac(Context* context) :
     AEWidget(context)
 {
-    TBUI* tbui = GetSubsystem<TBUI>();
+    UI* tbui = GetSubsystem<UI>();
     tbui->LoadResourceFile(delegate_, "AtomicEditor/editor/ui/buildsettings_mac.tb.txt");
 
     appNameEdit_ = delegate_->GetWidgetByIDAndType<TBEditField>(TBIDC("app_name"));

Source/AtomicEditor/Source/UI/Modal/UIBuildSettingsWeb.cpp

@@ -9,7 +9,7 @@
 
 #include <Atomic/Core/Context.h>
 #include <Atomic/IO/Log.h>
-#include <Atomic/UI/TBUI.h>
+#include <Atomic/UI/UI.h>
 
 #include "Build/BuildSystem.h"
 #include "UIBuildSettingsWeb.h"
@@ -20,7 +20,7 @@ namespace AtomicEditor
 UIBuildSettingsWeb::UIBuildSettingsWeb(Context* context) :
     AEWidget(context)
 {
-    TBUI* tbui = GetSubsystem<TBUI>();
+    UI* tbui = GetSubsystem<UI>();
     tbui->LoadResourceFile(delegate_, "AtomicEditor/editor/ui/buildsettings_html5.tb.txt");
 
     appNameEdit_ = delegate_->GetWidgetByIDAndType<TBEditField>(TBIDC("app_name"));

Source/AtomicEditor/Source/UI/Modal/UIBuildSettingsWindows.cpp

@@ -9,7 +9,7 @@
 
 #include <Atomic/Core/Context.h>
 #include <Atomic/IO/Log.h>
-#include <Atomic/UI/TBUI.h>
+#include <Atomic/UI/UI.h>
 
 #include "Build/BuildSystem.h"
 #include "UIBuildSettingsWindows.h"
@@ -20,7 +20,7 @@ namespace AtomicEditor
 UIBuildSettingsWindows::UIBuildSettingsWindows(Context* context) :
     AEWidget(context)
 {
-    TBUI* tbui = GetSubsystem<TBUI>();
+    UI* tbui = GetSubsystem<UI>();
     tbui->LoadResourceFile(delegate_, "AtomicEditor/editor/ui/buildsettings_windows.tb.txt");
 
     appNameEdit_ = delegate_->GetWidgetByIDAndType<TBEditField>(TBIDC("app_name"));

Source/AtomicEditor/Source/UI/Modal/UICreateProject.cpp

@@ -13,7 +13,7 @@
 
 #include <Atomic/Core/Context.h>
 #include <Atomic/Core/StringUtils.h>
-#include <Atomic/UI/TBUI.h>
+#include <Atomic/UI/UI.h>
 
 #include "Resources/AEResourceOps.h"
 #include "AEPreferences.h"
@@ -38,7 +38,7 @@ UICreateProject::UICreateProject(Context* context, const String &templateFolder,
     Editor* editor = GetSubsystem<Editor>();
     Project* project = editor->GetProject();
 
-    TBUI* tbui = GetSubsystem<TBUI>();
+    UI* tbui = GetSubsystem<UI>();
     window_->SetText("Create Project");
     tbui->LoadResourceFile(window_->GetContentRoot(), "AtomicEditor/editor/ui/createproject.tb.txt");
 

Source/AtomicEditor/Source/UI/Modal/UIInfoModule3D.cpp

@@ -9,7 +9,7 @@
 #include <TurboBadger/tb_editfield.h>
 
 #include <Atomic/Core/Context.h>
-#include <Atomic/UI/TBUI.h>
+#include <Atomic/UI/UI.h>
 
 #include "Resources/AEResourceOps.h"
 #include "AEPreferences.h"
@@ -35,7 +35,7 @@ InfoModule3D::InfoModule3D(Context* context,const String &exampleFolder, const S
     Editor* editor = GetSubsystem<Editor>();
     Project* project = editor->GetProject();
 
-    TBUI* tbui = GetSubsystem<TBUI>();
+    UI* tbui = GetSubsystem<UI>();
     window_->DisableCloseButton();
     window_->SetText("Atomic Game Engine Pro Required");
 

Source/AtomicEditor/Source/UI/Modal/UIModalOps.cpp

@@ -11,7 +11,7 @@
 
 #include <Atomic/Core/Context.h>
 #include <Atomic/Graphics/Graphics.h>
-#include <Atomic/UI/TBUI.h>
+#include <Atomic/UI/UI.h>
 
 #include "AEEvents.h"
 
@@ -48,7 +48,7 @@ UIModalOpWindow::UIModalOpWindow(Context* context):
     AEWidget(context)
 {
     window_ = new TBWindow();
-    TBUI* tbui = GetSubsystem<TBUI>();
+    UI* tbui = GetSubsystem<UI>();
     TBWidget* root = tbui->GetRootWidget();
     root->AddChild(delegate_);
     // start with full screen as size
@@ -69,7 +69,7 @@ bool UIModalOpWindow::OnEvent(const TBWidgetEvent &ev)
 
 void UIModalOpWindow::Center()
 {
-    TBUI* tbui = GetSubsystem<TBUI>();
+    UI* tbui = GetSubsystem<UI>();
     TBRect rect = window_->GetRect();
     TBWidget* root = tbui->GetRootWidget();
     TBRect bounds(0, 0, root->GetRect().w, root->GetRect().h);
@@ -94,7 +94,7 @@ UIModalOps::UIModalOps(Context* context) :
 void UIModalOps::Show()
 {
     assert(!dimmer_->GetParent());
-    TBUI* tbui = GetSubsystem<TBUI>();
+    UI* tbui = GetSubsystem<UI>();
     TBWidget* root = tbui->GetRootWidget();
     root->AddChild(dimmer_);
 }
@@ -108,7 +108,7 @@ void UIModalOps::Hide()
 
     opWindow_ = NULL;
 
-    TBUI* tbui = GetSubsystem<TBUI>();
+    UI* tbui = GetSubsystem<UI>();
     tbui->GetRootWidget()->SetFocusRecursive(WIDGET_FOCUS_REASON_UNKNOWN);
 
     isHiding_ = false;

Source/AtomicEditor/Source/UI/Modal/UINewProject.cpp

@@ -9,7 +9,7 @@
 #include <TurboBadger/tb_editfield.h>
 
 #include <Atomic/Core/Context.h>
-#include <Atomic/UI/TBUI.h>
+#include <Atomic/UI/UI.h>
 
 #include "License/AELicenseSystem.h"
 
@@ -32,7 +32,7 @@ UINewProject::UINewProject(Context* context):
     Editor* editor = GetSubsystem<Editor>();
     Project* project = editor->GetProject();
 
-    TBUI* tbui = GetSubsystem<TBUI>();
+    UI* tbui = GetSubsystem<UI>();
     window_->SetText("Project Type");
     tbui->LoadResourceFile(window_->GetContentRoot(), "AtomicEditor/editor/ui/newproject.tb.txt");
 

Source/AtomicEditor/Source/UI/Modal/UIPlatformsInfo.cpp

@@ -9,7 +9,7 @@
 #include <TurboBadger/tb_editfield.h>
 
 #include <Atomic/Core/Context.h>
-#include <Atomic/UI/TBUI.h>
+#include <Atomic/UI/UI.h>
 
 #include "Resources/AEResourceOps.h"
 #include "AEPreferences.h"
@@ -33,7 +33,7 @@ PlatformsInfo::PlatformsInfo(Context* context):
     Editor* editor = GetSubsystem<Editor>();
     Project* project = editor->GetProject();
 
-    TBUI* tbui = GetSubsystem<TBUI>();
+    UI* tbui = GetSubsystem<UI>();
     window_->DisableCloseButton();
     window_->SetText("Atomic Game Engine Pro Required");
 

Source/AtomicEditor/Source/UI/Modal/UIProgramOutput.cpp

@@ -7,7 +7,7 @@
 
 #include "AtomicEditor.h"
 #include <Atomic/Core/Context.h>
-#include <Atomic/UI/TBUI.h>
+#include <Atomic/UI/UI.h>
 
 #include "AEEvents.h"
 #include "UIProgramOutput.h"
@@ -21,7 +21,7 @@ UIProgramOutput::UIProgramOutput(Context* context):
     UIModalOpWindow(context)
 {
 
-    TBUI* tbui = GetSubsystem<TBUI>();
+    UI* tbui = GetSubsystem<UI>();
     window_->SetText("Program Output");
     tbui->LoadResourceFile(window_->GetContentRoot(), "AtomicEditor/editor/ui/programoutput.tb.txt");
     output_ = window_->GetContentRoot()->GetWidgetByIDAndType<TBEditField>(TBIDC("output"));

Source/AtomicEditor/Source/UI/Modal/UIProgressModal.cpp

@@ -15,7 +15,7 @@
 #include <TurboBadger/tb_message_window.h>
 #include <TurboBadger/tb_editfield.h>
 
-#include <Atomic/UI/TBUI.h>
+#include <Atomic/UI/UI.h>
 
 using namespace tb;
 
@@ -28,7 +28,7 @@ ProgressModal::ProgressModal(Context* context, const String &title, const String
     , window_(0)
     , dimmer_(0)
 {
-    TBUI* tbui = GetSubsystem<TBUI>();
+    UI* tbui = GetSubsystem<UI>();
     dimmer_ = new TBDimmer();
 
     window_ = new TBWindow();
@@ -61,7 +61,7 @@ void ProgressModal::SetMessage(const String& message)
 
 void ProgressModal::Center()
 {
-    TBUI* tbui = GetSubsystem<TBUI>();
+    UI* tbui = GetSubsystem<UI>();
     TBRect rect = window_->GetRect();
     TBWidget* root = tbui->GetRootWidget();
     TBRect bounds(0, 0, root->GetRect().w, root->GetRect().h);
@@ -73,7 +73,7 @@ void ProgressModal::Center()
 void ProgressModal::Show()
 {
     assert(!dimmer_->GetParent());
-    TBUI* tbui = GetSubsystem<TBUI>();
+    UI* tbui = GetSubsystem<UI>();
     TBWidget* root = tbui->GetRootWidget();
     root->AddChild(dimmer_);
     root->AddChild(delegate_);
@@ -83,7 +83,7 @@ void ProgressModal::Show()
 void ProgressModal::Hide()
 {
 
-    TBUI* tbui = GetSubsystem<TBUI>();
+    UI* tbui = GetSubsystem<UI>();
     tbui->GetRootWidget()->SetFocusRecursive(WIDGET_FOCUS_REASON_UNKNOWN);
 
     if (dimmer_->GetParent())

Source/AtomicEditor/Source/UI/Modal/UIResourceOps.cpp

@@ -8,7 +8,7 @@
 #include <TurboBadger/tb_editfield.h>
 
 #include <Atomic/Core/Context.h>
-#include <Atomic/UI/TBUI.h>
+#include <Atomic/UI/UI.h>
 
 #include "Resources/AEResourceOps.h"
 
@@ -22,7 +22,7 @@ namespace AtomicEditor
 UINewFolder::UINewFolder(Context* context):
     UIModalOpWindow(context)
 {
-    TBUI* tbui = GetSubsystem<TBUI>();
+    UI* tbui = GetSubsystem<UI>();
     window_->SetText("New Folder");
     tbui->LoadResourceFile(window_->GetContentRoot(), "AtomicEditor/editor/ui/resourcenewfolder.tb.txt");
     nameField_ = window_->GetContentRoot()->GetWidgetByIDAndType<TBEditField>(TBIDC("folder_name"));
@@ -69,7 +69,7 @@ UIResourceDelete::UIResourceDelete(Context* context):
 {
     UIModalOps* ops = GetSubsystem<UIModalOps>();
 
-    TBUI* tbui = GetSubsystem<TBUI>();
+    UI* tbui = GetSubsystem<UI>();
     window_->SetText("Delete Resource");
     tbui->LoadResourceFile(window_->GetContentRoot(), "AtomicEditor/editor/ui/resourcedelete.tb.txt");
 
@@ -117,7 +117,7 @@ bool UIResourceDelete::OnEvent(const TBWidgetEvent &ev)
 UICreateComponent::UICreateComponent(Context* context):
     UIModalOpWindow(context)
 {
-    TBUI* tbui = GetSubsystem<TBUI>();
+    UI* tbui = GetSubsystem<UI>();
     window_->SetText("Create Javascript Component");
     tbui->LoadResourceFile(window_->GetContentRoot(), "AtomicEditor/editor/ui/resourcecreatecomponent.tb.txt");
     nameField_ = window_->GetContentRoot()->GetWidgetByIDAndType<TBEditField>(TBIDC("component_name"));
@@ -165,7 +165,7 @@ bool UICreateComponent::OnEvent(const TBWidgetEvent &ev)
 UICreateScript::UICreateScript(Context* context):
     UIModalOpWindow(context)
 {
-    TBUI* tbui = GetSubsystem<TBUI>();
+    UI* tbui = GetSubsystem<UI>();
     window_->SetText("Create Script");
     tbui->LoadResourceFile(window_->GetContentRoot(), "AtomicEditor/editor/ui/resourcecreatescript.tb.txt");
     nameField_ = window_->GetContentRoot()->GetWidgetByIDAndType<TBEditField>(TBIDC("script_name"));
@@ -213,7 +213,7 @@ bool UICreateScript::OnEvent(const TBWidgetEvent &ev)
 UICreateModule::UICreateModule(Context* context):
     UIModalOpWindow(context)
 {
-    TBUI* tbui = GetSubsystem<TBUI>();
+    UI* tbui = GetSubsystem<UI>();
     window_->SetText("Create Module");
     tbui->LoadResourceFile(window_->GetContentRoot(), "AtomicEditor/editor/ui/resourcecreatemodule.tb.txt");
     nameField_ = window_->GetContentRoot()->GetWidgetByIDAndType<TBEditField>(TBIDC("module_name"));
@@ -261,7 +261,7 @@ bool UICreateModule::OnEvent(const TBWidgetEvent &ev)
 UICreate2DLevel::UICreate2DLevel(Context* context):
     UIModalOpWindow(context)
 {
-    TBUI* tbui = GetSubsystem<TBUI>();
+    UI* tbui = GetSubsystem<UI>();
     window_->SetText("Create 2D Level");
     tbui->LoadResourceFile(window_->GetContentRoot(), "AtomicEditor/editor/ui/resourcecreate2dlevel.tb.txt");
     nameField_ = window_->GetContentRoot()->GetWidgetByIDAndType<TBEditField>(TBIDC("level_name"));

Source/AtomicEditor/Source/UI/UIConsoleWidget.cpp

@@ -8,7 +8,7 @@
 
 #include <Atomic/Core/Context.h>
 #include <Atomic/IO/Log.h>
-#include <Atomic/UI/TBUI.h>
+#include <Atomic/UI/UI.h>
 
 #include "UIListView.h"
 #include "UIConsoleWidget.h"
@@ -32,7 +32,7 @@ ConsoleWidget::ConsoleWidget(Context* context) :
     context_->RegisterSubsystem(this);
     SubscribeToEvent(E_EDITORSHUTDOWN, HANDLER(ConsoleWidget, HandleEditorShutdown));
 
-    TBUI* tbui = GetSubsystem<TBUI>();
+    UI* tbui = GetSubsystem<UI>();
     tbui->LoadResourceFile(delegate_, "AtomicEditor/editor/ui/consolewidget.tb.txt");
 
     consolelayout_ = delegate_->GetWidgetByIDAndType<TBLayout>(TBIDC("consolelayout"));

Source/AtomicEditor/Source/UI/UIErrorsWidget.cpp

@@ -8,7 +8,7 @@
 #include <Atomic/Core/Context.h>
 #include <Atomic/IO/Log.h>
 #include <Atomic/IO/FileSystem.h>
-#include <Atomic/UI/TBUI.h>
+#include <Atomic/UI/UI.h>
 
 #include "AEEvents.h"
 #include "UIListView.h"
@@ -25,7 +25,7 @@ ErrorsWidget::ErrorsWidget(Context* context) :
 {
     context_->RegisterSubsystem(this);
 
-    TBUI* tbui = GetSubsystem<TBUI>();
+    UI* tbui = GetSubsystem<UI>();
     tbui->LoadResourceFile(delegate_, "AtomicEditor/editor/ui/errorswidget.tb.txt");
 
     errorlayout_ = delegate_->GetWidgetByIDAndType<TBLayout>(TBIDC("errorlayout"));

Source/AtomicEditor/Source/UI/UIFindTextWidget.cpp

@@ -6,7 +6,7 @@
 
 #include <Atomic/Core/Context.h>
 #include <Atomic/IO/Log.h>
-#include <Atomic/UI/TBUI.h>
+#include <Atomic/UI/UI.h>
 
 #include <TurboBadger/tb_editfield.h>
 
@@ -23,7 +23,7 @@ FindTextWidget::FindTextWidget(Context* context) :
 {
     context_->RegisterSubsystem(this);
 
-    TBUI* tbui = GetSubsystem<TBUI>();
+    UI* tbui = GetSubsystem<UI>();
     tbui->LoadResourceFile(delegate_, "AtomicEditor/editor/ui/findtextwidget.tb.txt");
     tbui->GetRootWidget()->AddChild(delegate_);
 

Source/AtomicEditor/Source/UI/UIHierarchyFrame.cpp

@@ -11,7 +11,7 @@
 #include <Atomic/IO/FileSystem.h>
 #include <Atomic/Resource/ResourceEvents.h>
 
-#include <Atomic/UI/TBUI.h>
+#include <Atomic/UI/UI.h>
 
 #include "AEEditor.h"
 #include "AEEvents.h"
@@ -29,7 +29,7 @@ namespace AtomicEditor
 HierarchyFrame::HierarchyFrame(Context* context) :
     AEWidget(context)
 {
-    TBUI* tbui = GetSubsystem<TBUI>();
+    UI* tbui = GetSubsystem<UI>();
     tbui->LoadResourceFile(delegate_, "AtomicEditor/editor/ui/hierarchyframe.tb.txt");
 
     delegate_->SetID(TBIDC("projectframe_delegate"));

Source/AtomicEditor/Source/UI/UIInspectorFrame.cpp

@@ -12,7 +12,7 @@
 
 #include <Atomic/Scene/Component.h>
 
-#include <Atomic/UI/TBUI.h>
+#include <Atomic/UI/UI.h>
 
 #include "AEEditor.h"
 #include "AEEvents.h"
@@ -31,7 +31,7 @@ namespace AtomicEditor
 InspectorFrame::InspectorFrame(Context* context) :
     AEWidget(context)
 {
-    TBUI* tbui = GetSubsystem<TBUI>();
+    UI* tbui = GetSubsystem<UI>();
     tbui->LoadResourceFile(delegate_, "AtomicEditor/editor/ui/inspectorframe.tb.txt");
 
     delegate_->SetID(TBIDC("projectframe_delegate"));

Source/AtomicEditor/Source/UI/UIIssuesWidget.cpp

@@ -9,7 +9,7 @@
 #include <Atomic/Core/Context.h>
 #include <Atomic/IO/Log.h>
 #include <Atomic/IO/FileSystem.h>
-#include <Atomic/UI/TBUI.h>
+#include <Atomic/UI/UI.h>
 
 #include "UIListView.h"
 #include "UIIssuesWidget.h"
@@ -28,7 +28,7 @@ IssuesWidget::IssuesWidget(Context* context) :
 {
     context_->RegisterSubsystem(this);
 
-    TBUI* tbui = GetSubsystem<TBUI>();
+    UI* tbui = GetSubsystem<UI>();
     tbui->LoadResourceFile(delegate_, "AtomicEditor/editor/ui/issueswidget.tb.txt");
 
     issuelayout_ = delegate_->GetWidgetByIDAndType<TBLayout>(TBIDC("issuelayout"));

Source/AtomicEditor/Source/UI/UIListView.cpp

@@ -4,7 +4,7 @@
 
 #include "AtomicEditor.h"
 
-#include <Atomic/UI/TBUI.h>
+#include <Atomic/UI/UI.h>
 #include <Atomic/IO/Log.h>
 #include "UIListView.h"
 

Source/AtomicEditor/Source/UI/UIMainFrame.cpp

@@ -8,7 +8,7 @@
 #include <TurboBadger/tb_editfield.h>
 
 #include <Atomic/Core/ProcessUtils.h>
-#include <Atomic/UI/TBUI.h>
+#include <Atomic/UI/UI.h>
 #include <Atomic/IO/Log.h>
 #include <Atomic/Core/Context.h>
 #include <Atomic/Graphics/Graphics.h>
@@ -59,7 +59,7 @@ MainFrame::MainFrame(Context* context) :
 
     InitializeMenuSources();
 
-    TBUI* tbui = GetSubsystem<TBUI>();
+    UI* tbui = GetSubsystem<UI>();
     tbui->LoadResourceFile(delegate_, "AtomicEditor/editor/ui/mainframe.tb.txt");
 
     Graphics* graphics = GetSubsystem<Graphics>();

Source/AtomicEditor/Source/UI/UIMainToolbar.cpp

@@ -4,7 +4,7 @@
 
 #include "AtomicEditor.h"
 
-#include <Atomic/UI/TBUI.h>
+#include <Atomic/UI/UI.h>
 #include <Atomic/IO/Log.h>
 #include "UIMainToolbar.h"
 #include "../AEEvents.h"
@@ -22,7 +22,7 @@ namespace AtomicEditor
 MainToolbar::MainToolbar(Context* context) :
     AEWidget(context)
 {
-    TBUI* tbui = GetSubsystem<TBUI>();
+    UI* tbui = GetSubsystem<UI>();
     tbui->LoadResourceFile(delegate_, "AtomicEditor/editor/ui/maintoolbar.tb.txt");
 
     Show3DWidgets(false);

Source/AtomicEditor/Source/UI/UIMenubar.cpp

@@ -4,7 +4,7 @@
 
 #include "AtomicEditor.h"
 
-#include <Atomic/UI/TBUI.h>
+#include <Atomic/UI/UI.h>
 #include <Atomic/IO/Log.h>
 #include "UIMenubar.h"
 

Source/AtomicEditor/Source/UI/UIPlayerWidget.cpp

@@ -4,7 +4,7 @@
 
 #include "AtomicEditor.h"
 
-#include <Atomic/UI/TBUI.h>
+#include <Atomic/UI/UI.h>
 #include <Atomic/IO/Log.h>
 
 #include "UIPlayerWidget.h"
@@ -17,7 +17,7 @@ namespace AtomicEditor
 PlayerWidget::PlayerWidget(Context* context) :
     AEWidget(context)
 {
-    TBUI* tbui = GetSubsystem<TBUI>();
+    UI* tbui = GetSubsystem<UI>();
     tbui->LoadResourceFile(delegate_, "AtomicEditor/editor/ui/playerwidget.tb.txt");
 }
 

Source/AtomicEditor/Source/UI/UIProjectFrame.cpp

@@ -11,7 +11,7 @@
 #include <Atomic/IO/FileSystem.h>
 #include <Atomic/Resource/ResourceEvents.h>
 
-#include <Atomic/UI/TBUI.h>
+#include <Atomic/UI/UI.h>
 
 #include "../AEEditor.h"
 #include "../Project/AEProject.h"
@@ -30,7 +30,7 @@ namespace AtomicEditor
 ProjectFrame::ProjectFrame(Context* context) :
     AEWidget(context)
 {
-    TBUI* tbui = GetSubsystem<TBUI>();
+    UI* tbui = GetSubsystem<UI>();
     tbui->LoadResourceFile(delegate_, "AtomicEditor/editor/ui/projectframe.tb.txt");
 
     delegate_->SetID(TBIDC("projectframe_delegate"));
@@ -392,7 +392,7 @@ bool ProjectFrame::OnEvent(const TBWidgetEvent &ev)
 
         if (ev.target->GetID() == TBIDC("menu create"))
         {
-            TBUI* tbui = GetSubsystem<TBUI>();
+            UI* tbui = GetSubsystem<UI>();
             if (!tbui->GetRootWidget()->GetWidgetByID(TBIDC("create popup")))
                 if (TBMenuWindow *menu = new TBMenuWindow(ev.target, TBIDC("create popup")))
                     menu->Show(&menuCreateSource, TBPopupAlignment());

Source/AtomicEditor/Source/UI/UIResourceFrame.cpp

@@ -5,7 +5,7 @@
 #include "AtomicEditor.h"
 
 #include <Atomic/Container/ArrayPtr.h>
-#include <Atomic/UI/TBUI.h>
+#include <Atomic/UI/UI.h>
 #include <Atomic/IO/Log.h>
 #include <Atomic/IO/File.h>
 #include <Atomic/IO/FileSystem.h>
@@ -42,7 +42,7 @@ ResourceFrame::ResourceFrame(Context* context) :
     tabcontainer_(0),
     resourceLayout_(0)
 {
-    TBUI* tbui = GetSubsystem<TBUI>();
+    UI* tbui = GetSubsystem<UI>();
     tbui->LoadResourceFile(delegate_, "AtomicEditor/editor/ui/resourceframe.tb.txt");
 
     tabcontainer_  = delegate_->GetWidgetByIDAndType<TBTabContainer>(TBIDC("tabcontainer"));

Source/AtomicEditor/Source/UI/UIView3D.cpp

@@ -221,7 +221,7 @@ void View3DWidget::OnPaint(const PaintProps &paint_props)
     data[30] = rect.x;
     data[31] = rect.y + rect.h;
 
-    //view3D_->GetSubsystem<TBUI>()->SubmitBatchVertexData(view3D_->GetRenderTexture(), vertexData_);
+    //view3D_->GetSubsystem<UI>()->SubmitBatchVertexData(view3D_->GetRenderTexture(), vertexData_);
 
 }
 

Source/AtomicEditor/Source/UI/UIWelcomeFrame.cpp

@@ -19,7 +19,7 @@ using namespace rapidjson;
 #include <Atomic/IO/File.h>
 #include <Atomic/IO/Log.h>
 
-#include <Atomic/UI/TBUI.h>
+#include <Atomic/UI/UI.h>
 
 #include "License/AELicenseSystem.h"
 
@@ -50,7 +50,7 @@ WelcomeFrame::WelcomeFrame(Context* context) :
     exampleInfoDir_ = exampleSourceDir_ + "ExampleInfo";
     exampleSourceDir_ += "Examples";
 
-    TBUI* tbui = GetSubsystem<TBUI>();
+    UI* tbui = GetSubsystem<UI>();
     tbui->LoadResourceFile(delegate_, "AtomicEditor/editor/ui/welcomeframe.tb.txt");
 
     delegate_->SetGravity(WIDGET_GRAVITY_ALL);

Source/AtomicPlayer/AtomicPlayer.cpp

@@ -38,7 +38,7 @@
 
 #include <Atomic/DebugNew.h>
 
-#include <Atomic/UI/TBUI.h>
+#include <Atomic/UI/UI.h>
 
 DEFINE_APPLICATION_MAIN(AtomicPlayer);