[vlc-devel] [PATCH 09/10] qt: specify the image extension in Qt ressource keys for proper rendering of SVG with Qt5.6
Pierre Lamot
pierre at videolabs.io
Fri Sep 29 10:25:11 CEST 2017
this is workaround for https://bugreports.qt.io/browse/QTBUG-55388
---
modules/gui/qt/actions_manager.cpp | 2 +-
modules/gui/qt/components/complete_preferences.cpp | 14 +-
modules/gui/qt/components/controller.cpp | 2 +-
modules/gui/qt/components/controller.hpp | 18 +-
modules/gui/qt/components/controller_widget.cpp | 22 +-
modules/gui/qt/components/playlist/selector.cpp | 32 +--
.../gui/qt/components/playlist/standardpanel.cpp | 27 +--
modules/gui/qt/components/playlist/views.cpp | 6 +-
modules/gui/qt/components/playlist/vlc_model.cpp | 14 +-
modules/gui/qt/components/preferences_widgets.cpp | 8 +-
modules/gui/qt/components/simple_preferences.cpp | 2 +-
.../gui/qt/components/sout/profile_selector.cpp | 10 +-
modules/gui/qt/dialogs/gototime.cpp | 2 +-
modules/gui/qt/dialogs/messages.cpp | 4 +-
modules/gui/qt/dialogs/open.cpp | 8 +-
modules/gui/qt/dialogs/plugins.cpp | 40 ++--
modules/gui/qt/dialogs/sout.cpp | 2 +-
modules/gui/qt/dialogs/toolbar.cpp | 22 +-
modules/gui/qt/dialogs/vlm.cpp | 18 +-
modules/gui/qt/extensions_manager.cpp | 2 +-
modules/gui/qt/main_interface.cpp | 4 +-
modules/gui/qt/main_interface_win32.cpp | 8 +-
modules/gui/qt/menus.cpp | 84 +++----
modules/gui/qt/qt.hpp | 2 +-
modules/gui/qt/ui/open_file.ui | 4 +-
modules/gui/qt/ui/podcast_configuration.ui | 4 +-
modules/gui/qt/util/customwidgets.cpp | 12 +-
modules/gui/qt/util/input_slider.cpp | 4 +-
modules/gui/qt/util/searchlineedit.cpp | 2 +-
modules/gui/qt/vlc.qrc | 244 ++++++++++-----------
30 files changed, 312 insertions(+), 311 deletions(-)
diff --git a/modules/gui/qt/actions_manager.cpp b/modules/gui/qt/actions_manager.cpp
index 313b51ca4b..d6cbf11792 100644
--- a/modules/gui/qt/actions_manager.cpp
+++ b/modules/gui/qt/actions_manager.cpp
@@ -239,7 +239,7 @@ void ActionsManager::renderer_event_item_added( vlc_renderer_discovery_t*,
return; /* we already have this item */
}
- QAction *action = new QAction( vlc_renderer_item_flags(p_item) & VLC_RENDERER_CAN_VIDEO ? QIcon( ":/sidebar/movie" ) : QIcon( ":/sidebar/music" ),
+ QAction *action = new QAction( vlc_renderer_item_flags(p_item) & VLC_RENDERER_CAN_VIDEO ? QIcon( ":/sidebar/movie.svg" ) : QIcon( ":/sidebar/music.svg" ),
vlc_renderer_item_name(p_item), VLCMenuBar::rendererMenu );
action->setCheckable(true);
diff --git a/modules/gui/qt/components/complete_preferences.cpp b/modules/gui/qt/components/complete_preferences.cpp
index a0b635739c..bca44457d3 100644
--- a/modules/gui/qt/components/complete_preferences.cpp
+++ b/modules/gui/qt/components/complete_preferences.cpp
@@ -67,13 +67,13 @@ PrefsTree::PrefsTree( intf_thread_t *_p_intf, QWidget *_parent,
/* Nice icons */
#define BI( a,b) QIcon a##_icon = QIcon( b )
- BI( audio, ":/prefsmenu/advanced/audio" );
- BI( video, ":/prefsmenu/advanced/video" );
- BI( input, ":/prefsmenu/advanced/codec" );
- BI( sout, ":/prefsmenu/advanced/sout" );
- BI( advanced, ":/prefsmenu/advanced/extended" );
- BI( playlist, ":/prefsmenu/advanced/playlist" );
- BI( interface, ":/prefsmenu/advanced/intf" );
+ BI( audio, ":/prefsmenu/advanced/audio.svg" );
+ BI( video, ":/prefsmenu/advanced/video.svg" );
+ BI( input, ":/prefsmenu/advanced/codec.svg" );
+ BI( sout, ":/prefsmenu/advanced/sout.svg" );
+ BI( advanced, ":/prefsmenu/advanced/extended.svg" );
+ BI( playlist, ":/prefsmenu/advanced/playlist.svg" );
+ BI( interface, ":/prefsmenu/advanced/intf.svg" );
#undef BI
/* Build the tree for the main module */
diff --git a/modules/gui/qt/components/controller.cpp b/modules/gui/qt/components/controller.cpp
index 3d33263fe0..f30e9cdc23 100644
--- a/modules/gui/qt/components/controller.cpp
+++ b/modules/gui/qt/components/controller.cpp
@@ -209,7 +209,7 @@ void AbstractController::createAndAddWidget( QBoxLayout *controlLayout_,
a_button->setIcon( QIcon( iconL[button] ) );
#define BUTTON_SET_BAR2( button, image, tooltip ) \
button->setToolTip( tooltip ); \
- button->setIcon( QIcon( ":/"#image ) );
+ button->setIcon( QIcon( ":/"#image ".svg" ) );
#define ENABLE_ON_VIDEO( a ) \
CONNECT( THEMIM->getIM(), voutChanged( bool ), a, setEnabled( bool ) ); \
diff --git a/modules/gui/qt/components/controller.hpp b/modules/gui/qt/components/controller.hpp
index 0eb3af1b75..b34147d5ab 100644
--- a/modules/gui/qt/components/controller.hpp
+++ b/modules/gui/qt/components/controller.hpp
@@ -126,15 +126,15 @@ static const char* const tooltipL[BUTTON_MAX] = { I_PLAY_TOOLTIP,
N_("Open subtitle file"),
N_("Dock/undock fullscreen controller to/from bottom of screen"),
};
-static const QString iconL[BUTTON_MAX] ={ ":/toolbar/play_b", ":/toolbar/stop_b",
- ":/toolbar/eject", ":/toolbar/previous_b", ":/toolbar/next_b",
- ":/toolbar/slower", ":/toolbar/faster", ":/toolbar/fullscreen",
- ":/toolbar/defullscreen", ":/toolbar/extended", ":/toolbar/playlist",
- ":/toolbar/snapshot", ":/toolbar/record", ":/toolbar/atob_nob",
- ":/toolbar/frame", ":/toolbar/reverse", ":/toolbar/skip_back",
- ":/toolbar/skip_fw", ":/toolbar/clear", ":/buttons/playlist/shuffle_on",
- ":/buttons/playlist/repeat_all", ":/menu/info",
- ":/toolbar/previous_b", ":/toolbar/next_b", ":/toolbar/eject", ":/toolbar/space"
+static const QString iconL[BUTTON_MAX] ={ ":/toolbar/play_b.svg", ":/toolbar/stop_b.svg",
+ ":/toolbar/eject.svg", ":/toolbar/previous_b.svg", ":/toolbar/next_b.svg",
+ ":/toolbar/slower.svg", ":/toolbar/faster.svg", ":/toolbar/fullscreen.svg",
+ ":/toolbar/defullscreen.svg", ":/toolbar/extended.svg", ":/toolbar/playlist.svg",
+ ":/toolbar/snapshot.svg", ":/toolbar/record.svg", ":/toolbar/atob_nob.svg",
+ ":/toolbar/frame.svg", ":/toolbar/reverse.svg", ":/toolbar/skip_back.svg",
+ ":/toolbar/skip_fw.svg", ":/toolbar/clear.svg", ":/buttons/playlist/shuffle_on.svg",
+ ":/buttons/playlist/repeat_all.svg", ":/menu/info.svg",
+ ":/toolbar/previous_b.svg", ":/toolbar/next_b.svg", ":/toolbar/eject.svg", ":/toolbar/space.svg"
};
enum
diff --git a/modules/gui/qt/components/controller_widget.cpp b/modules/gui/qt/components/controller_widget.cpp
index 2cf7566745..45ce4219fc 100644
--- a/modules/gui/qt/components/controller_widget.cpp
+++ b/modules/gui/qt/components/controller_widget.cpp
@@ -53,7 +53,7 @@ SoundWidget::SoundWidget( QWidget *_parent, intf_thread_t * _p_intf,
/* We need a Label for the pix */
volMuteLabel = new QLabel;
- volMuteLabel->setPixmap( ImageHelper::loadSvgToPixmap( ":/toolbar/volume-medium", 16, 16 ) );
+ volMuteLabel->setPixmap( ImageHelper::loadSvgToPixmap( ":/toolbar/volume-medium.svg", 16, 16 ) );
/* We might need a subLayout too */
QVBoxLayout *subLayout;
@@ -128,7 +128,7 @@ SoundWidget::SoundWidget( QWidget *_parent, intf_thread_t * _p_intf,
void SoundWidget::refreshLabels()
{
int i_sliderVolume = volumeSlider->value();
- const char *psz_icon = ":/toolbar/volume-muted";
+ const char *psz_icon = ":/toolbar/volume-muted.svg";
if( b_is_muted )
{
@@ -138,11 +138,11 @@ void SoundWidget::refreshLabels()
}
if( i_sliderVolume < VOLUME_MAX / 3 )
- psz_icon = ":/toolbar/volume-low";
+ psz_icon = ":/toolbar/volume-low.svg";
else if( i_sliderVolume > (VOLUME_MAX * 2 / 3 ) )
- psz_icon = ":/toolbar/volume-high";
+ psz_icon = ":/toolbar/volume-high.svg";
else
- psz_icon = ":/toolbar/volume-medium";
+ psz_icon = ":/toolbar/volume-medium.svg";
volMuteLabel->setPixmap( ImageHelper::loadSvgToPixmap( psz_icon, 16, 16 ) );
volMuteLabel->setToolTip( qfu(vlc_pgettext("Tooltip|Mute", "Mute")) );
@@ -230,7 +230,7 @@ bool SoundWidget::eventFilter( QObject *obj, QEvent *e )
**/
void PlayButton::updateButtonIcons( bool b_playing )
{
- setIcon( b_playing ? QIcon( ":/toolbar/pause_b" ) : QIcon( ":/toolbar/play_b" ) );
+ setIcon( b_playing ? QIcon( ":/toolbar/pause_b.svg" ) : QIcon( ":/toolbar/play_b.svg" ) );
setToolTip( b_playing ? qtr( "Pause the playback" )
: qtr( I_PLAY_TOOLTIP ) );
}
@@ -239,18 +239,18 @@ void AtoB_Button::updateButtonIcons( bool timeA, bool timeB )
{
if( !timeA && !timeB)
{
- setIcon( QIcon( ":/toolbar/atob_nob" ) );
+ setIcon( QIcon( ":/toolbar/atob_nob.svg" ) );
setToolTip( qtr( "Loop from point A to point B continuously\n"
"Click to set point A" ) );
}
else if( timeA && !timeB )
{
- setIcon( QIcon( ":/toolbar/atob_noa" ) );
+ setIcon( QIcon( ":/toolbar/atob_noa.svg" ) );
setToolTip( qtr( "Click to set point B" ) );
}
else if( timeA && timeB )
{
- setIcon( QIcon( ":/toolbar/atob" ) );
+ setIcon( QIcon( ":/toolbar/atob.svg" ) );
setToolTip( qtr( "Stop the A to B loop" ) );
}
}
@@ -258,8 +258,8 @@ void AtoB_Button::updateButtonIcons( bool timeA, bool timeB )
void LoopButton::updateButtonIcons( int value )
{
setChecked( value != NORMAL );
- setIcon( ( value == REPEAT_ONE ) ? QIcon( ":/buttons/playlist/repeat_one" )
- : QIcon( ":/buttons/playlist/repeat_all" ) );
+ setIcon( ( value == REPEAT_ONE ) ? QIcon( ":/buttons/playlist/repeat_one.svg" )
+ : QIcon( ":/buttons/playlist/repeat_all.svg" ) );
}
void AspectRatioComboBox::updateRatios()
diff --git a/modules/gui/qt/components/playlist/selector.cpp b/modules/gui/qt/components/playlist/selector.cpp
index a7cef6be13..168822726d 100644
--- a/modules/gui/qt/components/playlist/selector.cpp
+++ b/modules/gui/qt/components/playlist/selector.cpp
@@ -84,9 +84,9 @@ void PLSelItem::addAction( ItemAction act, const QString& tooltip )
switch( act )
{
case ADD_ACTION:
- icon = QIcon( ":/buttons/playlist/playlist_add" ); break;
+ icon = QIcon( ":/buttons/playlist/playlist_add.svg" ); break;
case RM_ACTION:
- icon = QIcon( ":/buttons/playlist/playlist_remove" ); break;
+ icon = QIcon( ":/buttons/playlist/playlist_remove.svg" ); break;
default:
return;
}
@@ -233,7 +233,7 @@ void PLSelector::createItems()
playlistItem = putPLData( addItem( PL_ITEM_TYPE, N_("Playlist"), true ),
THEPL->p_playing );
playlistItem->treeItem()->setData( 0, SPECIAL_ROLE, QVariant( IS_PL ) );
- playlistItem->treeItem()->setData( 0, Qt::DecorationRole, QIcon( ":/sidebar/playlist" ) );
+ playlistItem->treeItem()->setData( 0, Qt::DecorationRole, QIcon( ":/sidebar/playlist.svg" ) );
setCurrentItem( playlistItem->treeItem() );
/* ML */
@@ -242,7 +242,7 @@ void PLSelector::createItems()
PLSelItem *ml = putPLData( addItem( PL_ITEM_TYPE, N_("Media Library"), true ),
THEPL->p_media_library );
ml->treeItem()->setData( 0, SPECIAL_ROLE, QVariant( IS_ML ) );
- ml->treeItem()->setData( 0, Qt::DecorationRole, QIcon( ":/sidebar/library" ) );
+ ml->treeItem()->setData( 0, Qt::DecorationRole, QIcon( ":/sidebar/library.svg" ) );
}
/* SD nodes */
@@ -285,16 +285,16 @@ void PLSelector::createItems()
selItem->addAction( ADD_ACTION, qtr( "Subscribe to a podcast" ) );
CONNECT( selItem, action( PLSelItem* ), this, podcastAdd( PLSelItem* ) );
podcastsParent = selItem->treeItem();
- icon = QIcon( ":/sidebar/podcast" );
+ icon = QIcon( ":/sidebar/podcast.svg" );
}
else if ( name.startsWith( "lua{" ) )
{
int i_head = name.indexOf( "sd='" ) + 4;
int i_tail = name.indexOf( '\'', i_head );
- QString iconname = QString( ":/sidebar/sd/%1" ).arg( name.mid( i_head, i_tail - i_head ) );
+ QString iconname = QString( ":/sidebar/sd/%1.svg" ).arg( name.mid( i_head, i_tail - i_head ) );
QResource resource( iconname );
if ( !resource.isValid() )
- icon = QIcon( ":/sidebar/network" );
+ icon = QIcon( ":/sidebar/network.svg" );
else
icon = QIcon( iconname );
}
@@ -304,29 +304,29 @@ void PLSelector::createItems()
name = name.mid( 0, name.indexOf( '{' ) );
selItem = addItem( SD_TYPE, *ppsz_longname, false, false, devices );
if ( name == "xcb_apps" )
- icon = QIcon( ":/sidebar/screen" );
+ icon = QIcon( ":/sidebar/screen.svg" );
else if ( name == "mtp" )
- icon = QIcon( ":/sidebar/mtp" );
+ icon = QIcon( ":/sidebar/mtp.svg" );
else if ( name == "disc" )
- icon = QIcon( ":/sidebar/disc" );
+ icon = QIcon( ":/sidebar/disc.svg" );
else
- icon = QIcon( ":/sidebar/capture" );
+ icon = QIcon( ":/sidebar/capture.svg" );
break;
case SD_CAT_LAN:
selItem = addItem( SD_TYPE, *ppsz_longname, false, false, lan );
- icon = QIcon( ":/sidebar/lan" );
+ icon = QIcon( ":/sidebar/lan.svg" );
break;
case SD_CAT_MYCOMPUTER:
name = name.mid( 0, name.indexOf( '{' ) );
selItem = addItem( SD_TYPE, *ppsz_longname, false, false, mycomp );
if ( name == "video_dir" )
- icon = QIcon( ":/sidebar/movie" );
+ icon = QIcon( ":/sidebar/movie.svg" );
else if ( name == "audio_dir" )
- icon = QIcon( ":/sidebar/music" );
+ icon = QIcon( ":/sidebar/music.svg" );
else if ( name == "picture_dir" )
- icon = QIcon( ":/sidebar/pictures" );
+ icon = QIcon( ":/sidebar/pictures.svg" );
else
- icon = QIcon( ":/sidebar/movie" );
+ icon = QIcon( ":/sidebar/movie.svg" );
break;
default:
selItem = addItem( SD_TYPE, *ppsz_longname );
diff --git a/modules/gui/qt/components/playlist/standardpanel.cpp b/modules/gui/qt/components/playlist/standardpanel.cpp
index 483bb2111f..254dce3a19 100644
--- a/modules/gui/qt/components/playlist/standardpanel.cpp
+++ b/modules/gui/qt/components/playlist/standardpanel.cpp
@@ -101,10 +101,10 @@ StandardPLPanel::StandardPLPanel( PlaylistWidget *_parent,
lastActivatedPLItemId = -1;
QList<QString> frames;
- frames << ":/util/wait1";
- frames << ":/util/wait2";
- frames << ":/util/wait3";
- frames << ":/util/wait4";
+ frames << ":/util/wait1.svg";
+ frames << ":/util/wait2.svg";
+ frames << ":/util/wait3.svg";
+ frames << ":/util/wait4.svg";
spinnerAnimation = new PixmapAnimator( this, frames, SPINNER_SIZE, SPINNER_SIZE );
CONNECT( spinnerAnimation, pixmapReady( const QPixmap & ), this, updateViewport() );
@@ -190,27 +190,27 @@ bool StandardPLPanel::popup( const QPoint &point )
/* Play/Stream/Info static actions */
- ADD_MENU_ENTRY( QIcon( ":/toolbar/play_b" ), qtr(I_POP_PLAY),
+ ADD_MENU_ENTRY( QIcon( ":/toolbar/play_b.svg" ), qtr(I_POP_PLAY),
VLCModelSubInterface::ACTION_PLAY )
- ADD_MENU_ENTRY( QIcon( ":/toolbar/pause_b" ), qtr("Pause"),
+ ADD_MENU_ENTRY( QIcon( ":/toolbar/pause_b.svg" ), qtr("Pause"),
VLCModelSubInterface::ACTION_PAUSE )
- ADD_MENU_ENTRY( QIcon( ":/menu/stream" ), qtr(I_POP_STREAM),
+ ADD_MENU_ENTRY( QIcon( ":/menu/stream.svg" ), qtr(I_POP_STREAM),
VLCModelSubInterface::ACTION_STREAM )
ADD_MENU_ENTRY( QIcon(), qtr(I_POP_SAVE),
VLCModelSubInterface::ACTION_SAVE );
- ADD_MENU_ENTRY( QIcon( ":/menu/info" ), qtr(I_POP_INFO),
+ ADD_MENU_ENTRY( QIcon( ":/menu/info.svg" ), qtr(I_POP_INFO),
VLCModelSubInterface::ACTION_INFO );
menu.addSeparator();
- ADD_MENU_ENTRY( QIcon( ":/type/folder-grey" ), qtr(I_POP_EXPLORE),
+ ADD_MENU_ENTRY( QIcon( ":/type/folder-grey.svg" ), qtr(I_POP_EXPLORE),
VLCModelSubInterface::ACTION_EXPLORE );
- QIcon addIcon( ":/buttons/playlist/playlist_add" );
+ QIcon addIcon( ":/buttons/playlist/playlist_add.svg" );
ADD_MENU_ENTRY( addIcon, qtr(I_POP_NEWFOLDER),
VLCModelSubInterface::ACTION_CREATENODE )
@@ -240,10 +240,10 @@ bool StandardPLPanel::popup( const QPoint &point )
/* Item removal */
- ADD_MENU_ENTRY( QIcon( ":/buttons/playlist/playlist_remove" ), qtr(I_POP_DEL),
+ ADD_MENU_ENTRY( QIcon( ":/buttons/playlist/playlist_remove.svg" ), qtr(I_POP_DEL),
VLCModelSubInterface::ACTION_REMOVE );
- ADD_MENU_ENTRY( QIcon( ":/toolbar/clear" ), qtr("Clear the playlist"),
+ ADD_MENU_ENTRY( QIcon( ":/toolbar/clear.svg" ), qtr("Clear the playlist"),
VLCModelSubInterface::ACTION_CLEAR );
menu.addSeparator();
@@ -558,7 +558,8 @@ bool StandardPLPanel::eventFilter ( QObject *obj, QEvent * event )
{
QWidget *viewport = qobject_cast<QWidget *>( obj );
QStylePainter painter( viewport );
- QPixmap dropzone = ImageHelper::loadSvgToPixmap(":/dropzone", DROPZONE_SIZE, DROPZONE_SIZE);
+
+ QPixmap dropzone = ImageHelper::loadSvgToPixmap(":/dropzone.svg", DROPZONE_SIZE, DROPZONE_SIZE);
qreal scale = dropzone.devicePixelRatio();
QRect rect = viewport->geometry();
QSize size = rect.size() / 2 - dropzone.size() / (2 * scale);
diff --git a/modules/gui/qt/components/playlist/views.cpp b/modules/gui/qt/components/playlist/views.cpp
index e01bbaeeb6..e8b1a49d10 100644
--- a/modules/gui/qt/components/playlist/views.cpp
+++ b/modules/gui/qt/components/playlist/views.cpp
@@ -133,7 +133,7 @@ void PlIconViewItemDelegate::paint( QPainter * painter, const QStyleOptionViewIt
painter->fillPath( nodeRectPath, option.palette.color( QPalette::Highlight ) );
painter->setOpacity( 1.0 );
}
- QSvgRenderer renderer( QString(":/type/node") );
+ QSvgRenderer renderer( QString(":/type/node.svg") );
renderer.render(painter, r);
}
@@ -233,7 +233,7 @@ void PlListViewItemDelegate::paint( QPainter * painter, const QStyleOptionViewIt
if( !index.data( VLCModel::LEAF_NODE_ROLE ).toBool() )
{
qreal pixsize = fm.height();
- QSvgRenderer renderer( QString( ":/type/node" ) );
+ QSvgRenderer renderer( QString( ":/type/node.svg" ) );
renderer.render(painter, QRect(
textRect.x(), textRect.center().y() - pixsize / 2,
pixsize, pixsize ) );
@@ -296,7 +296,7 @@ void CellPixmapDelegate::paint( QPainter * painter, const QStyleOptionViewItem &
static inline void plViewStartDrag( QAbstractItemView *view, const Qt::DropActions & supportedActions )
{
QDrag *drag = new QDrag( view );
- drag->setPixmap( QPixmap( ":/noart64" ) );
+ drag->setPixmap( QPixmap( ":/noart64.png" ) );
drag->setMimeData( view->model()->mimeData(
view->selectionModel()->selectedIndexes() ) );
drag->exec( supportedActions );
diff --git a/modules/gui/qt/components/playlist/vlc_model.cpp b/modules/gui/qt/components/playlist/vlc_model.cpp
index e5df34dd75..e56efde560 100644
--- a/modules/gui/qt/components/playlist/vlc_model.cpp
+++ b/modules/gui/qt/components/playlist/vlc_model.cpp
@@ -54,13 +54,13 @@ VLCModel::VLCModel( intf_thread_t *_p_intf, QObject *parent )
/* Icons initialization */
#define ADD_ICON(type, x) icons[ITEM_TYPE_##type] = QIcon( x )
ADD_ICON( UNKNOWN , QPixmap( type_unknown_xpm ) );
- ADD_ICON( FILE, ":/type/file" );
- ADD_ICON( DIRECTORY, ":/type/directory" );
- ADD_ICON( DISC, ":/type/disc" );
- ADD_ICON( CARD, ":/type/capture-card" );
- ADD_ICON( STREAM, ":/type/stream" );
- ADD_ICON( PLAYLIST, ":/type/playlist" );
- ADD_ICON( NODE, ":/type/node" );
+ ADD_ICON( FILE, ":/type/file.svg" );
+ ADD_ICON( DIRECTORY, ":/type/directory.svg" );
+ ADD_ICON( DISC, ":/type/disc.svg" );
+ ADD_ICON( CARD, ":/type/capture-card.svg" );
+ ADD_ICON( STREAM, ":/type/stream.svg" );
+ ADD_ICON( PLAYLIST, ":/type/playlist.svg" );
+ ADD_ICON( NODE, ":/type/node.svg" );
#undef ADD_ICON
}
diff --git a/modules/gui/qt/components/preferences_widgets.cpp b/modules/gui/qt/components/preferences_widgets.cpp
index 1fc21a56d9..1321f8618a 100644
--- a/modules/gui/qt/components/preferences_widgets.cpp
+++ b/modules/gui/qt/components/preferences_widgets.cpp
@@ -175,19 +175,19 @@ void InterfacePreviewWidget::setNormalPreview( bool b_minimal )
void InterfacePreviewWidget::setPreview( enum_style e_style )
{
- QString pixmapLocationString(":/prefsmenu/");
+ QString pixmapLocationString;
switch( e_style )
{
default:
case COMPLETE:
- pixmapLocationString += "sample_complete";
+ pixmapLocationString = ":/prefsmenu/sample_complete.png";
break;
case MINIMAL:
- pixmapLocationString += "sample_minimal";
+ pixmapLocationString = ":/prefsmenu/sample_minimal.png";
break;
case SKINS:
- pixmapLocationString += "sample_skins";
+ pixmapLocationString = ":/prefsmenu/sample_skins.png";
break;
}
diff --git a/modules/gui/qt/components/simple_preferences.cpp b/modules/gui/qt/components/simple_preferences.cpp
index c697e1dc94..58246fa361 100644
--- a/modules/gui/qt/components/simple_preferences.cpp
+++ b/modules/gui/qt/components/simple_preferences.cpp
@@ -194,7 +194,7 @@ SPrefsCatList::SPrefsCatList( intf_thread_t *_p_intf, QWidget *_parent ) :
#define ADD_CATEGORY( button, label, ltooltip, icon, numb ) \
QToolButton * button = new QToolButton( this ); \
- button->setIcon( QIcon( ":/prefsmenu/" #icon ) ); \
+ button->setIcon( QIcon( ":/prefsmenu/" #icon ".png" ) ); \
button->setText( label ); \
button->setToolTip( ltooltip ); \
button->setToolButtonStyle( Qt::ToolButtonTextUnderIcon ); \
diff --git a/modules/gui/qt/components/sout/profile_selector.cpp b/modules/gui/qt/components/sout/profile_selector.cpp
index 11582c9961..7e11f3aa1b 100644
--- a/modules/gui/qt/components/sout/profile_selector.cpp
+++ b/modules/gui/qt/components/sout/profile_selector.cpp
@@ -57,17 +57,17 @@ VLCProfileSelector::VLCProfileSelector( QWidget *_parent ): QWidget( _parent )
layout->addWidget( profileBox );
QToolButton *editButton = new QToolButton( this );
- editButton->setIcon( QIcon( ":/menu/preferences" ) );
+ editButton->setIcon( QIcon( ":/menu/preferences.svg" ) );
editButton->setToolTip( qtr( "Edit selected profile" ) );
layout->addWidget( editButton );
QToolButton *deleteButton = new QToolButton( this );
- deleteButton->setIcon( QIcon( ":/toolbar/clear" ) );
+ deleteButton->setIcon( QIcon( ":/toolbar/clear.svg" ) );
deleteButton->setToolTip( qtr( "Delete selected profile" ) );
layout->addWidget( deleteButton );
QToolButton *newButton = new QToolButton( this );
- newButton->setIcon( QIcon( ":/new" ) );
+ newButton->setIcon( QIcon( ":/new.svg" ) );
newButton->setToolTip( qtr( "Create a new profile" ) );
layout->addWidget(newButton);
@@ -623,14 +623,14 @@ void VLCProfileEditor::muxSelected()
int textsize = QFontMetrics(ui.muxerwarning->font()).ascent();
if( current->property("module").toString() == "avformat" )
ui.muxerwarning->setText(
- QString( "<img src=\":/menu/info\" width=%2 height=%2/> %1" )
+ QString( "<img src=\":/menu/info.svg\" width=%2 height=%2/> %1" )
.arg( qtr( "This muxer is not provided directly by VLC: It could be missing." ) )
.arg(textsize)
);
else if ( !caps["muxers"].contains( current->property("module").toString() ) &&
!caps["muxers"].contains( "mux_" + current->property("module").toString() ) )
ui.muxerwarning->setText(
- QString( "<img src=\":/toobar/clear\" width=%2 height=%2/> %1" )
+ QString( "<img src=\":/toobar/clear.svg\" width=%2 height=%2/> %1" )
.arg( qtr( "This muxer is missing. Using this profile will fail" ) )
.arg(textsize)
);
diff --git a/modules/gui/qt/dialogs/gototime.cpp b/modules/gui/qt/dialogs/gototime.cpp
index 8f57b42aab..727a8a3c31 100644
--- a/modules/gui/qt/dialogs/gototime.cpp
+++ b/modules/gui/qt/dialogs/gototime.cpp
@@ -62,7 +62,7 @@ GotoTimeDialog::GotoTimeDialog( intf_thread_t *_p_intf)
timeEdit->setAlignment( Qt::AlignRight );
timeEdit->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Minimum );
- QPushButton *resetButton = new QPushButton( QIcon(":/update"), "" );
+ QPushButton *resetButton = new QPushButton( QIcon(":/update.svg"), "" );
resetButton->setToolTip( qtr("Reset") );
mainLayout->addWidget( timeIntro, 0, 0, 1, 1 );
diff --git a/modules/gui/qt/dialogs/messages.cpp b/modules/gui/qt/dialogs/messages.cpp
index d79826d7cd..842bf98fa8 100644
--- a/modules/gui/qt/dialogs/messages.cpp
+++ b/modules/gui/qt/dialogs/messages.cpp
@@ -98,7 +98,7 @@ MessagesDialog::MessagesDialog( intf_thread_t *_p_intf)
ui.filterEdit->setText( getSettings()->value( "messages-filter" ).toString() );
getSettings()->endGroup();
- updateButton = new QPushButton( QIcon(":/update"), "" );
+ updateButton = new QPushButton( QIcon(":/update.svg"), "" );
updateButton->setFlat( true );
ui.mainTab->setCornerWidget( updateButton );
@@ -330,7 +330,7 @@ void MessagesDialog::updateOrClear()
void MessagesDialog::tabChanged( int i )
{
- updateButton->setIcon( i != 0 ? QIcon(":/update") : QIcon(":/toolbar/clear") );
+ updateButton->setIcon( i != 0 ? QIcon(":/update.svg") : QIcon(":/toolbar/clear.svg") );
updateButton->setToolTip( i != 0 ? qtr("Update the tree")
: qtr("Clear the messages") );
}
diff --git a/modules/gui/qt/dialogs/open.cpp b/modules/gui/qt/dialogs/open.cpp
index 47bda6366b..817556ace9 100644
--- a/modules/gui/qt/dialogs/open.cpp
+++ b/modules/gui/qt/dialogs/open.cpp
@@ -86,14 +86,14 @@ OpenDialog::OpenDialog( QWidget *parent,
captureOpenPanel = new CaptureOpenPanel( this, p_intf );
/* Insert the tabs */
- ui.Tab->insertTab( OPEN_FILE_TAB, fileOpenPanel, QIcon( ":/type/file-asym" ),
+ ui.Tab->insertTab( OPEN_FILE_TAB, fileOpenPanel, QIcon( ":/type/file-asym.svg" ),
qtr( "&File" ) );
- ui.Tab->insertTab( OPEN_DISC_TAB, discOpenPanel, QIcon( ":/type/disc" ),
+ ui.Tab->insertTab( OPEN_DISC_TAB, discOpenPanel, QIcon( ":/type/disc.svg" ),
qtr( "&Disc" ) );
- ui.Tab->insertTab( OPEN_NETWORK_TAB, netOpenPanel, QIcon( ":/type/network" ),
+ ui.Tab->insertTab( OPEN_NETWORK_TAB, netOpenPanel, QIcon( ":/type/network.svg" ),
qtr( "&Network" ) );
ui.Tab->insertTab( OPEN_CAPTURE_TAB, captureOpenPanel,
- QIcon( ":/type/capture-card" ), qtr( "Capture &Device" ) );
+ QIcon( ":/type/capture-card.svg" ), qtr( "Capture &Device" ) );
/* Hide the Slave input widgets */
ui.slaveLabel->hide();
diff --git a/modules/gui/qt/dialogs/plugins.cpp b/modules/gui/qt/dialogs/plugins.cpp
index dd87ec743b..9edcce9591 100644
--- a/modules/gui/qt/dialogs/plugins.cpp
+++ b/modules/gui/qt/dialogs/plugins.cpp
@@ -251,7 +251,7 @@ ExtensionTab::ExtensionTab( intf_thread_t *p_intf_ )
QDialogButtonBox *buttonsBox = new QDialogButtonBox;
// More information button
- butMoreInfo = new QPushButton( QIcon( ":/menu/info" ),
+ butMoreInfo = new QPushButton( QIcon( ":/menu/info.svg" ),
qtr( "More information..." ),
this );
CONNECT( butMoreInfo, clicked(), this, moreInformation() );
@@ -259,7 +259,7 @@ ExtensionTab::ExtensionTab( intf_thread_t *p_intf_ )
// Reload button
ExtensionsManager *EM = ExtensionsManager::getInstance( p_intf );
- QPushButton *reload = new QPushButton( QIcon( ":/update" ),
+ QPushButton *reload = new QPushButton( QIcon( ":/update.svg" ),
qtr( "Reload extensions" ),
this );
CONNECT( reload, clicked(), EM, reloadExtensions() );
@@ -310,19 +310,19 @@ static QIcon iconFromCategory( int type )
switch( type )
{
case ADDON_EXTENSION:
- return QIcon( ":/addons/addon_yellow" );
+ return QIcon( ":/addons/addon_yellow.svg" );
case ADDON_PLAYLIST_PARSER:
- return QIcon( ":/addons/addon_green" );
+ return QIcon( ":/addons/addon_green.svg" );
case ADDON_SERVICE_DISCOVERY:
- return QIcon( ":/addons/addon_red" );
+ return QIcon( ":/addons/addon_red.svg" );
case ADDON_SKIN2:
- return QIcon( ":/addons/addon_cyan" );
+ return QIcon( ":/addons/addon_cyan.svg" );
case ADDON_INTERFACE:
- return QIcon( ":/addons/addon_blue" );
+ return QIcon( ":/addons/addon_blue.svg" );
case ADDON_META:
- return QIcon( ":/addons/addon_magenta" );
+ return QIcon( ":/addons/addon_magenta.svg" );
default:
- return QIcon( ":/addons/default" );
+ return QIcon( ":/addons/default.svg" );
}
vlc_assert_unreachable();
}
@@ -423,7 +423,7 @@ AddonsTab::AddonsTab( intf_thread_t *p_intf_ ) : QVLCFrame( p_intf_ )
switchStack->insertWidget( WITHONLINEADDONS, installedOnlyBox );
CONNECT( installedOnlyBox, stateChanged(int), this, installChecked(int) );
- QPushButton *reposyncButton = new QPushButton( QIcon( ":/update" ),
+ QPushButton *reposyncButton = new QPushButton( QIcon( ":/update.svg" ),
qtr("Find more addons online") );
reposyncButton->setSizePolicy( QSizePolicy::Ignored, QSizePolicy::Preferred );
switchStack->insertWidget( ONLYLOCALADDONS, reposyncButton );
@@ -481,10 +481,10 @@ AddonsTab::AddonsTab( intf_thread_t *p_intf_ ) : QVLCFrame( p_intf_ )
model, addonChanged( const addon_entry_t * ) );
QList<QString> frames;
- frames << ":/util/wait1";
- frames << ":/util/wait2";
- frames << ":/util/wait3";
- frames << ":/util/wait4";
+ frames << ":/util/wait1.svg";
+ frames << ":/util/wait2.svg";
+ frames << ":/util/wait3.svg";
+ frames << ":/util/wait4.svg";
spinnerAnimation = new PixmapAnimator( this, frames, SPINNER_SIZE, SPINNER_SIZE );
CONNECT( spinnerAnimation, pixmapReady( const QPixmap & ),
addonsView->viewport(), update() );
@@ -806,9 +806,9 @@ QVariant AddonsListModel::Addon::data( int role ) const
returnval = pixmap;
}
else if ( p_entry->e_flags & ADDON_BROKEN )
- returnval = QPixmap( ":/addons/broken" );
+ returnval = QPixmap( ":/addons/broken.svg" );
else
- returnval = QPixmap( ":/addons/default" );
+ returnval = QPixmap( ":/addons/default.svg" );
break;
case Qt::ToolTipRole:
{
@@ -1216,7 +1216,7 @@ void AddonItemDelegate::paint( QPainter *painter,
{
int i_scoreicon_height = newopt.fontMetrics.height();
int i_scoreicon_width = i_scoreicon_height * SCORE_ICON_WIDTH_SCALE;
- scoreicon = ImageHelper::loadSvgToPixmap( ":/addons/score",
+ scoreicon = ImageHelper::loadSvgToPixmap( ":/addons/score.svg",
i_scoreicon_width, i_scoreicon_height );
int i_width = ( (float) i_score / ADDON_MAX_SCORE ) * i_scoreicon_width;
/* Erase the end (value) of our pixmap with a shadow */
@@ -1298,7 +1298,7 @@ QWidget *AddonItemDelegate::createEditor( QWidget *parent,
editorWidget->setLayout( new QHBoxLayout() );
editorWidget->layout()->setMargin( 0 );
- infoButton = new QPushButton( QIcon( ":/menu/info" ),
+ infoButton = new QPushButton( QIcon( ":/menu/info.svg" ),
qtr( "More information..." ) );
connect( infoButton, SIGNAL(clicked()), this, SIGNAL(showInfo()) );
editorWidget->layout()->addWidget( infoButton );
@@ -1307,10 +1307,10 @@ QWidget *AddonItemDelegate::createEditor( QWidget *parent,
index.data( AddonsListModel::FlagsRole ).toInt() )
{
if ( index.data( AddonsListModel::StateRole ).toInt() == ADDON_INSTALLED )
- installButton = new QPushButton( QIcon( ":/buttons/playlist/playlist_remove" ),
+ installButton = new QPushButton( QIcon( ":/buttons/playlist/playlist_remove.svg" ),
qtr("&Uninstall"), parent );
else
- installButton = new QPushButton( QIcon( ":/buttons/playlist/playlist_add" ),
+ installButton = new QPushButton( QIcon( ":/buttons/playlist/playlist_add.svg" ),
qtr("&Install"), parent );
CONNECT( installButton, clicked(), this, editButtonClicked() );
editorWidget->layout()->addWidget( installButton );
diff --git a/modules/gui/qt/dialogs/sout.cpp b/modules/gui/qt/dialogs/sout.cpp
index 339a682e77..8958f3270a 100644
--- a/modules/gui/qt/dialogs/sout.cpp
+++ b/modules/gui/qt/dialogs/sout.cpp
@@ -64,7 +64,7 @@ SoutDialog::SoutDialog( QWidget *parent, intf_thread_t *_p_intf, const QString&
QTabBar* tb = ui.destTab->findChild<QTabBar*>();
if( tb != NULL ) tb->tabButton(0, QTabBar::RightSide)->hide();
CONNECT( ui.destTab, tabCloseRequested( int ), this, closeTab( int ) );
- ui.destTab->setTabIcon( 0, QIcon( ":/buttons/playlist/playlist_add" ) );
+ ui.destTab->setTabIcon( 0, QIcon( ":/buttons/playlist/playlist_add.svg" ) );
ui.destBox->addItem( qtr( "File" ) );
ui.destBox->addItem( "HTTP" );
diff --git a/modules/gui/qt/dialogs/toolbar.cpp b/modules/gui/qt/dialogs/toolbar.cpp
index 904902a307..9e48eec990 100644
--- a/modules/gui/qt/dialogs/toolbar.cpp
+++ b/modules/gui/qt/dialogs/toolbar.cpp
@@ -143,10 +143,10 @@ ToolbarEditDialog::ToolbarEditDialog( QWidget *_w, intf_thread_t *_p_intf)
profileCombo = new QComboBox;
QToolButton *newButton = new QToolButton;
- newButton->setIcon( QIcon( ":/new" ) );
+ newButton->setIcon( QIcon( ":/new.svg" ) );
newButton->setToolTip( qtr("New profile") );
QToolButton *deleteButton = new QToolButton;
- deleteButton->setIcon( QIcon( ":/toolbar/clear" ) );
+ deleteButton->setIcon( QIcon( ":/toolbar/clear.svg" ) );
deleteButton->setToolTip( qtr( "Delete the current profile" ) );
profileBoxLayout->addWidget( new QLabel( qtr( "Select profile:" ) ), 0, 0 );
@@ -413,14 +413,14 @@ WidgetListing::WidgetListing( intf_thread_t *p_intf, QWidget *_parent )
}
/* Spacers are yet again a different thing */
- QListWidgetItem *widgetItem = new QListWidgetItem( QIcon( ":/toolbar/space" ),
+ QListWidgetItem *widgetItem = new QListWidgetItem( QIcon( ":/toolbar/space.svg" ),
qtr( "Spacer" ), this );
widgetItem->setData( Qt::UserRole, WIDGET_SPACER );
widgetItem->setToolTip( widgetItem->text() );
widgetItem->setSizeHint( QSize( widgetItem->sizeHint().width(), 32 ) );
addItem( widgetItem );
- widgetItem = new QListWidgetItem( QIcon( ":/toolbar/space" ),
+ widgetItem = new QListWidgetItem( QIcon( ":/toolbar/space.svg" ),
qtr( "Expanding Spacer" ), this );
widgetItem->setData( Qt::UserRole, WIDGET_SPACER_EXTEND );
widgetItem->setToolTip( widgetItem->text() );
@@ -474,7 +474,7 @@ WidgetListing::WidgetListing( intf_thread_t *p_intf, QWidget *_parent )
{
QListWidgetItem *widgetItem = new QListWidgetItem( this );
widgetItem->setText( qtr("Small Volume") );
- widgetItem->setIcon( QIcon( ":/toolbar/volume-medium" ) );
+ widgetItem->setIcon( QIcon( ":/toolbar/volume-medium.svg" ) );
widgetItem->setData( Qt::UserRole, QVariant( i ) );
addItem( widgetItem );
}
@@ -494,17 +494,17 @@ WidgetListing::WidgetListing( intf_thread_t *p_intf, QWidget *_parent )
discLayout->setSpacing( 0 ); discLayout->setMargin( 0 );
QToolButton *prevSectionButton = new QToolButton( discFrame );
- prevSectionButton->setIcon( QIcon( ":/toolbar/dvd_prev" ) );
+ prevSectionButton->setIcon( QIcon( ":/toolbar/dvd_prev.svg" ) );
prevSectionButton->setToolTip( qtr("Previous chapter") );
discLayout->addWidget( prevSectionButton );
QToolButton *menuButton = new QToolButton( discFrame );
- menuButton->setIcon( QIcon( ":/toolbar/dvd_menu" ) );
+ menuButton->setIcon( QIcon( ":/toolbar/dvd_menu.svg" ) );
menuButton->setToolTip( qtr("Go to the DVD menu") );
discLayout->addWidget( menuButton );
QToolButton *nextButton = new QToolButton( discFrame );
- nextButton->setIcon( QIcon( ":/toolbar/dvd_next" ) );
+ nextButton->setIcon( QIcon( ":/toolbar/dvd_next.svg" ) );
nextButton->setToolTip( qtr("Next chapter") );
discLayout->addWidget( nextButton );
@@ -519,11 +519,11 @@ WidgetListing::WidgetListing( intf_thread_t *p_intf, QWidget *_parent )
telexLayout->setSpacing( 0 ); telexLayout->setMargin( 0 );
QToolButton *telexOn = new QToolButton( telexFrame );
- telexOn->setIcon( QIcon( ":/toolbar/tv" ) );
+ telexOn->setIcon( QIcon( ":/toolbar/tv.svg" ) );
telexLayout->addWidget( telexOn );
QToolButton *telexTransparent = new QToolButton;
- telexTransparent->setIcon( QIcon( ":/toolbar/tvtelx" ) );
+ telexTransparent->setIcon( QIcon( ":/toolbar/tvtelx.svg" ) );
telexTransparent->setToolTip( qtr("Teletext transparency") );
telexLayout->addWidget( telexTransparent );
@@ -669,7 +669,7 @@ void DroppingController::createAndAddWidget( QBoxLayout *newControlLayout,
if( i_type == WIDGET_SPACER || i_type == WIDGET_SPACER_EXTEND )
{
QLabel *label = new QLabel( this );
- label->setPixmap( ImageHelper::loadSvgToPixmap( ":/toolbar/space", height(), height() ) );
+ label->setPixmap( ImageHelper::loadSvgToPixmap( ":/toolbar/space.svg", height(), height() ) );
if( i_type == WIDGET_SPACER_EXTEND )
{
label->setSizePolicy( QSizePolicy::MinimumExpanding,
diff --git a/modules/gui/qt/dialogs/vlm.cpp b/modules/gui/qt/dialogs/vlm.cpp
index 336938ac50..383140ced2 100644
--- a/modules/gui/qt/dialogs/vlm.cpp
+++ b/modules/gui/qt/dialogs/vlm.cpp
@@ -489,12 +489,12 @@ VLMAWidget::VLMAWidget( VLMWrapper *_vlm, const QString& _name,
objLayout->addWidget( time, 1, 3, 1, 2 );*/
QToolButton *modifyButton = new QToolButton;
- modifyButton->setIcon( QIcon( ":/menu/settings" ) );
+ modifyButton->setIcon( QIcon( ":/menu/settings.svg" ) );
modifyButton->setToolTip( qtr("Change") );
objLayout->addWidget( modifyButton, 0, 5 );
QToolButton *deleteButton = new QToolButton;
- deleteButton->setIcon( QIcon( ":/pixmaps/clear" ) );
+ deleteButton->setIcon( QIcon( ":/toolbar/clear.svg" ) );
deleteButton->setToolTip("Delete");
objLayout->addWidget( deleteButton, 0, 6 );
@@ -535,13 +535,13 @@ VLMBroadcast::VLMBroadcast( VLMWrapper *vlm, const QString& _name,
b_looped = _looped;
playButton = new QToolButton;
- playButton->setIcon( QIcon( ":/toolbar/play_b" ) );
+ playButton->setIcon( QIcon( ":/toolbar/play_b.svg" ) );
playButton->setToolTip( qtr("Play") );
objLayout->addWidget( playButton, 1, 0 );
b_playing = true;
QToolButton *stopButton = new QToolButton;
- stopButton->setIcon( QIcon( ":/toolbar/stop_b" ) );
+ stopButton->setIcon( QIcon( ":/toolbar/stop_b.svg" ) );
stopButton->setToolTip( qtr("Stop") );
objLayout->addWidget( stopButton, 1, 1 );
@@ -560,9 +560,9 @@ void VLMBroadcast::update()
{
vlm->EditBroadcast( name, input, inputOptions, output, b_enabled, b_looped );
if( b_looped )
- loopButton->setIcon( QIcon( ":/buttons/playlist/repeat_all" ) );
+ loopButton->setIcon( QIcon( ":/buttons/playlist/repeat_all.svg" ) );
else
- loopButton->setIcon( QIcon( ":/buttons/playlist/repeat_off" ) );
+ loopButton->setIcon( QIcon( ":/buttons/playlist/repeat_off.svg" ) );
}
void VLMBroadcast::togglePlayPause()
@@ -570,12 +570,12 @@ void VLMBroadcast::togglePlayPause()
if( b_playing )
{
vlm->ControlBroadcast( name, ControlBroadcastPause );
- playButton->setIcon( QIcon( ":/toolbar/pause_b" ) );
+ playButton->setIcon( QIcon( ":/toolbar/pause_b.svg" ) );
}
else
{
vlm->ControlBroadcast( name, ControlBroadcastPlay );
- playButton->setIcon( QIcon( ":/toolbar/play_b" ) );
+ playButton->setIcon( QIcon( ":/toolbar/play_b.svg" ) );
}
b_playing = !b_playing;
}
@@ -589,7 +589,7 @@ void VLMBroadcast::toggleLoop()
void VLMBroadcast::stop()
{
vlm->ControlBroadcast( name, ControlBroadcastStop );
- playButton->setIcon( QIcon( ":/menu/play" ) );
+ playButton->setIcon( QIcon( ":/menu/play.svg" ) );
}
/****************
diff --git a/modules/gui/qt/extensions_manager.cpp b/modules/gui/qt/extensions_manager.cpp
index 72a687a8c2..aecff87787 100644
--- a/modules/gui/qt/extensions_manager.cpp
+++ b/modules/gui/qt/extensions_manager.cpp
@@ -193,7 +193,7 @@ void ExtensionsManager::menu( QMenu *current )
}
submenu->addSeparator();
- action = submenu->addAction( QIcon( ":/pixmaps/clear" ),
+ action = submenu->addAction( QIcon( ":/toolbar/clear.svg" ),
qtr( "Deactivate" ) );
menuMapper->setMapping( action, MENU_MAP( 0, i_ext ) );
CONNECT( action, triggered(), menuMapper, map() );
diff --git a/modules/gui/qt/main_interface.cpp b/modules/gui/qt/main_interface.cpp
index 9624c36a5f..30bb182868 100644
--- a/modules/gui/qt/main_interface.cpp
+++ b/modules/gui/qt/main_interface.cpp
@@ -355,7 +355,7 @@ void MainInterface::createResumePanel( QWidget *w )
resumePanelLayout->setSpacing( 0 ); resumePanelLayout->setMargin( 0 );
QLabel *continuePixmapLabel = new QLabel();
- continuePixmapLabel->setPixmap( ImageHelper::loadSvgToPixmap( ":/menu/help" , fontMetrics().height(), fontMetrics().height()) );
+ continuePixmapLabel->setPixmap( ImageHelper::loadSvgToPixmap( ":/menu/help.svg" , fontMetrics().height(), fontMetrics().height()) );
continuePixmapLabel->setContentsMargins( 5, 0, 5, 0 );
QLabel *continueLabel = new QLabel( qtr( "Do you want to restart the playback where left off?") );
@@ -1204,7 +1204,7 @@ void MainInterface::showCryptedLabel( bool b_show )
{
cryptedLabel = new QLabel;
// The lock icon is not the right one for DRM protection/scrambled.
- //cryptedLabel->setPixmap( QPixmap( ":/lock" ) );
+ //cryptedLabel->setPixmap( QPixmap( ":/lock.svg" ) );
cryptedLabel->setText( "DRM" );
statusBar()->addWidget( cryptedLabel );
}
diff --git a/modules/gui/qt/main_interface_win32.cpp b/modules/gui/qt/main_interface_win32.cpp
index e5f0629511..0a9e93658d 100644
--- a/modules/gui/qt/main_interface_win32.cpp
+++ b/modules/gui/qt/main_interface_win32.cpp
@@ -169,10 +169,10 @@ void MainInterfaceWin32::createTaskBarButtons()
return;
}
- QPixmap img = QPixmap(":/win7/prev").scaled( iconX, iconY );
- QPixmap img2 = QPixmap(":/win7/pause").scaled( iconX, iconY );
- QPixmap img3 = QPixmap(":/win7/play").scaled( iconX, iconY );
- QPixmap img4 = QPixmap(":/win7/next").scaled( iconX, iconY );
+ QPixmap img = QPixmap(":/win7/prev.svg").scaled( iconX, iconY );
+ QPixmap img2 = QPixmap(":/win7/pause.svg").scaled( iconX, iconY );
+ QPixmap img3 = QPixmap(":/win7/play.svg").scaled( iconX, iconY );
+ QPixmap img4 = QPixmap(":/win7/next.svg").scaled( iconX, iconY );
QBitmap mask = img.createMaskFromColor(Qt::transparent);
QBitmap mask2 = img2.createMaskFromColor(Qt::transparent);
QBitmap mask3 = img3.createMaskFromColor(Qt::transparent);
diff --git a/modules/gui/qt/menus.cpp b/modules/gui/qt/menus.cpp
index 5ffd8ebe28..663ac2b7e9 100644
--- a/modules/gui/qt/menus.cpp
+++ b/modules/gui/qt/menus.cpp
@@ -356,17 +356,17 @@ QMenu *VLCMenuBar::FileMenu( intf_thread_t *p_intf, QWidget *parent, MainInterfa
QAction *action;
addDPStaticEntry( menu, qtr( "Open &File..." ),
- ":/type/file-asym", SLOT( simpleOpenDialog() ), "Ctrl+O" );
+ ":/type/file-asym.svg", SLOT( simpleOpenDialog() ), "Ctrl+O" );
addDPStaticEntry( menu, qtr( "&Open Multiple Files..." ),
- ":/type/file-asym", SLOT( openFileDialog() ), "Ctrl+Shift+O" );
+ ":/type/file-asym.svg", SLOT( openFileDialog() ), "Ctrl+Shift+O" );
addDPStaticEntry( menu, qtr( I_OP_OPDIR ),
- ":/type/folder-grey", SLOT( PLOpenDir() ), "Ctrl+F" );
+ ":/type/folder-grey.svg", SLOT( PLOpenDir() ), "Ctrl+F" );
addDPStaticEntry( menu, qtr( "Open &Disc..." ),
- ":/type/disc", SLOT( openDiscDialog() ), "Ctrl+D" );
+ ":/type/disc.svg", SLOT( openDiscDialog() ), "Ctrl+D" );
addDPStaticEntry( menu, qtr( "Open &Network Stream..." ),
- ":/type/network", SLOT( openNetDialog() ), "Ctrl+N" );
+ ":/type/network.svg", SLOT( openNetDialog() ), "Ctrl+N" );
addDPStaticEntry( menu, qtr( "Open &Capture Device..." ),
- ":/type/capture-card", SLOT( openCaptureDialog() ), "Ctrl+C" );
+ ":/type/capture-card.svg", SLOT( openCaptureDialog() ), "Ctrl+C" );
addDPStaticEntry( menu, qtr( "Open &Location from clipboard" ),
NULL, SLOT( openUrlDialog() ), "Ctrl+V" );
@@ -386,7 +386,7 @@ QMenu *VLCMenuBar::FileMenu( intf_thread_t *p_intf, QWidget *parent, MainInterfa
addDPStaticEntry( menu, qtr( "Conve&rt / Save..." ), "",
SLOT( openAndTranscodingDialogs() ), "Ctrl+R" );
addDPStaticEntry( menu, qtr( "&Stream..." ),
- ":/menu/stream", SLOT( openAndStreamingDialogs() ), "Ctrl+S" );
+ ":/menu/stream.svg", SLOT( openAndStreamingDialogs() ), "Ctrl+S" );
menu->addSeparator();
#endif
@@ -402,7 +402,7 @@ QMenu *VLCMenuBar::FileMenu( intf_thread_t *p_intf, QWidget *parent, MainInterfa
}
addDPStaticEntry( menu, qtr( "&Quit" ) ,
- ":/menu/exit", SLOT( quit() ), "Ctrl+Q" );
+ ":/menu/exit.svg", SLOT( quit() ), "Ctrl+Q" );
return menu;
}
@@ -411,16 +411,16 @@ QMenu *VLCMenuBar::FileMenu( intf_thread_t *p_intf, QWidget *parent, MainInterfa
**/
QMenu *VLCMenuBar::ToolsMenu( intf_thread_t *p_intf, QMenu *menu )
{
- addDPStaticEntry( menu, qtr( "&Effects and Filters"), ":/menu/settings",
+ addDPStaticEntry( menu, qtr( "&Effects and Filters"), ":/menu/settings.svg",
SLOT( extendedDialog() ), "Ctrl+E" );
- addDPStaticEntry( menu, qtr( "&Track Synchronization"), ":/menu/settings",
+ addDPStaticEntry( menu, qtr( "&Track Synchronization"), ":/menu/setting.svgs",
SLOT( synchroDialog() ), "" );
- addDPStaticEntry( menu, qtr( I_MENU_INFO ) , ":/menu/info",
+ addDPStaticEntry( menu, qtr( I_MENU_INFO ) , ":/menu/info.svg",
SLOT( mediaInfoDialog() ), "Ctrl+I" );
addDPStaticEntry( menu, qtr( I_MENU_CODECINFO ) ,
- ":/menu/info", SLOT( mediaCodecDialog() ), "Ctrl+J" );
+ ":/menu/info.svg", SLOT( mediaCodecDialog() ), "Ctrl+J" );
#ifdef ENABLE_VLM
addDPStaticEntry( menu, qtr( I_MENU_VLM ), "", SLOT( vlmDialog() ),
@@ -431,7 +431,7 @@ QMenu *VLCMenuBar::ToolsMenu( intf_thread_t *p_intf, QMenu *menu )
"" );
addDPStaticEntry( menu, qtr( I_MENU_MSG ),
- ":/menu/messages", SLOT( messagesDialog() ), "Ctrl+M" );
+ ":/menu/messages.svg", SLOT( messagesDialog() ), "Ctrl+M" );
addDPStaticEntry( menu, qtr( "Plu&gins and extensions" ),
"", SLOT( pluginDialog() ) );
@@ -439,10 +439,10 @@ QMenu *VLCMenuBar::ToolsMenu( intf_thread_t *p_intf, QMenu *menu )
if( !p_intf->p_sys->b_isDialogProvider )
addDPStaticEntry( menu, qtr( "Customi&ze Interface..." ),
- ":/menu/preferences", SLOT( toolbarDialog() ) );
+ ":/menu/preferences.svg", SLOT( toolbarDialog() ) );
addDPStaticEntry( menu, qtr( "&Preferences" ),
- ":/menu/preferences", SLOT( prefsDialog() ), "Ctrl+P", QAction::PreferencesRole );
+ ":/menu/preferences.svg", SLOT( prefsDialog() ), "Ctrl+P", QAction::PreferencesRole );
return menu;
}
@@ -481,7 +481,7 @@ QMenu *VLCMenuBar::ViewMenu( intf_thread_t *p_intf, QMenu *current, MainInterfac
menu->addAction(
#ifndef __APPLE__
- QIcon( ":/menu/playlist_menu" ),
+ QIcon( ":/menu/playlist_menu.svg" ),
#endif
qtr( "Play&list" ), mi,
SLOT( togglePlaylist() ), qtr( "Ctrl+L" ) );
@@ -585,13 +585,13 @@ static inline void VolumeEntries( intf_thread_t *p_intf, QMenu *current )
{
current->addSeparator();
- QAction *action = current->addAction( QIcon( ":/toolbar/volume-high" ), qtr( "&Increase Volume" ),
+ QAction *action = current->addAction( QIcon( ":/toolbar/volume-high.svg" ), qtr( "&Increase Volume" ),
ActionsManager::getInstance( p_intf ), SLOT( AudioUp() ) );
action->setData( VLCMenuBar::ACTION_STATIC );
- action = current->addAction( QIcon( ":/toolbar/volume-low" ), qtr( "D&ecrease Volume" ),
+ action = current->addAction( QIcon( ":/toolbar/volume-low.svg" ), qtr( "D&ecrease Volume" ),
ActionsManager::getInstance( p_intf ), SLOT( AudioDown() ) );
action->setData( VLCMenuBar::ACTION_STATIC );
- action = current->addAction( QIcon( ":/toolbar/volume-muted" ), qtr( "&Mute" ),
+ action = current->addAction( QIcon( ":/toolbar/volume-muted.svg" ), qtr( "&Mute" ),
ActionsManager::getInstance( p_intf ), SLOT( toggleMuteAudio() ) );
action->setData( VLCMenuBar::ACTION_STATIC );
}
@@ -773,13 +773,13 @@ QMenu *VLCMenuBar::HelpMenu( QWidget *parent )
{
QMenu *menu = new QMenu( parent );
addDPStaticEntry( menu, qtr( "&Help" ) ,
- ":/menu/help", SLOT( helpDialog() ), "F1" );
+ ":/menu/help.svg", SLOT( helpDialog() ), "F1" );
#ifdef UPDATE_CHECK
addDPStaticEntry( menu, qtr( "Check for &Updates..." ) , "",
SLOT( updateDialog() ) );
#endif
menu->addSeparator();
- addDPStaticEntry( menu, qtr( I_MENU_ABOUT ), ":/menu/info",
+ addDPStaticEntry( menu, qtr( I_MENU_ABOUT ), ":/menu/info.svg",
SLOT( aboutDialog() ), "Shift+F1", QAction::AboutRole );
return menu;
}
@@ -811,19 +811,19 @@ void VLCMenuBar::PopupMenuPlaylistEntries( QMenu *menu,
action = menu->addAction( qtr( "&Play" ),
ActionsManager::getInstance( p_intf ), SLOT( play() ) );
#ifndef __APPLE__ /* No icons in menus in Mac */
- action->setIcon( QIcon( ":/toolbar/play_b" ) );
+ action->setIcon( QIcon( ":/toolbar/play_b.svg" ) );
#endif
}
else
{
action = addMIMStaticEntry( p_intf, menu, qtr( "Pause" ),
- ":/toolbar/pause_b", SLOT( togglePlayPause() ) );
+ ":/toolbar/pause_b.svg", SLOT( togglePlayPause() ) );
}
action->setData( ACTION_DELETE_ON_REBUILD );
/* Stop */
action = addMIMStaticEntry( p_intf, menu, qtr( "&Stop" ),
- ":/toolbar/stop_b", SLOT( stop() ), true );
+ ":/toolbar/stop_b.svg", SLOT( stop() ), true );
if( !p_input )
action->setEnabled( false );
action->setData( ACTION_DELETE_ON_REBUILD );
@@ -831,19 +831,19 @@ void VLCMenuBar::PopupMenuPlaylistEntries( QMenu *menu,
/* Next / Previous */
bool bPlaylistEmpty = THEMIM->hasEmptyPlaylist();
action = addMIMStaticEntry( p_intf, menu, qtr( "Pre&vious" ),
- ":/toolbar/previous_b", SLOT( prev() ), true );
+ ":/toolbar/previous_b.svg", SLOT( prev() ), true );
action->setEnabled( !bPlaylistEmpty );
action->setData( ACTION_NO_CLEANUP + ACTION_DELETE_ON_REBUILD );
CONNECT( THEMIM, playlistNotEmpty(bool), action, setEnabled(bool) );
action = addMIMStaticEntry( p_intf, menu, qtr( "Ne&xt" ),
- ":/toolbar/next_b", SLOT( next() ), true );
+ ":/toolbar/next_b.svg", SLOT( next() ), true );
action->setEnabled( !bPlaylistEmpty );
action->setData( ACTION_NO_CLEANUP + ACTION_DELETE_ON_REBUILD );
CONNECT( THEMIM, playlistNotEmpty(bool), action, setEnabled(bool) );
action = menu->addAction( qtr( "Record" ), THEAM, SLOT( record() ) );
- action->setIcon( QIcon( ":/toolbar/record" ) );
+ action->setIcon( QIcon( ":/toolbar/record.svg" ) );
if( !p_input )
action->setEnabled( false );
action->setData( ACTION_NO_CLEANUP + ACTION_DELETE_ON_REBUILD );
@@ -863,12 +863,12 @@ void VLCMenuBar::PopupMenuControlEntries( QMenu *menu, intf_thread_t *p_intf,
action = rateMenu->addAction( qtr( "&Faster" ), THEMIM->getIM(),
SLOT( faster() ) );
#ifndef __APPLE__ /* No icons in menus in Mac */
- action->setIcon( QIcon( ":/toolbar/faster2") );
+ action->setIcon( QIcon( ":/toolbar/faster2.svg") );
#endif
action->setData( ACTION_STATIC );
}
- action = rateMenu->addAction( QIcon( ":/toolbar/faster2" ), qtr( "Faster (fine)" ), THEMIM->getIM(),
+ action = rateMenu->addAction( QIcon( ":/toolbar/faster2.svg" ), qtr( "Faster (fine)" ), THEMIM->getIM(),
SLOT( littlefaster() ) );
action->setData( ACTION_STATIC );
@@ -876,7 +876,7 @@ void VLCMenuBar::PopupMenuControlEntries( QMenu *menu, intf_thread_t *p_intf,
SLOT( normalRate() ) );
action->setData( ACTION_STATIC );
- action = rateMenu->addAction( QIcon( ":/toolbar/slower2" ), qtr( "Slower (fine)" ), THEMIM->getIM(),
+ action = rateMenu->addAction( QIcon( ":/toolbar/slower2.svg" ), qtr( "Slower (fine)" ), THEMIM->getIM(),
SLOT( littleslower() ) );
action->setData( ACTION_STATIC );
@@ -885,7 +885,7 @@ void VLCMenuBar::PopupMenuControlEntries( QMenu *menu, intf_thread_t *p_intf,
action = rateMenu->addAction( qtr( "Slo&wer" ), THEMIM->getIM(),
SLOT( slower() ) );
#ifndef __APPLE__ /* No icons in menus in Mac */
- action->setIcon( QIcon( ":/toolbar/slower2") );
+ action->setIcon( QIcon( ":/toolbar/slower2.svg") );
#endif
action->setData( ACTION_STATIC );
}
@@ -900,14 +900,14 @@ void VLCMenuBar::PopupMenuControlEntries( QMenu *menu, intf_thread_t *p_intf,
action = menu->addAction( qtr( "&Jump Forward" ), THEMIM->getIM(),
SLOT( jumpFwd() ) );
#ifndef __APPLE__ /* No icons in menus in Mac */
- action->setIcon( QIcon( ":/toolbar/skip_fw") );
+ action->setIcon( QIcon( ":/toolbar/skip_fw.svg") );
#endif
action->setData( ACTION_STATIC );
action = menu->addAction( qtr( "Jump Bac&kward" ), THEMIM->getIM(),
SLOT( jumpBwd() ) );
#ifndef __APPLE__ /* No icons in menus in Mac */
- action->setIcon( QIcon( ":/toolbar/skip_back") );
+ action->setIcon( QIcon( ":/toolbar/skip_back.svg") );
#endif
action->setData( ACTION_STATIC );
@@ -921,15 +921,15 @@ void VLCMenuBar::PopupMenuStaticEntries( QMenu *menu )
{
QMenu *openmenu = new QMenu( qtr( "Open Media" ), menu );
addDPStaticEntry( openmenu, qtr( I_OP_OPF ),
- ":/type/file-asym", SLOT( openFileDialog() ) );
+ ":/type/file-asym.svg", SLOT( openFileDialog() ) );
addDPStaticEntry( openmenu, qtr( I_OP_OPDIR ),
- ":/type/folder-grey", SLOT( PLOpenDir() ) );
+ ":/type/folder-grey.svg", SLOT( PLOpenDir() ) );
addDPStaticEntry( openmenu, qtr( "Open &Disc..." ),
- ":/type/disc", SLOT( openDiscDialog() ) );
+ ":/type/disc.svg", SLOT( openDiscDialog() ) );
addDPStaticEntry( openmenu, qtr( "Open &Network..." ),
- ":/type/network", SLOT( openNetDialog() ) );
+ ":/type/network.svg", SLOT( openNetDialog() ) );
addDPStaticEntry( openmenu, qtr( "Open &Capture Device..." ),
- ":/type/capture-card", SLOT( openCaptureDialog() ) );
+ ":/type/capture-card.svg", SLOT( openCaptureDialog() ) );
menu->addMenu( openmenu );
menu->addSeparator();
@@ -939,7 +939,7 @@ void VLCMenuBar::PopupMenuStaticEntries( QMenu *menu )
menu->addMenu( helpmenu );
#endif
- addDPStaticEntry( menu, qtr( "Quit" ), ":/menu/exit",
+ addDPStaticEntry( menu, qtr( "Quit" ), ":/menu/exit.svg",
SLOT( quit() ), "Ctrl+Q", QAction::QuitRole );
}
@@ -1125,7 +1125,7 @@ QMenu* VLCMenuBar::PopupMenu( intf_thread_t *p_intf, bool show )
helpmenu->setTitle( qtr( "Help" ) );
menu->addMenu( helpmenu );
- addDPStaticEntry( menu, qtr( "Quit" ), ":/menu/exit",
+ addDPStaticEntry( menu, qtr( "Quit" ), ":/menu/exit.svg",
SLOT( quit() ), "Ctrl+Q", QAction::QuitRole );
}
else
@@ -1177,9 +1177,9 @@ void VLCMenuBar::updateSystrayMenu( MainInterface *mi,
VolumeEntries( p_intf, sysMenu );
sysMenu->addSeparator();
addDPStaticEntry( sysMenu, qtr( "&Open Media" ),
- ":/type/file-wide", SLOT( openFileDialog() ) );
+ ":/type/file-wide.svg", SLOT( openFileDialog() ) );
addDPStaticEntry( sysMenu, qtr( "&Quit" ) ,
- ":/menu/exit", SLOT( quit() ) );
+ ":/menu/exit.svg", SLOT( quit() ) );
/* Set the menu */
mi->getSysTray()->setContextMenu( sysMenu );
diff --git a/modules/gui/qt/qt.hpp b/modules/gui/qt/qt.hpp
index 569945ebb0..a4559961b8 100644
--- a/modules/gui/qt/qt.hpp
+++ b/modules/gui/qt/qt.hpp
@@ -137,7 +137,7 @@ struct vlc_playlist_locker {
#define BUTTON_SET_IMG( button, text, image, tooltip ) \
BUTTON_SET( button, text, tooltip ); \
- button->setIcon( QIcon( ":/"#image ) );
+ button->setIcon( QIcon( ":/"#image ".svg") );
#define BUTTON_SET_ACT_I( button, text, image, tooltip, thisslot ) \
BUTTON_SET_IMG( button, text, image, tooltip ); \
diff --git a/modules/gui/qt/ui/open_file.ui b/modules/gui/qt/ui/open_file.ui
index 56a0715d95..8da3e20ec1 100644
--- a/modules/gui/qt/ui/open_file.ui
+++ b/modules/gui/qt/ui/open_file.ui
@@ -109,7 +109,7 @@
</property>
<property name="icon">
<iconset>
- <normaloff>:/playlist_add</normaloff>:/playlist_add</iconset>
+ <normaloff>:/buttons/playlist/playlist_add.svg</normaloff>:/buttons/playlist/playlist_add.svg</iconset>
</property>
</widget>
</item>
@@ -129,7 +129,7 @@
</property>
<property name="icon">
<iconset>
- <normaloff>:/playlist_remove</normaloff>:/playlist_remove</iconset>
+ <normaloff>:/buttons/playlist/playlist_remove.svg</normaloff>:/buttons/playlist/playlist_remove.svg</iconset>
</property>
</widget>
</item>
diff --git a/modules/gui/qt/ui/podcast_configuration.ui b/modules/gui/qt/ui/podcast_configuration.ui
index 7bd0a74496..046bef5a37 100644
--- a/modules/gui/qt/ui/podcast_configuration.ui
+++ b/modules/gui/qt/ui/podcast_configuration.ui
@@ -49,7 +49,7 @@
<string>Add</string>
</property>
<property name="icon" >
- <iconset resource="../vlc.qrc" >:/pixmaps/play.png</iconset>
+ <iconset resource="../vlc.qrc" >:/toolbar/play_b.svg</iconset>
</property>
</widget>
</item>
@@ -59,7 +59,7 @@
<string>Delete</string>
</property>
<property name="icon" >
- <iconset resource="../vlc.qrc" >:/pixmaps/vlc_quit_16px.png</iconset>
+ <iconset resource="../vlc.qrc" >:/toolbar/clear.svg</iconset>
</property>
</widget>
</item>
diff --git a/modules/gui/qt/util/customwidgets.cpp b/modules/gui/qt/util/customwidgets.cpp
index dfb8307337..3879cc350b 100644
--- a/modules/gui/qt/util/customwidgets.cpp
+++ b/modules/gui/qt/util/customwidgets.cpp
@@ -323,10 +323,10 @@ QString VLCKeyToString( unsigned val, bool locale )
SpinningIcon::SpinningIcon( QWidget *parent ) : QLabel( parent )
{
QList<QString> frames;
- frames << ":/util/wait1";
- frames << ":/util/wait2";
- frames << ":/util/wait3";
- frames << ":/util/wait4";
+ frames << ":/util/wait1.svg";
+ frames << ":/util/wait2.svg";
+ frames << ":/util/wait3.svg";
+ frames << ":/util/wait4.svg";
animator = new PixmapAnimator( this, frames, SPINNER_SIZE, SPINNER_SIZE );
CONNECT( animator, pixmapReady( const QPixmap & ), this, setPixmap( const QPixmap & ) );
CONNECT( animator, pixmapReady( const QPixmap & ), this, repaint() );
@@ -406,11 +406,11 @@ YesNoCheckBox::YesNoCheckBox( QWidget *parent ) : QCheckBox( parent )
setStyleSheet("\
QCheckBox::indicator:unchecked:hover,\
QCheckBox::indicator:unchecked {\
- image: url(:/pixmaps/clear);\
+ image: url(:/toolbar/clear.svg);\
}\
QCheckBox::indicator:checked:hover,\
QCheckBox::indicator:checked {\
- image: url(:/valid);\
+ image: url(:/valid.svg);\
}\
");
}
diff --git a/modules/gui/qt/util/input_slider.cpp b/modules/gui/qt/util/input_slider.cpp
index e501e10f34..5b488dc606 100644
--- a/modules/gui/qt/util/input_slider.cpp
+++ b/modules/gui/qt/util/input_slider.cpp
@@ -595,9 +595,9 @@ SoundSlider::SoundSlider( QWidget *_parent, float _i_step,
setFixedSize( WLENGTH, WHEIGHT );
- pixOutside = ImageHelper::loadSvgToPixmap(":/toolbar/volslide-outside", width(), height() );
+ pixOutside = ImageHelper::loadSvgToPixmap(":/toolbar/volslide-outside.svg", width(), height() );
- const QPixmap temp = ImageHelper::loadSvgToPixmap(":/toolbar/volslide-inside", width(), height() );
+ const QPixmap temp = ImageHelper::loadSvgToPixmap(":/toolbar/volslide-inside.svg", width(), height() );
const QBitmap mask( temp.createHeuristicMask() );
pixGradient = QPixmap( pixOutside.size() );
diff --git a/modules/gui/qt/util/searchlineedit.cpp b/modules/gui/qt/util/searchlineedit.cpp
index 0fd232cad6..bf0b8d85f7 100644
--- a/modules/gui/qt/util/searchlineedit.cpp
+++ b/modules/gui/qt/util/searchlineedit.cpp
@@ -44,7 +44,7 @@
SearchLineEdit::SearchLineEdit( QWidget *parent ) : QLineEdit( parent )
{
clearButton = new QFramelessButton( this );
- clearButton->setIcon( QIcon( ":/search_clear" ) );
+ clearButton->setIcon( QIcon( ":/search_clear.svg" ) );
clearButton->setIconSize( QSize( 16, 16 ) );
clearButton->setCursor( Qt::ArrowCursor );
clearButton->setToolTip( qfu(vlc_pgettext("Tooltip|Clear", "Clear")) );
diff --git a/modules/gui/qt/vlc.qrc b/modules/gui/qt/vlc.qrc
index 4370b3d34b..8c032779bd 100644
--- a/modules/gui/qt/vlc.qrc
+++ b/modules/gui/qt/vlc.qrc
@@ -8,150 +8,150 @@
<file alias="vlc48-xmas.png">../../../share/icons/48x48/vlc-xmas.png</file>
</qresource>
<qresource prefix="/menu">
- <file alias="help">pixmaps/menus/help_16px.svg</file>
- <file alias="info">pixmaps/menus/info_16px.svg</file>
- <file alias="messages">pixmaps/menus/messages_16px.svg</file>
- <file alias="preferences">pixmaps/menus/preferences_16px.svg</file>
- <file alias="settings">pixmaps/menus/settings_16px.svg</file>
- <file alias="stream">pixmaps/menus/stream_16px.svg</file>
- <file alias="playlist_menu">pixmaps/menus/playlist_16px.svg</file>
- <file alias="exit">pixmaps/menus/exit_16px.svg</file>
+ <file alias="help.svg">pixmaps/menus/help_16px.svg</file>
+ <file alias="info.svg">pixmaps/menus/info_16px.svg</file>
+ <file alias="messages.svg">pixmaps/menus/messages_16px.svg</file>
+ <file alias="preferences.svg">pixmaps/menus/preferences_16px.svg</file>
+ <file alias="settings.svg">pixmaps/menus/settings_16px.svg</file>
+ <file alias="stream.svg">pixmaps/menus/stream_16px.svg</file>
+ <file alias="playlist_menu.svg">pixmaps/menus/playlist_16px.svg</file>
+ <file alias="exit.svg">pixmaps/menus/exit_16px.svg</file>
</qresource>
<qresource prefix="/util">
- <file alias="wait1">pixmaps/util/wait1.svg</file>
- <file alias="wait2">pixmaps/util/wait2.svg</file>
- <file alias="wait3">pixmaps/util/wait3.svg</file>
- <file alias="wait4">pixmaps/util/wait4.svg</file>
+ <file alias="wait1.svg">pixmaps/util/wait1.svg</file>
+ <file alias="wait2.svg">pixmaps/util/wait2.svg</file>
+ <file alias="wait3.svg">pixmaps/util/wait3.svg</file>
+ <file alias="wait4.svg">pixmaps/util/wait4.svg</file>
</qresource>
<qresource prefix="/toolbar">
- <file alias="faster">pixmaps/faster.svg</file>
- <file alias="slower">pixmaps/slower.svg</file>
- <file alias="skip_fw">pixmaps/toolbar/skip_for.svg</file>
- <file alias="skip_back">pixmaps/toolbar/skip_back.svg</file>
- <file alias="pause_b">pixmaps/pause.svg</file>
- <file alias="play_b">pixmaps/play.svg</file>
- <file alias="stop_b">pixmaps/stop.svg</file>
- <file alias="next_b">pixmaps/next.svg</file>
- <file alias="previous_b">pixmaps/previous.svg</file>
- <file alias="eject">pixmaps/eject.svg</file>
- <file alias="fullscreen">pixmaps/toolbar/fullscreen.svg</file>
- <file alias="renderer">pixmaps/toolbar/renderer.svg</file>
- <file alias="defullscreen">pixmaps/toolbar/defullscreen.svg</file>
- <file alias="extended">pixmaps/toolbar/extended_16px.svg</file>
- <file alias="playlist">pixmaps/playlist/playlist.svg</file>
- <file alias="snapshot">pixmaps/toolbar/snapshot.svg</file>
- <file alias="record">pixmaps/toolbar/record_16px.svg</file>
- <file alias="atob_nob">pixmaps/toolbar/atob_nob.svg</file>
- <file alias="frame">pixmaps/toolbar/frame-by-frame.svg</file>
- <file alias="reverse">pixmaps/toolbar/play_reverse.svg</file>
- <file alias="clear">pixmaps/clear.svg</file>
- <file alias="atob">pixmaps/toolbar/atob.svg</file>
- <file alias="atob_noa">pixmaps/toolbar/atob_noa.svg</file>
- <file alias="dvd_menu">pixmaps/toolbar/dvd_menu.svg</file>
- <file alias="dvd_next">pixmaps/toolbar/dvd_next.svg</file>
- <file alias="dvd_prev">pixmaps/toolbar/dvd_prev.svg</file>
- <file alias="volslide-inside">pixmaps/toolbar/volume-slider-inside.svg</file>
- <file alias="volslide-outside">pixmaps/toolbar/volume-slider-outside.svg</file>
- <file alias="volume-high">pixmaps/toolbar/volume-high.svg</file>
- <file alias="volume-medium">pixmaps/toolbar/volume-medium.svg</file>
- <file alias="volume-low">pixmaps/toolbar/volume-low.svg</file>
- <file alias="volume-muted">pixmaps/toolbar/volume-muted.svg</file>
- <file alias="tv">pixmaps/toolbar/tv.svg</file>
- <file alias="tvtelx">pixmaps/toolbar/tvtelx.svg</file>
- <file alias="space">pixmaps/space.svg</file>
- <file alias="slower2">pixmaps/slower2.svg</file>
- <file alias="faster2">pixmaps/faster2.svg</file>
+ <file alias="faster.svg">pixmaps/faster.svg</file>
+ <file alias="slower.svg">pixmaps/slower.svg</file>
+ <file alias="skip_fw.svg">pixmaps/toolbar/skip_for.svg</file>
+ <file alias="skip_back.svg">pixmaps/toolbar/skip_back.svg</file>
+ <file alias="pause_b.svg">pixmaps/pause.svg</file>
+ <file alias="play_b.svg">pixmaps/play.svg</file>
+ <file alias="stop_b.svg">pixmaps/stop.svg</file>
+ <file alias="next_b.svg">pixmaps/next.svg</file>
+ <file alias="previous_b.svg">pixmaps/previous.svg</file>
+ <file alias="eject.svg">pixmaps/eject.svg</file>
+ <file alias="fullscreen.svg">pixmaps/toolbar/fullscreen.svg</file>
+ <file alias="renderer.svg">pixmaps/toolbar/renderer.svg</file>
+ <file alias="defullscreen.svg">pixmaps/toolbar/defullscreen.svg</file>
+ <file alias="extended.svg">pixmaps/toolbar/extended_16px.svg</file>
+ <file alias="playlist.svg">pixmaps/playlist/playlist.svg</file>
+ <file alias="snapshot.svg">pixmaps/toolbar/snapshot.svg</file>
+ <file alias="record.svg">pixmaps/toolbar/record_16px.svg</file>
+ <file alias="atob_nob.svg">pixmaps/toolbar/atob_nob.svg</file>
+ <file alias="frame.svg">pixmaps/toolbar/frame-by-frame.svg</file>
+ <file alias="reverse.svg">pixmaps/toolbar/play_reverse.svg</file>
+ <file alias="clear.svg">pixmaps/clear.svg</file>
+ <file alias="atob.svg">pixmaps/toolbar/atob.svg</file>
+ <file alias="atob_noa.svg">pixmaps/toolbar/atob_noa.svg</file>
+ <file alias="dvd_menu.svg">pixmaps/toolbar/dvd_menu.svg</file>
+ <file alias="dvd_next.svg">pixmaps/toolbar/dvd_next.svg</file>
+ <file alias="dvd_prev.svg">pixmaps/toolbar/dvd_prev.svg</file>
+ <file alias="volslide-inside.svg">pixmaps/toolbar/volume-slider-inside.svg</file>
+ <file alias="volslide-outside.svg">pixmaps/toolbar/volume-slider-outside.svg</file>
+ <file alias="volume-high.svg">pixmaps/toolbar/volume-high.svg</file>
+ <file alias="volume-medium.svg">pixmaps/toolbar/volume-medium.svg</file>
+ <file alias="volume-low.svg">pixmaps/toolbar/volume-low.svg</file>
+ <file alias="volume-muted.svg">pixmaps/toolbar/volume-muted.svg</file>
+ <file alias="tv.svg">pixmaps/toolbar/tv.svg</file>
+ <file alias="tvtelx.svg">pixmaps/toolbar/tvtelx.svg</file>
+ <file alias="space.svg">pixmaps/space.svg</file>
+ <file alias="slower2.svg">pixmaps/slower2.svg</file>
+ <file alias="faster2.svg">pixmaps/faster2.svg</file>
</qresource>
<qresource prefix="/buttons/playlist">
- <file alias="playlist_add">pixmaps/playlist/add.svg</file>
- <file alias="playlist_remove">pixmaps/playlist/remove.svg</file>
- <file alias="repeat_off">pixmaps/playlist/repeat_off.svg</file>
- <file alias="repeat_all">pixmaps/playlist/repeat_all.svg</file>
- <file alias="repeat_one">pixmaps/playlist/repeat_one.svg</file>
- <file alias="shuffle_on">pixmaps/playlist/shuffle_on.svg</file>
+ <file alias="playlist_add.svg">pixmaps/playlist/add.svg</file>
+ <file alias="playlist_remove.svg">pixmaps/playlist/remove.svg</file>
+ <file alias="repeat_off.svg">pixmaps/playlist/repeat_off.svg</file>
+ <file alias="repeat_all.svg">pixmaps/playlist/repeat_all.svg</file>
+ <file alias="repeat_one.svg">pixmaps/playlist/repeat_one.svg</file>
+ <file alias="shuffle_on.svg">pixmaps/playlist/shuffle_on.svg</file>
</qresource>
<qresource prefix="/type">
- <file alias="capture-card">pixmaps/types/capture-card_16px.svg</file>
- <file alias="disc">pixmaps/types/disc_16px.svg</file>
- <file alias="file-asym">pixmaps/types/file-asym_16px.svg</file>
- <file alias="file-wide">pixmaps/types/file-wide_16px.svg</file>
- <file alias="folder-grey">pixmaps/types/folder-grey_16px.svg</file>
- <file alias="network">pixmaps/types/network_16px.svg</file>
- <file alias="directory">pixmaps/types/type_directory.svg</file>
- <file alias="file">pixmaps/types/type_file.svg</file>
- <file alias="stream">pixmaps/types/type_stream.svg</file>
- <file alias="node">pixmaps/types/type_node.svg</file>
- <file alias="playlist">pixmaps/types/type_playlist.svg</file>
+ <file alias="capture-card.svg">pixmaps/types/capture-card_16px.svg</file>
+ <file alias="disc.svg">pixmaps/types/disc_16px.svg</file>
+ <file alias="file-asym.svg">pixmaps/types/file-asym_16px.svg</file>
+ <file alias="file-wide.svg">pixmaps/types/file-wide_16px.svg</file>
+ <file alias="folder-grey.svg">pixmaps/types/folder-grey_16px.svg</file>
+ <file alias="network.svg">pixmaps/types/network_16px.svg</file>
+ <file alias="directory.svg">pixmaps/types/type_directory.svg</file>
+ <file alias="file.svg">pixmaps/types/type_file.svg</file>
+ <file alias="stream.svg">pixmaps/types/type_stream.svg</file>
+ <file alias="node.svg">pixmaps/types/type_node.svg</file>
+ <file alias="playlist.svg">pixmaps/types/type_playlist.svg</file>
</qresource>
<qresource prefix="/">
- <file alias="update">pixmaps/update.svg</file>
+ <file alias="update.svg">pixmaps/update.svg</file>
<file alias="noart.png">pixmaps/noart.png</file>
- <file alias="noart64">pixmaps/noart-64.png</file>
- <file alias="go-next">pixmaps/go-next.svg</file>
- <file alias="new.png">pixmaps/profile_new.svg</file>
- <file alias="lock">pixmaps/lock.svg</file>
- <file alias="search_clear">pixmaps/search_clear.svg</file>
- <file alias="dropzone">pixmaps/playlist/dropzone.svg</file>
- <file alias="valid">pixmaps/valid.svg</file>
+ <file alias="noart64.png">pixmaps/noart-64.png</file>
+ <file alias="go-next.svg">pixmaps/go-next.svg</file>
+ <file alias="new.svg">pixmaps/profile_new.svg</file>
+ <file alias="lock.svg">pixmaps/lock.svg</file>
+ <file alias="search_clear.svg">pixmaps/search_clear.svg</file>
+ <file alias="dropzone.svg">pixmaps/playlist/dropzone.svg</file>
+ <file alias="valid.svg">pixmaps/valid.svg</file>
</qresource>
<qresource prefix="/prefsmenu">
- <file alias="cone_audio_64">pixmaps/prefs/spref_cone_Audio_64.png</file>
- <file alias="cone_hotkeys_64">pixmaps/prefs/spref_cone_Hotkeys_64.png</file>
- <file alias="cone_input_64">pixmaps/prefs/spref_cone_Input_64.png</file>
- <file alias="cone_interface_64">pixmaps/prefs/spref_cone_Interface_64.png</file>
- <file alias="cone_subtitles_64">pixmaps/prefs/spref_cone_Subtitles_64.png</file>
- <file alias="cone_video_64">pixmaps/prefs/spref_cone_Video_64.png</file>
- <file alias="sample_complete">pixmaps/sample_complete.png</file>
- <file alias="sample_minimal">pixmaps/sample_minimal.png</file>
- <file alias="sample_skins">pixmaps/sample_skins.png</file>
+ <file alias="cone_audio_64.png">pixmaps/prefs/spref_cone_Audio_64.png</file>
+ <file alias="cone_hotkeys_64.png">pixmaps/prefs/spref_cone_Hotkeys_64.png</file>
+ <file alias="cone_input_64.png">pixmaps/prefs/spref_cone_Input_64.png</file>
+ <file alias="cone_interface_64.png">pixmaps/prefs/spref_cone_Interface_64.png</file>
+ <file alias="cone_subtitles_64.png">pixmaps/prefs/spref_cone_Subtitles_64.png</file>
+ <file alias="cone_video_64.png">pixmaps/prefs/spref_cone_Video_64.png</file>
+ <file alias="sample_complete.png">pixmaps/sample_complete.png</file>
+ <file alias="sample_minimal.png">pixmaps/sample_minimal.png</file>
+ <file alias="sample_skins.png">pixmaps/sample_skins.png</file>
</qresource>
<qresource prefix="/prefsmenu/advanced">
- <file alias="audio">pixmaps/prefs/advprefs_audio.svg</file>
- <file alias="codec">pixmaps/prefs/advprefs_codec.svg</file>
- <file alias="extended">pixmaps/prefs/advprefs_extended.svg</file>
- <file alias="intf">pixmaps/prefs/advprefs_intf.svg</file>
- <file alias="playlist">pixmaps/prefs/advprefs_playlist.svg</file>
- <file alias="sout">pixmaps/prefs/advprefs_sout.svg</file>
- <file alias="video">pixmaps/prefs/advprefs_video.svg</file>
+ <file alias="audio.svg">pixmaps/prefs/advprefs_audio.svg</file>
+ <file alias="codec.svg">pixmaps/prefs/advprefs_codec.svg</file>
+ <file alias="extended.svg">pixmaps/prefs/advprefs_extended.svg</file>
+ <file alias="intf.svg">pixmaps/prefs/advprefs_intf.svg</file>
+ <file alias="playlist.svg">pixmaps/prefs/advprefs_playlist.svg</file>
+ <file alias="sout.svg">pixmaps/prefs/advprefs_sout.svg</file>
+ <file alias="video.svg">pixmaps/prefs/advprefs_video.svg</file>
</qresource>
<qresource prefix="/win7">
- <file alias="pause">pixmaps/win7/win7thumbnail_pause.svg</file>
- <file alias="prev">pixmaps/win7/win7thumbnail_prev.svg</file>
- <file alias="play">pixmaps/win7/win7thumbnail_play.svg</file>
- <file alias="next">pixmaps/win7/win7thumbnail_next.svg</file>
+ <file alias="pause.svg">pixmaps/win7/win7thumbnail_pause.svg</file>
+ <file alias="prev.svg">pixmaps/win7/win7thumbnail_prev.svg</file>
+ <file alias="play.svg">pixmaps/win7/win7thumbnail_play.svg</file>
+ <file alias="next.svg">pixmaps/win7/win7thumbnail_next.svg</file>
</qresource>
<qresource prefix="/sidebar">
- <file alias="disc">pixmaps/playlist/sidebar-icons/disc.svg</file>
- <file alias="playlist">pixmaps/playlist/sidebar-icons/playlist.svg</file>
- <file alias="mtp">pixmaps/playlist/sidebar-icons/mtp.svg</file>
- <file alias="network">pixmaps/playlist/sidebar-icons/network.svg</file>
- <file alias="movie">pixmaps/playlist/sidebar-icons/movie.svg</file>
- <file alias="podcast">pixmaps/playlist/sidebar-icons/podcast.svg</file>
- <file alias="music">pixmaps/playlist/sidebar-icons/music.svg</file>
- <file alias="pictures">pixmaps/playlist/sidebar-icons/pictures.svg</file>
- <file alias="screen">pixmaps/playlist/sidebar-icons/screen.svg</file>
- <file alias="library">pixmaps/playlist/sidebar-icons/library.svg</file>
- <file alias="capture">pixmaps/playlist/sidebar-icons/capture.svg</file>
- <file alias="lan">pixmaps/playlist/sidebar-icons/lan.svg</file>
+ <file alias="disc.svg">pixmaps/playlist/sidebar-icons/disc.svg</file>
+ <file alias="playlist.svg">pixmaps/playlist/sidebar-icons/playlist.svg</file>
+ <file alias="mtp.svg">pixmaps/playlist/sidebar-icons/mtp.svg</file>
+ <file alias="network.svg">pixmaps/playlist/sidebar-icons/network.svg</file>
+ <file alias="movie.svg">pixmaps/playlist/sidebar-icons/movie.svg</file>
+ <file alias="podcast.svg">pixmaps/playlist/sidebar-icons/podcast.svg</file>
+ <file alias="music.svg">pixmaps/playlist/sidebar-icons/music.svg</file>
+ <file alias="pictures.svg">pixmaps/playlist/sidebar-icons/pictures.svg</file>
+ <file alias="screen.svg">pixmaps/playlist/sidebar-icons/screen.svg</file>
+ <file alias="library.svg">pixmaps/playlist/sidebar-icons/library.svg</file>
+ <file alias="capture.svg">pixmaps/playlist/sidebar-icons/capture.svg</file>
+ <file alias="lan.svg">pixmaps/playlist/sidebar-icons/lan.svg</file>
</qresource>
<qresource prefix="/sidebar/sd">
- <file alias="icecast">pixmaps/playlist/sidebar-icons/sd/icecast.svg</file>
- <file alias="appletrailers">pixmaps/playlist/sidebar-icons/sd/appletrailers.svg</file>
- <file alias="assembleenationale">pixmaps/playlist/sidebar-icons/sd/assembleenationale.svg</file>
- <file alias="fmc">pixmaps/playlist/sidebar-icons/sd/fmc.svg</file>
- <file alias="frenchtv">pixmaps/playlist/sidebar-icons/sd/frenchtv.svg</file>
- <file alias="jamendo">pixmaps/playlist/sidebar-icons/sd/jamendo.svg</file>
- <file alias="katsomo">pixmaps/playlist/sidebar-icons/sd/katsomo.svg</file>
+ <file alias="icecast.svg">pixmaps/playlist/sidebar-icons/sd/icecast.svg</file>
+ <file alias="appletrailers.svg">pixmaps/playlist/sidebar-icons/sd/appletrailers.svg</file>
+ <file alias="assembleenationale.svg">pixmaps/playlist/sidebar-icons/sd/assembleenationale.svg</file>
+ <file alias="fmc.svg">pixmaps/playlist/sidebar-icons/sd/fmc.svg</file>
+ <file alias="frenchtv.svg">pixmaps/playlist/sidebar-icons/sd/frenchtv.svg</file>
+ <file alias="jamendo.svg">pixmaps/playlist/sidebar-icons/sd/jamendo.svg</file>
+ <file alias="katsomo.svg">pixmaps/playlist/sidebar-icons/sd/katsomo.svg</file>
</qresource>
<qresource prefix="/addons">
- <file alias="default">pixmaps/addons/addon.svg</file>
- <file alias="broken">pixmaps/addons/addon_broken.svg</file>
- <file alias="score">pixmaps/addons/score.svg</file>
- <file alias="addon_blue">pixmaps/addons/addon_blue.svg</file>
- <file alias="addon_cyan">pixmaps/addons/addon_cyan.svg</file>
- <file alias="addon_green">pixmaps/addons/addon_green.svg</file>
- <file alias="addon_magenta">pixmaps/addons/addon_magenta.svg</file>
- <file alias="addon_red">pixmaps/addons/addon_red.svg</file>
- <file alias="addon_yellow">pixmaps/addons/addon_yellow.svg</file>
+ <file alias="default.svg">pixmaps/addons/addon.svg</file>
+ <file alias="broken.svg">pixmaps/addons/addon_broken.svg</file>
+ <file alias="score.svg">pixmaps/addons/score.svg</file>
+ <file alias="addon_blue.svg">pixmaps/addons/addon_blue.svg</file>
+ <file alias="addon_cyan.svg">pixmaps/addons/addon_cyan.svg</file>
+ <file alias="addon_green.svg">pixmaps/addons/addon_green.svg</file>
+ <file alias="addon_magenta.svg">pixmaps/addons/addon_magenta.svg</file>
+ <file alias="addon_red.svg">pixmaps/addons/addon_red.svg</file>
+ <file alias="addon_yellow.svg">pixmaps/addons/addon_yellow.svg</file>
</qresource>
</RCC>
--
2.14.1
More information about the vlc-devel
mailing list