feedc0de/QtZeiterfassung
1
0
Fork 0
Code Issues 28 Pull Requests Actions Packages Projects Releases 6 Wiki Activity

Implemented WebRadioSettings::lastUrl and WebRadioSettings::volume

Browse Source
This commit is contained in:
0xFEEDC0DE
2018-03-13 21:10:49 +01:00
parent 26f1c82080
commit 6fb58b1b74
3 changed files with 30 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/webradioplugin/webradiodialog.cpp
View File

@@ -22,7 +22,7 @@ WebRadioDialog::WebRadioDialog(MainWindow &mainWindow) :
for(const auto &url : m_settings.urls())
ui->comboBox->addItem(url, url);
ui->comboBox->setCurrentIndex(ui->comboBox->findData(m_mainWindow.settings().value(QStringLiteral("WebRadioPlugin/lastUrl")).toString()));
ui->comboBox->setCurrentIndex(ui->comboBox->findData(m_settings.lastUrl()));
connect(ui->comboBox, static_cast<void(QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
this, &WebRadioDialog::currentIndexChanged);
@@ -34,7 +34,7 @@ WebRadioDialog::WebRadioDialog(MainWindow &mainWindow) :
connect(ui->pushButtonPause, &QAbstractButton::pressed, m_player, &QMediaPlayer::pause);
connect(ui->pushButtonStop, &QAbstractButton::pressed, m_player, &QMediaPlayer::stop);
m_player->setVolume(m_mainWindow.settings().value(QStringLiteral("WebRadioPlugin/volume"), 100).toInt());
m_player->setVolume(m_settings.volume());
ui->horizontalSlider->setValue(m_player->volume());
connect(ui->horizontalSlider, &QAbstractSlider::valueChanged, this, &WebRadioDialog::volumeChanged);
@@ -106,7 +106,7 @@ void WebRadioDialog::play()
if(ui->comboBox->currentIndex() == -1)
return;
m_mainWindow.settings().setValue(QStringLiteral("WebRadioPlugin/lastUrl"), ui->comboBox->currentData().toString());
m_settings.setLastUrl(ui->comboBox->currentData().toString());
m_player->play();
}
@@ -123,6 +123,6 @@ void WebRadioDialog::updateWidgets()
void WebRadioDialog::volumeChanged(int volume)
{
m_mainWindow.settings().setValue(QStringLiteral("WebRadioPlugin/volume"), volume);
m_settings.setVolume(volume);
m_player->setVolume(volume);
}

20
plugins/webradioplugin/webradiosettings.cpp
View File

@@ -28,3 +28,23 @@ void WebRadioSettings::setUrls(const QStringList &urls)
{
m_settings.setValue(QStringLiteral("WebRadioPlugin/urls"), urls);
}
QString WebRadioSettings::lastUrl() const
{
return m_settings.value(QStringLiteral("WebRadioPlugin/lastUrl")).toString();
}
void WebRadioSettings::setLastUrl(const QString &lastUrl)
{
m_settings.setValue(QStringLiteral("WebRadioPlugin/lastUrl"), lastUrl);
}
int WebRadioSettings::volume() const
{
return m_settings.value(QStringLiteral("WebRadioPlugin/volume"), 100).toInt();
}
void WebRadioSettings::setVolume(int volume)
{
m_settings.setValue(QStringLiteral("WebRadioPlugin/volume"), volume);
}

6
plugins/webradioplugin/webradiosettings.h
View File

@@ -13,6 +13,12 @@ public:
QStringList urls() const;
void setUrls(const QStringList &urls);
QString lastUrl() const;
void setLastUrl(const QString &lastUrl);
int volume() const;
void setVolume(int volume);
private:
ZeiterfassungSettings &m_settings;
};