Moving GUI XML files such as styles, sprites and setup to their own d…

…irectory, this makes the mod easier to maintain. Replace the font mono-stroke with sans-stroke /sans-bold-stroke
LangLangBart · Mar 5, 2022 · a2ecaed · a2ecaed
1 parent 3456c44
commit a2ecaed
Show file tree

Hide file tree

Showing 39 changed files with 270 additions and 24,336 deletions.
diff --git a/fonts/mono-stroke-12.fnt b/fonts/mono-stroke-12.fnt
diff --git a/fonts/mono-stroke-12.png b/fonts/mono-stroke-12.png
diff --git a/fonts/mono-stroke-14.fnt b/fonts/mono-stroke-14.fnt
diff --git a/fonts/mono-stroke-14.png b/fonts/mono-stroke-14.png
diff --git a/fonts/mono-stroke-16.fnt b/fonts/mono-stroke-16.fnt
diff --git a/fonts/mono-stroke-16.png b/fonts/mono-stroke-16.png
diff --git a/fonts/mono-stroke-18.fnt b/fonts/mono-stroke-18.fnt
diff --git a/fonts/mono-stroke-18.png b/fonts/mono-stroke-18.png
diff --git a/fonts/mono-stroke-20.fnt b/fonts/mono-stroke-20.fnt
diff --git a/fonts/mono-stroke-20.png b/fonts/mono-stroke-20.png
diff --git a/gui/common/OverlayCounterManager.js b/gui/common/OverlayCounterManager.js
diff --git a/gui/common/styles.xml b/gui/common/styles.xml
diff --git a/gui/page_session.xml b/gui/page_session.xml
@@ -14,9 +14,17 @@
 	<include>session/setup.xml</include>
 	<include>session/sprites.xml</include>
 	<include>session/styles.xml</include>
-	<include>session/session.xml</include>
 
-	<include>session/setups/tech.xml</include>
-	<include>session/setups/misc.xml</include>
-	<include>session/setups/emblem.xml</include>
+	<!--
+	boonGUI's GUI_-_XML_Files
+	Try to put as much as possible in here and avoid adding the default XML files to the mod, makes it easier to maintain
+	https://trac.wildfiregames.com/wiki/GUI_-_XML_Files
+	-->
+	<include>session/boonGUI_XML/setups_icons.xml</include>
+	<include>session/boonGUI_XML/setups_tooltip.xml</include>
+	<include>session/boonGUI_XML/sprites.xml</include>
+	<!-- styles must come before session.xml -->
+	<include>session/boonGUI_XML/styles.xml</include>
+
+	<include>session/session.xml</include>
 </page>
diff --git a/gui/session/GameSpeedControl.xml b/gui/session/GameSpeedControl.xml
@@ -2,9 +2,9 @@
 <object
 	name="gameSpeed"
 	type="dropdown"
-	font="mono-stroke-14"
+	font="sans-bold-16"
 	style="ModernDropDown"
-	size="100%-300 40 100%-100 65"
+	size="100%-270 40 100%-100 65"
 	hidden="true"
 	z="200"
 	tooltip_style="sessionToolTip"

diff --git a/gui/session/ResearchProgress.xml b/gui/session/ResearchProgress.xml
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<object name="researchStartedButtons"
-	size="100%-48 40 100%-10 420"
->
+<object name="researchStartedButtons" size="100%-48 40 100%-10 420">
 	<repeat count="10">
 		<object name="researchStartedButton[n]" hidden="true" style="iconButton" type="button" size="0 0 48 48" tooltip_style="sessionToolTipBottom">
 			<object name="researchStartedIcon[n]" ghost="true" type="image" size="4 3 45 45"/>
 			<object name="researchStartedProgressSlider[n]" type="image" sprite="queueProgressSlider" ghost="true" size="4 3 44 45"/>
-			<object name="researchStartedTimeRemaining[n]" ghost="true" font="mono-stroke-14" text_align="center" text_valign="center" textcolor="white" type="text"/>
+			<object name="researchStartedTimeRemaining[n]" type="text" style="resourceTimeCounter"/>
 		</object>
 	</repeat>
 </object>
diff --git a/gui/session/SessionMessageBox.js b/gui/session/SessionMessageBox.js
diff --git a/gui/session/TimeNotificationOverlay.xml b/gui/session/TimeNotificationOverlay.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <object name="notificationPanel" type="image" size="0 100%-600 315 100%-335" ghost="true">
-	<object name="notificationText" type="text" style="notificationPanel" ghost="true" z="0"/>
+	<object name="notificationText" type="text" style="notifiyPanel" ghost="true" z="0"/>
 </object>