Skip to content

UI rework including light and dark themes #2824

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Tiberius-Sicae wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

UI rework including light and dark themes #2824

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 14 additions & 12 deletions CargoMonitor/ConfigurationWindow.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<UserControl x:Class="EddiCargoMonitor.ConfigurationWindow"
<UserControl x:Class="EddiCargoMonitor.ConfigurationWindow"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
Expand All @@ -10,15 +10,17 @@
xmlns:System="clr-namespace:System;assembly=System.Runtime"
mc:Ignorable="d"
d:DesignHeight="300" d:DesignWidth="800">
<DockPanel LastChildFill="True" Background="#FFE5E5E5" Margin="0,5">
<TextBlock DockPanel.Dock="Top" TextWrapping="Wrap" Margin="5, 0" Text="{x:Static resx:CargoMonitor.para1}" />
<TextBlock DockPanel.Dock="Top" TextWrapping="Wrap" Margin="5" Text="{x:Static resx:CargoMonitor.para2}" />
<TextBlock DockPanel.Dock="Top" TextWrapping="Wrap" Margin="5" Text="{x:Static resx:CargoMonitor.para3}" />
<DockPanel LastChildFill="True" Background="{DynamicResource WindowBackgroundBrush}" Margin="0,5">
<StackPanel DockPanel.Dock="Top" Margin="20, 5, 20, 5" Orientation="Vertical">
<TextBlock TextWrapping="Wrap" Margin="0, 5" Text="{x:Static resx:CargoMonitor.para1}" />
<TextBlock TextWrapping="Wrap" Margin="0, 5" Text="{x:Static resx:CargoMonitor.para2}" />
<TextBlock TextWrapping="Wrap" Margin="0, 5" Text="{x:Static resx:CargoMonitor.para3}" />
</StackPanel>
<DataGrid Margin="0,5" AutoGenerateColumns="False" x:Name="cargoData" CanUserAddRows="false" CanUserDeleteRows="False" TargetUpdated="cargoUpdated" HeadersVisibility="Column">
<DataGrid.Columns>
<DataGridTextColumn Header="{x:Static resx:CargoMonitor.header_name}" Width="*" IsReadOnly="True" Binding="{Binding Path=localizedName}">
<DataGridTextColumn.HeaderStyle>
<Style TargetType="DataGridColumnHeader">
<Style TargetType="DataGridColumnHeader" BasedOn="{StaticResource {x:Type DataGridColumnHeader}}">
<Setter Property="HorizontalContentAlignment" Value="Center" />
</Style>
</DataGridTextColumn.HeaderStyle>
Expand All @@ -31,7 +33,7 @@
</DataGridTextColumn>
<DataGridTextColumn Header="{x:Static resx:CargoMonitor.header_type}" Width="*" IsReadOnly="True" Binding="{Binding Path=localizedCategory}">
<DataGridTextColumn.HeaderStyle>
<Style TargetType="DataGridColumnHeader">
<Style TargetType="DataGridColumnHeader" BasedOn="{StaticResource {x:Type DataGridColumnHeader}}">
<Setter Property="HorizontalContentAlignment" Value="Center" />
</Style>
</DataGridTextColumn.HeaderStyle>
Expand All @@ -44,7 +46,7 @@
</DataGridTextColumn>
<utility:DataGridNumericColumn Header="{x:Static resx:CargoMonitor.header_price}" Width="120" IsReadOnly="True" Binding="{Binding Path=price}">
<DataGridTextColumn.HeaderStyle>
<Style TargetType="DataGridColumnHeader">
<Style TargetType="DataGridColumnHeader" BasedOn="{StaticResource {x:Type DataGridColumnHeader}}">
<Setter Property="HorizontalContentAlignment" Value="Center" />
</Style>
</DataGridTextColumn.HeaderStyle>
Expand All @@ -57,7 +59,7 @@
</utility:DataGridNumericColumn>
<utility:DataGridNumericColumn Header="{x:Static resx:CargoMonitor.header_haulage}" Width="80" Binding="{Binding Path=(eddiDataDefinitions:Cargo.haulage), NotifyOnTargetUpdated=True, UpdateSourceTrigger=PropertyChanged, Mode=OneWay, TargetNullValue={x:Static System:String.Empty}}">
<DataGridTextColumn.HeaderStyle>
<Style TargetType="DataGridColumnHeader">
<Style TargetType="DataGridColumnHeader" BasedOn="{StaticResource {x:Type DataGridColumnHeader}}">
<Setter Property="HorizontalContentAlignment" Value="Center" />
</Style>
</DataGridTextColumn.HeaderStyle>
Expand All @@ -70,7 +72,7 @@
</utility:DataGridNumericColumn>
<utility:DataGridNumericColumn Header="{x:Static resx:CargoMonitor.header_stolen}" Width="80" Binding="{Binding Path=(eddiDataDefinitions:Cargo.stolen), NotifyOnTargetUpdated=True, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay, TargetNullValue={x:Static System:String.Empty}}">
<DataGridTextColumn.HeaderStyle>
<Style TargetType="DataGridColumnHeader">
<Style TargetType="DataGridColumnHeader" BasedOn="{StaticResource {x:Type DataGridColumnHeader}}">
<Setter Property="HorizontalContentAlignment" Value="Center" />
</Style>
</DataGridTextColumn.HeaderStyle>
Expand All @@ -83,7 +85,7 @@
</utility:DataGridNumericColumn>
<utility:DataGridNumericColumn Header="{x:Static resx:CargoMonitor.header_owned}" Width="80" Binding="{Binding Path=(eddiDataDefinitions:Cargo.owned), NotifyOnTargetUpdated=True, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay, TargetNullValue={x:Static System:String.Empty}}">
<DataGridTextColumn.HeaderStyle>
<Style TargetType="DataGridColumnHeader">
<Style TargetType="DataGridColumnHeader" BasedOn="{StaticResource {x:Type DataGridColumnHeader}}">
<Setter Property="HorizontalContentAlignment" Value="Center" />
</Style>
</DataGridTextColumn.HeaderStyle>
Expand All @@ -96,7 +98,7 @@
</utility:DataGridNumericColumn>
<utility:DataGridNumericColumn Header="{x:Static resx:CargoMonitor.header_need}" Width="80" Binding="{Binding Path=(eddiDataDefinitions:Cargo.need), NotifyOnTargetUpdated=True, UpdateSourceTrigger=PropertyChanged, Mode=OneWay, TargetNullValue={x:Static System:String.Empty}}">
<DataGridTextColumn.HeaderStyle>
<Style TargetType="DataGridColumnHeader">
<Style TargetType="DataGridColumnHeader" BasedOn="{StaticResource {x:Type DataGridColumnHeader}}">
<Setter Property="HorizontalContentAlignment" Value="Center" />
</Style>
</DataGridTextColumn.HeaderStyle>
Expand Down
1 change: 1 addition & 0 deletions ChangeLog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ Full details of the variables available for each noted event, and VoiceAttack in
* Installer revised to more gracefully handle installation over an existing installation of EDDI 4.1.9 or earlier (e.g. when installing VoiceAttack 2 over an existing VoiceAttack 1 installation).
* Various bug fixes from telemetry.
* Speech Responder
* Fixed the active personality ComboBox layout in the Speech Responder tab so the dropdown arrow doesn't overlap the personality name text.
* Fixed copied personalities not being editable until EDDI is restarted.
* Fixed failing lexicon schema validation (for .pls lexicon files). (#2814) (thanks to @klightspeed)
* Fix `StopSpeaking()` function from creating unexpected "paused" speech outputs when used in a script which enqueues new speech. (#2815)
Expand Down
12 changes: 6 additions & 6 deletions CommanderMonitor/ConfigurationWindow.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<UserControl x:Class="CommanderMonitor.ConfigurationWindow"
<UserControl x:Class="CommanderMonitor.ConfigurationWindow"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
Expand All @@ -8,8 +8,8 @@
xmlns:utility="clr-namespace:Utilities;assembly=Utilities"
mc:Ignorable="d"
d:DesignHeight="600" d:DesignWidth="800">
<DockPanel LastChildFill="True" Background="#FFE5E5E5" Margin="0,0">
<Grid Margin="0, 10">
<DockPanel LastChildFill="True" Background="{DynamicResource WindowBackgroundBrush}" Margin="0,0">
<Grid Margin="20, 10, 20, 10">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="120" />
<ColumnDefinition Width="*" />
Expand All @@ -36,8 +36,8 @@
<RowDefinition Height="Auto" />
<RowDefinition Height="*" />
</Grid.RowDefinitions>
<RichTextBox Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="6" DockPanel.Dock="Top" Margin="0, 0, 0, 25" IsReadOnly="True" IsDocumentEnabled="True" Background="#FFE5E5E5" BorderThickness="0">
<FlowDocument Background="#FFE5E5E5">
<RichTextBox Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="6" DockPanel.Dock="Top" Margin="0, 0, 0, 25" IsReadOnly="True" IsDocumentEnabled="True" BorderThickness="0">
<FlowDocument>
<Paragraph >
<Run Text="{x:Static resx:Resources.tab_commander_Ipa1}" />
<Hyperlink Click="ipaClicked" >
Expand Down Expand Up @@ -71,7 +71,7 @@
</Binding>
</TextBox.Text>
<TextBox.Style>
<Style TargetType="{x:Type TextBox}">
<Style TargetType="{x:Type TextBox}" BasedOn="{StaticResource {x:Type TextBox}}">
<Style.Triggers>
<Trigger Property="Validation.HasError" Value="true">
<Setter Property="ToolTipService.ToolTip"
Expand Down
6 changes: 3 additions & 3 deletions ConfigService/ConfigService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using EddiConfigService.Configurations;
using EddiConfigService.Configurations;
using EddiDataDefinitions;
using JetBrains.Annotations;
using Newtonsoft.Json;
Expand All @@ -16,7 +16,7 @@

namespace EddiConfigService
{
public sealed class ConfigService : INotifyPropertyChanged
public sealed class ConfigService : INotifyPropertyChanged, IDisposable
{
#region Configurations

Expand Down Expand Up @@ -563,7 +563,7 @@ private void SaveDirtyConfigurations ()
}

/// <summary>Saves a single configuration to disk synchronously (maintains compatibility with ConfigWrite.cs pattern)</summary>
private void SaveConfiguration ( Config config )
public void SaveConfiguration ( Config config )
{
try
{
Expand Down
19 changes: 18 additions & 1 deletion ConfigService/Configurations/EDDIConfiguration.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using Newtonsoft.Json;
using Newtonsoft.Json;
using System.Collections.Generic;
using System.Collections.Immutable;
using System.Windows;
Expand Down Expand Up @@ -121,6 +121,22 @@ public string OverrideCulture
}
}

[ JsonProperty( "OverrideTheme" ) ]
public string OverrideTheme
{
get => _overrideTheme;
set
{
if ( value == _overrideTheme )
{
return;
}

_overrideTheme = value;
OnPropertyChanged();
}
}

// Window Properties

[ JsonProperty( "Maximized" ) ]
Expand Down Expand Up @@ -199,6 +215,7 @@ public Rect MainWindowPosition
private bool _disableTelemetry;
private IDictionary<string, bool> _plugins;
private string _overrideCulture;
private string _overrideTheme;
private bool _maximized;
private bool _minimized;
private int _selectedTab;
Expand Down
18 changes: 9 additions & 9 deletions CrimeMonitor/ConfigurationWindow.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<UserControl x:Class="EddiCrimeMonitor.ConfigurationWindow"
<UserControl x:Class="EddiCrimeMonitor.ConfigurationWindow"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:System="clr-namespace:System;assembly=System.Runtime"
Expand All @@ -9,15 +9,15 @@
xmlns:utility="clr-namespace:Utilities;assembly=Utilities"
mc:Ignorable="d"
d:DesignHeight="300" d:DesignWidth="800">
<DockPanel LastChildFill="True" Background="#FFE5E5E5" Margin="0,5">
<UniformGrid DockPanel.Dock="Bottom" Rows="1" Columns="1" Margin="0,5">
<DockPanel LastChildFill="True" Background="{DynamicResource WindowBackgroundBrush}" Margin="0,5">
<UniformGrid DockPanel.Dock="Bottom" Rows="1" Columns="1" Margin="20, 5, 20, 5">
<Button HorizontalAlignment="Center" Click="addRecord" Content="{x:Static resx:CrimeMonitor.add_button}" ToolTip="{x:Static resx:CrimeMonitor.add_button_desc}" />
</UniformGrid>
<DataGrid Margin="0,10" AutoGenerateColumns="False" x:Name="criminalRecord" CanUserAddRows="false" CanUserDeleteRows="False" TargetUpdated="criminalRecordUpdated" HeadersVisibility="Column">
<DataGrid.Columns>
<DataGridTextColumn Header="{x:Static resx:CrimeMonitor.header_faction}" Width="*" Binding="{Binding Path=faction, NotifyOnTargetUpdated=True, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay, TargetNullValue={x:Static System:String.Empty}}">
<DataGridTextColumn.HeaderStyle>
<Style TargetType="DataGridColumnHeader">
<Style TargetType="DataGridColumnHeader" BasedOn="{StaticResource {x:Type DataGridColumnHeader}}">
<Setter Property="HorizontalContentAlignment" Value="Center" />
</Style>
</DataGridTextColumn.HeaderStyle>
Expand All @@ -30,7 +30,7 @@
</DataGridTextColumn>
<DataGridTextColumn Header="{x:Static resx:CrimeMonitor.header_system}" Width="120" Binding="{Binding Path=system, NotifyOnTargetUpdated=True, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay, TargetNullValue={x:Static System:String.Empty}}">
<DataGridTextColumn.HeaderStyle>
<Style TargetType="DataGridColumnHeader">
<Style TargetType="DataGridColumnHeader" BasedOn="{StaticResource {x:Type DataGridColumnHeader}}">
<Setter Property="HorizontalContentAlignment" Value="Center" />
</Style>
</DataGridTextColumn.HeaderStyle>
Expand All @@ -43,7 +43,7 @@
</DataGridTextColumn>
<utility:DataGridNumericColumn Header="{x:Static resx:CrimeMonitor.header_station}" Width="150" IsReadOnly="True" Binding="{Binding Path=station}">
<DataGridTextColumn.HeaderStyle>
<Style TargetType="DataGridColumnHeader">
<Style TargetType="DataGridColumnHeader" BasedOn="{StaticResource {x:Type DataGridColumnHeader}}">
<Setter Property="HorizontalContentAlignment" Value="Center" />
</Style>
</DataGridTextColumn.HeaderStyle>
Expand All @@ -56,7 +56,7 @@
</utility:DataGridNumericColumn>
<utility:DataGridNumericColumn Header="{x:Static resx:CrimeMonitor.header_claims}" Width="80" Binding="{Binding Path=claims, StringFormat=\{0:N0\}, NotifyOnTargetUpdated=True, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay, TargetNullValue={x:Static System:String.Empty}}">
<DataGridTextColumn.HeaderStyle>
<Style TargetType="DataGridColumnHeader">
<Style TargetType="DataGridColumnHeader" BasedOn="{StaticResource {x:Type DataGridColumnHeader}}">
<Setter Property="HorizontalContentAlignment" Value="Center" />
</Style>
</DataGridTextColumn.HeaderStyle>
Expand All @@ -69,7 +69,7 @@
</utility:DataGridNumericColumn>
<utility:DataGridNumericColumn Header="{x:Static resx:CrimeMonitor.header_fines}" Width="80" Binding="{Binding Path=fines, StringFormat=\{0:N0\}, NotifyOnTargetUpdated=True, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay, TargetNullValue={x:Static System:String.Empty}}">
<DataGridTextColumn.HeaderStyle>
<Style TargetType="DataGridColumnHeader">
<Style TargetType="DataGridColumnHeader" BasedOn="{StaticResource {x:Type DataGridColumnHeader}}">
<Setter Property="HorizontalContentAlignment" Value="Center" />
</Style>
</DataGridTextColumn.HeaderStyle>
Expand All @@ -82,7 +82,7 @@
</utility:DataGridNumericColumn>
<utility:DataGridNumericColumn Header="{x:Static resx:CrimeMonitor.header_bounties}" Width="80" Binding="{Binding Path=bounties, StringFormat=\{0:N0\}, NotifyOnTargetUpdated=True, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay, TargetNullValue={x:Static System:String.Empty}}">
<DataGridTextColumn.HeaderStyle>
<Style TargetType="DataGridColumnHeader">
<Style TargetType="DataGridColumnHeader" BasedOn="{StaticResource {x:Type DataGridColumnHeader}}">
<Setter Property="HorizontalContentAlignment" Value="Center" />
</Style>
</DataGridTextColumn.HeaderStyle>
Expand Down
6 changes: 3 additions & 3 deletions Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Project>
<Project>

<!-- Set our source revision ID equal to our latest git commit ID -->
<Target Name="SetSourceRevisionId" BeforeTargets="InitializeSourceControlInformation">
<Exec Command="git rev-parse HEAD" ConsoleToMSBuild="True" IgnoreExitCode="False">
<Exec Command="git rev-parse HEAD" ConsoleToMSBuild="True" IgnoreExitCode="True">
<Output PropertyName="SourceRevisionId" TaskParameter="ConsoleOutput" />
</Exec>
<ItemGroup>
Expand All @@ -12,7 +12,7 @@

<!-- Set our source branch -->
<Target Name="SetSourceBranch" BeforeTargets="InitializeSourceControlInformation">
<Exec Command="git rev-parse --abbrev-ref HEAD" ConsoleToMSBuild="True" IgnoreExitCode="False">
<Exec Command="git rev-parse --abbrev-ref HEAD" ConsoleToMSBuild="True" IgnoreExitCode="True">
<Output PropertyName="SourceBranch" TaskParameter="ConsoleOutput" />
</Exec>
<ItemGroup>
Expand Down
8 changes: 7 additions & 1 deletion EDDI/App.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
<Application x:Class="Eddi.App"
<Application x:Class="Eddi.App"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<Application.Resources>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="pack://application:,,,/EddiUI;component/Themes/ThemeLight.xaml"/>
<ResourceDictionary Source="pack://application:,,,/EddiUI;component/Themes/ThemeModern.xaml"/>
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary>
</Application.Resources>
</Application>
5 changes: 5 additions & 0 deletions EDDI/App.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ public static void Main ( string[] args = null )
}

var app = new App();
app.InitializeComponent();
app.Exit += OnExit;

try
Expand Down Expand Up @@ -106,6 +107,9 @@ private static System.Version ParseVoiceAttackVersion( string[] args )

private static void Initialize ( App app, bool fromVA = false, System.Version vaVersion = null, EDDIConfiguration configuration = null )
{
// Initialize our dynamic theme management engine
EddiUI.Themes.ThemeManager.Initialize();

// Prepare to start the application
if ( configuration != null && !configuration.DisableTelemetry )
{
Expand Down Expand Up @@ -187,6 +191,7 @@ private static void OnExit(object sender, ExitEventArgs e)
// Always stop the EDDI instance so monitors and services are shut down
// cleanly before the process exits.
EDDI.Instance.Stop();
ConfigService.Instance.Dispose();

Current?.Dispatcher?.InvokeAsync( () => {
eddiMutex.ReleaseMutex();
Expand Down
Loading