diff --git a/launcher-client-win/GUI/App.xaml b/launcher-client-win/GUI/App.xaml index c814329..581c135 100644 --- a/launcher-client-win/GUI/App.xaml +++ b/launcher-client-win/GUI/App.xaml @@ -2,6 +2,7 @@ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"> + @@ -30,7 +31,7 @@ @@ -172,17 +173,32 @@ - + - diff --git a/launcher-client-win/GUI/LauncherWindow.xaml b/launcher-client-win/GUI/LauncherWindow.xaml index cf9172b..77afd55 100644 --- a/launcher-client-win/GUI/LauncherWindow.xaml +++ b/launcher-client-win/GUI/LauncherWindow.xaml @@ -9,7 +9,7 @@ Height="500" MinWidth="800" MinHeight="500" - Background="#232328" + Background="{DynamicResource MyBackgroundColor}" mc:Ignorable="d"> @@ -72,7 +72,7 @@ - + - Process.Start("explorer.exe", Logger.Logfile.Remove(Logger.Logfile.LastIndexOf(Path.Sep))); + Process.Start("explorer.exe", Logger.Logfile.Remove(Logger.Logfile.LastIndexOf(Путь.Разд))); LogfileLabel.MouseEnter += (s,e)=>LogfileLabel.Foreground=App.MySelectionColor; LogfileLabel.MouseLeave += (s,e)=>LogfileLabel.Foreground=App.MyWhite; LibraryButton.TabGrid = LibraryGrid; @@ -89,7 +89,7 @@ public partial class LauncherWindow : Window DescriptionBox.Text = selectedProg.Description; BackgroundImage.Source = new BitmapImage(new Uri( - $"{Directory.GetCurrent()}{Path.Sep}backgrounds{Path.Sep}{selectedProg.BackgroundFile}", + $"{Directory.GetCurrent()}{Путь.Разд}backgrounds{Путь.Разд}{selectedProg.BackgroundFile}", UriKind.Absolute)); ProgramSettingsViever.Content = selectedProg.SettingsPanel; DisplayingProgram = selectedProg; diff --git a/launcher-client-win/GUI/ProgramLabel.xaml.cs b/launcher-client-win/GUI/ProgramLabel.xaml.cs index 5835eab..9fa72ee 100644 --- a/launcher-client-win/GUI/ProgramLabel.xaml.cs +++ b/launcher-client-win/GUI/ProgramLabel.xaml.cs @@ -10,7 +10,7 @@ public partial class ProgramLabel : UserControl InitializeComponent(); NameLabel.Content = label; IconImage.Source = new BitmapImage(new Uri( - $"{Directory.GetCurrent()}{Path.Sep}icons{Path.Sep}{icon}", + $"{Directory.GetCurrent()}{Путь.Разд}icons{Путь.Разд}{icon}", UriKind.Absolute)); } } \ No newline at end of file diff --git a/launcher-client-win/GUI/ProgramSettingsPanelItem.xaml b/launcher-client-win/GUI/ProgramSettingsPanelItem.xaml index 456057d..a15d134 100644 --- a/launcher-client-win/GUI/ProgramSettingsPanelItem.xaml +++ b/launcher-client-win/GUI/ProgramSettingsPanelItem.xaml @@ -4,8 +4,8 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:local="clr-namespace:launcher_client_win.GUI" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" - Height="30" d:DesignWidth="100" + d:DesignHeight="30" mc:Ignorable="d" Background="Transparent"> @@ -15,7 +15,9 @@