diff --git a/resources.qrc b/resources.qrc index 37192e821..92840282e 100644 --- a/resources.qrc +++ b/resources.qrc @@ -1,51 +1,44 @@ - data/images/back-pressed.png - data/images/back-rest.png data/images/back-pressed.svg data/images/back-rest.svg - data/images/filter.png - data/images/loved.png - data/images/not-loved.png - data/images/no-album-art-placeholder.png - data/images/no-artist-image-placeholder.png - data/images/artist-placeholder-grid.png - data/images/album-placeholder-grid.png + data/images/filter.svg + data/images/loved.svg + data/images/not-loved.svg + data/images/no-album-art-placeholder.svg + data/images/no-artist-image-placeholder.svg + data/images/artist-placeholder-grid.svg + data/images/album-placeholder-grid.svg data/images/track-placeholder.png + data/images/track-placeholder-grid.svg data/images/now-playing-panel.png data/images/now-playing-speaker.png data/images/now-playing-speaker-dark.png - data/images/pause-pressed.png - data/images/pause-rest.png data/images/pause-pressed.svg data/images/pause-rest.svg - data/images/play-pressed.png data/images/play-pressed.svg - data/images/play-rest.png data/images/play-rest.svg data/images/sipplugin-add.png data/images/sipplugin-remove.png data/images/playlist-icon.png - data/images/repeat-1-on-pressed.png - data/images/repeat-1-on-rest.png - data/images/repeat-all-on-pressed.png - data/images/repeat-all-on-rest.png - data/images/repeat-off-pressed.png - data/images/repeat-off-rest.png + data/images/repeat-1-on-pressed.svg + data/images/repeat-1-on-rest.svg + data/images/repeat-all-on-pressed.svg + data/images/repeat-all-on-rest.svg + data/images/repeat-off-pressed.svg + data/images/repeat-off-rest.svg data/images/search-box-dismiss-x.png data/images/seek-and-volume-knob-pressed.png data/images/seek-and-volume-knob-rest.png data/images/seek-slider-bkg.png data/images/seek-slider-level.png - data/images/shuffle-off-pressed.png - data/images/shuffle-off-rest.png - data/images/shuffle-on-pressed.png - data/images/shuffle-on-rest.png - data/images/skip-pressed.png - data/images/skip-rest.png + data/images/shuffle-off-pressed.svg + data/images/shuffle-off-rest.svg + data/images/shuffle-on-pressed.svg + data/images/shuffle-on-rest.svg data/images/skip-pressed.svg data/images/skip-rest.svg - data/images/user-avatar.png + data/images/user-avatar.svg data/images/view-toggle-active-centre.png data/images/view-toggle-active-left.png data/images/view-toggle-active-right.png @@ -67,19 +60,19 @@ data/images/list-remove.png data/images/arrow-up-double.png data/images/arrow-down-double.png - data/images/volume-icon-full.png data/images/arrow-right-double.png data/images/view-refresh.png - data/images/volume-icon-muted.png + data/images/volume-icon-muted.svg + data/images/volume-icon-full.svg data/images/volume-slider-bkg.png data/images/volume-slider-level.png data/images/echonest_logo.png data/images/loading-animation.gif data/images/info.png - data/images/back.png - data/images/forward.png + data/images/back.svg + data/images/forward.svg data/images/music-icon.png - data/images/configure.png + data/images/configure.svg data/images/private-listening.png data/images/add.png data/images/recently-played.png @@ -142,13 +135,13 @@ data/images/closed-padlock.png data/images/open-padlock.png data/images/headphones-bigger.png - data/images/no-album-no-case.png + data/images/no-album-no-case.svg data/images/rdio.png data/images/grooveshark.png data/images/lastfm-icon.png data/images/spotifycore-logo.png data/images/playlist-header-tiled.png - data/images/share.png + data/images/share.svg data/images/process-stop.png data/icons/tomahawk-icon-128x128-grayscale.png data/images/collection.png @@ -164,7 +157,7 @@ data/images/green-dot.png data/images/exfm.png data/images/soundcloud.png - data/images/resolver-default.png + data/images/resolver-default.svg data/images/spotify-sourceicon.png data/images/account-offline.png data/images/account-online.png diff --git a/src/AudioControls.cpp b/src/AudioControls.cpp index eb7a04f43..4b6120fd6 100644 --- a/src/AudioControls.cpp +++ b/src/AudioControls.cpp @@ -20,12 +20,6 @@ #include "AudioControls.h" #include "ui_AudioControls.h" -#include "audio/AudioEngine.h" -#include "playlist/PlaylistView.h" -#include "database/Database.h" -#include "widgets/ImageButton.h" -#include "utils/TomahawkUtilsGui.h" -#include "utils/Logger.h" #include "Album.h" #include "DropJob.h" #include "SocialWidget.h" @@ -33,6 +27,13 @@ #include "ViewManager.h" #include "Source.h" +#include "audio/AudioEngine.h" +#include "playlist/PlaylistView.h" +#include "database/Database.h" +#include "widgets/ImageButton.h" +#include "utils/TomahawkUtilsGui.h" +#include "utils/Logger.h" + #include #include #include @@ -70,8 +71,7 @@ AudioControls::AudioControls( QWidget* parent ) font.setPointSize( TomahawkUtils::defaultFontSize() - 2 ); - m_defaultSourceIcon = QPixmap( RESPATH "images/resolver-default.png" ); - + ui->ownerButton->setPixmap( TomahawkUtils::defaultPixmap( TomahawkUtils::DefaultResolver, TomahawkUtils::Original, QSize( 34, 34 ) ) ); ui->prevButton->setPixmap( TomahawkUtils::defaultPixmap( TomahawkUtils::PrevButton, TomahawkUtils::Original, QSize( 35, 35 ) ) ); ui->prevButton->setPixmap( TomahawkUtils::defaultPixmap( TomahawkUtils::PrevButtonPressed, TomahawkUtils::Original, QSize( 35, 35 ) ), QIcon::Off, QIcon::Active ); ui->playPauseButton->setPixmap( TomahawkUtils::defaultPixmap( TomahawkUtils::PlayButton, TomahawkUtils::Original, QSize( 48, 48 ) ) ); @@ -80,16 +80,15 @@ AudioControls::AudioControls( QWidget* parent ) ui->pauseButton->setPixmap( TomahawkUtils::defaultPixmap( TomahawkUtils::PauseButtonPressed, TomahawkUtils::Original, QSize( 48, 48 ) ), QIcon::Off, QIcon::Active ); ui->nextButton->setPixmap( TomahawkUtils::defaultPixmap( TomahawkUtils::NextButton, TomahawkUtils::Original, QSize( 35, 35 ) ) ); ui->nextButton->setPixmap( TomahawkUtils::defaultPixmap( TomahawkUtils::NextButtonPressed, TomahawkUtils::Original, QSize( 35, 35 ) ), QIcon::Off, QIcon::Active ); - ui->shuffleButton->setPixmap( RESPATH "images/shuffle-off-rest.png" ); - ui->shuffleButton->setPixmap( RESPATH "images/shuffle-off-pressed.png", QIcon::Off, QIcon::Active ); - ui->repeatButton->setPixmap( RESPATH "images/repeat-off-rest.png" ); - ui->repeatButton->setPixmap( RESPATH "images/repeat-off-pressed.png", QIcon::Off, QIcon::Active ); - ui->volumeLowButton->setPixmap( RESPATH "images/volume-icon-muted.png" ); - ui->volumeHighButton->setPixmap( RESPATH "images/volume-icon-full.png" ); - ui->socialButton->setPixmap( RESPATH "images/share.png" ); - ui->loveButton->setPixmap( RESPATH "images/not-loved.png" ); + ui->shuffleButton->setPixmap( TomahawkUtils::defaultPixmap( TomahawkUtils::ShuffleOff, TomahawkUtils::Original, QSize( 34, 21 ) ) ); + ui->shuffleButton->setPixmap( TomahawkUtils::defaultPixmap( TomahawkUtils::ShuffleOffPressed, TomahawkUtils::Original, QSize( 34, 21 ) ), QIcon::Off, QIcon::Active ); + ui->repeatButton->setPixmap( TomahawkUtils::defaultPixmap( TomahawkUtils::RepeatOff, TomahawkUtils::Original, QSize( 34, 21 ) ) ); + ui->repeatButton->setPixmap( TomahawkUtils::defaultPixmap( TomahawkUtils::RepeatOffPressed, TomahawkUtils::Original, QSize( 34, 21 ) ), QIcon::Off, QIcon::Active ); + ui->volumeLowButton->setPixmap( TomahawkUtils::defaultPixmap( TomahawkUtils::VolumeMuted, TomahawkUtils::Original, QSize( 18, 18 ) ) ); + ui->volumeHighButton->setPixmap( TomahawkUtils::defaultPixmap( TomahawkUtils::VolumeFull, TomahawkUtils::Original, QSize( 22, 18 ) ) ); + ui->socialButton->setPixmap( TomahawkUtils::defaultPixmap( TomahawkUtils::Share, TomahawkUtils::Original, QSize( 20, 20 ) ) ); + ui->loveButton->setPixmap( TomahawkUtils::defaultPixmap( TomahawkUtils::NotLoved, TomahawkUtils::Original, QSize( 20, 20 ) ) ); ui->loveButton->setCheckable( true ); - ui->ownerButton->setPixmap( m_defaultSourceIcon ); ui->socialButton->setFixedSize( QSize( 20, 20 ) ); ui->loveButton->setFixedSize( QSize( 20, 20 ) ); @@ -294,7 +293,7 @@ AudioControls::onPlaybackLoading( const Tomahawk::result_ptr& result ) else { ui->ownerButton->clear(); - ui->ownerButton->setPixmap( m_defaultSourceIcon ); + ui->ownerButton->setPixmap( TomahawkUtils::defaultPixmap( TomahawkUtils::DefaultResolver, TomahawkUtils::Original, QSize( 34, 34 ) ) ); } if ( QUrl( result->linkUrl() ).isValid() || !result->collection().isNull() ) @@ -348,12 +347,12 @@ AudioControls::setSocialActions() { if ( m_currentTrack->toQuery()->loved() ) { - ui->loveButton->setPixmap( RESPATH "images/loved.png" ); + ui->loveButton->setPixmap( TomahawkUtils::defaultPixmap( TomahawkUtils::Loved, TomahawkUtils::Original, QSize( 20, 20 ) ) ); ui->loveButton->setChecked( true ); } else { - ui->loveButton->setPixmap( RESPATH "images/not-loved.png" ); + ui->loveButton->setPixmap( TomahawkUtils::defaultPixmap( TomahawkUtils::NotLoved, TomahawkUtils::Original, QSize( 20, 20 ) ) ); ui->loveButton->setChecked( false ); } } @@ -400,7 +399,7 @@ AudioControls::onPlaybackStopped() m_sliderTimeLine.stop(); m_sliderTimeLine.setCurrentTime( 0 ); m_phononTickCheckTimer.stop(); - ui->ownerButton->setPixmap( m_defaultSourceIcon ); + ui->ownerButton->setPixmap( TomahawkUtils::defaultPixmap( TomahawkUtils::DefaultResolver, TomahawkUtils::Original, QSize( 34, 34 ) ) ); ui->stackedLayout->setCurrentWidget( ui->playPauseButton ); ui->loveButton->setEnabled( false ); @@ -522,24 +521,24 @@ AudioControls::onRepeatModeChanged( PlaylistModes::RepeatMode mode ) case PlaylistModes::NoRepeat: { // switch to RepeatOne - ui->repeatButton->setPixmap( RESPATH "images/repeat-off-rest.png" ); - ui->repeatButton->setPixmap( RESPATH "images/repeat-off-pressed.png", QIcon::Off, QIcon::Active ); + ui->repeatButton->setPixmap( TomahawkUtils::defaultPixmap( TomahawkUtils::RepeatOff, TomahawkUtils::Original, QSize( 34, 21 ) ) ); + ui->repeatButton->setPixmap( TomahawkUtils::defaultPixmap( TomahawkUtils::RepeatOffPressed, TomahawkUtils::Original, QSize( 34, 21 ) ), QIcon::Off, QIcon::Active ); } break; case PlaylistModes::RepeatOne: { // switch to RepeatAll - ui->repeatButton->setPixmap( RESPATH "images/repeat-1-on-rest.png" ); - ui->repeatButton->setPixmap( RESPATH "images/repeat-1-on-pressed.png", QIcon::Off, QIcon::Active ); + ui->repeatButton->setPixmap( TomahawkUtils::defaultPixmap( TomahawkUtils::RepeatOne, TomahawkUtils::Original, QSize( 34, 21 ) ) ); + ui->repeatButton->setPixmap( TomahawkUtils::defaultPixmap( TomahawkUtils::RepeatOnePressed, TomahawkUtils::Original, QSize( 34, 21 ) ), QIcon::Off, QIcon::Active ); } break; case PlaylistModes::RepeatAll: { // switch to NoRepeat - ui->repeatButton->setPixmap( RESPATH "images/repeat-all-on-rest.png" ); - ui->repeatButton->setPixmap( RESPATH "images/repeat-all-on-pressed.png", QIcon::Off, QIcon::Active ); + ui->repeatButton->setPixmap( TomahawkUtils::defaultPixmap( TomahawkUtils::RepeatAll, TomahawkUtils::Original, QSize( 34, 21 ) ) ); + ui->repeatButton->setPixmap( TomahawkUtils::defaultPixmap( TomahawkUtils::RepeatAllPressed, TomahawkUtils::Original, QSize( 34, 21 ) ), QIcon::Off, QIcon::Active ); } break; @@ -590,15 +589,15 @@ AudioControls::onShuffleModeChanged( bool enabled ) if ( m_shuffled ) { - ui->shuffleButton->setPixmap( RESPATH "images/shuffle-on-rest.png" ); - ui->shuffleButton->setPixmap( RESPATH "images/shuffle-on-pressed.png", QIcon::Off, QIcon::Active ); + ui->shuffleButton->setPixmap( TomahawkUtils::defaultPixmap( TomahawkUtils::ShuffleOn, TomahawkUtils::Original, QSize( 34, 21 ) ) ); + ui->shuffleButton->setPixmap( TomahawkUtils::defaultPixmap( TomahawkUtils::ShuffleOnPressed, TomahawkUtils::Original, QSize( 34, 21 ) ), QIcon::Off, QIcon::Active ); ui->repeatButton->setEnabled( false ); } else { - ui->shuffleButton->setPixmap( RESPATH "images/shuffle-off-rest.png" ); - ui->shuffleButton->setPixmap( RESPATH "images/shuffle-off-pressed.png", QIcon::Off, QIcon::Active ); + ui->shuffleButton->setPixmap( TomahawkUtils::defaultPixmap( TomahawkUtils::ShuffleOff, TomahawkUtils::Original, QSize( 34, 21 ) ) ); + ui->shuffleButton->setPixmap( TomahawkUtils::defaultPixmap( TomahawkUtils::ShuffleOffPressed, TomahawkUtils::Original, QSize( 34, 21 ) ), QIcon::Off, QIcon::Active ); ui->repeatButton->setEnabled( true ); } @@ -701,13 +700,13 @@ AudioControls::onLoveButtonClicked( bool checked ) { if ( checked ) { - ui->loveButton->setPixmap( RESPATH "images/loved.png" ); + ui->loveButton->setPixmap( TomahawkUtils::defaultPixmap( TomahawkUtils::Loved, TomahawkUtils::Original, QSize( 20, 20 ) ) ); m_currentTrack->toQuery()->setLoved( true ); } else { - ui->loveButton->setPixmap( RESPATH "images/not-loved.png" ); + ui->loveButton->setPixmap( TomahawkUtils::defaultPixmap( TomahawkUtils::NotLoved, TomahawkUtils::Original, QSize( 20, 20 ) ) ); m_currentTrack->toQuery()->setLoved( false ); } diff --git a/src/AudioControls.h b/src/AudioControls.h index 0e1b2d05b..00cc1e9da 100644 --- a/src/AudioControls.h +++ b/src/AudioControls.h @@ -101,8 +101,6 @@ private: Tomahawk::PlaylistModes::RepeatMode m_repeatMode; bool m_shuffled; - QPixmap m_defaultSourceIcon; - QTimer m_phononTickCheckTimer; QTimeLine m_sliderTimeLine; bool m_seeked; diff --git a/src/TomahawkTrayIcon.cpp b/src/TomahawkTrayIcon.cpp index 36a416187..592c2c64e 100644 --- a/src/TomahawkTrayIcon.cpp +++ b/src/TomahawkTrayIcon.cpp @@ -315,7 +315,7 @@ void TomahawkTrayIcon::onSocialActionsLoaded() { m_loveTrackAction->setText( tr( "&Love" ) ); - m_loveTrackAction->setIcon( QIcon( RESPATH "images/loved.png" ) ); + m_loveTrackAction->setIcon( QIcon( RESPATH "images/loved.svg" ) ); if ( !m_currentTrack ) return; @@ -323,7 +323,7 @@ TomahawkTrayIcon::onSocialActionsLoaded() if ( m_currentTrack->toQuery()->loved() ) { m_loveTrackAction->setText( tr( "Un-&Love" ) ); - m_loveTrackAction->setIcon( QIcon( RESPATH "images/not-loved.png" ) ); + m_loveTrackAction->setIcon( QIcon( RESPATH "images/not-loved.svg" ) ); } } diff --git a/src/TomahawkWindow.cpp b/src/TomahawkWindow.cpp index d40d51b3b..b4e143523 100644 --- a/src/TomahawkWindow.cpp +++ b/src/TomahawkWindow.cpp @@ -22,47 +22,6 @@ #include "TomahawkWindow.h" #include "ui_TomahawkWindow.h" -#include "accounts/AccountManager.h" -#include "sourcetree/SourceTreeView.h" -#include "network/Servent.h" -#include "utils/TomahawkUtilsGui.h" -#include "utils/ProxyStyle.h" -#include "utils/WidgetDragFilter.h" -#include "widgets/AccountsToolButton.h" -#include "widgets/AnimatedSplitter.h" -#include "widgets/NewPlaylistWidget.h" -#include "widgets/SearchWidget.h" -#include "widgets/PlaylistTypeSelectorDialog.h" -#include "thirdparty/Qocoa/qsearchfield.h" -#include "playlist/dynamic/GeneratorInterface.h" -#include "playlist/PlaylistModel.h" -#include "playlist/PlaylistView.h" -#include "playlist/QueueView.h" -#include "jobview/JobStatusView.h" -#include "jobview/JobStatusModel.h" -#include "jobview/ErrorStatusMessage.h" -#include "jobview/JobStatusModel.h" -#include "sip/SipPlugin.h" - -#include "Playlist.h" -#include "Query.h" -#include "Artist.h" -#include "ViewManager.h" -#include "ActionCollection.h" -#include "AudioControls.h" -#include "SettingsDialog.h" -#include "DiagnosticsDialog.h" -#include "TomahawkSettings.h" -#include "SourceList.h" -#include "TomahawkTrayIcon.h" -#include "libtomahawk/filemetadata/ScanManager.h" -#include "TomahawkApp.h" -#include "LoadXSPFDialog.h" -#include "widgets/ContainedMenuButton.h" -#include "utils/Logger.h" - -#include "config.h" - #include #include #include @@ -79,6 +38,48 @@ #include #include +#include "accounts/AccountManager.h" +#include "sourcetree/SourceTreeView.h" +#include "network/Servent.h" +#include "utils/TomahawkUtilsGui.h" +#include "utils/ProxyStyle.h" +#include "utils/WidgetDragFilter.h" +#include "widgets/AccountsToolButton.h" +#include "widgets/AnimatedSplitter.h" +#include "widgets/NewPlaylistWidget.h" +#include "widgets/SearchWidget.h" +#include "widgets/PlaylistTypeSelectorDialog.h" +#include "widgets/ContainedMenuButton.h" +#include "thirdparty/Qocoa/qsearchfield.h" +#include "playlist/dynamic/GeneratorInterface.h" +#include "playlist/PlaylistModel.h" +#include "playlist/PlaylistView.h" +#include "playlist/QueueView.h" +#include "jobview/JobStatusView.h" +#include "jobview/JobStatusModel.h" +#include "jobview/ErrorStatusMessage.h" +#include "jobview/JobStatusModel.h" +#include "sip/SipPlugin.h" +#include "filemetadata/ScanManager.h" + +#include "Playlist.h" +#include "Query.h" +#include "Artist.h" +#include "ViewManager.h" +#include "ActionCollection.h" +#include "AudioControls.h" +#include "SettingsDialog.h" +#include "DiagnosticsDialog.h" +#include "TomahawkSettings.h" +#include "SourceList.h" +#include "TomahawkTrayIcon.h" +#include "TomahawkApp.h" +#include "LoadXSPFDialog.h" +#include "utils/ImageRegistry.h" +#include "utils/Logger.h" + +#include "config.h" + #if defined( Q_WS_WIN ) #if defined ( WITH_QtSparkle ) #include @@ -262,9 +263,9 @@ TomahawkWindow::setupToolBar() m_toolbar->installEventFilter( new WidgetDragFilter( m_toolbar ) ); #endif - m_backAction = m_toolbar->addAction( QIcon( RESPATH "images/back.png" ), tr( "Back" ), ViewManager::instance(), SLOT( historyBack() ) ); + m_backAction = m_toolbar->addAction( ImageRegistry::instance()->icon( RESPATH "images/back.svg" ), tr( "Back" ), ViewManager::instance(), SLOT( historyBack() ) ); m_backAction->setToolTip( tr( "Go back one page" ) ); - m_forwardAction = m_toolbar->addAction( QIcon( RESPATH "images/forward.png" ), tr( "Forward" ), ViewManager::instance(), SLOT( historyForward() ) ); + m_forwardAction = m_toolbar->addAction( ImageRegistry::instance()->icon( RESPATH "images/forward.svg" ), tr( "Forward" ), ViewManager::instance(), SLOT( historyForward() ) ); m_forwardAction->setToolTip( tr( "Go forward one page" ) ); m_toolbarLeftBalancer = new QWidget( this ); @@ -300,7 +301,7 @@ TomahawkWindow::setupToolBar() #ifndef Q_OS_MAC ContainedMenuButton* compactMenuButton = new ContainedMenuButton( m_toolbar ); - compactMenuButton->setIcon( QIcon( RESPATH "images/configure.png" ) ); + compactMenuButton->setIcon( ImageRegistry::instance()->icon( RESPATH "images/configure.svg" ) ); compactMenuButton->setText( tr( "&Main Menu" ) ); compactMenuButton->setMenu( m_compactMainMenu ); compactMenuButton->setToolButtonStyle( Qt::ToolButtonIconOnly ); @@ -1121,7 +1122,7 @@ TomahawkWindow::audioStarted() { m_audioRetryCounter = 0; - ActionCollection::instance()->getAction( "playPause" )->setIcon( QIcon( RESPATH "images/pause-rest.png" ) ); + ActionCollection::instance()->getAction( "playPause" )->setIcon( ImageRegistry::instance()->icon( RESPATH "images/pause-rest.svg" ) ); ActionCollection::instance()->getAction( "playPause" )->setText( tr( "Pause" ) ); ActionCollection::instance()->getAction( "stop" )->setEnabled( true ); @@ -1143,7 +1144,7 @@ TomahawkWindow::audioFinished() void TomahawkWindow::audioPaused() { - ActionCollection::instance()->getAction( "playPause" )->setIcon( QIcon( RESPATH "images/play-rest.png" ) ); + ActionCollection::instance()->getAction( "playPause" )->setIcon( ImageRegistry::instance()->icon( RESPATH "images/play-rest.svg" ) ); ActionCollection::instance()->getAction( "playPause" )->setText( tr( "&Play" ) ); } diff --git a/src/libtomahawk/ActionCollection.cpp b/src/libtomahawk/ActionCollection.cpp index 7dd304a41..449ac9154 100644 --- a/src/libtomahawk/ActionCollection.cpp +++ b/src/libtomahawk/ActionCollection.cpp @@ -20,11 +20,13 @@ */ #include "ActionCollection.h" + #include "TomahawkSettings.h" +#include "Source.h" #include "audio/AudioEngine.h" +#include "utils/ImageRegistry.h" #include "utils/TomahawkUtils.h" #include "utils/Logger.h" -#include "Source.h" #include @@ -76,14 +78,14 @@ ActionCollection::initActions() m_actionCollection[ "renamePlaylist" ] = new QAction( tr( "&Rename Playlist" ), this ); m_actionCollection[ "copyPlaylist" ] = new QAction( tr( "&Copy Playlist Link" ), this ); m_actionCollection[ "playPause" ] = new QAction( tr( "&Play" ), this ); - m_actionCollection[ "playPause" ]->setIcon( QIcon( RESPATH "images/play-rest.png" ) ); + m_actionCollection[ "playPause" ]->setIcon( ImageRegistry::instance()->icon( RESPATH "images/play-rest.svg" ) ); m_actionCollection[ "playPause" ]->setShortcut( Qt::Key_Space ); m_actionCollection[ "playPause" ]->setShortcutContext( Qt::ApplicationShortcut ); m_actionCollection[ "stop" ] = new QAction( tr( "&Stop" ), this ); m_actionCollection[ "previousTrack" ] = new QAction( tr( "&Previous Track" ), this ); - m_actionCollection[ "previousTrack" ]->setIcon( QIcon( RESPATH "images/back-rest.png" ) ); + m_actionCollection[ "previousTrack" ]->setIcon( ImageRegistry::instance()->icon( RESPATH "images/back-rest.svg" ) ); m_actionCollection[ "nextTrack" ] = new QAction( tr( "&Next Track" ), this ); - m_actionCollection[ "nextTrack" ]->setIcon( QIcon( RESPATH "images/skip-rest.png" ) ); + m_actionCollection[ "nextTrack" ]->setIcon( ImageRegistry::instance()->icon( RESPATH "images/skip-rest.svg" ) ); m_actionCollection[ "quit" ] = new QAction( tr( "&Quit" ), this ); m_actionCollection[ "quit" ]->setShortcut( QKeySequence::Quit ); m_actionCollection[ "quit" ]->setShortcutContext( Qt::ApplicationShortcut ); @@ -103,7 +105,7 @@ ActionCollection::initActions() m_actionCollection[ "showOfflineSources" ] = new QAction( tr( "Show Offline Sources" ), this ); m_actionCollection[ "showOfflineSources" ]->setCheckable( true ); m_actionCollection[ "preferences" ] = new QAction( tr( "&Configure Tomahawk..." ), this ); - m_actionCollection[ "preferences" ]->setIcon( QIcon( RESPATH "images/configure.png" ) ); + m_actionCollection[ "preferences" ]->setIcon( ImageRegistry::instance()->icon( RESPATH "images/configure.svg" ) ); m_actionCollection[ "preferences" ]->setMenuRole( QAction::PreferencesRole ); #ifdef Q_OS_MAC m_actionCollection[ "minimize" ] = new QAction( tr( "Minimize" ), this ); @@ -118,7 +120,7 @@ ActionCollection::initActions() m_actionCollection[ "diagnostics" ] = new QAction( tr( "Diagnostics..." ), this ); m_actionCollection[ "diagnostics" ]->setMenuRole( QAction::ApplicationSpecificRole ); m_actionCollection[ "aboutTomahawk" ] = new QAction( tr( "About &Tomahawk..." ), this ); - m_actionCollection[ "aboutTomahawk" ]->setIcon( QIcon( RESPATH "images/info.png" ) ); + m_actionCollection[ "aboutTomahawk" ]->setIcon( ImageRegistry::instance()->icon( RESPATH "images/info.svg" ) ); m_actionCollection[ "aboutTomahawk" ]->setMenuRole( QAction::AboutRole ); m_actionCollection[ "legalInfo" ] = new QAction( tr( "&Legal Information..." ), this ); m_actionCollection[ "legalInfo" ]->setMenuRole( QAction::ApplicationSpecificRole ); diff --git a/src/libtomahawk/ContextMenu.cpp b/src/libtomahawk/ContextMenu.cpp index 8c460535d..eefad6b0f 100644 --- a/src/libtomahawk/ContextMenu.cpp +++ b/src/libtomahawk/ContextMenu.cpp @@ -18,8 +18,10 @@ #include "ContextMenu.h" -#include "GlobalActionManager.h" +#include "audio/AudioEngine.h" #include "playlist/PlaylistView.h" +#include "filemetadata/MetadataEditor.h" +#include "GlobalActionManager.h" #include "ViewManager.h" #include "Query.h" #include "Result.h" @@ -28,9 +30,8 @@ #include "Artist.h" #include "Album.h" +#include "utils/ImageRegistry.h" #include "utils/Logger.h" -#include "audio/AudioEngine.h" -#include "filemetadata/MetadataEditor.h" using namespace Tomahawk; @@ -365,12 +366,12 @@ ContextMenu::onSocialActionsLoaded() if ( m_loveAction && m_queries.first()->loved() ) { m_loveAction->setText( tr( "Un-&Love" ) ); - m_loveAction->setIcon( QIcon( RESPATH "images/not-loved.png" ) ); + m_loveAction->setIcon( ImageRegistry::instance()->icon( RESPATH "images/not-loved.svg" ) ); } else if ( m_loveAction ) { m_loveAction->setText( tr( "&Love" ) ); - m_loveAction->setIcon( QIcon( RESPATH "images/loved.png" ) ); + m_loveAction->setIcon( ImageRegistry::instance()->icon( RESPATH "images/loved.svg" ) ); } } diff --git a/src/libtomahawk/accounts/AccountDelegate.cpp b/src/libtomahawk/accounts/AccountDelegate.cpp index 8996b9aa9..7689a51a5 100644 --- a/src/libtomahawk/accounts/AccountDelegate.cpp +++ b/src/libtomahawk/accounts/AccountDelegate.cpp @@ -26,7 +26,7 @@ #include "accounts/Account.h" #include "accounts/AccountManager.h" -#include "utils/TomahawkUtils.h" +#include "utils/ImageRegistry.h" #include "utils/TomahawkUtilsGui.h" #include "utils/Logger.h" #include "utils/AnimatedSpinner.h" @@ -637,7 +637,7 @@ AccountDelegate::drawConfigWrench ( QPainter* painter, QStyleOptionViewItemV4& o // draw it the same size as the check belox topt.font = opt.font; - topt.icon = QIcon( RESPATH "images/configure.png" ); + topt.icon = ImageRegistry::instance()->icon( RESPATH "images/configure.svg" ); topt.iconSize = QSize( 14, 14 ); topt.subControls = QStyle::SC_ToolButton; topt.activeSubControls = QStyle::SC_None; diff --git a/src/libtomahawk/accounts/AccountFactoryWrapperDelegate.cpp b/src/libtomahawk/accounts/AccountFactoryWrapperDelegate.cpp index 2b61599c5..e03443f0d 100644 --- a/src/libtomahawk/accounts/AccountFactoryWrapperDelegate.cpp +++ b/src/libtomahawk/accounts/AccountFactoryWrapperDelegate.cpp @@ -17,10 +17,12 @@ */ #include "AccountFactoryWrapperDelegate.h" -#include "accounts/Account.h" + #include "AccountFactoryWrapper.h" -#include "utils/TomahawkUtils.h" #include "Source.h" +#include "accounts/Account.h" +#include "utils/ImageRegistry.h" +#include "utils/TomahawkUtils.h" #include #include @@ -43,7 +45,7 @@ AccountFactoryWrapperDelegate::AccountFactoryWrapperDelegate( QObject* parent ) m_onlineIcon = m_onlineIcon.scaled( ICON_SIZE, ICON_SIZE, Qt::KeepAspectRatio, Qt::SmoothTransformation ); m_offlineIcon = m_offlineIcon.scaled( ICON_SIZE, ICON_SIZE, Qt::KeepAspectRatio, Qt::SmoothTransformation ); - m_configIcon.addFile( RESPATH "images/configure.png", QSize( CONFIG_WRENCH_SIZE - 8, CONFIG_WRENCH_SIZE - 8 ) ); + m_configIcon = ImageRegistry::instance()->pixmap( RESPATH "images/configure.svg", QSize( CONFIG_WRENCH_SIZE - 8, CONFIG_WRENCH_SIZE - 8 ) ); } void diff --git a/src/libtomahawk/resolvers/QtScriptResolver.cpp b/src/libtomahawk/resolvers/QtScriptResolver.cpp index 978f2a0e4..5923a08fe 100644 --- a/src/libtomahawk/resolvers/QtScriptResolver.cpp +++ b/src/libtomahawk/resolvers/QtScriptResolver.cpp @@ -35,7 +35,7 @@ #include "network/Servent.h" -#include "utils/TomahawkUtils.h" +#include "utils/TomahawkUtilsGui.h" #include "utils/Logger.h" // FIXME: bloody hack, remove this for 0.3 @@ -231,8 +231,7 @@ QtScriptResolver::QtScriptResolver( const QString& scriptPath ) m_name = QFileInfo( filePath() ).baseName(); // set the icon, if we launch properly we'll get the icon the resolver reports - m_icon.load( RESPATH "images/resolver-default.png" ); - + m_icon = TomahawkUtils::defaultPixmap( TomahawkUtils::DefaultResolver, TomahawkUtils::Original, QSize( 128, 128 ) ); if ( !QFile::exists( filePath() ) ) { diff --git a/src/libtomahawk/resolvers/ScriptResolver.cpp b/src/libtomahawk/resolvers/ScriptResolver.cpp index 98a2a183b..b2cf5ec71 100644 --- a/src/libtomahawk/resolvers/ScriptResolver.cpp +++ b/src/libtomahawk/resolvers/ScriptResolver.cpp @@ -28,7 +28,7 @@ #include "Pipeline.h" #include "SourceList.h" -#include "utils/TomahawkUtils.h" +#include "utils/TomahawkUtilsGui.h" #include "utils/Logger.h" #ifdef Q_OS_WIN @@ -59,7 +59,7 @@ ScriptResolver::ScriptResolver( const QString& exe ) m_name = QFileInfo( filePath() ).baseName(); // set the icon, if we launch properly we'll get the icon the resolver reports - m_icon.load( RESPATH "images/resolver-default.png" ); + m_icon = TomahawkUtils::defaultPixmap( TomahawkUtils::DefaultResolver, TomahawkUtils::Original, QSize( 128, 128 ) ); } diff --git a/src/libtomahawk/utils/TomahawkUtils.h b/src/libtomahawk/utils/TomahawkUtils.h index 363d5b056..675a9551c 100644 --- a/src/libtomahawk/utils/TomahawkUtils.h +++ b/src/libtomahawk/utils/TomahawkUtils.h @@ -48,6 +48,7 @@ namespace TomahawkUtils DefaultArtistImage, DefaultTrackImage, DefaultSourceAvatar, + DefaultResolver, NowPlayingSpeaker, NowPlayingSpeakerDark, InfoIcon, @@ -58,7 +59,23 @@ namespace TomahawkUtils PrevButton, PrevButtonPressed, NextButton, - NextButtonPressed + NextButtonPressed, + ShuffleOff, + ShuffleOffPressed, + ShuffleOn, + ShuffleOnPressed, + RepeatOne, + RepeatOnePressed, + RepeatAll, + RepeatAllPressed, + RepeatOff, + RepeatOffPressed, + VolumeMuted, + VolumeFull, + Share, + NotLoved, + Loved, + Configure }; enum ImageMode