Skip to content

Commit

Permalink
Release 1.2.20210527.0
Browse files Browse the repository at this point in the history
  • Loading branch information
BuIlDaLiBlE committed May 27, 2021
1 parent e7440a0 commit c2f85da
Show file tree
Hide file tree
Showing 22 changed files with 927 additions and 284 deletions.
Binary file added Assets/Images/BackgroundImage.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Assets/Images/Button_Preload.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Assets/Images/Button_Preload_Checkmark.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Assets/Images/Button_Preload_Circle.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Assets/Images/Button_Preload_Highlighted.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Assets/Images/Button_Preload_Pause.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Assets/Images/Button_Preload_Pressed.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Assets/Images/Button_Preload_Resume.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
47 changes: 18 additions & 29 deletions BetterHI3Launcher.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@
<Reference Include="System.Diagnostics.DiagnosticSource, Version=5.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>packages\System.Diagnostics.DiagnosticSource.5.0.1\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath>
</Reference>
<Reference Include="System.Drawing" />
<Reference Include="System.Globalization.Calendars, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>packages\System.Globalization.Calendars.4.3.0\lib\net46\System.Globalization.Calendars.dll</HintPath>
<Private>True</Private>
Expand Down Expand Up @@ -175,6 +176,7 @@
<Reference Include="System.Text.Encoding.CodePages, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>packages\System.Text.Encoding.CodePages.5.0.0\lib\net461\System.Text.Encoding.CodePages.dll</HintPath>
</Reference>
<Reference Include="System.Web" />
<Reference Include="System.Xml" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Core" />
Expand All @@ -188,6 +190,7 @@
<Private>True</Private>
<Private>True</Private>
</Reference>
<Reference Include="UIAutomationProvider" />
<Reference Include="WindowsBase" />
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
Expand Down Expand Up @@ -281,48 +284,34 @@
</BootstrapperPackage>
</ItemGroup>
<ItemGroup>
<Resource Include="Assets\Images\Icon.ico" />
<Resource Include="Assets\Images\Button.png" />
<Resource Include="Assets\Images\Button_Disabled.png" />
<Resource Include="Assets\Images\Button_Pressed.png" />
<Resource Include="Assets\Images\Icon.ico" />
</ItemGroup>
<ItemGroup>
<Resource Include="Assets\Images\HI3_Logo.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Assets\Images\BackgroundOverlay.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Assets\Images\Button_Close.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Assets\Images\Button_Close_Pressed.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Assets\Images\Button_Close_Highlighted.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Assets\Images\Button_Minimize.png" />
<Resource Include="Assets\Images\Button_Minimize_Highlighted.png" />
<Resource Include="Assets\Images\Button_Minimize_Pressed.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Assets\Images\HoV_Dance.gif" />
</ItemGroup>
<ItemGroup>
<Resource Include="Assets\Images\Button_Box_Close.png" />
<Resource Include="Assets\Images\Button_Box_Close_Highlighted.png" />
<Resource Include="Assets\Images\Button_Box_Close_Pressed.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Assets\Images\Button_Minimize.png" />
<Resource Include="Assets\Images\Button_Minimize_Highlighted.png" />
<Resource Include="Assets\Images\Button_Minimize_Pressed.png" />
<Resource Include="Assets\Images\BackgroundShadow.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Assets\Images\BackgroundOverlay.png" />
<Resource Include="Assets\Images\BackgroundImage.png" />
<Resource Include="Assets\Images\HI3_Logo.png" />
<Resource Include="Assets\Images\HoV_Dance.gif" />
<Resource Include="Assets\Images\Window_Dialog.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Assets\Images\Checkbox_Off.png" />
<Resource Include="Assets\Images\Checkbox_On.png" />
<Resource Include="Assets\Images\Button_Preload.png" />
<Resource Include="Assets\Images\Button_Preload_Checkmark.png" />
<Resource Include="Assets\Images\Button_Preload_Circle.png" />
<Resource Include="Assets\Images\Button_Preload_Highlighted.png" />
<Resource Include="Assets\Images\Button_Preload_Pressed.png" />
<Resource Include="Assets\Images\Button_Preload_Pause.png" />
<Resource Include="Assets\Images\Button_Preload_Resume.png" />
<Content Include="Assets\Sounds\Click.wav" />
<Content Include="Assets\Sounds\Window_Close.wav" />
<Content Include="Assets\Sounds\Window_Open.wav" />
Expand Down
9 changes: 4 additions & 5 deletions DialogWindow.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,9 @@
TextOptions.TextRenderingMode="ClearType"
ShowInTaskbar="False"
UseLayoutRounding="True"
Title="DialogWindow" Width="1280" Height="590">
Title="DialogWindow" Width="1280" Height="730">
<Window.Resources>
<FontFamily x:Key="Font">/BetterHI3Launcher;component/Assets/Fonts/#FZLanTingHei-B-GBK</FontFamily>
<FontFamily x:Key="FontStatic">/BetterHI3Launcher;component/Assets/Fonts/#FZLanTingHei-B-GBK</FontFamily>
<ImageBrush x:Key="Button" ImageSource="/Assets/Images/Button.png"/>
<ImageBrush x:Key="ButtonPressed" ImageSource="/Assets/Images/Button_Pressed.png"/>
<ImageBrush x:Key="ButtonDisabled" ImageSource="/Assets/Images/Button_Disabled.png"/>
Expand All @@ -29,7 +28,7 @@
</Setter.Value>
</Setter>
</Style>
<Style x:Key="LaunchButtonStyle" TargetType="{x:Type Button}">
<Style x:Key="ButtonStyle" TargetType="{x:Type Button}">
<Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisual}"/>
<Setter Property="Background" Value="{StaticResource Button}"/>
<Setter Property="BorderBrush" Value="{x:Null}"/>
Expand Down Expand Up @@ -94,8 +93,8 @@
</ScrollViewer>
<Button Name="CloseButton" Style="{DynamicResource CloseButtonStyle}" Margin="0,23,33,0" Click="CloseButton_Click"/>
<StackPanel Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Bottom" Margin="36">
<Button Name="ConfirmButton" Style="{DynamicResource LaunchButtonStyle}" Click="ConfirmButton_Click"/>
<Button Name="CancelButton" Style="{DynamicResource LaunchButtonStyle}" Click="CloseButton_Click"/>
<Button Name="ConfirmButton" Style="{DynamicResource ButtonStyle}" Click="ConfirmButton_Click"/>
<Button Name="CancelButton" Style="{DynamicResource ButtonStyle}" Click="CloseButton_Click"/>
</StackPanel>
</Grid>
</Window>
4 changes: 2 additions & 2 deletions DialogWindow.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ public partial class DialogWindow : Window
public DialogWindow(string title, string message, bool question = false)
{
Owner = Application.Current.MainWindow;
Left = Application.Current.MainWindow.Left + 41;
Top = Application.Current.MainWindow.Top + 40;
Left = Application.Current.MainWindow.Left;
Top = Application.Current.MainWindow.Top;
InitializeComponent();
DialogTitle.Text = title;
DialogMessage.Text = message;
Expand Down
Loading

0 comments on commit c2f85da

Please sign in to comment.