Skip to content
This repository has been archived by the owner on Feb 3, 2024. It is now read-only.

Commit

Permalink
Merge pull request #5 from B1ackSand/div
Browse files Browse the repository at this point in the history
Modify UI.
  • Loading branch information
B1ackSand authored Oct 6, 2023
2 parents e41d5e5 + 972c0eb commit 697c44e
Show file tree
Hide file tree
Showing 19 changed files with 1,554 additions and 681 deletions.
94 changes: 48 additions & 46 deletions LiaoTian_Cup/Dictionary/BaseStyle.xaml
Original file line number Diff line number Diff line change
@@ -1,69 +1,71 @@
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<!--存储常用的控件Style格式-->

<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<!-- 存储常用的控件Style格式 -->

<Style x:Key="BaseButton" TargetType="Button">
<Setter Property="Width" Value="120"></Setter>
<Setter Property="Height" Value="30"></Setter>
<Setter Property="VerticalAlignment" Value="Center"></Setter>
<Setter Property="HorizontalAlignment" Value="Right"></Setter>
<Setter Property="Width" Value="120" />
<Setter Property="Height" Value="30" />
<Setter Property="VerticalAlignment" Value="Center" />
<Setter Property="HorizontalAlignment" Value="Right" />
</Style>

<Style x:Key="BaseCheckBox" TargetType="CheckBox">
<Setter Property="Width" Value="120"></Setter>
<Setter Property="Height" Value="30"></Setter>
<Setter Property="VerticalAlignment" Value="Center"></Setter>
<Setter Property="HorizontalAlignment" Value="Center"></Setter>
<Setter Property="FontSize" Value="16"></Setter>
<Setter Property="RenderTransformOrigin" Value="0.5,0.5"></Setter>
<Setter Property="Width" Value="120" />
<Setter Property="Height" Value="30" />
<Setter Property="VerticalAlignment" Value="Center" />
<Setter Property="HorizontalAlignment" Value="Center" />
<Setter Property="FontSize" Value="16" />
<Setter Property="RenderTransformOrigin" Value="0.5,0.5" />
</Style>

<Style x:Key="BaseLabel" TargetType="Label">
<Setter Property="FontSize" Value="20"></Setter>
<Setter Property="FontWeight" Value="Bold"></Setter>
<Setter Property="HorizontalAlignment" Value="Left"></Setter>
<Setter Property="VerticalAlignment" Value="Center"></Setter>
<Setter Property="FontSize" Value="20" />
<Setter Property="FontWeight" Value="Bold" />
<Setter Property="HorizontalAlignment" Value="Center" />
<Setter Property="VerticalAlignment" Value="Center" />
</Style>

<Style x:Key="BaseTextBox" TargetType="TextBox">
<Setter Property="Focusable" Value="False"></Setter>
<Setter Property="FontSize" Value="20"></Setter>
<Setter Property="VerticalAlignment" Value="Center"></Setter>
<Setter Property="Focusable" Value="False" />
<Setter Property="FontSize" Value="20" />
<Setter Property="VerticalAlignment" Value="Center" />
</Style>

<Style x:Key="BaseComboBox" TargetType="ComboBox">
<Setter Property="Height" Value="30"/>
<Setter Property="Width" Value="125"/>
<Setter Property="VerticalAlignment" Value="Center"/>
<Setter Property="HorizontalAlignment" Value="Center"/>
<Setter Property="VerticalContentAlignment" Value="Center"/>
<Setter Property="HorizontalContentAlignment" Value="Center"/>
<Setter Property="IsEditable" Value="False"/>
<Setter Property="Height" Value="30" />
<Setter Property="Width" Value="125" />
<Setter Property="VerticalAlignment" Value="Center" />
<Setter Property="HorizontalAlignment" Value="Center" />
<Setter Property="VerticalContentAlignment" Value="Center" />
<Setter Property="HorizontalContentAlignment" Value="Center" />
<Setter Property="IsEditable" Value="False" />
</Style>

<Style x:Key="GridMinImage" TargetType="Image">
<Setter Property="Height" Value="60"/>
<Setter Property="Width" Value="60"/>
<Setter Property="Margin" Value="15,0,0,0"/>
<Setter Property="HorizontalAlignment" Value="Left"/>
<Setter Property="Stretch" Value="Fill"/>
<Setter Property="Height" Value="60" />
<Setter Property="Width" Value="60" />
<Setter Property="Margin" Value="15,0,0,0" />
<Setter Property="HorizontalAlignment" Value="Left" />
<Setter Property="Stretch" Value="Fill" />
</Style>

<Style x:Key="ClickableImg" TargetType="Image" BasedOn="{StaticResource GridMinImage}">
<Setter Property="Cursor" Value="Hand"/>
<Style
x:Key="ClickableImg"
BasedOn="{StaticResource GridMinImage}"
TargetType="Image">
<Setter Property="Cursor" Value="Hand" />
</Style>

<Style x:Key="MapImg" TargetType="Image">
<Setter Property="Height" Value="85"/>
<Setter Property="Width" Value="285"/>
<Setter Property="Stretch" Value="UniformToFill"/>
<Setter Property="Height" Value="85" />
<Setter Property="Width" Value="285" />
<Setter Property="Stretch" Value="UniformToFill" />
</Style>

<Style x:Key="MapName" TargetType="TextBlock">
<Setter Property="VerticalAlignment" Value="Center"/>
<Setter Property="TextAlignment" Value="Center"/>
<Setter Property="FontSize" Value="18"/>
<Setter Property="Foreground" Value="Red"/>
<Setter Property="FontWeight" Value="Bold"/>
<Setter Property="VerticalAlignment" Value="Center" />
<Setter Property="TextAlignment" Value="Center" />
<Setter Property="FontSize" Value="18" />
<Setter Property="Foreground" Value="Red" />
<Setter Property="FontWeight" Value="Bold" />
</Style>
</ResourceDictionary>
6 changes: 3 additions & 3 deletions LiaoTian_Cup/Dictionary/I18n/Lang.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions LiaoTian_Cup/Dictionary/I18n/Lang.resx
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@
<value>Player(s): </value>
</data>
<data name="MutationName" xml:space="preserve">
<value>Weekly mutation name:</value>
<value>Weekly mutation:</value>
</data>
<data name="MapName" xml:space="preserve">
<value>Map name:</value>
Expand All @@ -154,7 +154,7 @@
<value>Awesome Cmdrs.:</value>
</data>
<data name="HasSelectFreeMutators" xml:space="preserve">
<value>Free choice mutators picked:</value>
<value>Free mutators choiced:</value>
</data>
<data name="HasSelectCommanders" xml:space="preserve">
<value>Commander(s) picked:</value>
Expand Down Expand Up @@ -196,7 +196,7 @@
<value>you need to pick commander</value>
</data>
<data name="MainWindowTitle" xml:space="preserve">
<value>聊天杯 LiaoTian_Cup v0.2.4 - Programmed by B1ackSand</value>
<value>聊天杯 LiaoTian_Cup v0.2.5 - Programmed by B1ackSand</value>
</data>
<data name="ThreeMutatorsMode" xml:space="preserve">
<value>3 mutators mode</value>
Expand Down
2 changes: 1 addition & 1 deletion LiaoTian_Cup/Dictionary/I18n/Lang.zh.resx
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@
<value>未选择指挥官</value>
</data>
<data name="MainWindowTitle" xml:space="preserve">
<value>聊天杯 LiaoTian_Cup v0.2.4 - Programmed by B1ackSand</value>
<value>聊天杯 LiaoTian_Cup v0.2.5 - Programmed by B1ackSand</value>
</data>
<data name="ThreeMutatorsMode" xml:space="preserve">
<value>3因子模式</value>
Expand Down
3 changes: 2 additions & 1 deletion LiaoTian_Cup/LiaoTian_Cup.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
<UseWPF>true</UseWPF>
<ApplicationIcon>Resources\Logo\icon.ico</ApplicationIcon>
<Version>0.2.4</Version>
<Version>0.2.5</Version>
<Authors>B1ackSand</Authors>
<ApplicationManifest>app.manifest</ApplicationManifest>
<PackageReadmeFile>README.md</PackageReadmeFile>
Expand Down Expand Up @@ -320,6 +320,7 @@
<PackageReference Include="DeepCloner" Version="0.10.4" />
<PackageReference Include="log4net" Version="2.0.15" />
<PackageReference Include="Microsoft.Data.Sqlite" Version="7.0.11" />
<PackageReference Include="System.Drawing.Common" Version="7.0.0" />
</ItemGroup>

<ItemGroup>
Expand Down
Loading

0 comments on commit 697c44e

Please sign in to comment.