From 2bb5f6afc437da5ba250e7a6e70b515d17d9940b Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Thu, 3 Oct 2024 17:22:07 +0800
Subject: [PATCH] Add DialogHost fro Desktop

---
 v2rayN/v2rayN.Desktop/App.axaml               |   1 +
 v2rayN/v2rayN.Desktop/Views/MainWindow.axaml  | 500 +++++++++---------
 .../Views/ProfilesView.axaml.cs               |   6 +-
 v2rayN/v2rayN.Desktop/Views/QrcodeView.axaml  |  20 +-
 .../v2rayN.Desktop/Views/QrcodeView.axaml.cs  |   4 +-
 .../Views/SubSettingWindow.axaml              | 113 ++--
 .../Views/SubSettingWindow.axaml.cs           |   3 +-
 v2rayN/v2rayN.Desktop/v2rayN.Desktop.csproj   |   1 +
 8 files changed, 325 insertions(+), 323 deletions(-)

diff --git a/v2rayN/v2rayN.Desktop/App.axaml b/v2rayN/v2rayN.Desktop/App.axaml
index 12b0fc39..81f369d2 100644
--- a/v2rayN/v2rayN.Desktop/App.axaml
+++ b/v2rayN/v2rayN.Desktop/App.axaml
@@ -9,6 +9,7 @@
         <StyleInclude Source="Styles/GlobalStyles.axaml" />
         <StyleInclude Source="avares://Semi.Avalonia/Themes/Index.axaml" />
         <StyleInclude Source="avares://Semi.Avalonia.DataGrid/Index.axaml" />
+        <StyleInclude Source="avares://DialogHost.Avalonia/Styles.xaml" />
     </Application.Styles>
 
     <TrayIcon.Icons>
diff --git a/v2rayN/v2rayN.Desktop/Views/MainWindow.axaml b/v2rayN/v2rayN.Desktop/Views/MainWindow.axaml
index c1d0770e..9262a677 100644
--- a/v2rayN/v2rayN.Desktop/Views/MainWindow.axaml
+++ b/v2rayN/v2rayN.Desktop/Views/MainWindow.axaml
@@ -3,6 +3,7 @@
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:dialogHost="clr-namespace:DialogHostAvalonia;assembly=DialogHost.Avalonia"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:resx="clr-namespace:ServiceLib.Resx;assembly=ServiceLib"
     xmlns:vms="clr-namespace:ServiceLib.ViewModels;assembly=ServiceLib"
@@ -15,270 +16,273 @@
     ShowInTaskbar="True"
     WindowStartupLocation="CenterScreen"
     mc:Ignorable="d">
+    <dialogHost:DialogHost
+        Background="Gray"
+        CloseOnClickAway="True"
+        DisableOpeningAnimation="True">
+        <DockPanel>
+            <DockPanel Classes="Margin8" DockPanel.Dock="Top">
+                <ContentControl x:Name="conTheme" DockPanel.Dock="Right" />
+                <Menu Margin="0,1">
+                    <MenuItem Padding="8,0">
+                        <MenuItem.Header>
+                            <StackPanel Orientation="Horizontal">
+                                <TextBlock Text="{x:Static resx:ResUI.menuServers}" />
+                            </StackPanel>
+                        </MenuItem.Header>
+                        <MenuItem x:Name="menuAddServerViaClipboard" Header="{x:Static resx:ResUI.menuAddServerViaClipboard}" />
+                        <MenuItem
+                            x:Name="menuAddServerViaScan"
+                            Header="{x:Static resx:ResUI.menuAddServerViaScan}"
+                            IsVisible="False" />
+                        <MenuItem x:Name="menuAddCustomServer" Header="{x:Static resx:ResUI.menuAddCustomServer}" />
+                        <Separator />
+                        <MenuItem x:Name="menuAddVmessServer" Header="{x:Static resx:ResUI.menuAddVmessServer}" />
+                        <MenuItem x:Name="menuAddVlessServer" Header="{x:Static resx:ResUI.menuAddVlessServer}" />
+                        <MenuItem x:Name="menuAddShadowsocksServer" Header="{x:Static resx:ResUI.menuAddShadowsocksServer}" />
+                        <MenuItem x:Name="menuAddSocksServer" Header="{x:Static resx:ResUI.menuAddSocksServer}" />
+                        <MenuItem x:Name="menuAddHttpServer" Header="{x:Static resx:ResUI.menuAddHttpServer}" />
+                        <MenuItem x:Name="menuAddTrojanServer" Header="{x:Static resx:ResUI.menuAddTrojanServer}" />
+                        <Separator />
+                        <MenuItem x:Name="menuAddHysteria2Server" Header="{x:Static resx:ResUI.menuAddHysteria2Server}" />
+                        <MenuItem x:Name="menuAddTuicServer" Header="{x:Static resx:ResUI.menuAddTuicServer}" />
+                        <MenuItem x:Name="menuAddWireguardServer" Header="{x:Static resx:ResUI.menuAddWireguardServer}" />
+                    </MenuItem>
 
-    <DockPanel>
-        <DockPanel Classes="Margin8" DockPanel.Dock="Top">
-            <ContentControl x:Name="conTheme" DockPanel.Dock="Right" />
-            <Menu Margin="0,1">
-                <MenuItem Padding="8,0">
-                    <MenuItem.Header>
-                        <StackPanel Orientation="Horizontal">
-                            <TextBlock Text="{x:Static resx:ResUI.menuServers}" />
-                        </StackPanel>
-                    </MenuItem.Header>
-                    <MenuItem x:Name="menuAddServerViaClipboard" Header="{x:Static resx:ResUI.menuAddServerViaClipboard}" />
-                    <MenuItem
-                        x:Name="menuAddServerViaScan"
-                        Header="{x:Static resx:ResUI.menuAddServerViaScan}"
-                        IsVisible="False" />
-                    <MenuItem x:Name="menuAddCustomServer" Header="{x:Static resx:ResUI.menuAddCustomServer}" />
-                    <Separator />
-                    <MenuItem x:Name="menuAddVmessServer" Header="{x:Static resx:ResUI.menuAddVmessServer}" />
-                    <MenuItem x:Name="menuAddVlessServer" Header="{x:Static resx:ResUI.menuAddVlessServer}" />
-                    <MenuItem x:Name="menuAddShadowsocksServer" Header="{x:Static resx:ResUI.menuAddShadowsocksServer}" />
-                    <MenuItem x:Name="menuAddSocksServer" Header="{x:Static resx:ResUI.menuAddSocksServer}" />
-                    <MenuItem x:Name="menuAddHttpServer" Header="{x:Static resx:ResUI.menuAddHttpServer}" />
-                    <MenuItem x:Name="menuAddTrojanServer" Header="{x:Static resx:ResUI.menuAddTrojanServer}" />
-                    <Separator />
-                    <MenuItem x:Name="menuAddHysteria2Server" Header="{x:Static resx:ResUI.menuAddHysteria2Server}" />
-                    <MenuItem x:Name="menuAddTuicServer" Header="{x:Static resx:ResUI.menuAddTuicServer}" />
-                    <MenuItem x:Name="menuAddWireguardServer" Header="{x:Static resx:ResUI.menuAddWireguardServer}" />
-                </MenuItem>
+                    <MenuItem Padding="8,0">
+                        <MenuItem.Header>
+                            <StackPanel Orientation="Horizontal">
+                                <TextBlock Text="{x:Static resx:ResUI.menuSubscription}" />
+                            </StackPanel>
+                        </MenuItem.Header>
+                        <MenuItem x:Name="menuSubSetting" Header="{x:Static resx:ResUI.menuSubSetting}" />
+                        <Separator />
+                        <MenuItem x:Name="menuSubUpdate" Header="{x:Static resx:ResUI.menuSubUpdate}" />
+                        <MenuItem x:Name="menuSubUpdateViaProxy" Header="{x:Static resx:ResUI.menuSubUpdateViaProxy}" />
+                        <MenuItem x:Name="menuSubGroupUpdate" Header="{x:Static resx:ResUI.menuSubGroupUpdate}" />
+                        <MenuItem x:Name="menuSubGroupUpdateViaProxy" Header="{x:Static resx:ResUI.menuSubGroupUpdateViaProxy}" />
+                    </MenuItem>
 
-                <MenuItem Padding="8,0">
-                    <MenuItem.Header>
-                        <StackPanel Orientation="Horizontal">
-                            <TextBlock Text="{x:Static resx:ResUI.menuSubscription}" />
-                        </StackPanel>
-                    </MenuItem.Header>
-                    <MenuItem x:Name="menuSubSetting" Header="{x:Static resx:ResUI.menuSubSetting}" />
-                    <Separator />
-                    <MenuItem x:Name="menuSubUpdate" Header="{x:Static resx:ResUI.menuSubUpdate}" />
-                    <MenuItem x:Name="menuSubUpdateViaProxy" Header="{x:Static resx:ResUI.menuSubUpdateViaProxy}" />
-                    <MenuItem x:Name="menuSubGroupUpdate" Header="{x:Static resx:ResUI.menuSubGroupUpdate}" />
-                    <MenuItem x:Name="menuSubGroupUpdateViaProxy" Header="{x:Static resx:ResUI.menuSubGroupUpdateViaProxy}" />
-                </MenuItem>
+                    <MenuItem Padding="8,0">
+                        <MenuItem.Header>
+                            <StackPanel Orientation="Horizontal">
+                                <TextBlock Text="{x:Static resx:ResUI.menuSetting}" />
+                            </StackPanel>
+                        </MenuItem.Header>
+                        <MenuItem x:Name="menuOptionSetting" Header="{x:Static resx:ResUI.menuOptionSetting}" />
+                        <MenuItem x:Name="menuRoutingSetting" Header="{x:Static resx:ResUI.menuRoutingSetting}" />
+                        <MenuItem x:Name="menuDNSSetting" Header="{x:Static resx:ResUI.menuDNSSetting}" />
+                        <MenuItem x:Name="menuGlobalHotkeySetting" Header="{x:Static resx:ResUI.menuGlobalHotkeySetting}" />
+                        <Separator />
+                        <MenuItem x:Name="menuRebootAsAdmin" Header="{x:Static resx:ResUI.menuRebootAsAdmin}" />
+                        <MenuItem x:Name="menuSettingsSetUWP" Header="{x:Static resx:ResUI.TbSettingsSetUWP}" />
+                        <MenuItem x:Name="menuClearServerStatistics" Header="{x:Static resx:ResUI.menuClearServerStatistics}" />
+                        <Separator />
+                        <MenuItem x:Name="menuOpenTheFileLocation" Header="{x:Static resx:ResUI.menuOpenTheFileLocation}" />
+                    </MenuItem>
 
-                <MenuItem Padding="8,0">
-                    <MenuItem.Header>
-                        <StackPanel Orientation="Horizontal">
-                            <TextBlock Text="{x:Static resx:ResUI.menuSetting}" />
-                        </StackPanel>
-                    </MenuItem.Header>
-                    <MenuItem x:Name="menuOptionSetting" Header="{x:Static resx:ResUI.menuOptionSetting}" />
-                    <MenuItem x:Name="menuRoutingSetting" Header="{x:Static resx:ResUI.menuRoutingSetting}" />
-                    <MenuItem x:Name="menuDNSSetting" Header="{x:Static resx:ResUI.menuDNSSetting}" />
-                    <MenuItem x:Name="menuGlobalHotkeySetting" Header="{x:Static resx:ResUI.menuGlobalHotkeySetting}" />
-                    <Separator />
-                    <MenuItem x:Name="menuRebootAsAdmin" Header="{x:Static resx:ResUI.menuRebootAsAdmin}" />
-                    <MenuItem x:Name="menuSettingsSetUWP" Header="{x:Static resx:ResUI.TbSettingsSetUWP}" />
-                    <MenuItem x:Name="menuClearServerStatistics" Header="{x:Static resx:ResUI.menuClearServerStatistics}" />
-                    <Separator />
-                    <MenuItem x:Name="menuOpenTheFileLocation" Header="{x:Static resx:ResUI.menuOpenTheFileLocation}" />
-                </MenuItem>
+                    <MenuItem x:Name="menuReload" Padding="8,0">
+                        <MenuItem.Header>
+                            <StackPanel Orientation="Horizontal">
+                                <TextBlock Text="{x:Static resx:ResUI.menuReload}" />
+                            </StackPanel>
+                        </MenuItem.Header>
+                    </MenuItem>
 
-                <MenuItem x:Name="menuReload" Padding="8,0">
-                    <MenuItem.Header>
-                        <StackPanel Orientation="Horizontal">
-                            <TextBlock Text="{x:Static resx:ResUI.menuReload}" />
-                        </StackPanel>
-                    </MenuItem.Header>
-                </MenuItem>
+                    <MenuItem Padding="8,0">
+                        <MenuItem.Header>
+                            <ContentControl x:Name="conCheckUpdate" />
+                        </MenuItem.Header>
+                    </MenuItem>
 
-                <MenuItem Padding="8,0">
-                    <MenuItem.Header>
-                        <ContentControl x:Name="conCheckUpdate" />
-                    </MenuItem.Header>
-                </MenuItem>
+                    <MenuItem x:Name="menuHelp" Padding="8,0">
+                        <MenuItem.Header>
+                            <StackPanel Orientation="Horizontal">
+                                <TextBlock Text="{x:Static resx:ResUI.menuHelp}" />
+                            </StackPanel>
+                        </MenuItem.Header>
+                    </MenuItem>
 
-                <MenuItem x:Name="menuHelp" Padding="8,0">
-                    <MenuItem.Header>
-                        <StackPanel Orientation="Horizontal">
-                            <TextBlock Text="{x:Static resx:ResUI.menuHelp}" />
-                        </StackPanel>
-                    </MenuItem.Header>
-                </MenuItem>
+                    <MenuItem x:Name="menuPromotion" Padding="8,0">
+                        <MenuItem.Header>
+                            <StackPanel Orientation="Horizontal">
+                                <TextBlock Text="{x:Static resx:ResUI.menuPromotion}" />
+                            </StackPanel>
+                        </MenuItem.Header>
+                    </MenuItem>
 
-                <MenuItem x:Name="menuPromotion" Padding="8,0">
-                    <MenuItem.Header>
-                        <StackPanel Orientation="Horizontal">
-                            <TextBlock Text="{x:Static resx:ResUI.menuPromotion}" />
-                        </StackPanel>
-                    </MenuItem.Header>
-                </MenuItem>
-
-                <MenuItem x:Name="menuClose" Padding="8,0">
-                    <MenuItem.Header>
-                        <StackPanel Orientation="Horizontal">
-                            <TextBlock Text="{x:Static resx:ResUI.menuClose}" />
-                        </StackPanel>
-                    </MenuItem.Header>
-                </MenuItem>
-            </Menu>
-        </DockPanel>
-
-        <StackPanel Height="50" DockPanel.Dock="Bottom">
-            <DockPanel>
-                <StackPanel
-                    Margin="8,0"
-                    VerticalAlignment="Center"
-                    DockPanel.Dock="Right">
-                    <TextBlock x:Name="txtSpeedProxyDisplay" />
-                    <Border Margin="2" />
-                    <TextBlock x:Name="txtSpeedDirectDisplay" />
-                </StackPanel>
-
-                <StackPanel
-                    Width="240"
-                    Margin="8,0"
-                    VerticalAlignment="Center"
-                    DockPanel.Dock="Left">
-                    <TextBlock x:Name="txtInboundDisplay" />
-                    <Border Margin="2" />
-                    <TextBlock x:Name="txtInboundLanDisplay" />
-                </StackPanel>
-
-                <StackPanel
-                    x:Name="spEnableTun"
-                    Width="100"
-                    Margin="8,0"
-                    VerticalAlignment="Center"
-                    DockPanel.Dock="Left">
-                    <TextBlock Text="{x:Static resx:ResUI.TbEnableTunAs}" />
-                    <ToggleSwitch
-                        x:Name="togEnableTun"
-                        HorizontalAlignment="Left"
-                        Classes="Margin8"
-                        Theme="{StaticResource SimpleToggleSwitch}" />
-                </StackPanel>
-
-                <StackPanel
-                    Margin="8,0"
-                    VerticalAlignment="Center"
-                    DockPanel.Dock="Left"
-                    Orientation="Horizontal">
-                    <ComboBox
-                        x:Name="cmbSystemProxy"
-                        Width="120"
-                        Margin="8,0"
-                        ToolTip.Tip="{x:Static resx:ResUI.menuSystemproxy}">
-                        <ComboBoxItem Content="{x:Static resx:ResUI.menuSystemProxyClear}" />
-                        <ComboBoxItem Content="{x:Static resx:ResUI.menuSystemProxySet}" />
-                        <ComboBoxItem Content="{x:Static resx:ResUI.menuSystemProxyNothing}" />
-                    </ComboBox>
-
-                    <ComboBox
-                        x:Name="cmbRoutings2"
-                        Width="150"
-                        Margin="8,0"
-                        DisplayMemberBinding="{Binding remarks}"
-                        ItemsSource="{Binding RoutingItems}"
-                        ToolTip.Tip="{x:Static resx:ResUI.menuRouting}" />
-                </StackPanel>
-
-                <StackPanel Margin="8,0" VerticalAlignment="Center">
-                    <TextBlock x:Name="txtRunningServerDisplay" Tapped="TxtRunningServerDisplay_Tapped" />
-                    <Border Margin="2" />
-                    <TextBlock x:Name="txtRunningInfoDisplay" Tapped="TxtRunningServerDisplay_Tapped" />
-                </StackPanel>
+                    <MenuItem x:Name="menuClose" Padding="8,0">
+                        <MenuItem.Header>
+                            <StackPanel Orientation="Horizontal">
+                                <TextBlock Text="{x:Static resx:ResUI.menuClose}" />
+                            </StackPanel>
+                        </MenuItem.Header>
+                    </MenuItem>
+                </Menu>
             </DockPanel>
-        </StackPanel>
 
-        <Grid>
-            <Grid x:Name="gridMain" IsVisible="False">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="1*" />
-                    <ColumnDefinition Width="10" />
-                    <ColumnDefinition Width="1*" />
-                </Grid.ColumnDefinitions>
-                <ContentControl x:Name="tabProfiles" Grid.Column="0" />
-                <GridSplitter Grid.Column="1" HorizontalAlignment="Stretch" />
-                <TabControl
-                    x:Name="tabMain"
-                    Grid.Column="2"
-                    HorizontalContentAlignment="Left">
-                    <TabItem x:Name="tabMsgView" Header="{x:Static resx:ResUI.MsgInformationTitle}" />
-                    <TabItem x:Name="tabClashProxies" Header="{x:Static resx:ResUI.TbProxies}" />
-                    <TabItem x:Name="tabClashConnections" Header="{x:Static resx:ResUI.TbConnections}" />
-                </TabControl>
-            </Grid>
-            <Grid x:Name="gridMain1" IsVisible="False">
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="1*" />
-                    <RowDefinition Height="10" />
-                    <RowDefinition Height="1*" />
-                </Grid.RowDefinitions>
-                <ContentControl x:Name="tabProfiles1" Grid.Row="0" />
-                <GridSplitter Grid.Row="1" HorizontalAlignment="Stretch" />
-                <TabControl
-                    x:Name="tabMain1"
-                    Grid.Row="2"
-                    TabStripPlacement="Left">
-                    <TabItem x:Name="tabMsgView1">
-                        <TabItem.Header>
-                            <StackPanel>
+            <StackPanel Height="50" DockPanel.Dock="Bottom">
+                <DockPanel>
+                    <StackPanel
+                        Margin="8,0"
+                        VerticalAlignment="Center"
+                        DockPanel.Dock="Right">
+                        <TextBlock x:Name="txtSpeedProxyDisplay" />
+                        <Border Margin="2" />
+                        <TextBlock x:Name="txtSpeedDirectDisplay" />
+                    </StackPanel>
 
-                                <TextBlock HorizontalAlignment="Center" Text="{x:Static resx:ResUI.MsgInformationTitle}" />
-                            </StackPanel>
-                        </TabItem.Header>
-                    </TabItem>
-                    <TabItem x:Name="tabClashProxies1">
-                        <TabItem.Header>
-                            <StackPanel>
+                    <StackPanel
+                        Width="240"
+                        Margin="8,0"
+                        VerticalAlignment="Center"
+                        DockPanel.Dock="Left">
+                        <TextBlock x:Name="txtInboundDisplay" />
+                        <Border Margin="2" />
+                        <TextBlock x:Name="txtInboundLanDisplay" />
+                    </StackPanel>
 
-                                <TextBlock HorizontalAlignment="Center" Text="{x:Static resx:ResUI.TbProxies}" />
-                            </StackPanel>
-                        </TabItem.Header>
-                    </TabItem>
-                    <TabItem x:Name="tabClashConnections1">
-                        <TabItem.Header>
-                            <StackPanel>
+                    <StackPanel
+                        x:Name="spEnableTun"
+                        Width="100"
+                        Margin="8,0"
+                        VerticalAlignment="Center"
+                        DockPanel.Dock="Left">
+                        <TextBlock Text="{x:Static resx:ResUI.TbEnableTunAs}" />
+                        <ToggleSwitch
+                            x:Name="togEnableTun"
+                            HorizontalAlignment="Left"
+                            Classes="Margin8"
+                            Theme="{StaticResource SimpleToggleSwitch}" />
+                    </StackPanel>
 
-                                <TextBlock HorizontalAlignment="Center" Text="{x:Static resx:ResUI.TbConnections}" />
-                            </StackPanel>
-                        </TabItem.Header>
-                    </TabItem>
-                </TabControl>
-            </Grid>
-            <Grid x:Name="gridMain2" IsVisible="False">
-                <TabControl x:Name="tabMain2" TabStripPlacement="Left">
-                    <TabItem x:Name="tabProfiles2">
-                        <TabItem.Header>
-                            <StackPanel>
+                    <StackPanel
+                        Margin="8,0"
+                        VerticalAlignment="Center"
+                        DockPanel.Dock="Left"
+                        Orientation="Horizontal">
+                        <ComboBox
+                            x:Name="cmbSystemProxy"
+                            Width="120"
+                            Margin="8,0"
+                            ToolTip.Tip="{x:Static resx:ResUI.menuSystemproxy}">
+                            <ComboBoxItem Content="{x:Static resx:ResUI.menuSystemProxyClear}" />
+                            <ComboBoxItem Content="{x:Static resx:ResUI.menuSystemProxySet}" />
+                            <ComboBoxItem Content="{x:Static resx:ResUI.menuSystemProxyNothing}" />
+                        </ComboBox>
 
-                                <TextBlock HorizontalAlignment="Center" Text="{x:Static resx:ResUI.menuServers}" />
-                            </StackPanel>
-                        </TabItem.Header>
-                    </TabItem>
-                    <TabItem x:Name="tabMsgView2">
-                        <TabItem.Header>
-                            <StackPanel>
+                        <ComboBox
+                            x:Name="cmbRoutings2"
+                            Width="150"
+                            Margin="8,0"
+                            DisplayMemberBinding="{Binding remarks}"
+                            ItemsSource="{Binding RoutingItems}"
+                            ToolTip.Tip="{x:Static resx:ResUI.menuRouting}" />
+                    </StackPanel>
 
-                                <TextBlock HorizontalAlignment="Center" Text="{x:Static resx:ResUI.MsgInformationTitle}" />
-                            </StackPanel>
-                        </TabItem.Header>
-                    </TabItem>
-                    <TabItem x:Name="tabClashProxies2">
-                        <TabItem.Header>
-                            <StackPanel>
+                    <StackPanel Margin="8,0" VerticalAlignment="Center">
+                        <TextBlock x:Name="txtRunningServerDisplay" Tapped="TxtRunningServerDisplay_Tapped" />
+                        <Border Margin="2" />
+                        <TextBlock x:Name="txtRunningInfoDisplay" Tapped="TxtRunningServerDisplay_Tapped" />
+                    </StackPanel>
+                </DockPanel>
+            </StackPanel>
 
-                                <TextBlock HorizontalAlignment="Center" Text="{x:Static resx:ResUI.TbProxies}" />
-                            </StackPanel>
-                        </TabItem.Header>
-                    </TabItem>
-                    <TabItem x:Name="tabClashConnections2">
-                        <TabItem.Header>
-                            <StackPanel>
+            <Grid>
+                <Grid x:Name="gridMain" IsVisible="False">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="1*" />
+                        <ColumnDefinition Width="10" />
+                        <ColumnDefinition Width="1*" />
+                    </Grid.ColumnDefinitions>
+                    <ContentControl x:Name="tabProfiles" Grid.Column="0" />
+                    <GridSplitter Grid.Column="1" HorizontalAlignment="Stretch" />
+                    <TabControl
+                        x:Name="tabMain"
+                        Grid.Column="2"
+                        HorizontalContentAlignment="Left">
+                        <TabItem x:Name="tabMsgView" Header="{x:Static resx:ResUI.MsgInformationTitle}" />
+                        <TabItem x:Name="tabClashProxies" Header="{x:Static resx:ResUI.TbProxies}" />
+                        <TabItem x:Name="tabClashConnections" Header="{x:Static resx:ResUI.TbConnections}" />
+                    </TabControl>
+                </Grid>
+                <Grid x:Name="gridMain1" IsVisible="False">
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="1*" />
+                        <RowDefinition Height="10" />
+                        <RowDefinition Height="1*" />
+                    </Grid.RowDefinitions>
+                    <ContentControl x:Name="tabProfiles1" Grid.Row="0" />
+                    <GridSplitter Grid.Row="1" HorizontalAlignment="Stretch" />
+                    <TabControl
+                        x:Name="tabMain1"
+                        Grid.Row="2"
+                        TabStripPlacement="Left">
+                        <TabItem x:Name="tabMsgView1">
+                            <TabItem.Header>
+                                <StackPanel>
+
+                                    <TextBlock HorizontalAlignment="Center" Text="{x:Static resx:ResUI.MsgInformationTitle}" />
+                                </StackPanel>
+                            </TabItem.Header>
+                        </TabItem>
+                        <TabItem x:Name="tabClashProxies1">
+                            <TabItem.Header>
+                                <StackPanel>
+
+                                    <TextBlock HorizontalAlignment="Center" Text="{x:Static resx:ResUI.TbProxies}" />
+                                </StackPanel>
+                            </TabItem.Header>
+                        </TabItem>
+                        <TabItem x:Name="tabClashConnections1">
+                            <TabItem.Header>
+                                <StackPanel>
+
+                                    <TextBlock HorizontalAlignment="Center" Text="{x:Static resx:ResUI.TbConnections}" />
+                                </StackPanel>
+                            </TabItem.Header>
+                        </TabItem>
+                    </TabControl>
+                </Grid>
+                <Grid x:Name="gridMain2" IsVisible="False">
+                    <TabControl x:Name="tabMain2" TabStripPlacement="Left">
+                        <TabItem x:Name="tabProfiles2">
+                            <TabItem.Header>
+                                <StackPanel>
+
+                                    <TextBlock HorizontalAlignment="Center" Text="{x:Static resx:ResUI.menuServers}" />
+                                </StackPanel>
+                            </TabItem.Header>
+                        </TabItem>
+                        <TabItem x:Name="tabMsgView2">
+                            <TabItem.Header>
+                                <StackPanel>
+
+                                    <TextBlock HorizontalAlignment="Center" Text="{x:Static resx:ResUI.MsgInformationTitle}" />
+                                </StackPanel>
+                            </TabItem.Header>
+                        </TabItem>
+                        <TabItem x:Name="tabClashProxies2">
+                            <TabItem.Header>
+                                <StackPanel>
+
+                                    <TextBlock HorizontalAlignment="Center" Text="{x:Static resx:ResUI.TbProxies}" />
+                                </StackPanel>
+                            </TabItem.Header>
+                        </TabItem>
+                        <TabItem x:Name="tabClashConnections2">
+                            <TabItem.Header>
+                                <StackPanel>
+
+                                    <TextBlock HorizontalAlignment="Center" Text="{x:Static resx:ResUI.TbConnections}" />
+                                </StackPanel>
+                            </TabItem.Header>
+                        </TabItem>
+                    </TabControl>
+                </Grid>
 
-                                <TextBlock HorizontalAlignment="Center" Text="{x:Static resx:ResUI.TbConnections}" />
-                            </StackPanel>
-                        </TabItem.Header>
-                    </TabItem>
-                </TabControl>
             </Grid>
 
-        </Grid>
-
-    </DockPanel>
-
+        </DockPanel>
+    </dialogHost:DialogHost>
 </Window>
\ No newline at end of file
diff --git a/v2rayN/v2rayN.Desktop/Views/ProfilesView.axaml.cs b/v2rayN/v2rayN.Desktop/Views/ProfilesView.axaml.cs
index 4df3854f..ed9a34d7 100644
--- a/v2rayN/v2rayN.Desktop/Views/ProfilesView.axaml.cs
+++ b/v2rayN/v2rayN.Desktop/Views/ProfilesView.axaml.cs
@@ -3,6 +3,7 @@ using Avalonia.Input;
 using Avalonia.Interactivity;
 using Avalonia.ReactiveUI;
 using Avalonia.Threading;
+using DialogHostAvalonia;
 using MsBox.Avalonia.Enums;
 using ReactiveUI;
 using Splat;
@@ -88,7 +89,7 @@ namespace v2rayN.Desktop.Views
 
             RestoreUI();
             ViewModel?.RefreshServers();
-        }         
+        }
 
         //#region Event
 
@@ -170,8 +171,9 @@ namespace v2rayN.Desktop.Views
             {
                 return;
             }
+
             var dialog = new QrcodeView(url);
-            await dialog.ShowDialog(_window);
+            await DialogHost.Show(dialog);
         }
 
         private void lstProfiles_SelectionChanged(object? sender, SelectionChangedEventArgs e)
diff --git a/v2rayN/v2rayN.Desktop/Views/QrcodeView.axaml b/v2rayN/v2rayN.Desktop/Views/QrcodeView.axaml
index 2f92209a..aefd7619 100644
--- a/v2rayN/v2rayN.Desktop/Views/QrcodeView.axaml
+++ b/v2rayN/v2rayN.Desktop/Views/QrcodeView.axaml
@@ -1,25 +1,17 @@
-<Window
+<UserControl
     x:Class="v2rayN.Desktop.Views.QrcodeView"
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:resx="clr-namespace:ServiceLib.Resx;assembly=ServiceLib"
-    Title=""
-    Width="400"
-    Height="480"
     d:DesignHeight="480"
     d:DesignWidth="400"
-    ExtendClientAreaChromeHints="NoChrome"
-    ExtendClientAreaToDecorationsHint="True"
-    ShowInTaskbar="False"
-    WindowStartupLocation="CenterOwner"
     mc:Ignorable="d">
     <Grid Margin="30">
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto" />
             <RowDefinition Height="Auto" />
-            <RowDefinition Height="60" />
         </Grid.RowDefinitions>
 
         <Image
@@ -37,12 +29,6 @@
             IsReadOnly="True"
             MaxLines="1" />
 
-        <Button
-            x:Name="btnCancel"
-            Grid.Row="2"
-            Width="100"
-            HorizontalAlignment="Right"
-            Classes="Margin8"
-            Content="{x:Static resx:ResUI.TbConfirm}" />
+ 
     </Grid>
-</Window>
\ No newline at end of file
+</UserControl>
\ No newline at end of file
diff --git a/v2rayN/v2rayN.Desktop/Views/QrcodeView.axaml.cs b/v2rayN/v2rayN.Desktop/Views/QrcodeView.axaml.cs
index e9f18f90..15ba0357 100644
--- a/v2rayN/v2rayN.Desktop/Views/QrcodeView.axaml.cs
+++ b/v2rayN/v2rayN.Desktop/Views/QrcodeView.axaml.cs
@@ -3,7 +3,7 @@ using Avalonia.Media.Imaging;
 
 namespace v2rayN.Desktop.Views
 {
-    public partial class QrcodeView : Window
+    public partial class QrcodeView : UserControl
     {
         public QrcodeView(string? url)
         {
@@ -12,7 +12,7 @@ namespace v2rayN.Desktop.Views
             txtContent.Text = url;
             imgQrcode.Source = GetQRCode(url);
 
-            btnCancel.Click += (s, e) => this.Close();
+          //  btnCancel.Click += (s, e) => this.Close();
         }
 
         private Bitmap? GetQRCode(string? url)
diff --git a/v2rayN/v2rayN.Desktop/Views/SubSettingWindow.axaml b/v2rayN/v2rayN.Desktop/Views/SubSettingWindow.axaml
index 929ca75c..23974c14 100644
--- a/v2rayN/v2rayN.Desktop/Views/SubSettingWindow.axaml
+++ b/v2rayN/v2rayN.Desktop/Views/SubSettingWindow.axaml
@@ -3,6 +3,7 @@
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:dialogHost="clr-namespace:DialogHostAvalonia;assembly=DialogHost.Avalonia"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:resx="clr-namespace:ServiceLib.Resx;assembly=ServiceLib"
     xmlns:vms="clr-namespace:ServiceLib.ViewModels;assembly=ServiceLib"
@@ -15,58 +16,64 @@
     ShowInTaskbar="False"
     WindowStartupLocation="CenterScreen"
     mc:Ignorable="d">
-    <DockPanel Classes="Margin8">
-        <StackPanel
-            Classes="Margin8"
-            DockPanel.Dock="Top"
-            Orientation="Horizontal">
-            <Menu>
-                <MenuItem x:Name="menuSubAdd" Header="{x:Static resx:ResUI.menuSubAdd}" />
-                <MenuItem x:Name="menuSubDelete" Header="{x:Static resx:ResUI.menuSubDelete}" />
-                <MenuItem x:Name="menuSubEdit" Header="{x:Static resx:ResUI.menuSubEdit}" />
-                <MenuItem x:Name="menuSubShare" Header="{x:Static resx:ResUI.menuSubShare}" />
-                <MenuItem x:Name="menuClose" Header="{x:Static resx:ResUI.menuClose}" />
-            </Menu>
-        </StackPanel>
+    <dialogHost:DialogHost
+        Background="Gray"
+        CloseOnClickAway="True"
+        DisableOpeningAnimation="True"
+        Identifier="dialogHostSub">
+        <DockPanel Classes="Margin8">
+            <StackPanel
+                Classes="Margin8"
+                DockPanel.Dock="Top"
+                Orientation="Horizontal">
+                <Menu>
+                    <MenuItem x:Name="menuSubAdd" Header="{x:Static resx:ResUI.menuSubAdd}" />
+                    <MenuItem x:Name="menuSubDelete" Header="{x:Static resx:ResUI.menuSubDelete}" />
+                    <MenuItem x:Name="menuSubEdit" Header="{x:Static resx:ResUI.menuSubEdit}" />
+                    <MenuItem x:Name="menuSubShare" Header="{x:Static resx:ResUI.menuSubShare}" />
+                    <MenuItem x:Name="menuClose" Header="{x:Static resx:ResUI.menuClose}" />
+                </Menu>
+            </StackPanel>
 
-        <DataGrid
-            x:Name="lstSubscription"
-            AutoGenerateColumns="False"
-            BorderThickness="1"
-            CanUserResizeColumns="True"
-            GridLinesVisibility="All"
-            HeadersVisibility="Column"
-            IsReadOnly="True"
-            ItemsSource="{Binding SubItems}">
-            <DataGrid.KeyBindings>
-                <KeyBinding Command="{Binding SubDeleteCmd}" Gesture="Delete" />
-            </DataGrid.KeyBindings>
-            <DataGrid.Columns>
-                <DataGridTextColumn
-                    Width="120"
-                    Binding="{Binding remarks}"
-                    Header="{x:Static resx:ResUI.LvRemarks}" />
-                <DataGridTextColumn
-                    Width="150"
-                    Binding="{Binding url}"
-                    Header="{x:Static resx:ResUI.LvUrl}" />
-				<DataGridCheckBoxColumn
-                    Width="100"
-                    Binding="{Binding enabled}"
-                    Header="{x:Static resx:ResUI.LvEnabled}" />
-                <DataGridTextColumn
-                    Width="150"
-                    Binding="{Binding autoUpdateInterval}"
-                    Header="{x:Static resx:ResUI.LvAutoUpdateInterval}" />
-                <DataGridTextColumn
-                    Width="150"
-                    Binding="{Binding userAgent}"
-                    Header="{x:Static resx:ResUI.LvUserAgent}" />
-                <DataGridTextColumn
-                    Width="80"
-                    Binding="{Binding sort}"
-                    Header="{x:Static resx:ResUI.LvSort}" />
-            </DataGrid.Columns>
-        </DataGrid>
-    </DockPanel>
+            <DataGrid
+                x:Name="lstSubscription"
+                AutoGenerateColumns="False"
+                BorderThickness="1"
+                CanUserResizeColumns="True"
+                GridLinesVisibility="All"
+                HeadersVisibility="Column"
+                IsReadOnly="True"
+                ItemsSource="{Binding SubItems}">
+                <DataGrid.KeyBindings>
+                    <KeyBinding Command="{Binding SubDeleteCmd}" Gesture="Delete" />
+                </DataGrid.KeyBindings>
+                <DataGrid.Columns>
+                    <DataGridTextColumn
+                        Width="120"
+                        Binding="{Binding remarks}"
+                        Header="{x:Static resx:ResUI.LvRemarks}" />
+                    <DataGridTextColumn
+                        Width="150"
+                        Binding="{Binding url}"
+                        Header="{x:Static resx:ResUI.LvUrl}" />
+                    <DataGridCheckBoxColumn
+                        Width="100"
+                        Binding="{Binding enabled}"
+                        Header="{x:Static resx:ResUI.LvEnabled}" />
+                    <DataGridTextColumn
+                        Width="150"
+                        Binding="{Binding autoUpdateInterval}"
+                        Header="{x:Static resx:ResUI.LvAutoUpdateInterval}" />
+                    <DataGridTextColumn
+                        Width="150"
+                        Binding="{Binding userAgent}"
+                        Header="{x:Static resx:ResUI.LvUserAgent}" />
+                    <DataGridTextColumn
+                        Width="80"
+                        Binding="{Binding sort}"
+                        Header="{x:Static resx:ResUI.LvSort}" />
+                </DataGrid.Columns>
+            </DataGrid>
+        </DockPanel>
+    </dialogHost:DialogHost>
 </Window>
\ No newline at end of file
diff --git a/v2rayN/v2rayN.Desktop/Views/SubSettingWindow.axaml.cs b/v2rayN/v2rayN.Desktop/Views/SubSettingWindow.axaml.cs
index 9cd62245..7a9aad66 100644
--- a/v2rayN/v2rayN.Desktop/Views/SubSettingWindow.axaml.cs
+++ b/v2rayN/v2rayN.Desktop/Views/SubSettingWindow.axaml.cs
@@ -1,6 +1,7 @@
 using Avalonia.Controls;
 using Avalonia.Interactivity;
 using Avalonia.ReactiveUI;
+using DialogHostAvalonia;
 using DynamicData;
 using MsBox.Avalonia.Enums;
 using ReactiveUI;
@@ -71,7 +72,7 @@ namespace v2rayN.Desktop.Views
                 return;
             }
             var dialog = new QrcodeView(url);
-            await dialog.ShowDialog(this);
+            await DialogHost.Show(dialog, "dialogHostSub");
         }
 
         private void LstSubscription_DoubleTapped(object? sender, Avalonia.Input.TappedEventArgs e)
diff --git a/v2rayN/v2rayN.Desktop/v2rayN.Desktop.csproj b/v2rayN/v2rayN.Desktop/v2rayN.Desktop.csproj
index 1eda6990..02497df6 100644
--- a/v2rayN/v2rayN.Desktop/v2rayN.Desktop.csproj
+++ b/v2rayN/v2rayN.Desktop/v2rayN.Desktop.csproj
@@ -24,6 +24,7 @@
         <PackageReference Include="Avalonia.Fonts.Inter" Version="11.1.3" />
         <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.1.3" />
         <PackageReference Include="Avalonia.ReactiveUI" Version="11.1.3" />
+        <PackageReference Include="DialogHost.Avalonia" Version="0.8.1" />
         <PackageReference Include="MessageBox.Avalonia" Version="3.1.6" />		
         <PackageReference Include="Semi.Avalonia" Version="11.1.0.4" />
         <PackageReference Include="Semi.Avalonia.DataGrid" Version="11.1.0.4" />