Browse Source

Adding runtime and updated eula to about and initial confirmation dialogs

Josh Engebretson 10 years ago
parent
commit
5f840e34b8

+ 6 - 1
Resources/EditorData/AtomicEditor/editor/ui/about.tb.txt

@@ -4,7 +4,8 @@ TBLayout: axis: y
 		id tabcontainer
 		id tabcontainer
 		tabs
 		tabs
 			TBButton: text: "About"
 			TBButton: text: "About"
-			TBButton: text: "Atomic Game Engine License"
+			TBButton: text: "Editor and Tool License"
+			TBButton: text: "Runtime License"
 			TBButton: text: "Third Party Licenses"
 			TBButton: text: "Third Party Licenses"
 			TBButton: text: "External Tool Licenses"
 			TBButton: text: "External Tool Licenses"
 		TBEditField: multiline: 1, styling: 1, gravity: all, id: about_text, readonly: 1, adapt-to-content: 0
 		TBEditField: multiline: 1, styling: 1, gravity: all, id: about_text, readonly: 1, adapt-to-content: 0
@@ -15,6 +16,10 @@ TBLayout: axis: y
 			font: size: 12
 			font: size: 12
 			lp: max-width: 800, min-width: 800, min-height: 512, max-height: 512
 			lp: max-width: 800, min-width: 800, min-height: 512, max-height: 512
 			text: "..."
 			text: "..."
+		TBEditField: multiline: 1, styling: 1, gravity: all, id: age_runtime_license, readonly: 1, adapt-to-content: 0
+			font: size: 12
+			lp: max-width: 800, min-width: 800, min-height: 512, max-height: 512
+			text: "..."			
 		TBEditField: multiline: 1, styling: 1, gravity: all, id: thirdparty_license, readonly: 1, adapt-to-content: 0
 		TBEditField: multiline: 1, styling: 1, gravity: all, id: thirdparty_license, readonly: 1, adapt-to-content: 0
 			font: size: 12
 			font: size: 12
 			lp: max-width: 800, min-width: 800, min-height: 512, max-height: 512
 			lp: max-width: 800, min-width: 800, min-height: 512, max-height: 512

+ 6 - 1
Resources/EditorData/AtomicEditor/editor/ui/eulaagreement.tb.txt

@@ -3,13 +3,18 @@ TBLayout: axis: y
 		gravity all
 		gravity all
 		id tabcontainer
 		id tabcontainer
 		tabs
 		tabs
-			TBButton: text: "Atomic Game Engine License"
+			TBButton: text: "Editor and Tool License"
+			TBButton: text: "Runtime License"
 			TBButton: text: "Third Party Licenses"
 			TBButton: text: "Third Party Licenses"
 			TBButton: text: "External Tool Licenses"
 			TBButton: text: "External Tool Licenses"
 		TBEditField: multiline: 1, styling: 1, gravity: all, id: age_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: 12
 			font: size: 12
 			lp: max-width: 800, min-width: 800, min-height: 512, max-height: 512
 			lp: max-width: 800, min-width: 800, min-height: 512, max-height: 512
 			text: "..."
 			text: "..."
+		TBEditField: multiline: 1, styling: 1, gravity: all, id: age_runtime_license, readonly: 1, adapt-to-content: 0
+			font: size: 12
+			lp: max-width: 800, min-width: 800, min-height: 512, max-height: 512
+			text: "..."			
 		TBEditField: multiline: 1, styling: 1, gravity: all, id: thirdparty_license, readonly: 1, adapt-to-content: 0
 		TBEditField: multiline: 1, styling: 1, gravity: all, id: thirdparty_license, readonly: 1, adapt-to-content: 0
 			font: size: 12
 			font: size: 12
 			lp: max-width: 800, min-width: 800, min-height: 512, max-height: 512
 			lp: max-width: 800, min-width: 800, min-height: 512, max-height: 512

File diff suppressed because it is too large
+ 48 - 20
Resources/EditorData/AtomicEditor/eulas/atomic_game_engine_eula.txt


+ 21 - 0
Resources/EditorData/AtomicEditor/eulas/atomic_runtime_eula.txt

@@ -0,0 +1,21 @@
+<color #D4FB79>Atomic Game Engine™ Runtime End User License Agreement (EULA)</color>
+
+Copyright (c) 2014-2015, THUNDERBEAST GAMES LLC All rights reserved
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.

+ 5 - 0
Script/AtomicEditor/ui/modal/About.ts

@@ -21,6 +21,7 @@ class About extends ModalWindow {
         this.load("AtomicEditor/editor/ui/about.tb.txt");
         this.load("AtomicEditor/editor/ui/about.tb.txt");
 
 
         this.age_license = <Atomic.UIEditField>this.getWidget("age_license");
         this.age_license = <Atomic.UIEditField>this.getWidget("age_license");
+        this.age_runtimelicense = <Atomic.UIEditField> this.getWidget("age_runtime_license");
         this.thirdparty_license = <Atomic.UIEditField>this.getWidget("thirdparty_license");
         this.thirdparty_license = <Atomic.UIEditField>this.getWidget("thirdparty_license");
         this.externaltool_license = <Atomic.UIEditField>this.getWidget("externaltool_license");
         this.externaltool_license = <Atomic.UIEditField>this.getWidget("externaltool_license");
         this.about_text = <Atomic.UIEditField>this.getWidget("about_text");
         this.about_text = <Atomic.UIEditField>this.getWidget("about_text");
@@ -30,6 +31,9 @@ class About extends ModalWindow {
         var file = cache.getFile("AtomicEditor/eulas/atomic_game_engine_eula.txt");
         var file = cache.getFile("AtomicEditor/eulas/atomic_game_engine_eula.txt");
         this.age_license.text = file.readText();
         this.age_license.text = file.readText();
 
 
+        var file = cache.getFile("AtomicEditor/eulas/atomic_runtime_eula.txt");
+        this.age_runtimelicense.text = file.readText();
+        
         file = cache.getFile("AtomicEditor/eulas/atomic_thirdparty_eula.txt");
         file = cache.getFile("AtomicEditor/eulas/atomic_thirdparty_eula.txt");
         this.thirdparty_license.text = file.readText();
         this.thirdparty_license.text = file.readText();
 
 
@@ -115,6 +119,7 @@ class About extends ModalWindow {
     }
     }
 
 
     age_license: Atomic.UIEditField;
     age_license: Atomic.UIEditField;
+    age_runtimelicense: Atomic.UIEditField;
     thirdparty_license: Atomic.UIEditField;
     thirdparty_license: Atomic.UIEditField;
     externaltool_license: Atomic.UIEditField;
     externaltool_license: Atomic.UIEditField;
     about_text: Atomic.UIEditField;
     about_text: Atomic.UIEditField;

+ 5 - 0
Script/AtomicEditor/ui/modal/license/EULAWindow.ts

@@ -20,6 +20,7 @@ class EULAWindow extends ModalWindow {
         this.init("License Agreement", "AtomicEditor/editor/ui/eulaagreement.tb.txt");
         this.init("License Agreement", "AtomicEditor/editor/ui/eulaagreement.tb.txt");
 
 
         this.age_license = <Atomic.UIEditField> this.getWidget("age_license");
         this.age_license = <Atomic.UIEditField> this.getWidget("age_license");
+        this.age_runtimelicense = <Atomic.UIEditField> this.getWidget("age_runtime_license");
         this.thirdparty_license = <Atomic.UIEditField> this.getWidget("thirdparty_license");
         this.thirdparty_license = <Atomic.UIEditField> this.getWidget("thirdparty_license");
         this.externaltool_license = <Atomic.UIEditField> this.getWidget("externaltool_license");
         this.externaltool_license = <Atomic.UIEditField> this.getWidget("externaltool_license");
         this.eulaCheck = <Atomic.UICheckBox> this.getWidget("eula_check");
         this.eulaCheck = <Atomic.UICheckBox> this.getWidget("eula_check");
@@ -32,6 +33,9 @@ class EULAWindow extends ModalWindow {
         var file = cache.getFile("AtomicEditor/eulas/atomic_game_engine_eula.txt");
         var file = cache.getFile("AtomicEditor/eulas/atomic_game_engine_eula.txt");
         this.age_license.text = file.readText();
         this.age_license.text = file.readText();
 
 
+        var file = cache.getFile("AtomicEditor/eulas/atomic_runtime_eula.txt");
+        this.age_runtimelicense.text = file.readText();
+
         file = cache.getFile("AtomicEditor/eulas/atomic_thirdparty_eula.txt");
         file = cache.getFile("AtomicEditor/eulas/atomic_thirdparty_eula.txt");
         this.thirdparty_license.text = file.readText();
         this.thirdparty_license.text = file.readText();
 
 
@@ -71,6 +75,7 @@ class EULAWindow extends ModalWindow {
     }
     }
 
 
     age_license: Atomic.UIEditField;
     age_license: Atomic.UIEditField;
+    age_runtimelicense: Atomic.UIEditField;
     thirdparty_license: Atomic.UIEditField;
     thirdparty_license: Atomic.UIEditField;
     externaltool_license: Atomic.UIEditField;
     externaltool_license: Atomic.UIEditField;
     eulaCheck: Atomic.UICheckBox;
     eulaCheck: Atomic.UICheckBox;

Some files were not shown because too many files changed in this diff