Browse Source

Move Help to far right of main menu, update new build window

Josh Engebretson 9 years ago
parent
commit
689f964a8e

+ 77 - 77
Resources/EditorData/AtomicEditor/editor/ui/mainframe.tb.txt

@@ -1,80 +1,80 @@
 definitions
 definitions
-	menubutton		
-		lp: height: 28
-		font: name: Vera
-		skin TBButton.flat
+    menubutton
+        lp: height: 28
+        font: name: Vera
+        skin TBButton.flat
 TBLayout: distribution: gravity, axis: y
 TBLayout: distribution: gravity, axis: y
-	TBContainer: skin: AEContainer, gravity: all, id: mainframecontainer
-		TBLayout: distribution: gravity, axis: y		
-			TBLayout: distribution: gravity
-				TBContainer: skin: AEContainer, gravity: left right
-					TBLayout: distribution: gravity
-						TBButton
-							@include definitions>menubutton
-							text File
-							id menu file
-						TBButton
-							@include definitions>menubutton
-							text Edit
-							id menu edit
-						TBButton
-							@include definitions>menubutton
-							text Build
-							id menu build
-						TBButton
-							@include definitions>menubutton
-							text Tools
-							id menu tools
-						TBButton
-							@include definitions>menubutton
-							text Help
-							id menu help
-						TBButton
-							@include definitions>menubutton
-							text Developer
-							id menu developer
-						TBLayout: gravity: left right
-							TBWidget
-			TBLayout: distribution: gravity, position: top
-				TBLayout: distribution: gravity, axis: y, position: left, gravity: top bottom
-					TBEditField: text: "<color #AAAAAA>Project</color>", styling: 1, readonly: 1, adapt-to-content: 1, skin: 0
-						font: size: 11
-					TBLayout: distribution: gravity, id: projectviewcontainer
-					TBSeparator: gravity: left right, skin: AESeparator
-					TBEditField: text: "<color #AAAAAA>Hierarchy</color>", styling: 1, readonly: 1, adapt-to-content: 1, skin: 0
-						font: size: 11
-					TBLayout: distribution: gravity, id: hierarchycontainer
-						TBWidget: gravity: top bottom
-				TBLayout: distribution: gravity, axis: y
-					TBLayout: gravity: left right, id: maintoolbarcontainer
-					TBSeparator: gravity: left right, skin: AESeparator
-					TBLayout: distribution: gravity, id: resourceviewcontainer
-					TBContainer: skin: AEContainer, gravity: left right bottom, id: consolecontainer
-						TBEditField: multiline: 1, styling: 1, gravity: left right, id: consoletext
-							text: "Hello World!"
-				TBLayout: distribution: gravity, axis: y, position: left, gravity: top bottom, id: inspectorlayout
-					TBEditField: text: "<color #AAAAAA>Inspector</color>", styling: 1, readonly: 1, adapt-to-content: 1, skin: 0
-						font: size: 11
-					TBLayout: distribution: gravity, id: inspectorcontainer
+    TBContainer: skin: AEContainer, gravity: all, id: mainframecontainer
+        TBLayout: distribution: gravity, axis: y
+            TBLayout: distribution: gravity
+                TBContainer: skin: AEContainer, gravity: left right
+                    TBLayout: distribution: gravity
+                        TBButton
+                            @include definitions>menubutton
+                            text File
+                            id menu file
+                        TBButton
+                            @include definitions>menubutton
+                            text Edit
+                            id menu edit
+                        TBButton
+                            @include definitions>menubutton
+                            text Build
+                            id menu build
+                        TBButton
+                            @include definitions>menubutton
+                            text Tools
+                            id menu tools
+                        TBButton
+                            @include definitions>menubutton
+                            text Developer
+                            id menu developer
+                        TBButton
+                            @include definitions>menubutton
+                            text Help
+                            id menu help
+                        TBLayout: gravity: left right
+                            TBWidget
+            TBLayout: distribution: gravity, position: top
+                TBLayout: distribution: gravity, axis: y, position: left, gravity: top bottom
+                    TBEditField: text: "<color #AAAAAA>Project</color>", styling: 1, readonly: 1, adapt-to-content: 1, skin: 0
+                        font: size: 11
+                    TBLayout: distribution: gravity, id: projectviewcontainer
+                    TBSeparator: gravity: left right, skin: AESeparator
+                    TBEditField: text: "<color #AAAAAA>Hierarchy</color>", styling: 1, readonly: 1, adapt-to-content: 1, skin: 0
+                        font: size: 11
+                    TBLayout: distribution: gravity, id: hierarchycontainer
+                        TBWidget: gravity: top bottom
+                TBLayout: distribution: gravity, axis: y
+                    TBLayout: gravity: left right, id: maintoolbarcontainer
+                    TBSeparator: gravity: left right, skin: AESeparator
+                    TBLayout: distribution: gravity, id: resourceviewcontainer
+                    TBContainer: skin: AEContainer, gravity: left right bottom, id: consolecontainer
+                        TBEditField: multiline: 1, styling: 1, gravity: left right, id: consoletext
+                            text: "Hello World!"
+                TBLayout: distribution: gravity, axis: y, position: left, gravity: top bottom, id: inspectorlayout
+                    TBEditField: text: "<color #AAAAAA>Inspector</color>", styling: 1, readonly: 1, adapt-to-content: 1, skin: 0
+                        font: size: 11
+                    TBLayout: distribution: gravity, id: inspectorcontainer
 
 
-			TBLayout: distribution: gravity
-				TBContainer: skin: AEContainer, gravity: left right
-					TBLayout: distribution: gravity
-						TBLayout: distribution: gravity
-							TBLayout: axis: y, position: left, gravity: top left
-								TBSkinImage: skin: LogoAtomic64, id: current_platform_indicator
-									lp: height: 28, width:28
-						TBLayout: gravity: left right
-							TBWidget
-						TBButton
-							@include definitions>menubutton
-							text Errors
-							id menu errors
-						TBButton
-							@include definitions>menubutton
-							text Issues
-							id menu issues
-						TBButton
-							@include definitions>menubutton
-							text Console
-							id menu console
+            TBLayout: distribution: gravity
+                TBContainer: skin: AEContainer, gravity: left right
+                    TBLayout: distribution: gravity
+                        TBLayout: distribution: gravity
+                            TBLayout: axis: y, position: left, gravity: top left
+                                TBSkinImage: skin: LogoAtomic64, id: current_platform_indicator
+                                    lp: height: 28, width:28
+                        TBLayout: gravity: left right
+                            TBWidget
+                        TBButton
+                            @include definitions>menubutton
+                            text Errors
+                            id menu errors
+                        TBButton
+                            @include definitions>menubutton
+                            text Issues
+                            id menu issues
+                        TBButton
+                            @include definitions>menubutton
+                            text Console
+                            id menu console

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

@@ -2,7 +2,7 @@ TBLayout: axis: y
     gravity all
     gravity all
     TBEditField: multiline: 1, styling: 1, gravity: all, id: newbuild_text, readonly: 1, adapt-to-content: 0
     TBEditField: multiline: 1, styling: 1, gravity: all, id: newbuild_text, readonly: 1, adapt-to-content: 0
         font: size: 14
         font: size: 14
-        lp: max-width: 640, min-width: 640, min-height: 480, max-height: 480
+        lp: max-width: 640, min-width: 640, min-height: 460, max-height: 460
         text: "..."
         text: "..."
     TBLayout:
     TBLayout:
         TBCheckBox: id: newbuild_check
         TBCheckBox: id: newbuild_check

+ 3 - 2
Script/AtomicEditor/ui/modal/license/NewBuildWindow.ts

@@ -84,9 +84,10 @@ A cross platform game engine targeting 6 platforms is a lot of work! We need to
 
 
 In addition to monetary funding, we need help reviewing pull requests, addressing open issues, providing support in chat, etc.
 In addition to monetary funding, we need help reviewing pull requests, addressing open issues, providing support in chat, etc.
 
 
-<widget TBImageWidget: filename: 'AtomicEditor/editor/images/josh.jpg'> - Josh Engebretson on behalf of the Atomic Community
+<color #D4FB79>Thanks for your support!</color>
 
 
-<color #D4FB79>This notice will be displayed whenever a new Atomic Editor build is installed.</color>`;
+<widget TBImageWidget: filename: 'AtomicEditor/editor/images/josh.jpg'> - Josh Engebretson on behalf of the Atomic Community
+`;
 
 
         return text;
         return text;