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

Qt Imageset update.

- Add alias for most of the pixmpas. Separate in different folders.
- Change some pixmaps
- Close most of #852
- Close #1799
- Close #1780
parent c6adecf5
......@@ -172,70 +172,81 @@ EXTRA_DIST += \
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
......@@ -65,13 +65,13 @@ PrefsTree::PrefsTree( intf_thread_t *_p_intf, QWidget *_parent ) :
/* 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 */
......
......@@ -1332,8 +1332,6 @@ SyncControls::SyncControls( intf_thread_t *_p_intf, QWidget *_parent ) :
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 );
......@@ -1348,7 +1346,8 @@ SyncControls::SyncControls( intf_thread_t *_p_intf, QWidget *_parent ) :
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();
......
......@@ -306,7 +306,8 @@ AdvControlsWidget::AdvControlsWidget( intf_thread_t *_p_i ) :
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 ) );
......@@ -321,14 +322,15 @@ AdvControlsWidget::AdvControlsWidget( intf_thread_t *_p_i ) :
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()
......@@ -361,19 +363,22 @@ void AdvControlsWidget::fromAtoB()
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 */
......@@ -453,9 +458,9 @@ ControlsWidget::ControlsWidget( intf_thread_t *_p_i,
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();
......@@ -504,7 +509,7 @@ ControlsWidget::ControlsWidget( intf_thread_t *_p_i,
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() );
......@@ -516,7 +521,7 @@ ControlsWidget::ControlsWidget( intf_thread_t *_p_i,
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(),
......@@ -564,18 +569,19 @@ ControlsWidget::ControlsWidget( intf_thread_t *_p_i,
/* 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 )
......@@ -583,13 +589,13 @@ ControlsWidget::ControlsWidget( intf_thread_t *_p_i,
/** 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 );
}
......@@ -597,7 +603,7 @@ ControlsWidget::ControlsWidget( intf_thread_t *_p_i,
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 );
......@@ -703,13 +709,13 @@ void ControlsWidget::toggleTeletextTransparency()
{
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;
}
......@@ -773,12 +779,12 @@ void ControlsWidget::updateVolume( int i_sliderVolume )
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()
......@@ -808,12 +814,12 @@ void ControlsWidget::setStatus( int status )
{
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" ) );
}
}
......
......@@ -256,7 +256,8 @@ DiscOpenPanel::DiscOpenPanel( QWidget *_parent, intf_thread_t *_p_intf ) :
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());
......
......@@ -32,8 +32,6 @@
#include "components/playlist/playlist_model.hpp"
#include <vlc_intf_strings.h>
#include "pixmaps/type_unknown.xpm"
#include <QSettings>
#include "sorting.h"
......
......@@ -30,7 +30,7 @@
#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>
......@@ -83,14 +83,14 @@ PLModel::PLModel( playlist_t *_p_playlist, /* THEPL */
/* 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 );
......
......@@ -99,7 +99,7 @@ StandardPLPanel::StandardPLPanel( PlaylistWidget *_parent,
/* 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 );
......@@ -108,12 +108,12 @@ StandardPLPanel::StandardPLPanel( PlaylistWidget *_parent,
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() );
......@@ -123,17 +123,17 @@ StandardPLPanel::StandardPLPanel( PlaylistWidget *_parent,
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() );
......@@ -158,10 +158,8 @@ StandardPLPanel::StandardPLPanel( PlaylistWidget *_parent,
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 */
......@@ -177,19 +175,19 @@ void StandardPLPanel::toggleRepeat()
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 ));
}
}
......@@ -200,8 +198,8 @@ void StandardPLPanel::toggleRandom()
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 ) );
}
......
......@@ -60,7 +60,7 @@ SPrefsCatList::SPrefsCatList( intf_thread_t *_p_intf, QWidget *_parent ) :
#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 ); \
......
......@@ -492,11 +492,11 @@ VLMAWidget::VLMAWidget( QString _name,
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() );
......@@ -514,12 +514,6 @@ void VLMAWidget::del()
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 );
......@@ -538,12 +532,12 @@ VLMBroadcast::VLMBroadcast( QString _name, QString _input, QString _output,
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;
......@@ -560,9 +554,9 @@ void VLMBroadcast::update()
{
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()
......@@ -570,12 +564,12 @@ 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;
}
......@@ -589,7 +583,7 @@ void VLMBroadcast::toggleLoop()
void VLMBroadcast::stop()
{
VLMWrapper::ControlBroadcast( name, ControlBroadcastStop );
playButton->setIcon( QIcon( QPixmap( ":/pixmaps/play_16px.png" ) ) );
playButton->setIcon( QIcon( QPixmap( ":/play_16px" ) ) );
}
/****************
......
......@@ -167,7 +167,6 @@ protected:
bool b_enabled;
int type;
VLMDialog *parent;
virtual void enterEvent( QEvent * );
QGridLayout *objLayout;
private slots:
virtual void modify();
......
<
......@@ -293,27 +293,27 @@ QMenu *QVLCMenu::FileMenu()
QMenu *menu = new QMenu();
addDPStaticEntry( menu, qtr( "&Open File..." ), "",