Skip to content

Commit f8a86e2

Browse files
yqzhishenyqzhishen
committed
一揽子UI细节优化
1 parent 34d668f commit f8a86e2

File tree

4 files changed

+33
-47
lines changed

4 files changed

+33
-47
lines changed

‎csharp/GUI/MainWindow.xaml‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -505,7 +505,7 @@
505505
RelativeSource="{RelativeSource Mode=FindAncestor, AncestorType=materialDesign:Card}"
506506
Path="ActualWidth"
507507
Converter="{StaticResource DoubleConstantSubConverter}"
508-
ConverterParameter="160"/>
508+
ConverterParameter="180"/>
509509
</Setter.Value>
510510
</Setter>
511511
</Style>
@@ -555,10 +555,7 @@
555555
<TextBlock Style="{StaticResource TreeViewHeaderComment}" Text="["/>
556556
<TextBlock VerticalAlignment="Center" Style="{StaticResource TreeViewHeaderComment}" Margin="7 2 0 0">
557557
<TextBlock.Text>
558-
<MultiBinding StringFormat="{}导入自 {0}">
559-
<Binding Path="SelectedInputPlugin.Format"/>
560-
<Binding Path="SelectedInputPlugin.Suffix"/>
561-
</MultiBinding>
558+
<Binding Path="SelectedInputPlugin.Format" StringFormat="{}导入自 {0}"/>
562559
</TextBlock.Text>
563560
</TextBlock>
564561
<TextBlock Style="{StaticResource TreeViewHeaderComment}" Text="]" Margin="7 2 0 0"/>
@@ -587,10 +584,7 @@
587584
<TextBlock Style="{StaticResource TreeViewHeaderComment}" Text="["/>
588585
<TextBlock VerticalAlignment="Center" Style="{StaticResource TreeViewHeaderComment}" Margin="7 2 0 0">
589586
<TextBlock.Text>
590-
<MultiBinding StringFormat="{}导出为 {0}">
591-
<Binding Path="SelectedOutputPlugin.Format"/>
592-
<Binding Path="SelectedOutputPlugin.Suffix"/>
593-
</MultiBinding>
587+
<Binding Path="SelectedOutputPlugin.Format" StringFormat="{}导出为 {0}"/>
594588
</TextBlock.Text>
595589
</TextBlock>
596590
<TextBlock Style="{StaticResource TreeViewHeaderComment}" Text="]" Margin="7 2 0 0"/>

‎csharp/GUI/OpenSvip.GUI.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
1616
<NuGetPackageImportStamp>
1717
</NuGetPackageImportStamp>
18+
<IsWebBootstrapper>false</IsWebBootstrapper>
1819
<PublishUrl>publish\</PublishUrl>
1920
<Install>true</Install>
2021
<InstallFrom>Disk</InstallFrom>
@@ -27,7 +28,6 @@
2728
<MapFileExtensions>true</MapFileExtensions>
2829
<ApplicationRevision>0</ApplicationRevision>
2930
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
30-
<IsWebBootstrapper>false</IsWebBootstrapper>
3131
<UseApplicationTrust>false</UseApplicationTrust>
3232
<BootstrapperEnabled>true</BootstrapperEnabled>
3333
</PropertyGroup>

‎csharp/GUI/OptionTreeViewItem.xaml‎

Lines changed: 28 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
<UserControl.Resources>
1616
<Style x:Key="OptionTextBlock" TargetType="TextBlock" BasedOn="{StaticResource MaterialDesignTextBlock}">
1717
<Setter Property="FontSize" Value="14"/>
18+
<Setter Property="LineHeight" Value="20"/>
1819
<Setter Property="TextWrapping" Value="Wrap"/>
1920
</Style>
2021
<Style x:Key="OptionTextBox" TargetType="TextBox" BasedOn="{StaticResource MaterialDesignTextBox}">
@@ -28,10 +29,10 @@
2829
<Style x:Key="OptionDoubleBox" TargetType="{x:Type local:DoubleNumericBox}" BasedOn="{StaticResource OptionTextBox}">
2930
<Setter Property="InputMethod.IsInputMethodEnabled" Value="False"/>
3031
</Style>
31-
<Style x:Key="OptionInformationIcon" TargetType="materialDesign:PackIcon">
32-
<Setter Property="Kind" Value="Information"/>
32+
<Style x:Key="OptionTipsIcon" TargetType="materialDesign:PackIcon">
33+
<Setter Property="Kind" Value="HelpCircle"/>
3334
<Setter Property="VerticalAlignment" Value="Center"/>
34-
<Setter Property="Margin" Value="8"/>
35+
<Setter Property="Margin" Value="8 0 0 0"/>
3536
<Setter Property="Width">
3637
<Setter.Value>
3738
<Binding Path="OptionInfo.Tips" Mode="OneWay">
@@ -49,9 +50,10 @@
4950
<Setter Property="Opacity" Value="0.8"/>
5051
<Setter Property="ToolTip">
5152
<Setter.Value>
52-
<TextBlock FontSize="13" Text="{Binding OptionInfo.Tips}" MaxWidth="320" TextWrapping="Wrap"/>
53+
<TextBlock Text="{Binding OptionInfo.Tips}" MaxWidth="320" TextWrapping="Wrap"/>
5354
</Setter.Value>
5455
</Setter>
56+
<Setter Property="Cursor" Value="Help"/>
5557
</Style>
5658
<DataTemplate x:Key="String" d:DataType="{x:Type local:OptionViewModel}">
5759
<WrapPanel
@@ -60,10 +62,7 @@
6062
d:DataContext="{d:DesignInstance Type=local:OptionViewModel}"
6163
DataContext="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=TreeViewItem}, Path=DataContext}">
6264
<TextBlock x:Name="TextBlockNearTextBox" Style="{StaticResource OptionTextBlock}" VerticalAlignment="Center" Text="{Binding Path=OptionInfo.Notes, StringFormat={}{0}：}"/>
63-
<StackPanel Orientation="Horizontal">
64-
<TextBox Style="{StaticResource OptionTextBox}" VerticalAlignment="Center" Text="{Binding Path=OptionValue}" Margin="0 1 0 0" MinWidth="80"/>
65-
<materialDesign:PackIcon Style="{StaticResource OptionInformationIcon}"/>
66-
</StackPanel>
65+
<TextBox Style="{StaticResource OptionTextBox}" VerticalAlignment="Center" Text="{Binding Path=OptionValue}" Margin="0 1 0 0" MinWidth="80"/>
6766
</WrapPanel>
6867
</DataTemplate>
6968
<DataTemplate x:Key="Integer">
@@ -73,10 +72,7 @@
7372
d:DataContext="{d:DesignInstance Type=local:OptionViewModel}"
7473
DataContext="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=TreeViewItem}, Path=DataContext}">
7574
<TextBlock Style="{StaticResource OptionTextBlock}" VerticalAlignment="Center" Text="{Binding Path=OptionInfo.Notes, StringFormat={}{0}：}"/>
76-
<StackPanel Orientation="Horizontal">
77-
<local:IntegerNumericBox Style="{StaticResource OptionIntegerBox}" VerticalAlignment="Center" Margin="0 2 0 0" Padding="4 2" d:Text="60" Text="{Binding Path=OptionValue}" MinWidth="35"/>
78-
<materialDesign:PackIcon Style="{StaticResource OptionInformationIcon}"/>
79-
</StackPanel>
75+
<local:IntegerNumericBox Style="{StaticResource OptionIntegerBox}" VerticalAlignment="Center" Margin="0 2 0 0" Padding="4 2" d:Text="60" Text="{Binding Path=OptionValue}" MinWidth="35"/>
8076
</WrapPanel>
8177
</DataTemplate>
8278
<DataTemplate x:Key="Double">
@@ -86,10 +82,7 @@
8682
d:DataContext="{d:DesignInstance Type=local:OptionViewModel}"
8783
DataContext="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=TreeViewItem}, Path=DataContext}">
8884
<TextBlock Style="{StaticResource OptionTextBlock}" VerticalAlignment="Center" Text="{Binding Path=OptionInfo.Notes, StringFormat={}{0}：}"/>
89-
<StackPanel Orientation="Horizontal">
90-
<local:DoubleNumericBox Style="{StaticResource OptionDoubleTextBox}" VerticalAlignment="Center" Margin="0 2 0 0" Padding="4 2" d:Text="60" Text="{Binding Path=OptionValue}" MinWidth="50" Digits="3"/>
91-
<materialDesign:PackIcon Style="{StaticResource OptionInformationIcon}"/>
92-
</StackPanel>
85+
<local:DoubleNumericBox Style="{StaticResource OptionDoubleTextBox}" VerticalAlignment="Center" Margin="0 2 0 0" Padding="4 2" d:Text="60" Text="{Binding Path=OptionValue}" MinWidth="50" Digits="3"/>
9386
</WrapPanel>
9487
</DataTemplate>
9588
<DataTemplate x:Key="Boolean">
@@ -102,10 +95,7 @@
10295
Margin="-2 0 0 0"
10396
Cursor="Hand"
10497
IsChecked="{Binding Path=OptionValue}"/>
105-
<StackPanel Orientation="Horizontal">
106-
<TextBlock x:Name="AutoDetectText" Style="{StaticResource OptionTextBlock}" VerticalAlignment="Center" Margin="5 0" Text="{Binding Path=OptionInfo.Notes}"/>
107-
<materialDesign:PackIcon Style="{StaticResource OptionInformationIcon}"/>
108-
</StackPanel>
98+
<TextBlock x:Name="AutoDetectText" Style="{StaticResource OptionTextBlock}" VerticalAlignment="Center" Margin="5 2 5 0" Text="{Binding Path=OptionInfo.Notes}"/>
10999
</WrapPanel>
110100
</DataTemplate>
111101
<DataTemplate x:Key="Enum">
@@ -115,26 +105,27 @@
115105
d:DataContext="{d:DesignInstance Type=local:OptionViewModel}"
116106
DataContext="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=TreeViewItem}, Path=DataContext}">
117107
<TextBlock Style="{StaticResource OptionTextBlock}" VerticalAlignment="Center" Text="{Binding Path=OptionInfo.Notes, StringFormat={}{0}：}"/>
118-
<StackPanel Orientation="Horizontal">
119-
<ComboBox
120-
Margin="0 5 0 0"
121-
Padding="0 0 0 4"
122-
ItemsSource="{Binding Path=OptionInfo.EnumChoices}"
123-
SelectedIndex="{Binding ChoiceIndex}"
124-
ToolTip="{Binding RelativeSource={RelativeSource Mode=Self}, Path=SelectedItem.Label}">
125-
<ComboBox.ItemTemplate>
126-
<DataTemplate DataType="{x:Type framwork:Choice}">
127-
<TextBlock Style="{StaticResource OptionTextBlock}" Opacity="1" TextAlignment="Center" Text="{Binding Name}" Padding="0" ToolTip="{Binding Label}"/>
128-
</DataTemplate>
129-
</ComboBox.ItemTemplate>
130-
</ComboBox>
131-
<materialDesign:PackIcon Style="{StaticResource OptionInformationIcon}"/>
132-
</StackPanel>
108+
<ComboBox
109+
Margin="0 5 0 0"
110+
Padding="0 0 0 4"
111+
ItemsSource="{Binding Path=OptionInfo.EnumChoices}"
112+
SelectedIndex="{Binding ChoiceIndex}"
113+
ToolTip="{Binding RelativeSource={RelativeSource Mode=Self}, Path=SelectedItem.Label}">
114+
<ComboBox.ItemTemplate>
115+
<DataTemplate DataType="{x:Type framwork:Choice}">
116+
<TextBlock Style="{StaticResource OptionTextBlock}" TextAlignment="Center" Text="{Binding Name}" Padding="0" ToolTip="{Binding Label}"/>
117+
</DataTemplate>
118+
</ComboBox.ItemTemplate>
119+
</ComboBox>
133120
</WrapPanel>
134121
</DataTemplate>
135122
</UserControl.Resources>
136123
<Grid>
137-
<ContentControl x:Name="TaskStatusContentControl" Content="{Binding}">
124+
<Grid.ColumnDefinitions>
125+
<ColumnDefinition/>
126+
<ColumnDefinition Width="Auto"/>
127+
</Grid.ColumnDefinitions>
128+
<ContentControl x:Name="TaskStatusContentControl" Grid.Column="0" Content="{Binding}">
138129
<ContentControl.ContentTemplateSelector>
139130
<local:OptionTreeViewItemTemplateSelector
140131
StringTemplate="{StaticResource String}"
@@ -156,5 +147,6 @@
156147
</StackPanel>
157148
</d:ContentControl.Content>
158149
</ContentControl>
150+
<materialDesign:PackIcon Grid.Column="1" Style="{StaticResource OptionTipsIcon}"/>
159151
</Grid>
160152
</UserControl>

‎csharp/GUI/ValueConverters.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ public class DoubleConstantSubConverter : IValueConverter
271271
{
272272
public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
273273
{
274-
return Math.Max(0, (double)value - double.Parse(parameter.ToString()));
274+
return Math.Max(0, (double)value - double.Parse(parameter.ToString()));
275275
}
276276

277277
public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)

0 commit comments

Comments
 (0)