vlc | branch: master | Pierre Lamot <[email protected]> | Mon Jun 17 20:42:57 2019 +0530| [7bfbd813df522d322c36b5b8bfae38f91806ca07] | committer: Jean-Baptiste Kempf
pixmap: Add icons for AB Loop button Add the foreground and background icons for the AB loop button Signed-off-by: Jean-Baptiste Kempf <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=7bfbd813df522d322c36b5b8bfae38f91806ca07 --- modules/gui/qt/Makefile.am | 7 + modules/gui/qt/pixmaps/VLCIcons.json | 7 + modules/gui/qt/pixmaps/VLCIcons.ttf | Bin 22808 -> 23976 bytes modules/gui/qt/pixmaps/toolbar/atob_bg_a.svg | 80 ++++++++ modules/gui/qt/pixmaps/toolbar/atob_bg_ab.svg | 78 ++++++++ modules/gui/qt/pixmaps/toolbar/atob_bg_b.svg | 80 ++++++++ modules/gui/qt/pixmaps/toolbar/atob_bg_none.svg | 80 ++++++++ modules/gui/qt/pixmaps/toolbar/atob_fg_a.svg | 80 ++++++++ modules/gui/qt/pixmaps/toolbar/atob_fg_ab.svg | 80 ++++++++ modules/gui/qt/pixmaps/toolbar/atob_fg_b.svg | 80 ++++++++ modules/gui/qt/qml/style/VLCIcons.qml | 231 ++++++++++++------------ modules/gui/qt/vlc.qrc | 7 + 12 files changed, 698 insertions(+), 112 deletions(-) diff --git a/modules/gui/qt/Makefile.am b/modules/gui/qt/Makefile.am index feed9827b6..2049aeaa27 100644 --- a/modules/gui/qt/Makefile.am +++ b/modules/gui/qt/Makefile.am @@ -467,6 +467,13 @@ libqt_plugin_la_RES = \ gui/qt/pixmaps/toolbar/atob.svg \ gui/qt/pixmaps/toolbar/atob_noa.svg \ gui/qt/pixmaps/toolbar/atob_nob.svg \ + gui/qt/pixmaps/toolbar/atob_bg_a.svg \ + gui/qt/pixmaps/toolbar/atob_bg_ab.svg \ + gui/qt/pixmaps/toolbar/atob_bg_b.svg \ + gui/qt/pixmaps/toolbar/atob_bg_none.svg \ + gui/qt/pixmaps/toolbar/atob_fg_a.svg \ + gui/qt/pixmaps/toolbar/atob_fg_ab.svg \ + gui/qt/pixmaps/toolbar/atob_fg_b.svg \ gui/qt/pixmaps/toolbar/renderer.svg \ gui/qt/pixmaps/toolbar/defullscreen.svg \ gui/qt/pixmaps/toolbar/dvd_menu.svg \ diff --git a/modules/gui/qt/pixmaps/VLCIcons.json b/modules/gui/qt/pixmaps/VLCIcons.json index 8ab30cd235..03c133e7e0 100644 --- a/modules/gui/qt/pixmaps/VLCIcons.json +++ b/modules/gui/qt/pixmaps/VLCIcons.json @@ -21,6 +21,13 @@ {"key":"atob_nob", "path": "./toolbar/atob_nob.svg"}, {"key":"atob", "path": "./toolbar/atob.svg"}, {"key":"atob_noa", "path": "./toolbar/atob_noa.svg"}, + {"key":"atob_bg_ab", "path": "./toolbar/atob_bg_ab.svg"}, + {"key":"atob_bg_a", "path": "./toolbar/atob_bg_a.svg"}, + {"key":"atob_bg_b", "path": "./toolbar/atob_bg_b.svg"}, + {"key":"atob_bg_none", "path": "./toolbar/atob_bg_none.svg"}, + {"key":"atob_fg_ab", "path": "./toolbar/atob_fg_ab.svg"}, + {"key":"atob_fg_a", "path": "./toolbar/atob_fg_a.svg"}, + {"key":"atob_fg_b", "path": "./toolbar/atob_fg_b.svg"}, {"key":"volume_low", "path": "./toolbar/volume-low.svg"}, {"key":"dvd_prev", "path": "./toolbar/dvd_prev.svg"}, {"key":"volume_medium", "path": "./toolbar/volume-medium.svg"}, diff --git a/modules/gui/qt/pixmaps/VLCIcons.ttf b/modules/gui/qt/pixmaps/VLCIcons.ttf index da1cef560d..d9ad3d711b 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/toolbar/atob_bg_a.svg b/modules/gui/qt/pixmaps/toolbar/atob_bg_a.svg new file mode 100644 index 0000000000..547ee2c303 --- /dev/null +++ b/modules/gui/qt/pixmaps/toolbar/atob_bg_a.svg @@ -0,0 +1,80 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<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="svg2" + version="1.1" + inkscape:version="0.92.3 (2405546, 2018-03-11)" + sodipodi:docname="atob_bg_a.svg"> + <defs + id="defs8" /> + <sodipodi:namedview + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1" + objecttolerance="10" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:window-width="1920" + inkscape:window-height="1043" + id="namedview6" + showgrid="false" + inkscape:zoom="9.8333333" + inkscape:cx="2.7260861" + inkscape:cy="31.463724" + inkscape:window-x="2560" + inkscape:window-y="0" + inkscape:window-maximized="1" + inkscape:current-layer="layer1" + showguides="true" + inkscape:guide-bbox="true"> + <sodipodi:guide + position="0,24.017661" + orientation="1,0" + id="guide2390" + inkscape:locked="false" /> + <sodipodi:guide + position="23.59322,0" + orientation="0,1" + id="guide2392" + inkscape:locked="false" /> + </sodipodi:namedview> + <metadata + id="metadata7"> + <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> + <g + inkscape:label="Master" + inkscape:groupmode="layer" + id="layer1" + transform="translate(-384,-1004.3622)" + style="display:inline"> + <path + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#747474;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:5.61248589;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" + d="m 10,6 v 6 8 h 6 v -8 h 16 v 4 h -5 l 8,8 8,-8 H 38 V 12 6 Z m 1,22 c -2.2091397,0 -4.000001,1.790861 -4,4 v 12 h 4 v -4 h 4 v 4 h 4 V 32 c 0,-2.20914 -1.790861,-4.000001 -4,-4 z m 1,3 h 2 c 0.552285,0 1,0.447715 1,1 v 5 h -4 v -5 c 0,-0.552285 0.447715,-1 1,-1 z" + transform="translate(384,1004.3622)" + id="rect6972" + inkscape:connector-curvature="0" + sodipodi:nodetypes="ccccccccccccccssccccccssssssccss" /> + </g> +</svg> diff --git a/modules/gui/qt/pixmaps/toolbar/atob_bg_ab.svg b/modules/gui/qt/pixmaps/toolbar/atob_bg_ab.svg new file mode 100644 index 0000000000..490836954a --- /dev/null +++ b/modules/gui/qt/pixmaps/toolbar/atob_bg_ab.svg @@ -0,0 +1,78 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<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="svg2" + version="1.1" + inkscape:version="0.92.3 (2405546, 2018-03-11)" + sodipodi:docname="atob_bg_ab.svg"> + <defs + id="defs8" /> + <sodipodi:namedview + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1" + objecttolerance="10" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:window-width="1920" + inkscape:window-height="1043" + id="namedview6" + showgrid="false" + inkscape:zoom="9.8333333" + inkscape:cx="2.7260861" + inkscape:cy="36.129262" + inkscape:window-x="2560" + inkscape:window-y="0" + inkscape:window-maximized="1" + inkscape:current-layer="layer1" + showguides="true" + inkscape:guide-bbox="true"> + <sodipodi:guide + position="0,24.017661" + orientation="1,0" + id="guide2390" + inkscape:locked="false" /> + <sodipodi:guide + position="23.59322,0" + orientation="0,1" + id="guide2392" + inkscape:locked="false" /> + </sodipodi:namedview> + <metadata + id="metadata7"> + <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> + <g + inkscape:label="Master" + inkscape:groupmode="layer" + id="layer1" + transform="translate(-384,-1004.3622)" + style="display:inline"> + <path + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#747474;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:5.61248589;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" + d="M 10 6 L 10 12 L 10 20 L 16 20 L 16 12 L 32 12 L 32 16 L 27 16 L 35 24 L 43 16 L 38 16 L 38 12 L 38 6 L 10 6 z M 11 28 A 4 3.9999981 0 0 0 7 32 L 7 44 L 11 44 L 11 40 L 15 40 L 15 44 L 19 44 L 19 32 A 3.9999981 4 0 0 0 15 28 L 11 28 z M 29 28 L 29 44 L 38 44 C 39.65685 44 41 42.6569 41 41 L 41 39 C 41 37.3432 39.65685 36 38 36 L 37 36 A 3 2.9999986 0 0 0 40 33 L 40 31 C 40 29.3432 38.65685 28 37 28 L 29 28 z M 12 31 L 14 31 A 0.9999995 1 0 0 1 15 32 L 15 37 L 11 37 L 11 32 A 1 0.9999995 0 0 1 12 31 z M 33 31 L 35 31 C 35.55228 31 36 31.4478 36 32 L 36 33.5 C 36 34.0523 35.55228 34.5 35 34.5 L 33 34.5 L 33 31 z M 33 37.5 L 36 37.5 C 36.55228 37.5 37 37.9478 37 38.5 L 37 40 C 37 40.5523 36.55228 41 36 41 L 33 41 L 33 37.5 z " + transform="translate(384,1004.3622)" + id="rect6972" /> + </g> +</svg> diff --git a/modules/gui/qt/pixmaps/toolbar/atob_bg_b.svg b/modules/gui/qt/pixmaps/toolbar/atob_bg_b.svg new file mode 100644 index 0000000000..fccd2eecf6 --- /dev/null +++ b/modules/gui/qt/pixmaps/toolbar/atob_bg_b.svg @@ -0,0 +1,80 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<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="svg2" + version="1.1" + inkscape:version="0.92.3 (2405546, 2018-03-11)" + sodipodi:docname="atob_bg_b.svg"> + <defs + id="defs8" /> + <sodipodi:namedview + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1" + objecttolerance="10" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:window-width="1920" + inkscape:window-height="1043" + id="namedview6" + showgrid="false" + inkscape:zoom="9.8333333" + inkscape:cx="2.7260861" + inkscape:cy="31.463724" + inkscape:window-x="2560" + inkscape:window-y="0" + inkscape:window-maximized="1" + inkscape:current-layer="layer1" + showguides="true" + inkscape:guide-bbox="true"> + <sodipodi:guide + position="0,24.017661" + orientation="1,0" + id="guide2390" + inkscape:locked="false" /> + <sodipodi:guide + position="23.59322,0" + orientation="0,1" + id="guide2392" + inkscape:locked="false" /> + </sodipodi:namedview> + <metadata + id="metadata7"> + <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> + <g + inkscape:label="Master" + inkscape:groupmode="layer" + id="layer1" + transform="translate(-384,-1004.3622)" + style="display:inline"> + <path + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#747474;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:5.61248589;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" + d="m 10,6 v 6 8 h 6 v -8 h 16 v 4 h -5 l 8,8 8,-8 H 38 V 12 6 Z m 19,22 v 16 h 9 c 1.65685,0 3,-1.3431 3,-3 v -2 c 0,-1.6568 -1.34315,-3 -3,-3 h -1 c 1.656855,0 3.000001,-1.343146 3,-3 v -2 c 0,-1.6568 -1.34315,-3 -3,-3 z m 4,3 h 2 c 0.55228,0 1,0.4478 1,1 v 1.5 c 0,0.5523 -0.44772,1 -1,1 h -2 z m 0,6.5 h 3 c 0.55228,0 1,0.4478 1,1 V 40 c 0,0.5523 -0.44772,1 -1,1 h -3 z" + transform="translate(384,1004.3622)" + id="rect6972" + inkscape:connector-curvature="0" + sodipodi:nodetypes="ccccccccccccccccsssscsssccsssscccsssscc" /> + </g> +</svg> diff --git a/modules/gui/qt/pixmaps/toolbar/atob_bg_none.svg b/modules/gui/qt/pixmaps/toolbar/atob_bg_none.svg new file mode 100644 index 0000000000..5689f2e547 --- /dev/null +++ b/modules/gui/qt/pixmaps/toolbar/atob_bg_none.svg @@ -0,0 +1,80 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<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="svg2" + version="1.1" + inkscape:version="0.92.3 (2405546, 2018-03-11)" + sodipodi:docname="atob_bg_none.svg"> + <defs + id="defs8" /> + <sodipodi:namedview + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1" + objecttolerance="10" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:window-width="1920" + inkscape:window-height="1043" + id="namedview6" + showgrid="false" + inkscape:zoom="9.8333333" + inkscape:cx="2.7260861" + inkscape:cy="31.463724" + inkscape:window-x="2560" + inkscape:window-y="0" + inkscape:window-maximized="1" + inkscape:current-layer="layer1" + showguides="true" + inkscape:guide-bbox="true"> + <sodipodi:guide + position="0,24.017661" + orientation="1,0" + id="guide2390" + inkscape:locked="false" /> + <sodipodi:guide + position="23.59322,0" + orientation="0,1" + id="guide2392" + inkscape:locked="false" /> + </sodipodi:namedview> + <metadata + id="metadata7"> + <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> + <g + inkscape:label="Master" + inkscape:groupmode="layer" + id="layer1" + transform="translate(-384,-1004.3622)" + style="display:inline"> + <path + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#747474;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:5.61248589;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" + d="m 10,6 v 6 8 h 6 v -8 h 16 v 4 h -5 l 8,8 8,-8 H 38 V 12 6 Z" + transform="translate(384,1004.3622)" + id="rect6972" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cccccccccccccc" /> + </g> +</svg> diff --git a/modules/gui/qt/pixmaps/toolbar/atob_fg_a.svg b/modules/gui/qt/pixmaps/toolbar/atob_fg_a.svg new file mode 100644 index 0000000000..351ea96f74 --- /dev/null +++ b/modules/gui/qt/pixmaps/toolbar/atob_fg_a.svg @@ -0,0 +1,80 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<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="svg2" + version="1.1" + inkscape:version="0.92.3 (2405546, 2018-03-11)" + sodipodi:docname="atob_fg_a.svg"> + <defs + id="defs8" /> + <sodipodi:namedview + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1" + objecttolerance="10" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:window-width="1920" + inkscape:window-height="1043" + id="namedview6" + showgrid="false" + inkscape:zoom="9.8333333" + inkscape:cx="2.7260861" + inkscape:cy="31.463724" + inkscape:window-x="2560" + inkscape:window-y="0" + inkscape:window-maximized="1" + inkscape:current-layer="layer1" + showguides="true" + inkscape:guide-bbox="true"> + <sodipodi:guide + position="0,24.017661" + orientation="1,0" + id="guide2390" + inkscape:locked="false" /> + <sodipodi:guide + position="23.59322,0" + orientation="0,1" + id="guide2392" + inkscape:locked="false" /> + </sodipodi:namedview> + <metadata + id="metadata7"> + <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> + <g + inkscape:label="Master" + inkscape:groupmode="layer" + id="layer1" + transform="translate(-384,-1004.3622)" + style="display:inline"> + <path + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#747474;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:5.61248589;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" + d="m 11,28 c -2.2091397,0 -4.000001,1.790861 -4,4 v 12 h 4 v -4 h 4 v 4 h 4 V 32 c 0,-2.20914 -1.790861,-4.000001 -4,-4 z m 1,3 h 2 c 0.552285,0 1,0.447715 1,1 v 5 h -4 v -5 c 0,-0.552285 0.447715,-1 1,-1 z" + transform="translate(384,1004.3622)" + id="rect6972" + inkscape:connector-curvature="0" + sodipodi:nodetypes="ssccccccssssssccss" /> + </g> +</svg> diff --git a/modules/gui/qt/pixmaps/toolbar/atob_fg_ab.svg b/modules/gui/qt/pixmaps/toolbar/atob_fg_ab.svg new file mode 100644 index 0000000000..ce45a54f34 --- /dev/null +++ b/modules/gui/qt/pixmaps/toolbar/atob_fg_ab.svg @@ -0,0 +1,80 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<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="svg2" + version="1.1" + inkscape:version="0.92.3 (2405546, 2018-03-11)" + sodipodi:docname="atob_fg_ab.svg"> + <defs + id="defs8" /> + <sodipodi:namedview + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1" + objecttolerance="10" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:window-width="1920" + inkscape:window-height="1043" + id="namedview6" + showgrid="false" + inkscape:zoom="9.8333333" + inkscape:cx="2.7260861" + inkscape:cy="31.463724" + inkscape:window-x="2560" + inkscape:window-y="0" + inkscape:window-maximized="1" + inkscape:current-layer="layer1" + showguides="true" + inkscape:guide-bbox="true"> + <sodipodi:guide + position="0,24.017661" + orientation="1,0" + id="guide2390" + inkscape:locked="false" /> + <sodipodi:guide + position="23.59322,0" + orientation="0,1" + id="guide2392" + inkscape:locked="false" /> + </sodipodi:namedview> + <metadata + id="metadata7"> + <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> + <g + inkscape:label="Master" + inkscape:groupmode="layer" + id="layer1" + transform="translate(-384,-1004.3622)" + style="display:inline"> + <path + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#747474;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:5.61248589;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" + d="m 11,28 c -2.2091397,0 -4.000001,1.790861 -4,4 v 12 h 4 v -4 h 4 v 4 h 4 V 32 c 0,-2.20914 -1.790861,-4.000001 -4,-4 z m 18,0 v 16 h 9 c 1.65685,0 3,-1.3431 3,-3 v -2 c 0,-1.6568 -1.34315,-3 -3,-3 h -1 c 1.656855,0 3.000001,-1.343146 3,-3 v -2 c 0,-1.6568 -1.34315,-3 -3,-3 z m -17,3 h 2 c 0.552285,0 1,0.447715 1,1 v 5 h -4 v -5 c 0,-0.552285 0.447715,-1 1,-1 z m 21,0 h 2 c 0.55228,0 1,0.4478 1,1 v 1.5 c 0,0.5523 -0.44772,1 -1,1 h -2 z m 0,6.5 h 3 c 0.55228,0 1,0.4478 1,1 V 40 c 0,0.5523 -0.44772,1 -1,1 h -3 z" + transform="translate(384,1004.3622)" + id="rect6972" + inkscape:connector-curvature="0" + sodipodi:nodetypes="ssccccccsssccsssscssscsssccsscsssscccsssscc" /> + </g> +</svg> diff --git a/modules/gui/qt/pixmaps/toolbar/atob_fg_b.svg b/modules/gui/qt/pixmaps/toolbar/atob_fg_b.svg new file mode 100644 index 0000000000..a75ad11c58 --- /dev/null +++ b/modules/gui/qt/pixmaps/toolbar/atob_fg_b.svg @@ -0,0 +1,80 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<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="svg2" + version="1.1" + inkscape:version="0.92.3 (2405546, 2018-03-11)" + sodipodi:docname="atob_fg_b.svg"> + <defs + id="defs8" /> + <sodipodi:namedview + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1" + objecttolerance="10" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:window-width="1920" + inkscape:window-height="1043" + id="namedview6" + showgrid="false" + inkscape:zoom="9.8333333" + inkscape:cx="2.7260861" + inkscape:cy="31.463724" + inkscape:window-x="2560" + inkscape:window-y="0" + inkscape:window-maximized="1" + inkscape:current-layer="layer1" + showguides="true" + inkscape:guide-bbox="true"> + <sodipodi:guide + position="0,24.017661" + orientation="1,0" + id="guide2390" + inkscape:locked="false" /> + <sodipodi:guide + position="23.59322,0" + orientation="0,1" + id="guide2392" + inkscape:locked="false" /> + </sodipodi:namedview> + <metadata + id="metadata7"> + <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> + <g + inkscape:label="Master" + inkscape:groupmode="layer" + id="layer1" + transform="translate(-384,-1004.3622)" + style="display:inline"> + <path + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#747474;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:5.61248589;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" + d="m 29,28 v 16 h 9 c 1.65685,0 3,-1.3431 3,-3 v -2 c 0,-1.6568 -1.34315,-3 -3,-3 h -1 c 1.656855,0 3.000001,-1.343146 3,-3 v -2 c 0,-1.6568 -1.34315,-3 -3,-3 z m 4,3 h 2 c 0.55228,0 1,0.4478 1,1 v 1.5 c 0,0.5523 -0.44772,1 -1,1 h -2 z m 0,6.5 h 3 c 0.55228,0 1,0.4478 1,1 V 40 c 0,0.5523 -0.44772,1 -1,1 h -3 z" + transform="translate(384,1004.3622)" + id="rect6972" + inkscape:connector-curvature="0" + sodipodi:nodetypes="ccsssscsssccsssscccsssscc" /> + </g> +</svg> diff --git a/modules/gui/qt/qml/style/VLCIcons.qml b/modules/gui/qt/qml/style/VLCIcons.qml index ab3663e153..0239304811 100644 --- a/modules/gui/qt/qml/style/VLCIcons.qml +++ b/modules/gui/qt/qml/style/VLCIcons.qml @@ -15,12 +15,11 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ - /** - * This file is generated, please do not edit by hand + * This file was generated by makeIconFont.py, please do not edit by hand */ pragma Singleton -import QtQuick 2.11 +import QtQuick 2.0 Item { FontLoader { @@ -47,112 +46,120 @@ Item { property string atob_nob : "\ue00e" property string atob : "\ue00f" property string atob_noa : "\ue010" - property string volume_low : "\ue011" - property string dvd_prev : "\ue012" - property string volume_medium : "\ue013" - property string dvd_next : "\ue014" - property string audiosub : "\ue015" - property string volume_slider_outside : "\ue016" - property string arrows : "\ue017" - property string aspect_ratio : "\ue018" - property string fullscreen : "\ue019" - property string dvd_menu : "\ue01a" - property string play_reverse : "\ue01b" - property string record : "\ue01c" - property string snapshot : "\ue01d" - property string volume_high : "\ue01e" - property string volume_slider_inside : "\ue01f" - property string volume_muted : "\ue020" - property string previous : "\ue021" - property string type_node : "\ue022" - property string type_unknown : "\ue023" - property string file_asym : "\ue024" - property string folder_grey : "\ue025" - property string type_file : "\ue026" - property string file_wide : "\ue027" - property string harddisk : "\ue028" - property string type_playlist : "\ue029" - property string folder_blue : "\ue02a" - property string capture_card : "\ue02b" - property string tape : "\ue02c" - property string type_stream : "\ue02d" - property string type_directory : "\ue02e" - property string disc : "\ue02f" - property string repeat_one : "\ue030" - property string repeat_off : "\ue031" - property string dropzone : "\ue032" - property string remove : "\ue033" - property string add : "\ue034" - property string shuffle_on : "\ue035" - property string appletrailers : "\ue036" - property string metachannels : "\ue037" - property string assembleenationale : "\ue038" - property string fmc : "\ue039" - property string jamendo : "\ue03a" - property string icecast : "\ue03b" - property string katsomo : "\ue03c" - property string frenchtv : "\ue03d" - property string mtp : "\ue03e" - property string network : "\ue03f" - property string movie : "\ue040" - property string pictures : "\ue041" - property string screen : "\ue042" - property string library : "\ue043" - property string music : "\ue044" - property string lan : "\ue045" - property string capture : "\ue046" - property string podcast : "\ue047" - property string playlist : "\ue048" - property string repeat_all : "\ue049" - property string lock : "\ue04a" - property string slower : "\ue04b" - property string clear : "\ue04c" - property string profile_new : "\ue04d" - property string addon_green : "\ue04e" - property string addon_broken : "\ue04f" - property string addon_magenta : "\ue050" - property string addon_cyan : "\ue051" - property string score : "\ue052" - property string addon_yellow : "\ue053" - property string addon_blue : "\ue054" - property string addon : "\ue055" - property string addon_red : "\ue056" - property string advprefs_playlist : "\ue057" - property string advprefs_audio : "\ue058" - property string advprefs_video : "\ue059" - property string advprefs_extended : "\ue05a" - property string advprefs_codec : "\ue05b" - property string advprefs_intf : "\ue05c" - property string advprefs_sout : "\ue05d" - property string win7thumbnail_next : "\ue05e" - property string win7thumbnail_play : "\ue05f" - property string win7thumbnail_pause : "\ue060" - property string win7thumbnail_prev : "\ue061" - property string next : "\ue062" - property string play : "\ue063" - property string space : "\ue064" - property string pause : "\ue065" - property string faster2 : "\ue066" - property string wait1 : "\ue067" - property string wait2 : "\ue068" - property string wait3 : "\ue069" - property string wait4 : "\ue06a" - property string slower2 : "\ue06b" - property string messages : "\ue06c" - property string settings : "\ue06d" - property string info : "\ue06e" - property string preferences : "\ue06f" - property string exit : "\ue070" - property string help : "\ue071" - property string stream : "\ue072" - property string valid : "\ue073" - property string search_clear : "\ue074" - property string menu : "\ue075" - property string topbar_video: "\ue076" - property string topbar_music: "\ue077" - property string topbar_network: "\ue078" - property string topbar_previous: "\ue079" - property string topbar_next: "\ue07a" - property string topbar_filter: "\ue07b" - property string topbar_sort: "\ue07c" -} + property string atob_bg_ab : "\ue011" + property string atob_bg_a : "\ue012" + property string atob_bg_b : "\ue013" + property string atob_bg_none : "\ue014" + property string atob_fg_ab : "\ue015" + property string atob_fg_a : "\ue016" + property string atob_fg_b : "\ue017" + property string volume_low : "\ue018" + property string dvd_prev : "\ue019" + property string volume_medium : "\ue01a" + property string dvd_next : "\ue01b" + property string audiosub : "\ue01c" + property string volume_slider_outside : "\ue01d" + property string arrows : "\ue01e" + property string aspect_ratio : "\ue01f" + property string fullscreen : "\ue020" + property string dvd_menu : "\ue021" + property string play_reverse : "\ue022" + property string record : "\ue023" + property string snapshot : "\ue024" + property string volume_high : "\ue025" + property string volume_slider_inside : "\ue026" + property string volume_muted : "\ue027" + property string previous : "\ue028" + property string type_node : "\ue029" + property string type_unknown : "\ue02a" + property string file_asym : "\ue02b" + property string folder_grey : "\ue02c" + property string type_file : "\ue02d" + property string file_wide : "\ue02e" + property string harddisk : "\ue02f" + property string type_playlist : "\ue030" + property string folder_blue : "\ue031" + property string capture_card : "\ue032" + property string tape : "\ue033" + property string type_stream : "\ue034" + property string type_directory : "\ue035" + property string disc : "\ue036" + property string repeat_one : "\ue037" + property string repeat_off : "\ue038" + property string dropzone : "\ue039" + property string remove : "\ue03a" + property string add : "\ue03b" + property string shuffle_on : "\ue03c" + property string appletrailers : "\ue03d" + property string metachannels : "\ue03e" + property string assembleenationale : "\ue03f" + property string fmc : "\ue040" + property string jamendo : "\ue041" + property string icecast : "\ue042" + property string katsomo : "\ue043" + property string frenchtv : "\ue044" + property string mtp : "\ue045" + property string network : "\ue046" + property string movie : "\ue047" + property string pictures : "\ue048" + property string screen : "\ue049" + property string library : "\ue04a" + property string music : "\ue04b" + property string lan : "\ue04c" + property string capture : "\ue04d" + property string podcast : "\ue04e" + property string playlist : "\ue04f" + property string repeat_all : "\ue050" + property string lock : "\ue051" + property string slower : "\ue052" + property string clear : "\ue053" + property string profile_new : "\ue054" + property string addon_green : "\ue055" + property string addon_broken : "\ue056" + property string addon_magenta : "\ue057" + property string addon_cyan : "\ue058" + property string score : "\ue059" + property string addon_yellow : "\ue05a" + property string addon_blue : "\ue05b" + property string addon : "\ue05c" + property string addon_red : "\ue05d" + property string advprefs_playlist : "\ue05e" + property string advprefs_audio : "\ue05f" + property string advprefs_video : "\ue060" + property string advprefs_extended : "\ue061" + property string advprefs_codec : "\ue062" + property string advprefs_intf : "\ue063" + property string advprefs_sout : "\ue064" + property string win7thumbnail_next : "\ue065" + property string win7thumbnail_play : "\ue066" + property string win7thumbnail_pause : "\ue067" + property string win7thumbnail_prev : "\ue068" + property string next : "\ue069" + property string play : "\ue06a" + property string space : "\ue06b" + property string pause : "\ue06c" + property string faster2 : "\ue06d" + property string wait1 : "\ue06e" + property string wait2 : "\ue06f" + property string wait3 : "\ue070" + property string wait4 : "\ue071" + property string slower2 : "\ue072" + property string messages : "\ue073" + property string settings : "\ue074" + property string info : "\ue075" + property string preferences : "\ue076" + property string exit : "\ue077" + property string help : "\ue078" + property string stream : "\ue079" + property string valid : "\ue07a" + property string search_clear : "\ue07b" + property string menu : "\ue07c" + property string topbar_video : "\ue07d" + property string topbar_music : "\ue07e" + property string topbar_network : "\ue07f" + property string topbar_previous : "\ue080" + property string topbar_next : "\ue081" + property string topbar_filter : "\ue082" + property string topbar_sort : "\ue083" + +} \ No newline at end of file diff --git a/modules/gui/qt/vlc.qrc b/modules/gui/qt/vlc.qrc index 232fc0941e..e03613e474 100644 --- a/modules/gui/qt/vlc.qrc +++ b/modules/gui/qt/vlc.qrc @@ -48,6 +48,13 @@ <file alias="clear.svg">pixmaps/clear.svg</file> <file alias="atob.svg">pixmaps/toolbar/atob.svg</file> <file alias="atob_noa.svg">pixmaps/toolbar/atob_noa.svg</file> + <file alias="atob_bg_a.svg">pixmaps/toolbar/atob_bg_a.svg</file> + <file alias="atob_bg_ab.svg">pixmaps/toolbar/atob_bg_ab.svg</file> + <file alias="atob_bg_b.svg">pixmaps/toolbar/atob_bg_b.svg</file> + <file alias="atob_bg_none.svg">pixmaps/toolbar/atob_bg_none.svg</file> + <file alias="atob_fg_a.svg">pixmaps/toolbar/atob_fg_a.svg</file> + <file alias="atob_fg_ab.svg">pixmaps/toolbar/atob_fg_ab.svg</file> + <file alias="atob_fg_b.svg">pixmaps/toolbar/atob_fg_b.svg</file> <file alias="dvd_menu.svg">pixmaps/toolbar/dvd_menu.svg</file> <file alias="dvd_next.svg">pixmaps/toolbar/dvd_next.svg</file> <file alias="dvd_prev.svg">pixmaps/toolbar/dvd_prev.svg</file> _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
