diff options
author | Ken Moore <ken@ixsystems.com> | 2018-03-05 15:27:48 -0500 |
---|---|---|
committer | Ken Moore <ken@ixsystems.com> | 2018-03-05 15:27:48 -0500 |
commit | 63a1df7be03ab6d47bd4721cc70947e1cd4259bd (patch) | |
tree | d76e7fa4eb9dd5495be3bd8fd9b373d8fa526301 /src-qt5/desktop-utils | |
parent | Make the cursor theme change a but more dynamic. Can't seem to force a reload... (diff) | |
download | lumina-63a1df7be03ab6d47bd4721cc70947e1cd4259bd.tar.gz lumina-63a1df7be03ab6d47bd4721cc70947e1cd4259bd.tar.bz2 lumina-63a1df7be03ab6d47bd4721cc70947e1cd4259bd.zip |
Add another XDG registration for lumina-mediaplayer when pianobar is installed.
This shortcut is specifically for launching the Pandora radio streaming side.
Diffstat (limited to 'src-qt5/desktop-utils')
-rw-r--r-- | src-qt5/desktop-utils/lumina-mediaplayer/lumina-mediaplayer.pro | 3 | ||||
-rw-r--r-- | src-qt5/desktop-utils/lumina-mediaplayer/mainUI.cpp | 12 |
2 files changed, 8 insertions, 7 deletions
diff --git a/src-qt5/desktop-utils/lumina-mediaplayer/lumina-mediaplayer.pro b/src-qt5/desktop-utils/lumina-mediaplayer/lumina-mediaplayer.pro index d7423485..cf1aa872 100644 --- a/src-qt5/desktop-utils/lumina-mediaplayer/lumina-mediaplayer.pro +++ b/src-qt5/desktop-utils/lumina-mediaplayer/lumina-mediaplayer.pro @@ -92,7 +92,8 @@ TRANSLATIONS = i18n/l-mediap_af.ts \ dotrans.path=$${L_SHAREDIR}/lumina-desktop/i18n/ dotrans.extra=cd $$PWD/i18n && $${LRELEASE} -nounfinished *.ts && cp *.qm $(INSTALL_ROOT)$${L_SHAREDIR}/lumina-desktop/i18n/ -desktop.files=lumina-mediaplayer.desktop +desktop.files=lumina-mediaplayer.desktop \ + lumina-mediaplayer-pandora.desktop desktop.path=$${L_SHAREDIR}/applications/ #link.path=$${L_BINDIR} diff --git a/src-qt5/desktop-utils/lumina-mediaplayer/mainUI.cpp b/src-qt5/desktop-utils/lumina-mediaplayer/mainUI.cpp index cfb6823c..982e2346 100644 --- a/src-qt5/desktop-utils/lumina-mediaplayer/mainUI.cpp +++ b/src-qt5/desktop-utils/lumina-mediaplayer/mainUI.cpp @@ -256,7 +256,7 @@ void MainUI::loadFile(QString file){ // ==== PRIVATE SLOTS ==== void MainUI::closeApplication(){ closing = true; - if(PANDORA->currentState()!= PianoBarProcess::Stopped){ + if(PANDORA->currentState()!= PianoBarProcess::Stopped){ PANDORA->closePianoBar(); this->hide(); QTimer::singleShot(500, this, SLOT(close()) ); @@ -452,7 +452,7 @@ void MainUI::LocalListMediaRemoved(int start, int end){ void MainUI::LocalVideoAvailable(bool avail){ qDebug() << "Local VideoAvailable:" << avail; if(DISABLE_VIDEO){ avail = false; } //TEMPORARY DISABLE while working out gstreamer issues when video widget is hidden - //if(ui->tabWidget_local->currentWidget()==ui->tab_local_playing && avail){ + //if(ui->tabWidget_local->currentWidget()==ui->tab_local_playing && avail){ VIDEO->setVisible(avail); //} ui->label_player_novideo->setVisible(!avail); @@ -549,7 +549,7 @@ void MainUI::changePandoraStation(QString station){ } void MainUI::checkPandoraSettings(){ - bool changes = (PANDORA->email() != ui->line_pandora_email->text()) + bool changes = (PANDORA->email() != ui->line_pandora_email->text()) || (PANDORA->password() != ui->line_pandora_pass->text()) || (PANDORA->audioQuality() != ui->combo_pandora_quality->currentData().toString()) || (PANDORA->proxy() != ui->line_pandora_proxy->text()) @@ -575,7 +575,7 @@ void MainUI::createPandoraStation(){ //Prompt for a search string QString srch = QInputDialog::getText(this, tr("Pandora: Create Station"),"", QLineEdit::Normal, tr("Search Term")); if(srch.isEmpty()){ return; } //cancelled - PANDORA->createNewStation(srch); + PANDORA->createNewStation(srch); } //Pandora Process Feedback @@ -604,9 +604,9 @@ void MainUI::NewPandoraInfo(QString info){ void MainUI::PandoraStationChanged(QString station){ //qDebug() << "[STATION CHANGE]" << station; int index = ui->combo_pandora_station->findText( station ); - if(index>=0){ + if(index>=0){ //qDebug() <<" [FOUND]" << ui->combo_pandora_station->itemText(index); - ui->combo_pandora_station->setCurrentIndex(index); + ui->combo_pandora_station->setCurrentIndex(index); }else{ //Could not find the station in the current list - need to update that first //qDebug() <<" [NOT FOUND]"; |