Skip to content

Commit

Permalink
add second row for new game screen
Browse files Browse the repository at this point in the history 
moved ui files to correct folder
  • Loading branch information
@ar0ne
ar0ne authored and ar0ne committed Jun 25, 2018
1 parent dbfe54e commit 3be9575
Show file tree
Hide file tree
Showing 5 changed files with 84 additions and 57 deletions.
43 changes: 22 additions & 21 deletions ...rces/assets/ui/advancedGameSetupScreen.ui → ...assets/ui/menu/advancedGameSetupScreen.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
},
"position-bottom": {
"target": "TOP",
"widget": "close",
"widget": "actionsRow",
"offset": 16
}
}
Expand Down Expand Up @@ -112,7 +112,7 @@
},
"position-bottom": {
"target": "TOP",
"widget": "close",
"widget": "actionsRow",
"offset": 24
}
},
Expand Down Expand Up @@ -409,33 +409,20 @@
}
]
},
{
"type": "UISpace",
"id": "close",
"layoutInfo": {
"width": 128,
"height": 32,
"position-horizontal-center": {},
"position-bottom": {
"target": "BOTTOM",
"offset": 48
}
}
},
{
"type": "RowLayout",
"id": "actionsRow",
"horizontalSpacing": 4,
"contents": [
{
"type": "UIButton",
"text": "${engine:menu#back}",
"id": "close"
"text": "${engine:menu#continue}",
"id": "continue"
},
{
"type": "UIButton",
"text": "${engine:menu#continue}",
"id": "continue"
"text": "${engine:menu#start-game}",
"id": "play"
}
],
"layoutInfo": {
Expand All @@ -444,8 +431,22 @@
"position-horizontal-center": {},
"position-bottom": {
"target": "BOTTOM",
"offset": -48,
"widget": "container"
"offset": 80
}
}
},
{
"type": "UIButton",
"text": "${engine:menu#back}",
"id": "close",
"layoutInfo": {
"width": 128,
"height": 32,
"position-horizontal-center": {},
"position-top": {
"target": "BOTTOM",
"widget": "actionsRow",
"offset": 16
}
}
}
Expand Down
24 changes: 17 additions & 7 deletions ...main/resources/assets/ui/newGameScreen.ui → ...resources/assets/ui/menu/newGameScreen.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,11 +110,6 @@
"id": "actionsRow",
"horizontalSpacing": 4,
"contents": [
{
"type": "UIButton",
"text": "${engine:menu#back}",
"id": "close"
},
{
"type": "UIButton",
"text": "${engine:menu#advanced}",
Expand All @@ -130,12 +125,27 @@
"width": 400,
"height": 32,
"position-horizontal-center": {},
"position-bottom": {
"position-top": {
"target": "BOTTOM",
"offset": -48,
"offset": 16,
"widget": "mainBox"
}
}
},
{
"type": "UIButton",
"text": "${engine:menu#back}",
"id": "close",
"layoutInfo": {
"width": 128,
"height": 32,
"position-horizontal-center": {},
"position-top": {
"target": "BOTTOM",
"offset": 16,
"widget": "actionsRow"
}
}
}
]
}
Expand Down
0 ...resources/assets/ui/startPlayingScreen.ui → ...rces/assets/ui/menu/startPlayingScreen.ui
View file
File renamed without changes.
27 changes: 21 additions & 6 deletions ...esources/assets/ui/universeSetupScreen.ui → ...ces/assets/ui/menu/universeSetupScreen.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -154,25 +154,40 @@
"contents": [
{
"type": "UIButton",
"text": "${engine:menu#back}",
"id": "close"
"text": "${engine:menu#continue}",
"id": "continue"
},
{
"type": "UIButton",
"text": "${engine:menu#continue}",
"id": "continue"
"text": "${engine:menu#start-game}",
"id": "play"
}
],
"layoutInfo": {
"width": 400,
"height": 32,
"position-horizontal-center": {},
"position-bottom": {
"position-top": {
"target": "BOTTOM",
"offset": -48,
"offset": 16,
"widget": "mainBox"
}
}
},
{
"type": "UIButton",
"text": "${engine:menu#back}",
"id": "close",
"layoutInfo": {
"width": 128,
"height": 32,
"position-horizontal-center": {},
"position-top": {
"target": "BOTTOM",
"offset": 16,
"widget": "actionsRow"
}
}
}
]
}
Expand Down
47 changes: 24 additions & 23 deletions ...ces/assets/ui/worldPreGenerationScreen.ui → ...ssets/ui/menu/worldPreGenerationScreen.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
},
"position-bottom": {
"target": "TOP",
"widget": "close",
"widget": "actionsRow",
"offset": 16
}
}
Expand All @@ -64,9 +64,9 @@
"offset": 8
},
"position-bottom": {
"target": "TOP",
"widget": "close",
"offset": 24
"target": "BOTTOM",
"widget": "container",
"offset": 8
}
},
"contents": [
Expand Down Expand Up @@ -186,33 +186,20 @@
}
]
},
{
"type": "UISpace",
"id": "close",
"layoutInfo": {
"width": 128,
"height": 32,
"position-horizontal-center": {},
"position-bottom": {
"target": "BOTTOM",
"offset": 48
}
}
},
{
"type": "RowLayout",
"id": "actionsRow",
"horizontalSpacing": 4,
"contents": [
{
"type": "UIButton",
"text": "${engine:menu#back}",
"id": "close"
"text": "${engine:menu#continue}",
"id": "continue"
},
{
"type": "UIButton",
"text": "${engine:menu#continue}",
"id": "continue"
"text": "${engine:menu#start-game}",
"id": "play"
}
],
"layoutInfo": {
Expand All @@ -221,8 +208,22 @@
"position-horizontal-center": {},
"position-bottom": {
"target": "BOTTOM",
"offset": -48,
"widget": "container"
"offset": 80
}
}
},
{
"type": "UIButton",
"text": "${engine:menu#back}",
"id": "close",
"layoutInfo": {
"width": 128,
"height": 32,
"position-horizontal-center": {},
"position-top": {
"target": "BOTTOM",
"widget": "actionsRow",
"offset": 16
}
}
}
Expand Down

0 comments on commit 3be9575

Please sign in to comment.