vlc | branch: master | Abel Tesfaye <[email protected]> | Thu Aug 1 12:20:31 2019 +0300| [6e01c8c56b415586e7f9edcad0327797e4de3f52] | committer: Jean-Baptiste Kempf
qml: add ellipsis, grid and list icons Signed-off-by: Jean-Baptiste Kempf <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=6e01c8c56b415586e7f9edcad0327797e4de3f52 --- modules/gui/qt/Makefile.am | 5 +- modules/gui/qt/pixmaps/VLCIcons.json | 5 +- modules/gui/qt/pixmaps/VLCIcons.ttf | Bin 24508 -> 25420 bytes modules/gui/qt/pixmaps/ellipsis.svg | 61 ++++++++++++++++++++ modules/gui/qt/pixmaps/topbar/grid.svg | 101 +++++++++++++++++++++++++++++++++ modules/gui/qt/pixmaps/topbar/list.svg | 96 +++++++++++++++++++++++++++++++ modules/gui/qt/qml/style/VLCIcons.qml | 3 + 7 files changed, 269 insertions(+), 2 deletions(-) diff --git a/modules/gui/qt/Makefile.am b/modules/gui/qt/Makefile.am index 2932cf2426..886a02bb7f 100644 --- a/modules/gui/qt/Makefile.am +++ b/modules/gui/qt/Makefile.am @@ -542,7 +542,10 @@ libqt_plugin_la_RES = \ gui/qt/pixmaps/lock.svg \ gui/qt/pixmaps/close.svg \ gui/qt/pixmaps/rename.svg \ - gui/qt/pixmaps/del.svg + gui/qt/pixmaps/del.svg \ + gui/qt/pixmaps/ellipsis.svg \ + gui/qt/pixmaps/topbar/grid.svg \ + gui/qt/pixmaps/topbar/list.svg #QML and JS resources libqt_plugin_la_QML = \ diff --git a/modules/gui/qt/pixmaps/VLCIcons.json b/modules/gui/qt/pixmaps/VLCIcons.json index fff20f7346..3c94990760 100644 --- a/modules/gui/qt/pixmaps/VLCIcons.json +++ b/modules/gui/qt/pixmaps/VLCIcons.json @@ -138,6 +138,9 @@ {"key":"topbar_sort", "path": "./topbar/sort.svg"}, {"key":"rename", "path": "./rename.svg"}, {"key":"del", "path": "./del.svg"}, - {"key":"close", "path": "./close.svg"} + {"key":"close", "path": "./close.svg"}, + {"key":"ellipsis", "path": "./ellipsis.svg"}, + {"key":"grid", "path": "./topbar/grid.svg"}, + {"key":"list", "path": "./topbar/list.svg"} ] } diff --git a/modules/gui/qt/pixmaps/VLCIcons.ttf b/modules/gui/qt/pixmaps/VLCIcons.ttf index ffe97d1e0d..4bfc5ff7c6 100644 Binary files a/modules/gui/qt/pixmaps/VLCIcons.ttf and b/modules/gui/qt/pixmaps/VLCIcons.ttf differ diff --git a/modules/gui/qt/pixmaps/ellipsis.svg b/modules/gui/qt/pixmaps/ellipsis.svg new file mode 100644 index 0000000000..d3e6007bf3 --- /dev/null +++ b/modules/gui/qt/pixmaps/ellipsis.svg @@ -0,0 +1,61 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/"; + xmlns:cc="http://creativecommons.org/ns#"; + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"; + xmlns:svg="http://www.w3.org/2000/svg"; + xmlns="http://www.w3.org/2000/svg"; + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"; + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"; + width="48" + height="48" + viewBox="0 0 48 48" + version="1.1" + id="svg2" + inkscape:version="0.91 r13725" + sodipodi:docname="ellipsis.svg"> + <metadata + id="metadata11"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage"; /> + <dc:title /> + </cc:Work> + </rdf:RDF> + </metadata> + <defs + id="defs9" /> + <sodipodi:namedview + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1" + objecttolerance="10" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:window-width="1329" + inkscape:window-height="750" + id="namedview7" + showgrid="false" + inkscape:zoom="3.9333333" + inkscape:cx="-30.381355" + inkscape:cy="-0.50847483" + inkscape:window-x="37" + inkscape:window-y="18" + inkscape:window-maximized="1" + inkscape:current-layer="svg2" + units="px" /> + <g + id="surface1" + transform="matrix(0,2.4101695,-2.4101695,0,78.802046,-37.322035)"> + <path + style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" + d="M 27,16.5 C 27,15.671875 26.328125,15 25.5,15 24.671875,15 24,15.671875 24,16.5 c 0,0.828125 0.671875,1.5 1.5,1.5 0.828125,0 1.5,-0.671875 1.5,-1.5 z m 0,6 C 27,21.671875 26.328125,21 25.5,21 24.671875,21 24,21.671875 24,22.5 c 0,0.828125 0.671875,1.5 1.5,1.5 0.828125,0 1.5,-0.671875 1.5,-1.5 z m 0,6 C 27,27.671875 26.328125,27 25.5,27 24.671875,27 24,27.671875 24,28.5 c 0,0.828125 0.671875,1.5 1.5,1.5 0.828125,0 1.5,-0.671875 1.5,-1.5 z m 0,0" + id="path5" + inkscape:connector-curvature="0" /> + </g> +</svg> diff --git a/modules/gui/qt/pixmaps/topbar/grid.svg b/modules/gui/qt/pixmaps/topbar/grid.svg new file mode 100644 index 0000000000..8d636acc14 --- /dev/null +++ b/modules/gui/qt/pixmaps/topbar/grid.svg @@ -0,0 +1,101 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/"; + xmlns:cc="http://creativecommons.org/ns#"; + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"; + xmlns:svg="http://www.w3.org/2000/svg"; + xmlns="http://www.w3.org/2000/svg"; + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"; + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"; + width="48" + height="48" + viewBox="0 0 48 48" + version="1.1" + id="svg2" + inkscape:version="0.91 r13725" + sodipodi:docname="grid.svg"> + <metadata + id="metadata27"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage"; /> + <dc:title></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <defs + id="defs25" /> + <sodipodi:namedview + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1" + objecttolerance="10" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:window-width="1329" + inkscape:window-height="750" + id="namedview23" + showgrid="false" + units="px" + inkscape:zoom="3.9333333" + inkscape:cx="-4.0677969" + inkscape:cy="30" + inkscape:window-x="37" + inkscape:window-y="18" + inkscape:window-maximized="1" + inkscape:current-layer="svg2" /> + <g + id="surface1" + transform="matrix(1.0086322,0,0,1.0086322,-0.0359449,-0.31782068)"> + <path + style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" + d="m 12.109375,11.214844 c 0,0.457031 -0.371094,0.832031 -0.832031,0.832031 l -6.28125,0 c -0.460938,0 -0.832032,-0.375 -0.832032,-0.832031 l 0,-6.28125 c 0,-0.460938 0.371094,-0.835938 0.832032,-0.835938 l 6.28125,0 c 0.460937,0 0.832031,0.375 0.832031,0.835938 z m 0,0" + id="path5" + inkscape:connector-curvature="0" /> + <path + style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" + d="m 28.03125,11.214844 c 0,0.457031 -0.375,0.832031 -0.832031,0.832031 l -6.28125,0 c -0.460938,0 -0.835938,-0.375 -0.835938,-0.832031 l 0,-6.28125 c 0,-0.460938 0.375,-0.835938 0.835938,-0.835938 l 6.28125,0 c 0.457031,0 0.832031,0.375 0.832031,0.835938 z m 0,0" + id="path7" + inkscape:connector-curvature="0" /> + <path + style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" + d="m 43.953125,11.214844 c 0,0.457031 -0.375,0.832031 -0.835937,0.832031 l -6.28125,0 c -0.460938,0 -0.832032,-0.375 -0.832032,-0.832031 l 0,-6.28125 c 0,-0.460938 0.371094,-0.835938 0.832032,-0.835938 l 6.28125,0 c 0.460937,0 0.835937,0.375 0.835937,0.835938 z m 0,0" + id="path9" + inkscape:connector-curvature="0" /> + <path + style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" + d="m 12.109375,27.132812 c 0,0.460938 -0.371094,0.835938 -0.832031,0.835938 l -6.28125,0 c -0.460938,0 -0.832032,-0.375 -0.832032,-0.835938 l 0,-6.28125 c 0,-0.460937 0.371094,-0.832031 0.832032,-0.832031 l 6.28125,0 c 0.460937,0 0.832031,0.371094 0.832031,0.832031 z m 0,0" + id="path11" + inkscape:connector-curvature="0" /> + <path + style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" + d="m 28.03125,27.132812 c 0,0.460938 -0.375,0.835938 -0.832031,0.835938 l -6.28125,0 c -0.460938,0 -0.835938,-0.375 -0.835938,-0.835938 l 0,-6.28125 c 0,-0.460937 0.375,-0.832031 0.835938,-0.832031 l 6.28125,0 c 0.457031,0 0.832031,0.371094 0.832031,0.832031 z m 0,0" + id="path13" + inkscape:connector-curvature="0" /> + <path + style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" + d="m 43.953125,27.132812 c 0,0.460938 -0.375,0.835938 -0.835937,0.835938 l -6.28125,0 c -0.460938,0 -0.832032,-0.375 -0.832032,-0.835938 l 0,-6.28125 c 0,-0.460937 0.371094,-0.832031 0.832032,-0.832031 l 6.28125,0 c 0.460937,0 0.835937,0.371094 0.835937,0.832031 z m 0,0" + id="path15" + inkscape:connector-curvature="0" /> + <path + style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" + d="m 12.109375,43.054688 c 0,0.460937 -0.371094,0.832031 -0.832031,0.832031 l -6.28125,0 c -0.460938,0 -0.832032,-0.371094 -0.832032,-0.832031 l 0,-6.28125 c 0,-0.460938 0.371094,-0.832032 0.832032,-0.832032 l 6.28125,0 c 0.460937,0 0.832031,0.371094 0.832031,0.832032 z m 0,0" + id="path17" + inkscape:connector-curvature="0" /> + <path + style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" + d="m 28.03125,43.054688 c 0,0.460937 -0.375,0.832031 -0.832031,0.832031 l -6.28125,0 c -0.460938,0 -0.835938,-0.371094 -0.835938,-0.832031 l 0,-6.28125 c 0,-0.460938 0.375,-0.832032 0.835938,-0.832032 l 6.28125,0 c 0.457031,0 0.832031,0.371094 0.832031,0.832032 z m 0,0" + id="path19" + inkscape:connector-curvature="0" /> + <path + style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" + d="m 43.953125,43.054688 c 0,0.460937 -0.375,0.832031 -0.835937,0.832031 l -6.28125,0 c -0.460938,0 -0.832032,-0.371094 -0.832032,-0.832031 l 0,-6.28125 c 0,-0.460938 0.371094,-0.832032 0.832032,-0.832032 l 6.28125,0 c 0.460937,0 0.835937,0.371094 0.835937,0.832032 z m 0,0" + id="path21" + inkscape:connector-curvature="0" /> + </g> +</svg> diff --git a/modules/gui/qt/pixmaps/topbar/list.svg b/modules/gui/qt/pixmaps/topbar/list.svg new file mode 100644 index 0000000000..db349bcc09 --- /dev/null +++ b/modules/gui/qt/pixmaps/topbar/list.svg @@ -0,0 +1,96 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/"; + xmlns:cc="http://creativecommons.org/ns#"; + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"; + xmlns:svg="http://www.w3.org/2000/svg"; + xmlns="http://www.w3.org/2000/svg"; + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"; + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"; + width="48" + height="48" + viewBox="0 0 48 48" + version="1.1" + id="svg2" + inkscape:version="0.91 r13725" + sodipodi:docname="list.svg"> + <metadata + id="metadata25"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage"; /> + <dc:title /> + </cc:Work> + </rdf:RDF> + </metadata> + <defs + id="defs23" /> + <sodipodi:namedview + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1" + objecttolerance="10" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:window-width="1329" + inkscape:window-height="750" + id="namedview21" + showgrid="false" + units="px" + inkscape:zoom="3.9333333" + inkscape:cx="-4.0677969" + inkscape:cy="30" + inkscape:window-x="37" + inkscape:window-y="18" + inkscape:window-maximized="1" + inkscape:current-layer="svg2" /> + <g + id="surface1" + transform="translate(0.25423729,-1.7186449)"> + <path + style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" + d="m 8.050781,17.550781 -4.609375,0 c -0.207031,0 -0.386718,0.07422 -0.539062,0.226563 C 2.75,17.929688 2.675781,18.109375 2.675781,18.320312 l 0,4.605469 c 0,0.210938 0.074219,0.390625 0.226563,0.542969 0.152344,0.148438 0.332031,0.226562 0.539062,0.226562 l 4.609375,0 c 0.207031,0 0.390625,-0.07422 0.539063,-0.226562 0.152344,-0.152344 0.230468,-0.332031 0.230468,-0.542969 l 0,-4.605469 c 0,-0.210937 -0.078124,-0.390624 -0.230468,-0.542968 C 8.441406,17.625 8.257812,17.550781 8.050781,17.550781 Z m 0,0" + id="path5" + inkscape:connector-curvature="0" /> + <path + style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" + d="m 8.050781,35.984375 -4.609375,0 c -0.207031,0 -0.386718,0.07422 -0.539062,0.226563 C 2.75,36.363281 2.675781,36.542969 2.675781,36.753906 l 0,4.609375 c 0,0.207031 0.074219,0.386719 0.226563,0.539063 0.152344,0.152344 0.332031,0.226562 0.539062,0.226562 l 4.609375,0 c 0.207031,0 0.390625,-0.07422 0.539063,-0.226562 C 8.742188,41.75 8.820312,41.570312 8.820312,41.363281 l 0,-4.609375 c 0,-0.210937 -0.078124,-0.390625 -0.230468,-0.542968 C 8.441406,36.0625 8.257812,35.984375 8.050781,35.984375 Z m 0,0" + id="path7" + inkscape:connector-curvature="0" /> + <path + style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" + d="m 8.050781,26.765625 -4.609375,0 c -0.207031,0 -0.386718,0.07813 -0.539062,0.230469 C 2.75,27.148438 2.675781,27.328125 2.675781,27.535156 l 0,4.609375 c 0,0.207031 0.074219,0.386719 0.226563,0.539063 0.152344,0.152344 0.332031,0.226562 0.539062,0.226562 l 4.609375,0 c 0.207031,0 0.390625,-0.07422 0.539063,-0.226562 0.152344,-0.152344 0.230468,-0.332032 0.230468,-0.539063 l 0,-4.609375 c 0,-0.207031 -0.078124,-0.386718 -0.230468,-0.539062 C 8.441406,26.84375 8.257812,26.765625 8.050781,26.765625 Z m 0,0" + id="path9" + inkscape:connector-curvature="0" /> + <path + style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" + d="m 8.050781,8.332031 -4.609375,0 C 3.234375,8.332031 3.054688,8.410156 2.902344,8.5625 2.75,8.714844 2.675781,8.894531 2.675781,9.101562 l 0,4.609376 c 0,0.207031 0.074219,0.386718 0.226563,0.539062 0.152344,0.152344 0.332031,0.226562 0.539062,0.226562 l 4.609375,0 c 0.207031,0 0.390625,-0.07422 0.539063,-0.226562 0.152344,-0.152344 0.230468,-0.332031 0.230468,-0.539062 l 0,-4.609376 C 8.820312,8.894531 8.742188,8.714844 8.589844,8.5625 8.441406,8.410156 8.257812,8.332031 8.050781,8.332031 Z m 0,0" + id="path11" + inkscape:connector-curvature="0" /> + <path + style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" + d="m 44.921875,35.984375 -32.261719,0 c -0.207031,0 -0.386718,0.07422 -0.539062,0.226563 -0.152344,0.152343 -0.230469,0.332031 -0.230469,0.542968 l 0,4.609375 c 0,0.207031 0.07813,0.386719 0.230469,0.539063 0.152344,0.152344 0.332031,0.226562 0.539062,0.226562 l 32.261719,0 c 0.207031,0 0.386719,-0.07422 0.539063,-0.226562 C 45.613281,41.75 45.6875,41.570312 45.6875,41.363281 l 0,-4.609375 c 0,-0.210937 -0.07422,-0.390625 -0.226562,-0.542968 -0.152344,-0.148438 -0.332032,-0.226563 -0.539063,-0.226563 z m 0,0" + id="path13" + inkscape:connector-curvature="0" /> + <path + style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" + d="m 44.921875,26.765625 -32.261719,0 c -0.207031,0 -0.386718,0.07813 -0.539062,0.230469 -0.152344,0.152344 -0.230469,0.332031 -0.230469,0.539062 l 0,4.609375 c 0,0.207031 0.07813,0.386719 0.230469,0.539063 0.152344,0.152344 0.332031,0.226562 0.539062,0.226562 l 32.261719,0 c 0.207031,0 0.386719,-0.07422 0.539063,-0.226562 0.152343,-0.152344 0.226562,-0.332032 0.226562,-0.539063 l 0,-4.609375 c 0,-0.207031 -0.07422,-0.386718 -0.226562,-0.539062 -0.152344,-0.152344 -0.332032,-0.230469 -0.539063,-0.230469 z m 0,0" + id="path15" + inkscape:connector-curvature="0" /> + <path + style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" + d="M 45.460938,8.5625 C 45.308594,8.410156 45.128906,8.332031 44.921875,8.332031 l -32.261719,0 c -0.207031,0 -0.386718,0.078125 -0.539062,0.230469 -0.152344,0.152344 -0.230469,0.332031 -0.230469,0.539062 l 0,4.609376 c 0,0.207031 0.07813,0.386718 0.230469,0.539062 0.152344,0.152344 0.332031,0.226562 0.539062,0.226562 l 32.261719,0 c 0.207031,0 0.386719,-0.07422 0.539063,-0.226562 0.152343,-0.152344 0.226562,-0.332031 0.226562,-0.539062 l 0,-4.609376 c 0,-0.207031 -0.07422,-0.386718 -0.226562,-0.539062 z m 0,0" + id="path17" + inkscape:connector-curvature="0" /> + <path + style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" + d="m 44.921875,17.550781 -32.261719,0 c -0.207031,0 -0.386718,0.07422 -0.539062,0.226563 -0.152344,0.152344 -0.230469,0.332031 -0.230469,0.542968 l 0,4.605469 c 0,0.210938 0.07813,0.390625 0.230469,0.542969 0.152344,0.148438 0.332031,0.226562 0.539062,0.226562 l 32.261719,0 c 0.207031,0 0.386719,-0.07422 0.539063,-0.226562 0.152343,-0.152344 0.226562,-0.332031 0.226562,-0.542969 l 0,-4.605469 c 0,-0.210937 -0.07422,-0.390624 -0.226562,-0.542968 C 45.308594,17.625 45.128906,17.550781 44.921875,17.550781 Z m 0,0" + id="path19" + inkscape:connector-curvature="0" /> + </g> +</svg> diff --git a/modules/gui/qt/qml/style/VLCIcons.qml b/modules/gui/qt/qml/style/VLCIcons.qml index 9b65385aff..bdf48d0de3 100644 --- a/modules/gui/qt/qml/style/VLCIcons.qml +++ b/modules/gui/qt/qml/style/VLCIcons.qml @@ -164,5 +164,8 @@ Item { property string rename : "\ue084" property string del : "\ue085" property string close : "\ue086" + property string ellipsis : "\ue087" + property string grid : "\ue088" + property string list : "\ue089" } \ No newline at end of file _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
