From b5077c0ef45f56e5b4126f78b71aadecf8f2857f Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Kempf Date: Sun, 27 Jul 2008 23:26:46 -0700 Subject: [PATCH] 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 --- modules/gui/qt4/Modules.am | 121 +++++++++------- .../qt4/components/complete_preferences.cpp | 14 +- .../gui/qt4/components/extended_panels.cpp | 5 +- .../gui/qt4/components/interface_widgets.cpp | 64 +++++---- modules/gui/qt4/components/open_panels.cpp | 3 +- .../qt4/components/playlist/playlist_item.cpp | 2 - .../components/playlist/playlist_model.cpp | 18 +-- .../qt4/components/playlist/standardpanel.cpp | 26 ++-- .../gui/qt4/components/simple_preferences.cpp | 2 +- modules/gui/qt4/dialogs/vlm.cpp | 24 ++-- modules/gui/qt4/dialogs/vlm.hpp | 1 - modules/gui/qt4/menus.cpp | 66 ++++----- modules/gui/qt4/pixmaps/arrow_down_dark.png | Bin 0 -> 229 bytes modules/gui/qt4/pixmaps/clear.png | Bin 0 -> 343 bytes modules/gui/qt4/pixmaps/eject.png | Bin 0 -> 246 bytes .../help_16px.png} | Bin .../info_16px.png} | Bin .../messages_16px.png} | Bin .../qt4/pixmaps/{ => menus}/playlist_16px.png | Bin .../preferences_16px.png} | Bin .../quit_16px.png} | Bin .../settings_16px.png} | Bin .../stream_16px.png} | Bin modules/gui/qt4/pixmaps/playlist.png | Bin 162 -> 0 bytes .../{playlist_add.png => playlist/add.png} | Bin modules/gui/qt4/pixmaps/playlist/playlist.png | Bin 0 -> 2934 bytes .../repeat_all.png} | Bin .../repeat_off.png} | Bin .../repeat_one.png} | Bin .../shuffle_off.png} | Bin .../shuffle_on.png} | Bin .../pixmaps/{ => prefs}/advprefs_audio.png | Bin .../pixmaps/{ => prefs}/advprefs_codec.png | Bin .../pixmaps/{ => prefs}/advprefs_extended.png | Bin .../qt4/pixmaps/{ => prefs}/advprefs_intf.png | Bin .../pixmaps/{ => prefs}/advprefs_playlist.png | Bin .../qt4/pixmaps/{ => prefs}/advprefs_sout.png | Bin .../pixmaps/{ => prefs}/advprefs_video.png | Bin .../{ => prefs}/spref_cone_Audio_64.png | Bin .../{ => prefs}/spref_cone_Hotkeys_64.png | Bin .../{ => prefs}/spref_cone_Input_64.png | Bin .../{ => prefs}/spref_cone_Interface_64.png | Bin .../{ => prefs}/spref_cone_Subtitles_64.png | Bin .../{ => prefs}/spref_cone_Video_64.png | Bin modules/gui/qt4/pixmaps/toolbar/atob.png | Bin 0 -> 453 bytes modules/gui/qt4/pixmaps/toolbar/atob_noa.png | Bin 0 -> 500 bytes modules/gui/qt4/pixmaps/toolbar/atob_nob.png | Bin 0 -> 498 bytes modules/gui/qt4/pixmaps/toolbar/dvd_menu.png | Bin 0 -> 246 bytes modules/gui/qt4/pixmaps/toolbar/dvd_next.png | Bin 0 -> 371 bytes modules/gui/qt4/pixmaps/toolbar/dvd_prev.png | Bin 0 -> 360 bytes .../pixmaps/{ => toolbar}/extended_16px.png | Bin .../gui/qt4/pixmaps/toolbar/fullscreen.png | Bin 0 -> 441 bytes .../qt4/pixmaps/{ => toolbar}/record_16px.png | Bin modules/gui/qt4/pixmaps/toolbar/snapshot.png | Bin 0 -> 463 bytes modules/gui/qt4/pixmaps/{ => toolbar}/tv.png | Bin .../{ => toolbar}/tvtelx-transparent.png | Bin .../gui/qt4/pixmaps/{ => toolbar}/tvtelx.png | Bin .../qt4/pixmaps/{ => toolbar}/volume-high.png | Bin .../qt4/pixmaps/{ => toolbar}/volume-low.png | Bin .../pixmaps/{ => toolbar}/volume-medium.png | Bin .../pixmaps/{ => toolbar}/volume-muted.png | Bin .../{ => toolbar}/volume-slider-inside.png | Bin .../{ => toolbar}/volume-slider-outside.png | Bin .../pixmaps/{ => toolbar}/volume-slider.svg | 0 .../pixmaps/{ => types}/capture-card_16px.png | Bin .../gui/qt4/pixmaps/{ => types}/cdda_16px.png | Bin .../gui/qt4/pixmaps/{ => types}/disc_16px.png | Bin .../pixmaps/{ => types}/file-asym_16px.png | Bin .../pixmaps/{ => types}/file-wide_16px.png | Bin .../pixmaps/{ => types}/folder-blue_16px.png | Bin .../pixmaps/{ => types}/folder-grey_16px.png | Bin .../qt4/pixmaps/{ => types}/harddisk_16px.png | Bin .../qt4/pixmaps/{ => types}/network_16px.png | Bin .../gui/qt4/pixmaps/{ => types}/tape_16px.png | Bin .../pixmaps/{ => types}/type_directory.png | Bin .../gui/qt4/pixmaps/{ => types}/type_file.png | Bin .../gui/qt4/pixmaps/{ => types}/type_net.png | Bin .../gui/qt4/pixmaps/{ => types}/type_node.png | Bin .../qt4/pixmaps/{ => types}/type_playlist.png | Bin .../qt4/pixmaps/{ => types}/type_unknown.xpm | 0 modules/gui/qt4/pixmaps/update.png | Bin 0 -> 681 bytes modules/gui/qt4/qt4.hpp | 2 +- modules/gui/qt4/util/input_slider.cpp | 4 +- modules/gui/qt4/vlc.qrc | 135 ++++++++++-------- 84 files changed, 253 insertions(+), 234 deletions(-) create mode 100644 modules/gui/qt4/pixmaps/arrow_down_dark.png create mode 100644 modules/gui/qt4/pixmaps/clear.png create mode 100644 modules/gui/qt4/pixmaps/eject.png rename modules/gui/qt4/pixmaps/{menus_help_16px.png => menus/help_16px.png} (100%) rename modules/gui/qt4/pixmaps/{menus_info_16px.png => menus/info_16px.png} (100%) rename modules/gui/qt4/pixmaps/{menus_messages_16px.png => menus/messages_16px.png} (100%) rename modules/gui/qt4/pixmaps/{ => menus}/playlist_16px.png (100%) rename modules/gui/qt4/pixmaps/{menus_preferences_16px.png => menus/preferences_16px.png} (100%) rename modules/gui/qt4/pixmaps/{menus_quit_16px.png => menus/quit_16px.png} (100%) rename modules/gui/qt4/pixmaps/{menus_settings_16px.png => menus/settings_16px.png} (100%) rename modules/gui/qt4/pixmaps/{menus_stream_16px.png => menus/stream_16px.png} (100%) delete mode 100644 modules/gui/qt4/pixmaps/playlist.png rename modules/gui/qt4/pixmaps/{playlist_add.png => playlist/add.png} (100%) create mode 100644 modules/gui/qt4/pixmaps/playlist/playlist.png rename modules/gui/qt4/pixmaps/{playlist_repeat_all.png => playlist/repeat_all.png} (100%) rename modules/gui/qt4/pixmaps/{playlist_repeat_off.png => playlist/repeat_off.png} (100%) rename modules/gui/qt4/pixmaps/{playlist_repeat_one.png => playlist/repeat_one.png} (100%) rename modules/gui/qt4/pixmaps/{playlist_shuffle_off.png => playlist/shuffle_off.png} (100%) rename modules/gui/qt4/pixmaps/{playlist_shuffle_on.png => playlist/shuffle_on.png} (100%) rename modules/gui/qt4/pixmaps/{ => prefs}/advprefs_audio.png (100%) rename modules/gui/qt4/pixmaps/{ => prefs}/advprefs_codec.png (100%) rename modules/gui/qt4/pixmaps/{ => prefs}/advprefs_extended.png (100%) rename modules/gui/qt4/pixmaps/{ => prefs}/advprefs_intf.png (100%) rename modules/gui/qt4/pixmaps/{ => prefs}/advprefs_playlist.png (100%) rename modules/gui/qt4/pixmaps/{ => prefs}/advprefs_sout.png (100%) rename modules/gui/qt4/pixmaps/{ => prefs}/advprefs_video.png (100%) rename modules/gui/qt4/pixmaps/{ => prefs}/spref_cone_Audio_64.png (100%) rename modules/gui/qt4/pixmaps/{ => prefs}/spref_cone_Hotkeys_64.png (100%) rename modules/gui/qt4/pixmaps/{ => prefs}/spref_cone_Input_64.png (100%) rename modules/gui/qt4/pixmaps/{ => prefs}/spref_cone_Interface_64.png (100%) rename modules/gui/qt4/pixmaps/{ => prefs}/spref_cone_Subtitles_64.png (100%) rename modules/gui/qt4/pixmaps/{ => prefs}/spref_cone_Video_64.png (100%) create mode 100644 modules/gui/qt4/pixmaps/toolbar/atob.png create mode 100644 modules/gui/qt4/pixmaps/toolbar/atob_noa.png create mode 100644 modules/gui/qt4/pixmaps/toolbar/atob_nob.png create mode 100644 modules/gui/qt4/pixmaps/toolbar/dvd_menu.png create mode 100644 modules/gui/qt4/pixmaps/toolbar/dvd_next.png create mode 100644 modules/gui/qt4/pixmaps/toolbar/dvd_prev.png rename modules/gui/qt4/pixmaps/{ => toolbar}/extended_16px.png (100%) create mode 100644 modules/gui/qt4/pixmaps/toolbar/fullscreen.png rename modules/gui/qt4/pixmaps/{ => toolbar}/record_16px.png (100%) create mode 100644 modules/gui/qt4/pixmaps/toolbar/snapshot.png rename modules/gui/qt4/pixmaps/{ => toolbar}/tv.png (100%) rename modules/gui/qt4/pixmaps/{ => toolbar}/tvtelx-transparent.png (100%) rename modules/gui/qt4/pixmaps/{ => toolbar}/tvtelx.png (100%) rename modules/gui/qt4/pixmaps/{ => toolbar}/volume-high.png (100%) rename modules/gui/qt4/pixmaps/{ => toolbar}/volume-low.png (100%) rename modules/gui/qt4/pixmaps/{ => toolbar}/volume-medium.png (100%) rename modules/gui/qt4/pixmaps/{ => toolbar}/volume-muted.png (100%) rename modules/gui/qt4/pixmaps/{ => toolbar}/volume-slider-inside.png (100%) rename modules/gui/qt4/pixmaps/{ => toolbar}/volume-slider-outside.png (100%) rename modules/gui/qt4/pixmaps/{ => toolbar}/volume-slider.svg (100%) rename modules/gui/qt4/pixmaps/{ => types}/capture-card_16px.png (100%) rename modules/gui/qt4/pixmaps/{ => types}/cdda_16px.png (100%) rename modules/gui/qt4/pixmaps/{ => types}/disc_16px.png (100%) rename modules/gui/qt4/pixmaps/{ => types}/file-asym_16px.png (100%) rename modules/gui/qt4/pixmaps/{ => types}/file-wide_16px.png (100%) rename modules/gui/qt4/pixmaps/{ => types}/folder-blue_16px.png (100%) rename modules/gui/qt4/pixmaps/{ => types}/folder-grey_16px.png (100%) rename modules/gui/qt4/pixmaps/{ => types}/harddisk_16px.png (100%) rename modules/gui/qt4/pixmaps/{ => types}/network_16px.png (100%) rename modules/gui/qt4/pixmaps/{ => types}/tape_16px.png (100%) rename modules/gui/qt4/pixmaps/{ => types}/type_directory.png (100%) rename modules/gui/qt4/pixmaps/{ => types}/type_file.png (100%) rename modules/gui/qt4/pixmaps/{ => types}/type_net.png (100%) rename modules/gui/qt4/pixmaps/{ => types}/type_node.png (100%) rename modules/gui/qt4/pixmaps/{ => types}/type_playlist.png (100%) rename modules/gui/qt4/pixmaps/{ => types}/type_unknown.xpm (100%) create mode 100644 modules/gui/qt4/pixmaps/update.png diff --git a/modules/gui/qt4/Modules.am b/modules/gui/qt4/Modules.am index bd46cc2629..bf228afff7 100644 --- a/modules/gui/qt4/Modules.am +++ b/modules/gui/qt4/Modules.am @@ -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 diff --git a/modules/gui/qt4/components/complete_preferences.cpp b/modules/gui/qt4/components/complete_preferences.cpp index 0fce1cae6c..69afc75ba2 100644 --- a/modules/gui/qt4/components/complete_preferences.cpp +++ b/modules/gui/qt4/components/complete_preferences.cpp @@ -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 */ diff --git a/modules/gui/qt4/components/extended_panels.cpp b/modules/gui/qt4/components/extended_panels.cpp index ca7d471a5e..3560d7a854 100644 --- a/modules/gui/qt4/components/extended_panels.cpp +++ b/modules/gui/qt4/components/extended_panels.cpp @@ -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(); diff --git a/modules/gui/qt4/components/interface_widgets.cpp b/modules/gui/qt4/components/interface_widgets.cpp index a42d4c0bfe..c891f7828b 100644 --- a/modules/gui/qt4/components/interface_widgets.cpp +++ b/modules/gui/qt4/components/interface_widgets.cpp @@ -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" ) ); } } diff --git a/modules/gui/qt4/components/open_panels.cpp b/modules/gui/qt4/components/open_panels.cpp index 14ec54cddc..27ee273304 100644 --- a/modules/gui/qt4/components/open_panels.cpp +++ b/modules/gui/qt4/components/open_panels.cpp @@ -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()); diff --git a/modules/gui/qt4/components/playlist/playlist_item.cpp b/modules/gui/qt4/components/playlist/playlist_item.cpp index 507ffc77aa..d9f97e56e2 100644 --- a/modules/gui/qt4/components/playlist/playlist_item.cpp +++ b/modules/gui/qt4/components/playlist/playlist_item.cpp @@ -32,8 +32,6 @@ #include "components/playlist/playlist_model.hpp" #include -#include "pixmaps/type_unknown.xpm" - #include #include "sorting.h" diff --git a/modules/gui/qt4/components/playlist/playlist_model.cpp b/modules/gui/qt4/components/playlist/playlist_model.cpp index a4a16db57b..74c1b50c8f 100644 --- a/modules/gui/qt4/components/playlist/playlist_model.cpp +++ b/modules/gui/qt4/components/playlist/playlist_model.cpp @@ -30,7 +30,7 @@ #include "dialogs/mediainfo.hpp" #include -#include "pixmaps/type_unknown.xpm" +#include "pixmaps/types/type_unknown.xpm" #include #include @@ -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 ); diff --git a/modules/gui/qt4/components/playlist/standardpanel.cpp b/modules/gui/qt4/components/playlist/standardpanel.cpp index 6bea1c92d4..e56651abb2 100644 --- a/modules/gui/qt4/components/playlist/standardpanel.cpp +++ b/modules/gui/qt4/components/playlist/standardpanel.cpp @@ -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 ) ); } diff --git a/modules/gui/qt4/components/simple_preferences.cpp b/modules/gui/qt4/components/simple_preferences.cpp index 3161f45624..2f62769b09 100644 --- a/modules/gui/qt4/components/simple_preferences.cpp +++ b/modules/gui/qt4/components/simple_preferences.cpp @@ -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 ); \ diff --git a/modules/gui/qt4/dialogs/vlm.cpp b/modules/gui/qt4/dialogs/vlm.cpp index 12ad9bf4e4..430296cbaf 100644 --- a/modules/gui/qt4/dialogs/vlm.cpp +++ b/modules/gui/qt4/dialogs/vlm.cpp @@ -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" ) ) ); } /**************** diff --git a/modules/gui/qt4/dialogs/vlm.hpp b/modules/gui/qt4/dialogs/vlm.hpp index 10a5376890..cf0cb148fc 100644 --- a/modules/gui/qt4/dialogs/vlm.hpp +++ b/modules/gui/qt4/dialogs/vlm.hpp @@ -167,7 +167,6 @@ protected: bool b_enabled; int type; VLMDialog *parent; - virtual void enterEvent( QEvent * ); QGridLayout *objLayout; private slots: virtual void modify(); diff --git a/modules/gui/qt4/menus.cpp b/modules/gui/qt4/menus.cpp index d8254b76c8..77a76dcc91 100644 --- a/modules/gui/qt4/menus.cpp +++ b/modules/gui/qt4/menus.cpp @@ -293,27 +293,27 @@ QMenu *QVLCMenu::FileMenu() 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; } @@ -322,7 +322,7 @@ QMenu *QVLCMenu::PlaylistMenu( intf_thread_t *p_intf, MainInterface *mi ) { 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(); @@ -352,13 +352,13 @@ QMenu *QVLCMenu::ToolsMenu( intf_thread_t *p_intf, 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(); @@ -406,12 +406,12 @@ QMenu *QVLCMenu::ToolsMenu( intf_thread_t *p_intf, 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 @@ -421,7 +421,7 @@ QMenu *QVLCMenu::ToolsMenu( intf_thread_t *p_intf, menu->addSeparator(); addDPStaticEntry( menu, qtr( "Preferences..." ), "", - ":/pixmaps/menus_preferences_16px.png", SLOT( prefsDialog() ), "Ctrl+P" ); + ":/preferences", SLOT( prefsDialog() ), "Ctrl+P" ); return menu; } @@ -614,14 +614,14 @@ QMenu *QVLCMenu::HelpMenu( QMenu *current ) { 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; } @@ -651,24 +651,24 @@ void QVLCMenu::PopupMenuControlEntries( QMenu *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 ) @@ -681,15 +681,15 @@ 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(); @@ -699,7 +699,7 @@ void QVLCMenu::PopupMenuStaticEntries( intf_thread_t *p_intf, QMenu *menu ) menu->addMenu( helpmenu ); #endif - addDPStaticEntry( menu, qtr( "Quit" ), "", ":/pixmaps/menus_quit_16px.png", + addDPStaticEntry( menu, qtr( "Quit" ), "", ":/quit", SLOT( quit() ), "Ctrl+Q" ); } @@ -839,10 +839,10 @@ void QVLCMenu::PopupMenu( intf_thread_t *p_intf, bool show ) 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 ); @@ -904,9 +904,9 @@ void QVLCMenu::updateSystrayMenu( MainInterface *mi, 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 ); diff --git a/modules/gui/qt4/pixmaps/arrow_down_dark.png b/modules/gui/qt4/pixmaps/arrow_down_dark.png new file mode 100644 index 0000000000000000000000000000000000000000..0e135b0e82537ae2c3a2d7ae52a92ba8f5c54888 GIT binary patch literal 229 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmUzPnffIy#(?lOI#yL zg7ec#$`gxH85~pclTsBta}(23gHjVyDhp4h+5i=md%8G=RNPAX^Z&m+vuZDRLVmb-OKK{J;3nAHyTl*WNn8VA3#ALf?m7^WTq; z$}-JA6begPdv*v3osmv+v*KBPF81K78UqH&2JY80XZSKd`mZ20UFz7yB|bYD85r3Z Y?)pZwy;l{i20DSk)78&qol`;+0QK@ux&QzG literal 0 HcmV?d00001 diff --git a/modules/gui/qt4/pixmaps/clear.png b/modules/gui/qt4/pixmaps/clear.png new file mode 100644 index 0000000000000000000000000000000000000000..0df25812fb3ea6e87d87e0ce467935eaca46a6da GIT binary patch literal 343 zcmV-d0jU0oP)o^KNL^Hq86(>Ba#>XduwWf8C$Pk2T{|3I15R0CYn4Wh+sjs;@{uD zVA@knjbZz(TbW2wnIJKkJT5Ox2Wn#Y3seNcZpzAFjUWtS!^A;qpsvI40^F%ia&lM$ zY~Q0t=w8E!1(3vakitKI{-9uNnlZuv8T|hJo2+yI_JS!tKf|A2zfdqp3>qfW@TG%H zLvC)kvrm8g2*xlzNDkc)lysoW#s=qH2HJ`g+L>77Fw?jzm!%yzl@3002ovPDHLkV1l0HiUj}w literal 0 HcmV?d00001 diff --git a/modules/gui/qt4/pixmaps/eject.png b/modules/gui/qt4/pixmaps/eject.png new file mode 100644 index 0000000000000000000000000000000000000000..ff6767d4a7f615c30c61251469363bc9ced5d9a5 GIT binary patch literal 246 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmUzPnffIy#(?lOI#yL zg7ec#$`gxH85~pclTsBta}(23gHjVyDhp4h+5i=Gc)B=-RNP9sVr-bafW^Qtfa8Ot z0dL2D=Z_{qybPHqdbmEPGb9Q~PgnH$VRD$k&Uwa%%zqyrvr9ZSZsDB%?EHLt<3IoY zO7}SC#IzYCUjFm#ZFF1w{B^JJXV83a8C*$d`T$b1Ajh~h?vl@B&FkPM) q>rm+AlFz@i?BGAi>JaBe9YD|Ns7FJ%amfPF_27 rHd*S0fCTH}%mk61WsQLb4;UB@vh#2y@hr*)YGm+q^>bP0l+XkKvr#P| diff --git a/modules/gui/qt4/pixmaps/playlist_add.png b/modules/gui/qt4/pixmaps/playlist/add.png similarity index 100% rename from modules/gui/qt4/pixmaps/playlist_add.png rename to modules/gui/qt4/pixmaps/playlist/add.png diff --git a/modules/gui/qt4/pixmaps/playlist/playlist.png b/modules/gui/qt4/pixmaps/playlist/playlist.png new file mode 100644 index 0000000000000000000000000000000000000000..443ea10bc3a46ae48c498fb52878e0fcc5524eaa GIT binary patch literal 2934 zcmV-+3yJiJP)KLZ*U+IBfRsybQWXdwQbLP>6pAqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uhf59&ghTmgWD0l;*T zI709Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-rV&neh&#Q1i z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_IfqH8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA@W-aonk<7r1(?fC{oI5N*U!4 zfg=2N-7=cNnjjOr{yriy6mMFgG#l znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U zt5vFIcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya? z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0 z?2xS?_ve_-kiKB_KiJlZ$9G`c^=E@oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$ z3*&nim@mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz@C5{St!X3hAA}`T4 z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i& z_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01 z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R z9cLXcYC@Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD zJpPl@Psh8QyPB@KTx+@RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3| zawq-H%e&ckC+@AhPrP6BKT#_XdT7&;F71j}Joy zkC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot2z=00004XF*Lt006O$eEU(80000WV@Og>004R=004l4008;_004mL004C` z008P>0026e000+nl3&F}0001yNkl49iw+%w%9-$YNk%$V^K~$E$nRoSB&n z3=D7srb9JPhw-5b@VbD3fq{XM(paEg7`QlCGVD2Uocu6=Y97jApslXRaP{VW^1}eC gnf_rwab^Mx0A~AHQ=Bhta{vGU07*qoM6N<$f+D+Z#{d8T literal 0 HcmV?d00001 diff --git a/modules/gui/qt4/pixmaps/playlist_repeat_all.png b/modules/gui/qt4/pixmaps/playlist/repeat_all.png similarity index 100% rename from modules/gui/qt4/pixmaps/playlist_repeat_all.png rename to modules/gui/qt4/pixmaps/playlist/repeat_all.png diff --git a/modules/gui/qt4/pixmaps/playlist_repeat_off.png b/modules/gui/qt4/pixmaps/playlist/repeat_off.png similarity index 100% rename from modules/gui/qt4/pixmaps/playlist_repeat_off.png rename to modules/gui/qt4/pixmaps/playlist/repeat_off.png diff --git a/modules/gui/qt4/pixmaps/playlist_repeat_one.png b/modules/gui/qt4/pixmaps/playlist/repeat_one.png similarity index 100% rename from modules/gui/qt4/pixmaps/playlist_repeat_one.png rename to modules/gui/qt4/pixmaps/playlist/repeat_one.png diff --git a/modules/gui/qt4/pixmaps/playlist_shuffle_off.png b/modules/gui/qt4/pixmaps/playlist/shuffle_off.png similarity index 100% rename from modules/gui/qt4/pixmaps/playlist_shuffle_off.png rename to modules/gui/qt4/pixmaps/playlist/shuffle_off.png diff --git a/modules/gui/qt4/pixmaps/playlist_shuffle_on.png b/modules/gui/qt4/pixmaps/playlist/shuffle_on.png similarity index 100% rename from modules/gui/qt4/pixmaps/playlist_shuffle_on.png rename to modules/gui/qt4/pixmaps/playlist/shuffle_on.png diff --git a/modules/gui/qt4/pixmaps/advprefs_audio.png b/modules/gui/qt4/pixmaps/prefs/advprefs_audio.png similarity index 100% rename from modules/gui/qt4/pixmaps/advprefs_audio.png rename to modules/gui/qt4/pixmaps/prefs/advprefs_audio.png diff --git a/modules/gui/qt4/pixmaps/advprefs_codec.png b/modules/gui/qt4/pixmaps/prefs/advprefs_codec.png similarity index 100% rename from modules/gui/qt4/pixmaps/advprefs_codec.png rename to modules/gui/qt4/pixmaps/prefs/advprefs_codec.png diff --git a/modules/gui/qt4/pixmaps/advprefs_extended.png b/modules/gui/qt4/pixmaps/prefs/advprefs_extended.png similarity index 100% rename from modules/gui/qt4/pixmaps/advprefs_extended.png rename to modules/gui/qt4/pixmaps/prefs/advprefs_extended.png diff --git a/modules/gui/qt4/pixmaps/advprefs_intf.png b/modules/gui/qt4/pixmaps/prefs/advprefs_intf.png similarity index 100% rename from modules/gui/qt4/pixmaps/advprefs_intf.png rename to modules/gui/qt4/pixmaps/prefs/advprefs_intf.png diff --git a/modules/gui/qt4/pixmaps/advprefs_playlist.png b/modules/gui/qt4/pixmaps/prefs/advprefs_playlist.png similarity index 100% rename from modules/gui/qt4/pixmaps/advprefs_playlist.png rename to modules/gui/qt4/pixmaps/prefs/advprefs_playlist.png diff --git a/modules/gui/qt4/pixmaps/advprefs_sout.png b/modules/gui/qt4/pixmaps/prefs/advprefs_sout.png similarity index 100% rename from modules/gui/qt4/pixmaps/advprefs_sout.png rename to modules/gui/qt4/pixmaps/prefs/advprefs_sout.png diff --git a/modules/gui/qt4/pixmaps/advprefs_video.png b/modules/gui/qt4/pixmaps/prefs/advprefs_video.png similarity index 100% rename from modules/gui/qt4/pixmaps/advprefs_video.png rename to modules/gui/qt4/pixmaps/prefs/advprefs_video.png diff --git a/modules/gui/qt4/pixmaps/spref_cone_Audio_64.png b/modules/gui/qt4/pixmaps/prefs/spref_cone_Audio_64.png similarity index 100% rename from modules/gui/qt4/pixmaps/spref_cone_Audio_64.png rename to modules/gui/qt4/pixmaps/prefs/spref_cone_Audio_64.png diff --git a/modules/gui/qt4/pixmaps/spref_cone_Hotkeys_64.png b/modules/gui/qt4/pixmaps/prefs/spref_cone_Hotkeys_64.png similarity index 100% rename from modules/gui/qt4/pixmaps/spref_cone_Hotkeys_64.png rename to modules/gui/qt4/pixmaps/prefs/spref_cone_Hotkeys_64.png diff --git a/modules/gui/qt4/pixmaps/spref_cone_Input_64.png b/modules/gui/qt4/pixmaps/prefs/spref_cone_Input_64.png similarity index 100% rename from modules/gui/qt4/pixmaps/spref_cone_Input_64.png rename to modules/gui/qt4/pixmaps/prefs/spref_cone_Input_64.png diff --git a/modules/gui/qt4/pixmaps/spref_cone_Interface_64.png b/modules/gui/qt4/pixmaps/prefs/spref_cone_Interface_64.png similarity index 100% rename from modules/gui/qt4/pixmaps/spref_cone_Interface_64.png rename to modules/gui/qt4/pixmaps/prefs/spref_cone_Interface_64.png diff --git a/modules/gui/qt4/pixmaps/spref_cone_Subtitles_64.png b/modules/gui/qt4/pixmaps/prefs/spref_cone_Subtitles_64.png similarity index 100% rename from modules/gui/qt4/pixmaps/spref_cone_Subtitles_64.png rename to modules/gui/qt4/pixmaps/prefs/spref_cone_Subtitles_64.png diff --git a/modules/gui/qt4/pixmaps/spref_cone_Video_64.png b/modules/gui/qt4/pixmaps/prefs/spref_cone_Video_64.png similarity index 100% rename from modules/gui/qt4/pixmaps/spref_cone_Video_64.png rename to modules/gui/qt4/pixmaps/prefs/spref_cone_Video_64.png diff --git a/modules/gui/qt4/pixmaps/toolbar/atob.png b/modules/gui/qt4/pixmaps/toolbar/atob.png new file mode 100644 index 0000000000000000000000000000000000000000..10b25d474ae596cc9e2c96b9d171c414ecf17583 GIT binary patch literal 453 zcmV;$0XqJPP)f$zYM?s{DG;PhGf7$FvbJG z;q?2@FEECNSti^7c2;&U#uw_qfMeib=Ky068zjbvB^tregToLEbua_S2H;q5yHt&0 z@-Dqr3>O>|XhctJ)2%+#XEC0OfjCPq*bXduY3(7fq~YTKD2DjYX8&*Fp$F$5*>MT1 z4it!)y56Q>jUWtS<4V?l|NRDQ1Yt`zO|Uw!7yf6OK2Li@U$_&SM zU5C4X;s2)(3|9}{1Y-~z7x?|>2bey)?=FL$oiwTo;7OW*3pA`mAz^jsDcA)d1E$}& v{XG+wRFT=}3F*eM*C?^DG4*E_K!5=NEIFZ|BznRD00000NkvXXu0mjf9$LXs literal 0 HcmV?d00001 diff --git a/modules/gui/qt4/pixmaps/toolbar/atob_noa.png b/modules/gui/qt4/pixmaps/toolbar/atob_noa.png new file mode 100644 index 0000000000000000000000000000000000000000..3adafdacdfe05401b4faddea67db1fb046e6000e GIT binary patch literal 500 zcmVPx#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iON3 z1_>&Zq7L`~00DGKL_t(I%bk+HOG053hMz0Sb*rVRv7sUqA{>%1Xpq36p|v5wld*Op~;5`qA_dCk@#Th^f z(3nj+kaTw&EgnnEG@Z$&wSE9X2&9xKiZXR@*wY8FkVta5+*CmHFp4630GC}@!a@jP zx5}8O1DK|TVVbrt)dvt*J-|3=@mK=G>|mH3x|wMXK=r7o9(8K!nQR)b>cy*i$z;<2 zx-#Y)bs#wbGUBrV|CSpdTsfWt+JFU+_m4tL^QXhdrU#oRN#*$f7a;umApk1ZMF7^X zj7XV4c3@N)Y&c3n#tl=C$JHp8ow^EJ&4Alfa~wwJN% zN$Qv#05*1(Y>@5(kgX=wLW63dfowG=0u1vDfT#O6{GmmF-UiM||FOYJaN#$r;=7Xp q_190w)L#!DQoZys@C!Fb-^m|?n4Vo$!Vp>j0000Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iON3 z1_=tU%q}nh00DAIL_t(I%bk+HOF~f;$3HKOXIo2CV?#wKL^vd2&>(?BLu*5UDX)K_ zAsT|{5AdN04$Tg2;t(iOQw;tCUz!45Y z2-hkjjt*ek4wh}Zc?BOp;Pe5bq~)@CEZfAgO?o}kJb*f_qE4%0yIv|6iKBfLxEC4OMVEdpZM{faBgJJ0~a)d%tDHcT)fu)h2+x zdL;vpolBLC?YQS#HNzXD7Rw|ss!fb)lUOD}*jhWnqE$0!)eP3t%l$8ik1i{li@0%^ zOxpxtZEJzM`cr?AWVgd(qs?QZjqG+p0hav*!2QiD@zi{<0&k`Ns9-5M_uH%Hn+MRJ oUp_T=RsHdxo^Rg+{`&BnAIOfJ32UB?$p8QV07*qoM6N<$f^wzF)&Kwi literal 0 HcmV?d00001 diff --git a/modules/gui/qt4/pixmaps/toolbar/dvd_menu.png b/modules/gui/qt4/pixmaps/toolbar/dvd_menu.png new file mode 100644 index 0000000000000000000000000000000000000000..7aa56cbd7b96cd6211c61594044d7bd5d4a59175 GIT binary patch literal 246 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmUzPnffIy#(?lOI#yL zg7ec#$`gxH85~pclTsBta}(23gHjVyDhp4h+5i=Gc)B=-RNP9sVr-bafW^S^Wv0WQ z`7S({4j;T|NH+qu*|YBXygz`V7RzFu;u68-#dVAV(@hJb6Mw<&;$U5j$U5? literal 0 HcmV?d00001 diff --git a/modules/gui/qt4/pixmaps/toolbar/dvd_next.png b/modules/gui/qt4/pixmaps/toolbar/dvd_next.png new file mode 100644 index 0000000000000000000000000000000000000000..02db82919cb2a2fbabbbbd6e9f741097cd0220b5 GIT binary patch literal 371 zcmV-(0gV2MP)OdI7fIol!05$()`2PI| z!(@^o4`#`v*bW1gGCd6Se<17@SehyF-9NE}gHU??0Z%kA^+{{H$OIV{?JJYSht zJBM+bKX`wCzlCWV`|pOQ^?!aGWau&t3k&mM{`co+bDl$*ONaj9@9*zR+SUJSO43$V zRt{uq$o>8IxB21q@%sZ}PMkW`B-yLLe1T`?zM{8cZMnPoj6Qt)Xt-g+hK8q(_Z-67 zQx3!%xG_a4TyNru+McO?_}$;*5-qK*k~eNzO3aus!+`g}^XJUTIt+Oi+H`kI^2u1T zh8*wb;I|bvo+7}m*^;FsvNi$e4K_V}gP>V+8JTz(d>mdKI;Vst E0B@vP&4o;}BFfRvOZLt08YoIh*MOfby^BL4sX&+zx(KfL(m%U57cAhjR}17HLGfeiTj z7bjMbmtznY7X!Os_S{(vj6etjU@!aw+VBUc5Eqb;5C>}px!~FJ7hwAH=Pw8Ygaie_ zw%`I!pFRg`0?{{b-C?+K<2Hk$f*isCK0aQCl%!OK-+z8#Xl7+$W0*5=1>&|Dbvi6tE};{0D{h-#-`z{D&(1i)O(8e`qfF_x~R_ z#L)pr90bq<`5(FqIN7&+Xm_`DTM+`HK|0B1HaoN5elzne@jMSdR&aY?hpWsW!cF9IIc%)02RVl)t^Vcx zU2Uib0YJkrP^~@VWiBggP(a-_F3T09R#H%@ii`5y;Q3Ji&N&`xHMH0gZ1&M_5hXD+ z9u2If(>OjT1kE91rT`&0{Bk>%4O0wK;fI-)FXzCN*tq#m~ z7nHpsp}s-Wk`OZPvt)vS$^8!oTnHp(Vs^8Q#by(oF2nLdOoC?MO0~K&{+EytpHF=G zd;*314jjh;rF0@8mHc^5spLRNd%ZQ4DF|sK?05bYU;uplh+*wQ05Jdn002ovPDHLk FV1h5izd`^2 literal 0 HcmV?d00001 diff --git a/modules/gui/qt4/pixmaps/tv.png b/modules/gui/qt4/pixmaps/toolbar/tv.png similarity index 100% rename from modules/gui/qt4/pixmaps/tv.png rename to modules/gui/qt4/pixmaps/toolbar/tv.png diff --git a/modules/gui/qt4/pixmaps/tvtelx-transparent.png b/modules/gui/qt4/pixmaps/toolbar/tvtelx-transparent.png similarity index 100% rename from modules/gui/qt4/pixmaps/tvtelx-transparent.png rename to modules/gui/qt4/pixmaps/toolbar/tvtelx-transparent.png diff --git a/modules/gui/qt4/pixmaps/tvtelx.png b/modules/gui/qt4/pixmaps/toolbar/tvtelx.png similarity index 100% rename from modules/gui/qt4/pixmaps/tvtelx.png rename to modules/gui/qt4/pixmaps/toolbar/tvtelx.png diff --git a/modules/gui/qt4/pixmaps/volume-high.png b/modules/gui/qt4/pixmaps/toolbar/volume-high.png similarity index 100% rename from modules/gui/qt4/pixmaps/volume-high.png rename to modules/gui/qt4/pixmaps/toolbar/volume-high.png diff --git a/modules/gui/qt4/pixmaps/volume-low.png b/modules/gui/qt4/pixmaps/toolbar/volume-low.png similarity index 100% rename from modules/gui/qt4/pixmaps/volume-low.png rename to modules/gui/qt4/pixmaps/toolbar/volume-low.png diff --git a/modules/gui/qt4/pixmaps/volume-medium.png b/modules/gui/qt4/pixmaps/toolbar/volume-medium.png similarity index 100% rename from modules/gui/qt4/pixmaps/volume-medium.png rename to modules/gui/qt4/pixmaps/toolbar/volume-medium.png diff --git a/modules/gui/qt4/pixmaps/volume-muted.png b/modules/gui/qt4/pixmaps/toolbar/volume-muted.png similarity index 100% rename from modules/gui/qt4/pixmaps/volume-muted.png rename to modules/gui/qt4/pixmaps/toolbar/volume-muted.png diff --git a/modules/gui/qt4/pixmaps/volume-slider-inside.png b/modules/gui/qt4/pixmaps/toolbar/volume-slider-inside.png similarity index 100% rename from modules/gui/qt4/pixmaps/volume-slider-inside.png rename to modules/gui/qt4/pixmaps/toolbar/volume-slider-inside.png diff --git a/modules/gui/qt4/pixmaps/volume-slider-outside.png b/modules/gui/qt4/pixmaps/toolbar/volume-slider-outside.png similarity index 100% rename from modules/gui/qt4/pixmaps/volume-slider-outside.png rename to modules/gui/qt4/pixmaps/toolbar/volume-slider-outside.png diff --git a/modules/gui/qt4/pixmaps/volume-slider.svg b/modules/gui/qt4/pixmaps/toolbar/volume-slider.svg similarity index 100% rename from modules/gui/qt4/pixmaps/volume-slider.svg rename to modules/gui/qt4/pixmaps/toolbar/volume-slider.svg diff --git a/modules/gui/qt4/pixmaps/capture-card_16px.png b/modules/gui/qt4/pixmaps/types/capture-card_16px.png similarity index 100% rename from modules/gui/qt4/pixmaps/capture-card_16px.png rename to modules/gui/qt4/pixmaps/types/capture-card_16px.png diff --git a/modules/gui/qt4/pixmaps/cdda_16px.png b/modules/gui/qt4/pixmaps/types/cdda_16px.png similarity index 100% rename from modules/gui/qt4/pixmaps/cdda_16px.png rename to modules/gui/qt4/pixmaps/types/cdda_16px.png diff --git a/modules/gui/qt4/pixmaps/disc_16px.png b/modules/gui/qt4/pixmaps/types/disc_16px.png similarity index 100% rename from modules/gui/qt4/pixmaps/disc_16px.png rename to modules/gui/qt4/pixmaps/types/disc_16px.png diff --git a/modules/gui/qt4/pixmaps/file-asym_16px.png b/modules/gui/qt4/pixmaps/types/file-asym_16px.png similarity index 100% rename from modules/gui/qt4/pixmaps/file-asym_16px.png rename to modules/gui/qt4/pixmaps/types/file-asym_16px.png diff --git a/modules/gui/qt4/pixmaps/file-wide_16px.png b/modules/gui/qt4/pixmaps/types/file-wide_16px.png similarity index 100% rename from modules/gui/qt4/pixmaps/file-wide_16px.png rename to modules/gui/qt4/pixmaps/types/file-wide_16px.png diff --git a/modules/gui/qt4/pixmaps/folder-blue_16px.png b/modules/gui/qt4/pixmaps/types/folder-blue_16px.png similarity index 100% rename from modules/gui/qt4/pixmaps/folder-blue_16px.png rename to modules/gui/qt4/pixmaps/types/folder-blue_16px.png diff --git a/modules/gui/qt4/pixmaps/folder-grey_16px.png b/modules/gui/qt4/pixmaps/types/folder-grey_16px.png similarity index 100% rename from modules/gui/qt4/pixmaps/folder-grey_16px.png rename to modules/gui/qt4/pixmaps/types/folder-grey_16px.png diff --git a/modules/gui/qt4/pixmaps/harddisk_16px.png b/modules/gui/qt4/pixmaps/types/harddisk_16px.png similarity index 100% rename from modules/gui/qt4/pixmaps/harddisk_16px.png rename to modules/gui/qt4/pixmaps/types/harddisk_16px.png diff --git a/modules/gui/qt4/pixmaps/network_16px.png b/modules/gui/qt4/pixmaps/types/network_16px.png similarity index 100% rename from modules/gui/qt4/pixmaps/network_16px.png rename to modules/gui/qt4/pixmaps/types/network_16px.png diff --git a/modules/gui/qt4/pixmaps/tape_16px.png b/modules/gui/qt4/pixmaps/types/tape_16px.png similarity index 100% rename from modules/gui/qt4/pixmaps/tape_16px.png rename to modules/gui/qt4/pixmaps/types/tape_16px.png diff --git a/modules/gui/qt4/pixmaps/type_directory.png b/modules/gui/qt4/pixmaps/types/type_directory.png similarity index 100% rename from modules/gui/qt4/pixmaps/type_directory.png rename to modules/gui/qt4/pixmaps/types/type_directory.png diff --git a/modules/gui/qt4/pixmaps/type_file.png b/modules/gui/qt4/pixmaps/types/type_file.png similarity index 100% rename from modules/gui/qt4/pixmaps/type_file.png rename to modules/gui/qt4/pixmaps/types/type_file.png diff --git a/modules/gui/qt4/pixmaps/type_net.png b/modules/gui/qt4/pixmaps/types/type_net.png similarity index 100% rename from modules/gui/qt4/pixmaps/type_net.png rename to modules/gui/qt4/pixmaps/types/type_net.png diff --git a/modules/gui/qt4/pixmaps/type_node.png b/modules/gui/qt4/pixmaps/types/type_node.png similarity index 100% rename from modules/gui/qt4/pixmaps/type_node.png rename to modules/gui/qt4/pixmaps/types/type_node.png diff --git a/modules/gui/qt4/pixmaps/type_playlist.png b/modules/gui/qt4/pixmaps/types/type_playlist.png similarity index 100% rename from modules/gui/qt4/pixmaps/type_playlist.png rename to modules/gui/qt4/pixmaps/types/type_playlist.png diff --git a/modules/gui/qt4/pixmaps/type_unknown.xpm b/modules/gui/qt4/pixmaps/types/type_unknown.xpm similarity index 100% rename from modules/gui/qt4/pixmaps/type_unknown.xpm rename to modules/gui/qt4/pixmaps/types/type_unknown.xpm diff --git a/modules/gui/qt4/pixmaps/update.png b/modules/gui/qt4/pixmaps/update.png new file mode 100644 index 0000000000000000000000000000000000000000..acfd4164ff24d9f2b2f9e58a89a672f37f3a23c6 GIT binary patch literal 681 zcmV;a0#^NrP)}^B0_vUQ6UZtax!8JOiWA+&tJZ0 z`26KN12;D(gP;H}gN~L0!|OL6t>1t6at5gWHnI!Yn3%g{R{-&Fav<#I26aBhd3iJ z7XD`^d83OnOq~bT%ZMfnwhZcmERX;bhyzmm_wQdghH9RUO>;)P2LsfQX|PxTsTMzT z@s6p1juOMH#XA|0Z9vwX679zD@85q0BRyq?bC>U$g7h&WB_s^zA%Xw#5iS_sT)1Kn z10$A{hz)=Zmy;1?u(Qx+`0(*7!#{P_n?2H$`D zVgMO@_2wgnYquWn`}^-7C?l;vPDt1S4dic7vbBNouL1E&q?8E<009O7*B{)cSvnRy P00000NkvXXu0mjf3^FDP literal 0 HcmV?d00001 diff --git a/modules/gui/qt4/qt4.hpp b/modules/gui/qt4/qt4.hpp index cd6439e6a4..dec423d108 100644 --- a/modules/gui/qt4/qt4.hpp +++ b/modules/gui/qt4/qt4.hpp @@ -89,7 +89,7 @@ struct intf_sys_t #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 ); \ diff --git a/modules/gui/qt4/util/input_slider.cpp b/modules/gui/qt4/util/input_slider.cpp index b3a720fd4a..dc81a95e26 100644 --- a/modules/gui/qt4/util/input_slider.cpp +++ b/modules/gui/qt4/util/input_slider.cpp @@ -126,9 +126,9 @@ SoundSlider::SoundSlider( QWidget *_parent, int _i_step, bool b_hard, 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() ); diff --git a/modules/gui/qt4/vlc.qrc b/modules/gui/qt4/vlc.qrc index 4d27d37bd7..53dec775d1 100644 --- a/modules/gui/qt4/vlc.qrc +++ b/modules/gui/qt4/vlc.qrc @@ -1,72 +1,85 @@ - pixmaps/noart.png ../../../share/vlc128x128.png ../../../share/vlc16x16.png ../../../share/vlc48x48.png ../../../share/vlc128x128-christmas.png ../../../share/vlc48x48-christmas.png - 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-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-grey_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/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/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/toolbar/tv.png + pixmaps/toolbar/fullscreen.png + pixmaps/toolbar/tvtelx-transparent.png + pixmaps/toolbar/tvtelx.png + pixmaps/toolbar/extended_16px.png + pixmaps/toolbar/record_16px.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-inside.png + pixmaps/toolbar/volume-slider-outside.png + pixmaps/toolbar/snapshot.png + pixmaps/toolbar/dvd_menu.png + pixmaps/toolbar/dvd_next.png + pixmaps/toolbar/dvd_prev.png + pixmaps/toolbar/atob.png + pixmaps/toolbar/atob_noa.png + pixmaps/toolbar/atob_nob.png + pixmaps/next_16px.png + pixmaps/next.png + pixmaps/arrow_down_dark.png + pixmaps/pause_16px.png + pixmaps/pause.png + pixmaps/play_16px.png + pixmaps/play.png + pixmaps/previous_16px.png + pixmaps/previous.png + pixmaps/stop_16px.png + pixmaps/stop.png + pixmaps/eject.png + pixmaps/update.png + pixmaps/clear.png + pixmaps/noart.png pixmaps/go-next.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/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/play.png - pixmaps/tvtelx-transparent.png - pixmaps/tvtelx.png - pixmaps/tv.png - pixmaps/previous_16px.png - pixmaps/previous.png - pixmaps/record_16px.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/type_directory.png - pixmaps/type_file.png - pixmaps/type_net.png - pixmaps/type_node.png - pixmaps/type_playlist.png - pixmaps/volume-high.png - pixmaps/volume-medium.png - pixmaps/volume-low.png - pixmaps/volume-muted.png - pixmaps/volume-slider-inside.png - pixmaps/volume-slider-outside.png -- 2.39.2