aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKen Moore <ken@ixsystems.com>2018-05-13 05:18:38 -0400
committerKen Moore <ken@ixsystems.com>2018-05-13 05:40:00 -0400
commitacd10b3c10990223f32b7ca4f737f0cc16ae313a (patch)
treed7d8f2c0a855b20dc260c7b67c3db52ae7a5340f
parentFix the view-presentation icon in lumina-pdf (diff)
downloadlumina-acd10b3c10990223f32b7ca4f737f0cc16ae313a.tar.gz
lumina-acd10b3c10990223f32b7ca4f737f0cc16ae313a.tar.bz2
lumina-acd10b3c10990223f32b7ca4f737f0cc16ae313a.zip
Update the fallback icon used for Pandora radio in lumina-mediaplayer
-rw-r--r--src-qt5/desktop-utils/lumina-mediaplayer/extra/pandora.pngbin0 -> 29927 bytes
-rw-r--r--src-qt5/desktop-utils/lumina-mediaplayer/extra/resources.qrc2
-rw-r--r--src-qt5/desktop-utils/lumina-mediaplayer/mainUI.cpp7
3 files changed, 5 insertions, 4 deletions
diff --git a/src-qt5/desktop-utils/lumina-mediaplayer/extra/pandora.png b/src-qt5/desktop-utils/lumina-mediaplayer/extra/pandora.png
new file mode 100644
index 00000000..daff651b
--- /dev/null
+++ b/src-qt5/desktop-utils/lumina-mediaplayer/extra/pandora.png
Binary files differ
diff --git a/src-qt5/desktop-utils/lumina-mediaplayer/extra/resources.qrc b/src-qt5/desktop-utils/lumina-mediaplayer/extra/resources.qrc
index 3e09863d..fc53d7e5 100644
--- a/src-qt5/desktop-utils/lumina-mediaplayer/extra/resources.qrc
+++ b/src-qt5/desktop-utils/lumina-mediaplayer/extra/resources.qrc
@@ -1,5 +1,5 @@
<RCC>
<qresource>
- <file alias="pandora">Pandora.svg</file>
+ <file alias="pandora">pandora.png</file>
</qresource>
</RCC>
diff --git a/src-qt5/desktop-utils/lumina-mediaplayer/mainUI.cpp b/src-qt5/desktop-utils/lumina-mediaplayer/mainUI.cpp
index 358a8dbd..227b9014 100644
--- a/src-qt5/desktop-utils/lumina-mediaplayer/mainUI.cpp
+++ b/src-qt5/desktop-utils/lumina-mediaplayer/mainUI.cpp
@@ -196,8 +196,9 @@ void MainUI::setupConnections(){
}
void MainUI::setupIcons(){
+
ui->radio_local->setIcon( LXDG::findIcon("multimedia-audio-player","media-audio") );
- ui->radio_pandora->setIcon( LXDG::findIcon("pandora",":pandora") );
+ ui->radio_pandora->setIcon( QIcon::fromTheme("pandora",QIcon(":pandora")) );
ui->actionClose->setIcon( LXDG::findIcon("application-close","dialog-close") );
ui->actionPlay->setIcon( LXDG::findIcon("media-playback-start","") );
@@ -270,7 +271,7 @@ void MainUI::PlayerTypeChanged(bool active){
if(ui->radio_pandora->isChecked()){
ui->stackedWidget->setCurrentWidget(ui->page_pandora);
PandoraStateChanged(PANDORA->currentState());
- QIcon ico = LXDG::findIcon("pandora",":pandora");
+ QIcon ico = QIcon::fromTheme("pandora",QIcon(":pandora"));
SYSTRAY->setIcon( ico );
this->setWindowIcon( ico );
this->setWindowTitle( tr("Pandora Radio") );
@@ -279,7 +280,7 @@ void MainUI::PlayerTypeChanged(bool active){
}else{
ui->stackedWidget->setCurrentWidget(ui->page_local);
LocalStateChanged(QMediaPlayer::StoppedState);
- QIcon ico = LXDG::findIcon("media-playlist-audio","audio-x-generic");
+ QIcon ico = LXDG::findIcon("multimedia-audio-player","media-audio");
SYSTRAY->setIcon( ico );
this->setWindowIcon( ico );
this->setWindowTitle( tr("Media Player") );
bgstack15