Skip to content

Commit cdfcd1b

Browse files
migeyusumigeyusu
committed
edit some effect.
1 parent 22c981d commit cdfcd1b

File tree

9 files changed

+64
-38
lines changed

9 files changed

+64
-38
lines changed

‎AIClient/Dialog/DialogTemplateDictionary.xaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -377,7 +377,7 @@
377377
Margin="6,0,0,0"
378378
ToolTip="重试"
379379
Command="{Binding RefreshSelectedCommand}"
380-
Content="{materialDesign:PackIcon Kind=Autorenew,Size=20}" />
380+
Content="{materialDesign:PackIcon Kind=Refresh,Size=20}" />
381381
<Button Style="{StaticResource RefreshButtonStyle}"
382382
Command="{Binding EditCommand}"
383383
VerticalAlignment="Center"

‎AIClient/Dialog/DialogView.xaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@
102102
</Button>
103103
<Button ToolTip="备份"
104104
Command="{x:Static ui:CommonCommands.Backup}">
105-
<materialDesign:PackIcon Kind="Archive"
105+
<materialDesign:PackIcon Kind="ArchiveArrowUpOutline"
106106
Width="20"
107107
Height="20" />
108108
</Button>

‎AIClient/LLMClient.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
<PackageReference Include="LambdaConverters" Version="4.0.0"/>
2929
<PackageReference Include="Magick.NET-Q8-x64" Version="14.7.0" />
3030
<PackageReference Include="Magick.NET.SystemWindowsMedia" Version="8.0.7" />
31+
<PackageReference Include="MahApps.Metro.IconPacks.Material" Version="6.1.0" />
3132
<PackageReference Include="MahApps.Metro.IconPacks.MaterialDesign" Version="5.1.0"/>
3233
<PackageReference Include="Markdig.Wpf" Version="0.5.0.1"/>
3334
<PackageReference Include="MaterialDesignThemes" Version="5.2.2-ci998"/>

‎AIClient/Project/ProjectView.xaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
ModelDetailCommand="{x:Static materialDesign:DialogHost.OpenDialogCommand}"
8383
Model="{Binding Requester.DefaultClient.Model,Mode=OneWay}" />
8484
<Button ToolTip="备份"
85-
Content="{materialDesign:PackIcon Kind=ContentSave,Size=20}"
85+
Content="{materialDesign:PackIcon Kind=ArchiveArrowUpOutline,Size=20}"
8686
Command="{x:Static ui:CommonCommands.Backup}" />
8787
<materialDesign:PopupBox StaysOpen="True">
8888
<StackPanel MaxWidth="200"

‎AIClient/UI/Component/CustomControlResourceDictionary.xaml‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
33
xmlns:component="clr-namespace:LLMClient.UI.Component"
44
xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
5-
xmlns:endpoints="clr-namespace:LLMClient.Endpoints">
5+
xmlns:endpoints="clr-namespace:LLMClient.Endpoints"
6+
xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks">
67
<Style TargetType="{x:Type component:PopupBoxEx}"
78
BasedOn="{StaticResource MaterialDesignToolPopupBox}" />
89
<Style x:Key="ArrowButtonStyle" TargetType="RepeatButton">
@@ -257,9 +258,14 @@
257258
Height="22"
258259
Style="{StaticResource MaterialDesignIconButton}"
259260
Command="{TemplateBinding ChangeModelCommand}">
260-
<materialDesign:PackIcon Kind="SwapHorizontalBold"
261+
<iconPacks:PackIconMaterialDesign Kind="ChangeCircle"
262+
Width="22"
263+
Height="22"
264+
Foreground="White"
265+
Background="{DynamicResource MaterialDesign.Brush.Primary}"/>
266+
<!--<materialDesign:PackIcon Kind="SwapHorizontalBold"
261267
Width="15"
262-
Height="15" />
268+
Height="15" />-->
263269
</Button>
264270
</StackPanel>
265271
</Button>

‎AIClient/UI/Component/PromptEditor.xaml‎

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,21 +15,30 @@
1515
Style="{StaticResource DialogContentControlStyle}"
1616
Header="System Prompt"
1717
Width="600">
18-
<TextBox Text="{Binding PromptString,Mode=TwoWay, UpdateSourceTrigger=LostFocus}"
19-
MaxHeight="300"
20-
Height="200"
21-
Margin="10,0"
22-
materialDesign:HintAssist.Hint="System prompt"
23-
SpellCheck.IsEnabled="True"
24-
Style="{StaticResource InputBoxStyle}" />
18+
<Grid>
19+
<TextBox Text="{Binding PromptString,Mode=TwoWay, UpdateSourceTrigger=LostFocus}"
20+
MaxHeight="300"
21+
Height="200"
22+
SpellCheck.IsEnabled="True"
23+
Style="{StaticResource InputBoxStyle}" />
24+
<!--<Button Style="{StaticResource MaterialDesignFloatingActionMiniLightButton}"
25+
Content="{materialDesign:PackIcon Kind=Add,Size=16}"
26+
VerticalAlignment="Bottom"
27+
HorizontalAlignment="Right"
28+
ToolTipService.InitialShowDelay="0"
29+
ToolTip="Add to system prompt resources"
30+
Width="23"
31+
Height="23"
32+
Margin="6" />-->
33+
</Grid>
2534
</HeaderedContentControl>
2635
</UserControl.Resources>
2736
<materialDesign:SplitButton PopupElevation="Dp6"
2837
Margin="0"
2938
Height="50"
3039
Padding="10,4"
3140
PopupUniformCornerRadius="6"
32-
Click="Button_OnClick"
41+
Click="PromptEditorButton_OnClick"
3342
Style="{StaticResource MaterialDesignFlatSplitButton}">
3443
<materialDesign:SplitButton.Content>
3544
<TextBlock TextWrapping="Wrap"

‎AIClient/UI/Component/PromptEditor.xaml.cs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
using System.Collections;
22
using System.Windows;
33
using System.Windows.Controls;
4+
using LLMClient.Data;
45
using MaterialDesignThemes.Wpf;
56

67
namespace LLMClient.UI.Component;
@@ -31,8 +32,9 @@ public IList Source
3132
set { SetValue(SourceProperty, value); }
3233
}
3334

34-
public void Button_OnClick(object sender, RoutedEventArgs e)
35+
public void PromptEditorButton_OnClick(object sender, RoutedEventArgs e)
3536
{
37+
//这里必须通过resouce发送到dialoghost，否则会绑定异常
3638
var findResource = this.FindResource("HeaderedContentControl");
3739
if (findResource is FrameworkElement frameworkElement)
3840
{

‎AIClient/UI/DataTemplateDictionary.xaml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -240,11 +240,10 @@
240240
<Run Text="{Binding Name,Mode=OneWay}"
241241
FontSize="18"
242242
FontWeight="Bold" />
243-
<Run> (</Run>
243+
<Run FontSize="12" > (</Run>
244244
<Run Text="{Binding Id,Mode=OneWay}"
245245
FontSize="12" />
246-
<Run>)</Run>
247-
<LineBreak />
246+
<Run FontSize="12" >)</Run>
248247
</TextBlock>
249248
<Image Grid.Column="1"
250249
Width="40"

‎AIClient/UI/GlobalOptionsView.xaml‎

Lines changed: 29 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -109,15 +109,16 @@
109109
<StackPanel Orientation="Horizontal"
110110
Margin="0,10,0,0">
111111
<TextBlock Text="Embedding"
112-
Style="{StaticResource MaterialDesignHeadline6TextBlock}"
113-
VerticalAlignment="Center" />
112+
Style="{StaticResource MaterialDesignSubtitle2TextBlock}"
113+
VerticalAlignment="Center"
114+
Width="140" />
114115
<TextBlock Text="Endpoint:"
115-
Margin="20,0,0,0"
116116
VerticalAlignment="Center"
117117
Style="{StaticResource MaterialDesignBody2TextBlock}" />
118118
<ComboBox ItemsSource="{Binding EndpointService.AvailableEndpoints,Mode=OneWay}"
119119
SelectedItem="{Binding EmbeddingEndpoint,Mode=TwoWay}"
120120
Style="{StaticResource MaterialDesignFilledComboBox}"
121+
Padding="12,5"
121122
DisplayMemberPath="DisplayName"
122123
MinWidth="120"
123124
Margin="12,0,0,0" />
@@ -133,13 +134,15 @@
133134
<StackPanel Orientation="Horizontal"
134135
Margin="0,10,0,0">
135136
<TextBlock Text="Summarization"
136-
Style="{StaticResource MaterialDesignHeadline6TextBlock}"
137+
Style="{StaticResource MaterialDesignSubtitle2TextBlock}"
138+
Width="140"
137139
VerticalAlignment="Center" />
138140
<materialDesign:PopupBox Padding="2,0"
139141
StaysOpen="True"
140-
Margin="10,0,0,0"
142+
Margin="0,0,0,0"
141143
VerticalAlignment="Center"
142-
ToolTip="添加suggestion"
144+
ToolTip="选择模型"
145+
ToolTipService.InitialShowDelay="0"
143146
Style="{StaticResource MaterialDesignToolPopupBox}"
144147
PopupContentTemplate="{StaticResource PopupSelectModelDataTemplate}"
145148
PopupContent="{Binding SelectionViewModel,Mode=OneTime}">
@@ -157,21 +160,23 @@
157160
</materialDesign:PopupBox>
158161
<TextBlock Margin="12,0,0,0"
159162
VerticalAlignment="Center"
160-
Style="{StaticResource MaterialDesignBody2TextBlock}">
161-
<TextBlock.Text>
162-
<MultiBinding StringFormat="{}终结点：{0} 模型：{1}">
163-
<Binding Path="DigestClientPersist.EndPointName" Mode="TwoWay" />
164-
<Binding Path="DigestClientPersist.ModelName" Mode="OneWay" />
165-
</MultiBinding>
166-
</TextBlock.Text>
167-
</TextBlock>
163+
Style="{StaticResource MaterialDesignBody2TextBlock}"
164+
Text="{Binding Path=DigestClientPersist.ModelName, Mode=OneWay, StringFormat=模型：{0}}" />
168165
</StackPanel>
169-
<TextBlock Text="DbConnection："
170-
Margin="0,10,0,0" />
171166
<Grid Margin="0,10,0,0">
172-
<TextBox Text="{Binding DBConnection,Mode=TwoWay}"
167+
<Grid.ColumnDefinitions>
168+
<ColumnDefinition Width="Auto" />
169+
<ColumnDefinition />
170+
</Grid.ColumnDefinitions>
171+
<TextBlock Text="DbConnection"
172+
Width="140"
173+
VerticalAlignment="Center"
174+
Style="{StaticResource MaterialDesignSubtitle2TextBlock}" />
175+
<TextBox Grid.Column="1"
176+
Text="{Binding DBConnection,Mode=TwoWay}"
173177
Style="{StaticResource MaterialDesignFilledTextBox}" />
174-
<Button Content="{materialDesign:PackIcon Kind=DatabasePlus}"
178+
<Button Grid.Column="1"
179+
Content="{materialDesign:PackIcon Kind=DatabasePlus}"
175180
Margin="0,0,10,0"
176181
Width="28"
177182
Height="28"
@@ -180,8 +185,12 @@
180185
Command="{Binding SelectDatabaseCommand}"
181186
Style="{StaticResource MaterialDesignFloatingActionMiniLightButton}" />
182187
</Grid>
183-
<StackPanel Orientation="Horizontal">
184-
<TextBlock Text="APIParallelism：" />
188+
<StackPanel Orientation="Horizontal"
189+
Margin="0,10,0,0">
190+
<TextBlock Text="API Parallelism"
191+
VerticalAlignment="Center"
192+
Width="140"
193+
Style="{StaticResource MaterialDesignSubtitle2TextBlock}" />
185194
<TextBox Text="{Binding MaxDigestParallelism,Mode=TwoWay}"
186195
Width="80" />
187196
</StackPanel>

0 commit comments

Comments
 (0)