mirror of
https://github.com/2dust/v2rayN.git
synced 2025-08-29 14:26:20 +00:00
Removed unnecessary "Close" button
This commit is contained in:
parent
3c2da0a225
commit
5e17769128
10 changed files with 0 additions and 71 deletions
9
v2rayN/v2rayN/Resx/ResUI.Designer.cs
generated
9
v2rayN/v2rayN/Resx/ResUI.Designer.cs
generated
|
@ -672,15 +672,6 @@ namespace v2rayN.Resx {
|
|||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 查找类似 Close 的本地化字符串。
|
||||
/// </summary>
|
||||
public static string menuClose {
|
||||
get {
|
||||
return ResourceManager.GetString("menuClose", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 查找类似 Clone selected server 的本地化字符串。
|
||||
/// </summary>
|
||||
|
|
|
@ -436,9 +436,6 @@
|
|||
<data name="menuCheckUpdate" xml:space="preserve">
|
||||
<value>بررسی بروزرسانی</value>
|
||||
</data>
|
||||
<data name="menuClose" xml:space="preserve">
|
||||
<value>بستن</value>
|
||||
</data>
|
||||
<data name="menuExit" xml:space="preserve">
|
||||
<value>خروج</value>
|
||||
</data>
|
||||
|
|
|
@ -436,9 +436,6 @@
|
|||
<data name="menuCheckUpdate" xml:space="preserve">
|
||||
<value>Check Update</value>
|
||||
</data>
|
||||
<data name="menuClose" xml:space="preserve">
|
||||
<value>Close</value>
|
||||
</data>
|
||||
<data name="menuExit" xml:space="preserve">
|
||||
<value>Exit</value>
|
||||
</data>
|
||||
|
|
|
@ -436,9 +436,6 @@
|
|||
<data name="menuCheckUpdate" xml:space="preserve">
|
||||
<value>Проверить обновления</value>
|
||||
</data>
|
||||
<data name="menuClose" xml:space="preserve">
|
||||
<value>Закрыть</value>
|
||||
</data>
|
||||
<data name="menuExit" xml:space="preserve">
|
||||
<value>Выход</value>
|
||||
</data>
|
||||
|
|
|
@ -436,9 +436,6 @@
|
|||
<data name="menuCheckUpdate" xml:space="preserve">
|
||||
<value>检查更新</value>
|
||||
</data>
|
||||
<data name="menuClose" xml:space="preserve">
|
||||
<value>关闭</value>
|
||||
</data>
|
||||
<data name="menuExit" xml:space="preserve">
|
||||
<value>退出</value>
|
||||
</data>
|
||||
|
|
|
@ -435,9 +435,6 @@
|
|||
<data name="menuCheckUpdate" xml:space="preserve">
|
||||
<value>檢查更新</value>
|
||||
</data>
|
||||
<data name="menuClose" xml:space="preserve">
|
||||
<value>關閉</value>
|
||||
</data>
|
||||
<data name="menuExit" xml:space="preserve">
|
||||
<value>退出</value>
|
||||
</data>
|
||||
|
|
|
@ -272,23 +272,6 @@
|
|||
</MenuItem.Header>
|
||||
</MenuItem>
|
||||
</Menu>
|
||||
<Separator />
|
||||
<Menu Margin="0,1" Style="{StaticResource ToolbarMenu}">
|
||||
<MenuItem
|
||||
x:Name="menuClose"
|
||||
Padding="8,0"
|
||||
Click="menuClose_Click">
|
||||
<MenuItem.Header>
|
||||
<StackPanel Orientation="Horizontal">
|
||||
<materialDesign:PackIcon
|
||||
Margin="0,0,8,0"
|
||||
VerticalAlignment="Center"
|
||||
Kind="Minimize" />
|
||||
<TextBlock Text="{x:Static resx:ResUI.menuClose}" />
|
||||
</StackPanel>
|
||||
</MenuItem.Header>
|
||||
</MenuItem>
|
||||
</Menu>
|
||||
|
||||
<materialDesign:PopupBox
|
||||
Padding="8,0"
|
||||
|
|
|
@ -410,12 +410,6 @@ namespace v2rayN.Views
|
|||
}
|
||||
}
|
||||
|
||||
private void menuClose_Click(object sender, RoutedEventArgs e)
|
||||
{
|
||||
StorageUI();
|
||||
ViewModel?.ShowHideWindow(false);
|
||||
}
|
||||
|
||||
private void menuPromotion_Click(object sender, RoutedEventArgs e)
|
||||
{
|
||||
Utils.ProcessStart($"{Utils.Base64Decode(Global.PromotionUrl)}?t={DateTime.Now.Ticks}");
|
||||
|
|
|
@ -70,18 +70,6 @@
|
|||
<TextBlock Style="{StaticResource ToolbarTextBlock}" Text="{x:Static resx:ResUI.menuSubShare}" />
|
||||
</StackPanel>
|
||||
</Button>
|
||||
<Button
|
||||
x:Name="menuClose"
|
||||
Click="menuClose_Click"
|
||||
IsCancel="True">
|
||||
<StackPanel Orientation="Horizontal">
|
||||
<materialDesign:PackIcon
|
||||
Margin="0,0,8,0"
|
||||
VerticalAlignment="Center"
|
||||
Kind="Close" />
|
||||
<TextBlock Style="{StaticResource ToolbarTextBlock}" Text="{x:Static resx:ResUI.menuClose}" />
|
||||
</StackPanel>
|
||||
</Button>
|
||||
</ToolBar>
|
||||
</ToolBarTray>
|
||||
|
||||
|
|
|
@ -60,17 +60,5 @@ namespace v2rayN.Views
|
|||
{
|
||||
ViewModel.SelectedSources = lstSubscription.SelectedItems.Cast<SubItem>().ToList();
|
||||
}
|
||||
|
||||
private void menuClose_Click(object sender, System.Windows.RoutedEventArgs e)
|
||||
{
|
||||
if (ViewModel?.IsModified == true)
|
||||
{
|
||||
this.DialogResult = true;
|
||||
}
|
||||
else
|
||||
{
|
||||
this.Close();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
Loading…
Reference in a new issue