Skip to content

fix:修复下载界面速度/剩余时间显示英文 perf:预设代码量进行优化 #120

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
GuHanDuRen wants to merge 7 commits into
base: master
Choose a base branch
from
Open

fix:修复下载界面速度/剩余时间显示英文 perf:预设代码量进行优化 #120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8b1ba84
添加配置预设功能
GuHanDuRen Aug 18, 2026
e98a7f4
修复部分问题
GuHanDuRen Aug 18, 2026
d69bd96
feat:优化配置预设页面的布局
GuHanDuRen Aug 18, 2026
901deb3
fix:修复下载界面速度/剩余时间显示英文
GuHanDuRen Aug 18, 2026
ec674e8
i18n
GuHanDuRen Aug 19, 2026
461e0d3
i18n
GuHanDuRen Aug 19, 2026
2a170e5
fix:forge安装器界面i18n
GuHanDuRen Aug 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion MSL/MSL.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -601,4 +601,4 @@
<Resource Include="images\msl-user-msl-user-logo-512-transparent-BjXu1GPW.png" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
</Project>
119 changes: 119 additions & 0 deletions MSL/controls/ctrls_serverrunner/ServerProperties.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<UserControl x:Class="MSL.controls.ctrls_serverrunner.ServerProperties"
x:Name="Root"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
Expand Down Expand Up @@ -68,6 +69,124 @@
<TextBlock Grid.Column="7" Margin="0,90,0,0" TextWrapping="Wrap" Text="3" HorizontalAlignment="Center" VerticalAlignment="Top"/>
</Grid>
</Grid>
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="*"/>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<TextBlock Text="{Binding [SR_ConfigPreset], Source={x:Static langs:LanguageManager.Instance}}" FontSize="18" FontWeight="Bold"
Foreground="{DynamicResource PrimaryTextBrush}" VerticalAlignment="Center"/>
<Border Grid.Column="1" Margin="8,0,5,0" MinHeight="34" MaxHeight="76"
Padding="5,3" BorderBrush="{DynamicResource BorderBrush}"
BorderThickness="1" CornerRadius="6"
Background="{DynamicResource BorderBackground}">
<ScrollViewer VerticalScrollBarVisibility="Auto"
HorizontalScrollBarVisibility="Disabled">
<WrapPanel x:Name="ConfigPresetButtonsPanel" VerticalAlignment="Center"/>
</ScrollViewer>
</Border>
<Button x:Name="LoadSelectedConfigPresetButton" Grid.Column="2" Content="{Binding [SR_ConfigPresetLoad], Source={x:Static langs:LanguageManager.Instance}}" MinWidth="90" Padding="10,0"
IsEnabled="False"
Margin="0,0,5,0" Click="LoadConfigPreset_Click"/>
<Button x:Name="configPresetButton" Grid.Column="3" Content="{Binding [SR_ConfigPresetAdd], Source={x:Static langs:LanguageManager.Instance}}" MinWidth="90" Padding="10,0"
IsEnabled="False"
Click="configPresetButton_Click"/>
</Grid>
<TextBlock x:Name="ConfigPresetStatusText" Visibility="Collapsed"
Foreground="{DynamicResource DarkPrimaryBrush}" TextWrapping="Wrap"/>
<Border x:Name="ConfigPresetPanel" Visibility="Collapsed" Padding="10"
BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1" CornerRadius="6"
Background="{DynamicResource BorderBackground}">
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
<RowDefinition Height="8"/>
<RowDefinition Height="Auto"/>
</Grid.RowDefinitions>
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*"/>
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<TextBlock Text="{Binding [SR_ConfigPresetPanelTitle], Source={x:Static langs:LanguageManager.Instance}}" Style="{StaticResource MagicText16}" FontWeight="Bold"
VerticalAlignment="Center" TextTrimming="CharacterEllipsis"
ToolTip="{Binding [SR_ConfigPresetPanelTitle], Source={x:Static langs:LanguageManager.Instance}}"/>
<hc:UniformSpacingPanel Grid.Column="1" Orientation="Horizontal" Spacing="5">
<Button Content="{Binding [SR_SelectAll], Source={x:Static langs:LanguageManager.Instance}}" Click="SelectAllConfigPreset_Click"/>
<Button Content="{Binding [SR_ConfigPresetSelectNone], Source={x:Static langs:LanguageManager.Instance}}" Click="SelectNoneConfigPreset_Click"/>
<Button Content="{Binding [Collapse], Source={x:Static langs:LanguageManager.Instance}}" Click="CollapseConfigPreset_Click"/>
</hc:UniformSpacingPanel>
</Grid>
<Grid Grid.Row="2">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="3*"/>
<ColumnDefinition Width="12"/>
<ColumnDefinition Width="1*" MinWidth="180"/>
</Grid.ColumnDefinitions>
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
</Grid.RowDefinitions>
<Grid Margin="2,0,2,4">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="36"/>
<ColumnDefinition Width="2*"/>
<ColumnDefinition Width="3*"/>
</Grid.ColumnDefinitions>
<TextBlock Text="{Binding [SR_Save], Source={x:Static langs:LanguageManager.Instance}}" HorizontalAlignment="Center"/>
<TextBlock Grid.Column="1" Text="{Binding [SR_ConfigPresetItem], Source={x:Static langs:LanguageManager.Instance}}" Margin="0,0,8,0"/>
<TextBlock Grid.Column="2" Text="{Binding [SR_ConfigPresetValue], Source={x:Static langs:LanguageManager.Instance}}"/>
</Grid>
<ListView x:Name="ConfigPresetList" Grid.Row="1" MinHeight="150" MaxHeight="400"
VerticalAlignment="Top" HorizontalContentAlignment="Stretch"
ItemsSource="{Binding ConfigPresetItems, ElementName=Root}"
BorderThickness="0" Background="{DynamicResource ContentRegionBrush}"
ScrollViewer.HorizontalScrollBarVisibility="Disabled"
ScrollViewer.VerticalScrollBarVisibility="Auto"
PreviewMouseLeftButtonDown="ConfigPresetList_PreviewMouseLeftButtonDown">
<ListView.ItemContainerStyle>
<Style TargetType="ListViewItem">
<Setter Property="HorizontalContentAlignment" Value="Stretch"/>
<Setter Property="Focusable" Value="False"/>
<Setter Property="IsTabStop" Value="False"/>
</Style>
</ListView.ItemContainerStyle>
<ListView.ItemTemplate>
<DataTemplate>
<Grid Margin="2">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="36"/>
<ColumnDefinition Width="2*"/>
<ColumnDefinition Width="3*"/>
</Grid.ColumnDefinitions>
<CheckBox IsChecked="{Binding IsSelected, Mode=TwoWay}"
HorizontalAlignment="Center" VerticalAlignment="Center"/>
<TextBlock Grid.Column="1" Text="{Binding Key}" TextTrimming="CharacterEllipsis"
ToolTip="{Binding Key}" VerticalAlignment="Center" Margin="0,0,8,0"/>
<TextBlock Grid.Column="2" Text="{Binding Value}" TextTrimming="CharacterEllipsis"
ToolTip="{Binding Value}" VerticalAlignment="Center"/>
</Grid>
</DataTemplate>
</ListView.ItemTemplate>
</ListView>
</Grid>
<hc:UniformSpacingPanel Grid.Column="2" Orientation="Vertical" Spacing="8">
<TextBlock Text="{Binding [SR_ConfigPresetName], Source={x:Static langs:LanguageManager.Instance}}" Foreground="{DynamicResource PrimaryTextBrush}"/>
<TextBox x:Name="ConfigPresetNameTextBox" Height="30" VerticalContentAlignment="Center"/>
<Button x:Name="SaveConfigPresetButton" Content="{Binding [SR_ConfigPresetSave], Source={x:Static langs:LanguageManager.Instance}}" Style="{StaticResource ButtonPrimary}"
Click="SaveConfigPreset_Click" Visibility="Collapsed"/>
<Button x:Name="ApplyConfigPresetButton" Content="{Binding [SR_ConfigPresetApply], Source={x:Static langs:LanguageManager.Instance}}"
Style="{StaticResource ButtonPrimary}" Click="ApplyConfigPreset_Click"
Visibility="Collapsed"/>
<Button x:Name="DeleteConfigPresetButton" Content="{Binding [SR_ConfigPresetDelete], Source={x:Static langs:LanguageManager.Instance}}"
Click="DeleteConfigPreset_Click" Visibility="Collapsed"/>
</hc:UniformSpacingPanel>
</Grid>
</Grid>
</Border>
<Grid x:Name="ChangeServerProperties">
<Grid.Resources>
<Style TargetType="TextBlock">
Expand Down
Loading