From 3ae61c5f8c91e67a8386e4c8b212220ec0e83858 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= <matthias@mailaender.name>
Date: Sat, 27 Apr 2013 15:37:52 +0200
Subject: [PATCH] added the game asset viewer to d2k mod

---
 OpenRA.Mods.RA/Widgets/Logic/AssetBrowserLogic.cs | 12 ++++++------
 mods/d2k/chrome/mainmenu.yaml                     | 11 +++++++++--
 mods/d2k/mod.yaml                                 |  2 ++
 mods/ra/chrome/assetbrowser.yaml                  |  4 ++--
 4 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/OpenRA.Mods.RA/Widgets/Logic/AssetBrowserLogic.cs b/OpenRA.Mods.RA/Widgets/Logic/AssetBrowserLogic.cs
index 7bd85985b2..60154c5f2d 100644
--- a/OpenRA.Mods.RA/Widgets/Logic/AssetBrowserLogic.cs
+++ b/OpenRA.Mods.RA/Widgets/Logic/AssetBrowserLogic.cs
@@ -33,12 +33,6 @@ namespace OpenRA.Mods.RA.Widgets.Logic
 		{
 			panel = widget;
 
-			spriteImage = panel.Get<ShpImageWidget>("SPRITE");
-
-			filenameInput = panel.Get<TextFieldWidget>("FILENAME_INPUT");
-			filenameInput.Text = spriteImage.Image;
-			filenameInput.OnEnterKey = () => LoadAsset(filenameInput.Text);
-
 			var assetList = panel.Get<ScrollPanelWidget>("ASSET_LIST");
 			var template = panel.Get<ScrollItemWidget>("ASSET_TEMPLATE");
 
@@ -53,6 +47,12 @@ namespace OpenRA.Mods.RA.Widgets.Logic
 				}
 			}
 
+			spriteImage = panel.Get<ShpImageWidget>("SPRITE");
+
+			filenameInput = panel.Get<TextFieldWidget>("FILENAME_INPUT");
+			filenameInput.Text = spriteImage.Image;
+			filenameInput.OnEnterKey = () => LoadAsset(filenameInput.Text);
+
 			frameSlider = panel.Get<SliderWidget>("FRAME_SLIDER");
 			frameSlider.MaximumValue = (float)spriteImage.FrameCount;
 			frameSlider.Ticks = spriteImage.FrameCount+1;
diff --git a/mods/d2k/chrome/mainmenu.yaml b/mods/d2k/chrome/mainmenu.yaml
index 2e762ef458..c9092ef014 100644
--- a/mods/d2k/chrome/mainmenu.yaml
+++ b/mods/d2k/chrome/mainmenu.yaml
@@ -2,7 +2,7 @@ Background@MAINMENU:
 	X:(WINDOW_RIGHT - WIDTH)/2
 	Y:(WINDOW_BOTTOM - HEIGHT)/2
 	Width:250
-	Height:420
+	Height:460
 	Visible:true
 	Logic:MainMenuButtonsLogic
 	Children:
@@ -63,11 +63,18 @@ Background@MAINMENU:
 			Height:25
 			Text:Replay Viewer
 			Font:Bold
-		Button@MAINMENU_BUTTON_QUIT:
+		Button@MAINMENU_BUTTON_ASSET_BROWSER:
 			X:45
 			Y:350
 			Width:160
 			Height:25
+			Text:Asset Browser
+			Font:Bold
+		Button@MAINMENU_BUTTON_QUIT:
+			X:45
+			Y:390
+			Width:160
+			Height:25
 			Text:Quit
 			Font:Bold
 Background@PERF_BG:
diff --git a/mods/d2k/mod.yaml b/mods/d2k/mod.yaml
index 6c759fa3b1..de3390ecfb 100644
--- a/mods/d2k/mod.yaml
+++ b/mods/d2k/mod.yaml
@@ -66,6 +66,8 @@ ChromeLayout:
 	mods/ra/chrome/cheats.yaml
 	mods/ra/chrome/musicplayer.yaml
 	mods/d2k/chrome/tooltips.yaml
+	mods/ra/chrome/assetbrowser.yaml
+
 Weapons:
 	mods/d2k/weapons/defaults.yaml
 	mods/d2k/weapons/explosions.yaml
diff --git a/mods/ra/chrome/assetbrowser.yaml b/mods/ra/chrome/assetbrowser.yaml
index 21c62fbbd6..cd07b7bc53 100644
--- a/mods/ra/chrome/assetbrowser.yaml
+++ b/mods/ra/chrome/assetbrowser.yaml
@@ -68,8 +68,8 @@ Background@ASSETBROWSER_BG:
 					Y:80
 					Width:246
 					Height:246
-					Image:fact
-					Palette:player
+					Image:mouse
+					Palette:colorpicker
 		Label@ACTIONS_TITLE:
 			X:PARENT_RIGHT - 150
 			Y:45