2dust 2024-12-05 10:39:08 +08:00
parent 3f2ab8ddcb
commit 4d2eb324f1
8 changed files with 29 additions and 30 deletions

View File

@ -7,7 +7,7 @@
xmlns:resx="clr-namespace:ServiceLib.Resx;assembly=ServiceLib"
xmlns:vms="clr-namespace:ServiceLib.ViewModels;assembly=ServiceLib"
Title="{x:Static resx:ResUI.menuRoutingRuleSetting}"
Width="960"
Width="1000"
Height="700"
x:DataType="vms:RoutingRuleSettingViewModel"
ShowInTaskbar="False"
@ -237,11 +237,11 @@
Binding="{Binding Network}"
Header="network" />
<DataGridTextColumn
Width="200"
Width="*"
Binding="{Binding Domains}"
Header="domain" />
<DataGridTextColumn
Width="200"
Width="*"
Binding="{Binding Ips}"
Header="ip" />
</DataGrid.Columns>

View File

@ -7,7 +7,7 @@
xmlns:resx="clr-namespace:ServiceLib.Resx;assembly=ServiceLib"
xmlns:vms="clr-namespace:ServiceLib.ViewModels;assembly=ServiceLib"
Title="{x:Static resx:ResUI.menuRoutingSetting}"
Width="990"
Width="1000"
Height="700"
x:DataType="vms:RoutingSettingViewModel"
ShowInTaskbar="False"
@ -109,7 +109,7 @@
<DataGrid.Columns>
<DataGridCheckBoxColumn Width="40" Binding="{Binding IsActive}" />
<DataGridTextColumn
Width="250"
Width="*"
Binding="{Binding Remarks}"
Header="{x:Static resx:ResUI.LvRemarks}" />
<DataGridTextColumn
@ -121,7 +121,7 @@
Binding="{Binding Sort}"
Header="{x:Static resx:ResUI.LvSort}" />
<DataGridTextColumn
Width="300"
Width="*"
Binding="{Binding Url}"
Header="{x:Static resx:ResUI.LvUrl}" />
<DataGridTextColumn

View File

@ -8,9 +8,7 @@
xmlns:vms="clr-namespace:ServiceLib.ViewModels;assembly=ServiceLib"
Title="{x:Static resx:ResUI.menuSubSetting}"
Width="700"
Height="600"
d:DesignHeight="600"
d:DesignWidth="800"
Height="650"
ShowInTaskbar="False"
WindowStartupLocation="CenterScreen"
mc:Ignorable="d">

View File

@ -8,10 +8,8 @@
xmlns:resx="clr-namespace:ServiceLib.Resx;assembly=ServiceLib"
xmlns:vms="clr-namespace:ServiceLib.ViewModels;assembly=ServiceLib"
Title="{x:Static resx:ResUI.menuSubSetting}"
Width="800"
Height="600"
d:DesignHeight="450"
d:DesignWidth="800"
Width="1000"
Height="700"
x:DataType="vms:SubSettingViewModel"
ShowInTaskbar="False"
WindowStartupLocation="CenterScreen"
@ -49,7 +47,7 @@
</DataGrid.KeyBindings>
<DataGrid.Columns>
<DataGridTextColumn
Width="120"
Width="*"
Binding="{Binding Remarks}"
Header="{x:Static resx:ResUI.LvRemarks}" />
<DataGridTextColumn

View File

@ -1,17 +1,18 @@
<reactiveui:ReactiveWindow
x:Class="v2rayN.Views.RoutingRuleSettingWindow"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
xmlns:reactiveui="http://reactiveui.net"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:reactiveui="http://reactiveui.net"
xmlns:resx="clr-namespace:ServiceLib.Resx;assembly=ServiceLib"
xmlns:vms="clr-namespace:ServiceLib.ViewModels;assembly=ServiceLib"
Title="{x:Static resx:ResUI.menuRoutingRuleSetting}"
Width="960"
Width="1000"
Height="700"
x:TypeArguments="vms:RoutingRuleSettingViewModel"
ResizeMode="CanResize"
ShowInTaskbar="False"
Style="{StaticResource WindowGlobal}"
WindowStartupLocation="CenterScreen"
@ -321,11 +322,11 @@
Binding="{Binding Network}"
Header="network" />
<DataGridTextColumn
Width="200"
Width="*"
Binding="{Binding Domains}"
Header="domain" />
<DataGridTextColumn
Width="200"
Width="*"
Binding="{Binding Ips}"
Header="ip" />
</DataGrid.Columns>

View File

@ -9,9 +9,10 @@
xmlns:resx="clr-namespace:ServiceLib.Resx;assembly=ServiceLib"
xmlns:vms="clr-namespace:ServiceLib.ViewModels;assembly=ServiceLib"
Title="{x:Static resx:ResUI.menuRoutingSetting}"
Width="990"
Width="1000"
Height="700"
x:TypeArguments="vms:RoutingSettingViewModel"
ResizeMode="CanResize"
ShowInTaskbar="False"
Style="{StaticResource WindowGlobal}"
WindowStartupLocation="CenterScreen"
@ -174,7 +175,7 @@
</DataGrid.Resources>
<DataGrid.Columns>
<DataGridTextColumn
Width="250"
Width="*"
Binding="{Binding Remarks}"
Header="{x:Static resx:ResUI.LvRemarks}" />
<DataGridTextColumn
@ -186,7 +187,7 @@
Binding="{Binding Sort}"
Header="{x:Static resx:ResUI.LvSort}" />
<DataGridTextColumn
Width="300"
Width="*"
Binding="{Binding Url}"
Header="{x:Static resx:ResUI.LvUrl}" />
<DataGridTextColumn

View File

@ -1,16 +1,16 @@
<reactiveui:ReactiveWindow
x:Class="v2rayN.Views.SubEditWindow"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
xmlns:reactiveui="http://reactiveui.net"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:reactiveui="http://reactiveui.net"
xmlns:resx="clr-namespace:ServiceLib.Resx;assembly=ServiceLib"
xmlns:vms="clr-namespace:ServiceLib.ViewModels;assembly=ServiceLib"
Title="{x:Static resx:ResUI.menuSubSetting}"
Width="700"
Height="600"
Height="650"
x:TypeArguments="vms:SubEditViewModel"
ShowInTaskbar="False"
Style="{StaticResource WindowGlobal}"

View File

@ -9,9 +9,10 @@
xmlns:resx="clr-namespace:ServiceLib.Resx;assembly=ServiceLib"
xmlns:vms="clr-namespace:ServiceLib.ViewModels;assembly=ServiceLib"
Title="{x:Static resx:ResUI.menuSubSetting}"
Width="800"
Height="600"
Width="1000"
Height="700"
x:TypeArguments="vms:SubSettingViewModel"
ResizeMode="CanResize"
ShowInTaskbar="False"
Style="{StaticResource WindowGlobal}"
WindowStartupLocation="CenterScreen"
@ -92,7 +93,7 @@
Style="{StaticResource DefDataGrid}">
<DataGrid.Columns>
<DataGridTextColumn
Width="120"
Width="*"
Binding="{Binding Remarks}"
Header="{x:Static resx:ResUI.LvRemarks}" />
<DataGridTextColumn