Alex-Devera/v2rayN
1
0
Fork 0
mirror of https://github.com/2dust/v2rayN.git synced 2025-10-23 00:34:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Optimize the desktop version icon

Browse source
This commit is contained in:
2dust 2025-10-21 20:00:02 +08:00
parent 07e173eab1
commit 6a19896915
11 changed files with 65 additions and 79 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
v2rayN/v2rayN.Desktop/App.axaml
View file

@ -8,14 +8,7 @@
xmlns:vms="clr-namespace:ServiceLib.ViewModels;assembly=ServiceLib" xmlns:vms="clr-namespace:ServiceLib.ViewModels;assembly=ServiceLib"
Name="v2rayN" Name="v2rayN"
x:DataType="vms:StatusBarViewModel" x:DataType="vms:StatusBarViewModel"
RequestedThemeVariant="Default"> 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> <Application.Resources>
<ResourceDictionary> <ResourceDictionary>
<ResourceDictionary.MergedDictionaries> <ResourceDictionary.MergedDictionaries>
@ -23,6 +16,13 @@
</ResourceDictionary.MergedDictionaries> </ResourceDictionary.MergedDictionaries>
</ResourceDictionary> </ResourceDictionary>
</Application.Resources> </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> <TrayIcon.Icons>
<TrayIcons> <TrayIcons>

9
v2rayN/v2rayN.Desktop/Assets/GlobalStyles.axaml
View file

@ -13,6 +13,7 @@
<Style Selector="PathIcon"> <Style Selector="PathIcon">
<Setter Property="Width" Value="16" /> <Setter Property="Width" Value="16" />
<Setter Property="Height" Value="16" /> <Setter Property="Height" Value="16" />
<Setter Property="Foreground" Value="{DynamicResource ButtonDefaultTertiaryForeground}" />
</Style> </Style>
<Style Selector="TextBox"> <Style Selector="TextBox">
@ -26,4 +27,12 @@
<Style Selector="TabControl"> <Style Selector="TabControl">
<Setter Property="Theme" Value="{StaticResource LineTabControl}" /> <Setter Property="Theme" Value="{StaticResource LineTabControl}" />
</Style> </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> </Styles>

12
v2rayN/v2rayN.Desktop/Views/AddServerWindow.axaml
View file

@ -607,12 +607,14 @@
<Button <Button
x:Name="btnExtra" x:Name="btnExtra"
Width="{StaticResource IconButtonWidth}" Classes="IconButton"
Height="{StaticResource IconButtonHeight}" Margin="{StaticResource MarginLr8}">
Margin="{StaticResource MarginLr8}"
Theme="{DynamicResource BorderlessButton}">
<Button.Content> <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.Content>
<Button.Flyout> <Button.Flyout>
<Flyout> <Flyout>

13
v2rayN/v2rayN.Desktop/Views/BackupAndRestoreView.axaml
View file

@ -88,13 +88,14 @@
<TextBlock Margin="{StaticResource Margin4}" Text="{x:Static resx:ResUI.menuRemoteBackupAndRestore}" /> <TextBlock Margin="{StaticResource Margin4}" Text="{x:Static resx:ResUI.menuRemoteBackupAndRestore}" />
<Button <Button
Width="{StaticResource IconButtonWidth}" Classes="IconButton"
Height="{StaticResource IconButtonHeight}" Margin="{StaticResource MarginLr8}">
MinWidth="{StaticResource IconButtonWidth}"
Margin="{StaticResource MarginLr8}"
Theme="{DynamicResource BorderlessButton}">
<Button.Content> <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.Content>
<Button.Flyout> <Button.Flyout>
<Flyout> <Flyout>

14
v2rayN/v2rayN.Desktop/Views/ClashConnectionsView.axaml
View file

@ -27,27 +27,21 @@
<Button <Button
x:Name="btnConnectionCloseAll" x:Name="btnConnectionCloseAll"
Width="{StaticResource IconButtonWidth}" Classes="IconButton Success"
Height="{StaticResource IconButtonHeight}"
Classes="Success"
Margin="{StaticResource MarginLr8}" Margin="{StaticResource MarginLr8}"
Theme="{DynamicResource BorderlessButton}"
ToolTip.Tip="{x:Static resx:ResUI.menuConnectionCloseAll}"> ToolTip.Tip="{x:Static resx:ResUI.menuConnectionCloseAll}">
<Button.Content> <Button.Content>
<PathIcon Data="{StaticResource building_delete}" Foreground="{DynamicResource ButtonDefaultTertiaryForeground}" /> <PathIcon Data="{StaticResource SemiIconClose}" />
</Button.Content> </Button.Content>
</Button> </Button>
<Button <Button
x:Name="btnAutofitColumnWidth" x:Name="btnAutofitColumnWidth"
Width="{StaticResource IconButtonWidth}" Classes="IconButton Success"
Height="{StaticResource IconButtonHeight}"
Classes="Success"
Margin="{StaticResource MarginLr8}" Margin="{StaticResource MarginLr8}"
Theme="{DynamicResource BorderlessButton}"
ToolTip.Tip="{x:Static resx:ResUI.menuProfileAutofitColumnWidth}"> ToolTip.Tip="{x:Static resx:ResUI.menuProfileAutofitColumnWidth}">
<Button.Content> <Button.Content>
<PathIcon Data="{StaticResource building_fit}" Foreground="{DynamicResource ButtonDefaultTertiaryForeground}" /> <PathIcon Data="{StaticResource SemiIconExpand}" />
</Button.Content> </Button.Content>
</Button> </Button>

14
v2rayN/v2rayN.Desktop/Views/ClashProxiesView.axaml
View file

@ -50,27 +50,21 @@
<Button <Button
x:Name="menuProxiesReload" x:Name="menuProxiesReload"
Width="{StaticResource IconButtonWidth}"
Height="{StaticResource IconButtonHeight}"
Margin="{StaticResource MarginLr8}" Margin="{StaticResource MarginLr8}"
Classes="Success" Classes="IconButton Success"
Theme="{DynamicResource BorderlessButton}"
ToolTip.Tip="{x:Static resx:ResUI.menuProxiesReload}"> ToolTip.Tip="{x:Static resx:ResUI.menuProxiesReload}">
<Button.Content> <Button.Content>
<PathIcon Data="{StaticResource building_refresh}" Foreground="{DynamicResource ButtonDefaultTertiaryForeground}" /> <PathIcon Data="{StaticResource SemiIconRefresh}" />
</Button.Content> </Button.Content>
</Button> </Button>
<Button <Button
x:Name="menuProxiesDelaytest" x:Name="menuProxiesDelaytest"
Width="{StaticResource IconButtonWidth}"
Height="{StaticResource IconButtonHeight}"
Margin="{StaticResource MarginLr8}" Margin="{StaticResource MarginLr8}"
Classes="Success" Classes="IconButton Success"
Theme="{DynamicResource BorderlessButton}"
ToolTip.Tip="{x:Static resx:ResUI.menuProxiesDelaytest}"> ToolTip.Tip="{x:Static resx:ResUI.menuProxiesDelaytest}">
<Button.Content> <Button.Content>
<PathIcon Data="{StaticResource building_ping}" Foreground="{DynamicResource ButtonDefaultTertiaryForeground}" /> <PathIcon Data="{StaticResource SemiIconBolt}" />
</Button.Content> </Button.Content>
</Button> </Button>

14
v2rayN/v2rayN.Desktop/Views/MsgView.axaml
View file

@ -25,28 +25,22 @@
<Button <Button
x:Name="btnCopy" x:Name="btnCopy"
Width="{StaticResource IconButtonWidth}"
Height="{StaticResource IconButtonHeight}"
Margin="{StaticResource MarginLr8}" Margin="{StaticResource MarginLr8}"
Classes="Success" Classes="IconButton Success"
Click="menuMsgViewCopyAll_Click" Click="menuMsgViewCopyAll_Click"
Theme="{DynamicResource BorderlessButton}"
ToolTip.Tip="{x:Static resx:ResUI.menuMsgViewCopyAll}"> ToolTip.Tip="{x:Static resx:ResUI.menuMsgViewCopyAll}">
<Button.Content> <Button.Content>
<PathIcon Data="{StaticResource building_copy}" Foreground="{DynamicResource ButtonDefaultTertiaryForeground}" /> <PathIcon Data="{StaticResource SemiIconCopy}" />
</Button.Content> </Button.Content>
</Button> </Button>
<Button <Button
x:Name="btnClear" x:Name="btnClear"
Width="{StaticResource IconButtonWidth}"
Height="{StaticResource IconButtonHeight}"
Margin="{StaticResource MarginLr8}" Margin="{StaticResource MarginLr8}"
Classes="Success" Classes="IconButton Success"
Click="menuMsgViewClear_Click" Click="menuMsgViewClear_Click"
Theme="{DynamicResource BorderlessButton}"
ToolTip.Tip="{x:Static resx:ResUI.menuMsgViewClear}"> ToolTip.Tip="{x:Static resx:ResUI.menuMsgViewClear}">
<Button.Content> <Button.Content>
<PathIcon Data="{StaticResource building_delete}" Foreground="{DynamicResource ButtonDefaultTertiaryForeground}" /> <PathIcon Data="{StaticResource SemiIconDelete}" />
</Button.Content> </Button.Content>
</Button> </Button>
<TextBlock <TextBlock

7
v2rayN/v2rayN.Desktop/Views/ProfilesSelectWindow.axaml
View file

@ -51,12 +51,11 @@
<Button <Button
x:Name="btnAutofitColumnWidth" x:Name="btnAutofitColumnWidth"
Width="32" Margin="{StaticResource MarginLr4}"
Height="32" Classes="IconButton Success"
Margin="8,0"
ToolTip.Tip="{x:Static resx:ResUI.menuProfileAutofitColumnWidth}"> ToolTip.Tip="{x:Static resx:ResUI.menuProfileAutofitColumnWidth}">
<Button.Content> <Button.Content>
<PathIcon Data="{StaticResource building_fit}" /> <PathIcon Data="{StaticResource SemiIconExpand}" />
</Button.Content> </Button.Content>
</Button> </Button>

21
v2rayN/v2rayN.Desktop/Views/ProfilesView.axaml
View file

@ -32,39 +32,30 @@
<Button <Button
x:Name="btnEditSub" x:Name="btnEditSub"
Width="{StaticResource IconButtonWidth}"
Height="{StaticResource IconButtonHeight}"
Margin="{StaticResource MarginLr4}" Margin="{StaticResource MarginLr4}"
Classes="Success" Classes="IconButton Success"
Theme="{DynamicResource BorderlessButton}"
ToolTip.Tip="{x:Static resx:ResUI.menuSubEdit}"> ToolTip.Tip="{x:Static resx:ResUI.menuSubEdit}">
<Button.Content> <Button.Content>
<PathIcon Data="{StaticResource building_edit}" Foreground="{DynamicResource ButtonDefaultTertiaryForeground}" /> <PathIcon Data="{StaticResource SemiIconEdit}" />
</Button.Content> </Button.Content>
</Button> </Button>
<Button <Button
x:Name="btnAddSub" x:Name="btnAddSub"
Width="{StaticResource IconButtonWidth}"
Height="{StaticResource IconButtonHeight}"
Margin="{StaticResource MarginLr4}" Margin="{StaticResource MarginLr4}"
Classes="Success" Classes="IconButton Success"
Theme="{DynamicResource BorderlessButton}"
ToolTip.Tip="{x:Static resx:ResUI.menuSubAdd}"> ToolTip.Tip="{x:Static resx:ResUI.menuSubAdd}">
<Button.Content> <Button.Content>
<PathIcon Data="{StaticResource building_add}" Foreground="{DynamicResource ButtonDefaultTertiaryForeground}" /> <PathIcon Data="{StaticResource SemiIconPlus}" />
</Button.Content> </Button.Content>
</Button> </Button>
<Button <Button
x:Name="btnAutofitColumnWidth" x:Name="btnAutofitColumnWidth"
Width="{StaticResource IconButtonWidth}"
Height="{StaticResource IconButtonHeight}"
Margin="{StaticResource MarginLr4}" Margin="{StaticResource MarginLr4}"
Classes="Success" Classes="IconButton Success"
Theme="{DynamicResource BorderlessButton}"
ToolTip.Tip="{x:Static resx:ResUI.menuProfileAutofitColumnWidth}"> ToolTip.Tip="{x:Static resx:ResUI.menuProfileAutofitColumnWidth}">
<Button.Content> <Button.Content>
<PathIcon Data="{StaticResource building_fit}" Foreground="{DynamicResource ButtonDefaultTertiaryForeground}" /> <PathIcon Data="{StaticResource SemiIconExpand}" />
</Button.Content> </Button.Content>
</Button> </Button>

12
v2rayN/v2rayN.Desktop/Views/SubEditWindow.axaml
View file

@ -72,13 +72,15 @@
<Button <Button
Grid.Row="2" Grid.Row="2"
Grid.Column="2" Grid.Column="2"
Width="{StaticResource IconButtonWidth}" Classes="IconButton"
Height="{StaticResource IconButtonHeight}"
Margin="{StaticResource MarginLr8}"
HorizontalAlignment="Left" HorizontalAlignment="Left"
Theme="{DynamicResource BorderlessButton}"> Margin="{StaticResource MarginLr8}">
<Button.Content> <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.Content>
<Button.Flyout> <Button.Flyout>
<Flyout> <Flyout>

12
v2rayN/v2rayN.Desktop/Views/ThemeSettingView.axaml
View file

@ -19,13 +19,13 @@
</Style> </Style>
</UserControl.Styles> </UserControl.Styles>
<Button <Button Margin="{StaticResource MarginLr8}" Classes="IconButton">
Width="{StaticResource IconButtonWidth}"
Height="{StaticResource IconButtonHeight}"
Margin="{StaticResource MarginLr8}"
Theme="{DynamicResource BorderlessButton}">
<Button.Content> <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.Content>
<Button.Flyout> <Button.Flyout>
<Flyout> <Flyout>