diff options
author | Weblate <noreply@weblate.org> | 2017-08-17 16:04:15 +0000 |
---|---|---|
committer | Weblate <noreply@weblate.org> | 2017-08-17 16:04:15 +0000 |
commit | da678fc7fa150351ce15acf8fed2c90dde244db7 (patch) | |
tree | 8c5702ce54b5e533b61c5a2ce555e5b5bdde1d48 /src-qt5/desktop-utils/lumina-mediaplayer/mainUI.cpp | |
parent | Translated using Weblate (French) (diff) | |
parent | Merge remote-tracking branch 'origin/master' (diff) | |
download | lumina-da678fc7fa150351ce15acf8fed2c90dde244db7.tar.gz lumina-da678fc7fa150351ce15acf8fed2c90dde244db7.tar.bz2 lumina-da678fc7fa150351ce15acf8fed2c90dde244db7.zip |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'src-qt5/desktop-utils/lumina-mediaplayer/mainUI.cpp')
-rw-r--r-- | src-qt5/desktop-utils/lumina-mediaplayer/mainUI.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src-qt5/desktop-utils/lumina-mediaplayer/mainUI.cpp b/src-qt5/desktop-utils/lumina-mediaplayer/mainUI.cpp index dfd859d7..cfb6823c 100644 --- a/src-qt5/desktop-utils/lumina-mediaplayer/mainUI.cpp +++ b/src-qt5/desktop-utils/lumina-mediaplayer/mainUI.cpp @@ -22,7 +22,7 @@ MainUI::MainUI() : QMainWindow(), ui(new Ui::MainUI()){ ui->setupUi(this); SETTINGS = LUtils::openSettings("lumina-desktop","lumina-mediaplayer",this); closing = false; - DISABLE_VIDEO = true; //add a toggle in the UI for this later + DISABLE_VIDEO = false; //add a toggle in the UI for this later //Any special UI changes QWidget *spacer = new QWidget(this); spacer->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred); @@ -69,7 +69,7 @@ void MainUI::loadArguments(QStringList args){ void MainUI::setupPlayer(){ PLAYER = new QMediaPlayer(this); //base multimedia object VIDEO = new QVideoWidget(this); //output to this widget for video - PLAYLIST = new QMediaPlaylist(PLAYER); //pull from this playlist + PLAYLIST = new QMediaPlaylist(PLAYER); //pull from this playlist ui->videoLayout->addWidget(VIDEO); //Now setup the interfaces between all these objects @@ -262,13 +262,13 @@ void MainUI::closeApplication(){ QTimer::singleShot(500, this, SLOT(close()) ); }else{ this->close(); - } + } } void MainUI::PlayerTypeChanged(bool active){ if(!active){ return; } //this gets rid of the "extra" signals from the radio button functionality (1 signal from each button on change) - if(ui->radio_pandora->isChecked()){ - ui->stackedWidget->setCurrentWidget(ui->page_pandora); + if(ui->radio_pandora->isChecked()){ + ui->stackedWidget->setCurrentWidget(ui->page_pandora); PandoraStateChanged(PANDORA->currentState()); QIcon ico = LXDG::findIcon("pandora",":pandora"); SYSTRAY->setIcon( ico ); @@ -276,7 +276,7 @@ void MainUI::PlayerTypeChanged(bool active){ this->setWindowTitle( tr("Pandora Radio") ); //Now hide/deactivate any toolbar buttons which are not used ui->actionBack->setVisible(!ui->radio_pandora->isChecked()); - }else{ + }else{ ui->stackedWidget->setCurrentWidget(ui->page_local); LocalStateChanged(QMediaPlayer::StoppedState); QIcon ico = LXDG::findIcon("media-playlist-audio","audio-x-generic"); |