[vlc-devel] [PATCH 1/7] qt: add window min/max/close icons for CSD
Pierre Lamot
pierre at videolabs.io
Wed Sep 30 18:21:53 CEST 2020
---
modules/gui/qt/pixmaps/VLCIcons.json | 6 +++++-
modules/gui/qt/pixmaps/VLCIcons.ttf | Bin 28804 -> 29236 bytes
.../gui/qt/pixmaps/topbar/window_close.svg | 1 +
.../gui/qt/pixmaps/topbar/window_maximize.svg | 4 ++++
.../gui/qt/pixmaps/topbar/window_minimize.svg | 3 +++
.../gui/qt/pixmaps/topbar/window_restore.svg | 8 ++++++++
modules/gui/qt/style/VLCIcons.qml | 4 ++++
7 files changed, 25 insertions(+), 1 deletion(-)
create mode 100644 modules/gui/qt/pixmaps/topbar/window_close.svg
create mode 100644 modules/gui/qt/pixmaps/topbar/window_maximize.svg
create mode 100644 modules/gui/qt/pixmaps/topbar/window_minimize.svg
create mode 100644 modules/gui/qt/pixmaps/topbar/window_restore.svg
diff --git a/modules/gui/qt/pixmaps/VLCIcons.json b/modules/gui/qt/pixmaps/VLCIcons.json
index 7a9fcad647..4ab0f3db6e 100644
--- a/modules/gui/qt/pixmaps/VLCIcons.json
+++ b/modules/gui/qt/pixmaps/VLCIcons.json
@@ -151,6 +151,10 @@
{"key":"play_outline", "path": "./play_outline.svg"},
{"key":"enqueue", "path": "./enqueue.svg"},
{"key":"back", "path": "./back.svg"},
- {"key":"history", "path": "./history.svg"}
+ {"key":"history", "path": "./history.svg"},
+ {"key": "window_close", "path": "./topbar/window_close.svg" },
+ {"key": "window_maximize", "path": "./topbar/window_maximize.svg" },
+ {"key": "window_minimize", "path": "./topbar/window_minimize.svg" },
+ {"key": "window_restore", "path": "./topbar/window_restore.svg" }
]
}
diff --git a/modules/gui/qt/pixmaps/VLCIcons.ttf b/modules/gui/qt/pixmaps/VLCIcons.ttf
index 7a8d1f562ddc9c4b7b03e794d0a7b81c7a09dbb0..c5a217690df64d5b02bd1c0f557d28b977efad31 100644
GIT binary patch
delta 1124
zcmY*YO-vI(6n<}ayY14 at A1Eb2#kTwyib^T80v6IJU_xTR2#5!j25T2W?FNukqm%<g
z4jMHLe>c4m2*jiwJgDhKZzhm<Fp>~VICwD_6Nv{YzA0Oxvpf5~@6DU{w=+{;@zoB-
z0Rg}WlfZ-0-rjxj*;>j1pu8rnt at Cn?=f?&=4S+G?{R5GpviD;D0RT at n+{nQAm>rzl
z41k6v2;tzUa&SPNKzT`A7aqQQ%k=ZxcK|U35PU9&f;WrXXRB%L4^5vehvGpU3K|Mf
zPl|FmG8SvusahrenP$^)bRZ~1N<|9rh}lGfF$G1=M7WRa?YD!G(BrooZ2)pVC1g^f
zqhlSM{2pLPp`b0}6j8I9Cs0D4nE!F|e;z&M#D6pYfKF0V2d1rkA8#1_zd%p6G&U1U
z=dv<k$7WniT*qrTpL~Oz=v{_oNYP}2ip at -0rjdZd#8^vhAYd0sfga-9^T`Ij5w){0
z2lKFyRD=dj=k~dW-S^z<$tAI>KaS*aneXL$K at T9IR>Bh!o{_MSb7O@&y_w!5nfVaq
z;6Iw)BppTLj(ixwL6tc?)&jFdEOR(3z2<sfp;IJUiggZ;kN9aULo;r<nwwo|XPgOx
zMKVdal at WX|Q!_0yX|ov8PFl1WaEk=RqOwxB%?CI;YXBBFynJAPlCuW_w8kGLk`EQo
zMC&d5S at c+sp+(eEWUfr(@RTBDW5C1g;w(J_m(8yQ)dU+g`9;UgyWO$MQfql#NqPo*
zY&AA|(<?5&-=)o!G%V+y9Agf>yxCZkmlNyWb$IpIRZ>@OZOxe4YD)Yr?5Xy*ic+pN
zy+T{EyI3g(SUbE4j1+?}^9xypIv7wf2U at tVVxDSRSFu3<Do4c{FkyDD2s*q<eL#UV
ziyiMnj9`LGD&{C~=D?6m6%QRSr7j4N2YV{kfE_I=7Ae4m#6-ACufQOLV1%Af;$7G(
zDubbskx*hg97S)UOFl*43HgqmV+GMD0#D+pP=Jd`>!1sDIEVANKrAryLFix?Rgr7!
q8?vBL1zvX+)MmUO-EQWQ9dP*aF#3eafA322Wb_J3bdGVG-H*RzcG}+n
delta 651
zcmYjN&ubH55Ph>h(k+oTL@#Q<C8#74ZH=N7EwmO|5u^bH6>RKwv(0YWWIxhPNKuRx
z51ypDw4g`5DAHcmgNGax#DfP>@E~|m at edGbJq7A)UBO*uzxQTl=e=)U{GdDEs0{+p
zk6Vx-#>X$7zyIuN32+mfO-)`H$p8E(F9FnIK5bSFvDxUJ0^}WlR56>Lj<j?aP{X=X
zHWtLz7Egk!G1toTi?hMZug5^_DgU0aEu*w&^yqc2bvaJhw$(N?QdAZ=&WZhY)oTqe
zXU3R+=E%>xrtzfHdB*}bnCGfSOOPb7Il9dKdd;X>&tt1S!0ZP$losxScRT)&`|S-D
zO*UCkT}vu#C>PFe^8C at Yfk(^>;e1e<)4YM=%h&s^^`G8EoO}8Cvi!U9 at AP#VrWL<P
zQ{)F7nk0XxylZ!fuNkf`1%=M?sqoAEs~?QWLli72C#B$3EIZu>`mny;8V=NPCc*>_
zjR;HV!MzB}IDqdFR?thS2&+i2P$<bagGO_q0i~DO2*+PcNWhG+#JV>jAK7k_aSp3d
zK|zwV2&>TPV1#2VaK-O)vO@*b;h at H&EH*sBHU&Hwz?dr*>rUDB^o*I+^Mm=poL;Cq
yHPg~38p1RDqT|vr|GjgVzg?%{yOlJp1P>~QD0nmXR`J)x-uQp34L*rWMEC>$+l5*H
diff --git a/modules/gui/qt/pixmaps/topbar/window_close.svg b/modules/gui/qt/pixmaps/topbar/window_close.svg
new file mode 100644
index 0000000000..e6e5445500
--- /dev/null
+++ b/modules/gui/qt/pixmaps/topbar/window_close.svg
@@ -0,0 +1 @@
+<svg id="Calque_1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48"><path d="M26.27,24,40,37.73,37.73,40,24,26.27,10.27,40,8,37.73,21.73,24,8,10.27,10.27,8,24,21.73,37.73,8,40,10.27Z"/></svg>
diff --git a/modules/gui/qt/pixmaps/topbar/window_maximize.svg b/modules/gui/qt/pixmaps/topbar/window_maximize.svg
new file mode 100644
index 0000000000..2c9b90bef7
--- /dev/null
+++ b/modules/gui/qt/pixmaps/topbar/window_maximize.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" data-name="Calque 1" viewBox="0 0 48 48">
+ <path style="fill:#000000;stroke-width:3.20169497;fill-opacity:1"
+ d="m 12.794067,7.991525 c -2.65238,0 -4.8025414,2.150163 -4.8025414,4.802544 v 22.411862 c 0,2.652285 2.1501614,4.802544 4.8025414,4.802544 h 22.411865 c 2.652284,0 4.802542,-2.150259 4.802542,-4.802544 V 12.794069 c 0,-2.652381 -2.150258,-4.802544 -4.802542,-4.802544 z m 0,3.201695 h 22.411865 c 0.883988,0 1.600847,0.716732 1.600847,1.600849 v 22.411862 c 0,0.883989 -0.716859,1.600849 -1.600847,1.600849 H 12.794067 c -0.884116,0 -1.600847,-0.71686 -1.600847,-1.600849 V 12.794069 c 0,-0.884117 0.716731,-1.600849 1.600847,-1.600849 z"/>
+</svg>
diff --git a/modules/gui/qt/pixmaps/topbar/window_minimize.svg b/modules/gui/qt/pixmaps/topbar/window_minimize.svg
new file mode 100644
index 0000000000..37ee1884f4
--- /dev/null
+++ b/modules/gui/qt/pixmaps/topbar/window_minimize.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48">
+ <path d="m 39,22.5 v 3 H 9 v -3 z" style="stroke-width:3" />
+</svg>
diff --git a/modules/gui/qt/pixmaps/topbar/window_restore.svg b/modules/gui/qt/pixmaps/topbar/window_restore.svg
new file mode 100644
index 0000000000..6c4702ef3b
--- /dev/null
+++ b/modules/gui/qt/pixmaps/topbar/window_restore.svg
@@ -0,0 +1,8 @@
+<svg xmlns="http://www.w3.org/2000/svg" data-name="Calque 1" viewBox="0 0 48 48">
+ <path
+ style="fill:#090909;fill-opacity:1;stroke-width:3.20006394"
+ d="M 14.672139,11.2 C 15.33111,9.3356802 17.109165,8.0000002 19.1992,8.0000002 H 30.399648 C 35.701908,8.0000002 40,12.29808 40,17.6 v 11.2 c 0,2.08992 -1.335734,3.86784 -3.200128,4.52672 V 17.6 c 0,-3.534624 -2.865395,-6.4 -6.400224,-6.4 z"/>
+ <path
+ style="fill:#090909;fill-opacity:1;stroke-width:3.20006394"
+ d="m 12.800192,14.4 h 16.00064 c 2.650986,0 4.800192,2.149024 4.800192,4.8 v 16 c 0,2.65088 -2.149206,4.8 -4.800192,4.8 H 12.800192 C 10.14911,40 7.9999999,37.85088 7.9999999,35.2 v -16 c 0,-2.650976 2.1491101,-4.8 4.8001921,-4.8 z m 0,3.2 c -0.883684,0 -1.600064,0.716352 -1.600064,1.6 v 16 c 0,0.88352 0.71638,1.6 1.600064,1.6 h 16.00064 c 0.883683,0 1.600064,-0.71648 1.600064,-1.6 v -16 c 0,-0.883648 -0.716381,-1.6 -1.600064,-1.6 z"/>
+</svg>
diff --git a/modules/gui/qt/style/VLCIcons.qml b/modules/gui/qt/style/VLCIcons.qml
index c9e02cb165..f2e1761a7c 100644
--- a/modules/gui/qt/style/VLCIcons.qml
+++ b/modules/gui/qt/style/VLCIcons.qml
@@ -165,5 +165,9 @@ Item {
property string enqueue : "\ue091"
property string back : "\ue092"
property string history : "\ue093"
+ property string window_close : "\ue094"
+ property string window_maximize : "\ue095"
+ property string window_minimize : "\ue096"
+ property string window_restore : "\ue097"
}
\ No newline at end of file
--
2.25.1
More information about the vlc-devel
mailing list