Implement RA command bar.

2017-06-10 16:29:16 +00:00
parent 2923c9907f
commit 242f33c2ba
6 changed files with 313 additions and 8 deletions
--- a/mods/common/chrome/ingame-chat.yaml
+++ b/mods/common/chrome/ingame-chat.yaml
@@ -1,6 +1,6 @@
 Container@CHAT_PANEL:
 	X: (WINDOW_RIGHT - WIDTH) / 2
-	Y: WINDOW_BOTTOM - HEIGHT - 15
+	Y: WINDOW_BOTTOM - HEIGHT - 50
 	Width: 550
 	Height: 194
 	Logic: IngameChatLogic
--- a/mods/common/chrome/ingame-player.yaml
+++ b/mods/common/chrome/ingame-player.yaml
@@ -1,369 +0,0 @@
-Container@PLAYER_WIDGETS:
-	Children:
-		LogicKeyListener@CONTROLGROUP_KEYHANDLER:
-			Logic: ControlGroupLogic
-		LogicTicker@SIDEBAR_TICKER:
-		UnitCommand:
-			Width: WINDOW_RIGHT
-			Height: WINDOW_BOTTOM
-		Container@SUPPORT_POWERS:
-			Logic: SupportPowerBinLogic
-			X: 10
-			Y: 10
-			Children:
-				SupportPowers@SUPPORT_PALETTE:
-					IconSize: 62, 46
-					IconSpriteOffset: -1, -1
-					TooltipContainer: TOOLTIP_CONTAINER
-					ReadyText: READY
-					HoldText: ON HOLD
-				Container@PALETTE_FOREGROUND:
-					Children:
-						Image@ICON_TEMPLATE:
-							Logic: AddFactionSuffixLogic
-							X: 0 - 2
-							Y: 0 - 2
-							Width: 62
-							Height: 46
-							IgnoreMouseOver: true
-							ImageCollection: sidebar
-							ImageName: background-supportoverlay
-		SupportPowerTimer@SUPPORT_POWER_TIMER:
-			X: 80
-			Y: 10
-			Order: Descending
-		Image@SIDEBAR_BACKGROUND_TOP:
-			Logic: AddFactionSuffixLogic
-			X: WINDOW_RIGHT - 250
-			Y: 10
-			Width: 238
-			Height: 291
-			ImageCollection: sidebar
-			ImageName: background-top
-			ClickThrough: false
-			Children:
-				Container@TOP_BUTTONS:
-					Logic: MenuButtonsChromeLogic
-					X: 9
-					Y: 7
-					Children:
-						Button@BEACON_BUTTON:
-							Logic: BeaconOrderButtonLogic, AddFactionSuffixLogic
-							Width: 28
-							Height: 28
-							Background: sidebar-button
-							TooltipText: Place Beacon
-							TooltipContainer: TOOLTIP_CONTAINER
-							VisualHeight: 0
-							Children:
-								Image@ICON:
-									X: 6
-									Y: 6
-									ImageCollection: order-icons
-						Button@SELL_BUTTON:
-							Logic: SellOrderButtonLogic, AddFactionSuffixLogic
-							X: 32
-							Width: 28
-							Height: 28
-							Background: sidebar-button
-							TooltipText: Sell
-							TooltipContainer: TOOLTIP_CONTAINER
-							VisualHeight: 0
-							Children:
-								Image@ICON:
-									X: 6
-									Y: 6
-									ImageCollection: order-icons
-						Button@POWER_BUTTON:
-							Logic: PowerdownOrderButtonLogic, AddFactionSuffixLogic
-							X: 64
-							Width: 28
-							Height: 28
-							Background: sidebar-button
-							TooltipText: Power Down
-							TooltipContainer: TOOLTIP_CONTAINER
-							VisualHeight: 0
-							Children:
-								Image@ICON:
-									X: 6
-									Y: 6
-									ImageCollection: order-icons
-						Button@REPAIR_BUTTON:
-							Logic: RepairOrderButtonLogic, AddFactionSuffixLogic
-							X: 96
-							Width: 28
-							Height: 28
-							Background: sidebar-button
-							TooltipText: Repair
-							TooltipContainer: TOOLTIP_CONTAINER
-							VisualHeight: 0
-							Children:
-								Image@ICON:
-									X: 6
-									Y: 6
-									ImageCollection: order-icons
-						MenuButton@DEBUG_BUTTON:
-							Logic: AddFactionSuffixLogic
-							Key: escape Shift
-							X: 128
-							Width: 28
-							Height: 28
-							Background: sidebar-button
-							TooltipText: Debug Menu
-							TooltipContainer: TOOLTIP_CONTAINER
-							DisableWorldSounds: true
-							VisualHeight: 0
-							Children:
-								Image@ICON:
-									X: 6
-									Y: 6
-									ImageCollection: order-icons
-									ImageName: debug
-						MenuButton@OPTIONS_BUTTON:
-							Logic: AddFactionSuffixLogic
-							Key: escape
-							X: 192
-							Width: 28
-							Height: 28
-							Background: sidebar-button
-							TooltipText: Options
-							TooltipContainer: TOOLTIP_CONTAINER
-							DisableWorldSounds: true
-							VisualHeight: 0
-							Children:
-								Image@ICON:
-									X: 6
-									Y: 6
-									ImageCollection: order-icons
-									ImageName: options
-				Container@RADAR:
-					Logic: IngameRadarDisplayLogic
-					Children:
-						LogicTicker@RADAR_TICKER:
-						ColorBlock@RADAR_FADETOBLACK:
-							X: 8
-							Y: 40
-							Width: 222
-							Height: 222
-						Radar@RADAR_MINIMAP:
-							WorldInteractionController: INTERACTION_CONTROLLER
-							X: 9
-							Y: 41
-							Width: 220
-							Height: 220
-							Children:
-						VqaPlayer@PLAYER:
-							X: 8
-							Y: 40
-							Width: 220
-							Height: 220
-							Skippable: false
-				Label@GAME_TIMER:
-					Logic: GameTimerLogic
-					X: 3
-					Y: 263
-					Width: PARENT_RIGHT
-					Height: 22
-					Align: Center
-					Font: TinyBold
-				LabelWithTooltip@CASH:
-					Logic: IngameCashCounterLogic
-					X: 35
-					Y: 262
-					Width: 50
-					Height: 22
-					Font: Bold
-					Text: {0}
-					TooltipContainer: TOOLTIP_CONTAINER
-					TooltipTemplate: SIMPLE_TOOLTIP
-				LabelWithTooltip@POWER:
-					Logic: IngamePowerCounterLogic
-					X: PARENT_RIGHT - WIDTH - 30
-					Y: 262
-					Width: 50
-					Height: 22
-					Align: Right
-					Font: Bold
-					Text: {0}
-					TooltipContainer: TOOLTIP_CONTAINER
-					TooltipTemplate: SIMPLE_TOOLTIP
-					Children:
-						Image@POWER_ICON:
-							X: PARENT_RIGHT + 4
-							Y: 5
-							ImageCollection: power-icons
-							ImageName: power-normal
-		Container@SIDEBAR_PRODUCTION:
-			Logic: ClassicProductionLogic
-			X: WINDOW_RIGHT - 250
-			Y: 300
-			Width: 238
-			Height: 250
-			Children:
-				Container@PALETTE_BACKGROUND:
-					Children:
-						Image@ROW_TEMPLATE:
-							Logic: AddFactionSuffixLogic
-							Width: 238
-							Height: 47
-							ClickThrough: false
-							ImageCollection: sidebar
-							ImageName: background-iconrow
-						Image@BOTTOM_CAP:
-							Logic: AddFactionSuffixLogic
-							Width: 238
-							Height: 8
-							ClickThrough: false
-							ImageCollection: sidebar
-							ImageName: background-bottom
-				LogicTicker@PRODUCTION_TICKER:
-				ProductionPalette@PRODUCTION_PALETTE:
-					X: 42
-					Y: 1
-					TooltipContainer: TOOLTIP_CONTAINER
-					ReadyText: READY
-					HoldText: ON HOLD
-					IconSize: 62, 46
-					IconMargin: 1, 1
-					IconSpriteOffset: -1, -1
-				Container@PALETTE_FOREGROUND:
-					X: 40
-					Y: 0 - 1
-					Children:
-						Image@ROW_TEMPLATE:
-							Width: 238
-							Height: 47
-							IgnoreMouseOver: true
-							ImageCollection: sidebar-bits
-							ImageName: production-iconoverlay
-				Container@PRODUCTION_TYPES:
-					X: 7
-					Y: 2
-					Width: 29
-					Height: 240
-					Children:
-						ProductionTypeButton@BUILDING:
-							Logic: AddFactionSuffixLogic
-							Width: 28
-							Height: 28
-							VisualHeight: 0
-							Background: sidebar-button
-							TooltipText: Buildings
-							TooltipContainer: TOOLTIP_CONTAINER
-							ProductionGroup: Building
-							HotkeyName: ProductionTypeBuildingKey
-							Children:
-								Image@ICON:
-									X: 6
-									Y: 6
-									ImageCollection: production-icons
-						ProductionTypeButton@DEFENSE:
-							Logic: AddFactionSuffixLogic
-							Y: 31
-							Width: 28
-							Height: 28
-							VisualHeight: 0
-							Background: sidebar-button
-							TooltipText: Defense
-							TooltipContainer: TOOLTIP_CONTAINER
-							ProductionGroup: Defense
-							HotkeyName: ProductionTypeDefenseKey
-							Children:
-								Image@ICON:
-									X: 6
-									Y: 6
-									ImageCollection: production-icons
-						ProductionTypeButton@INFANTRY:
-							Logic: AddFactionSuffixLogic
-							Y: 62
-							Width: 28
-							Height: 28
-							VisualHeight: 0
-							Background: sidebar-button
-							TooltipText: Infantry
-							TooltipContainer: TOOLTIP_CONTAINER
-							ProductionGroup: Infantry
-							HotkeyName: ProductionTypeInfantryKey
-							Children:
-								Image@ICON:
-									X: 6
-									Y: 6
-									ImageCollection: production-icons
-						ProductionTypeButton@VEHICLE:
-							Logic: AddFactionSuffixLogic
-							Y: 93
-							Width: 28
-							Height: 28
-							VisualHeight: 0
-							Background: sidebar-button
-							TooltipText: Vehicles
-							TooltipContainer: TOOLTIP_CONTAINER
-							ProductionGroup: Vehicle
-							HotkeyName: ProductionTypeVehicleKey
-							Children:
-								Image@ICON:
-									X: 6
-									Y: 6
-									ImageCollection: production-icons
-						ProductionTypeButton@AIRCRAFT:
-							Logic: AddFactionSuffixLogic
-							Y: 124
-							Width: 28
-							Height: 28
-							VisualHeight: 0
-							Background: sidebar-button
-							TooltipText: Aircraft
-							TooltipContainer: TOOLTIP_CONTAINER
-							ProductionGroup: Aircraft
-							HotkeyName: ProductionTypeAircraftKey
-							Children:
-								Image@ICON:
-									X: 6
-									Y: 6
-									ImageCollection: production-icons
-						ProductionTypeButton@NAVAL:
-							Logic: AddFactionSuffixLogic
-							Y: 155
-							Width: 28
-							Height: 28
-							VisualHeight: 0
-							Background: sidebar-button
-							TooltipText: Naval
-							TooltipContainer: TOOLTIP_CONTAINER
-							ProductionGroup: Ship
-							HotkeyName: ProductionTypeNavalKey
-							Children:
-								Image@ICON:
-									X: 6
-									Y: 6
-									ImageCollection: production-icons
-						Button@SCROLL_UP_BUTTON:
-							Logic: AddFactionSuffixLogic
-							Y: 186
-							Width: 28
-							Height: 22
-							VisualHeight: 0
-							Background: sidebar-button
-							TooltipText: Scroll up
-							TooltipContainer: TOOLTIP_CONTAINER
-							Children:
-								Image@ICON:
-									X: 6
-									Y: 3
-									ImageCollection: scrollbar
-									ImageName: up_arrow
-						Button@SCROLL_DOWN_BUTTON:
-							Logic: AddFactionSuffixLogic
-							Y: 211
-							Width: 28
-							Height: 22
-							VisualHeight: 0
-							Background: sidebar-button
-							TooltipText: Scroll down
-							TooltipContainer: TOOLTIP_CONTAINER
-							Children:
-								Image@ICON:
-									X: 6
-									Y: 3
-									ImageCollection: scrollbar
-									ImageName: down_arrow
--- a/mods/common/chrome/tooltips.yaml
+++ b/mods/common/chrome/tooltips.yaml
@@ -28,6 +28,36 @@ Background@BUTTON_TOOLTIP:
 			Height: 23
 			TextColor: FFFF00
 			Font: Bold
+		Label@DESC:
+			X: 7
+			Y: 25
+			Height: 12
+			Font: TinyBold
+			VAlign: Top
+
+Background@BUTTON_WITH_DESC_HIGHLIGHT_TOOLTIP:
+	Logic: ButtonTooltipWithDescHighlightLogic
+		Highlight: FFFF00
+	Background: dialog4
+	Height: 29
+	Children:
+		Label@LABEL:
+			X: 7
+			Y: 2
+			Height: 23
+			Font: Bold
+		Label@HOTKEY:
+			Y: 2
+			Visible: false
+			TextColor: FFFF00
+			Height: 23
+			Font: Bold
+		Label@DESC:
+			X: 7
+			Y: 25
+			Height: 12
+			Font: TinyBold
+			VAlign: Top

 Background@WORLD_TOOLTIP:
 	Logic: WorldTooltipLogic