Timerix/dtlauncher
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

some fixes and default resources

Browse Source
This commit is contained in:
timerix
2022-10-15 03:14:16 +06:00
parent 89ddbc19d9
commit e31df8e029
25 changed files with 97 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Launcher.Client.Avalonia/GUI/App.axaml
View File

@@ -18,7 +18,13 @@
<Style Selector="TextBox.MyTextBoxStyle" />
<Style Selector="Label.MyLabelStyle" />
<Style Selector="Button.MyButtonStyle" />
<Style Selector="Button.MyButtonStyle" >
<Setter Property="Background" Value="Transparent"/>
<Setter Property="HorizontalAlignment" Value="Stretch"/>
<Setter Property="VerticalAlignment" Value="Stretch"/>
<Setter Property="HorizontalContentAlignment" Value="Center"/>
<Setter Property="VerticalContentAlignment" Value="Center"/>
</Style>
</Application.Styles>
</Application>

2
Launcher.Client.Avalonia/GUI/LauncherWindow.axaml
View File

@@ -8,7 +8,7 @@
MinWidth="800"
MinHeight="500"
Background="{DynamicResource MyBackgroundColor}">
<Grid ColumnDefinitions="5,*,5" RowDefinitions="5,40,5,*,5">
<Grid ColumnDefinitions="5,*,5" RowDefinitions="5,35,5,*,5">
<Image x:Name="BackgroundImage"
Grid.RowSpan="5"
Grid.ColumnSpan="3"

3
Launcher.Client.Avalonia/GUI/MessageBox.axaml.cs
View File

@@ -5,9 +5,6 @@ public partial class MessageBox : Window
public MessageBox()
{
InitializeComponent();
#if DEBUG
this.AttachDevTools();
#endif
}
public static void Show(string title, string text)

10
Launcher.Client.Avalonia/GUI/TabButton.cs
View File

@@ -1,11 +1,17 @@
namespace Launcher.Client.Avalonia.GUI;
using Avalonia.Styling;
public class TabButton : Button
namespace Launcher.Client.Avalonia.GUI;
public partial class TabButton : Button, IStyleable
{
Type IStyleable.StyleKey => typeof(Button);
public static readonly StyledProperty<Grid> TabGridProp = AvaloniaProperty.Register<TabButton, Grid>("TabGrid");
public Grid TabGrid
{
get => GetValue(TabGridProp);
set => SetValue(TabGridProp, value);
}
public TabButton() :base() {}
}

18
Launcher.Client.Avalonia/Launcher.Client.Avalonia.csproj
View File

@@ -16,18 +16,18 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Avalonia" Version="0.10.15" />
<PackageReference Include="Avalonia.Desktop" Version="0.10.15" />
<PackageReference Include="Avalonia" Version="0.10.18" />
<PackageReference Include="Avalonia.Desktop" Version="0.10.18" />
<!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
<PackageReference Include="Avalonia.Diagnostics" Version="0.10.15" Condition="'$(Configuration)' == 'Debug'" />
<PackageReference Include="Avalonia.Diagnostics" Version="0.10.18" Condition="'$(Configuration)' == 'Debug'" />
<PackageReference Include="XamlNameReferenceGenerator" Version="1.3.4" />
</ItemGroup>
<ItemGroup>
<Reference Include="..\..\DTLib\bin\Release\net6.0\DTLib.dll" />
<Reference Include="..\..\DTLib\bin\Release\net6.0\DTLib.Dtsod.dll" />
<Reference Include="..\..\DTLib\bin\Release\net6.0\DTLib.Network.dll" />
<ProjectReference Include="..\Launcher.Client\Launcher.Client.csproj"/>
<ProjectReference Include="..\..\DTLib\DTLib.Network\DTLib.Network.csproj" />
<ProjectReference Include="..\..\DTLib\DTLib.Dtsod\DTLib.Dtsod.csproj" />
<ProjectReference Include="..\..\DTLib\DTLib\DTLib.csproj" />
<ProjectReference Include="..\Launcher.Client\Launcher.Client.csproj" />
</ItemGroup>
<ItemGroup>
@@ -46,7 +46,7 @@
</ItemGroup>
<Target Name="PostBuild-Release" AfterTargets="PostBuildEvent" Condition="'$(Configuration)' == 'Release'">
<!--Target Name="PostBuild-Release" AfterTargets="PostBuildEvent" Condition="'$(Configuration)' == 'Release'">
<Exec Command="cp -f bin/Release/runtimes/linux-x64/native/* bin/Release/" />
<Exec Command="cp -f bin/Release/runtimes/win-x64/native/* bin/Release/" />
<Exec Command="rm -rf bin/Release/runtimes" />
@@ -55,6 +55,6 @@
<Exec Command="cp -f bin/Debug/runtimes/linux-x64/native/* bin/Debug/" />
<Exec Command="cp -f bin/Debug/runtimes/win-x64/native/* bin/Debug/" />
<Exec Command="rm -rf bin/Debug/runtimes" />
</Target>
</Target!-->
</Project>

2
Launcher.Client.Avalonia/LauncherMain.cs
View File

@@ -19,6 +19,7 @@ public static class LauncherMain
{
public static LauncherWindow CurrentLauncherWindow;
//it's being used by Avalonia xml preview
public static AppBuilder BuildAvaloniaApp() =>
AppBuilder.Configure<App>()
.UsePlatformDetect()
@@ -29,7 +30,6 @@ public static class LauncherMain
try
{
LauncherClient.Init();
var traceHandler = new ConsoleTraceListener();
Trace.AutoFlush = true;
Trace.Listeners.Add(traceHandler);