diff --git a/launcher-client-win/GUI/App.xaml b/launcher-client-win/GUI/App.xaml index e7e28b1..fc3e275 100644 --- a/launcher-client-win/GUI/App.xaml +++ b/launcher-client-win/GUI/App.xaml @@ -1,30 +1,46 @@ - - + + + + + + + + + + - - + + + + - + Background="{Binding Background, RelativeSource={RelativeSource TemplatedParent}}" + BorderBrush="{Binding Foreground, RelativeSource={RelativeSource TemplatedParent}}" + BorderThickness="{Binding BorderThickness, RelativeSource={RelativeSource TemplatedParent}}"> + + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/launcher-client-win/GUI/App.xaml.cs b/launcher-client-win/GUI/App.xaml.cs index 38fddc6..fb2dabb 100644 --- a/launcher-client-win/GUI/App.xaml.cs +++ b/launcher-client-win/GUI/App.xaml.cs @@ -1,19 +1,28 @@ -namespace launcher_client_win; +using System.Windows.Input; +using System.Windows.Media; + +namespace launcher_client_win.GUI; public partial class App : Application { + public static SolidColorBrush MyDark,MySoftDark, MyWhite, MyGreen, MyOrange, MySelectionColor; + + protected override void OnStartup(StartupEventArgs e) { try { base.OnStartup(e); + MyDark = (SolidColorBrush)Resources["MyDarkTr"]; + MySoftDark = (SolidColorBrush)Resources["MyGray"]; + MyWhite = (SolidColorBrush)Resources["MyWhite"]; + MyGreen = (SolidColorBrush)Resources["MyGreen"]; + MyOrange = (SolidColorBrush)Resources["MyOrange"]; + MySelectionColor = (SolidColorBrush)Resources["MySelectionColor"]; _Main(e.Args); } - catch (Exception ex) - { - MessageBox.Show($"STARTUP ERROR:\n{ex}"); - Shutdown(); - } + catch(Exception ex) + { LogError("STARTUP",ex); } } } diff --git a/launcher-client-win/GUI/LauncherWindow.xaml b/launcher-client-win/GUI/LauncherWindow.xaml index e1946fd..54254ab 100644 --- a/launcher-client-win/GUI/LauncherWindow.xaml +++ b/launcher-client-win/GUI/LauncherWindow.xaml @@ -1,98 +1,249 @@  - + xmlns:local="clr-namespace:launcher_client_win.GUI" + xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + Title="Launcher" + Width="800" + Height="500" + MinWidth="800" + MinHeight="500" + Background="#232328" + mc:Ignorable="d"> + - - - + + + - - - - - + + + + + - - + + + - - - - - + + + + + + + -