Commit e8251e39 authored by Hugo Beauzée-Luyssen's avatar Hugo Beauzée-Luyssen

qt: Remove duplicated icons

Fix #18650
parent f8e01ad9
......@@ -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 \
......
......@@ -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),
......
......@@ -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;
}
......
......@@ -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) );
......
......@@ -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">
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment