[vlc-commits] [Git][videolan/vlc][master] 3 commits: qml/ProgramButton: Update to 'tv' icon
Felix Paul Kühne (@fkuehne)
gitlab at videolan.org
Fri Sep 9 10:35:23 UTC 2022
Felix Paul Kühne pushed to branch master at VideoLAN / VLC
Commits:
40d03bba by Benjamin Arnaud at 2022-09-09T09:46:41+00:00
qml/ProgramButton: Update to 'tv' icon
- - - - -
49598b82 by Benjamin Arnaud at 2022-09-09T09:46:41+00:00
qml/TeletextButton: Update to 'tvtelx' icon
- - - - -
42501aae by Benjamin Arnaud at 2022-09-09T09:46:41+00:00
qt/pixmaps: Update tv(s) icons
- - - - -
6 changed files:
- modules/gui/qt/pixmaps/VLCIcons.ttf
- modules/gui/qt/pixmaps/icons/tv.svg
- modules/gui/qt/pixmaps/icons/tvtelx.svg
- modules/gui/qt/player/qml/ControlbarControls.qml
- modules/gui/qt/player/qml/controlbarcontrols/ProgramButton.qml
- modules/gui/qt/player/qml/controlbarcontrols/TeletextButton.qml
Changes:
=====================================
modules/gui/qt/pixmaps/VLCIcons.ttf
=====================================
Binary files a/modules/gui/qt/pixmaps/VLCIcons.ttf and b/modules/gui/qt/pixmaps/VLCIcons.ttf differ
=====================================
modules/gui/qt/pixmaps/icons/tv.svg
=====================================
@@ -1,4 +1,3 @@
-<svg viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg">
- <path d="M12 8c-2.216 0-4 1.784-4 4v24c0 2.216 1.784 4 4 4h24c2.216 0 4-1.784 4-4V12c0-2.216-1.784-4-4-4zm0 4h6v6h-6zm10 0h14v6H22zM12 24h24v4H12zm0 8h24v4H12z" fill="#747474" fill-rule="evenodd"/>
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M4.75 4C3.23122 4 2 5.23122 2 6.75V15.25C2 16.7688 3.23122 18 4.75 18H19.25C20.7688 18 22 16.7688 22 15.25V6.75C22 5.23122 20.7688 4 19.25 4H4.75ZM3.5 6.75C3.5 6.05964 4.05964 5.5 4.75 5.5H19.25C19.9404 5.5 20.5 6.05964 20.5 6.75V15.25C20.5 15.9404 19.9404 16.5 19.25 16.5H4.75C4.05964 16.5 3.5 15.9404 3.5 15.25V6.75ZM5.75 19.5C5.33579 19.5 5 19.8358 5 20.25C5 20.6642 5.33579 21 5.75 21H18.25C18.6642 21 19 20.6642 19 20.25C19 19.8358 18.6642 19.5 18.25 19.5H5.75Z" fill="#212121"/>
</svg>
-
=====================================
modules/gui/qt/pixmaps/icons/tvtelx.svg
=====================================
@@ -1,4 +1,3 @@
-<svg viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg">
- <path d="M12 8c-2.216 0-4 1.784-4 4v24c0 2.216 1.784 4 4 4h24c2.216 0 4-1.784 4-4V12c0-2.216-1.784-4-4-4zm0 4h6v6h-6zm10 0h14v6H22zM12 24h24v4H12zm0 8h24v4H12z" fill="#e0e0e0" fill-rule="evenodd"/>
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M2 6.75C2 5.23122 3.23122 4 4.75 4H19.25C20.7688 4 22 5.23122 22 6.75V15.25C22 16.7688 20.7688 18 19.25 18H4.75C3.23122 18 2 16.7688 2 15.25V6.75ZM4.75 5.5C4.05964 5.5 3.5 6.05964 3.5 6.75V15.25C3.5 15.9404 4.05964 16.5 4.75 16.5H19.25C19.9404 16.5 20.5 15.9404 20.5 15.25V6.75C20.5 6.05964 19.9404 5.5 19.25 5.5H4.75ZM5 20.25C5 19.8358 5.33579 19.5 5.75 19.5H18.25C18.6642 19.5 19 19.8358 19 20.25C19 20.6642 18.6642 21 18.25 21H5.75C5.33579 21 5 20.6642 5 20.25ZM5 7.70588C5 7.31603 5.33579 7 5.75 7H18.25C18.6642 7 19 7.31603 19 7.70588C19 8.09573 18.6642 8.41176 18.25 8.41176H5.75C5.33579 8.41176 5 8.09573 5 7.70588ZM5.75 10.2941C5.33579 10.2941 5 10.6102 5 11C5 11.3898 5.33579 11.7059 5.75 11.7059H18.25C18.6642 11.7059 19 11.3898 19 11C19 10.6102 18.6642 10.2941 18.25 10.2941H5.75ZM5.75 13.5882C5.33579 13.5882 5 13.9043 5 14.2941C5 14.684 5.33579 15 5.75 15H18.25C18.6642 15 19 14.684 19 14.2941C19 13.9043 18.6642 13.5882 18.25 13.5882H5.75Z" fill="#212121"/>
</svg>
-
=====================================
modules/gui/qt/player/qml/ControlbarControls.qml
=====================================
@@ -58,7 +58,7 @@ QtObject {
{ id: ControlListModel.VOLUME, file: "VolumeWidget.qml", label: VLCIcons.volume_high, text: I18n.qtr("Volume Widget") },
{ id: ControlListModel.NAVIGATION_BUTTONS, file: "NavigationWidget.qml", label: VLCIcons.dvd_menu, text: I18n.qtr("Navigation") },
{ id: ControlListModel.DVD_MENUS_BUTTON, file: "DvdMenuButton.qml", label: VLCIcons.dvd_menu, text: I18n.qtr("DVD menus") },
- { id: ControlListModel.PROGRAM_BUTTON, file: "ProgramButton.qml", label: VLCIcons.bookmark, text: I18n.qtr("Program Button") },
+ { id: ControlListModel.PROGRAM_BUTTON, file: "ProgramButton.qml", label: VLCIcons.tv, text: I18n.qtr("Program Button") },
{ id: ControlListModel.TELETEXT_BUTTONS, file: "TeletextButton.qml", label: VLCIcons.tvtelx, text: I18n.qtr("Teletext") },
{ id: ControlListModel.RENDERER_BUTTON, file: "RendererButton.qml", label: VLCIcons.renderer, text: I18n.qtr("Renderer Button") },
{ id: ControlListModel.ASPECT_RATIO_COMBOBOX, file: "AspectRatioWidget.qml", label: VLCIcons.aspect_ratio, text: I18n.qtr("Aspect Ratio") },
=====================================
modules/gui/qt/player/qml/controlbarcontrols/ProgramButton.qml
=====================================
@@ -30,8 +30,7 @@ Widgets.IconControlButton {
signal requestLockUnlockAutoHide(bool lock)
- // FIXME: Placeholder icon.
- iconText: VLCIcons.bookmark
+ iconText: VLCIcons.tv
text: I18n.qtr("Programs")
=====================================
modules/gui/qt/player/qml/controlbarcontrols/TeletextButton.qml
=====================================
@@ -46,7 +46,7 @@ Widgets.IconControlButton {
enabled: Player.isTeletextAvailable
- iconText: VLCIcons.tv
+ iconText: VLCIcons.tvtelx
text: I18n.qtr("Teletext")
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/fa49f8c3663540aad9a96a0d2097205550f7e83f...42501aaed8c5e92198bd32482278a476e16682c8
--
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/fa49f8c3663540aad9a96a0d2097205550f7e83f...42501aaed8c5e92198bd32482278a476e16682c8
You're receiving this email because of your account on code.videolan.org.
VideoLAN code repository instance
More information about the vlc-commits
mailing list