From c5815c17e053ab37d2be7d9d685914c911911f80 Mon Sep 17 00:00:00 2001 From: Timerix22 Date: Wed, 16 Mar 2022 22:12:14 +0300 Subject: [PATCH] descriptors --- launcher-client-win/GUI/App.xaml | 301 ++++++++++-------- launcher-client-win/GUI/App.xaml.cs | 21 +- launcher-client-win/GUI/LauncherWindow.xaml | 301 +++++++++++++----- .../GUI/LauncherWindow.xaml.cs | 122 ++++++- launcher-client-win/GUI/ProgramLabel.xaml | 33 ++ launcher-client-win/GUI/ProgramLabel.xaml.cs | 17 + launcher-client-win/GUI/TabButton.cs | 16 + launcher-client-win/Launcher.cs | 20 +- launcher-client-win/Program.cs | 62 ++++ .../Resources/default.descriptor.template | 6 + launcher-client-win/Resources/logo-D.ico | Bin 0 -> 38078 bytes .../launcher-client-win.csproj | 2 + 12 files changed, 685 insertions(+), 216 deletions(-) create mode 100644 launcher-client-win/GUI/ProgramLabel.xaml create mode 100644 launcher-client-win/GUI/ProgramLabel.xaml.cs create mode 100644 launcher-client-win/GUI/TabButton.cs create mode 100644 launcher-client-win/Program.cs create mode 100644 launcher-client-win/Resources/default.descriptor.template create mode 100644 launcher-client-win/Resources/logo-D.ico 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"> + - - - + + + - - - - - + + + + + - - + + + - - - - - + + + + + + + -