Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
## Ignore Visual Studio temporary files, build results, and
## Ignore Visual Studio temporary files, build results, and
## files generated by popular Visual Studio add-ons.
##
## Get latest from https://github.com/github/gitignore/blob/main/VisualStudio.gitignore
Expand Down Expand Up @@ -402,3 +402,6 @@ FodyWeavers.xsd
# JetBrains Rider
.idea/
*.sln.iml

# MiMoCode
.mimocode/
4 changes: 4 additions & 0 deletions v2rayN/ServiceLib/Handler/ConfigHandler.cs
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,10 @@ public static class ConfigHandler
{
config.SpeedTestItem.UdpTestTarget = Global.UdpTestTargets.First();
}
if (config.SpeedTestItem.IPAPIUrl.IsNullOrEmpty())
{
config.SpeedTestItem.IPAPIUrl = Global.IPAPIUrls.First();
}

config.Mux4RayItem ??= new()
{
Expand Down
3 changes: 1 addition & 2 deletions v2rayN/ServiceLib/Models/Dto/IPAPIInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ public readonly record struct IpInfoResult(string Country, string? Ip)
{
public override string ToString()
{
var emoji = Utils.IsWindows() ? null : Country.CountryToEmoji();
return $"{emoji}({Country}) {Ip}";
return $"({Country}) {Ip}";
}
}
1 change: 1 addition & 0 deletions v2rayN/v2rayN/App.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
<system:Double x:Key="StdFontSize-1">11</system:Double>

<conv:InverseBooleanConverter x:Key="InverseBooleanConverter" />
<conv:FlagImageConverter x:Key="FlagImageConverter" />
<Thickness
x:Key="Margin4"
Bottom="4"
Expand Down
8 changes: 8 additions & 0 deletions v2rayN/v2rayN/Base/MyDGTemplateColumn.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
using System.Windows.Controls;

namespace v2rayN.Base;

internal class MyDGTemplateColumn : DataGridTemplateColumn
{
public string ExName { get; set; }
}
54 changes: 54 additions & 0 deletions v2rayN/v2rayN/Converters/FlagImageConverter.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
using System;
using System.Globalization;
using System.Windows.Data;
using System.Windows.Media.Imaging;
using v2rayN.Helper;

namespace v2rayN.Converters;

public class FlagImageConverter : IValueConverter
{
public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
{
if (value is string countryCode)
{
// Extract country code from formats like "(US) 1.2.3.4" or "US"
var code = ExtractCountryCode(countryCode);
return FlagImageHelper.GetFlagImage(code) ?? new BitmapImage();
}
return new BitmapImage();
}

public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
{
throw new NotImplementedException();
}

private static string? ExtractCountryCode(string? text)
{
if (string.IsNullOrEmpty(text))
{
return null;
}

text = text.Trim();

// Format: "(XX) IP" - extract XX
if (text.StartsWith("(") && text.Length >= 4)
{
var closeIdx = text.IndexOf(')');
if (closeIdx == 2 || closeIdx == 3)
{
return text.Substring(1, closeIdx - 1).Trim();
}
}

// Format: "XX" - just the code
if (text.Length == 2)
{
return text;
}

return null;
}
}
49 changes: 49 additions & 0 deletions v2rayN/v2rayN/Helper/FlagImageHelper.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
using System;
using System.Collections.Concurrent;
using System.IO;
using System.Windows.Media.Imaging;

namespace v2rayN.Helper;

public static class FlagImageHelper
{
private static readonly ConcurrentDictionary<string, BitmapImage> _cache = new(StringComparer.OrdinalIgnoreCase);
private static readonly string _flagsDir = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Resources", "Flags");

public static BitmapImage? GetFlagImage(string? countryCode)
{
if (string.IsNullOrEmpty(countryCode) || countryCode.Length != 2)
{
return null;
}

var key = countryCode.ToUpperInvariant();
if (_cache.TryGetValue(key, out var cached))
{
return cached;
}

var pngPath = Path.Combine(_flagsDir, $"{key}.png");
if (!File.Exists(pngPath))
{
return null;
}

try
{
var bitmap = new BitmapImage();
bitmap.BeginInit();
bitmap.UriSource = new Uri(pngPath);
bitmap.CacheOption = BitmapCacheOption.OnLoad;
bitmap.EndInit();
bitmap.Freeze();

_cache[key] = bitmap;
return bitmap;
}
catch
{
return null;
}
}
}
Binary file added v2rayN/v2rayN/Resources/Flags/ad.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added v2rayN/v2rayN/Resources/Flags/ae.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added v2rayN/v2rayN/Resources/Flags/af.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added v2rayN/v2rayN/Resources/Flags/ag.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added v2rayN/v2rayN/Resources/Flags/ai.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added v2rayN/v2rayN/Resources/Flags/al.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added v2rayN/v2rayN/Resources/Flags/am.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added v2rayN/v2rayN/Resources/Flags/ao.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added v2rayN/v2rayN/Resources/Flags/aq.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added v2rayN/v2rayN/Resources/Flags/ar.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added v2rayN/v2rayN/Resources/Flags/as.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added v2rayN/v2rayN/Resources/Flags/at.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added v2rayN/v2rayN/Resources/Flags/au.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added v2rayN/v2rayN/Resources/Flags/aw.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added v2rayN/v2rayN/Resources/Flags/ax.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added v2rayN/v2rayN/Resources/Flags/az.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added v2rayN/v2rayN/Resources/Flags/ba.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added v2rayN/v2rayN/Resources/Flags/bb.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added v2rayN/v2rayN/Resources/Flags/bd.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added v2rayN/v2rayN/Resources/Flags/be.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added v2rayN/v2rayN/Resources/Flags/bf.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added v2rayN/v2rayN/Resources/Flags/bg.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added v2rayN/v2rayN/Resources/Flags/bh.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added v2rayN/v2rayN/Resources/Flags/bi.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added v2rayN/v2rayN/Resources/Flags/bj.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added v2rayN/v2rayN/Resources/Flags/bl.png
Binary file added v2rayN/v2rayN/Resources/Flags/bm.png
Binary file added v2rayN/v2rayN/Resources/Flags/bn.png
Binary file added v2rayN/v2rayN/Resources/Flags/bo.png
Binary file added v2rayN/v2rayN/Resources/Flags/br.png
Binary file added v2rayN/v2rayN/Resources/Flags/bs.png
Binary file added v2rayN/v2rayN/Resources/Flags/bt.png
Binary file added v2rayN/v2rayN/Resources/Flags/bw.png
Binary file added v2rayN/v2rayN/Resources/Flags/by.png
Binary file added v2rayN/v2rayN/Resources/Flags/bz.png
Binary file added v2rayN/v2rayN/Resources/Flags/ca.png
Binary file added v2rayN/v2rayN/Resources/Flags/cc.png
Binary file added v2rayN/v2rayN/Resources/Flags/cd.png
Binary file added v2rayN/v2rayN/Resources/Flags/cf.png
Binary file added v2rayN/v2rayN/Resources/Flags/cg.png
Binary file added v2rayN/v2rayN/Resources/Flags/ch.png
Binary file added v2rayN/v2rayN/Resources/Flags/ci.png
Binary file added v2rayN/v2rayN/Resources/Flags/ck.png
Binary file added v2rayN/v2rayN/Resources/Flags/cl.png
Binary file added v2rayN/v2rayN/Resources/Flags/cm.png
Binary file added v2rayN/v2rayN/Resources/Flags/cn.png
Binary file added v2rayN/v2rayN/Resources/Flags/co.png
Binary file added v2rayN/v2rayN/Resources/Flags/cr.png
Binary file added v2rayN/v2rayN/Resources/Flags/cu.png
Binary file added v2rayN/v2rayN/Resources/Flags/cv.png
Binary file added v2rayN/v2rayN/Resources/Flags/cw.png
Binary file added v2rayN/v2rayN/Resources/Flags/cx.png
Binary file added v2rayN/v2rayN/Resources/Flags/cy.png
Binary file added v2rayN/v2rayN/Resources/Flags/cz.png
Binary file added v2rayN/v2rayN/Resources/Flags/de.png
Binary file added v2rayN/v2rayN/Resources/Flags/dj.png
Binary file added v2rayN/v2rayN/Resources/Flags/dk.png
Binary file added v2rayN/v2rayN/Resources/Flags/do.png
Binary file added v2rayN/v2rayN/Resources/Flags/dz.png
Binary file added v2rayN/v2rayN/Resources/Flags/ec.png
Binary file added v2rayN/v2rayN/Resources/Flags/ee.png
Binary file added v2rayN/v2rayN/Resources/Flags/eg.png
Binary file added v2rayN/v2rayN/Resources/Flags/er.png
Binary file added v2rayN/v2rayN/Resources/Flags/es.png
Binary file added v2rayN/v2rayN/Resources/Flags/et.png
Binary file added v2rayN/v2rayN/Resources/Flags/fi.png
Binary file added v2rayN/v2rayN/Resources/Flags/fj.png
Binary file added v2rayN/v2rayN/Resources/Flags/fk.png
Binary file added v2rayN/v2rayN/Resources/Flags/fm.png
Binary file added v2rayN/v2rayN/Resources/Flags/fo.png
Binary file added v2rayN/v2rayN/Resources/Flags/fr.png
Binary file added v2rayN/v2rayN/Resources/Flags/ga.png
Binary file added v2rayN/v2rayN/Resources/Flags/gb.png
Binary file added v2rayN/v2rayN/Resources/Flags/gd.png
Binary file added v2rayN/v2rayN/Resources/Flags/ge.png
Binary file added v2rayN/v2rayN/Resources/Flags/gf.png
Binary file added v2rayN/v2rayN/Resources/Flags/gg.png
Binary file added v2rayN/v2rayN/Resources/Flags/gh.png
Binary file added v2rayN/v2rayN/Resources/Flags/gi.png
Binary file added v2rayN/v2rayN/Resources/Flags/gl.png
Binary file added v2rayN/v2rayN/Resources/Flags/gm.png
Binary file added v2rayN/v2rayN/Resources/Flags/gn.png
Binary file added v2rayN/v2rayN/Resources/Flags/gp.png
Binary file added v2rayN/v2rayN/Resources/Flags/gq.png
Binary file added v2rayN/v2rayN/Resources/Flags/gr.png
Binary file added v2rayN/v2rayN/Resources/Flags/gs.png
Binary file added v2rayN/v2rayN/Resources/Flags/gt.png
Binary file added v2rayN/v2rayN/Resources/Flags/gu.png
Binary file added v2rayN/v2rayN/Resources/Flags/gw.png
Binary file added v2rayN/v2rayN/Resources/Flags/gy.png
Binary file added v2rayN/v2rayN/Resources/Flags/hk.png
Binary file added v2rayN/v2rayN/Resources/Flags/hn.png
Binary file added v2rayN/v2rayN/Resources/Flags/hr.png
Binary file added v2rayN/v2rayN/Resources/Flags/ht.png
Binary file added v2rayN/v2rayN/Resources/Flags/hu.png
Binary file added v2rayN/v2rayN/Resources/Flags/id.png
Binary file added v2rayN/v2rayN/Resources/Flags/ie.png
Binary file added v2rayN/v2rayN/Resources/Flags/il.png
Binary file added v2rayN/v2rayN/Resources/Flags/im.png
Binary file added v2rayN/v2rayN/Resources/Flags/in.png
Binary file added v2rayN/v2rayN/Resources/Flags/io.png
Binary file added v2rayN/v2rayN/Resources/Flags/iq.png
Binary file added v2rayN/v2rayN/Resources/Flags/ir.png
Binary file added v2rayN/v2rayN/Resources/Flags/is.png
Binary file added v2rayN/v2rayN/Resources/Flags/it.png
Binary file added v2rayN/v2rayN/Resources/Flags/je.png
Binary file added v2rayN/v2rayN/Resources/Flags/jm.png
Binary file added v2rayN/v2rayN/Resources/Flags/jo.png
Binary file added v2rayN/v2rayN/Resources/Flags/jp.png
Binary file added v2rayN/v2rayN/Resources/Flags/ke.png
Binary file added v2rayN/v2rayN/Resources/Flags/kg.png
Binary file added v2rayN/v2rayN/Resources/Flags/kh.png
Binary file added v2rayN/v2rayN/Resources/Flags/ki.png
Binary file added v2rayN/v2rayN/Resources/Flags/km.png
Binary file added v2rayN/v2rayN/Resources/Flags/kn.png
Binary file added v2rayN/v2rayN/Resources/Flags/kp.png
Binary file added v2rayN/v2rayN/Resources/Flags/kr.png
Binary file added v2rayN/v2rayN/Resources/Flags/kw.png
Binary file added v2rayN/v2rayN/Resources/Flags/ky.png
Binary file added v2rayN/v2rayN/Resources/Flags/kz.png
Binary file added v2rayN/v2rayN/Resources/Flags/la.png
Binary file added v2rayN/v2rayN/Resources/Flags/lb.png
Binary file added v2rayN/v2rayN/Resources/Flags/lc.png
Binary file added v2rayN/v2rayN/Resources/Flags/li.png
Binary file added v2rayN/v2rayN/Resources/Flags/lk.png
Binary file added v2rayN/v2rayN/Resources/Flags/lr.png
Binary file added v2rayN/v2rayN/Resources/Flags/ls.png
Binary file added v2rayN/v2rayN/Resources/Flags/lt.png
Binary file added v2rayN/v2rayN/Resources/Flags/lu.png
Binary file added v2rayN/v2rayN/Resources/Flags/lv.png
Binary file added v2rayN/v2rayN/Resources/Flags/ly.png
Binary file added v2rayN/v2rayN/Resources/Flags/ma.png
Binary file added v2rayN/v2rayN/Resources/Flags/mc.png
Binary file added v2rayN/v2rayN/Resources/Flags/md.png
Binary file added v2rayN/v2rayN/Resources/Flags/me.png
Binary file added v2rayN/v2rayN/Resources/Flags/mf.png
Binary file added v2rayN/v2rayN/Resources/Flags/mg.png
Binary file added v2rayN/v2rayN/Resources/Flags/mh.png
Binary file added v2rayN/v2rayN/Resources/Flags/mk.png
Binary file added v2rayN/v2rayN/Resources/Flags/ml.png
Binary file added v2rayN/v2rayN/Resources/Flags/mm.png
Binary file added v2rayN/v2rayN/Resources/Flags/mn.png
Binary file added v2rayN/v2rayN/Resources/Flags/mo.png
Binary file added v2rayN/v2rayN/Resources/Flags/mp.png
Binary file added v2rayN/v2rayN/Resources/Flags/mq.png
Binary file added v2rayN/v2rayN/Resources/Flags/mr.png
Binary file added v2rayN/v2rayN/Resources/Flags/ms.png
Binary file added v2rayN/v2rayN/Resources/Flags/mt.png
Binary file added v2rayN/v2rayN/Resources/Flags/mu.png
Binary file added v2rayN/v2rayN/Resources/Flags/mv.png
Binary file added v2rayN/v2rayN/Resources/Flags/mw.png
Binary file added v2rayN/v2rayN/Resources/Flags/mx.png
Binary file added v2rayN/v2rayN/Resources/Flags/my.png
Binary file added v2rayN/v2rayN/Resources/Flags/mz.png
Binary file added v2rayN/v2rayN/Resources/Flags/na.png
Binary file added v2rayN/v2rayN/Resources/Flags/nc.png
Binary file added v2rayN/v2rayN/Resources/Flags/ne.png
Binary file added v2rayN/v2rayN/Resources/Flags/nf.png
Binary file added v2rayN/v2rayN/Resources/Flags/ng.png
Binary file added v2rayN/v2rayN/Resources/Flags/ni.png
Binary file added v2rayN/v2rayN/Resources/Flags/nl.png
Binary file added v2rayN/v2rayN/Resources/Flags/no.png
Binary file added v2rayN/v2rayN/Resources/Flags/np.png
Binary file added v2rayN/v2rayN/Resources/Flags/nr.png
Binary file added v2rayN/v2rayN/Resources/Flags/nu.png
Binary file added v2rayN/v2rayN/Resources/Flags/nz.png
Binary file added v2rayN/v2rayN/Resources/Flags/om.png
Binary file added v2rayN/v2rayN/Resources/Flags/pa.png
Binary file added v2rayN/v2rayN/Resources/Flags/pe.png
Binary file added v2rayN/v2rayN/Resources/Flags/pf.png
Binary file added v2rayN/v2rayN/Resources/Flags/pg.png
Binary file added v2rayN/v2rayN/Resources/Flags/ph.png
Binary file added v2rayN/v2rayN/Resources/Flags/pk.png
Binary file added v2rayN/v2rayN/Resources/Flags/pl.png
Binary file added v2rayN/v2rayN/Resources/Flags/pm.png
Binary file added v2rayN/v2rayN/Resources/Flags/pn.png
Binary file added v2rayN/v2rayN/Resources/Flags/pr.png
Binary file added v2rayN/v2rayN/Resources/Flags/ps.png
Binary file added v2rayN/v2rayN/Resources/Flags/pt.png
Binary file added v2rayN/v2rayN/Resources/Flags/pw.png
Binary file added v2rayN/v2rayN/Resources/Flags/py.png
Binary file added v2rayN/v2rayN/Resources/Flags/qa.png
Binary file added v2rayN/v2rayN/Resources/Flags/re.png
Binary file added v2rayN/v2rayN/Resources/Flags/ro.png
Binary file added v2rayN/v2rayN/Resources/Flags/rs.png
Binary file added v2rayN/v2rayN/Resources/Flags/ru.png
Binary file added v2rayN/v2rayN/Resources/Flags/rw.png
Binary file added v2rayN/v2rayN/Resources/Flags/sa.png
Binary file added v2rayN/v2rayN/Resources/Flags/sb.png
Binary file added v2rayN/v2rayN/Resources/Flags/sc.png
Binary file added v2rayN/v2rayN/Resources/Flags/sd.png
Binary file added v2rayN/v2rayN/Resources/Flags/se.png
Binary file added v2rayN/v2rayN/Resources/Flags/sg.png
Binary file added v2rayN/v2rayN/Resources/Flags/sh.png
Binary file added v2rayN/v2rayN/Resources/Flags/si.png
Binary file added v2rayN/v2rayN/Resources/Flags/sj.png
Binary file added v2rayN/v2rayN/Resources/Flags/sk.png
Binary file added v2rayN/v2rayN/Resources/Flags/sl.png
Binary file added v2rayN/v2rayN/Resources/Flags/sm.png
Binary file added v2rayN/v2rayN/Resources/Flags/sn.png
Binary file added v2rayN/v2rayN/Resources/Flags/so.png
Binary file added v2rayN/v2rayN/Resources/Flags/sr.png
Binary file added v2rayN/v2rayN/Resources/Flags/ss.png
Binary file added v2rayN/v2rayN/Resources/Flags/st.png
Binary file added v2rayN/v2rayN/Resources/Flags/sv.png
Binary file added v2rayN/v2rayN/Resources/Flags/sx.png
Binary file added v2rayN/v2rayN/Resources/Flags/sy.png
Binary file added v2rayN/v2rayN/Resources/Flags/sz.png
Binary file added v2rayN/v2rayN/Resources/Flags/tc.png
Binary file added v2rayN/v2rayN/Resources/Flags/td.png
Binary file added v2rayN/v2rayN/Resources/Flags/tf.png
Binary file added v2rayN/v2rayN/Resources/Flags/tg.png
Binary file added v2rayN/v2rayN/Resources/Flags/th.png
Binary file added v2rayN/v2rayN/Resources/Flags/tj.png
Binary file added v2rayN/v2rayN/Resources/Flags/tk.png
Binary file added v2rayN/v2rayN/Resources/Flags/tl.png
Binary file added v2rayN/v2rayN/Resources/Flags/tm.png
Binary file added v2rayN/v2rayN/Resources/Flags/tn.png
Binary file added v2rayN/v2rayN/Resources/Flags/to.png
Binary file added v2rayN/v2rayN/Resources/Flags/tr.png
Binary file added v2rayN/v2rayN/Resources/Flags/tt.png
Binary file added v2rayN/v2rayN/Resources/Flags/tv.png
Binary file added v2rayN/v2rayN/Resources/Flags/tw.png
Binary file added v2rayN/v2rayN/Resources/Flags/tz.png
Binary file added v2rayN/v2rayN/Resources/Flags/ua.png
Binary file added v2rayN/v2rayN/Resources/Flags/ug.png
Binary file added v2rayN/v2rayN/Resources/Flags/um.png
Binary file added v2rayN/v2rayN/Resources/Flags/us.png
Binary file added v2rayN/v2rayN/Resources/Flags/uy.png
Binary file added v2rayN/v2rayN/Resources/Flags/uz.png
Binary file added v2rayN/v2rayN/Resources/Flags/va.png
Binary file added v2rayN/v2rayN/Resources/Flags/vc.png
Binary file added v2rayN/v2rayN/Resources/Flags/ve.png
Binary file added v2rayN/v2rayN/Resources/Flags/vg.png
Binary file added v2rayN/v2rayN/Resources/Flags/vn.png
Binary file added v2rayN/v2rayN/Resources/Flags/vu.png
Binary file added v2rayN/v2rayN/Resources/Flags/wf.png
Binary file added v2rayN/v2rayN/Resources/Flags/ws.png
Binary file added v2rayN/v2rayN/Resources/Flags/ye.png
Binary file added v2rayN/v2rayN/Resources/Flags/za.png
Binary file added v2rayN/v2rayN/Resources/Flags/zm.png
Binary file added v2rayN/v2rayN/Resources/Flags/zw.png
24 changes: 20 additions & 4 deletions v2rayN/v2rayN/Views/ProfilesView.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -346,12 +346,28 @@
ExName="TodayUp"
Header="{x:Static resx:ResUI.LvTodayUploadDataAmount}" />

<base:MyDGTextColumn
<base:MyDGTemplateColumn
x:Name="colIpInfo"
Width="100"
Binding="{Binding IpInfo}"
Width="180"
SortMemberPath="IpInfo"
ExName="IpInfo"
Header="{x:Static resx:ResUI.LvTestIpInfo}" />
Header="{x:Static resx:ResUI.LvTestIpInfo}">
<DataGridTemplateColumn.CellTemplate>
<DataTemplate>
<StackPanel Orientation="Horizontal" VerticalAlignment="Center">
<Image
Width="16"
Height="12"
Margin="0,0,6,0"
Source="{Binding IpInfo, Converter={StaticResource FlagImageConverter}}"
RenderOptions.BitmapScalingMode="HighQuality" />
<TextBlock
Text="{Binding IpInfo}"
VerticalAlignment="Center" />
</StackPanel>
</DataTemplate>
</DataGridTemplateColumn.CellTemplate>
</base:MyDGTemplateColumn>

<base:MyDGTextColumn
x:Name="colTodayDown"
Expand Down
50 changes: 36 additions & 14 deletions v2rayN/v2rayN/Views/ProfilesView.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,12 @@ private void LstProfiles_ColumnHeader_Click(object sender, RoutedEventArgs e)
return;
}

var colName = ((MyDGTextColumn)colHeader.Column).ExName;
var colName = colHeader.Column switch
{
MyDGTextColumn myCol => myCol.ExName,
MyDGTemplateColumn tplCol => tplCol.ExName,
_ => string.Empty
};
ViewModel?.SortServer(colName);
}

Expand Down Expand Up @@ -333,26 +338,33 @@ private void RestoreUI()
var displayIndex = 0;
foreach (var item in lvColumnItem)
{
foreach (var item2 in lstProfiles.Columns.Cast<MyDGTextColumn>())
foreach (var col in lstProfiles.Columns)
{
if (item2.ExName == item.Name)
var name = col switch
{
MyDGTextColumn myCol => myCol.ExName,
MyDGTemplateColumn tplCol => tplCol.ExName,
_ => null
};

if (name != null && name.Equals(item.Name, StringComparison.CurrentCultureIgnoreCase))
{
if (item.Width < 0)
{
item2.Visibility = Visibility.Hidden;
col.Visibility = Visibility.Hidden;
}
else
{
item2.Width = item.Width;
item2.DisplayIndex = displayIndex++;
col.Width = item.Width;
col.DisplayIndex = displayIndex++;
}
if (item.Name.StartsWith("to", StringComparison.CurrentCultureIgnoreCase))
{
item2.Visibility = _config.GuiItem.EnableStatistics ? Visibility.Visible : Visibility.Hidden;
col.Visibility = _config.GuiItem.EnableStatistics ? Visibility.Visible : Visibility.Hidden;
}
if (item.Name.Equals("IpInfo", StringComparison.CurrentCultureIgnoreCase))
{
item2.Visibility = _config.SpeedTestItem.IPAPIUrl.IsNotEmpty() && !_config.UiItem.HideColumnIpInfo ? Visibility.Visible : Visibility.Hidden;
col.Visibility = _config.SpeedTestItem.IPAPIUrl.IsNotEmpty() && !_config.UiItem.HideColumnIpInfo ? Visibility.Visible : Visibility.Hidden;
}
}
}
Expand All @@ -369,14 +381,24 @@ private void StorageUI()
try
{
List<ColumnItem> lvColumnItem = [];
foreach (var item2 in lstProfiles.Columns.Cast<MyDGTextColumn>())
foreach (var col in lstProfiles.Columns)
{
lvColumnItem.Add(new()
var name = col switch
{
Name = item2.ExName,
Width = (int)(item2.Visibility == Visibility.Visible ? item2.ActualWidth : -1),
Index = item2.DisplayIndex
});
MyDGTextColumn myCol => myCol.ExName,
MyDGTemplateColumn tplCol => tplCol.ExName,
_ => null
};

if (name != null)
{
lvColumnItem.Add(new()
{
Name = name,
Width = (int)(col.Visibility == Visibility.Visible ? col.ActualWidth : -1),
Index = col.DisplayIndex
});
}
}
_config.UiItem.MainColumnItem = lvColumnItem;
}
Expand Down
3 changes: 3 additions & 0 deletions v2rayN/v2rayN/v2rayN.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,9 @@
<Resource Include="Resources\NotifyIcon3.ico" />
<Resource Include="Resources\NotifyIcon4.ico" />
<Resource Include="Resources\v2rayN.ico" />
<Content Include="Resources\Flags\*.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
</ItemGroup>

<ItemGroup>
Expand Down