Compare commits

...

6 commits

Author SHA1 Message Date
Heavy Bob
2b805428eb Added AXP theme. 2025-04-08 03:45:51 +10:00
Heavy Bob
29dfaa2123 Added Enclave theme 2025-04-08 00:26:02 +10:00
Heavy Bob
4fd295345b Load *.png from assets instead of needing to define each logo.
Also fixed wraiths logo and emp, changed the gankhub theme.
2025-04-08 00:14:44 +10:00
Heavy Bob
3f06c95026 Added FCU theme 2025-04-07 23:43:57 +10:00
Heavy Bob
98c77b2b36 Added Blackrock theme, Added debugging. 2025-04-07 23:28:10 +10:00
Heavy Bob
769d46df9d Theme slider is now defined by the max themes available.
Also added the DMC theme too.
2025-04-07 23:02:55 +10:00
12 changed files with 402 additions and 411 deletions

BIN
AutoTrackR2/Assets/AXP.png Normal file

Binary file not shown.

After

(image error) Size: 83 KiB

BIN
AutoTrackR2/Assets/BRTE.png Normal file

Binary file not shown.

After

(image error) Size: 26 KiB

BIN
AutoTrackR2/Assets/DMC.png Normal file

Binary file not shown.

After

(image error) Size: 385 KiB

Binary file not shown.

Before

(image error) Size: 271 KiB

After

(image error) Size: 28 KiB

Before After
Before After

BIN
AutoTrackR2/Assets/FCU.png Normal file

Binary file not shown.

After

(image error) Size: 5 KiB

Binary file not shown.

After

(image error) Size: 10 KiB

View file

Before

(image error) Size: 66 KiB

After

(image error) Size: 66 KiB

Before After
Before After

View file

@ -13,23 +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="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" />
@ -43,73 +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\WRITH.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> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Resource> </Resource>
<Resource Include="config.ini" /> <Resource Include="config.ini" />

View file

@ -207,7 +207,6 @@
Margin="0,7,0,5"/> Margin="0,7,0,5"/>
<Slider x:Name="ThemeSlider" <Slider x:Name="ThemeSlider"
Minimum="0" Minimum="0"
Maximum="24"
Value="0" Value="0"
TickFrequency="1" TickFrequency="1"
IsSnapToTickEnabled="True" IsSnapToTickEnabled="True"

View file

@ -43,6 +43,12 @@ public partial class ConfigPage : UserControl
const string themeJsonPath = "themes.json"; const string themeJsonPath = "themes.json";
var themeJson = File.ReadAllText(themeJsonPath); var themeJson = File.ReadAllText(themeJsonPath);
_themes = JsonSerializer.Deserialize<Dictionary<string, Theme>>(themeJson); _themes = JsonSerializer.Deserialize<Dictionary<string, Theme>>(themeJson);
// Set the theme slider's maximum value based on the number of themes
if (_themes != null)
{
ThemeSlider.Maximum = _themes.Count - 1;
}
} }
// Method to change the logo image in MainWindow // Method to change the logo image in MainWindow
@ -139,7 +145,7 @@ public partial class ConfigPage : UserControl
{ {
ChangeLogo(theme.Logo.Path, ChangeLogo(theme.Logo.Path,
theme.Logo.Primary != null theme.Logo.Primary != null
? (Color) ColorConverter.ConvertFromString(theme.Logo.Primary) ? (Color)ColorConverter.ConvertFromString(theme.Logo.Primary)
: Colors.Transparent); : Colors.Transparent);
} }

View file

@ -39,9 +39,7 @@ namespace AutoTrackR2
} }
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}");
// 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"
} }
}, },
@ -116,7 +121,7 @@
"Accent": "#FF4500", "Accent": "#FF4500",
"Button": "#2A0A0A", "Button": "#2A0A0A",
"Background": "#1A0000", "Background": "#1A0000",
"Text": "#FF8C42", "Text": "#FFFFFF",
"AltText": "#FF6B35" "AltText": "#FF6B35"
}, },
"Logo": { "Logo": {
@ -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": {
@ -163,6 +168,19 @@
"Primary": "#00FF00" "Primary": "#00FF00"
} }
}, },
"AXP": {
"Colors": {
"Accent": "#E61E00",
"Button": "#250B0B",
"Background": "#150404",
"Text": "#FFFFFF",
"AltText": "#FF3333"
},
"Logo": {
"Path": "/Assets/axp.png",
"Primary": "#E61E00"
}
},
"Mammon": { "Mammon": {
"Colors": { "Colors": {
"Accent": "#FFD700", "Accent": "#FFD700",
@ -250,20 +268,21 @@
"AltText": "#FF3333" "AltText": "#FF3333"
}, },
"Logo": { "Logo": {
"Path": "/Assets/Blightveil.png", "Path": "/Assets/BlightVeil.png",
"Primary": "#8B4AC6" "Primary": "#8B4AC6"
} }
}, },
"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": {
@ -317,5 +336,57 @@
"Path": "/Assets/ZAP.png", "Path": "/Assets/ZAP.png",
"Primary": "#FFD700" "Primary": "#FFD700"
} }
},
"DMC": {
"Colors": {
"Accent": "#FF0000",
"Button": "#1A0000",
"Background": "#0A0000",
"Text": "#FFFFFF",
"AltText": "#FF3333"
},
"Logo": {
"Path": "/Assets/DMC.png",
"Primary": "#FF0000"
}
},
"BRTE": {
"Colors": {
"Accent": "#FF4500",
"Button": "#1A0A00",
"Background": "#0A0500",
"Text": "#FFFFFF",
"AltText": "#FF8C42"
},
"Logo": {
"Path": "/Assets/BRTE.png",
"Primary": "#FF4500"
}
},
"FCU": {
"Colors": {
"Accent": "#9CAF88",
"Button": "#2A3324",
"Background": "#1A1F15",
"Text": "#FFFFFF",
"AltText": "#B8C7A8"
},
"Logo": {
"Path": "/Assets/FCU.png",
"Primary": "#9CAF88"
}
},
"THEENCLAVE": {
"Colors": {
"Accent": "#FF0000",
"Button": "#1A0000",
"Background": "#0A0000",
"Text": "#FFFFFF",
"AltText": "#FF3333"
},
"Logo": {
"Path": "/Assets/THEENCLAVE.png",
"Primary": "#FF0000"
}
} }
} }