From b33f536dbdd1cf95701a2f6136c2749e96a3696b Mon Sep 17 00:00:00 2001 From: 2dust <31833384+2dust@users.noreply.github.com> Date: Sat, 5 Oct 2024 14:53:34 +0800 Subject: [PATCH] Improved UI for Desktop PathIcon --- v2rayN/v2rayN.Desktop/App.axaml | 12 ++++++ v2rayN/v2rayN.Desktop/Assets/add.png | Bin 198 -> 0 bytes v2rayN/v2rayN.Desktop/Assets/close.png | Bin 388 -> 0 bytes v2rayN/v2rayN.Desktop/Assets/copy.png | Bin 377 -> 0 bytes v2rayN/v2rayN.Desktop/Assets/delete.png | Bin 295 -> 0 bytes v2rayN/v2rayN.Desktop/Assets/edit.png | Bin 329 -> 0 bytes v2rayN/v2rayN.Desktop/Assets/fit.png | Bin 455 -> 0 bytes v2rayN/v2rayN.Desktop/Assets/light.png | Bin 690 -> 0 bytes v2rayN/v2rayN.Desktop/Assets/more.png | Bin 450 -> 0 bytes v2rayN/v2rayN.Desktop/Assets/refresh.png | Bin 701 -> 0 bytes .../Views/BackupAndRestoreView.axaml | 8 ++-- .../Views/CheckUpdateView.axaml | 2 +- .../Views/ClashConnectionsView.axaml | 15 ++++---- .../Views/ClashProxiesView.axaml | 30 ++++++++------- v2rayN/v2rayN.Desktop/Views/MsgView.axaml | 30 ++++++++------- .../v2rayN.Desktop/Views/ProfilesView.axaml | 35 ++++++++++-------- .../Views/ThemeSettingView.axaml | 2 +- 17 files changed, 77 insertions(+), 57 deletions(-) delete mode 100644 v2rayN/v2rayN.Desktop/Assets/add.png delete mode 100644 v2rayN/v2rayN.Desktop/Assets/close.png delete mode 100644 v2rayN/v2rayN.Desktop/Assets/copy.png delete mode 100644 v2rayN/v2rayN.Desktop/Assets/delete.png delete mode 100644 v2rayN/v2rayN.Desktop/Assets/edit.png delete mode 100644 v2rayN/v2rayN.Desktop/Assets/fit.png delete mode 100644 v2rayN/v2rayN.Desktop/Assets/light.png delete mode 100644 v2rayN/v2rayN.Desktop/Assets/more.png delete mode 100644 v2rayN/v2rayN.Desktop/Assets/refresh.png diff --git a/v2rayN/v2rayN.Desktop/App.axaml b/v2rayN/v2rayN.Desktop/App.axaml index 81f369d2..365b648e 100644 --- a/v2rayN/v2rayN.Desktop/App.axaml +++ b/v2rayN/v2rayN.Desktop/App.axaml @@ -11,6 +11,18 @@ + + + M512 0a512 512 0 1 0 512 512A512 512 0 0 0 512 0z m47.402667 580.906667l-50.090667 50.816q-25.045333 24.448-45.098667 44.8c-13.397333 13.610667-24.405333 24.704-33.194666 33.493333s-13.994667 13.781333-15.701334 15.018667c-4.266667 3.797333-9.002667 7.722667-14.421333 11.904a77.397333 77.397333 0 0 1-17.066667 9.984 255.232 255.232 0 0 1-25.6 10.581333 832.426667 832.426667 0 0 1-70.528 22.485333c-11.093333 2.901333-19.285333 4.821333-24.704 5.589334-11.306667 1.28-18.816-0.384-22.485333-4.992a29.397333 29.397333 0 0 1-3.114667-23.210667 198.016 198.016 0 0 1 6.016-25.6c3.114667-11.093333 6.485333-22.485333 9.984-34.389333s6.997333-22.912 10.282667-32.896a164.821333 164.821333 0 0 1 8.106667-20.693334 96.64 96.64 0 0 1 8.533333-16 101.504 101.504 0 0 1 13.482667-16c2.517333-2.517333 8.533333-8.533333 17.493333-17.792s20.693333-20.992 34.389333-34.816l231.253334-231.253333 117.12 118.016-134.741334 134.741333z m224.938666-229.333334a51.2 51.2 0 0 1-9.984 15.701334q-7.509333 7.509333-13.482666 13.184c-4.010667 3.797333-7.381333 7.082667-10.282667 9.984s-6.485333 6.314667-9.386667 8.789333l-117.290666-117.162667c4.992-4.608 11.008-10.112 17.92-16.597333s12.8-11.605333 17.066666-15.317333a54.613333 54.613333 0 0 1 18.218667-9.685334 56.917333 56.917333 0 0 1 18.517333-2.517333 71.936 71.936 0 0 1 17.493334 2.816 94.464 94.464 0 0 1 14.72 5.589333 113.536 113.536 0 0 1 29.098666 24.106667 138.666667 138.666667 0 0 1 24.704 36.010667 66.389333 66.389333 0 0 1 4.266667 13.184 79.573333 79.573333 0 0 1 1.621333 15.701333 44.330667 44.330667 0 0 1-3.114666 16.213333z m0 0 + M512 0C229.376 0 0 229.376 0 512s229.376 512 512 512 512-229.376 512-512S794.624 0 512 0z m238.08 570.88h-179.2v179.2c0 32.768-26.112 58.88-58.88 58.88s-58.88-26.112-58.88-58.88v-179.2h-179.2c-32.768 0-58.88-26.112-58.88-58.88s26.112-58.88 58.88-58.88h179.2v-179.2c0-32.768 26.112-58.88 58.88-58.88s58.88 26.112 58.88 58.88v179.2h179.2c32.768 0 58.88 26.112 58.88 58.88s-26.112 58.88-58.88 58.88z + M512 1024C229.248 1024 0 794.752 0 512S229.248 0 512 0s512 229.248 512 512-229.248 512-512 512zM216.576 488.789333h-23.168v46.421334h23.168v56.448c0 7.296 5.973333 13.226667 13.269333 13.226666h42.965334c7.296 0 13.226667-5.930667 13.226666-13.226666v-159.317334a13.269333 13.269333 0 0 0-13.226666-13.226666H229.845333a13.269333 13.269333 0 0 0-13.226666 13.226666v56.448z m415.104 0.426667H403.712V366.037333a13.269333 13.269333 0 0 0-13.269333-13.269333H325.802667a13.269333 13.269333 0 0 0-13.226667 13.226667v292.053333c0 7.338667 5.888 13.269333 13.226667 13.269333h64.64c7.338667 0 13.269333-5.930667 13.269333-13.226666v-123.306667h227.968v123.306667c0 7.296 5.930667 13.226667 13.226667 13.226666h64.64c7.338667 0 13.269333-5.930667 13.269333-13.226666V365.952a13.269333 13.269333 0 0 0-13.226667-13.269333h-64.64a13.269333 13.269333 0 0 0-13.269333 13.226666v123.306667z m187.093333-0.426667v-56.448a13.269333 13.269333 0 0 0-13.226666-13.226666h-42.965334a13.269333 13.269333 0 0 0-13.269333 13.226666v159.317334c0 7.296 5.973333 13.226667 13.269333 13.226666h42.922667c7.338667 0 13.269333-5.930667 13.269333-13.226666v-56.448h23.168v-46.421334h-23.168z + M511.9,276.3c43.8,0 79.2,-35.5 79.2,-79.2 0,-43.8 -35.5,-79.2 -79.2,-79.2 -43.8,0 -79.2,35.5 -79.2,79.2 0,43.8 35.5,79.2 79.2,79.2zM511.9,434.8c-43.8,0 -79.2,35.5 -79.2,79.2 0,43.8 35.5,79.2 79.2,79.2 43.8,0 79.2,-35.5 79.2,-79.2 0,-43.8 -35.5,-79.2 -79.2,-79.2zM511.9,751.8c-43.8,0 -79.2,35.4 -79.2,79.2 0,43.8 35.5,79.2 79.2,79.2 43.8,0 79.2,-35.5 79.2,-79.2 0,-43.8 -35.5,-79.2 -79.2,-79.2z + M809.984 169.984l0 86.016-596.010667 0 0-86.016 148.010667 0 43.989333-41.984 212.010667 0 43.989333 41.984 148.010667 0zM256 809.984l0-512 512 0 0 512q0 34.005333-25.984 59.989333t-59.989333 25.984l-340.010667 0q-34.005333 0-59.989333-25.984t-25.984-59.989333z + M704 896v80c0 26.51-21.49 48-48 48H112c-26.51 0-48-21.49-48-48V240c0-26.51 21.49-48 48-48h144v592c0 61.758 50.242 112 112 112h336z m0-688V0H368c-26.51 0-48 21.49-48 48v736c0 26.51 21.49 48 48 48h544c26.51 0 48-21.49 48-48V256H752c-26.4 0-48-21.6-48-48z m241.942-62.058L814.058 14.058A48 48 0 0 0 780.118 0H768v192h192v-12.118a48 48 0 0 0-14.058-33.94z + M849.652671 679.144788l111.007233-174.965917-50.615794 0C905.498584 274.107915 717.720873 88.965218 486.575446 88.965218c-233.998405 0-423.716304 189.698456-423.716304 423.707095 0 233.998405 189.716876 423.715281 423.716304 423.715281 113.936959 0 217.278605-45.079708 293.440216-118.235868l-62.46568-108.306728c-55.750745 65.205071-138.455375 106.709347-230.974535 106.709347-167.843706 0-303.882032-136.039349-303.882032-303.883055S318.732763 208.788234 486.575446 208.788234c164.951843 0 298.899554 131.522476 303.44508 295.389614l-51.357691 0L849.652671 679.144788z + M273.28 899.328c-6.4 6.4-16 9.6-25.6 9.6-6.4 0-12.8-3.2-18.56-6.4-102.4-85.76-162.56-209.92-162.56-343.68 0-245.12 200.32-445.44 445.44-445.44s445.44 200.32 445.44 445.44c0 133.76-56.96 257.92-162.56 343.68-12.16 12.8-34.56 9.6-44.16-3.2-12.8-12.8-9.6-35.2 3.2-44.8a377.152 377.152 0 0 0 136.96-292.48c0-209.92-172.16-382.08-382.08-382.08-206.72-3.2-378.88 168.96-378.88 378.88 0 114.56 51.2 222.72 140.16 295.68 12.8 12.8 16 32 3.2 44.8z m394.88-540.8c12.8-12.8 31.36-12.8 44.16 0 12.8 12.8 12.8 32 0 44.8l-138.88 138.88c1.28 5.12 2.56 10.88 2.56 16.64 0 35.2-28.8 64-64 64-5.76 0-11.52-1.28-16.64-2.56l-24.32 24.32c-6.4 6.4-12.8 9.6-22.4 9.6-9.6 0-16-3.2-22.4-9.6-12.8-12.8-12.8-31.36 0-44.16l24.32-24.96a69.76 69.76 0 0 1-1.92-16.64c0-35.2 28.16-63.36 63.36-63.36 5.76 0 11.52 0.64 16.64 1.92z + + diff --git a/v2rayN/v2rayN.Desktop/Assets/add.png b/v2rayN/v2rayN.Desktop/Assets/add.png deleted file mode 100644 index 41170fbe0a0bac6dbcfa8d57bb33c34b5c4955ff..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 198 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}4W2HJArbCx zr(NVcpupo&I-lpF-#xyGjei0)oh&*uKR*5=y63a12z;Elxi6Tw)Q=2A)}#7kGIXOYCl$7eA_Cev$TnDubrJYLdug v2F@jdGcHU06I&qDajX14XJ!M-A`TN)pCrYs=`-YjZej3r^>bP0l+XkKa-BxX diff --git a/v2rayN/v2rayN.Desktop/Assets/close.png b/v2rayN/v2rayN.Desktop/Assets/close.png deleted file mode 100644 index 7f25fe11453ff281b5721630faf46efffae8346f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 388 zcmV-~0ek+5P)Px$K1oDDR9HvtR=Z9EF%aDS6l$;k28D`H5gGywp(0WQG(Z|24Nw6U{El~f{$!BR z9kS3}&PR|8(p`0ucV=g2?X{T-e_S{}4FU!S1_wGF5RnBlZvr?~)wi5uDaP66I~1>h=@v8ukTB6QA;W8xSC;N8qN))Ek_A)?os1i-}19-BzL_Y(m3$=X(z zYn={6G7;G(qUV~JnWrIyyHtdT91ziUB6P>hzA$YrWC@61=iDwcKO{smRb5sBXGCK`k_?BcdXuwRKe4%ib)1MC5z$o(?pRgZ)*2zb z1yt=g`Brt@@pCgf?_1FS6Hv4TMK@v5V_0+$6(7Za;W8?F9rqn9edB*Li25d3>pk$B i$(pzZ2L=aPx$Gf6~2R9HvV)^SG!K^VvJ?~sUy6A_V!m}e4^NOZ3(_sTkn9Fcg4NJK;;A`(r8 z+vQGMV|MGQ{d=ByJ~KNz`*RpSuIeu$2f$%Ro`I?kbLN@`9OV>cjOqV-K=ukUcH_$- zO|RhZ0LF*2?LzDN>9g_e4v5G*P>*XXQPqjLasY3@Oxwm)eF@+dm<7^zJt%~v`z75o zlmK3Uxdc$vehENC(*05lcn0Pz0Z+h!CEyY0nE|}_56-zoGk}QP150Lr5W-!IaoG$Y zBDcVb86bpk6JuO81Bl2qux1Ik0@f`7m%zqv0jf}1hsqFw#u)vN1Dbv^B60z2S_002 zEla=|ux$w#0Xvp}Q()H;a02X=B%#l08Y5X#1MmH@b8g=ZFwS#b^-rO6B3E{n_e+Hz XqR%%lz=sor00000NkvXXu0mjf?Ma$V diff --git a/v2rayN/v2rayN.Desktop/Assets/delete.png b/v2rayN/v2rayN.Desktop/Assets/delete.png deleted file mode 100644 index cdcfe3b08977ad0e436fd7e3c8f3eac5dbe1ec41..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 295 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}4?SHRLn7SY zPB-K_-MtNeH|<)RH|efK$047; zKR-V+=HAT7wl3wtzYeAon{rau-repnU1j^i=1NAFBk2k8%N8D6%71`8jJ<%(fP1b| zi2J9-_x+h$_{7#INABrfJk4N7aLWcU2bVj1IZAtGEqRw3Q`2O|u)U`?WFf<>2DJs8 z8BAd6Pb!lz!*#oJiVVS%wy&6crqlHaL&8VZBNLx&I=A?v*169$IXyQSXD~~+HrX)D qxnvR>9$NaIMd0R!$u%G94+?ML=~cYawt^k#Sq4v6KbLh*2~7axM|gGs diff --git a/v2rayN/v2rayN.Desktop/Assets/edit.png b/v2rayN/v2rayN.Desktop/Assets/edit.png deleted file mode 100644 index f269f777b54f4d3b23f98a8def2e568b3482ce04..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmV-P0k-~$P)Px$14%?dR9HvtmeCP{Fbsx&*3l(&2wg{AN0)F3T}R0sy{k1%n~=Z@z2o2k_&)xI zv;$Ti!^(VY0+9(^0bBsw#%ZQ&c0>szc!E|XA_PjfC=nsB18@hhXEOgw!c&00oWSq# zEJ^$@y#!M1uTkJENQ5L%&UsCOEyTGA)C#VYpj6mjagIO@2;FEPSYOkga z*Sp*18c`B>0ytXQYcIT&0141IXnMN_-V!L^CGKvuU}-VRYoL2o^AxbY%k-RfH8eq_ bhcPx$fk{L`R9HvtmmyCBK@f%CY$~d77!=|}>CGw(K@~|!Kw(KBNDKlJRH-5Xfk6`Z z0Vqf)k_tjFnC@ILm*6mUsH$5y(k7*8OM2bpN^+}TX1;s-X0k^}`B2LJkpWDX1I%2q z)_O{*4`WQtWj?gl- zT#Lw#lMHyCHD486ps&cl5$n|q8&xL&NkZV{3MOfs x0sK1$Qh$=A`zUph_Hk=W*MGsd^e*(717G>pKrp?IMnC`n002ovPDHLkV1m|Dy$t{W diff --git a/v2rayN/v2rayN.Desktop/Assets/light.png b/v2rayN/v2rayN.Desktop/Assets/light.png deleted file mode 100644 index 8a9c5d092b571f2647cfe73b78ad757e147a141b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 690 zcmV;j0!{siP)Px%Y)M2xR9HvtmOW?`K@`XTZ=(kaDoD~<_z{qEW>(HqyXZ9{S_*=Vg|QNXSg8b5 zP=i=01R;V|ItdnnAH?dA5CuQUyxqIv1i`}M2wJ4Lz1+<+D+wGCB)fNR8V9Bu-tV_> z-kZ0CbzZd2eEb*aNd`)#(uR7y9uUzaGmj;?)}9C`r7jWCJpiN3d?!kDieWXvA8*kqOSnz0A>LUJLk5AVYrZqfHCH- zh+HP3l88J6u)xd*lfqNgfH7vbh*SVfH=E7jTrO7^k*7p-e?`DKHyegwb1g!Ni%==` zf{2dw_4TQCyS){_yVW2fx^At#)pG%3%*myye-2=rnJ>lw-}etV=VFm~#c#qMBJ!=Z zwx>MRDo}h-jy^_D3h6LvDhZFRTTgs0NHNBO)@sT>0TLK%8?|l~V63mCEO( z4D4vNT7%VUb^c!noDh*K9f1b`>?5Lc0CI6Rh{#9~1P|5~+AT@lw45Ng;nbzwQFR Y0E(vhAt^-~i2wiq07*qoM6N<$f&<4i?*IS* diff --git a/v2rayN/v2rayN.Desktop/Assets/more.png b/v2rayN/v2rayN.Desktop/Assets/more.png deleted file mode 100644 index 93cb6e81ad789787d0f8148be86e8ac48690070c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 450 zcmV;z0X_bSP)Px$d`Uz>R9HvtmOo3wKp2OA?{OAE9J@P~a4D7!4vzW>L><(j9TjI+^)m=|)WJVs z^&9BupilzsOPkTnK^%qBgq&Pyp#%}`hD0GZg>Wy=li&Mt7eda9a^|BDa8AJUyoL~B z1Hd8?Jw#D-8;0ShZA+a5DwWETl=2loc?wLDq}lKHFEbJFeg9BveU^efF!N?60-onB z3n7A8Sf&XWuu`f8paEbWKs%1(qc9BLGD%&|0sXSc&Md*XvoI0pnVieoo*Qv$aIjbdhipP)c0^*iFe_GxMJ92mMch+*@E` z&UFZF`~2H}rx_>&OakU2isN|IJWDB`gCO{DNye!K)oOJmNs=c33lr#<5Mr&{?Y`Jb zI0-1F&H?PFU@c}o$V%W2z*Y*@X6Egz1Wo`Pr(mbdY~EWfrxw)f^|{e#bfdK%|AZ3J seW_I1>2x}g72WkVw1pH0(VtG>8=Px%cS%G+R9HvtmOF?PK@f)jn%Q6jH8n63;f|f^*}w;QiGhKjqR}229GVD*20l&^ zd<5#9CYlIFYM|mqz7oMiP*K=mW@-jCFgr0)J+=d-k*WKASYj6!s!*q53-&9vu zHDSt)rmT-OfdAhE%zV*x-3LJse75nz%-aC?L^PwSTL9DnBt#UaX&T3IoD33IxgPL5 z?-&u?0q~57ZUb0Q)x&uLs`^S*&m~Fnp&yW30AtKuRXx(S(GLK(RCR@jzN+d5BHG%3 z%=-GK{V5T-(F-CMfSJDm*qCjis+Wt!;!>?v``u|{W6Wk%y#}C?&5KB`M%PKt^R^RF zyBoi!X}UK_lJ|Lk#?1QwJa5`mMP$C4eOCY*d;l(VSa?Z9>|AbRW*QO=4Dl_6bgksSq2>TIGA|> zz+qY!;0H=Ljf3L7FG2sfSV$6Vnl$!kHGi+18JH*0q|Nx zc8v%yco6!&Ka-}Zy*|HO*PRW5U}YGHk**;#zXh<9h?b)$Ix`HwNQuZ8Q&H8&P2sYL zgo8kgB^5KX1;{Gfei3=m55!oCQ6|L9+9FydqQxkRzH|Z^YdLNeVCItmt~bBg;#9L; zRqbf2-DDmltq`SBX$KKqA)?)R$1v6>StlXS^Gc56c#Qxp0q~kOaiiuZV}F$P6L6#2 jOuQWT0$c-_x(EIMrfVKBKzvKL00000NkvXXu0mjf6b?DF diff --git a/v2rayN/v2rayN.Desktop/Views/BackupAndRestoreView.axaml b/v2rayN/v2rayN.Desktop/Views/BackupAndRestoreView.axaml index 0aa5fda9..293f17e3 100644 --- a/v2rayN/v2rayN.Desktop/Views/BackupAndRestoreView.axaml +++ b/v2rayN/v2rayN.Desktop/Views/BackupAndRestoreView.axaml @@ -11,7 +11,7 @@ x:DataType="vms:BackupAndRestoreViewModel" mc:Ignorable="d"> - + @@ -74,7 +74,7 @@ @@ -105,7 +105,7 @@ diff --git a/v2rayN/v2rayN.Desktop/Views/CheckUpdateView.axaml b/v2rayN/v2rayN.Desktop/Views/CheckUpdateView.axaml index 1e0def17..cd9393c8 100644 --- a/v2rayN/v2rayN.Desktop/Views/CheckUpdateView.axaml +++ b/v2rayN/v2rayN.Desktop/Views/CheckUpdateView.axaml @@ -11,7 +11,7 @@ x:DataType="vms:CheckUpdateViewModel" mc:Ignorable="d"> - + - + diff --git a/v2rayN/v2rayN.Desktop/Views/ClashProxiesView.axaml b/v2rayN/v2rayN.Desktop/Views/ClashProxiesView.axaml index e37b5c4d..ce64ce2c 100644 --- a/v2rayN/v2rayN.Desktop/Views/ClashProxiesView.axaml +++ b/v2rayN/v2rayN.Desktop/Views/ClashProxiesView.axaml @@ -50,33 +50,35 @@ diff --git a/v2rayN/v2rayN.Desktop/Views/MsgView.axaml b/v2rayN/v2rayN.Desktop/Views/MsgView.axaml index 2418015b..4ff25dcb 100644 --- a/v2rayN/v2rayN.Desktop/Views/MsgView.axaml +++ b/v2rayN/v2rayN.Desktop/Views/MsgView.axaml @@ -24,34 +24,36 @@ - + - + diff --git a/v2rayN/v2rayN.Desktop/Views/ThemeSettingView.axaml b/v2rayN/v2rayN.Desktop/Views/ThemeSettingView.axaml index fd6e9a0b..42804ce1 100644 --- a/v2rayN/v2rayN.Desktop/Views/ThemeSettingView.axaml +++ b/v2rayN/v2rayN.Desktop/Views/ThemeSettingView.axaml @@ -19,7 +19,7 @@