Consolidated font icon use

CriticalFlaw · Oct 30, 2022 · df3e170 · df3e170
1 parent 25f59c8
commit df3e170
Show file tree

Hide file tree

Showing 33 changed files with 121 additions and 179 deletions.
diff --git a/resource/links.res b/resource/links.res
@@ -26,7 +26,7 @@
 			"zpos"					"2"
 			"wide"					"f0"
 			"tall"					"f0"
-			"font"					"CustomIcons"
+			"font"					"SmallIcons"
 			"labelText"				"Y"
 			"enabled"				"1"
 			"visible"				"1"
@@ -102,7 +102,7 @@
 			"zpos"					"2"
 			"wide"					"f0"
 			"tall"					"f0"
-			"font"					"CustomIcons"
+			"font"					"SmallIcons"
 			"labelText"				"Z"
 			"enabled"				"1"
 			"visible"				"1"
@@ -158,7 +158,7 @@
 			"zpos"					"2"
 			"wide"					"f0"
 			"tall"					"f0"
-			"font"					"CustomIcons"
+			"font"					"SmallIcons"
 			"labelText"				""
 			"enabled"				"1"
 			"visible"				"1"
@@ -212,7 +212,7 @@
 			"zpos"					"2"
 			"wide"					"f0"
 			"tall"					"f0"
-			"font"					"CustomIcons"
+			"font"					"SmallIcons"
 			"labelText"				""
 			"enabled"				"1"
 			"visible"				"1"

diff --git a/resource/scheme/clientscheme_icons.res b/resource/scheme/clientscheme_icons.res
@@ -2,30 +2,6 @@ Scheme
 {
 	Fonts
 	{
-		"MenuArrows"
-		{
-			"1"
-			{
-				"name"			"TF2Icons"
-				"tall"			"15"
-				"weight"		"400"
-				"additive"		"0"
-				"antialias" 	"1"
-			}
-		}
-
-		"NormalIcons"
-		{
-			"1"
-			{
-				"name"			"TF2Icons"
-				"tall"			"25"
-				"weight"		"0"
-				"additive"		"0"
-				"antialias"		"1"
-			}
-		}
-
 		"LargeIcons"
 		{
 			"1"
@@ -38,19 +14,19 @@ Scheme
 			}
 		}
 
-		"MenuIcons"
+		"MediumIcons"
 		{
 			"1"
 			{
 				"name"			"TF2Icons"
-				"tall"			"15"
+				"tall"			"25"
 				"weight"		"0"
 				"additive"		"0"
 				"antialias"		"1"
 			}
 		}
 
-		"CustomIcons"
+		"SmallIcons"
 		{
 			"1"
 			{
@@ -62,19 +38,7 @@ Scheme
 			}
 		}
 
-		"ClassIcons"
-		{
-			"1"
-			{
-				"name"			"TF2Icons"
-				"tall"			"25"
-				"weight"		"0"
-				"additive"		"0"
-				"antialias"		"1"
-			}
-		}
-
-		"FontIcons12"
+		"SmallerIcons"
 		{
 			"1"
 			{
@@ -85,28 +49,6 @@ Scheme
 				"antialias"		"1"
 			}
 		}
-		"FontIcons10"
-		{
-			"1"
-			{
-				"name"			"TF2Icons"
-				"tall"			"10"
-				"weight"		"0"
-				"additive"		"0"
-				"antialias"		"1"
-			}
-		}
-		"FontIcons8"
-		{
-			"1"
-			{
-				"name"			"TF2Icons"
-				"tall"			"8"
-				"weight"		"0"
-				"additive"		"0"
-				"antialias" 	"1"
-			}
-		}
 	}
 
 	CustomFontFiles

diff --git a/resource/tools.res b/resource/tools.res
@@ -61,7 +61,7 @@
 			"enabled"			"1"
 			"tabPosition"		"0"
 			"labeltext"			"("
-			"font"				"CustomIcons"
+			"font"				"SmallIcons"
 			"textAlignment"		"center"
 			"dulltext"			"0"
 			"brighttext"		"0"
@@ -402,7 +402,7 @@
 			"labelText"				"#"
 			"command"				"engine hud_combattext 1;hud_combattext_red 255;hud_combattext_green 255;hud_combattext_blue 255"
 			"actionsignallevel"		"2"
-			"font"					"CustomIcons"
+			"font"					"SmallIcons"
 			"textAlignment"			"center"
 			"paintbackground"		"0"
 
@@ -432,7 +432,7 @@
 			"labelText"				"#"
 			"command"				"engine hud_combattext 1;hud_combattext_red 255;hud_combattext_green 255;hud_combattext_blue 0"
 			"actionsignallevel"		"2"
-			"font"					"CustomIcons"
+			"font"					"SmallIcons"
 			"textAlignment"			"center"
 			"paintbackground"		"0"
 
@@ -462,7 +462,7 @@
 			"labelText"				"#"
 			"command"				"engine hud_combattext 1;hud_combattext_red 255;hud_combattext_green 0;hud_combattext_blue 0"
 			"actionsignallevel"		"2"
-			"font"					"CustomIcons"
+			"font"					"SmallIcons"
 			"textAlignment"			"center"
 			"paintbackground"		"0"
 
@@ -492,7 +492,7 @@
 			"labelText"				"#"
 			"command"				"engine hud_combattext 1;hud_combattext_red 0;hud_combattext_green 255;hud_combattext_blue 0"
 			"actionsignallevel"		"2"
-			"font"					"CustomIcons"
+			"font"					"SmallIcons"
 			"textAlignment"			"center"
 			"paintbackground"		"0"
 
@@ -522,7 +522,7 @@
 			"labelText"				"#"
 			"command"				"engine hud_combattext 1;hud_combattext_red 0;hud_combattext_green 255;hud_combattext_blue 255"
 			"actionsignallevel"		"2"
-			"font"					"CustomIcons"
+			"font"					"SmallIcons"
 			"textAlignment"			"center"
 			"paintbackground"		"0"
 
@@ -552,7 +552,7 @@
 			"labelText"				"#"
 			"command"				"engine hud_combattext 1;hud_combattext_red 255;hud_combattext_green 0;hud_combattext_blue 255"
 			"actionsignallevel"		"2"
-			"font"					"CustomIcons"
+			"font"					"SmallIcons"
 			"textAlignment"			"center"
 			"paintbackground"		"0"
 

diff --git a/resource/ui/charinfoarmorysubpanel.res b/resource/ui/charinfoarmorysubpanel.res
@@ -264,7 +264,7 @@
 		"enabled"				"1"
 		"tabPosition"			"0"
 		"labelText"				"&A"
-		"font"					"MenuArrows"
+		"font"					"SmallIcons"
 		"textAlignment"			"center"
 		"dulltext"				"0"
 		"brighttext"			"0"
@@ -306,7 +306,7 @@
 		"enabled"				"1"
 		"tabPosition"			"0"
 		"labelText"				"&D"
-		"font"					"MenuArrows"
+		"font"					"SmallIcons"
 		"textAlignment"			"center"
 		"dulltext"				"0"
 		"brighttext"			"0"

diff --git a/resource/ui/charinfoloadoutsubpanel.res b/resource/ui/charinfoloadoutsubpanel.res
@@ -1189,7 +1189,7 @@
 			"enabled"		"1"
 			"tabPosition"	"0"
 			"labeltext"		"("
-			"font"			"CustomIcons"
+			"font"			"SmallIcons"
 			"textAlignment"	"center"
 			"dulltext"		"0"
 			"brighttext"	"0"
@@ -1347,7 +1347,7 @@
 			"enabled"		"1"
 			"tabPosition"	"0"
 			"labeltext"		"("
-			"font"			"CustomIcons"
+			"font"			"SmallIcons"
 			"textAlignment"	"center"
 			"dulltext"		"0"
 			"brighttext"	"0"
@@ -1554,7 +1554,7 @@
 			"enabled"		"1"
 			"tabPosition"	"0"
 			"labeltext"		"("
-			"font"			"CustomIcons"
+			"font"			"SmallIcons"
 			"textAlignment"	"center"
 			"dulltext"		"0"
 			"brighttext"	"0"
@@ -1761,7 +1761,7 @@
 			"enabled"		"1"
 			"tabPosition"	"0"
 			"labeltext"		"("
-			"font"			"CustomIcons"
+			"font"			"SmallIcons"
 			"textAlignment"	"center"
 			"dulltext"		"0"
 			"brighttext"	"0"
@@ -1968,7 +1968,7 @@
 			"enabled"		"1"
 			"tabPosition"	"0"
 			"labeltext"		"("
-			"font"			"CustomIcons"
+			"font"			"SmallIcons"
 			"textAlignment"	"center"
 			"dulltext"		"0"
 			"brighttext"	"0"
@@ -2175,7 +2175,7 @@
 			"enabled"		"1"
 			"tabPosition"	"0"
 			"labeltext"		"("
-			"font"			"CustomIcons"
+			"font"			"SmallIcons"
 			"textAlignment"	"center"
 			"dulltext"		"0"
 			"brighttext"	"0"
@@ -2381,7 +2381,7 @@
 			"enabled"		"1"
 			"tabPosition"	"0"
 			"labeltext"		"("
-			"font"			"CustomIcons"
+			"font"			"SmallIcons"
 			"textAlignment"	"center"
 			"dulltext"		"0"
 			"brighttext"	"0"

diff --git a/resource/ui/classloadoutpanel.res b/resource/ui/classloadoutpanel.res
@@ -84,7 +84,7 @@
 			"enabled"			"1"
 			"tabPosition"		"0"
 			"labelText"			"w"
-			"font"				"CustomIcons"
+			"font"				"SmallIcons"
 			"textAlignment"		"center"
 			"dulltext"			"0"
 			"brighttext"		"0"
@@ -371,7 +371,7 @@
 		"tabPosition"		"0"
 		"labelText"			"B"
 		"textAlignment"		"center"
-		"font"				"CustomIcons"
+		"font"				"SmallIcons"
 		"scaleImage"		"1"
 		"Command"			"characterloadout"
 		"paintbackground"	"1"
@@ -403,7 +403,7 @@
 		"tabPosition"		"0"
 		"labelText"			"C"
 		"textAlignment"		"center"
-		"font"				"CustomIcons"
+		"font"				"SmallIcons"
 		"scaleImage"		"1"
 		"Command"			"tauntloadout"
 		"paintbackground"	"1"

diff --git a/resource/ui/classselection.res b/resource/ui/classselection.res
@@ -75,7 +75,7 @@
 		"visible"					"1"
 		"enabled"					"1"
 		"labelText"					"&1"
-		"font"						"ClassIcons"
+		"font"						"MediumIcons"
 		"textAlignment"				"north"
 		"use_proportional_insets"	"1"
 		"Command"					"loadout scout"
@@ -142,7 +142,7 @@
 		"visible"					"1"
 		"enabled"					"1"
 		"labelText"					"&2"
-		"font"						"ClassIcons"
+		"font"						"MediumIcons"
 		"textAlignment"				"center"
 		"use_proportional_insets"	"1"
 		"Command"					"loadout soldier"
@@ -209,7 +209,7 @@
 		"visible"					"1"
 		"enabled"					"1"
 		"labelText"					"&3"
-		"font"						"ClassIcons"
+		"font"						"MediumIcons"
 		"textAlignment"				"center"
 		"use_proportional_insets"	"1"
 		"Command"					"loadout pyro"
@@ -276,7 +276,7 @@
 		"visible"					"1"
 		"enabled"					"1"
 		"labelText"					"&4"
-		"font"						"ClassIcons"
+		"font"						"MediumIcons"
 		"textAlignment"				"center"
 		"use_proportional_insets"	"1"
 		"Command"					"loadout demoman"
@@ -343,7 +343,7 @@
 		"visible"					"1"
 		"enabled"					"1"
 		"labelText"					"&5"
-		"font"						"ClassIcons"
+		"font"						"MediumIcons"
 		"textAlignment"				"center"
 		"use_proportional_insets"	"1"
 		"Command"					"loadout heavyweapons"
@@ -410,7 +410,7 @@
 		"visible"					"1"
 		"enabled"					"1"
 		"labelText"					"&6"
-		"font"						"ClassIcons"
+		"font"						"MediumIcons"
 		"textAlignment"				"center"
 		"use_proportional_insets"	"1"
 		"Command"					"loadout engineer"
@@ -477,7 +477,7 @@
 		"visible"					"1"
 		"enabled"					"1"
 		"labelText"					"&7"
-		"font"						"ClassIcons"
+		"font"						"MediumIcons"
 		"textAlignment"				"center"
 		"use_proportional_insets"	"1"
 		"Command"					"loadout medic"
@@ -544,7 +544,7 @@
 		"visible"					"1"
 		"enabled"					"1"
 		"labelText"					"&8"
-		"font"						"ClassIcons"
+		"font"						"MediumIcons"
 		"textAlignment"				"center"
 		"use_proportional_insets"	"1"
 		"Command"					"loadout sniper"
@@ -611,7 +611,7 @@
 		"visible"					"1"
 		"enabled"					"1"
 		"labelText"					"&9"
-		"font"						"ClassIcons"
+		"font"						"MediumIcons"
 		"textAlignment"				"center"
 		"use_proportional_insets"	"1"
 		"Command"					"loadout spy"