Commit b83845d9 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Qt4 - pixmaps: fix compilation with new pixmaps.

parent e5d83117
......@@ -181,15 +181,14 @@ EXTRA_DIST += \
ui/streampanel.ui \
ui/sout.ui \
ui/vlm.ui \
pixmaps/type_net.xpm \
pixmaps/type_playlist.xpm \
pixmaps/type_net.png \
pixmaps/type_playlist.png \
pixmaps/type_unknown.xpm \
pixmaps/type_file.xpm \
pixmaps/type_card.xpm \
pixmaps/type_disc.xpm \
pixmaps/type_cdda.xpm \
pixmaps/type_directory.xpm \
pixmaps/type_node.xpm \
pixmaps/type_file.png \
pixmaps/type_card.png \
pixmaps/cdda_16px.png \
pixmaps/type_directory.png \
pixmaps/type_node.png \
pixmaps/go-next.png \
pixmaps/next.png \
pixmaps/noart.png \
......@@ -207,39 +206,39 @@ EXTRA_DIST += \
pixmaps/volume-high.png \
pixmaps/volume-low.png \
pixmaps/volume-muted.png \
pixmaps/vlc_help_16px.png \
pixmaps/vlc_stop_16px.png \
pixmaps/vlc_play_16px.png \
pixmaps/vlc_pause_16px.png \
pixmaps/vlc_messages_16px.png \
pixmaps/vlc_network_16px.png \
pixmaps/vlc_stream_16px.png \
pixmaps/vlc_quit_16px.png \
pixmaps/vlc_disc_16px.png \
pixmaps/vlc_network_16px.png \
pixmaps/vlc_capture-card_16px.png \
pixmaps/vlc_preferences_16px.png \
pixmaps/vlc_settings_16px.png \
pixmaps/vlc_playlist_16px.png \
pixmaps/vlc_folder-grey_16px.png \
pixmaps/vlc_folder-blue_16px.png \
pixmaps/vlc_tape_16px.png \
pixmaps/vlc_file-asym_16px.png \
pixmaps/vlc_file-wide_16px.png \
pixmaps/vlc_info_16px.png \
pixmaps/vlc_previous_16px.png \
pixmaps/vlc_next_16px.png \
pixmaps/vlc_record_16px.png \
pixmaps/vlc_playlist_add.png \
pixmaps/vlc_playlist_repeat_off.png \
pixmaps/vlc_playlist_repeat_all.png \
pixmaps/vlc_playlist_repeat_one.png \
pixmaps/vlc_playlist_shuffle_on.png \
pixmaps/vlc_playlist_shuffle_off.png \
pixmaps/vlc_advprefs_audio.png \
pixmaps/vlc_advprefs_video.png \
pixmaps/vlc_advprefs_intf.png \
pixmaps/vlc_advprefs_sout.png \
pixmaps/vlc_advprefs_codec.png \
pixmaps/vlc_advprefs_extended.png \
pixmaps/vlc_advprefs_playlist.png
pixmaps/menus_help_16px.png \
pixmaps/stop_16px.png \
pixmaps/play_16px.png \
pixmaps/pause_16px.png \
pixmaps/menus_messages_16px.png \
pixmaps/network_16px.png \
pixmaps/menus_stream_16px.png \
pixmaps/menus_quit_16px.png \
pixmaps/disc_16px.png \
pixmaps/network_16px.png \
pixmaps/capture-card_16px.png \
pixmaps/menus_preferences_16px.png \
pixmaps/menus_settings_16px.png \
pixmaps/playlist_16px.png \
pixmaps/folder-grey_16px.png \
pixmaps/folder-blue_16px.png \
pixmaps/tape_16px.png \
pixmaps/file-asym_16px.png \
pixmaps/file-wide_16px.png \
pixmaps/info_16px.png \
pixmaps/previous_16px.png \
pixmaps/next_16px.png \
pixmaps/record_16px.png \
pixmaps/playlist_add.png \
pixmaps/playlist_repeat_off.png \
pixmaps/playlist_repeat_all.png \
pixmaps/playlist_repeat_one.png \
pixmaps/playlist_shuffle_on.png \
pixmaps/playlist_shuffle_off.png \
pixmaps/advprefs_audio.png \
pixmaps/advprefs_video.png \
pixmaps/advprefs_intf.png \
pixmaps/advprefs_sout.png \
pixmaps/advprefs_codec.png \
pixmaps/advprefs_extended.png \
pixmaps/advprefs_playlist.png
......@@ -190,25 +190,25 @@ QMenu *QVLCMenu::FileMenu()
QMenu *menu = new QMenu();
DP_SADD( menu, qtr( "Open &File..." ), "",
":/pixmaps/vlc_file-asym_16px.png", openFileDialog(), "Ctrl+O" );
":/pixmaps/file-asym_16px.png", openFileDialog(), "Ctrl+O" );
DP_SADD( menu, qtr( I_OPEN_FOLDER ), "",
":/pixmaps/vlc_folder-grey_16px.png", PLAppendDir(), "Ctrl+F" );
DP_SADD( menu, qtr( "Open &Disc..." ), "", ":/pixmaps/vlc_disc_16px.png",
":/pixmaps/folder-grey_16px.png", PLAppendDir(), "Ctrl+F" );
DP_SADD( menu, qtr( "Open &Disc..." ), "", ":/pixmaps/disc_16px.png",
openDiscDialog(), "Ctrl+D" );
DP_SADD( menu, qtr( "Open &Network..." ), "",
":/pixmaps/vlc_network_16px.png", openNetDialog(), "Ctrl+N" );
":/pixmaps/network_16px.png", openNetDialog(), "Ctrl+N" );
DP_SADD( menu, qtr( "Open &Capture Device..." ), "",
":/pixmaps/vlc_capture-card_16px.png", openCaptureDialog(),
":/pixmaps/capture-card_16px.png", openCaptureDialog(),
"Ctrl+C" );
menu->addSeparator();
DP_SADD( menu, qtr( "&Streaming..." ), "", ":/pixmaps/vlc_stream_16px.png",
DP_SADD( menu, qtr( "&Streaming..." ), "", ":/pixmaps/menus_stream_16px.png",
openThenStreamingDialogs(), "Ctrl+S" );
DP_SADD( menu, qtr( "Conve&rt / Save..." ), "", "",
openThenTranscodingDialogs(), "Ctrl+R" );
menu->addSeparator();
DP_SADD( menu, qtr( "&Quit" ) , "", ":/pixmaps/vlc_quit_16px.png", quit(),
DP_SADD( menu, qtr( "&Quit" ) , "", ":/pixmaps/menus_quit_16px.png", quit(),
"Ctrl+Q" );
return menu;
}
......@@ -218,7 +218,7 @@ QMenu *QVLCMenu::PlaylistMenu( MainInterface *mi, intf_thread_t *p_intf )
{
QMenu *menu = new QMenu();
menu->addMenu( SDMenu( p_intf ) );
menu->addAction ( QIcon( ":/pixmaps/vlc_playlist_16px.png" ),
menu->addAction ( QIcon( ":/pixmaps/playlist_16px.png" ),
qtr( "Show Playlist" ), mi, SLOT( togglePlaylist() ) );
menu->addSeparator();
......@@ -242,11 +242,11 @@ QMenu *QVLCMenu::ToolsMenu( intf_thread_t *p_intf, MainInterface *mi,
QMenu *menu = new QMenu;
if( mi )
{
menu->addAction( QIcon( ":/pixmaps/vlc_playlist_16px.png" ),
menu->addAction( QIcon( ":/pixmaps/playlist_16px.png" ),
qtr( "Playlist..." ), mi, SLOT( togglePlaylist() ),
qtr( "Ctrl+L" ) );
}
DP_SADD( menu, qtr( I_MENU_EXT ), "", ":/pixmaps/vlc_settings_16px.png",
DP_SADD( menu, qtr( I_MENU_EXT ), "", ":/pixmaps/menus_settings_16px.png",
extendedDialog() , "Ctrl+E" );
menu->addSeparator();
......@@ -282,10 +282,10 @@ QMenu *QVLCMenu::ToolsMenu( intf_thread_t *p_intf, MainInterface *mi,
menu->addSeparator();
DP_SADD( menu, qtr( I_MENU_MSG ), "", ":/pixmaps/vlc_messages_16px.png",
DP_SADD( menu, qtr( I_MENU_MSG ), "", ":/pixmaps/menus_messages_16px.png",
messagesDialog(), "Ctrl+M" );
DP_SADD( menu, qtr( I_MENU_INFO ) , "", "", mediaInfoDialog(), "Ctrl+I" );
DP_SADD( menu, qtr( I_MENU_CODECINFO ) , "", ":/pixmaps/vlc_info_16px.png",
DP_SADD( menu, qtr( I_MENU_CODECINFO ) , "", ":/pixmaps/menus_info_16px.png",
mediaCodecDialog(), "Ctrl+J" );
#if 0 /* Not Implemented yet */
......@@ -295,7 +295,7 @@ QMenu *QVLCMenu::ToolsMenu( intf_thread_t *p_intf, MainInterface *mi,
menu->addSeparator();
DP_SADD( menu, qtr( "Preferences..." ), "", ":/pixmaps/vlc_preferences_16px.png",
DP_SADD( menu, qtr( "Preferences..." ), "", ":/pixmaps/menus_preferences_16px.png",
prefsDialog(), "Ctrl+P" );
return menu;
}
......@@ -461,7 +461,7 @@ QMenu *QVLCMenu::SDMenu( intf_thread_t *p_intf )
QMenu *QVLCMenu::HelpMenu()
{
QMenu *menu = new QMenu();
DP_SADD( menu, qtr( "Help..." ) , "", ":/pixmaps/vlc_help_16px.png",
DP_SADD( menu, qtr( "Help..." ) , "", ":/pixmaps/menus_help_16px.png",
helpDialog(), "F1" );
menu->addSeparator();
DP_SADD( menu, qtr( I_MENU_ABOUT ), "", "", aboutDialog(), "Ctrl+F1" );
......@@ -491,20 +491,20 @@ QMenu *QVLCMenu::HelpMenu()
vlc_value_t val; \
var_Get( p_input, "state", &val ); \
if( val.i_int == PLAYING_S ) \
MIM_SADD( menu, qtr( "Pause" ), "", ":/pixmaps/vlc_pause_16px.png", \
MIM_SADD( menu, qtr( "Pause" ), "", ":/pixmaps/pause_16px.png", \
togglePlayPause() ) \
else \
MIM_SADD( menu, qtr( "Play" ), "", ":/pixmaps/vlc_play_16px.png", \
MIM_SADD( menu, qtr( "Play" ), "", ":/pixmaps/play_16px.png", \
togglePlayPause() ) \
} \
else if( THEPL->items.i_size && THEPL->i_enabled ) \
MIM_SADD( menu, qtr( "Play" ), "", ":/pixmaps/vlc_play_16px.png", \
MIM_SADD( menu, qtr( "Play" ), "", ":/pixmaps/play_16px.png", \
togglePlayPause() ); \
\
MIM_SADD( menu, qtr( "Stop" ), "", ":/pixmaps/vlc_stop_16px.png", stop() ); \
MIM_SADD( menu, qtr( "Previous" ), "", ":/pixmaps/vlc_previous_16px.png", \
MIM_SADD( menu, qtr( "Stop" ), "", ":/pixmaps/stop_16px.png", stop() ); \
MIM_SADD( menu, qtr( "Previous" ), "", ":/pixmaps/previous_16px.png", \
prev() ); \
MIM_SADD( menu, qtr( "Next" ), "", ":/pixmaps/vlc_next_16px.png", next() );
MIM_SADD( menu, qtr( "Next" ), "", ":/pixmaps/next_16px.png", next() );
#define POPUP_STATIC_ENTRIES( menu ) \
QMenu *toolsmenu = ToolsMenu( p_intf, NULL, false, true ); \
......@@ -693,8 +693,8 @@ void QVLCMenu::updateSystrayMenu( MainInterface *mi,
sysMenu->addSeparator();
DP_SADD( sysMenu, qtr( "&Open Media" ), "",
":/pixmaps/vlc_file-wide_16px.png", openFileDialog(), "" );
DP_SADD( sysMenu, qtr( "&Quit" ) , "", ":/pixmaps/vlc_quit_16px.png",
":/pixmaps/file-wide_16px.png", openFileDialog(), "" );
DP_SADD( sysMenu, qtr( "&Quit" ) , "", ":/pixmaps/quit_16px.png",
quit(), "" );
/* Set the menu */
......
......@@ -33,14 +33,6 @@
#include <vlc_intf_strings.h>
#include "pixmaps/type_unknown.xpm"
#include "pixmaps/type_file.xpm"
#include "pixmaps/type_net.xpm"
#include "pixmaps/type_card.xpm"
#include "pixmaps/type_disc.xpm"
#include "pixmaps/type_cdda.xpm"
#include "pixmaps/type_directory.xpm"
#include "pixmaps/type_playlist.xpm"
#include "pixmaps/type_node.xpm"
QIcon PLModel::icons[ITEM_TYPE_NUMBER];
......@@ -271,16 +263,16 @@ PLModel::PLModel( playlist_t *_p_playlist, intf_thread_t *_p_intf,
i_cached_input_id = -1;
i_popup_item = i_popup_parent = -1;
#define ADD_ICON(type, x) icons[ITEM_TYPE_##type] = QIcon( QPixmap( type_##x##_xpm ) );
ADD_ICON( UNKNOWN , unknown );
ADD_ICON( FILE, file );
ADD_ICON( DIRECTORY, directory );
ADD_ICON( DISC, disc );
ADD_ICON( CDDA, cdda );
ADD_ICON( CARD, card );
ADD_ICON( NET, net );
ADD_ICON( PLAYLIST, playlist );
ADD_ICON( NODE, node );
#define ADD_ICON(type, x) icons[ITEM_TYPE_##type] = QIcon( QPixmap( x ) );
ADD_ICON( UNKNOWN , type_unknown_xpm );
ADD_ICON( FILE, ":/pixmaps/type_file.png" );
ADD_ICON( DIRECTORY, ":/pixmaps/type_directory.png" );
ADD_ICON( DISC, ":/pixmaps/disc_16px.png" );
ADD_ICON( CDDA, ":/pixmaps/cdda_16px.png" );
ADD_ICON( CARD, ":/pixmaps/capture-card_16px.png" );
ADD_ICON( NET, ":/pixmaps/type_net.png" );
ADD_ICON( PLAYLIST, ":/pixmaps/type_playlist.png" );
ADD_ICON( NODE, ":/pixmaps/type_node.png" );
rootItem = NULL;
addCallbacks();
......
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