Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Colorful Emojis #5246

Closed
wants to merge 4 commits into from
Closed

Colorful Emojis #5246

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1d4c587
Use Colour Emojies.
privatesupport Jun 16, 2024
fcf1e9d
Change ExName to Attached Property
privatesupport Jun 18, 2024
692e72e
Use colour emoji in mainwindow datagrid
privatesupport Jun 18, 2024
422f58c
Added emoji support in SubSettingWindow
privatesupport Jun 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions v2rayN/v2rayN/Base/MyDGTextColumn.cs
View file
Open in desktop

This file was deleted.

20 changes: 20 additions & 0 deletions v2rayN/v2rayN/Base/MyDgTextColumnAttachedProperties.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
using System.Windows;

namespace v2rayN.Base
{
public static class MyDgTextColumnAttachedProperties
{
public static readonly DependencyProperty ExNameProperty =
DependencyProperty.RegisterAttached("ExName", typeof(string), typeof(MyDgTextColumnAttachedProperties), new PropertyMetadata(default(string)));

public static void SetExName(DependencyObject element, string value)
{
element.SetValue(ExNameProperty, value);
}

public static string GetExName(DependencyObject element)
{
return (string)element.GetValue(ExNameProperty);
}
}
}
91 changes: 53 additions & 38 deletions v2rayN/v2rayN/Views/MainWindow.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
xmlns:reactiveui="http://reactiveui.net"
xmlns:resx="clr-namespace:v2rayN.Resx"
xmlns:tb="clr-namespace:H.NotifyIcon;assembly=H.NotifyIcon.Wpf"
xmlns:emoji="clr-namespace:Emoji.Wpf;assembly=Emoji.Wpf"
xmlns:vms="clr-namespace:v2rayN.ViewModels"
Title="v2rayN"
Width="900"
Expand Down Expand Up @@ -413,7 +414,7 @@
Style="{StaticResource MaterialDesignChoiceChipPrimaryOutlineListBox}">
<ListBox.ItemTemplate>
<DataTemplate>
<TextBlock Text="{Binding remarks}" />
<emoji:TextBlock Text="{Binding remarks}" />
</DataTemplate>
</ListBox.ItemTemplate>
</ListBox>
Expand Down Expand Up @@ -513,13 +514,12 @@
Width="150"
Margin="8,0"
materialDesign:HintAssist.Hint="{x:Static resx:ResUI.menuRouting}"
DisplayMemberPath="remarks"
FontSize="{DynamicResource StdFontSize}"
Style="{StaticResource MaterialDesignFloatingHintComboBox}" />
</StackPanel>

<StackPanel Margin="8,0" VerticalAlignment="Center">
<TextBlock
<emoji:TextBlock
x:Name="txtRunningServerDisplay"
PreviewMouseDown="txtRunningInfoDisplay_MouseDoubleClick"
Style="{StaticResource StatusbarItem}" />
Expand Down Expand Up @@ -619,9 +619,14 @@
x:Name="cmbMoveToGroup"
Width="200"
materialDesign:HintAssist.Hint="{x:Static resx:ResUI.menuSubscription}"
DisplayMemberPath="remarks"
FontSize="{DynamicResource StdFontSize}"
Style="{StaticResource MaterialDesignFilledComboBox}" />
Style="{StaticResource MaterialDesignFilledComboBox}">
<ComboBox.ItemTemplate>
<DataTemplate>
<emoji:TextBlock Text="{Binding remarks}" />
</DataTemplate>
</ComboBox.ItemTemplate>
</ComboBox>
</DockPanel>
</MenuItem.Header>
</MenuItem>
Expand Down Expand Up @@ -684,88 +689,93 @@
</DataGrid.Resources>
<DataGrid.Columns>

<base:MyDGTextColumn
<DataGridTextColumn
Width="80"
Binding="{Binding configType}"
ExName="configType"
Header="{x:Static resx:ResUI.LvServiceType}" />
<base:MyDGTextColumn
Header="{x:Static resx:ResUI.LvServiceType}"
base:MyDgTextColumnAttachedProperties.ExName="configType" />
<DataGridTemplateColumn
Width="150"
Binding="{Binding remarks}"
ExName="remarks"
Header="{x:Static resx:ResUI.LvRemarks}" />
<base:MyDGTextColumn
Header="{x:Static resx:ResUI.LvRemarks}"
base:MyDgTextColumnAttachedProperties.ExName="remarks">
<DataGridTemplateColumn.CellTemplate>
<DataTemplate>
<emoji:TextBlock Text="{Binding remarks}" />
</DataTemplate>
</DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn>
<DataGridTextColumn
Width="120"
Binding="{Binding address}"
ExName="address"
base:MyDgTextColumnAttachedProperties.ExName="address"
Header="{x:Static resx:ResUI.LvAddress}" />
<base:MyDGTextColumn
<DataGridTextColumn
Width="60"
Binding="{Binding port}"
ExName="port"
base:MyDgTextColumnAttachedProperties.ExName="port"
Header="{x:Static resx:ResUI.LvPort}" />
<base:MyDGTextColumn
<DataGridTextColumn
Width="100"
Binding="{Binding network}"
ExName="network"
base:MyDgTextColumnAttachedProperties.ExName="network"
Header="{x:Static resx:ResUI.LvTransportProtocol}" />
<base:MyDGTextColumn
<DataGridTextColumn
Width="100"
Binding="{Binding streamSecurity}"
ExName="streamSecurity"
base:MyDgTextColumnAttachedProperties.ExName="streamSecurity"
Header="{x:Static resx:ResUI.LvTLS}" />
<base:MyDGTextColumn
<DataGridTextColumn
Width="100"
Binding="{Binding subRemarks}"
ExName="subRemarks"
base:MyDgTextColumnAttachedProperties.ExName="subRemarks"
Header="{x:Static resx:ResUI.LvSubscription}" />
<base:MyDGTextColumn
<DataGridTextColumn
Width="100"
Binding="{Binding delayVal}"
ExName="delayVal"
base:MyDgTextColumnAttachedProperties.ExName="delayVal"
Header="{x:Static resx:ResUI.LvTestDelay}">
<DataGridTextColumn.ElementStyle>
<Style TargetType="{x:Type TextBlock}">
<Setter Property="HorizontalAlignment" Value="Right" />
<Setter Property="Foreground" Value="{Binding delay, Converter={StaticResource DelayColorConverter}}" />
</Style>
</DataGridTextColumn.ElementStyle>
</base:MyDGTextColumn>
<base:MyDGTextColumn
</DataGridTextColumn>
<DataGridTextColumn
Width="100"
Binding="{Binding speedVal}"
ExName="speedVal"
base:MyDgTextColumnAttachedProperties.ExName="speedVal"
Header="{x:Static resx:ResUI.LvTestSpeed}">
<DataGridTextColumn.ElementStyle>
<Style TargetType="{x:Type TextBlock}">
<Setter Property="HorizontalAlignment" Value="Right" />
</Style>
</DataGridTextColumn.ElementStyle>
</base:MyDGTextColumn>
</DataGridTextColumn>

<base:MyDGTextColumn
<DataGridTextColumn
x:Name="colTodayUp"
Width="100"
Binding="{Binding todayUp}"
ExName="todayUp"
base:MyDgTextColumnAttachedProperties.ExName="todayUp"
Header="{x:Static resx:ResUI.LvTodayUploadDataAmount}" />
<base:MyDGTextColumn
<DataGridTextColumn
x:Name="colTodayDown"
Width="100"
Binding="{Binding todayDown}"
ExName="todayDown"
base:MyDgTextColumnAttachedProperties.ExName="todayDown"
Header="{x:Static resx:ResUI.LvTodayDownloadDataAmount}" />
<base:MyDGTextColumn
<DataGridTextColumn
x:Name="colTotalUp"
Width="100"
Binding="{Binding totalUp}"
ExName="totalUp"
base:MyDgTextColumnAttachedProperties.ExName="totalUp"
Header="{x:Static resx:ResUI.LvTotalUploadDataAmount}" />
<base:MyDGTextColumn
<DataGridTextColumn
x:Name="colTotalDown"
Width="100"
Binding="{Binding totalDown}"
ExName="totalDown"
base:MyDgTextColumnAttachedProperties.ExName="totalDown"
Header="{x:Static resx:ResUI.LvTotalDownloadDataAmount}" />
</DataGrid.Columns>
</DataGrid>
Expand Down Expand Up @@ -840,9 +850,14 @@
x:Name="cmbRoutings"
MaxWidth="300"
materialDesign:HintAssist.Hint="{x:Static resx:ResUI.menuRouting}"
DisplayMemberPath="remarks"
FontSize="{DynamicResource StdFontSize}"
Style="{StaticResource MaterialDesignFilledComboBox}" />
Style="{StaticResource MaterialDesignFilledComboBox}">
<ComboBox.ItemTemplate>
<DataTemplate>
<emoji:TextBlock Text="{Binding remarks}" />
</DataTemplate>
</ComboBox.ItemTemplate>
</ComboBox>
</DockPanel>
</MenuItem.Header>
</MenuItem>
Expand Down
Loading