From 3e6d1fc1e24c545a497ecc0211153a021f07cc11 Mon Sep 17 00:00:00 2001
From: Paul Chote <paul@chote.net>
Date: Thu, 5 May 2011 20:46:35 +1200
Subject: [PATCH] New button layout

---
 artsrc/cnc/buttons.svg        |  33 ++++++++----
 mods/cnc/chrome.yaml          |  58 ++++++++++-----------
 mods/cnc/chrome/mainmenu.yaml |  94 +++++++++++++++++-----------------
 mods/cnc/uibits/uibuttons.png | Bin 490 -> 526 bytes
 4 files changed, 98 insertions(+), 87 deletions(-)

diff --git a/artsrc/cnc/buttons.svg b/artsrc/cnc/buttons.svg
index 2960a85eed..9d57b3b662 100644
--- a/artsrc/cnc/buttons.svg
+++ b/artsrc/cnc/buttons.svg
@@ -15,7 +15,7 @@
    version="1.1"
    inkscape:version="0.48.1 r9760"
    sodipodi:docname="buttons.svg"
-   inkscape:export-filename="/Users/paul/src/OpenRA/mods/cnc/uibits/shellmap-border.png"
+   inkscape:export-filename="/Users/paul/src/OpenRA/mods/cnc/uibits/uibuttons.png"
    inkscape:export-xdpi="90"
    inkscape:export-ydpi="90">
   <defs
@@ -28,15 +28,15 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="4"
-     inkscape:cx="38.797739"
+     inkscape:cx="-5.452261"
      inkscape:cy="49.497475"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="false"
-     inkscape:window-width="1386"
-     inkscape:window-height="856"
+     inkscape:window-width="1626"
+     inkscape:window-height="1006"
      inkscape:window-x="54"
-     inkscape:window-y="0"
+     inkscape:window-y="22"
      inkscape:window-maximized="0" />
   <metadata
      id="metadata7">
@@ -56,11 +56,24 @@
      id="layer1"
      transform="translate(0,-924.3622)">
     <rect
-       style="fill:#2b0000;fill-opacity:0.50196078;stroke:#800000;stroke-width:2;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none"
+       style="fill:#2b0000;fill-opacity:0.87843137;stroke:#800000;stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none"
        id="rect3776"
-       width="126"
-       height="126"
-       x="1"
-       y="925.36218" />
+       width="63"
+       height="63"
+       x="0.5"
+       y="988.86218"
+       inkscape:export-filename="/Users/paul/src/OpenRA/mods/cnc/uibits/rect3776.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
+    <rect
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/Users/paul/src/OpenRA/mods/cnc/uibits/rect3776.png"
+       y="924.86218"
+       x="0.5"
+       height="63"
+       width="63"
+       id="rect3759"
+       style="fill:#560000;fill-opacity:0.87843138;stroke:#c00000;stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
   </g>
 </svg>
diff --git a/mods/cnc/chrome.yaml b/mods/cnc/chrome.yaml
index 91e8ea9d2e..6e16236374 100644
--- a/mods/cnc/chrome.yaml
+++ b/mods/cnc/chrome.yaml
@@ -130,38 +130,38 @@ tabs-normal: tabs.png
 	nod-Plane: 134,160,27,41
 	nod-Ship: 134,200,27,41
 
-dialog: dialog.png
-	background: 46,46,36,36
-	border-r: 82,46,46,36
-	border-l: 0,46,46,36
-	border-b: 46,82,36,46
-	border-t: 46,0,36,46
-	corner-tl: 0,0,46,46
-	corner-tr: 82,0,46,46
-	corner-bl: 0,82,46,46
-	corner-br: 82,82,46,46
+dialog: uibuttons.png
+	background: 2,2,60,60
+	border-r: 62,2,2,60
+	border-l: 0,2,2,60
+	border-b: 2,62,60,2
+	border-t: 2,0,60,2
+	corner-tl: 0,0,2,2
+	corner-tr: 62,0,2,2
+	corner-bl: 0,62,2,2
+	corner-br: 62,62,2,2
+
+dialog3: uibuttons.png
+	background: 2,2,60,60
+	border-r: 62,2,2,60
+	border-l: 0,2,2,60
+	border-b: 2,62,60,2
+	border-t: 2,0,60,2
+	corner-tl: 0,0,2,2
+	corner-tr: 62,0,2,2
+	corner-bl: 0,62,2,2
+	corner-br: 62,62,2,2
 
 dialog2: uibuttons.png
-	background: 2,2,124,124
-	border-r: 126,2,2,124
-	border-l: 0,2,2,124
-	border-b: 2,126,124,2
-	border-t: 2,0,124,2
-	corner-tl: 0,0,2,2
-	corner-tr: 126,0,2,2
+	background: 2,66,60,60
+	border-r: 62,66,2,60
+	border-l: 0,66,2,60
+	border-b: 2,126,60,2
+	border-t: 2,64,60,2
+	corner-tl: 0,64,2,2
+	corner-tr: 62,64,2,2
 	corner-bl: 0,126,2,2
-	corner-br: 126,126,2,2
-
-dialog3: dialog3.png
-	background: 1,1,126,126
-	border-r: 127,1,1,126
-	border-l: 0,1,1,126
-	border-b: 1,127,126,1
-	border-t: 1,0,126,1
-	corner-tl: 0,0,1,1
-	corner-tr: 82,0,1,1
-	corner-bl: 0,82,1,1
-	corner-br: 82,82,1,1
+	corner-br: 62,126,2,2
 
 dialog4: dialog4.png
 	border-t: 5,0,52,6
diff --git a/mods/cnc/chrome/mainmenu.yaml b/mods/cnc/chrome/mainmenu.yaml
index 1a2b94a9e9..5658debed1 100644
--- a/mods/cnc/chrome/mainmenu.yaml
+++ b/mods/cnc/chrome/mainmenu.yaml
@@ -4,7 +4,6 @@ Container@MAINMENU_BG:
 	Y:0
 	Width:WINDOW_RIGHT
 	Height:WINDOW_BOTTOM
-	Delegate:MainMenuButtonsDelegate
 	Children:
 		Image@RETICLE:
 			X:(WINDOW_RIGHT-WIDTH)/2
@@ -19,54 +18,53 @@ Container@MAINMENU_BG:
 			Width:WINDOW_RIGHT
 			Height:WINDOW_BOTTOM
 			Background:shellmapborder
-		Button@MAINMENU_BUTTON_JOIN:
-			Id:MAINMENU_BUTTON_JOIN
-			X:WINDOW_RIGHT-WIDTH-47
-			Y:150
-			Width:160
+		Container@BUTTON_CONTAINER:
+			Id:BUTTON_CONTAINER
+			X:(WINDOW_RIGHT-WIDTH)/2
+			Y:WINDOW_BOTTOM-33-HEIGHT-10
+			Width:740
 			Height:35
-			Text:Campaign
-			Bold:True
-		Button@MAINMENU_BUTTON_CREATE:
-			Id:MAINMENU_BUTTON_CREATE
-			X:WINDOW_RIGHT-WIDTH-47
-			Y:200
-			Width:160
-			Height:35
-			Text:Skirmish/Online
-			Bold:True
-		Button@MAINMENU_BUTTON_SETTINGS:
-			Id:MAINMENU_BUTTON_SETTINGS
-			X:WINDOW_RIGHT-WIDTH-47
-			Y:250
-			Width:160
-			Height:35
-			Text:Settings
-			Bold:True
-		Button@MAINMENU_BUTTON_MUSIC:
-			Id:MAINMENU_BUTTON_MUSIC
-			X:WINDOW_RIGHT-WIDTH-47
-			Y:300
-			Width:160
-			Height:35
-			Text:Music
-			Bold:True
-		Button@MAINMENU_BUTTON_REPLAY_VIEWER:
-			Id:MAINMENU_BUTTON_REPLAY_VIEWER
-			X:WINDOW_RIGHT-WIDTH-47
-			Y:350
-			Width:160
-			Height:35
-			Text: Replay Viewer
-			Bold: True
-		Button@MAINMENU_BUTTON_QUIT:
-			Id:MAINMENU_BUTTON_QUIT
-			X:WINDOW_RIGHT-WIDTH-47
-			Y:400
-			Width:160
-			Height:35
-			Text:Quit
-			Bold:True
+			Children:	
+				Button@SOLO_BUTTON:
+					Id:SOLO_BUTTON
+					X:0
+					Y:0
+					Width:140
+					Height:35
+					Text:Solo Play
+					Bold:True
+				Button@MULTIPLAYER_BUTTON:
+					Id:MULTIPLAYER_BUTTON
+					X:150
+					Y:0
+					Width:140
+					Height:35
+					Text:Multiplayer
+					Bold:True
+				Button@REPLAY_BUTTON:
+					Id:REPLAY_BUTTON
+					X:300
+					Y:0
+					Width:140
+					Height:35
+					Text: Replays
+					Bold: True
+				Button@SETTINGS_BUTTON:
+					Id:SETTINGS_BUTTON
+					X:450
+					Y:0
+					Width:140
+					Height:35
+					Text:Options
+					Bold:True
+				Button@QUIT_BUTTON:
+					Id:QUIT_BUTTON
+					X:600
+					Y:0
+					Width:140
+					Height:35
+					Text:Quit
+					Bold:True
 Background@QUICKMODSWITCHER:
 	Id:QUICKMODSWITCHER
 	Background: dialog4
diff --git a/mods/cnc/uibits/uibuttons.png b/mods/cnc/uibits/uibuttons.png
index 3e47a1927872f1504d91c0c987520758145b7ab1..9ff0cef09f4df2f031f93c6878a88c5bef80fa52 100644
GIT binary patch
delta 146
zcmV;D0B!&31C9icZb*wsL_t(|obBB)mBRoG1wr|qc^FDi9Eczah$CStLE?j<VrLNi
zVheRT?wM!8Ue9xEZ`gFs%zS3P+e0?IXRhrH+kUnOuuGFM0gfMz+xz(T`}li%!Lrx(
zfMw^*%-_s+d&q|0nQME)HaC&6kQ<#dzG#>I0}*--bdjsAAOHXW07*qoM6N<$g5{q^
AR{#J2

delta 142
zcmeBUdBr>-&pO@H#WAE}&f6;+1rIUsusF_K==$p5x^^XB7jBImcRe1mn_HcmS$(1^
zhd<%^=kl7gb!Qd-T+e=H`<VI3<VMD#$qyKXiNLJ#$1RKV`xE;41-`QuJFxy&e3kKl
P0SG)@{an^LB{Ts5cr-hu