[vlc-commits] qt: Remove duplicated icons
Hugo Beauzée-Luyssen
git at videolan.org
Tue Aug 8 13:32:42 CEST 2017
vlc | branch: master | Hugo Beauzée-Luyssen <hugo at beauzee.fr> | Mon Aug 7 15:20:34 2017 +0200| [e8251e391fc0cb17274b655c2ec01cfe5b8ec771] | committer: Hugo Beauzée-Luyssen
qt: Remove duplicated icons
Fix #18650
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=e8251e391fc0cb17274b655c2ec01cfe5b8ec771
---
modules/gui/qt/Makefile.am | 5 -----
modules/gui/qt/components/playlist/standardpanel.cpp | 4 ++--
modules/gui/qt/dialogs/vlm.cpp | 6 +++---
modules/gui/qt/menus.cpp | 10 +++++-----
modules/gui/qt/pixmaps/next_16px.png | Bin 446 -> 0 bytes
modules/gui/qt/pixmaps/pause_16px.png | Bin 218 -> 0 bytes
modules/gui/qt/pixmaps/play_16px.png | Bin 561 -> 0 bytes
modules/gui/qt/pixmaps/previous_16px.png | Bin 449 -> 0 bytes
modules/gui/qt/pixmaps/stop_16px.png | Bin 210 -> 0 bytes
modules/gui/qt/vlc.qrc | 5 -----
10 files changed, 10 insertions(+), 20 deletions(-)
diff --git a/modules/gui/qt/Makefile.am b/modules/gui/qt/Makefile.am
index 56b90dc630..3dd9667741 100644
--- a/modules/gui/qt/Makefile.am
+++ b/modules/gui/qt/Makefile.am
@@ -327,13 +327,10 @@ libqt_plugin_la_RES = \
gui/qt/pixmaps/menus/settings_16px.png \
gui/qt/pixmaps/menus/stream_16px.png \
gui/qt/pixmaps/next.png \
- gui/qt/pixmaps/next_16px.png \
gui/qt/pixmaps/noart-64.png \
gui/qt/pixmaps/noart.png \
gui/qt/pixmaps/pause.png \
- gui/qt/pixmaps/pause_16px.png \
gui/qt/pixmaps/play.png \
- gui/qt/pixmaps/play_16px.png \
gui/qt/pixmaps/playlist/add.png \
gui/qt/pixmaps/playlist/playlist.png \
gui/qt/pixmaps/playlist/remove.png \
@@ -375,7 +372,6 @@ libqt_plugin_la_RES = \
gui/qt/pixmaps/prefs/spref_cone_Subtitles_64.png \
gui/qt/pixmaps/prefs/spref_cone_Video_64.png \
gui/qt/pixmaps/previous.png \
- gui/qt/pixmaps/previous_16px.png \
gui/qt/pixmaps/profile_new.png \
gui/qt/pixmaps/sample_complete.png \
gui/qt/pixmaps/sample_minimal.png \
@@ -384,7 +380,6 @@ libqt_plugin_la_RES = \
gui/qt/pixmaps/slower2.png \
gui/qt/pixmaps/space.png \
gui/qt/pixmaps/stop.png \
- gui/qt/pixmaps/stop_16px.png \
gui/qt/pixmaps/toolbar/arrows.png \
gui/qt/pixmaps/toolbar/aspect-ratio.png \
gui/qt/pixmaps/toolbar/atob.png \
diff --git a/modules/gui/qt/components/playlist/standardpanel.cpp b/modules/gui/qt/components/playlist/standardpanel.cpp
index b6dd29fd2e..345c735892 100644
--- a/modules/gui/qt/components/playlist/standardpanel.cpp
+++ b/modules/gui/qt/components/playlist/standardpanel.cpp
@@ -186,10 +186,10 @@ bool StandardPLPanel::popup( const QPoint &point )
/* Play/Stream/Info static actions */
- ADD_MENU_ENTRY( QIcon( ":/menu/play" ), qtr(I_POP_PLAY),
+ ADD_MENU_ENTRY( QIcon( ":/toolbar/play_b" ), qtr(I_POP_PLAY),
VLCModelSubInterface::ACTION_PLAY )
- ADD_MENU_ENTRY( QIcon( ":/menu/pause" ), qtr("Pause"),
+ ADD_MENU_ENTRY( QIcon( ":/toolbar/pause_b" ), qtr("Pause"),
VLCModelSubInterface::ACTION_PAUSE )
ADD_MENU_ENTRY( QIcon( ":/menu/stream" ), qtr(I_POP_STREAM),
diff --git a/modules/gui/qt/dialogs/vlm.cpp b/modules/gui/qt/dialogs/vlm.cpp
index c63a9bf79a..336938ac50 100644
--- a/modules/gui/qt/dialogs/vlm.cpp
+++ b/modules/gui/qt/dialogs/vlm.cpp
@@ -535,7 +535,7 @@ VLMBroadcast::VLMBroadcast( VLMWrapper *vlm, const QString& _name,
b_looped = _looped;
playButton = new QToolButton;
- playButton->setIcon( QIcon( ":/menu/play" ) );
+ playButton->setIcon( QIcon( ":/toolbar/play_b" ) );
playButton->setToolTip( qtr("Play") );
objLayout->addWidget( playButton, 1, 0 );
b_playing = true;
@@ -570,12 +570,12 @@ void VLMBroadcast::togglePlayPause()
if( b_playing )
{
vlm->ControlBroadcast( name, ControlBroadcastPause );
- playButton->setIcon( QIcon( ":/menu/pause" ) );
+ playButton->setIcon( QIcon( ":/toolbar/pause_b" ) );
}
else
{
vlm->ControlBroadcast( name, ControlBroadcastPlay );
- playButton->setIcon( QIcon( ":/menu/play" ) );
+ playButton->setIcon( QIcon( ":/toolbar/play_b" ) );
}
b_playing = !b_playing;
}
diff --git a/modules/gui/qt/menus.cpp b/modules/gui/qt/menus.cpp
index 6395a0a068..5ffd8ebe28 100644
--- a/modules/gui/qt/menus.cpp
+++ b/modules/gui/qt/menus.cpp
@@ -811,19 +811,19 @@ void VLCMenuBar::PopupMenuPlaylistEntries( QMenu *menu,
action = menu->addAction( qtr( "&Play" ),
ActionsManager::getInstance( p_intf ), SLOT( play() ) );
#ifndef __APPLE__ /* No icons in menus in Mac */
- action->setIcon( QIcon( ":/menu/play" ) );
+ action->setIcon( QIcon( ":/toolbar/play_b" ) );
#endif
}
else
{
action = addMIMStaticEntry( p_intf, menu, qtr( "Pause" ),
- ":/menu/pause", SLOT( togglePlayPause() ) );
+ ":/toolbar/pause_b", SLOT( togglePlayPause() ) );
}
action->setData( ACTION_DELETE_ON_REBUILD );
/* Stop */
action = addMIMStaticEntry( p_intf, menu, qtr( "&Stop" ),
- ":/menu/stop", SLOT( stop() ), true );
+ ":/toolbar/stop_b", SLOT( stop() ), true );
if( !p_input )
action->setEnabled( false );
action->setData( ACTION_DELETE_ON_REBUILD );
@@ -831,13 +831,13 @@ void VLCMenuBar::PopupMenuPlaylistEntries( QMenu *menu,
/* Next / Previous */
bool bPlaylistEmpty = THEMIM->hasEmptyPlaylist();
action = addMIMStaticEntry( p_intf, menu, qtr( "Pre&vious" ),
- ":/menu/previous", SLOT( prev() ), true );
+ ":/toolbar/previous_b", SLOT( prev() ), true );
action->setEnabled( !bPlaylistEmpty );
action->setData( ACTION_NO_CLEANUP + ACTION_DELETE_ON_REBUILD );
CONNECT( THEMIM, playlistNotEmpty(bool), action, setEnabled(bool) );
action = addMIMStaticEntry( p_intf, menu, qtr( "Ne&xt" ),
- ":/menu/next", SLOT( next() ), true );
+ ":/toolbar/next_b", SLOT( next() ), true );
action->setEnabled( !bPlaylistEmpty );
action->setData( ACTION_NO_CLEANUP + ACTION_DELETE_ON_REBUILD );
CONNECT( THEMIM, playlistNotEmpty(bool), action, setEnabled(bool) );
diff --git a/modules/gui/qt/pixmaps/next_16px.png b/modules/gui/qt/pixmaps/next_16px.png
deleted file mode 100644
index 81c0a26b65..0000000000
Binary files a/modules/gui/qt/pixmaps/next_16px.png and /dev/null differ
diff --git a/modules/gui/qt/pixmaps/pause_16px.png b/modules/gui/qt/pixmaps/pause_16px.png
deleted file mode 100644
index 01af4ac710..0000000000
Binary files a/modules/gui/qt/pixmaps/pause_16px.png and /dev/null differ
diff --git a/modules/gui/qt/pixmaps/play_16px.png b/modules/gui/qt/pixmaps/play_16px.png
deleted file mode 100644
index 9eef29d770..0000000000
Binary files a/modules/gui/qt/pixmaps/play_16px.png and /dev/null differ
diff --git a/modules/gui/qt/pixmaps/previous_16px.png b/modules/gui/qt/pixmaps/previous_16px.png
deleted file mode 100644
index c822442e5d..0000000000
Binary files a/modules/gui/qt/pixmaps/previous_16px.png and /dev/null differ
diff --git a/modules/gui/qt/pixmaps/stop_16px.png b/modules/gui/qt/pixmaps/stop_16px.png
deleted file mode 100644
index b7ebd95c9d..0000000000
Binary files a/modules/gui/qt/pixmaps/stop_16px.png and /dev/null differ
diff --git a/modules/gui/qt/vlc.qrc b/modules/gui/qt/vlc.qrc
index c294597ad5..59055fb6bb 100644
--- a/modules/gui/qt/vlc.qrc
+++ b/modules/gui/qt/vlc.qrc
@@ -15,11 +15,6 @@
<file alias="settings">pixmaps/menus/settings_16px.png</file>
<file alias="stream">pixmaps/menus/stream_16px.png</file>
<file alias="playlist_menu">pixmaps/menus/playlist_16px.png</file>
- <file alias="next">pixmaps/next_16px.png</file>
- <file alias="previous">pixmaps/previous_16px.png</file>
- <file alias="play">pixmaps/play_16px.png</file>
- <file alias="pause">pixmaps/pause_16px.png</file>
- <file alias="stop">pixmaps/stop_16px.png</file>
<file alias="exit">pixmaps/menus/exit_16px.png</file>
</qresource>
<qresource prefix="/util">
More information about the vlc-commits
mailing list