- Add alias for most of the pixmpas. Separate in different folders.
- Change some pixmaps
- Close most of #852
- Close #1799
- Close #1780
ui/streampanel.ui \
ui/sout.ui \
ui/vlm.ui \
- pixmaps/advprefs_audio.png \
- pixmaps/advprefs_codec.png \
- pixmaps/advprefs_extended.png \
- pixmaps/advprefs_intf.png \
- pixmaps/advprefs_playlist.png \
- pixmaps/advprefs_sout.png \
- pixmaps/advprefs_video.png \
- pixmaps/capture-card_16px.png \
- pixmaps/cdda_16px.png \
- pixmaps/disc_16px.png \
- pixmaps/file-asym_16px.png \
- pixmaps/file-wide_16px.png \
- pixmaps/folder-blue_16px.png \
- pixmaps/folder-grey_16px.png \
+ pixmaps/prefs/advprefs_audio.png \
+ pixmaps/prefs/advprefs_codec.png \
+ pixmaps/prefs/advprefs_extended.png \
+ pixmaps/prefs/advprefs_intf.png \
+ pixmaps/prefs/advprefs_playlist.png \
+ pixmaps/prefs/advprefs_sout.png \
+ pixmaps/prefs/advprefs_video.png \
+ pixmaps/prefs/spref_cone_Audio_64.png \
+ pixmaps/prefs/spref_cone_Hotkeys_64.png \
+ pixmaps/prefs/spref_cone_Input_64.png \
+ pixmaps/prefs/spref_cone_Interface_64.png \
+ pixmaps/prefs/spref_cone_Subtitles_64.png \
+ pixmaps/prefs/spref_cone_Video_64.png \
+ pixmaps/types/capture-card_16px.png \
+ pixmaps/types/cdda_16px.png \
+ pixmaps/types/disc_16px.png \
+ pixmaps/types/file-asym_16px.png \
+ pixmaps/types/file-wide_16px.png \
+ pixmaps/types/folder-blue_16px.png \
+ pixmaps/types/folder-grey_16px.png \
+ pixmaps/types/harddisk_16px.png \
+ pixmaps/types/network_16px.png \
+ pixmaps/menus/help_16px.png \
+ pixmaps/menus/info_16px.png \
+ pixmaps/menus/messages_16px.png \
+ pixmaps/menus/preferences_16px.png \
+ pixmaps/menus/quit_16px.png \
+ pixmaps/menus/settings_16px.png \
+ pixmaps/menus/stream_16px.png \
+ pixmaps/menus/playlist_16px.png \
pixmaps/go-next.png \
- pixmaps/harddisk_16px.png \
- pixmaps/menus_help_16px.png \
- pixmaps/menus_info_16px.png \
- pixmaps/menus_messages_16px.png \
- pixmaps/menus_preferences_16px.png \
- pixmaps/menus_quit_16px.png \
- pixmaps/menus_settings_16px.png \
- pixmaps/menus_stream_16px.png \
- pixmaps/network_16px.png \
pixmaps/next_16px.png \
pixmaps/next.png \
pixmaps/noart.png \
pixmaps/pause_16px.png \
pixmaps/pause.png \
pixmaps/play_16px.png \
- pixmaps/playlist_16px.png \
- pixmaps/playlist_add.png \
- pixmaps/playlist.png \
- pixmaps/playlist_repeat_all.png \
- pixmaps/playlist_repeat_off.png \
- pixmaps/playlist_repeat_one.png \
- pixmaps/playlist_shuffle_off.png \
- pixmaps/playlist_shuffle_on.png \
+ pixmaps/playlist/add.png \
+ pixmaps/playlist/playlist.png \
+ pixmaps/playlist/repeat_all.png \
+ pixmaps/playlist/repeat_off.png \
+ pixmaps/playlist/repeat_one.png \
+ pixmaps/playlist/shuffle_off.png \
+ pixmaps/playlist/shuffle_on.png \
pixmaps/play.png \
pixmaps/previous_16px.png \
pixmaps/previous.png \
- pixmaps/record_16px.png \
- pixmaps/tv.png \
- pixmaps/tvtelx.png \
- pixmaps/tvtelx-transparent.png \
- pixmaps/spref_cone_Audio_64.png \
- pixmaps/spref_cone_Hotkeys_64.png \
- pixmaps/spref_cone_Input_64.png \
- pixmaps/spref_cone_Interface_64.png \
- pixmaps/spref_cone_Subtitles_64.png \
- pixmaps/spref_cone_Video_64.png \
pixmaps/stop_16px.png \
pixmaps/stop.png \
- pixmaps/tape_16px.png \
- pixmaps/type_directory.png \
- pixmaps/type_file.png \
- pixmaps/type_net.png \
- pixmaps/type_node.png \
- pixmaps/type_playlist.png \
- pixmaps/type_unknown.xpm \
- pixmaps/volume-high.png \
- pixmaps/volume-medium.png \
- pixmaps/volume-low.png \
- pixmaps/volume-muted.png \
- pixmaps/volume-slider.svg \
- pixmaps/volume-slider-inside.png \
- pixmaps/volume-slider-outside.png
+ pixmaps/eject.png \
+ pixmaps/update.png \
+ pixmaps/clear.png \
+ pixmaps/arrow_down_dark.png \
+ pixmaps/types/tape_16px.png \
+ pixmaps/types/type_directory.png \
+ pixmaps/types/type_file.png \
+ pixmaps/types/type_net.png \
+ pixmaps/types/type_node.png \
+ pixmaps/types/type_playlist.png \
+ pixmaps/types/type_unknown.xpm \
+ pixmaps/toolbar/extended_16px.png \
+ pixmaps/toolbar/record_16px.png \
+ pixmaps/toolbar/snapshot.png \
+ pixmaps/toolbar/atob.png \
+ pixmaps/toolbar/dvd_menu.png \
+ pixmaps/toolbar/dvd_next.png \
+ pixmaps/toolbar/dvd_prev.png \
+ pixmaps/toolbar/tv.png \
+ pixmaps/toolbar/fullscreen.png \
+ pixmaps/toolbar/tvtelx.png \
+ pixmaps/toolbar/tvtelx-transparent.png \
+ pixmaps/toolbar/volume-high.png \
+ pixmaps/toolbar/volume-medium.png \
+ pixmaps/toolbar/volume-low.png \
+ pixmaps/toolbar/volume-muted.png \
+ pixmaps/toolbar/volume-slider.svg \
+ pixmaps/toolbar/volume-slider-inside.png \
+ pixmaps/toolbar/volume-slider-outside.png
/* Nice icons */
#define BI( a,b) QIcon a##_icon = QIcon( QPixmap( b ))
- BI( audio, ":/pixmaps/advprefs_audio.png" );
- BI( video, ":/pixmaps/advprefs_video.png" );
- BI( input, ":/pixmaps/advprefs_codec.png" );
- BI( sout, ":/pixmaps/advprefs_sout.png" );
- BI( advanced, ":/pixmaps/advprefs_extended.png" );
- BI( playlist, ":/pixmaps/advprefs_playlist.png" );
- BI( interface, ":/pixmaps/advprefs_intf.png" );
+ BI( audio, ":/advprefs_audio" );
+ BI( video, ":/advprefs_video" );
+ BI( input, ":/advprefs_codec" );
+ BI( sout, ":/advprefs_sout" );
+ BI( advanced, ":/advprefs_extended" );
+ BI( playlist, ":/advprefs_playlist" );
+ BI( interface, ":/advprefs_intf" );
#undef BI
/* Build the tree for the main module */
updateButton = new QToolButton;
updateButton->setAutoRaise( true );
- updateButton->setText( "u" );
- updateButton->setToolTip( qtr( "Force update of this dialog's values" ) );
mainLayout->addWidget( updateButton, 0, 4, 1, 1 );
CONNECT( subsSpin, valueChanged ( double ), this, advanceSubs( double ) ) ;
CONNECT( subSpeedSpin, valueChanged ( double ),
this, adjustSubsSpeed( double ) );
- BUTTONACT( updateButton, update() );
+ BUTTON_SET_ACT_I( updateButton, "", update,
+ qtr( "Force update of this dialog's values" ), update() );
/* Set it */
update();
ABButton = new QPushButton( "AB" );
setupSmallButton( ABButton );
advLayout->addWidget( ABButton );
- BUTTON_SET_ACT( ABButton, "AB", qtr( "A to B" ), fromAtoB() );
+ BUTTON_SET_ACT_I( ABButton, "", atob_nob,
+ qtr( "Loop from point A to point B continuously\nClick to set point A" ), fromAtoB() );
timeA = timeB = 0;
CONNECT( THEMIM->getIM(), positionUpdated( float, int, int ),
this, AtoBLoop( float, int, int ) );
recordButton = new QPushButton( "R" );
setupSmallButton( recordButton );
advLayout->addWidget( recordButton );
- BUTTON_SET_ACT_I( recordButton, "", record_16px.png,
+ BUTTON_SET_ACT_I( recordButton, "", record,
qtr( "Record" ), record() );
/* Snapshot Button */
snapshotButton = new QPushButton( "S" );
setupSmallButton( snapshotButton );
advLayout->addWidget( snapshotButton );
- BUTTON_SET_ACT( snapshotButton, "S", qtr( "Take a snapshot" ), snapshot() );
+ BUTTON_SET_ACT_I( snapshotButton, "", snapshot,
+ qtr( "Take a snapshot" ), snapshot() );
}
AdvControlsWidget::~AdvControlsWidget()
if( !timeA )
{
timeA = var_GetTime( THEMIM->getInput(), "time" );
- ABButton->setText( "A->..." );
+ ABButton->setToolTip( "Click to set point B" );
+ ABButton->setIcon( QIcon( ":/atob_noa" ) );
return;
}
if( !timeB )
{
timeB = var_GetTime( THEMIM->getInput(), "time" );
var_SetTime( THEMIM->getInput(), "time" , timeA );
- ABButton->setText( "A<=>B" );
+ ABButton->setIcon( QIcon( ":/atob" ) );
+ ABButton->setToolTip( "Stop the A to B loop" );
return;
}
timeA = 0;
timeB = 0;
- ABButton->setText( "AB" );
+ ABButton->setToolTip( qtr( "Loop from point A to point B continuously\nClick to set point A" ) );
+ ABButton->setIcon( QIcon( ":/atob_nob" ) );
}
/* Function called regularly when in an AtoB loop */
setupSmallButton( nextSectionButton );
discLayout->addWidget( nextSectionButton );
- BUTTON_SET_IMG( prevSectionButton, "", previous.png, "" );
- BUTTON_SET_IMG( nextSectionButton, "", next.png, "" );
- BUTTON_SET_IMG( menuButton, "", previous.png, qtr( "Menu" ) );
+ BUTTON_SET_IMG( prevSectionButton, "", dvd_prev, "" );
+ BUTTON_SET_IMG( nextSectionButton, "", dvd_next, "" );
+ BUTTON_SET_IMG( menuButton, "", dvd_menu, qtr( "Menu" ) );
discFrame->hide();
CONNECT( THEMIM->getIM(), setNewTelexPage( int ),
telexPage, setValue( int ) );
- BUTTON_SET_IMG( telexOn, "", tv.png, qtr( "Teletext on" ) );
+ BUTTON_SET_IMG( telexOn, "", tv, qtr( "Teletext on" ) );
CONNECT( telexOn, clicked(), THEMIM->getIM(),
telexToggleButtons() );
telexTransparent->setEnabled( false );
telexPage->setEnabled( false );
- BUTTON_SET_IMG( telexTransparent, "", tvtelx.png, qtr( "Teletext" ) );
+ BUTTON_SET_IMG( telexTransparent, "", tvtelx, qtr( "Teletext" ) );
CONNECT( telexTransparent, clicked( bool ),
THEMIM->getIM(), telexSetTransparency() );
CONNECT( THEMIM->getIM(), toggleTelexTransparency(),
/* Add this block to the main layout */
- BUTTON_SET_ACT_I( playButton, "", play.png, qtr( "Play" ), play() );
- BUTTON_SET_ACT_I( prevButton, "" , previous.png,
+ BUTTON_SET_ACT_I( playButton, "", play_b, qtr( "Play" ), play() );
+ BUTTON_SET_ACT_I( prevButton, "" , previous_b,
qtr( "Previous" ), prev() );
- BUTTON_SET_ACT_I( nextButton, "", next.png, qtr( "Next" ), next() );
- BUTTON_SET_ACT_I( stopButton, "", stop.png, qtr( "Stop" ), stop() );
+ BUTTON_SET_ACT_I( nextButton, "", next_b, qtr( "Next" ), next() );
+ BUTTON_SET_ACT_I( stopButton, "", stop_b, qtr( "Stop" ), stop() );
/*
* Other first Line buttons
*/
/** Fullscreen/Visualisation **/
- fullscreenButton = new QPushButton( "F" );
- BUTTON_SET_ACT( fullscreenButton, "F", qtr( "Fullscreen" ), fullscreen() );
+ fullscreenButton = new QPushButton;
+ BUTTON_SET_ACT_I( fullscreenButton, "", fullscreen, qtr( "Fullscreen" ),
+ fullscreen() );
setupSmallButton( fullscreenButton );
if( !b_fsCreation )
/** Playlist Button **/
playlistButton = new QPushButton;
setupSmallButton( playlistButton );
- BUTTON_SET_IMG( playlistButton, "" , playlist.png, qtr( "Show playlist" ) );
+ BUTTON_SET_IMG( playlistButton, "" , playlist, qtr( "Show playlist" ) );
CONNECT( playlistButton, clicked(), _p_mi, togglePlaylist() );
/** extended Settings **/
extSettingsButton = new QPushButton;
- BUTTON_SET_ACT( extSettingsButton, "Ex", qtr( "Extended settings" ),
- extSettings() );
+ BUTTON_SET_ACT_I( extSettingsButton, "", extended,
+ qtr( "Extended settings" ), extSettings() );
setupSmallButton( extSettingsButton );
}
hVolLabel = new VolumeClickHandler( p_intf, this );
volMuteLabel = new QLabel;
- volMuteLabel->setPixmap( QPixmap( ":/pixmaps/volume-medium.png" ) );
+ volMuteLabel->setPixmap( QPixmap( ":/volume-medium" ) );
volMuteLabel->setToolTip( qtr( "Mute" ) );
volMuteLabel->installEventFilter( hVolLabel );
{
if( b_telexTransparent )
{
- telexTransparent->setIcon( QIcon( ":/pixmaps/tvtelx.png" ) );
+ telexTransparent->setIcon( QIcon( ":/tvtelx" ) );
telexTransparent->setToolTip( qtr( "Teletext" ) );
b_telexTransparent = false;
}
else
{
- telexTransparent->setIcon( QIcon( ":/pixmaps/tvtelx-transparent.png" ) );
+ telexTransparent->setIcon( QIcon( ":/tvtelx-transparent" ) );
telexTransparent->setToolTip( qtr( "Transparent" ) );
b_telexTransparent = true;
}
aout_VolumeSet( p_intf, i_res );
}
if( i_sliderVolume == 0 )
- volMuteLabel->setPixmap( QPixmap(":/pixmaps/volume-muted.png" ) );
+ volMuteLabel->setPixmap( QPixmap(":/volume-muted" ) );
else if( i_sliderVolume < VOLUME_MAX / 3 )
- volMuteLabel->setPixmap( QPixmap( ":/pixmaps/volume-low.png" ) );
+ volMuteLabel->setPixmap( QPixmap( ":/volume-low" ) );
else if( i_sliderVolume > (VOLUME_MAX * 2 / 3 ) )
- volMuteLabel->setPixmap( QPixmap( ":/pixmaps/volume-high.png" ) );
- else volMuteLabel->setPixmap( QPixmap( ":/pixmaps/volume-medium.png" ) );
+ volMuteLabel->setPixmap( QPixmap( ":/volume-high" ) );
+ else volMuteLabel->setPixmap( QPixmap( ":/volume-medium" ) );
}
void ControlsWidget::updateVolume()
{
if( status == PLAYING_S ) /* Playing */
{
- playButton->setIcon( QIcon( ":/pixmaps/pause.png" ) );
+ playButton->setIcon( QIcon( ":/pause_b" ) );
playButton->setToolTip( qtr( "Pause" ) );
}
else
{
- playButton->setIcon( QIcon( ":/pixmaps/play.png" ) );
+ playButton->setIcon( QIcon( ":/play_b" ) );
playButton->setToolTip( qtr( "Play" ) );
}
}
BUTTONACT( ui.audioCDRadioButton, updateButtons() );
BUTTONACT( ui.dvdsimple, updateButtons() );
BUTTONACT( ui.browseDiscButton, browseDevice() );
- BUTTONACT( ui.ejectButton, eject() );
+ BUTTON_SET_ACT_I( ui.ejectButton, "", eject, qtr( "Eject the disc" ),
+ eject() );
CONNECT( ui.deviceCombo, editTextChanged( QString ), this, updateMRL());
CONNECT( ui.titleSpin, valueChanged( int ), this, updateMRL());
#include "components/playlist/playlist_model.hpp"
#include <vlc_intf_strings.h>
-#include "pixmaps/type_unknown.xpm"
-
#include <QSettings>
#include "sorting.h"
#include "dialogs/mediainfo.hpp"
#include <vlc_intf_strings.h>
-#include "pixmaps/type_unknown.xpm"
+#include "pixmaps/types/type_unknown.xpm"
#include <assert.h>
#include <QIcon>
/* Icons initialization */
#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" );
+ ADD_ICON( FILE, ":/type_file" );
+ ADD_ICON( DIRECTORY, ":/type_directory" );
+ ADD_ICON( DISC, ":/disc" );
+ ADD_ICON( CDDA, ":/cdda" );
+ ADD_ICON( CARD, ":/capture-card" );
+ ADD_ICON( NET, ":/type_net" );
+ ADD_ICON( PLAYLIST, ":/type_playlist" );
+ ADD_ICON( NODE, ":/type_node" );
#undef ADD_ICON
rebuild( p_root );
/* Add item to the playlist button */
addButton = new QPushButton;
- addButton->setIcon( QIcon( ":/pixmaps/playlist_add.png" ) );
+ addButton->setIcon( QIcon( ":/playlist_add" ) );
addButton->setMaximumWidth( 30 );
BUTTONACT( addButton, popupAdd() );
buttons->addWidget( addButton );
randomButton = new QPushButton( this );
if( model->hasRandom() )
{
- randomButton->setIcon( QIcon( ":/pixmaps/playlist_shuffle_on.png" ));
+ randomButton->setIcon( QIcon( ":/shuffle_on" ));
randomButton->setToolTip( qtr( I_PL_RANDOM ));
}
else
{
- randomButton->setIcon( QIcon( ":/pixmaps/playlist_shuffle_off.png" ) );
+ randomButton->setIcon( QIcon( ":/shuffle_off" ) );
randomButton->setToolTip( qtr( I_PL_NORANDOM ));
}
BUTTONACT( randomButton, toggleRandom() );
repeatButton = new QPushButton( this );
if( model->hasRepeat() )
{
- repeatButton->setIcon( QIcon( ":/pixmaps/playlist_repeat_one.png" ) );
+ repeatButton->setIcon( QIcon( ":/repeat_one" ) );
repeatButton->setToolTip( qtr( I_PL_REPEAT ));
}
else if( model->hasLoop() )
{
- repeatButton->setIcon( QIcon( ":/pixmaps/playlist_repeat_all.png" ) );
+ repeatButton->setIcon( QIcon( ":/repeat_all" ) );
repeatButton->setToolTip( qtr( I_PL_LOOP ));
}
else
{
- repeatButton->setIcon( QIcon( ":/pixmaps/playlist_repeat_off.png" ) );
+ repeatButton->setIcon( QIcon( ":/repeat_off" ) );
repeatButton->setToolTip( qtr( I_PL_NOREPEAT ));
}
BUTTONACT( repeatButton, toggleRepeat() );
buttons->addWidget( searchLine ); filter->setBuddy( searchLine );
QPushButton *clear = new QPushButton;
- clear->setText( qfu( "CL") );
clear->setMaximumWidth( 30 );
- clear->setToolTip( qtr( "Clear" ));
- BUTTONACT( clear, clearFilter() );
+ BUTTON_SET_ACT_I( clear, "", clear, qtr( "Clear" ), clearFilter() );
buttons->addWidget( clear );
/* Finish the layout */
if( model->hasRepeat() )
{
model->setRepeat( false ); model->setLoop( true );
- repeatButton->setIcon( QIcon( ":/pixmaps/playlist_repeat_all.png" ) );
+ repeatButton->setIcon( QIcon( ":/repeat_all" ) );
repeatButton->setToolTip( qtr( I_PL_LOOP ));
}
else if( model->hasLoop() )
{
model->setRepeat( false ) ; model->setLoop( false );
- repeatButton->setIcon( QIcon( ":/pixmaps/playlist_repeat_off.png" ) );
+ repeatButton->setIcon( QIcon( ":/repeat_off" ) );
repeatButton->setToolTip( qtr( I_PL_NOREPEAT ));
}
else
{
model->setRepeat( true );
- repeatButton->setIcon( QIcon( ":/pixmaps/playlist_repeat_one.png" ) );
+ repeatButton->setIcon( QIcon( ":/repeat_one" ) );
repeatButton->setToolTip( qtr( I_PL_REPEAT ));
}
}
bool prev = model->hasRandom();
model->setRandom( !prev );
randomButton->setIcon( prev ?
- QIcon( ":/pixmaps/playlist_shuffle_off.png" ) :
- QIcon( ":/pixmaps/playlist_shuffle_on.png" ) );
+ QIcon( ":/shuffle_off" ) :
+ QIcon( ":/shuffle_on" ) );
randomButton->setToolTip( prev ? qtr( I_PL_NORANDOM ) : qtr(I_PL_RANDOM ) );
}
#define ADD_CATEGORY( button, label, icon, numb ) \
QToolButton * button = new QToolButton( this ); \
- button->setIcon( QIcon( ":/pixmaps/" #icon ) ); \
+ button->setIcon( QIcon( ":/pixmaps/prefs/" #icon ) ); \
button->setIconSize( QSize( ICON_HEIGHT , ICON_HEIGHT ) ); \
button->setText( label ); \
button->setToolButtonStyle( Qt::ToolButtonTextUnderIcon ); \
objLayout->addWidget( time, 1, 3, 1, 2 );*/
QToolButton *modifyButton = new QToolButton;
- modifyButton->setIcon( QIcon( QPixmap( ":/pixmaps/menus_settings_16px.png" ) ) );
+ modifyButton->setIcon( QIcon( QPixmap( ":/settings" ) ) );
objLayout->addWidget( modifyButton, 0, 5 );
QToolButton *deleteButton = new QToolButton;
- deleteButton->setIcon( QIcon( QPixmap( ":/pixmaps/menus_quit_16px.png" ) ) );
+ deleteButton->setIcon( QIcon( QPixmap( ":/quit" ) ) );
objLayout->addWidget( deleteButton, 0, 6 );
BUTTONACT( modifyButton, modify() );
parent->removeVLMItem( this );
}
-//FIXME, remove me before release
-void VLMAWidget::enterEvent( QEvent *event )
-{
- printf( "test" );
-}
-
void VLMAWidget::toggleEnabled( bool b_enable )
{
VLMWrapper::EnableItem( name, b_enable );
b_looped = _looped;
playButton = new QToolButton;
- playButton->setIcon( QIcon( QPixmap( ":/pixmaps/play_16px.png" ) ) );
+ playButton->setIcon( QIcon( QPixmap( ":/play_16px" ) ) );
objLayout->addWidget( playButton, 1, 0 );
b_playing = true;
QToolButton *stopButton = new QToolButton;
- stopButton->setIcon( QIcon( QPixmap( ":/pixmaps/stop_16px.png" ) ) );
+ stopButton->setIcon( QIcon( QPixmap( ":/stop_16px" ) ) );
objLayout->addWidget( stopButton, 1, 1 );
loopButton = new QToolButton;
{
VLMWrapper::EditBroadcast( name, input, output, b_enabled, b_looped );
if( b_looped )
- loopButton->setIcon( QIcon( QPixmap( ":/pixmaps/playlist_repeat_all.png" ) ) );
+ loopButton->setIcon( QIcon( QPixmap( ":/repeat_all" ) ) );
else
- loopButton->setIcon( QIcon( QPixmap( ":/pixmaps/playlist_repeat_off.png" ) ) );
+ loopButton->setIcon( QIcon( QPixmap( ":/repeat_off" ) ) );
}
void VLMBroadcast::togglePlayPause()
if( b_playing = true )
{
VLMWrapper::ControlBroadcast( name, ControlBroadcastPause );
- playButton->setIcon( QIcon( QPixmap( ":/pixmaps/pause_16px.png" ) ) );
+ playButton->setIcon( QIcon( QPixmap( ":/pause_16px" ) ) );
}
else
{
VLMWrapper::ControlBroadcast( name, ControlBroadcastPlay );
- playButton->setIcon( QIcon( QPixmap( ":/pixmaps/play_16px.png" ) ) );
+ playButton->setIcon( QIcon( QPixmap( ":/play_16px" ) ) );
}
b_playing = !b_playing;
}
void VLMBroadcast::stop()
{
VLMWrapper::ControlBroadcast( name, ControlBroadcastStop );
- playButton->setIcon( QIcon( QPixmap( ":/pixmaps/play_16px.png" ) ) );
+ playButton->setIcon( QIcon( QPixmap( ":/play_16px" ) ) );
}
/****************
bool b_enabled;
int type;
VLMDialog *parent;
- virtual void enterEvent( QEvent * );
QGridLayout *objLayout;
private slots:
virtual void modify();
QMenu *menu = new QMenu();
addDPStaticEntry( menu, qtr( "&Open File..." ), "",
- ":/pixmaps/file-asym_16px.png", SLOT( openFileDialog() ), "Ctrl+O" );
+ ":/file-asym", SLOT( openFileDialog() ), "Ctrl+O" );
addDPStaticEntry( menu, qtr( I_OPEN_FOLDER ), "",
- ":/pixmaps/folder-grey_16px.png", SLOT( PLAppendDir() ), "Ctrl+F" );
+ ":/folder-grey", SLOT( PLAppendDir() ), "Ctrl+F" );
addDPStaticEntry( menu, qtr( "Open &Disc..." ), "",
- ":/pixmaps/disc_16px.png", SLOT( openDiscDialog() ), "Ctrl+D" );
+ ":/disc", SLOT( openDiscDialog() ), "Ctrl+D" );
addDPStaticEntry( menu, qtr( "Open &Network..." ), "",
- ":/pixmaps/network_16px.png", SLOT( openNetDialog() ), "Ctrl+N" );
+ ":/network", SLOT( openNetDialog() ), "Ctrl+N" );
addDPStaticEntry( menu, qtr( "Open &Capture Device..." ), "",
- ":/pixmaps/capture-card_16px.png", SLOT( openCaptureDialog() ),
+ ":/capture-card", SLOT( openCaptureDialog() ),
"Ctrl+C" );
menu->addSeparator();
addDPStaticEntry( menu, qtr( "&Streaming..." ), "",
- ":/pixmaps/menus_stream_16px.png", SLOT( openThenStreamingDialogs() ),
+ ":/stream", SLOT( openThenStreamingDialogs() ),
"Ctrl+S" );
addDPStaticEntry( menu, qtr( "Conve&rt / Save..." ), "", "",
SLOT( openThenTranscodingDialogs() ), "Ctrl+R" );
menu->addSeparator();
addDPStaticEntry( menu, qtr( "&Quit" ) , "",
- ":/pixmaps/menus_quit_16px.png", SLOT( quit() ), "Ctrl+Q" );
+ ":/quit", SLOT( quit() ), "Ctrl+Q" );
return menu;
}
{
QMenu *menu = new QMenu();
menu->addMenu( SDMenu( p_intf ) );
- menu->addAction( QIcon( ":/pixmaps/playlist_16px.png" ),
+ menu->addAction( QIcon( ":/playlist_menu" ),
qtr( "Show Playlist" ), mi, SLOT( togglePlaylist() ) );
menu->addSeparator();
if( mi )
{
QAction *act=
- menu->addAction( QIcon( ":/pixmaps/playlist_16px.png" ),
+ menu->addAction( QIcon( ":/playlist_menu" ),
qtr( "Playlist..." ), mi, SLOT( togglePlaylist() ),
qtr( "Ctrl+L" ) );
act->setData( "_static_" );
}
addDPStaticEntry( menu, qtr( I_MENU_EXT ), "",
- ":/pixmaps/menus_settings_16px.png", SLOT( extendedDialog() ),
+ ":/settings", SLOT( extendedDialog() ),
"Ctrl+E" );
menu->addSeparator();
menu->addSeparator();
addDPStaticEntry( menu, qtr( I_MENU_MSG ), "",
- ":/pixmaps/menus_messages_16px.png", SLOT( messagesDialog() ),
+ ":/messages", SLOT( messagesDialog() ),
"Ctrl+M" );
addDPStaticEntry( menu, qtr( I_MENU_INFO ) , "", "",
SLOT( mediaInfoDialog() ), "Ctrl+I" );
addDPStaticEntry( menu, qtr( I_MENU_CODECINFO ) , "",
- ":/pixmaps/menus_info_16px.png", SLOT( mediaCodecDialog() ), "Ctrl+J" );
+ ":/info", SLOT( mediaCodecDialog() ), "Ctrl+J" );
addDPStaticEntry( menu, qtr( I_MENU_BOOKMARK ), "","",
SLOT( bookmarksDialog() ), "Ctrl+B" );
#ifdef ENABLE_VLM
menu->addSeparator();
addDPStaticEntry( menu, qtr( "Preferences..." ), "",
- ":/pixmaps/menus_preferences_16px.png", SLOT( prefsDialog() ), "Ctrl+P" );
+ ":/preferences", SLOT( prefsDialog() ), "Ctrl+P" );
return menu;
}
{
QMenu *menu = new QMenu( current );
addDPStaticEntry( menu, qtr( "Help..." ) , "",
- ":/pixmaps/menus_help_16px.png", SLOT( helpDialog() ), "F1" );
+ ":/help", SLOT( helpDialog() ), "F1" );
#ifdef UPDATE_CHECK
addDPStaticEntry( menu, qtr( "Check for Updates..." ) , "", "",
SLOT( updateDialog() ), "");
#endif
menu->addSeparator();
- addDPStaticEntry( menu, qtr( I_MENU_ABOUT ), "", "", SLOT( aboutDialog() ),
- "Ctrl+F1" );
+ addDPStaticEntry( menu, qtr( I_MENU_ABOUT ), "", ":/info",
+ SLOT( aboutDialog() ), "Ctrl+F1" );
return menu;
}
var_Get( p_input, "state", &val );
if( val.i_int == PLAYING_S )
addMIMStaticEntry( p_intf, menu, qtr( "Pause" ), "",
- ":/pixmaps/pause_16px.png", SLOT( togglePlayPause() ) );
+ ":/pause", SLOT( togglePlayPause() ) );
else
addMIMStaticEntry( p_intf, menu, qtr( "Play" ), "",
- ":/pixmaps/play_16px.png", SLOT( togglePlayPause() ) );
+ ":/play", SLOT( togglePlayPause() ) );
}
else if( THEPL->items.i_size )
addMIMStaticEntry( p_intf, menu, qtr( "Play" ), "",
- ":/pixmaps/play_16px.png", SLOT( togglePlayPause() ) );
+ ":/play", SLOT( togglePlayPause() ) );
else
addDPStaticEntry( menu, qtr( "Play" ), "",
- ":/pixmaps/play_16px.png", SLOT( openDialog() ) );
+ ":/play", SLOT( openDialog() ) );
addMIMStaticEntry( p_intf, menu, qtr( "Stop" ), "",
- ":/pixmaps/stop_16px.png", SLOT( stop() ) );
+ ":/stop", SLOT( stop() ) );
addMIMStaticEntry( p_intf, menu, qtr( "Previous" ), "",
- ":/pixmaps/previous_16px.png", SLOT( prev() ) );
+ ":/previous", SLOT( prev() ) );
addMIMStaticEntry( p_intf, menu, qtr( "Next" ), "",
- ":/pixmaps/next_16px.png", SLOT( next() ) );
+ ":/next", SLOT( next() ) );
}
void QVLCMenu::PopupMenuStaticEntries( intf_thread_t *p_intf, QMenu *menu )
QMenu *openmenu = new QMenu( qtr( "Open" ), menu );
addDPStaticEntry( openmenu, qtr( "&Open File..." ), "",
- ":/pixmaps/file-asym_16px.png", SLOT( openFileDialog() ) );
+ ":/file-asym", SLOT( openFileDialog() ) );
addDPStaticEntry( openmenu, qtr( I_OPEN_FOLDER ), "",
- ":/pixmaps/folder-grey_16px.png", SLOT( PLAppendDir() ) );
+ ":/folder-grey", SLOT( PLAppendDir() ) );
addDPStaticEntry( openmenu, qtr( "Open &Disc..." ), "",
- ":/pixmaps/disc_16px.png", SLOT( openDiscDialog() ) );
+ ":/disc", SLOT( openDiscDialog() ) );
addDPStaticEntry( openmenu, qtr( "Open &Network..." ), "",
- ":/pixmaps/network_16px.png", SLOT( openNetDialog() ) );
+ ":/network", SLOT( openNetDialog() ) );
addDPStaticEntry( openmenu, qtr( "Open &Capture Device..." ), "",
- ":/pixmaps/capture-card_16px.png", SLOT( openCaptureDialog() ) );
+ ":/capture-card", SLOT( openCaptureDialog() ) );
menu->addMenu( openmenu );
menu->addSeparator();
menu->addMenu( helpmenu );
#endif
- addDPStaticEntry( menu, qtr( "Quit" ), "", ":/pixmaps/menus_quit_16px.png",
+ addDPStaticEntry( menu, qtr( "Quit" ), "", ":/quit",
SLOT( quit() ), "Ctrl+Q" );
}
if( !b_isFullscreen )
{
submenu = new QMenu( qtr( "Interface" ), menu );
- submenu->addAction( QIcon( ":/pixmaps/playlist_16px.png" ),
+ submenu->addAction( QIcon( ":/playlist" ),
qtr( "Show Playlist" ), mi, SLOT( togglePlaylist() ) );
addDPStaticEntry( submenu, qtr( I_MENU_EXT ), "",
- ":/pixmaps/menus_settings_16px.png", SLOT( extendedDialog() ) );
+ ":/settings", SLOT( extendedDialog() ) );
action = submenu->addAction( QIcon( "" ),
qtr( "Minimal View..." ), mi, SLOT( toggleMinimalView() ) );
action->setCheckable( true );
sysMenu->addSeparator();
addDPStaticEntry( sysMenu, qtr( "&Open Media" ), "",
- ":/pixmaps/file-wide_16px.png", SLOT( openFileDialog() ), "" );
+ ":/file-wide", SLOT( openFileDialog() ), "" );
addDPStaticEntry( sysMenu, qtr( "&Quit" ) , "",
- ":/pixmaps/menus_quit_16px.png", SLOT( quit() ), "" );
+ ":/quit", SLOT( quit() ), "" );
/* Set the menu */
mi->getSysTray()->setContextMenu( sysMenu );
#define BUTTON_SET_IMG( button, text, image, tooltip ) \
BUTTON_SET( button, text, tooltip ); \
- button->setIcon( QIcon( ":/pixmaps/"#image ) );
+ button->setIcon( QIcon( ":/"#image ) );
#define BUTTON_SET_ACT_I( button, text, image, tooltip, thisslot ) \
BUTTON_SET_IMG( button, text, image, tooltip ); \
setMouseTracking( true );
b_sliding = false;
- pixOutside = QPixmap( ":/pixmaps/volume-slider-outside.png" );
+ pixOutside = QPixmap( ":/volslide-outside" );
- const QPixmap temp( ":/pixmaps/volume-slider-inside.png" );
+ const QPixmap temp( ":/volslide-inside" );
const QBitmap mask( temp.createHeuristicMask() );
setMinimumSize( pixOutside.size() );
<!DOCTYPE RCC>
<RCC version="1.0">
<qresource>
- <file alias="noart.png">pixmaps/noart.png</file>
<file alias="vlc128.png">../../../share/vlc128x128.png</file>
<file alias="vlc16.png">../../../share/vlc16x16.png</file>
<file alias="vlc48.png">../../../share/vlc48x48.png</file>
<file alias="vlc128-christmas.png">../../../share/vlc128x128-christmas.png</file>
<file alias="vlc48-christmas.png">../../../share/vlc48x48-christmas.png</file>
- <file>pixmaps/advprefs_audio.png</file>
- <file>pixmaps/advprefs_codec.png</file>
- <file>pixmaps/advprefs_extended.png</file>
- <file>pixmaps/advprefs_intf.png</file>
- <file>pixmaps/advprefs_playlist.png</file>
- <file>pixmaps/advprefs_sout.png</file>
- <file>pixmaps/advprefs_video.png</file>
- <file>pixmaps/capture-card_16px.png</file>
- <file>pixmaps/cdda_16px.png</file>
- <file>pixmaps/disc_16px.png</file>
- <file>pixmaps/file-asym_16px.png</file>
- <file>pixmaps/file-wide_16px.png</file>
- <file>pixmaps/folder-grey_16px.png</file>
+ <file alias="advprefs_audio">pixmaps/prefs/advprefs_audio.png</file>
+ <file alias="advprefs_codec">pixmaps/prefs/advprefs_codec.png</file>
+ <file alias="advprefs_extended">pixmaps/prefs/advprefs_extended.png</file>
+ <file alias="advprefs_intf">pixmaps/prefs/advprefs_intf.png</file>
+ <file alias="advprefs_playlist">pixmaps/prefs/advprefs_playlist.png</file>
+ <file alias="advprefs_sout">pixmaps/prefs/advprefs_sout.png</file>
+ <file alias="advprefs_video">pixmaps/prefs/advprefs_video.png</file>
+ <file>pixmaps/prefs/spref_cone_Audio_64.png</file>
+ <file>pixmaps/prefs/spref_cone_Hotkeys_64.png</file>
+ <file>pixmaps/prefs/spref_cone_Input_64.png</file>
+ <file>pixmaps/prefs/spref_cone_Interface_64.png</file>
+ <file>pixmaps/prefs/spref_cone_Subtitles_64.png</file>
+ <file>pixmaps/prefs/spref_cone_Video_64.png</file>
+ <file alias="capture-card">pixmaps/types/capture-card_16px.png</file>
+ <file alias="cdda">pixmaps/types/cdda_16px.png</file>
+ <file alias="disc">pixmaps/types/disc_16px.png</file>
+ <file alias="file-asym">pixmaps/types/file-asym_16px.png</file>
+ <file alias="file-wide">pixmaps/types/file-wide_16px.png</file>
+ <file alias="folder-grey">pixmaps/types/folder-grey_16px.png</file>
+ <file alias="network">pixmaps/types/network_16px.png</file>
+ <file alias="help">pixmaps/menus/help_16px.png</file>
+ <file alias="info">pixmaps/menus/info_16px.png</file>
+ <file alias="messages">pixmaps/menus/messages_16px.png</file>
+ <file alias="preferences">pixmaps/menus/preferences_16px.png</file>
+ <file alias="quit">pixmaps/menus/quit_16px.png</file>
+ <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="playlist_add">pixmaps/playlist/add.png</file>
+ <file alias="playlist">pixmaps/playlist/playlist.png</file>
+ <file alias="repeat_all">pixmaps/playlist/repeat_all.png</file>
+ <file alias="repeat_off">pixmaps/playlist/repeat_off.png</file>
+ <file alias="repeat_one">pixmaps/playlist/repeat_one.png</file>
+ <file alias="shuffle_off">pixmaps/playlist/shuffle_off.png</file>
+ <file alias="shuffle_on">pixmaps/playlist/shuffle_on.png</file>
+ <file alias="type_directory">pixmaps/types/type_directory.png</file>
+ <file alias="type_file">pixmaps/types/type_file.png</file>
+ <file alias="type_net">pixmaps/types/type_net.png</file>
+ <file alias="type_node">pixmaps/types/type_node.png</file>
+ <file alias="type_playlist">pixmaps/types/type_playlist.png</file>
+ <file alias="tv">pixmaps/toolbar/tv.png</file>
+ <file alias="fullscreen">pixmaps/toolbar/fullscreen.png</file>
+ <file alias="tvtelx-trans">pixmaps/toolbar/tvtelx-transparent.png</file>
+ <file alias="tvtelx">pixmaps/toolbar/tvtelx.png</file>
+ <file alias="extended">pixmaps/toolbar/extended_16px.png</file>
+ <file alias="record">pixmaps/toolbar/record_16px.png</file>
+ <file alias="volume-high">pixmaps/toolbar/volume-high.png</file>
+ <file alias="volume-medium">pixmaps/toolbar/volume-medium.png</file>
+ <file alias="volume-low">pixmaps/toolbar/volume-low.png</file>
+ <file alias="volume-muted">pixmaps/toolbar/volume-muted.png</file>
+ <file alias="volslide-inside">pixmaps/toolbar/volume-slider-inside.png</file>
+ <file alias="volslide-outside">pixmaps/toolbar/volume-slider-outside.png</file>
+ <file alias="snapshot">pixmaps/toolbar/snapshot.png</file>
+ <file alias="dvd_menu">pixmaps/toolbar/dvd_menu.png</file>
+ <file alias="dvd_next">pixmaps/toolbar/dvd_next.png</file>
+ <file alias="dvd_prev">pixmaps/toolbar/dvd_prev.png</file>
+ <file alias="atob">pixmaps/toolbar/atob.png</file>
+ <file alias="atob_noa">pixmaps/toolbar/atob_noa.png</file>
+ <file alias="atob_nob">pixmaps/toolbar/atob_nob.png</file>
+ <file alias="next">pixmaps/next_16px.png</file>
+ <file alias="next_b">pixmaps/next.png</file>
+ <file alias="down_arrow">pixmaps/arrow_down_dark.png</file>
+ <file alias="pause">pixmaps/pause_16px.png</file>
+ <file alias="pause_b">pixmaps/pause.png</file>
+ <file alias="play">pixmaps/play_16px.png</file>
+ <file alias="play_b">pixmaps/play.png</file>
+ <file alias="previous">pixmaps/previous_16px.png</file>
+ <file alias="previous_b">pixmaps/previous.png</file>
+ <file alias="stop">pixmaps/stop_16px.png</file>
+ <file alias="stop_b">pixmaps/stop.png</file>
+ <file alias="eject">pixmaps/eject.png</file>
+ <file alias="update">pixmaps/update.png</file>
+ <file alias="clear">pixmaps/clear.png</file>
+ <file alias="noart.png">pixmaps/noart.png</file>
<file>pixmaps/go-next.png</file>
- <file>pixmaps/menus_help_16px.png</file>
- <file>pixmaps/menus_info_16px.png</file>
- <file>pixmaps/menus_messages_16px.png</file>
- <file>pixmaps/menus_preferences_16px.png</file>
- <file>pixmaps/menus_quit_16px.png</file>
- <file>pixmaps/menus_settings_16px.png</file>
- <file>pixmaps/menus_stream_16px.png</file>
- <file>pixmaps/network_16px.png</file>
- <file>pixmaps/next_16px.png</file>
- <file>pixmaps/next.png</file>
- <file>pixmaps/pause_16px.png</file>
- <file>pixmaps/pause.png</file>
- <file>pixmaps/play_16px.png</file>
- <file>pixmaps/playlist_16px.png</file>
- <file>pixmaps/playlist_add.png</file>
- <file>pixmaps/playlist.png</file>
- <file>pixmaps/playlist_repeat_all.png</file>
- <file>pixmaps/playlist_repeat_off.png</file>
- <file>pixmaps/playlist_repeat_one.png</file>
- <file>pixmaps/playlist_shuffle_off.png</file>
- <file>pixmaps/playlist_shuffle_on.png</file>
- <file>pixmaps/play.png</file>
- <file>pixmaps/tvtelx-transparent.png</file>
- <file>pixmaps/tvtelx.png</file>
- <file>pixmaps/tv.png</file>
- <file>pixmaps/previous_16px.png</file>
- <file>pixmaps/previous.png</file>
- <file>pixmaps/record_16px.png</file>
- <file>pixmaps/spref_cone_Audio_64.png</file>
- <file>pixmaps/spref_cone_Hotkeys_64.png</file>
- <file>pixmaps/spref_cone_Input_64.png</file>
- <file>pixmaps/spref_cone_Interface_64.png</file>
- <file>pixmaps/spref_cone_Subtitles_64.png</file>
- <file>pixmaps/spref_cone_Video_64.png</file>
- <file>pixmaps/stop_16px.png</file>
- <file>pixmaps/stop.png</file>
- <file>pixmaps/type_directory.png</file>
- <file>pixmaps/type_file.png</file>
- <file>pixmaps/type_net.png</file>
- <file>pixmaps/type_node.png</file>
- <file>pixmaps/type_playlist.png</file>
- <file>pixmaps/volume-high.png</file>
- <file>pixmaps/volume-medium.png</file>
- <file>pixmaps/volume-low.png</file>
- <file>pixmaps/volume-muted.png</file>
- <file>pixmaps/volume-slider-inside.png</file>
- <file>pixmaps/volume-slider-outside.png</file>
</qresource>
</RCC>
projects / vlc / commitdiff
