vlc | branch: master | Abel Tesfaye <[email protected]> | Mon Jul 22 13:45:29 2019 +0300| [6981611daa536f25ec98a52a1864dd55ead25138] | committer: Jean-Baptiste Kempf
qml: add close, del, rename icons > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=6981611daa536f25ec98a52a1864dd55ead25138 --- modules/gui/qt/Makefile.am | 5 +- modules/gui/qt/pixmaps/VLCIcons.json | 5 +- modules/gui/qt/pixmaps/VLCIcons.ttf | Bin 23964 -> 24508 bytes modules/gui/qt/pixmaps/close.svg | 78 ++++++++++++++++++++++++++++ modules/gui/qt/pixmaps/del.svg | 93 ++++++++++++++++++++++++++++++++++ modules/gui/qt/pixmaps/rename.svg | 55 ++++++++++++++++++++ modules/gui/qt/qml/style/VLCIcons.qml | 3 ++ 7 files changed, 237 insertions(+), 2 deletions(-) diff --git a/modules/gui/qt/Makefile.am b/modules/gui/qt/Makefile.am index 7391cebec1..1a343f405c 100644 --- a/modules/gui/qt/Makefile.am +++ b/modules/gui/qt/Makefile.am @@ -536,7 +536,10 @@ libqt_plugin_la_RES = \ gui/qt/pixmaps/update.svg \ gui/qt/pixmaps/valid.svg \ gui/qt/pixmaps/search_clear.svg \ - gui/qt/pixmaps/lock.svg + gui/qt/pixmaps/lock.svg \ + gui/qt/pixmaps/close.svg \ + gui/qt/pixmaps/rename.svg \ + gui/qt/pixmaps/del.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 03c133e7e0..fff20f7346 100644 --- a/modules/gui/qt/pixmaps/VLCIcons.json +++ b/modules/gui/qt/pixmaps/VLCIcons.json @@ -135,6 +135,9 @@ {"key":"topbar_previous", "path": "./topbar/previous.svg"}, {"key":"topbar_next", "path": "./topbar/next.svg"}, {"key":"topbar_filter", "path": "./topbar/filter.svg"}, - {"key":"topbar_sort", "path": "./topbar/sort.svg"} + {"key":"topbar_sort", "path": "./topbar/sort.svg"}, + {"key":"rename", "path": "./rename.svg"}, + {"key":"del", "path": "./del.svg"}, + {"key":"close", "path": "./close.svg"} ] } diff --git a/modules/gui/qt/pixmaps/VLCIcons.ttf b/modules/gui/qt/pixmaps/VLCIcons.ttf index 891aa8d1a5..ffe97d1e0d 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/close.svg b/modules/gui/qt/pixmaps/close.svg new file mode 100644 index 0000000000..ecdc84a631 --- /dev/null +++ b/modules/gui/qt/pixmaps/close.svg @@ -0,0 +1,78 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Generator: Adobe Illustrator 19.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) --> + +<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"; + version="1.1" + id="Capa_1" + x="0px" + y="0px" + viewBox="0 0 48.000002 48.000002" + xml:space="preserve" + inkscape:version="0.91 r13725" + sodipodi:docname="close.svg" + width="48" + height="48"><metadata + id="metadata3450"><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="defs3448" /><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="namedview3446" + showgrid="false" + inkscape:zoom="9.503293" + inkscape:cx="10.549814" + inkscape:cy="17.065547" + inkscape:window-x="37" + inkscape:window-y="18" + inkscape:window-maximized="1" + inkscape:current-layer="Capa_1" /><path + style="fill:#1e201d" + d="m 0.98605217,4.2419239 c -0.89082947,-0.8908295 -0.89082947,-2.3734687 0,-3.29544608 0.92197733,-0.89082942 2.37346873,-0.89082942 3.29544603,0 L 24.056251,20.754455 43.864228,0.94647782 c 0.89083,-0.89082942 2.373469,-0.89082942 3.262222,0 0.921977,0.92197738 0.921977,2.40669318 0,3.29544608 L 27.351697,24.018754 47.12645,43.826731 c 0.921977,0.890829 0.921977,2.373469 0,3.295446 -0.89083,0.890829 -2.373469,0.890829 -3.262222,0 L 24.056251,27.3142 4.2814982,47.122177 c -0.9219773,0.890829 -2.3734687,0.890829 -3.29544603,0 -0.89082947,-0.921977 -0.89082947,-2.406693 0,-3.295446 L 20.760805,24.018754 0.98605217,4.2419239 Z" + id="path3414" + inkscape:connector-curvature="0" /><g + id="g3416" + transform="translate(0,25.120002)" /><g + id="g3418" + transform="translate(0,25.120002)" /><g + id="g3420" + transform="translate(0,25.120002)" /><g + id="g3422" + transform="translate(0,25.120002)" /><g + id="g3424" + transform="translate(0,25.120002)" /><g + id="g3426" + transform="translate(0,25.120002)" /><g + id="g3428" + transform="translate(0,25.120002)" /><g + id="g3430" + transform="translate(0,25.120002)" /><g + id="g3432" + transform="translate(0,25.120002)" /><g + id="g3434" + transform="translate(0,25.120002)" /><g + id="g3436" + transform="translate(0,25.120002)" /><g + id="g3438" + transform="translate(0,25.120002)" /><g + id="g3440" + transform="translate(0,25.120002)" /><g + id="g3442" + transform="translate(0,25.120002)" /><g + id="g3444" + transform="translate(0,25.120002)" /></svg> \ No newline at end of file diff --git a/modules/gui/qt/pixmaps/del.svg b/modules/gui/qt/pixmaps/del.svg new file mode 100644 index 0000000000..ec0a9892d3 --- /dev/null +++ b/modules/gui/qt/pixmaps/del.svg @@ -0,0 +1,93 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Generator: Adobe Illustrator 18.1.1, SVG Export Plug-In . SVG Version: 6.00 Build 0) --> + +<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"; + version="1.1" + id="Capa_1" + x="0px" + y="0px" + viewBox="0 0 48 48" + xml:space="preserve" + inkscape:version="0.91 r13725" + sodipodi:docname="del.svg" + width="48" + height="48"><metadata + id="metadata3584"><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="defs3582" /><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="namedview3580" + showgrid="false" + inkscape:zoom="7.375" + inkscape:cx="2.2372881" + inkscape:cy="16" + inkscape:window-x="37" + inkscape:window-y="18" + inkscape:window-maximized="1" + inkscape:current-layer="Capa_1" /><g + id="g3550" + transform="translate(0,16)" /><g + id="g3552" + transform="translate(0,16)" /><g + id="g3554" + transform="translate(0,16)" /><g + id="g3556" + transform="translate(0,16)" /><g + id="g3558" + transform="translate(0,16)" /><g + id="g3560" + transform="translate(0,16)" /><g + id="g3562" + transform="translate(0,16)" /><g + id="g3564" + transform="translate(0,16)" /><g + id="g3566" + transform="translate(0,16)" /><g + id="g3568" + transform="translate(0,16)" /><g + id="g3570" + transform="translate(0,16)" /><g + id="g3572" + transform="translate(0,16)" /><g + id="g3574" + transform="translate(0,16)" /><g + id="g3576" + transform="translate(0,16)" /><g + id="g3578" + transform="translate(0,16)" /><g + id="g3539" + transform="matrix(1.4915254,0,0,1.4915254,0.64406779,0.13559322)"><g + id="trash"><path + style="fill:#010002" + d="M 29.98,6.818 C 29.884,5.248 28.593,4.002 27,4.002 l -3,0 0,-1 L 24,3 C 24,1.343 22.656,0 21,0 L 11,0 C 9.343,0 8,1.343 8,3 l 0,10e-4 0,1 -3,0 c -1.595,0 -2.885,1.246 -2.981,2.816 L 2,6.817 2,8 2,9 c 0,1.104 0.896,2 2,2 l 0,0 0,17 c 0,2.209 1.791,4 4,4 l 16,0 c 2.209,0 4,-1.791 4,-4 l 0,-17 0,0 c 1.104,0 2,-0.896 2,-2 l 0,-1 0,-1.182 -0.02,0 z M 10,3.001 c 0,-0.553 0.447,-1 1,-1 l 10,0 c 0.553,0 1,0.447 1,1 l 0,1 -12,0 0,-1 z m 16,25 c 0,1.102 -0.898,2 -2,2 l -16,0 c -1.103,0 -2,-0.898 -2,-2 l 0,-17 20,0 0,17 z M 28,8 28,9 4,9 4,8 4,7.001 c 0,-0.553 0.447,-1 1,-1 l 22,0 c 0.553,0 1,0.447 1,1 L 28,8 Z" + id="path3542" + inkscape:connector-curvature="0" /><path + style="fill:#010002" + d="m 9,28.005 2,0 c 0.553,0 1,-0.447 1,-1 l 0,-13 c 0,-0.553 -0.447,-1 -1,-1 l -2,0 c -0.553,0 -1,0.447 -1,1 l 0,13 c 0,0.553 0.447,1 1,1 z m 0,-14.001 2,0 0,13 -2,0 0,-13 z" + id="path3544" + inkscape:connector-curvature="0" /><path + style="fill:#010002" + d="m 15,28.005 2,0 c 0.553,0 1,-0.447 1,-1 l 0,-13 c 0,-0.553 -0.447,-1 -1,-1 l -2,0 c -0.553,0 -1,0.447 -1,1 l 0,13 c 0,0.553 0.447,1 1,1 z m 0,-14.001 2,0 0,13 -2,0 0,-13 z" + id="path3546" + inkscape:connector-curvature="0" /><path + style="fill:#010002" + d="m 21,28.005 2,0 c 0.553,0 1,-0.447 1,-1 l 0,-13 c 0,-0.553 -0.447,-1 -1,-1 l -2,0 c -0.553,0 -1,0.447 -1,1 l 0,13 c 0,0.553 0.447,1 1,1 z m 0,-14.001 2,0 0,13 -2,0 0,-13 z" + id="path3548" + inkscape:connector-curvature="0" /></g></g></svg> \ No newline at end of file diff --git a/modules/gui/qt/pixmaps/rename.svg b/modules/gui/qt/pixmaps/rename.svg new file mode 100644 index 0000000000..b59b57b548 --- /dev/null +++ b/modules/gui/qt/pixmaps/rename.svg @@ -0,0 +1,55 @@ +<?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" + id="svg3674" + version="1.1" + inkscape:version="0.91 r13725" + sodipodi:docname="rename.svg"> + <metadata + id="metadata3682"> + <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="defs3680" /> + <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="namedview3678" + showgrid="false" + inkscape:zoom="9.8333333" + inkscape:cx="1.6779661" + inkscape:cy="12" + inkscape:window-x="37" + inkscape:window-y="18" + inkscape:window-maximized="1" + inkscape:current-layer="svg3674" /> + <path + d="M 14.254,45.124 0,48 2.876,33.744 14.254,45.124 Z M 17.082,42.296 39.538,19.846 28.158,8.462 5.704,30.916 17.082,42.296 Z M 36.618,0 30.986,5.634 42.368,17.016 48,11.378 36.618,0 Z" + id="path3676" + inkscape:connector-curvature="0" /> +</svg> diff --git a/modules/gui/qt/qml/style/VLCIcons.qml b/modules/gui/qt/qml/style/VLCIcons.qml index 0239304811..9b65385aff 100644 --- a/modules/gui/qt/qml/style/VLCIcons.qml +++ b/modules/gui/qt/qml/style/VLCIcons.qml @@ -161,5 +161,8 @@ Item { property string topbar_next : "\ue081" property string topbar_filter : "\ue082" property string topbar_sort : "\ue083" + property string rename : "\ue084" + property string del : "\ue085" + property string close : "\ue086" } \ No newline at end of file _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
