mirror of
https://github.com/2dust/v2rayN.git
synced 2025-10-23 00:34:41 +00:00
Optimize the desktop version icon
This commit is contained in:
2dust
parent
07e173eab1
commit
6a19896915
11 changed files with 65 additions and 79 deletions
|
|
@ -9,13 +9,6 @@
|
|||
Name="v2rayN"
|
||||
x:DataType="vms:StatusBarViewModel"
|
||||
RequestedThemeVariant="Default">
|
||||
<Application.Styles>
|
||||
<semi:SemiTheme />
|
||||
<semi:AvaloniaEditSemiTheme />
|
||||
<StyleInclude Source="Assets/GlobalStyles.axaml" />
|
||||
<StyleInclude Source="avares://Semi.Avalonia.DataGrid/Index.axaml" />
|
||||
<dialogHost:DialogHostStyles />
|
||||
</Application.Styles>
|
||||
<Application.Resources>
|
||||
<ResourceDictionary>
|
||||
<ResourceDictionary.MergedDictionaries>
|
||||
|
|
@ -23,6 +16,13 @@
|
|||
</ResourceDictionary.MergedDictionaries>
|
||||
</ResourceDictionary>
|
||||
</Application.Resources>
|
||||
<Application.Styles>
|
||||
<semi:SemiTheme />
|
||||
<semi:AvaloniaEditSemiTheme />
|
||||
<StyleInclude Source="Assets/GlobalStyles.axaml" />
|
||||
<StyleInclude Source="avares://Semi.Avalonia.DataGrid/Index.axaml" />
|
||||
<dialogHost:DialogHostStyles />
|
||||
</Application.Styles>
|
||||
|
||||
<TrayIcon.Icons>
|
||||
<TrayIcons>
|
||||
|
|
|
|||
|
|
@ -13,6 +13,7 @@
|
|||
<Style Selector="PathIcon">
|
||||
<Setter Property="Width" Value="16" />
|
||||
<Setter Property="Height" Value="16" />
|
||||
<Setter Property="Foreground" Value="{DynamicResource ButtonDefaultTertiaryForeground}" />
|
||||
</Style>
|
||||
|
||||
<Style Selector="TextBox">
|
||||
|
|
@ -26,4 +27,12 @@
|
|||
<Style Selector="TabControl">
|
||||
<Setter Property="Theme" Value="{StaticResource LineTabControl}" />
|
||||
</Style>
|
||||
|
||||
<Style Selector="Button.IconButton">
|
||||
<Setter Property="Width" Value="{StaticResource IconButtonWidth}" />
|
||||
<Setter Property="Height" Value="{StaticResource IconButtonHeight}" />
|
||||
<Setter Property="MinWidth" Value="{StaticResource IconButtonWidth}" />
|
||||
<Setter Property="Theme" Value="{DynamicResource BorderlessButton}" />
|
||||
</Style>
|
||||
|
||||
</Styles>
|
||||
|
|
|
|||
|
|
@ -607,12 +607,14 @@
|
|||
|
||||
<Button
|
||||
x:Name="btnExtra"
|
||||
Width="{StaticResource IconButtonWidth}"
|
||||
Height="{StaticResource IconButtonHeight}"
|
||||
Margin="{StaticResource MarginLr8}"
|
||||
Theme="{DynamicResource BorderlessButton}">
|
||||
Classes="IconButton"
|
||||
Margin="{StaticResource MarginLr8}">
|
||||
<Button.Content>
|
||||
<PathIcon Data="{StaticResource building_more}" Foreground="{DynamicResource ButtonDefaultTertiaryForeground}" />
|
||||
<PathIcon Data="{StaticResource SemiIconMore}" >
|
||||
<PathIcon.RenderTransform>
|
||||
<RotateTransform Angle="90" />
|
||||
</PathIcon.RenderTransform>
|
||||
</PathIcon>
|
||||
</Button.Content>
|
||||
<Button.Flyout>
|
||||
<Flyout>
|
||||
|
|
|
|||
|
|
@ -88,13 +88,14 @@
|
|||
<TextBlock Margin="{StaticResource Margin4}" Text="{x:Static resx:ResUI.menuRemoteBackupAndRestore}" />
|
||||
|
||||
<Button
|
||||
Width="{StaticResource IconButtonWidth}"
|
||||
Height="{StaticResource IconButtonHeight}"
|
||||
MinWidth="{StaticResource IconButtonWidth}"
|
||||
Margin="{StaticResource MarginLr8}"
|
||||
Theme="{DynamicResource BorderlessButton}">
|
||||
Classes="IconButton"
|
||||
Margin="{StaticResource MarginLr8}">
|
||||
<Button.Content>
|
||||
<PathIcon Data="{StaticResource building_more}" Foreground="{DynamicResource ButtonDefaultTertiaryForeground}" />
|
||||
<PathIcon Data="{StaticResource SemiIconMore}" >
|
||||
<PathIcon.RenderTransform>
|
||||
<RotateTransform Angle="90" />
|
||||
</PathIcon.RenderTransform>
|
||||
</PathIcon>
|
||||
</Button.Content>
|
||||
<Button.Flyout>
|
||||
<Flyout>
|
||||
|
|
|
|||
|
|
@ -27,27 +27,21 @@
|
|||
|
||||
<Button
|
||||
x:Name="btnConnectionCloseAll"
|
||||
Width="{StaticResource IconButtonWidth}"
|
||||
Height="{StaticResource IconButtonHeight}"
|
||||
Classes="Success"
|
||||
Classes="IconButton Success"
|
||||
Margin="{StaticResource MarginLr8}"
|
||||
Theme="{DynamicResource BorderlessButton}"
|
||||
ToolTip.Tip="{x:Static resx:ResUI.menuConnectionCloseAll}">
|
||||
<Button.Content>
|
||||
<PathIcon Data="{StaticResource building_delete}" Foreground="{DynamicResource ButtonDefaultTertiaryForeground}" />
|
||||
<PathIcon Data="{StaticResource SemiIconClose}" />
|
||||
</Button.Content>
|
||||
</Button>
|
||||
|
||||
<Button
|
||||
x:Name="btnAutofitColumnWidth"
|
||||
Width="{StaticResource IconButtonWidth}"
|
||||
Height="{StaticResource IconButtonHeight}"
|
||||
Classes="Success"
|
||||
Classes="IconButton Success"
|
||||
Margin="{StaticResource MarginLr8}"
|
||||
Theme="{DynamicResource BorderlessButton}"
|
||||
ToolTip.Tip="{x:Static resx:ResUI.menuProfileAutofitColumnWidth}">
|
||||
<Button.Content>
|
||||
<PathIcon Data="{StaticResource building_fit}" Foreground="{DynamicResource ButtonDefaultTertiaryForeground}" />
|
||||
<PathIcon Data="{StaticResource SemiIconExpand}" />
|
||||
</Button.Content>
|
||||
</Button>
|
||||
|
||||
|
|
|
|||
|
|
@ -50,27 +50,21 @@
|
|||
|
||||
<Button
|
||||
x:Name="menuProxiesReload"
|
||||
Width="{StaticResource IconButtonWidth}"
|
||||
Height="{StaticResource IconButtonHeight}"
|
||||
Margin="{StaticResource MarginLr8}"
|
||||
Classes="Success"
|
||||
Theme="{DynamicResource BorderlessButton}"
|
||||
Classes="IconButton Success"
|
||||
ToolTip.Tip="{x:Static resx:ResUI.menuProxiesReload}">
|
||||
<Button.Content>
|
||||
<PathIcon Data="{StaticResource building_refresh}" Foreground="{DynamicResource ButtonDefaultTertiaryForeground}" />
|
||||
<PathIcon Data="{StaticResource SemiIconRefresh}" />
|
||||
</Button.Content>
|
||||
</Button>
|
||||
|
||||
<Button
|
||||
x:Name="menuProxiesDelaytest"
|
||||
Width="{StaticResource IconButtonWidth}"
|
||||
Height="{StaticResource IconButtonHeight}"
|
||||
Margin="{StaticResource MarginLr8}"
|
||||
Classes="Success"
|
||||
Theme="{DynamicResource BorderlessButton}"
|
||||
Classes="IconButton Success"
|
||||
ToolTip.Tip="{x:Static resx:ResUI.menuProxiesDelaytest}">
|
||||
<Button.Content>
|
||||
<PathIcon Data="{StaticResource building_ping}" Foreground="{DynamicResource ButtonDefaultTertiaryForeground}" />
|
||||
<PathIcon Data="{StaticResource SemiIconBolt}" />
|
||||
</Button.Content>
|
||||
</Button>
|
||||
|
||||
|
|
|
|||
|
|
@ -25,28 +25,22 @@
|
|||
|
||||
<Button
|
||||
x:Name="btnCopy"
|
||||
Width="{StaticResource IconButtonWidth}"
|
||||
Height="{StaticResource IconButtonHeight}"
|
||||
Margin="{StaticResource MarginLr8}"
|
||||
Classes="Success"
|
||||
Classes="IconButton Success"
|
||||
Click="menuMsgViewCopyAll_Click"
|
||||
Theme="{DynamicResource BorderlessButton}"
|
||||
ToolTip.Tip="{x:Static resx:ResUI.menuMsgViewCopyAll}">
|
||||
<Button.Content>
|
||||
<PathIcon Data="{StaticResource building_copy}" Foreground="{DynamicResource ButtonDefaultTertiaryForeground}" />
|
||||
<PathIcon Data="{StaticResource SemiIconCopy}" />
|
||||
</Button.Content>
|
||||
</Button>
|
||||
<Button
|
||||
x:Name="btnClear"
|
||||
Width="{StaticResource IconButtonWidth}"
|
||||
Height="{StaticResource IconButtonHeight}"
|
||||
Margin="{StaticResource MarginLr8}"
|
||||
Classes="Success"
|
||||
Classes="IconButton Success"
|
||||
Click="menuMsgViewClear_Click"
|
||||
Theme="{DynamicResource BorderlessButton}"
|
||||
ToolTip.Tip="{x:Static resx:ResUI.menuMsgViewClear}">
|
||||
<Button.Content>
|
||||
<PathIcon Data="{StaticResource building_delete}" Foreground="{DynamicResource ButtonDefaultTertiaryForeground}" />
|
||||
<PathIcon Data="{StaticResource SemiIconDelete}" />
|
||||
</Button.Content>
|
||||
</Button>
|
||||
<TextBlock
|
||||
|
|
|
|||
|
|
@ -51,12 +51,11 @@
|
|||
|
||||
<Button
|
||||
x:Name="btnAutofitColumnWidth"
|
||||
Width="32"
|
||||
Height="32"
|
||||
Margin="8,0"
|
||||
Margin="{StaticResource MarginLr4}"
|
||||
Classes="IconButton Success"
|
||||
ToolTip.Tip="{x:Static resx:ResUI.menuProfileAutofitColumnWidth}">
|
||||
<Button.Content>
|
||||
<PathIcon Data="{StaticResource building_fit}" />
|
||||
<PathIcon Data="{StaticResource SemiIconExpand}" />
|
||||
</Button.Content>
|
||||
</Button>
|
||||
|
||||
|
|
|
|||
|
|
@ -32,39 +32,30 @@
|
|||
|
||||
<Button
|
||||
x:Name="btnEditSub"
|
||||
Width="{StaticResource IconButtonWidth}"
|
||||
Height="{StaticResource IconButtonHeight}"
|
||||
Margin="{StaticResource MarginLr4}"
|
||||
Classes="Success"
|
||||
Theme="{DynamicResource BorderlessButton}"
|
||||
Classes="IconButton Success"
|
||||
ToolTip.Tip="{x:Static resx:ResUI.menuSubEdit}">
|
||||
<Button.Content>
|
||||
<PathIcon Data="{StaticResource building_edit}" Foreground="{DynamicResource ButtonDefaultTertiaryForeground}" />
|
||||
<PathIcon Data="{StaticResource SemiIconEdit}" />
|
||||
</Button.Content>
|
||||
</Button>
|
||||
<Button
|
||||
x:Name="btnAddSub"
|
||||
Width="{StaticResource IconButtonWidth}"
|
||||
Height="{StaticResource IconButtonHeight}"
|
||||
Margin="{StaticResource MarginLr4}"
|
||||
Classes="Success"
|
||||
Theme="{DynamicResource BorderlessButton}"
|
||||
Classes="IconButton Success"
|
||||
ToolTip.Tip="{x:Static resx:ResUI.menuSubAdd}">
|
||||
<Button.Content>
|
||||
<PathIcon Data="{StaticResource building_add}" Foreground="{DynamicResource ButtonDefaultTertiaryForeground}" />
|
||||
<PathIcon Data="{StaticResource SemiIconPlus}" />
|
||||
</Button.Content>
|
||||
</Button>
|
||||
|
||||
<Button
|
||||
x:Name="btnAutofitColumnWidth"
|
||||
Width="{StaticResource IconButtonWidth}"
|
||||
Height="{StaticResource IconButtonHeight}"
|
||||
Margin="{StaticResource MarginLr4}"
|
||||
Classes="Success"
|
||||
Theme="{DynamicResource BorderlessButton}"
|
||||
Classes="IconButton Success"
|
||||
ToolTip.Tip="{x:Static resx:ResUI.menuProfileAutofitColumnWidth}">
|
||||
<Button.Content>
|
||||
<PathIcon Data="{StaticResource building_fit}" Foreground="{DynamicResource ButtonDefaultTertiaryForeground}" />
|
||||
<PathIcon Data="{StaticResource SemiIconExpand}" />
|
||||
</Button.Content>
|
||||
</Button>
|
||||
|
||||
|
|
|
|||
|
|
@ -72,13 +72,15 @@
|
|||
<Button
|
||||
Grid.Row="2"
|
||||
Grid.Column="2"
|
||||
Width="{StaticResource IconButtonWidth}"
|
||||
Height="{StaticResource IconButtonHeight}"
|
||||
Margin="{StaticResource MarginLr8}"
|
||||
Classes="IconButton"
|
||||
HorizontalAlignment="Left"
|
||||
Theme="{DynamicResource BorderlessButton}">
|
||||
Margin="{StaticResource MarginLr8}">
|
||||
<Button.Content>
|
||||
<PathIcon Data="{StaticResource building_more}" Foreground="{DynamicResource ButtonDefaultTertiaryForeground}" />
|
||||
<PathIcon Data="{StaticResource SemiIconMore}" >
|
||||
<PathIcon.RenderTransform>
|
||||
<RotateTransform Angle="90" />
|
||||
</PathIcon.RenderTransform>
|
||||
</PathIcon>
|
||||
</Button.Content>
|
||||
<Button.Flyout>
|
||||
<Flyout>
|
||||
|
|
|
|||
|
|
@ -19,13 +19,13 @@
|
|||
</Style>
|
||||
</UserControl.Styles>
|
||||
|
||||
<Button
|
||||
Width="{StaticResource IconButtonWidth}"
|
||||
Height="{StaticResource IconButtonHeight}"
|
||||
Margin="{StaticResource MarginLr8}"
|
||||
Theme="{DynamicResource BorderlessButton}">
|
||||
<Button Margin="{StaticResource MarginLr8}" Classes="IconButton">
|
||||
<Button.Content>
|
||||
<PathIcon Data="{StaticResource building_more}" Foreground="{DynamicResource ButtonDefaultTertiaryForeground}" />
|
||||
<PathIcon Data="{StaticResource SemiIconMore}">
|
||||
<PathIcon.RenderTransform>
|
||||
<RotateTransform Angle="90" />
|
||||
</PathIcon.RenderTransform>
|
||||
</PathIcon>
|
||||
</Button.Content>
|
||||
<Button.Flyout>
|
||||
<Flyout>
|
||||
|
|
|
|||
Loading…
Reference in a new issue