Map chooser

2011-05-07 20:29:24 +12:00
parent 44d3412c7b
commit d349c5341e
4 changed files with 214 additions and 215 deletions
--- a/mods/cnc/chrome/mapchooser.yaml
+++ b/mods/cnc/chrome/mapchooser.yaml
@@ -0,0 +1,213 @@
+Container@MAP_CHOOSER:
+	Id:MAP_CHOOSER
+	Delegate:MapChooserDelegate
+	X:(WINDOW_RIGHT - WIDTH)/2
+	Y:(WINDOW_BOTTOM - 500)/2
+	Width:740
+	Height:535
+	Children:
+		Label@TITLE:
+			Width:740
+			Y:0-25
+			Font:BigBold
+			Contrast:true
+			Align:Center
+			Text: Select Map
+		Background@bg:
+			Width:740
+			Height:500
+			Background:panel-black
+			Children:
+				Background@MAP_BG:
+					X:PARENT_RIGHT-15-WIDTH
+					Y:30
+					Width:194
+					Height:194
+					Background:panel-gray
+					Children:
+						MapPreview@MAP_PREVIEW:
+							Id:MAPCHOOSER_MAP_PREVIEW
+							X:1
+							Y:1
+							Width:192
+							Height:192
+				ScrollPanel@MAP_LIST:
+					Id:MAP_LIST
+					X:15
+					Y:30
+					Width:504
+					Height:455
+					Children:
+						Container@MAP_TEMPLATE:
+							Id:MAP_TEMPLATE
+							Width:PARENT_RIGHT-28
+							Height:25
+							X:2
+							Y:0
+							Visible:false
+							Children:
+								Label@TITLE:
+									X:10
+									Id:TITLE
+									Width:PARENT_RIGHT-100
+									Height:25
+								Label@PLAYERS:
+									Id:PLAYERS
+									X:PARENT_RIGHT-150
+									Width:30
+									Height:25
+								Label@TYPE:
+									Id:TYPE
+									Width:90
+									X:PARENT_RIGHT-100
+									Align:Right
+									Height:25
+				Container@LABEL_CONTAINER:
+					X:25
+					Y:5
+					Children:
+						Label@TITLE:
+							Width:125
+							Height:25
+							X:0
+							Y:0
+							Text:Title
+							Align:Center
+							Bold:True
+						Label@PLAYERS:
+							Text:Players
+							Bold:true
+							Width:50
+							X:294
+							Height:25
+						Label@TYPE:
+							Text:Type
+							Bold:true
+							Width:50
+							X:410
+							Height:25
+				Container@MAP_LABEL_CONTAINER:
+					X:PARENT_RIGHT-15-WIDTH-10
+					Y:232
+					Width:192
+					Height:200
+					Children:
+						Label@CURMAP_TITLE_LABEL:
+							Id:CURMAP_TITLE_LABEL
+							X:0
+							Y:0
+							Align:Right
+							Width:70
+							Height:20
+							Text:Title:
+							Bold:True
+						Label@CURMAP_TITLE:
+							Id:CURMAP_TITLE
+							X:75
+							Y:0
+							Align:Left
+							Width:70
+							Height:20
+						Label@CURMAP_AUTHOR_LABEL:
+							Id:CURMAP_AUTHOR_LABEL
+							X:0
+							Y:20
+							Align:Right
+							Width:70
+							Height:20
+							Text:Author:
+							Bold:True
+						Label@CURMAP_AUTHOR:
+							Id:CURMAP_AUTHOR
+							X:75
+							Y:20
+							Align:Left
+							Width:175
+							Height:20
+							WordWrap:True
+						Label@CURMAP_SIZE_LABEL:
+							Id:CURMAP_SIZE_LABEL
+							X:0
+							Y:40
+							Align:Right
+							Width:70
+							Height:20
+							Text:Size:
+							Bold:True
+						Label@CURMAP_SIZE:
+							Id:CURMAP_SIZE
+							X:75
+							Y:40
+							Align:Left
+							Width:70
+							Height:20
+						Label@CURMAP_THEATER_LABEL:
+							Id:CURMAP_THEATER_LABEL
+							X:0
+							Y:60
+							Align:Right
+							Width:70
+							Height:20
+							Text:Theater:
+							Bold:True
+						Label@CURMAP_THEATER:
+							Id:CURMAP_THEATER
+							X:75
+							Y:60
+							Align:Left
+							Width:70
+							Height:20
+						Label@CURMAP_PLAYERS_LABEL:
+							Id:CURMAP_PLAYERS_LABEL
+							X:0
+							Y:80
+							Align:Right
+							Width:70
+							Height:20
+							Text:Players:
+							Bold:True
+						Label@CURMAP_PLAYERS:
+							Id:CURMAP_PLAYERS
+							X:75
+							Y:80
+							Align:Left
+							Width:70
+							Height:20
+						Label@CURMAP_DESC_LABEL:
+							Id:CURMAP_DESC_LABEL
+							X:0
+							Y:100
+							Align:Right
+							Width:70
+							Height:20
+							Text:Desc:
+							Bold:True
+						Label@CURMAP_DESC:
+							Id:CURMAP_DESC
+							X:75
+							Y:100
+							Align:Left
+							Width:117
+							Height:20
+							WordWrap:True
+				CncMenuButton@BUTTON_OK:
+					Id:BUTTON_OK
+					X:0
+					Y:499
+					Width:140
+					Height:35
+					Text:Ok
+				CncMenuButton@BUTTON_INSTALL:
+					Id:BUTTON_INSTALL
+					X:150
+					Y:499
+					Width:140
+					Height:35
+					Text:Install Map
+				CncMenuButton@BUTTON_CANCEL:
+					Id:BUTTON_CANCEL
+					X:600
+					Y:499
+					Width:140
+					Height:35
+					Text:Cancel
--- a/mods/cnc/chrome/serverbrowser.yaml
+++ b/mods/cnc/chrome/serverbrowser.yaml
@@ -115,7 +115,6 @@ Container@SERVERBROWSER_PANEL:
 							Width:PARENT_RIGHT
 							Height:PARENT_BOTTOM
 							Visible:false
-							Background:panel-darkred
 							Children:
 								MapPreview@MAP_PREVIEW:
 									Id:MAP_PREVIEW
--- a/mods/cnc/chrome/unused/mapchooser.yaml
+++ b/mods/cnc/chrome/unused/mapchooser.yaml
@@ -1,214 +0,0 @@
-Background@MAP_CHOOSER:
-	Id:MAP_CHOOSER
-	X:(WINDOW_RIGHT - WIDTH)/2
-	Y:(WINDOW_BOTTOM - HEIGHT)/2
-	Delegate:MapChooserDelegate
-	Width:800
-	Height:600
-	Children:
-		Label@MAPCHOOSER_TITLE:
-			X:0
-			Y:17
-			Align:Center
-			Width:800
-			Height:20
-			Text:Choose Map
-			Bold:True
-		ScrollPanel@MAP_LIST:
-			Id:MAP_LIST
-			X:20
-			Y:67
-			Width:504
-			Height:474
-			Children:
-				Container@MAP_TEMPLATE:
-					Id:MAP_TEMPLATE
-					Width:PARENT_RIGHT-28
-					Height:25
-					X:2
-					Y:0
-					Visible:false
-					Children:
-						Label@TITLE:
-							X:10
-							Id:TITLE
-							Width:PARENT_RIGHT-100
-							Height:25
-						Label@PLAYERS:
-							Id:PLAYERS
-							X:PARENT_RIGHT-150
-							Width:30
-							Height:25
-						Label@TYPE:
-							Id:TYPE
-							Width:90
-							X:PARENT_RIGHT-100
-							Align:Right
-							Height:25
-		Container@MAP_LABELS:
-			Width:494
-			Height:25
-			X:25
-			Y:40
-			Children:
-				Label@TITLE:
-					Width:125
-					Height:25
-					X:0
-					Y:0
-					Text:Title
-					Align:Center
-					Bold:True
-				Label@PLAYERS:
-					Text:Players
-					Bold:true
-					Width:50
-					X:304
-					Height:25
-				Label@TYPE:
-					Text:Type
-					Bold:true
-					Width:50
-					X:420
-					Height:25
-		Background@MAPCHOOSER_MAP_BG:
-			X:PARENT_RIGHT-268
-			Y:50
-			Width:252
-			Height:252
-			Background:dialog3
-			Children:
-				MapPreview@MAPCHOOSER_MAP_PREVIEW:
-					Id:MAPCHOOSER_MAP_PREVIEW
-					X:4
-					Y:4
-					Width:244
-					Height:244
-		Container@MAP_LABEL_CONTAINER:
-			Width:70
-			Height:200
-			X:PARENT_RIGHT - 255
-			Y:311
-			Children:
-				Label@CURMAP_TITLE_LABEL:
-					Id:CURMAP_TITLE_LABEL
-					X:0
-					Y:0
-					Align:Right
-					Width:70
-					Height:20
-					Text:Title:
-					Bold:True
-				Label@CURMAP_TITLE:
-					Id:CURMAP_TITLE
-					X:75
-					Y:0
-					Align:Left
-					Width:70
-					Height:20
-				Label@CURMAP_AUTHOR_LABEL:
-					Id:CURMAP_AUTHOR_LABEL
-					X:0
-					Y:20
-					Align:Right
-					Width:70
-					Height:20
-					Text:Author:
-					Bold:True
-				Label@CURMAP_AUTHOR:
-					Id:CURMAP_AUTHOR
-					X:75
-					Y:20
-					Align:Left
-					Width:175
-					Height:20
-					WordWrap:True
-				Label@CURMAP_SIZE_LABEL:
-					Id:CURMAP_SIZE_LABEL
-					X:0
-					Y:40
-					Align:Right
-					Width:70
-					Height:20
-					Text:Size:
-					Bold:True
-				Label@CURMAP_SIZE:
-					Id:CURMAP_SIZE
-					X:75
-					Y:40
-					Align:Left
-					Width:70
-					Height:20
-				Label@CURMAP_THEATER_LABEL:
-					Id:CURMAP_THEATER_LABEL
-					X:0
-					Y:60
-					Align:Right
-					Width:70
-					Height:20
-					Text:Theater:
-					Bold:True
-				Label@CURMAP_THEATER:
-					Id:CURMAP_THEATER
-					X:75
-					Y:60
-					Align:Left
-					Width:70
-					Height:20
-				Label@CURMAP_PLAYERS_LABEL:
-					Id:CURMAP_PLAYERS_LABEL
-					X:0
-					Y:80
-					Align:Right
-					Width:70
-					Height:20
-					Text:Players:
-					Bold:True
-				Label@CURMAP_PLAYERS:
-					Id:CURMAP_PLAYERS
-					X:75
-					Y:80
-					Align:Left
-					Width:70
-					Height:20
-				Label@CURMAP_DESC_LABEL:
-					Id:CURMAP_DESC_LABEL
-					X:0
-					Y:100
-					Align:Right
-					Width:70
-					Height:20
-					Text:Desc:
-					Bold:True
-				Label@CURMAP_DESC:
-					Id:CURMAP_DESC
-					X:75
-					Y:100
-					Align:Left
-					Width:170
-					Height:20
-					WordWrap:True
-		Button@BUTTON_OK:
-			Id:BUTTON_OK
-			X:PARENT_RIGHT - 295
-			Y:PARENT_BOTTOM - 49
-			Width:120
-			Height:25
-			Text:Ok
-			Bold:True
-		Button@BUTTON_CANCEL:
-			Id:BUTTON_CANCEL
-			X:PARENT_RIGHT-154
-			Y:PARENT_BOTTOM-49
-			Width:120
-			Height:25
-			Text:Cancel
-			Bold:True
-		Button@BUTTON_INSTALL:
-			Id:BUTTON_INSTALL
-			X:20
-			Y:PARENT_BOTTOM-49
-			Width:120
-			Height:25
-			Text:Install Map
-			Bold:True
--- a/mods/cnc/mod.yaml
+++ b/mods/cnc/mod.yaml
@@ -64,6 +64,7 @@ ChromeLayout:
 	mods/cnc/chrome/serverbrowser.yaml
 	mods/cnc/chrome/directconnect.yaml
 	mods/cnc/chrome/lobby.yaml
+	mods/cnc/chrome/mapchooser.yaml
 	mods/cnc/chrome/ingame.yaml

 Weapons: