Skip to content

Commit 5fbeb4b

Browse files
committed
Improved UI for Desktop version
1 parent 1b2b838 commit 5fbeb4b

File tree

5 files changed

+44
-12
lines changed

5 files changed

+44
-12
lines changed

v2rayN/ServiceLib/Resx/ResUI.Designer.cs

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

v2rayN/ServiceLib/Resx/ResUI.resx

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1321,4 +1321,7 @@
13211321
<data name="ConnectionsHostFilterTitle" xml:space="preserve">
13221322
<value>Host filter</value>
13231323
</data>
1324+
<data name="TipActiveServer" xml:space="preserve">
1325+
<value>Active</value>
1326+
</data>
13241327
</root>

v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1318,4 +1318,7 @@
13181318
<data name="ConnectionsHostFilterTitle" xml:space="preserve">
13191319
<value>主机过滤器</value>
13201320
</data>
1321+
<data name="TipActiveServer" xml:space="preserve">
1322+
<value>活动</value>
1323+
</data>
13211324
</root>

v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1198,4 +1198,7 @@
11981198
<data name="ConnectionsHostFilterTitle" xml:space="preserve">
11991199
<value>主機過濾</value>
12001200
</data>
1201+
<data name="TipActiveServer" xml:space="preserve">
1202+
<value>活動</value>
1203+
</data>
12011204
</root>

v2rayN/v2rayN.Desktop/Views/ProfilesView.axaml

Lines changed: 24 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383
BorderThickness="1"
8484
CanUserResizeColumns="True"
8585
GridLinesVisibility="All"
86-
HeadersVisibility="Column"
86+
HeadersVisibility="All"
8787
IsReadOnly="True"
8888
ItemsSource="{Binding ProfileItems}">
8989
<DataGrid.KeyBindings>
@@ -143,20 +143,34 @@
143143
</DataGrid.ContextMenu>
144144

145145
<DataGrid.Columns>
146-
<DataGridCheckBoxColumn
147-
Width="40"
148-
Binding="{Binding isActive}"
149-
Tag="isActive" />
150146
<DataGridTextColumn
151147
Width="80"
152148
Binding="{Binding configType}"
153149
Header="{x:Static resx:ResUI.LvServiceType}"
154150
Tag="configType" />
155-
<DataGridTextColumn
156-
Width="150"
157-
Binding="{Binding remarks}"
158-
Header="{x:Static resx:ResUI.LvRemarks}"
159-
Tag="remarks" />
151+
152+
<DataGridTemplateColumn SortMemberPath="remarks" Tag="remarks">
153+
<DataGridTemplateColumn.Header>
154+
<TextBlock Text="{x:Static resx:ResUI.LvRemarks}" />
155+
</DataGridTemplateColumn.Header>
156+
<DataGridTemplateColumn.CellTemplate>
157+
<DataTemplate>
158+
<StackPanel Margin="8,0" Orientation="Horizontal">
159+
<Label
160+
Margin="0,0,8,0"
161+
Classes="Solid Red"
162+
Content="{x:Static resx:ResUI.TipActiveServer}"
163+
IsVisible="{Binding isActive}"
164+
Theme="{StaticResource TagLabel}" />
165+
<Label
166+
HorizontalAlignment="Center"
167+
VerticalAlignment="Center"
168+
Content="{Binding remarks}" />
169+
</StackPanel>
170+
</DataTemplate>
171+
</DataGridTemplateColumn.CellTemplate>
172+
</DataGridTemplateColumn>
173+
160174
<DataGridTextColumn
161175
Width="120"
162176
Binding="{Binding address}"

0 commit comments

Comments
 (0)