Some GUI fixes.

This was SVN commit r2521.

binaries/data/mods/official/gui/test/2_mainmenu.xml

@@ -82,7 +82,7 @@
 		/>
 
                 <object name="pregame_mainmenu_versionnumber"
-			style="text_prospero16_gold"
+			style="fancyTextHeadGold"
 			type="text"
 			ghost="true"
 			size="43% 24% 43%+282 24%+25"
@@ -120,7 +120,7 @@
 		-->
 
                 <object	name="pregame_mainmenu_tooltip"
-			style="text_prospero16_white"
+			style="fancyTextHeadWhite"
 			type="text"
 			hidden="true"
 			sprite="pregame_mainmenu_tooltip_background"
@@ -231,7 +231,7 @@
 			</object>
                               
 			<object name="pregame_mp_modesel_hostjoin_txt"
-				style="text_tahoma16_black"
+				style="wheatTextHeadBlack"
 				type="text"
 				size="0 140 200 170"
 				text_valign="center"
@@ -303,7 +303,7 @@
 			</object>
 
 			<object name="pregame_mp_host_gamename_txt"
-				style="text_tahoma16_black"
+				style="wheatTextHeadBlack"
 				type="text"
 				size="0 40 200 60"
 			>Game (Server) Name:
@@ -323,7 +323,7 @@
 			-->
 
 			<object name="pregame_mp_host_welcomemsg_txt" 
-				style="text_tahoma16_black"
+				style="wheatTextHeadBlack"
 				type="text"
 				size="0 70 200 90"
 			>Welcome Message:
@@ -435,7 +435,7 @@
 			</object>
 
 			<object name="pregame_mp_join_serverip_txt" 
-				style="text_tahoma16_black"
+				style="wheatTextHeadBlack"
 				type="text"
 				size="0 40 200 60"
 			>Server Hostname or IP:
@@ -529,14 +529,14 @@
 			-->
 
 			<object name="pregame_mp_setup_host_playerhead"
-				style="text_giovanni22bold_black"
+				style="wheatTextHeadMaxBlack"
 				type="text"
 				size="30 10 320 40"
 			>Player Slots
 			</object>
 
 			<object name="pregame_mp_setup_host_p1_txt"
-				style="text_tahoma16_black"
+				style="wheatTextHeadBlack"
 				type="text"
 				size="30 50 320 80"
 			>
@@ -546,7 +546,7 @@
 			</object>
 
 			<object name="pregame_mp_setup_host_p2_txt"
-				style="text_tahoma16_black"
+				style="wheatTextHeadBlack"
 				type="text"
 				size="30 90 320 120"
 			>
@@ -556,7 +556,7 @@
 			</object>
 
 			<object name="pregame_mp_setup_host_p3_txt"
-				style="text_tahoma16_black"
+				style="wheatTextHeadBlack"
 				type="text"
 				size="30 130 320 160"
 			>
@@ -566,7 +566,7 @@
 			</object>
 
 			<object name="pregame_mp_setup_host_p4_txt"
-				style="text_tahoma16_black"
+				style="wheatTextHeadBlack"
 				type="text"
 				size="30 170 320 200"
 			>
@@ -576,7 +576,7 @@
 			</object>
 
 			<object name="pregame_mp_setup_host_p5_txt"
-				style="text_tahoma16_black"
+				style="wheatTextHeadBlack"
 				type="text"
 				size="30 210 320 240"
 			>
@@ -586,7 +586,7 @@
 			</object>
 
 			<object name="pregame_mp_setup_host_p6_txt"
-				style="text_tahoma16_black"
+				style="wheatTextHeadBlack"
 				type="text"
 				size="30 250 320 280"
 			>
@@ -596,7 +596,7 @@
 			</object>
 
 			<object name="pregame_mp_setup_host_p7_txt"
-				style="text_tahoma16_black"
+				style="wheatTextHeadBlack"
 				type="text"
 				size="30 290 320 320"
 			>
@@ -606,7 +606,7 @@
 			</object>
 
 			<object name="pregame_mp_setup_host_p8_txt"
-				style="text_tahoma16_black"
+				style="wheatTextHeadBlack"
 				type="text"
 				size="30 330 320 360"
 			>

binaries/data/mods/official/gui/test/functions_atlas.js

@@ -381,9 +381,9 @@ function atlasOpenSectionMenu(atlasMenuName)
 			guiUnHide("ATLAS_LEFT_PANE");
 			guiHide("ATLAS_BOTTOM_PANE");
 			// Reveal headings.
-			GUIObjectRenameandReveal("ATLAS_LEFT_PANE_SECTION_HEADING_1", "Map Creator");
+			guiRenameAndReveal("ATLAS_LEFT_PANE_SECTION_HEADING_1", "Map Creator");
-			GUIObjectRenameandReveal("ATLAS_LEFT_PANE_SECTION_HEADING_2", "Map Type");
+			guiRenameAndReveal("ATLAS_LEFT_PANE_SECTION_HEADING_2", "Map Type");
-			GUIObjectRenameandReveal("ATLAS_LEFT_PANE_SECTION_HEADING_3", "Map Settings");
+			guiRenameAndReveal("ATLAS_LEFT_PANE_SECTION_HEADING_3", "Map Settings");
 		break;
 		case "ATLAS_LEFT_PANE_SECTION_TERRAIN":
 			// Toggle backgrounds.
@@ -391,8 +391,8 @@ function atlasOpenSectionMenu(atlasMenuName)
 			guiUnHide("ATLAS_BOTTOM_PANE");
 			guiUnHide("ATLAS_BOTTOM_PANE_SECTION_TERRAIN");
 			// Reveal headings.
-			GUIObjectRenameandReveal("ATLAS_LEFT_PANE_SECTION_HEADING_1", "Terrain Editor");
+			guiRenameAndReveal("ATLAS_LEFT_PANE_SECTION_HEADING_1", "Terrain Editor");
-			GUIObjectRenameandReveal("ATLAS_LEFT_PANE_SECTION_HEADING_2", "Edit Elevation");
+			guiRenameAndReveal("ATLAS_LEFT_PANE_SECTION_HEADING_2", "Edit Elevation");
 			guiHide("ATLAS_LEFT_PANE_SECTION_HEADING_3");
 		break;
 		case "ATLAS_LEFT_PANE_SECTION_OBJECT":
@@ -401,8 +401,8 @@ function atlasOpenSectionMenu(atlasMenuName)
 			guiUnHide("ATLAS_BOTTOM_PANE");
 			guiUnHide("ATLAS_BOTTOM_PANE_SECTION_OBJECT");
 			// Reveal headings.
-			GUIObjectRenameandReveal("ATLAS_LEFT_PANE_SECTION_HEADING_1", "Object Editor");
+			guiRenameAndReveal("ATLAS_LEFT_PANE_SECTION_HEADING_1", "Object Editor");
-			GUIObjectRenameandReveal("ATLAS_LEFT_PANE_SECTION_HEADING_2", "Object List");
+			guiRenameAndReveal("ATLAS_LEFT_PANE_SECTION_HEADING_2", "Object List");
 			guiHide("ATLAS_LEFT_PANE_SECTION_HEADING_3");
 		break;
 	}

binaries/data/mods/official/gui/test/styles.xml

@@ -25,7 +25,7 @@
 
 	<!--
 	==========================================
-	- STYLE - GLOBAL - BEIGE MENU SKIN - PANES
+	- STYLE - GLOBAL - WHEAT SKIN - PANES
 	==========================================
 	-->
 
@@ -43,7 +43,7 @@
 
 	<!--
 	==========================================
-	- STYLE - GLOBAL - BEIGE MENU SKIN - CONTROLS
+	- STYLE - GLOBAL - WHEAT SKIN - CONTROLS
 	==========================================
 	-->
 
@@ -97,45 +97,168 @@
 
 	<!--
 	==========================================
-	- STYLE - GLOBAL - BEIGE MENU SKIN - TEXT
+	- STYLE - GLOBAL - WHEAT SKIN - TEXT
 	==========================================
 	-->
+		<!--
+		=============================================================
+		- STYLE - GLOBAL - WHEAT SKIN - TEXT - LARGE HEADING
+		- Standard text. Largest heading. (eg "Player Slots" in host screen.)
+		=============================================================
+		-->
 
-	<style 	name="text_prospero16_gold"
+		<style 	name="wheatTextHeadMaxBlack"
-		ghost="true"
+			ghost="true"
-		font="prospero16"
+			font="giovanni22bold"
-		textcolor="237 227 167"
+			text_align="center"
-	/>
+			textcolor="0 0 0"
+		/>
 
-	<style 	name="text_prospero16_white"
+		<!--
-		ghost="true"
+		=============================================================
-		font="prospero16"
+		- STYLE - GLOBAL - WHEAT SKIN - TEXT - HEADING
-		textcolor="255 255 255"
+		- Standard text. Heading. (eg "Player Name").
-	/>
+		=============================================================
+		-->
 
-	<style 	name="text_tahoma16_black"
+		<style 	name="wheatTextHeadBlack"
-		ghost="true"
+			ghost="true"
-		font="tahoma16"
+			font="tahoma16"
-		textcolor="0 0 0"
+			textcolor="0 0 0"
-	/>
+		/>
 
-	<style 	name="text_tahoma16_black_right"
+		<style 	name="wheatTextHeadWhite"
-		ghost="true"
+			ghost="true"
-		font="tahoma16"
+			font="tahoma16"
-		text_align="right"
+			textcolor="255 255 255"
-		textcolor="0 0 0"
+		/>
-	/>
 
-	<style 	name="text_giovanni22bold_black"
+		<style 	name="wheatTextHeadBlackRt"
-		ghost="true"
+			ghost="true"
-		font="giovanni22bold"
+			font="tahoma16"
-		text_align="center"
+			text_align="right"
-		textcolor="0 0 0"
+			textcolor="0 0 0"
-	/>
+		/>
+
+		<!--
+		=============================================================
+		- STYLE - GLOBAL - WHEAT SKIN - TEXT - SUBHEADING
+		- Standard text. Subheading.
+		=============================================================
+		-->
+
+		<style 	name="wheatTextHeadSubBlack"
+			ghost="true"
+			font="tahoma14"
+			textcolor="0 0 0"
+		/>
+
+		<!--
+		=============================================================
+		- STYLE - GLOBAL - WHEAT SKIN - TEXT - LABEL
+		- Standard text. Plain medium text (eg window text). Default.
+		=============================================================
+		-->
+
+		<style 	name="wheatTextLabelBlack"
+			ghost="true"
+			font="verdana12"
+			textcolor="0 0 0"
+		/>
+
+		<!--
+		=============================================================
+		- STYLE - GLOBAL - WHEAT SKIN - TEXT - SUB LABEL
+		- Standard text. Plain smaller label.
+		=============================================================
+		-->
+
+		<style 	name="wheatTextSubLabelBlack"
+			ghost="true"
+			font="verdana11"
+			textcolor="0 0 0"
+		/>
+
+		<!--
+		=============================================================
+		- STYLE - GLOBAL - WHEAT SKIN - TEXT - FOOTNOTE MAX
+		- Standard text. Large footnote.
+		=============================================================
+		-->
+
+		<style 	name="wheatTextFootMaxBlack"
+			ghost="true"
+			font="verdana10"
+			textcolor="0 0 0"
+		/>
+
+		<!--
+		=============================================================
+		- STYLE - GLOBAL - WHEAT SKIN - TEXT - FOOTNOTE
+		- Standard text. Normal footnote.
+		=============================================================
+		-->
+
+		<style 	name="wheatTextFootBlack"
+			ghost="true"
+			font="verdana9"
+			textcolor="0 0 0"
+		/>
+
+		<!--
+		=============================================================
+		- STYLE - GLOBAL - WHEAT SKIN - TEXT - SUBFOOTNOTE
+		- Standard text. Small subfootnote.
+		=============================================================
+		-->
+
+		<style 	name="wheatTextFootSubBlack"
+			ghost="true"
+			font="verdana8"
+			textcolor="0 0 0"
+		/>
+
+		<!--
+		=============================================================
+		- STYLE - GLOBAL - WHEAT SKIN - TEXT - FANCY - TITLEBAR
+		- Large and ornate. eg Window titlebar.
+		=============================================================
+		-->
+
+		<style 	name="fancyTextTitleGold"
+			ghost="true"
+			font="prospero18"
+			textcolor="237 227 167"
+		/>
+
+		<style 	name="fancyTextTitleWhite"
+			ghost="true"
+			font="prospero18"
+			textcolor="255 255 255"
+		/>
+
+		<!--
+		=============================================================
+		- STYLE - GLOBAL - WHEAT SKIN - TEXT - FANCY - HEADING
+		- Medium and ornate. eg Version number.
+		=============================================================
+		-->
+
+		<style 	name="fancyTextHeadGold"
+			ghost="true"
+			font="prospero16"
+			textcolor="237 227 167"
+		/>
+
+		<style 	name="fancyTextHeadWhite"
+			ghost="true"
+			font="prospero16"
+			textcolor="255 255 255"
+		/>
 
 	<!--
 	==========================================
-	- STYLE - GLOBAL - BEIGE MENU SKIN - BORDERS
+	- STYLE - GLOBAL - WHEAT SKIN - BORDERS
 	==========================================
 	-->