4 files changed, 17 insertions, 10 deletions

diff --git a/src-qt5/desktop-utils/lumina-archiver/TarBackend.cpp b/src-qt5/desktop-utils/lumina-archiver/TarBackend.cpp
index 714cfe45..150f8375 100644
--- a/src-qt5/desktop-utils/lumina-archiver/TarBackend.cpp
+++ b/src-qt5/desktop-utils/lumina-archiver/TarBackend.cpp
@@ -12,10 +12,16 @@
 #include <QCoreApplication>
 #include <QTimer>
 
+#ifdef Q_OS_LINUX
+#define TAR_CMD "bsdtar"
+#else
+#define TAR_CMD "tar"
+#endif
+
 Backend::Backend(QObject *parent) : QObject(parent){
   //Setup the backend process
   PROC.setProcessChannelMode(QProcess::MergedChannels);
-  PROC.setProgram("tar");
+  PROC.setProgram(TAR_CMD);
   connect(&PROC, SIGNAL(finished(int, QProcess::ExitStatus)), this, SLOT(procFinished(int, QProcess::ExitStatus)) );
   connect(&PROC, SIGNAL(readyReadStandardOutput()), this, SLOT(processData()) );
   connect(&PROC, SIGNAL(started()), this, SIGNAL(ProcessStarting()) );
@@ -124,7 +130,7 @@ void Backend::startAdd(QStringList paths,  bool absolutePaths){
     args<< "@"+filepath;
   }
   STARTING=true;
-  PROC.start("tar", args);
+  PROC.start(TAR_CMD, args);
 }
 
 void Backend::startRemove(QStringList paths){
@@ -140,7 +146,7 @@ void Backend::startRemove(QStringList paths){
   }
   args<< "@"+filepath;
   STARTING=true;
-  PROC.start("tar", args);
+  PROC.start(TAR_CMD, args);
 }
 
 void Backend::startExtract(QString path, bool overwrite, QString file){
@@ -162,7 +168,7 @@ void Backend::startExtract(QString path, bool overwrite, QStringList files){
   args << "-C" << path;
   STARTING=true;
   //qDebug() << "Starting command:" << "tar" << args;
-  PROC.start("tar", args);
+  PROC.start(TAR_CMD, args);
 }
 
 void Backend::startViewFile(QString path){
@@ -180,7 +186,7 @@ void Backend::startViewFile(QString path){
   while(!tmpProc.waitForFinished(500)){ QCoreApplication::processEvents(); }
   emit ProcessFinished(tmpProc.exitCode()==0, "");
   QProcess::startDetached("xdg-open", QStringList() << newfilename);
-  //PROC.start("tar", args);
+  //PROC.start(TAR_CMD, args);
 }
 
 //===============
@@ -226,7 +232,7 @@ void Backend::startList(){
   args << "-tv";
   LIST = STARTING=true;
   //qDebug() << "Starting List:" << "tar "+args.join(" ")+" "+flags.join(" ");
-  PROC.start("tar", QStringList() << args << flags);
+  PROC.start(TAR_CMD, QStringList() << args << flags);
 }
 
 //===============
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
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") );