[vlc-commits] qml: add a 'clear playlist' icon
Pierre Lamot
git at videolan.org
Tue Nov 19 16:50:10 CET 2019
vlc | branch: master | Pierre Lamot <pierre at videolabs.io> | Mon Nov 18 12:52:45 2019 +0100| [a58be347c106fca419616800751163c1bf7bac01] | committer: Jean-Baptiste Kempf
qml: add a 'clear playlist' icon
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=a58be347c106fca419616800751163c1bf7bac01
---
modules/gui/qt/pixmaps/VLCIcons.json | 1 +
modules/gui/qt/pixmaps/VLCIcons.ttf | Bin 25520 -> 25612 bytes
modules/gui/qt/pixmaps/playlist/playlist_clear.svg | 100 +++++++++++++++
modules/gui/qt/qml/style/VLCIcons.qml | 137 +++++++++------------
4 files changed, 162 insertions(+), 76 deletions(-)
diff --git a/modules/gui/qt/pixmaps/VLCIcons.json b/modules/gui/qt/pixmaps/VLCIcons.json
index 1434bf93c1..2551c96488 100644
--- a/modules/gui/qt/pixmaps/VLCIcons.json
+++ b/modules/gui/qt/pixmaps/VLCIcons.json
@@ -84,6 +84,7 @@
{"key":"capture", "path": "./playlist/sidebar-icons/capture.svg"},
{"key":"podcast", "path": "./playlist/sidebar-icons/podcast.svg"},
{"key":"playlist", "path": "./playlist/playlist.svg"},
+ {"key":"playlist_clear", "path": "./playlist/playlist_clear.svg"},
{"key":"repeat_all", "path": "./playlist/repeat_all.svg"},
{"key":"active_indicator", "path": "./playlist/active_indicator.svg"},
{"key":"lock", "path": "./lock.svg"},
diff --git a/modules/gui/qt/pixmaps/VLCIcons.ttf b/modules/gui/qt/pixmaps/VLCIcons.ttf
index 1c094a5220..89e320adfd 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/playlist/playlist_clear.svg b/modules/gui/qt/pixmaps/playlist/playlist_clear.svg
new file mode 100644
index 0000000000..ae2089a788
--- /dev/null
+++ b/modules/gui/qt/pixmaps/playlist/playlist_clear.svg
@@ -0,0 +1,100 @@
+<?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="playlist_clear.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="1051"
+ id="namedview6"
+ showgrid="true"
+ inkscape:zoom="9.8333334"
+ inkscape:cx="-10.629028"
+ inkscape:cy="24.387301"
+ inkscape:window-x="1920"
+ 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" />
+ <inkscape:grid
+ type="xygrid"
+ id="grid4488" />
+ </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:3;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 392,1012.3622 v 5.9994 l 32,-6e-4 v -5.9994 z"
+ id="path10525"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccccc" />
+ <path
+ sodipodi:nodetypes="ccccc"
+ inkscape:connector-curvature="0"
+ id="path10527"
+ d="m 392,1024.3622 v 5.9994 l 32,-6e-4 v -5.9994 z"
+ style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#747474;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+ <path
+ style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#747474;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;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 392,1036.3622 v 5.9994 l 18,-6e-4 v -5.9994 z"
+ id="path10529"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccccc" />
+ <path
+ sodipodi:nodetypes="ccccccccccccc"
+ inkscape:connector-curvature="0"
+ id="path7127-9"
+ d="m 416.73332,1046.3454 4.76668,-4.7667 4.76668,4.7667 1.73332,-1.7333 -4.76667,-4.7667 4.76667,-4.7666 -1.73332,-1.7334 -4.76668,4.7666 -4.76668,-4.7666 -1.73332,1.7334 4.76667,4.7666 -4.76667,4.7667 z"
+ style="display:inline;fill:#747474;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.43333361px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+ </g>
+</svg>
diff --git a/modules/gui/qt/qml/style/VLCIcons.qml b/modules/gui/qt/qml/style/VLCIcons.qml
index 70db7f3283..c94560fa68 100644
--- a/modules/gui/qt/qml/style/VLCIcons.qml
+++ b/modules/gui/qt/qml/style/VLCIcons.qml
@@ -1,20 +1,4 @@
-/*****************************************************************************
- * Copyright (C) 2019 VLC authors and VideoLAN
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * ( at your option ) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * 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 was generated by makeIconFont.py, please do not edit by hand
*/
@@ -109,64 +93,65 @@ Item {
property string capture : "\ue04d"
property string podcast : "\ue04e"
property string playlist : "\ue04f"
- property string repeat_all : "\ue050"
- property string active_indicator : "\ue051"
- property string lock : "\ue052"
- property string slower : "\ue053"
- property string clear : "\ue054"
- property string profile_new : "\ue055"
- property string addon_green : "\ue056"
- property string addon_broken : "\ue057"
- property string addon_magenta : "\ue058"
- property string addon_cyan : "\ue059"
- property string score : "\ue05a"
- property string addon_yellow : "\ue05b"
- property string addon_blue : "\ue05c"
- property string addon : "\ue05d"
- property string addon_red : "\ue05e"
- property string advprefs_playlist : "\ue05f"
- property string advprefs_audio : "\ue060"
- property string advprefs_video : "\ue061"
- property string advprefs_extended : "\ue062"
- property string advprefs_codec : "\ue063"
- property string advprefs_intf : "\ue064"
- property string advprefs_sout : "\ue065"
- property string win7thumbnail_next : "\ue066"
- property string win7thumbnail_play : "\ue067"
- property string win7thumbnail_pause : "\ue068"
- property string win7thumbnail_prev : "\ue069"
- property string next : "\ue06a"
- property string play : "\ue06b"
- property string space : "\ue06c"
- property string pause : "\ue06d"
- property string faster2 : "\ue06e"
- property string wait1 : "\ue06f"
- property string wait2 : "\ue070"
- property string wait3 : "\ue071"
- property string wait4 : "\ue072"
- property string slower2 : "\ue073"
- property string messages : "\ue074"
- property string settings : "\ue075"
- property string info : "\ue076"
- property string preferences : "\ue077"
- property string exit : "\ue078"
- property string help : "\ue079"
- property string stream : "\ue07a"
- property string valid : "\ue07b"
- property string search_clear : "\ue07c"
- property string menu : "\ue07d"
- property string topbar_video : "\ue07e"
- property string topbar_music : "\ue07f"
- property string topbar_network : "\ue080"
- property string topbar_previous : "\ue081"
- property string topbar_next : "\ue082"
- property string topbar_filter : "\ue083"
- property string topbar_sort : "\ue084"
- property string rename : "\ue085"
- property string del : "\ue086"
- property string close : "\ue087"
- property string ellipsis : "\ue088"
- property string grid : "\ue089"
- property string list : "\ue08a"
+ property string playlist_clear : "\ue050"
+ property string repeat_all : "\ue051"
+ property string active_indicator : "\ue052"
+ property string lock : "\ue053"
+ property string slower : "\ue054"
+ property string clear : "\ue055"
+ property string profile_new : "\ue056"
+ property string addon_green : "\ue057"
+ property string addon_broken : "\ue058"
+ property string addon_magenta : "\ue059"
+ property string addon_cyan : "\ue05a"
+ property string score : "\ue05b"
+ property string addon_yellow : "\ue05c"
+ property string addon_blue : "\ue05d"
+ property string addon : "\ue05e"
+ property string addon_red : "\ue05f"
+ property string advprefs_playlist : "\ue060"
+ property string advprefs_audio : "\ue061"
+ property string advprefs_video : "\ue062"
+ property string advprefs_extended : "\ue063"
+ property string advprefs_codec : "\ue064"
+ property string advprefs_intf : "\ue065"
+ property string advprefs_sout : "\ue066"
+ property string win7thumbnail_next : "\ue067"
+ property string win7thumbnail_play : "\ue068"
+ property string win7thumbnail_pause : "\ue069"
+ property string win7thumbnail_prev : "\ue06a"
+ property string next : "\ue06b"
+ property string play : "\ue06c"
+ property string space : "\ue06d"
+ property string pause : "\ue06e"
+ property string faster2 : "\ue06f"
+ property string wait1 : "\ue070"
+ property string wait2 : "\ue071"
+ property string wait3 : "\ue072"
+ property string wait4 : "\ue073"
+ property string slower2 : "\ue074"
+ property string messages : "\ue075"
+ property string settings : "\ue076"
+ property string info : "\ue077"
+ property string preferences : "\ue078"
+ property string exit : "\ue079"
+ property string help : "\ue07a"
+ property string stream : "\ue07b"
+ property string valid : "\ue07c"
+ property string search_clear : "\ue07d"
+ property string menu : "\ue07e"
+ property string topbar_video : "\ue07f"
+ property string topbar_music : "\ue080"
+ property string topbar_network : "\ue081"
+ property string topbar_previous : "\ue082"
+ property string topbar_next : "\ue083"
+ property string topbar_filter : "\ue084"
+ property string topbar_sort : "\ue085"
+ property string rename : "\ue086"
+ property string del : "\ue087"
+ property string close : "\ue088"
+ property string ellipsis : "\ue089"
+ property string grid : "\ue08a"
+ property string list : "\ue08b"
}
\ No newline at end of file
More information about the vlc-commits
mailing list