Skip to content

Commit cc73b96

Browse files
hiddenbluehiddenblue
committed
move the localization resource file to Lang
1 parent 5ad4afe commit cc73b96

File tree

4 files changed

+47
-52
lines changed

4 files changed

+47
-52
lines changed

‎Avalonia.CpuLimiter/Avalonia.CpuLimiter.csproj‎

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212

1313
<ItemGroup>
1414
<AvaloniaResource Include="Assets\**" />
15+
<AvaloniaResource Include="Lang\**" />
16+
1517
</ItemGroup>
1618

1719
<ItemGroup>
@@ -25,19 +27,4 @@
2527
<PackageReference Include="MessageBox.Avalonia" Version="3.2.0" />
2628
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
2729
</ItemGroup>
28-
29-
<ItemGroup>
30-
<EmbeddedResource Update="Assets\Resources.resx">
31-
<Generator>PublicResXFileCodeGenerator</Generator>
32-
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
33-
</EmbeddedResource>
34-
</ItemGroup>
35-
36-
<ItemGroup>
37-
<Compile Update="Assets\Resources.Designer.cs">
38-
<DesignTime>True</DesignTime>
39-
<AutoGen>True</AutoGen>
40-
<DependentUpon>Resources.resx</DependentUpon>
41-
</Compile>
42-
</ItemGroup>
4330
</Project>

Avalonia.CpuLimiter/Assets/Resources.Designer.cs renamed to Avalonia.CpuLimiter/Lang/Resources.Designer.cs

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Avalonia.CpuLimiter/Assets/Resources.resx renamed to Avalonia.CpuLimiter/Lang/Resources.resx

File renamed without changes.

‎Avalonia.CpuLimiter/Views/MainWindow.axaml‎

Lines changed: 43 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<Window xmlns="https://github.com/avaloniaui"
22
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
33
xmlns:vm="using:Avalonia.CpuLimiter.ViewModels"
4+
xmlns:lang="using:Avalonia.CpuLimiter.Lang"
45
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
56
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
6-
xmlns:assets="clr-namespace:Avalonia.CpuLimiter.Assets"
7-
mc:Ignorable="d" d:DesignWidth="600" d:DesignHeight="500"
7+
mc:Ignorable="d" d:DesignWidth="600" d:DesignHeight="400"
88
Width="600" Height="400"
99
x:Class="Avalonia.CpuLimiter.Views.MainWindow"
1010
x:DataType="vm:MainWindowViewModel"
@@ -36,29 +36,29 @@
3636
<!-- window menu -->
3737
<DockPanel>
3838
<Menu DockPanel.Dock="Top">
39-
<MenuItem Name="FileButton" Header="{x:Static assets:Resources.FileButton}">
39+
<MenuItem Name="FileButton" Header="{x:Static lang:Resources.FileButton}">
4040
<MenuItem Header="Open" Command="{Binding ChooseExeFileCommand}" FontSize="13"/>
4141
<MenuItem Header="Save" Command="{Binding}" FontSize="13"/>
4242
<Separator/>
4343
<MenuItem Header="Exit" Click="OnExitButtonClicked" FontSize="13"/>
4444
</MenuItem>
4545

46-
<MenuItem Name="EditButton" Header="{x:Static assets:Resources.EditButton}">
46+
<MenuItem Name="EditButton" Header="{x:Static lang:Resources.EditButton}">
4747
<MenuItem Header="Cut" FontSize="13"/>
4848
<MenuItem Header="Copy" FontSize="13"/>
4949
<MenuItem Header="Paste" FontSize="13"/>
5050
</MenuItem>
5151

52-
<MenuItem Name="SettingButton" Header="{x:Static assets:Resources.SettingButton}">
52+
<MenuItem Name="SettingButton" Header="{x:Static lang:Resources.SettingButton}">
5353
<MenuItem Header="View" FontSize="13"/>
5454
<MenuItem Header="Config" FontSize="13"/>
5555
</MenuItem>
5656

57-
<MenuItem Name="RunButton" Header="{x:Static assets:Resources.RunButton}">
57+
<MenuItem Name="RunButton" Header="{x:Static lang:Resources.RunButton}">
5858
<MenuItem Header="Launch Game" Command="{Binding RunGameCommand}" FontSize="13"/>
5959
</MenuItem>
6060

61-
<MenuItem Name="HelpButton" Header="{x:Static assets:Resources.HelpButton}">
61+
<MenuItem Name="HelpButton" Header="{x:Static lang:Resources.HelpButton}">
6262
<MenuItem Header="Docs" FontSize="13" Command="{Binding OpenDocsCommand}"
6363
ToolTip.Tip="Click to open docs in browser"/>
6464
<Separator/>
@@ -77,14 +77,39 @@
7777
</TextBlock>
7878

7979
<StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
80-
<TextBox Text="{Binding GamePath}" Name="GamePathTextBox"
81-
HorizontalAlignment="Center"
82-
Padding="30 8 30 0" FontSize="16">
83-
<TextBox.InnerRightContent>
84-
<!-- <Button>Select</Button> -->
85-
86-
</TextBox.InnerRightContent>
87-
</TextBox>
80+
<!-- SelectedItem="{Binding HistoryItems[0]}" -->
81+
<ComboBox Name="HistoryComboBox" HorizontalAlignment="Center" Padding="15 0 15 5"
82+
FontSize="16" FontWeight="Bold"
83+
PlaceholderText="Input the Program Path"
84+
PlaceholderForeground="Yellow"
85+
ItemsSource="{Binding HistoryItems}"
86+
ToolTip.Tip="Store no more than five records">
87+
88+
<ComboBox.ItemTemplate>
89+
<DataTemplate DataType="vm:HistoryItemViewModel">
90+
<Grid ColumnDefinitions="* Auto">
91+
<TextBlock Grid.Column="0" Text="{Binding Path}"
92+
FontSize="16"
93+
Width="300"
94+
Height="20"/>
95+
<Button Grid.Column="1" Padding="10"
96+
Command="{Binding }"
97+
CommandParameter="{Binding .}">
98+
<PathIcon Data="{StaticResource DeleteRegular}" Padding="0 10" IsVisible="True"/>
99+
</Button>
100+
</Grid>
101+
</DataTemplate>
102+
</ComboBox.ItemTemplate>
103+
</ComboBox>
104+
105+
<!-- <TextBox Text="{Binding GamePath}" Name="GamePathTextBox" -->
106+
<!-- HorizontalAlignment="Center" -->
107+
<!-- Padding="30 8 30 0" FontSize="16"> -->
108+
<!-- <TextBox.InnerRightContent> -->
109+
<!-- ~1~ <Button>Select</Button> @1@ -->
110+
<!-- -->
111+
<!-- </TextBox.InnerRightContent> -->
112+
<!-- </TextBox> -->
88113

89114
<Button Content=" ... " HorizontalAlignment="Center"
90115
Background="Beige" Foreground="Black"
@@ -107,7 +132,7 @@
107132

108133
<StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
109134
<TextBlock Name="CPUCoreNumberTextBlock" FontSize="18" FontWeight="Bold" Margin="10 6 10 0"
110-
HorizontalAlignment="Center" Text="{x:Static assets:Resources.CPUCoreNumberTextBlock}"></TextBlock>
135+
HorizontalAlignment="Center" Text="{x:Static lang:Resources.CPUCoreNumberTextBlock}"></TextBlock>
111136
<!-- <TextBlock Text="{Binding #slider.Value}" -->
112137
<!-- HorizontalAlignment="Center" FontSize="20" FontWeight="Bold" Padding="0"/> -->
113138

@@ -124,29 +149,12 @@
124149
FontSize="16" FontWeight="Bold"
125150
Margin="10 20" Padding="14"
126151
ToolTip.Tip="Run the selected Game"
127-
Content="{x:Static assets:Resources.LaunchGameButton}"
152+
Content="{x:Static lang:Resources.LaunchGameButton}"
128153
HotKey="Enter">
129154
<!-- <PathIcon Data="{StaticResource GamesRegular}"/> -->
130155
</Button>
131156

132-
<ComboBox HorizontalAlignment="Center" Padding="15"
133-
FontSize="16" FontWeight="Bold"
134-
x:Name="HistoryBox"
135-
ToolTip.Tip="Store no more than five records">
136-
<ComboBox.ItemTemplate>
137-
<DataTemplate>
138-
<Grid ColumnDefinitions="* Auto">
139-
<TextBlock Grid.Column="0" Text="Hello"
140-
FontSize="18"
141-
FontFamily="{Binding}"
142-
Width="200"
143-
Height="20"
144-
/>
145-
<Button Grid.Column="1" Padding="10">X</Button>
146-
</Grid>
147-
</DataTemplate>
148-
</ComboBox.ItemTemplate>
149-
</ComboBox>
157+
150158

151159
</StackPanel>
152160
</DockPanel>

0 commit comments

Comments
 (0)