videolan
/
vlc
mirror of https://gitea.goldendeliverer.com/videolan/vlc.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

qt : new faster and slower icons

pull/162/head
Alexandre Perraud 3 years ago
committed by Jean-Baptiste Kempf
parent
2012d52bc8
commit
992dcf8968
13 changed files with 28 additions and 24 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      modules/gui/qt/Makefile.am
  2. 8
      modules/gui/qt/menus/menus.cpp
  3. 4
      modules/gui/qt/pixmaps/VLCIcons.json
  4. BIN
      modules/gui/qt/pixmaps/VLCIcons.ttf
  5. 3
      modules/gui/qt/pixmaps/icons/faster.svg
  6. 4
      modules/gui/qt/pixmaps/icons/ic_fluent_fast_forward.svg
  7. 4
      modules/gui/qt/pixmaps/icons/ic_fluent_rewind.svg
  8. 1
      modules/gui/qt/pixmaps/icons/slower.svg
  9. 4
      modules/gui/qt/pixmaps/menu/faster.svg
  10. 4
      modules/gui/qt/pixmaps/menu/ic_fluent_fast_forward.svg
  11. 4
      modules/gui/qt/pixmaps/menu/ic_fluent_rewind.svg
  12. 4
      modules/gui/qt/pixmaps/menu/slower.svg
  13. 4
      modules/gui/qt/vlc.qrc

8
modules/gui/qt/Makefile.am
View File

@ -663,7 +663,7 @@ libqt_plugin_la_RES = \
gui/qt/pixmaps/icons/expand_inverted.svg \
gui/qt/pixmaps/icons/expand.svg \
gui/qt/pixmaps/icons/extended.svg \
gui/qt/pixmaps/icons/faster.svg \
gui/qt/pixmaps/icons/ic_fluent_fast_forward.svg \
gui/qt/pixmaps/icons/frame-by-frame.svg \
gui/qt/pixmaps/icons/fullscreen.svg \
gui/qt/pixmaps/icons/ic_fluent_grid.svg \
@ -689,11 +689,11 @@ libqt_plugin_la_RES = \
gui/qt/pixmaps/icons/renderer.svg \
gui/qt/pixmaps/icons/ic_fluent_arrow_repeat_all.svg \
gui/qt/pixmaps/icons/ic_fluent_arrow_repeat_1.svg \
gui/qt/pixmaps/icons/ic_fluent_rewind.svg \
gui/qt/pixmaps/icons/ic_fluent_search.svg \
gui/qt/pixmaps/icons/ic_fluent_arrow_shuffle.svg \
gui/qt/pixmaps/icons/skip_back.svg \
gui/qt/pixmaps/icons/skip_for.svg \
gui/qt/pixmaps/icons/slower.svg \
gui/qt/pixmaps/icons/snapshot.svg \
gui/qt/pixmaps/icons/space.svg \
gui/qt/pixmaps/icons/stop.svg \
@ -725,7 +725,7 @@ libqt_plugin_la_RES = \
gui/qt/pixmaps/menu/download.svg \
gui/qt/pixmaps/menu/eject.svg \
gui/qt/pixmaps/menu/exit.svg \
gui/qt/pixmaps/menu/faster.svg \
gui/qt/pixmaps/menu/ic_fluent_fast_forward.svg \
gui/qt/pixmaps/menu/file.svg \
gui/qt/pixmaps/menu/folder.svg \
gui/qt/pixmaps/menu/help.svg \
@ -747,12 +747,12 @@ libqt_plugin_la_RES = \
gui/qt/pixmaps/menu/ic_fluent_arrow_repeat_all.svg \
gui/qt/pixmaps/menu/repeat_off.svg \
gui/qt/pixmaps/menu/ic_fluent_arrow_repeat_1.svg \
gui/qt/pixmaps/menu/ic_fluent_rewind.svg \
gui/qt/pixmaps/menu/search_clear.svg \
gui/qt/pixmaps/menu/settings.svg \
gui/qt/pixmaps/menu/skip_for.svg \
gui/qt/pixmaps/menu/skip_back.svg \
gui/qt/pixmaps/menu/ic_fluent_arrow_shuffle.svg \
gui/qt/pixmaps/menu/slower.svg \
gui/qt/pixmaps/menu/stop.svg \
gui/qt/pixmaps/menu/stream.svg \
gui/qt/pixmaps/menu/sync.svg \

8
modules/gui/qt/menus/menus.cpp
View File

@ -626,17 +626,17 @@ void VLCMenuBar::PopupMenuControlEntries( QMenu *menu, qt_intf_t *p_intf,
action = rateMenu->addAction( qtr( "&Faster" ), THEMIM,
&PlayerController::faster );
#ifndef __APPLE__ /* No icons in menus in Mac */
action->setIcon( QIcon( ":/menu/faster.svg") );
action->setIcon( QIcon( ":/menu/ic_fluent_fast_forward.svg") );
#endif
}
action = rateMenu->addAction( QIcon( ":/menu/faster.svg" ), qtr( "Faster (fine)" ), THEMIM,
action = rateMenu->addAction( QIcon( ":/menu/ic_fluent_fast_forward.svg" ), qtr( "Faster (fine)" ), THEMIM,
&PlayerController::littlefaster );
action = rateMenu->addAction( qtr( "N&ormal Speed" ), THEMIM,
&PlayerController::normalRate );
action = rateMenu->addAction( QIcon( ":/menu/slower.svg" ), qtr( "Slower (fine)" ), THEMIM,
action = rateMenu->addAction( QIcon( ":/menu/ic_fluent_rewind.svg" ), qtr( "Slower (fine)" ), THEMIM,
&PlayerController::littleslower );
if( b_normal )
@ -644,7 +644,7 @@ void VLCMenuBar::PopupMenuControlEntries( QMenu *menu, qt_intf_t *p_intf,
action = rateMenu->addAction( qtr( "Slo&wer" ), THEMIM,
&PlayerController::slower );
#ifndef __APPLE__ /* No icons in menus in Mac */
action->setIcon( QIcon( ":/menu/slower.svg") );
action->setIcon( QIcon( ":/menu/ic_fluent_rewind.svg") );
#endif
}

4
modules/gui/qt/pixmaps/VLCIcons.json
View File

@ -29,7 +29,7 @@
{"key":"expand_inverted", "path": "./icons/expand_inverted.svg"},
{"key":"expand", "path": "./icons/expand.svg"},
{"key":"extended", "path": "./icons/extended.svg"},
{"key":"faster", "path": "./icons/faster.svg"},
{"key":"faster", "path": "./icons/ic_fluent_fast_forward.svg"},
{"key":"frame_by_frame", "path": "./icons/frame-by-frame.svg"},
{"key":"fullscreen", "path": "./icons/fullscreen.svg"},
{"key":"grid", "path": "./icons/ic_fluent_grid.svg"},
@ -56,7 +56,7 @@
{"key":"shuffle", "path": "./icons/ic_fluent_arrow_shuffle.svg"},
{"key":"skip_back", "path": "./icons/skip_back.svg"},
{"key":"skip_for", "path": "./icons/skip_for.svg"},
{"key":"slower", "path": "./icons/slower.svg"},
{"key":"slower", "path": "./icons/ic_fluent_rewind.svg"},
{"key":"snapshot", "path": "./icons/snapshot.svg"},
{"key":"space", "path": "./icons/space.svg"},
{"key":"stop", "path": "./icons/stop.svg"},

BIN
modules/gui/qt/pixmaps/VLCIcons.ttf
View File

Binary file not shown.

3
modules/gui/qt/pixmaps/icons/faster.svg
View File

@ -1,3 +0,0 @@
<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M12.7105 4.1584L21.7105 11.1584C22.0965 11.4587 22.0965 12.0422 21.7104 12.3425L12.7089 19.3425C12.2162 19.7256 11.4985 19.3745 11.4985 18.7503V13.673L4.20888 19.3425C3.7162 19.7256 2.99847 19.3745 2.99847 18.7503L3 4.75033C3.00007 4.12626 3.71784 3.77525 4.21046 4.1584L11.4985 9.82702L11.5 4.75033C11.5001 4.12626 12.2178 3.77525 12.7105 4.1584Z" fill="#212121"/>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 477 B

4
modules/gui/qt/pixmaps/icons/ic_fluent_fast_forward.svg
View File

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg id="svg4" width="24" height="24" fill="none" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
<path id="path2" d="m12.018 7.4862c0-0.8191 0.9308-1.2908 1.5914-0.80641l5.8796 4.3117c0.681 0.49944 0.681 1.5165 0 2.016l-5.8796 4.3117c-0.6606 0.4844-1.5914 0.0127-1.5914-0.8064v-3.16l-5.4086 3.9664c-0.66052 0.4844-1.5914 0.0127-1.5914-0.8064v-9.0266c0-0.8191 0.93084-1.2908 1.5914-0.80641l5.4086 3.9663zm6.8796 4.3117-5.8796-4.3117v9.0266l5.8796-4.3117c0.1362-0.0999 0.1362-0.30335 0-0.40324zm-7 0-5.8796-4.3117v9.0266l5.8796-4.3117c0.1362-0.0999 0.1362-0.30335 0-0.40324z" fill="#212121"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 661 B

4
modules/gui/qt/pixmaps/icons/ic_fluent_rewind.svg
View File

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg id="svg4" width="24" height="24" fill="none" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
<path id="path2" d="m12 7.4871c0-0.8191-0.93084-1.2908-1.5914-0.8064l-5.8796 4.3117c-0.68106 0.49945-0.68106 1.5166 0 2.016l5.8796 4.3117c0.66052 0.4844 1.5914 0.0127 1.5914-0.8064v-3.1599l5.4086 3.9663c0.6606 0.4844 1.5914 0.0127 1.5914-0.8064v-9.0266c0-0.8191-0.9308-1.2908-1.5914-0.8064l-5.4086 3.9663zm-6.8796 4.3117 5.8796-4.3117v9.0266l-5.8796-4.3117c-0.13621-0.0998-0.13621-0.30327 0-0.40316zm7 0 5.8796-4.3117v9.0266l-5.8796-4.3117c-0.1362-0.0998-0.1362-0.30327 0-0.40316z" fill="#212121"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 666 B

1
modules/gui/qt/pixmaps/icons/slower.svg
View File

@ -1 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none"><path d="M12.288 19.342l-9-7a.75.75 0 0 1 0-1.184l9.002-7a.75.75 0 0 1 1.21.593v5.077l7.29-5.67a.75.75 0 0 1 1.21.593l-.002 14a.75.75 0 0 1-1.21.591L13.5 13.674l-.002 5.077a.75.75 0 0 1-1.21.591z" fill="#212121"/></svg>
Side by Side

Before

Width:  |  Height:  |  Size: 315 B

4
modules/gui/qt/pixmaps/menu/faster.svg
View File

@ -1,4 +0,0 @@
<svg viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg">
<path d="M31.201 7.218a6 2 73.214 0 0-.139.027 6 2 73.214 0 0-.376 5.613 6 2 40.402 0 0-5.297-1.904 6 2 40.402 0 0 3.273 5.412 6 2 40.402 0 0 2.445 1.73 4 4 0 0 0-.107.903 4 4 0 0 0 .611 2.119A11 4 0 0 0 24 19.998a11 4 0 0 0-4.068.288A4 4 0 0 0 17 18.999a4 4 0 0 0-2.088.594 1 1 0 0 0-.912-.594 1 1 0 0 0-1 1 1 1 0 0 0 .594.914A4 4 0 0 0 13 22.999a4 4 0 0 0 .05.625 11 4 0 0 0-.027.203 2 4 80 0 0-1.416.115 2 4 80 0 0-3.591 2.664 2 4 80 0 0 4.287 1.276 2 4 80 0 0 2.949-1.29 4 4 0 0 0 1.44.391A11 4 0 0 0 24 27.999a11 4 0 0 0 8.627-1.524 4 2 10 0 0 3.07 1.407 4 2 10 0 0 4.287-1.276 4 2 10 0 0-3.591-2.664 4 2 10 0 0-1.41-.119 11 4 0 0 0-.352-.842 4 4 0 0 0 .37.018 4 4 0 0 0 4-4 4 4 0 0 0-3.724-3.984 6 2 73.214 0 0-.568-2.604 6 2 73.214 0 0-3.508-5.193z" fill="#747474"/>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 845 B

4
modules/gui/qt/pixmaps/menu/ic_fluent_fast_forward.svg
View File

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg id="svg4" width="24" height="24" fill="none" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
<path id="path2" d="m12.018 7.4862c0-0.8191 0.9308-1.2908 1.5914-0.80641l5.8796 4.3117c0.681 0.49944 0.681 1.5165 0 2.016l-5.8796 4.3117c-0.6606 0.4844-1.5914 0.0127-1.5914-0.8064v-3.16l-5.4086 3.9664c-0.66052 0.4844-1.5914 0.0127-1.5914-0.8064v-9.0266c0-0.8191 0.93084-1.2908 1.5914-0.80641l5.4086 3.9663zm6.8796 4.3117-5.8796-4.3117v9.0266l5.8796-4.3117c0.1362-0.0999 0.1362-0.30335 0-0.40324zm-7 0-5.8796-4.3117v9.0266l5.8796-4.3117c0.1362-0.0999 0.1362-0.30335 0-0.40324z" fill="#212121"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 661 B

4
modules/gui/qt/pixmaps/menu/ic_fluent_rewind.svg
View File

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg id="svg4" width="24" height="24" fill="none" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
<path id="path2" d="m12 7.4871c0-0.8191-0.93084-1.2908-1.5914-0.8064l-5.8796 4.3117c-0.68106 0.49945-0.68106 1.5166 0 2.016l5.8796 4.3117c0.66052 0.4844 1.5914 0.0127 1.5914-0.8064v-3.1599l5.4086 3.9663c0.6606 0.4844 1.5914 0.0127 1.5914-0.8064v-9.0266c0-0.8191-0.9308-1.2908-1.5914-0.8064l-5.4086 3.9663zm-6.8796 4.3117 5.8796-4.3117v9.0266l-5.8796-4.3117c-0.13621-0.0998-0.13621-0.30327 0-0.40316zm7 0 5.8796-4.3117v9.0266l-5.8796-4.3117c-0.1362-0.0998-0.1362-0.30327 0-0.40316z" fill="#212121"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 666 B

4
modules/gui/qt/pixmaps/menu/slower.svg
View File

@ -1,4 +0,0 @@
<svg viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg">
<path d="M24 16a12 12 0 0 0-12 12h2a4 4 0 0 0 4 4 4 4 0 0 0 4-4h4a4 4 0 0 0 4 4 4 4 0 0 0 4-4 4 4 0 0 0-.01-.26A8 8 0 0 0 40 20h4a4 4 0 0 0-4-4 4 4 0 0 0-4 4 4 4 0 0 1-1.19 2.846A12 12 0 0 0 24 16z" fill="#747474"/>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 287 B

4
modules/gui/qt/vlc.qrc
View File

@ -19,7 +19,7 @@
<file alias="download.svg">pixmaps/menu/download.svg</file>
<file alias="eject.svg">pixmaps/menu/eject.svg</file>
<file alias="exit.svg">pixmaps/menu/exit.svg</file>
<file alias="faster.svg">pixmaps/menu/faster.svg</file>
<file alias="ic_fluent_fast_forward.svg">pixmaps/menu/ic_fluent_fast_forward.svg</file>
<file alias="file.svg">pixmaps/menu/file.svg</file>
<file alias="folder.svg">pixmaps/menu/folder.svg</file>
<file alias="help.svg">pixmaps/menu/help.svg</file>
@ -41,12 +41,12 @@
<file alias="ic_fluent_arrow_repeat_all.svg">pixmaps/menu/ic_fluent_arrow_repeat_all.svg</file>
<file alias="repeat_off.svg">pixmaps/menu/repeat_off.svg</file>
<file alias="ic_fluent_arrow_repeat_1.svg">pixmaps/menu/ic_fluent_arrow_repeat_1.svg</file>
<file alias="ic_fluent_rewind.svg">pixmaps/menu/ic_fluent_rewind.svg</file>
<file alias="search_clear.svg">pixmaps/menu/search_clear.svg</file>
<file alias="settings.svg">pixmaps/menu/settings.svg</file>
<file alias="ic_fluent_arrow_shuffle.svg">pixmaps/menu/ic_fluent_arrow_shuffle.svg</file>
<file alias="skip_fw.svg">pixmaps/menu/skip_for.svg</file>
<file alias="skip_back.svg">pixmaps/menu/skip_back.svg</file>
<file alias="slower.svg">pixmaps/menu/slower.svg</file>
<file alias="stop.svg">pixmaps/menu/stop.svg</file>
<file alias="stream.svg">pixmaps/menu/stream.svg</file>
<file alias="sync.svg">pixmaps/menu/sync.svg</file>

Write Preview
Loading…
Cancel
Save