vlc | branch: master | Prince Gupta <guptaprince8...@gmail.com> | Tue Sep 8 17:47:58 2020 +0530| [74c2f64c099ee85c13840eadd3341a2fba2a516f] | committer: Pierre Lamot
qml: add 'discover' and 'history' icons to VLCIcons Signed-off-by: Pierre Lamot <pie...@videolabs.io> > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=74c2f64c099ee85c13840eadd3341a2fba2a516f --- modules/gui/qt/pixmaps/VLCIcons.json | 4 +++- modules/gui/qt/pixmaps/VLCIcons.ttf | Bin 27796 -> 28804 bytes modules/gui/qt/pixmaps/history.svg | 1 + modules/gui/qt/pixmaps/topbar/discover.svg | 1 + modules/gui/qt/style/VLCIcons.qml | 24 +++++++++++++----------- 5 files changed, 18 insertions(+), 12 deletions(-) diff --git a/modules/gui/qt/pixmaps/VLCIcons.json b/modules/gui/qt/pixmaps/VLCIcons.json index 88ae38db3e..7a9fcad647 100644 --- a/modules/gui/qt/pixmaps/VLCIcons.json +++ b/modules/gui/qt/pixmaps/VLCIcons.json @@ -139,6 +139,7 @@ {"key":"topbar_next", "path": "./topbar/next.svg"}, {"key":"topbar_filter", "path": "./topbar/filter.svg"}, {"key":"topbar_sort", "path": "./topbar/sort.svg"}, + {"key":"topbar_discover", "path": "./topbar/discover.svg"}, {"key":"rename", "path": "./rename.svg"}, {"key":"del", "path": "./del.svg"}, {"key":"close", "path": "./close.svg"}, @@ -149,6 +150,7 @@ {"key":"time", "path": "./time.svg"}, {"key":"play_outline", "path": "./play_outline.svg"}, {"key":"enqueue", "path": "./enqueue.svg"}, - {"key":"back", "path": "./back.svg"} + {"key":"back", "path": "./back.svg"}, + {"key":"history", "path": "./history.svg"} ] } diff --git a/modules/gui/qt/pixmaps/VLCIcons.ttf b/modules/gui/qt/pixmaps/VLCIcons.ttf index ea5a217a86..7a8d1f562d 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/history.svg b/modules/gui/qt/pixmaps/history.svg new file mode 100644 index 0000000000..45a9d704c9 --- /dev/null +++ b/modules/gui/qt/pixmaps/history.svg @@ -0,0 +1 @@ +<svg id="Calque_1" data-name="Calque 1" xmlns="http://www.w3.org/2000/svg"; viewBox="0 0 48 48"><defs><style>.cls-1{fill:#1d1d1b;fill-rule:evenodd;}</style></defs><title>Icon-History</title><path class="cls-1" d="M38.75,17.77a16.15,16.15,0,0,1,0,12.46,16.23,16.23,0,0,1-8.52,8.52A16.08,16.08,0,0,1,24,40a16.06,16.06,0,0,1-9.77-3.33A16.2,16.2,0,0,1,10.75,33,14.26,14.26,0,0,1,9.48,30.7a15.67,15.67,0,0,1-.89-2.43l1.92-.54a13.66,13.66,0,0,0,1.94,4.16,14,14,0,0,0,7,5.36A13.68,13.68,0,0,0,24,38a13.84,13.84,0,0,0,3.71-.5,14,14,0,0,0,3.35-1.41,14.42,14.42,0,0,0,5-5,14,14,0,0,0,0-14.12,14.42,14.42,0,0,0-5-5,14,14,0,0,0-3.35-1.41,14,14,0,0,0-7.65.07,14.1,14.1,0,0,0-3.55,1.62,14.28,14.28,0,0,0-3,2.52A13.74,13.74,0,0,0,11.36,18H16v2H8V12h2v4.28c.18-.33.37-.66.58-1s.43-.62.65-.92A16,16,0,0,1,14.67,11a16.27,16.27,0,0,1,4.42-2.23A15.86,15.86,0,0,1,24,8a16.08,16.08,0,0,1,6.23,1.25,16.23,16.23,0,0,1,8.52,8.52ZM24,16v8.58l5.7,5.72-1.4,1.4L22,25.42V16Z"/></svg> \ No newline at end of file diff --git a/modules/gui/qt/pixmaps/topbar/discover.svg b/modules/gui/qt/pixmaps/topbar/discover.svg new file mode 100755 index 0000000000..0a7aa9bce1 --- /dev/null +++ b/modules/gui/qt/pixmaps/topbar/discover.svg @@ -0,0 +1 @@ +<svg id="Calque_1" data-name="Calque 1" xmlns="http://www.w3.org/2000/svg"; viewBox="0 0 48 48"><title>Icon-Discover</title><path d="M30.64,15.9l-8.79,4c-.43.19-.9.36-1.32.59s-.5.59-.67,1c-.72,1.68-1.45,3.37-2.18,5.05-.58,1.37-1.17,2.74-1.76,4.11a1.17,1.17,0,0,0,0,1.12l.06.07,0,0a.91.91,0,0,0,.64.38h.13a1.09,1.09,0,0,0,.62-.13l8.83-3.74a5,5,0,0,0,1.1-.5A3,3,0,0,0,28,26.63c.78-1.75,1.56-3.49,2.33-5.24l1.79-4.05A1.06,1.06,0,0,0,30.64,15.9Zm-4.32,9.29-.45,1-7.08,3,2.62-6.1.41-1,7.3-3.27Z"/><path d="M39,18.37a16.29,16.29,0,0,0-6.16-7.74A16.11,16.11,0,0,0,14.59,11a18.68,18.68,0,0,0-1.92,1.62,16,16,0,0,0-4.45,8.6,16.29,16.29,0,0,0,1.31,9.58A16,16,0,0,0,39,18.37Zm-1.17,7,0,.29s0,.19,0,.19l-.06.39c-.06.38-.15.76-.24,1.14s-.19.69-.3,1a3.57,3.57,0,0,1-.16.46l-.1.27,0,.11a.52.52,0,0,0-.06.15,15.75,15.75,0,0,1-1,1.87A11.51,11.51,0,0,1,34.59,33a13.17,13.17,0,0,1-1.68,1.66l-.39.33-.07,0,0,0-.24.17c-.31.23-.63.44-1,.64s-.6.35-.9.5l-.53.26-.27.12s-.18.07-.17.08a16.32,16.32,0,0,1-2.05.66c-.34.09-.69. 16-1,.22l-.39.06-.19,0-.38,0a16.55,16.55,0,0,1-2.11,0c-.33,0-.65-.06-1-.09l-.19,0-.29-.05-.57-.1A14.45,14.45,0,0,1,19,37l-.4-.15-.17-.07-.26-.12q-.54-.26-1.05-.54a10.13,10.13,0,0,1-.89-.55,4.73,4.73,0,0,1-.46-.32l-.25-.17,0,0-.06,0a15.49,15.49,0,0,1-1.73-1.61c-.25-.27-.49-.56-.72-.86l-.06-.06,0,0-.15-.2-.37-.54a15.88,15.88,0,0,1-1.1-2,1.34,1.34,0,0,1-.07-.18s-.1-.23-.08-.16L11,28.92c-.13-.35-.25-.7-.35-1.06s-.18-.69-.26-1c0-.19-.07-.38-.1-.57a1.08,1.08,0,0,1,0-.19,1.31,1.31,0,0,1,0-.25,15.41,15.41,0,0,1-.11-2.15c0-.35,0-.7.06-1.06,0-.13,0-.26,0-.39s0-.17,0-.19a2.88,2.88,0,0,1,0-.33,15.65,15.65,0,0,1,.53-2.12c.1-.31.22-.63.34-.94,0,0,.07-.15.08-.16a2.21,2.21,0,0,1,.12-.27c.08-.17.16-.36.26-.53a16,16,0,0,1,1.19-1.94l.12-.16,0,0a.23.23,0,0,1,.05-.07c.12-.16.25-.31.38-.47s.51-.56.77-.82a.81.81,0,0,0,.09-.1c.24-.24.49-.48.75-.7l.46-.39.05,0,0,0c.1-.06.19-.14.29-.21a14.13,14.13,0,0,1,1.94-1.18l.45-.22.26-.12.17-.07c.34-.14.68-.26,1-.38a14.72,14.72,0,0,1,2.06-.5l.29,0s.34-.05.11,0l.47,0c.3 9,0,.76-.05,1.15-.06s.71,0,1.06,0l.48,0,.28,0,.27,0a14.39,14.39,0,0,1,2.05.44c.33.09.66.2,1,.31l.49.19.16.07.27.12a13.87,13.87,0,0,1,3.67,2.46A15.72,15.72,0,0,1,35,15.49l0,.07.17.24.29.42c.22.33.43.66.63,1s.34.64.49,1l.12.27s.07.17.07.18l0-.07c.06.18.14.36.21.54a16.21,16.21,0,0,1,.6,2.14c0,.16.07.32.1.48l0,.29v0s0,.07,0,.1v0c0,.35.08.7.09,1.05A14.8,14.8,0,0,1,37.82,25.38Z"/></svg> \ No newline at end of file diff --git a/modules/gui/qt/style/VLCIcons.qml b/modules/gui/qt/style/VLCIcons.qml index 74e7bb6cad..c9e02cb165 100644 --- a/modules/gui/qt/style/VLCIcons.qml +++ b/modules/gui/qt/style/VLCIcons.qml @@ -152,16 +152,18 @@ Item { property string topbar_next : "\ue084" property string topbar_filter : "\ue085" property string topbar_sort : "\ue086" - property string rename : "\ue087" - property string del : "\ue088" - property string close : "\ue089" - property string ellipsis : "\ue08a" - property string grid : "\ue08b" - property string list : "\ue08c" - property string album_cover : "\ue08d" - property string time : "\ue08e" - property string play_outline : "\ue08f" - property string enqueue : "\ue090" - property string back : "\ue091" + property string topbar_discover : "\ue087" + property string rename : "\ue088" + property string del : "\ue089" + property string close : "\ue08a" + property string ellipsis : "\ue08b" + property string grid : "\ue08c" + property string list : "\ue08d" + property string album_cover : "\ue08e" + property string time : "\ue08f" + property string play_outline : "\ue090" + property string enqueue : "\ue091" + property string back : "\ue092" + property string history : "\ue093" } \ No newline at end of file _______________________________________________ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
