Updates to EULA UI

Data/AtomicEditor/Resources/EditorData/AtomicEditor/editor/ui/eulaagreement.tb.txt

@@ -3,15 +3,10 @@ TBLayout: axis: y
 		gravity all
 		id tabcontainer
 		tabs
-			TBButton: text: "Editor License"
-			TBButton: text: "Source Code License"
+			TBButton: text: "Atomic Game Engine License"
 			TBButton: text: "Third Party Licenses"
 			TBButton: text: "External Tool Licenses"
-		TBEditField: multiline: 1, styling: 1, gravity: all, id: editor_license, readonly: 1, adapt-to-content: 0
-			font: size: 14
-			lp: max-width: 800, min-width: 800, min-height: 512, max-height: 512
-			text: "..."
-		TBEditField: multiline: 1, styling: 1, gravity: all, id: source_license, readonly: 1, adapt-to-content: 0
+		TBEditField: multiline: 1, styling: 1, gravity: all, id: age_license, readonly: 1, adapt-to-content: 0
 			font: size: 14
 			lp: max-width: 800, min-width: 800, min-height: 512, max-height: 512
 			text: "..."

Data/AtomicEditor/Resources/EditorData/AtomicEditor/eulas/atomic_editor_eula.txt

@@ -1 +0,0 @@
-atomic_editor_eula.txt

Data/AtomicEditor/Resources/EditorData/AtomicEditor/eulas/atomic_source_code_eula.txt

@@ -1,25 +0,0 @@
-ATOMIC GAME ENGINE SOURCE CODE EULA
-
-<color #D4FB79>The Atomic Game Engine Source Code is intended for licensees who need to customize the C++ runtime and editor.  For most users, we recommend the <u>supported binary releases</u> available for download at our website.</color>
-
-LICENSE
-
-This sets forth the entire agreement between THUNDERBEAST GAMES LLC ("Licensor") and the Licensee relating to the use of the Atomic Game Engine Source Code.
-
-Copyright (c) 2014-2015, THUNDERBEAST GAMES LLC All rights reserved
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-1. The annual revenue of any company employing, partnering, or affiliated in any way with the Licensee is <color #76D6FF>less than $250,000 USD annually</color>.  Please contact [email protected] if annual revenue exceeds $250,000 USD
-
-2. Licensee may not remove, alter, or circumvent any source code or functionality related to <color #76D6FF>product activation</color> or <color #76D6FF>feature and platform license management</color>.  This code is clearly commented between "// BEGIN LICENSE MANAGEMENT" and "// END LICENSE MANAGEMENT" blocks in the Atomic Game Engine source code
-
-3. Licensee may use the source code for any legal purpose including creating games, simulations, visualizations, etc.  <color #76D6FF>Licensee may NOT use the source code to create derivative game creation software including but not limited to game editors and engines</color>
- 
-4. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer
-
-5. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution
-
-6. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE

Data/AtomicEditor/Resources/EditorData/AtomicEditor/eulas/atomic_thirdparty_eula.txt

@@ -1,4 +1,3 @@
-
 THIRD PARTY TECHNOLOGY LICENSES AND COPYRIGHTS
 
 <color #D4FB79>This file contains information for third party technology used in the Atomic Game Engine</color>

Source/AtomicEditor/Source/License/AELicenseSystem.cpp

@@ -199,8 +199,7 @@ void LicenseSystem::SaveLicense()
     licenseFilePath += "AtomicLicense";
 
     SharedPtr<File> file(new File(context_, licenseFilePath, FILE_WRITE));
-    file->WriteInt(2); // version
-    file->WriteBool(eulaAgreementConfirmed_);
+    file->WriteInt(1); // version
     file->WriteString(key_);
 
     file->WriteBool(licenseWindows_);

Source/AtomicEditor/Source/License/UIEulaAgreement.cpp

@@ -36,17 +36,14 @@ UIEulaAgreement::UIEulaAgreement(Context* context):
     UIModalOpWindow(context)
 {
     TBUI* tbui = GetSubsystem<TBUI>();
-    window_->SetText("Atomic Game Engine - End User License Agreement");
+    window_->SetText("License Agreement");
     tbui->LoadResourceFile(window_->GetContentRoot(), "AtomicEditor/editor/ui/eulaagreement.tb.txt");
 
     eulaCheck_ = window_->GetWidgetByIDAndType<TBCheckBox>(TBIDC("eula_check"));
     assert(eulaCheck_);
 
-    TBEditField* editor_license = window_->GetWidgetByIDAndType<TBEditField>(TBIDC("editor_license"));
-    assert(editor_license);
-
-    TBEditField* source_license = window_->GetWidgetByIDAndType<TBEditField>(TBIDC("source_license"));
-    assert(source_license);
+    TBEditField* age_license = window_->GetWidgetByIDAndType<TBEditField>(TBIDC("age_license"));
+    assert(age_license);
 
     TBEditField* thirdparty_license = window_->GetWidgetByIDAndType<TBEditField>(TBIDC("thirdparty_license"));
     assert(thirdparty_license);
@@ -57,10 +54,10 @@ UIEulaAgreement::UIEulaAgreement(Context* context):
 
     ResourceCache* cache = GetSubsystem<ResourceCache>();
 
-    SharedPtr<File> file = cache->GetFile("AtomicEditor/eulas/atomic_source_code_eula.txt");
+    SharedPtr<File> file = cache->GetFile("AtomicEditor/eulas/atomic_game_engine_eula.txt");
     String text;
     file->ReadText(text);
-    source_license->SetText(text.CString());
+    age_license->SetText(text.CString());
 
     file = cache->GetFile("AtomicEditor/eulas/atomic_thirdparty_eula.txt");
     file->ReadText(text);
@@ -70,10 +67,6 @@ UIEulaAgreement::UIEulaAgreement(Context* context):
     file->ReadText(text);
     externaltool_license->SetText(text.CString());
 
-    file = cache->GetFile("AtomicEditor/eulas/atomic_editor_eula.txt");
-    file->ReadText(text);
-    editor_license->SetText(text.CString());
-
     window_->ResizeToFitContent();
     Center();
 }