Josh Engebretson 10 years ago
parent
commit
a138ba53d8

BIN
Data/AtomicEditor/Resources/EditorData/AtomicEditor/editor/images/3dmodule_header.png


BIN
Data/AtomicEditor/Resources/EditorData/AtomicEditor/editor/images/atomic_logo.png


BIN
Data/AtomicEditor/Resources/EditorData/AtomicEditor/editor/images/earlyaccess_header.png


BIN
Data/AtomicEditor/Resources/EditorData/AtomicEditor/editor/images/platforms_header.png


+ 4 - 4
Data/AtomicEditor/Resources/EditorData/AtomicEditor/editor/ui/activation.tb.txt

@@ -1,17 +1,17 @@
-TBLayout: axis: y, distribution: gravity, position: left
-	TBSeparator: gravity: left right, skin: AESeparator
+TBLayout: axis: y, distribution: gravity
 	TBLayout: distribution: gravity
 	TBLayout: distribution: gravity
+		TBImageWidget: filename: "AtomicEditor/editor/images/atomic_logo.png"
 		TBTextField: text: "Product Key:"
 		TBTextField: text: "Product Key:"
 			font: size:18
 			font: size:18
 		TBLayout: gravity: left right, distribution-position: right bottom
 		TBLayout: gravity: left right, distribution-position: right bottom
 			TBEditField: id: license_key, autofocus: 1
 			TBEditField: id: license_key, autofocus: 1
 				placeholder ATOMIC-XXXX-XXXX-XXXX-XXXX
 				placeholder ATOMIC-XXXX-XXXX-XXXX-XXXX
-				lp: min-width: 380
+				lp: width: 240
 	TBSeparator: gravity: left right, skin: AESeparator
 	TBSeparator: gravity: left right, skin: AESeparator
 	TBLayout:
 	TBLayout:
 		TBButton: text: Activate, id: activate
 		TBButton: text: Activate, id: activate
 			lp: min-width: 128, min-height: 64
 			lp: min-width: 128, min-height: 64
-		TBButton: text: "Get Free Key", id: get_key
+		TBButton: text: "Get Free Key", id: get_key, skin: TBButton.greentext
 			lp: min-width: 128, min-height: 64			
 			lp: min-width: 128, min-height: 64			
 	TBSeparator: gravity: left right, skin: AESeparator
 	TBSeparator: gravity: left right, skin: AESeparator
 	TBLayout:
 	TBLayout:

+ 1 - 0
Data/AtomicEditor/Resources/EditorData/AtomicEditor/editor/ui/infomodule3d.tb.txt

@@ -1,4 +1,5 @@
 TBLayout: axis: y, distribution: gravity
 TBLayout: axis: y, distribution: gravity
+	TBImageWidget: filename: "AtomicEditor/editor/images/3dmodule_header.png"
 	TBEditField: multiline: 1, styling: 1, gravity: all, id: info, readonly: 1
 	TBEditField: multiline: 1, styling: 1, gravity: all, id: info, readonly: 1
 		font: size: 14
 		font: size: 14
 		text: "3D module required for 3D content\n\n" \
 		text: "3D module required for 3D content\n\n" \

+ 3 - 5
Data/AtomicEditor/Resources/EditorData/AtomicEditor/editor/ui/platformsinfo.tb.txt

@@ -1,13 +1,11 @@
 TBLayout: axis: y, distribution: gravity
 TBLayout: axis: y, distribution: gravity
+	TBImageWidget: filename: "AtomicEditor/editor/images/platforms_header.png"
 	TBEditField: multiline: 1, styling: 1, gravity: all, id: info, readonly: 1
 	TBEditField: multiline: 1, styling: 1, gravity: all, id: info, readonly: 1
 		font: size: 14
 		font: size: 14
-		text: "There are no platform deployment licenses installed.\n\n" \
-				"A platform license is required to deploy apps.\n\n" \
-				"<color #D4FB79>You will be able to preview gameplay in the Atomic Editor.</color>\n\n" \
+		text: "A platform license is required to deploy apps to this platform.\n\n" \
 				"<color #76D6FF>Available platform licenses:</color>\n\n" \
 				"<color #76D6FF>Available platform licenses:</color>\n\n" \
-				"<widget TBSkinImage: skin: 'LogoMac-Small'> <widget TBSkinImage: skin: 'LogoWindows-Small'> " \
 				"<widget TBSkinImage: skin: 'LogoHTML5-Small'> <widget TBSkinImage: skin: 'LogoAndroid-Small'> " \
 				"<widget TBSkinImage: skin: 'LogoHTML5-Small'> <widget TBSkinImage: skin: 'LogoAndroid-Small'> " \
-				"<widget TBSkinImage: skin: 'LogoIOS-Small'>" 
+				"<widget TBSkinImage: skin: 'LogoIOS-Small'>"
 		lp: min-width: 480, min-height: 240
 		lp: min-width: 480, min-height: 240
 	TBSeparator: gravity: left right, skin: AESeparator
 	TBSeparator: gravity: left right, skin: AESeparator
 	TBLayout:
 	TBLayout:

+ 3 - 1
Data/AtomicEditor/Resources/EditorData/AtomicEditor/editor/ui/welcomeframe.tb.txt

@@ -13,10 +13,12 @@ TBLayout: distribution: gravity, size: available, axis: y, id: welcomelayout, po
 	TBLayout: distribution: gravity, size: available
 	TBLayout: distribution: gravity, size: available
 		TBLayout: distribution: gravity, axis: y, position: left
 		TBLayout: distribution: gravity, axis: y, position: left
 			TBEditField: text: "<color #76D6FF>Welcome:</color>", styling: 1, readonly: 1, adapt-to-content: 1, skin: 0
 			TBEditField: text: "<color #76D6FF>Welcome:</color>", styling: 1, readonly: 1, adapt-to-content: 1, skin: 0
+			TBImageWidget: filename: "AtomicEditor/editor/images/earlyaccess_header.png"
+				lp: width: 420, height: 137
 			TBEditField: multiline: 1, styling: 1, gravity: all, id: welcome_text, readonly: 1, adapt-to-content: 0
 			TBEditField: multiline: 1, styling: 1, gravity: all, id: welcome_text, readonly: 1, adapt-to-content: 0
 				font: size: 14
 				font: size: 14
 				lp: max-width: 420, min-width: 420
 				lp: max-width: 420, min-width: 420
-				text: "Welcome to the     <widget TBImageWidget: filename: 'AtomicEditor/editor/images/atomic_logo.png'>\n\n" \
+				text: "Welcome to the Atomic Game Engine Early Access\n\n" \
 				"<color #D4FB79>First Steps</color>\n\n" \
 				"<color #D4FB79>First Steps</color>\n\n" \
 				"• Try out some of the example projects on the right.\n\n" \
 				"• Try out some of the example projects on the right.\n\n" \
 				"• You can also create a new project based on a 2D or 3D template.\n\n" \
 				"• You can also create a new project based on a 2D or 3D template.\n\n" \

+ 4 - 0
Data/AtomicEditor/Resources/EditorData/AtomicEditor/resources/default_skin/skin.tb.txt

@@ -69,6 +69,10 @@ elements
 		bitmap button_flat_pressed.png
 		bitmap button_flat_pressed.png
 		cut 8
 		cut 8
 
 
+	TBButton.greentext
+		clone TBButton
+		text-color #D4FB79
+
 
 
 	# == TBButtonInGroup is not a widget. It's only used as override for TBButton under a "button_group" ====
 	# == TBButtonInGroup is not a widget. It's only used as override for TBButton under a "button_group" ====
 	TBButtonInGroup
 	TBButtonInGroup

+ 11 - 9
Source/AtomicEditor/Source/UI/Modal/UIBuildSettings.cpp

@@ -299,19 +299,21 @@ bool UIBuildSettings::OnEvent(const TBWidgetEvent &ev)
         {
         {
 // BEGIN LICENSE MANAGEMENT
 // BEGIN LICENSE MANAGEMENT
 
 
+            TBID id = platformSelect_->GetSelectedItemID();
             LicenseSystem* licenseSystem = GetSubsystem<LicenseSystem>();
             LicenseSystem* licenseSystem = GetSubsystem<LicenseSystem>();
-            /*
-            if (!licenseSystem->HasPlatformLicense())
+            if (licenseSystem->IsStarterLicense())
             {
             {
-                SharedPtr<UIBuildSettings> keepAlive(this);
-                UIModalOps* ops = GetSubsystem<UIModalOps>();
-                ops->Hide();
-                ops->ShowPlatformsInfo();
-                return true;
+                if (id == TBIDC("WebGLBuildSettings") || id == TBIDC("AndroidBuildSettings") || id == TBIDC("iOSBuildSettings"))
+                {
+                    SharedPtr<UIBuildSettings> keepAlive(this);
+                    UIModalOps* ops = GetSubsystem<UIModalOps>();
+                    ops->Hide();
+                    ops->ShowPlatformsInfo();
+                    return true;
+                }
+
             }
             }
-            */
 
 
-            TBID id = platformSelect_->GetSelectedItemID();
             RequestPlatformChange(id);
             RequestPlatformChange(id);
             return true;
             return true;
 // END LICENSE MANAGEMENT
 // END LICENSE MANAGEMENT

+ 0 - 1
Source/AtomicEditor/Source/UI/Modal/UIInfoModule3D.cpp

@@ -43,7 +43,6 @@ InfoModule3D::InfoModule3D(Context* context):
 
 
 }
 }
 
 
-
 InfoModule3D::~InfoModule3D()
 InfoModule3D::~InfoModule3D()
 {
 {
 }
 }