Another few changes to icons and such for Lumina.

3 files changed, 16 insertions, 13 deletions

diff --git a/src-qt5/core/libLumina/LuminaXDG.cpp b/src-qt5/core/libLumina/LuminaXDG.cpp
index db1f5a97..3e31c3fc 100644
--- a/src-qt5/core/libLumina/LuminaXDG.cpp
+++ b/src-qt5/core/libLumina/LuminaXDG.cpp
@@ -791,13 +791,13 @@ QIcon LXDG::findIcon(QString iconName, QString fallback){
     
     //fall << LOS::AppPrefix()+"share/pixmaps"; //always use this as well as a final fallback
     QDir::setSearchPaths("icontheme", theme);
-    QDir::setSearchPaths("material-design-light", oxy);
+    QDir::setSearchPaths("default", oxy);
     QDir::setSearchPaths("fallback", fall);
     //qDebug() << "Setting Icon Search Paths:" << "\nicontheme:" << theme << "\nmaterial-design-light:" << oxy << "\nfallback:" << fall;
   }
   //Find the icon in the search paths
   QIcon ico;
-  QStringList srch; srch << "icontheme" << "material-design-light" << "fallback";
+  QStringList srch; srch << "icontheme" << "default" << "fallback";
   for(int i=0; i<srch.length() && ico.isNull(); i++){
     //Look for a svg first
     if(QFile::exists(srch[i]+":"+iconName+".svg") ){
diff --git a/src-qt5/desktop-utils/lumina-mediaplayer/lumina-mediaplayer.desktop b/src-qt5/desktop-utils/lumina-mediaplayer/lumina-mediaplayer.desktop
index 180f4562..1fec4a3a 100644
--- a/src-qt5/desktop-utils/lumina-mediaplayer/lumina-mediaplayer.desktop
+++ b/src-qt5/desktop-utils/lumina-mediaplayer/lumina-mediaplayer.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=lumina-mediaplayer %f
-Icon=audio-x-generic
+Icon=media-playlist-audio
 Terminal=false
 Type=Application
 StartupNotify=true
diff --git a/src-qt5/desktop-utils/lumina-mediaplayer/mainUI.cpp b/src-qt5/desktop-utils/lumina-mediaplayer/mainUI.cpp
index c11dce6c..b4a83a66 100644
--- a/src-qt5/desktop-utils/lumina-mediaplayer/mainUI.cpp
+++ b/src-qt5/desktop-utils/lumina-mediaplayer/mainUI.cpp
@@ -122,7 +122,8 @@ void MainUI::setupConnections(){
 }
 
 void MainUI::setupIcons(){
-  ui->radio_local->setIcon( LXDG::findIcon("audio-x-generic","") );
+  ui->radio_local->setIcon( LXDG::findIcon("media-playlist-audio","audio-x-generic") );
+  ui->radio_pandora->setIcon( LXDG::findIcon("pandora",":pandora") );
 
   ui->actionClose->setIcon( LXDG::findIcon("application-close","dialog-close") );
   ui->actionPlay->setIcon( LXDG::findIcon("media-playback-start","") );
@@ -135,14 +136,14 @@ void MainUI::setupIcons(){
 
   //Pandora Pages
   ui->push_pandora_apply->setIcon( LXDG::findIcon("dialog-ok-apply","dialog-ok") );
-  ui->tool_pandora_ban->setIcon( LXDG::findIcon("dialog-cancel","") );
-  ui->tool_pandora_info->setIcon( LXDG::findIcon("help-about","") );
+  ui->tool_pandora_ban->setIcon( LXDG::findIcon("dialog-warning","") );
+  ui->tool_pandora_info->setIcon( LXDG::findIcon("dialog-information","") );
   ui->tool_pandora_love->setIcon( LXDG::findIcon("emblem-favorite","") );
-  ui->tool_pandora_tired->setIcon( LXDG::findIcon("flag-yellow","flag") );
+  ui->tool_pandora_tired->setIcon( LXDG::findIcon("media-playlist-close","flag") );
   ui->tool_pandora_stationrm->setIcon( LXDG::findIcon("list-remove","") );
   ui->tool_pandora_stationadd->setIcon( LXDG::findIcon("list-add","") );
-  ui->action_pandora_newstation_artist->setIcon( LXDG::findIcon("list-add-user","") );
-  ui->action_pandora_newstation_song->setIcon( LXDG::findIcon("audio-x-generic","") );
+  ui->action_pandora_newstation_artist->setIcon( LXDG::findIcon("preferences-desktop-user","") );
+  ui->action_pandora_newstation_song->setIcon( LXDG::findIcon("bookmark-audio","media-playlist-audio") );
 
 }
 
@@ -180,13 +181,15 @@ void MainUI::PlayerTypeChanged(bool active){
   if(ui->radio_pandora->isChecked()){ 
     ui->stackedWidget->setCurrentWidget(ui->page_pandora); 
     PandoraStateChanged(PANDORA->currentState());
-    SYSTRAY->setIcon( QIcon(":pandora") );
-    this->setWindowIcon( QIcon(":pandora") );
+    QIcon ico = LXDG::findIcon("pandora",":pandora");
+    SYSTRAY->setIcon( ico );
+    this->setWindowIcon( ico );
     this->setWindowTitle( tr("Pandora Radio") );
   }else{ 
     ui->stackedWidget->setCurrentWidget(ui->page_local);
-    SYSTRAY->setIcon( LXDG::findIcon("audio-x-generic","") );
-    this->setWindowIcon( LXDG::findIcon("audio-x-generic","") );
+    QIcon ico = LXDG::findIcon("media-playlist-audio","audio-x-generic");
+    SYSTRAY->setIcon( ico );
+    this->setWindowIcon( ico );
     this->setWindowTitle( tr("Media Player") );
   }
   //Now close down any currently running streams as needed