Load *.png from assets instead of needing to define each logo.

Also fixed wraiths logo and emp, changed the gankhub theme.
This commit is contained in:
Heavy Bob 2025-04-08 00:14:44 +10:00
parent 3f06c95026
commit 4fd295345b
5 changed files with 22 additions and 122 deletions

Binary file not shown.

Before

(image error) Size: 271 KiB

After

(image error) Size: 28 KiB

Before After
Before After

View file

Before

(image error) Size: 66 KiB

After

(image error) Size: 66 KiB

Before After
Before After

View file

@ -13,26 +13,6 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<None Remove="Assets\AVSQN.png" />
<None Remove="Assets\BlightVeil.png" />
<None Remove="Assets\BOBGREL.png" />
<None Remove="Assets\chibifox.png" />
<None Remove="Assets\D3VL.png" />
<None Remove="Assets\EMP.png" />
<None Remove="Assets\Gankhub.png" />
<None Remove="Assets\HEX.png" />
<None Remove="Assets\HIT.png" />
<None Remove="Assets\MAMMON.png" />
<None Remove="Assets\NMOS.png" />
<None Remove="Assets\NW.png" />
<None Remove="Assets\RACKETEERS.png" />
<None Remove="Assets\SHADOWMOSES.png" />
<None Remove="Assets\VOX.png" />
<None Remove="Assets\WRITH.png" />
<None Remove="Assets\ZAP.png" />
<None Remove="Assets\DMC.png" />
<None Remove="Assets\BRTE.png" />
<None Remove="Assets\FCU.png" />
<None Remove="config.ini" /> <None Remove="config.ini" />
<None Remove="Fonts\Orbitron-Bold.ttf" /> <None Remove="Fonts\Orbitron-Bold.ttf" />
<None Remove="Fonts\Roboto-Regular.ttf" /> <None Remove="Fonts\Roboto-Regular.ttf" />
@ -46,79 +26,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Resource Include="Assets\BlightVeil.png"> <Resource Include="Assets\*.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Resource>
<Resource Include="Assets\Gankhub.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Resource>
<Resource Include="Assets\HEX.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Resource>
<Resource Include="Assets\IP.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Resource>
<Resource Include="Assets\NMOS.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Resource>
</ItemGroup>
<ItemGroup>
<Resource Include="Assets\AVSQN.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Resource>
<Resource Include="Assets\BOBGREL.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Resource>
<Resource Include="Assets\chibifox.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Resource>
<Resource Include="Assets\D3VL.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Resource>
<Resource Include="Assets\EMP.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Resource>
<Resource Include="Assets\GN.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Resource>
<Resource Include="Assets\AutoTrackR.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Resource>
<Resource Include="Assets\HIT.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Resource>
<Resource Include="Assets\MAMMON.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Resource>
<Resource Include="Assets\NW.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Resource>
<Resource Include="Assets\RACKETEERS.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Resource>
<Resource Include="Assets\SHADOWMOSES.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Resource>
<Resource Include="Assets\VOX.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Resource>
<Resource Include="Assets\cinderborn.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Resource>
<Resource Include="Assets\shadowguard.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Resource>
<Resource Include="Assets\ZAP.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Resource>
<Resource Include="Assets\DMC.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Resource>
<Resource Include="Assets\BRTE.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Resource>
<Resource Include="Assets\FCU.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Resource> </Resource>
<Resource Include="config.ini" /> <Resource Include="config.ini" />

View file

@ -35,25 +35,11 @@ namespace AutoTrackR2
// Create a pack URI for the resource // Create a pack URI for the resource
Uri uri = new Uri($"pack://application:,,,/AutoTrackR2;component{imagePath}", UriKind.Absolute); Uri uri = new Uri($"pack://application:,,,/AutoTrackR2;component{imagePath}", UriKind.Absolute);
Debug.WriteLine($"Attempting to load logo from: {uri}");
// Check if the resource exists
var resourceInfo = Application.GetResourceStream(uri);
if (resourceInfo == null)
{
Debug.WriteLine($"Resource not found: {uri}");
return;
}
Logo.Source = new BitmapImage(uri); Logo.Source = new BitmapImage(uri);
Debug.WriteLine($"Successfully loaded logo: {uri}");
} }
catch (Exception ex) catch (Exception ex)
{ {
// Log the error or handle it appropriately
Debug.WriteLine($"Error loading logo image: {ex.Message}"); Debug.WriteLine($"Error loading logo image: {ex.Message}");
Debug.WriteLine($"Stack trace: {ex.StackTrace}");
// Optionally set a default logo or handle the error
} }
} }

View file

@ -8,7 +8,8 @@
"AltText": "#A88F2C" "AltText": "#A88F2C"
}, },
"Logo": { "Logo": {
"Path": "/Assets/AutoTrackR.png" "Path": "/Assets/AutoTrackR.png",
"Primary": "#00A9E0"
} }
}, },
"Green": { "Green": {
@ -20,7 +21,8 @@
"AltText": "#DCD6C4" "AltText": "#DCD6C4"
}, },
"Logo": { "Logo": {
"Path": "/Assets/AutoTrackR.png" "Path": "/Assets/AutoTrackR.png",
"Primary": "#1D9F00"
} }
}, },
"Red": { "Red": {
@ -32,7 +34,8 @@
"AltText": "#A88F2C" "AltText": "#A88F2C"
}, },
"Logo": { "Logo": {
"Path": "/Assets/AutoTrackR.png" "Path": "/Assets/AutoTrackR.png",
"Primary": "#D32F2F"
} }
}, },
"Purple": { "Purple": {
@ -44,7 +47,8 @@
"AltText": "#B3976E" "AltText": "#B3976E"
}, },
"Logo": { "Logo": {
"Path": "/Assets/AutoTrackR.png" "Path": "/Assets/AutoTrackR.png",
"Primary": "#32CD32"
} }
}, },
"GN": { "GN": {
@ -95,7 +99,8 @@
"AltText": "#A88F2C" "AltText": "#A88F2C"
}, },
"Logo": { "Logo": {
"Path": "/Assets/HIT.png" "Path": "/Assets/HIT.png",
"Primary": "#B92D2D"
} }
}, },
"WRAITH": { "WRAITH": {
@ -107,7 +112,7 @@
"AltText": "#8B0000" "AltText": "#8B0000"
}, },
"Logo": { "Logo": {
"Path": "/Assets/WRITH.png", "Path": "/Assets/WRAITH.png",
"Primary": "#ff0000" "Primary": "#ff0000"
} }
}, },
@ -127,14 +132,14 @@
"EMP": { "EMP": {
"Colors": { "Colors": {
"Accent": "#F5721C", "Accent": "#F5721C",
"Button": "#535353", "Button": "#1A1A1A",
"Background": "#080000", "Background": "#080000",
"Text": "#FFFFFF", "Text": "#FFFFFF",
"AltText": "#CEA75B" "AltText": "#F3BD9B"
}, },
"Logo": { "Logo": {
"Path": "/Assets/EMP.png", "Path": "/Assets/EMP.png",
"Primary": "#F3BD9B" "Primary": "#F5721C"
} }
}, },
"AVS": { "AVS": {
@ -256,14 +261,15 @@
}, },
"Gankhub": { "Gankhub": {
"Colors": { "Colors": {
"Accent": "#ffa500", "Accent": "#FF8C00",
"Button": "#2C2C2C", "Button": "#331400",
"Background": "#1b1b1b", "Background": "#1A0A00",
"Text": "#FFFFFF", "Text": "#FFB366",
"AltText": "#ffa500" "AltText": "#FF8C00"
}, },
"Logo": { "Logo": {
"Path": "/Assets/Gankhub.png" "Path": "/Assets/Gankhub.png",
"Primary": "#FF8C00"
} }
}, },
"IronPoint": { "IronPoint": {