diff --git a/settingswidget.cpp b/settingswidget.cpp index 375d408fdf549c104bf90b2ba73c6cdde9688228..708ba10f5142b58be000532bf6bf9572616158b1 100644 --- a/settingswidget.cpp +++ b/settingswidget.cpp @@ -772,7 +772,13 @@ void SettingsWidget::setConnections() // audio / visual settings - connect(ui->recordPathButton, &QPushButton::clicked, this, &SettingsWidget::openRecordFolderSlot); + connect(ui->alwaysRecordingCheckBox, &QAbstractButton::clicked, this, &SettingsWidget::slotAlwaysRecordingClicked); + + connect(ui->recordPreviewCheckBox, &QAbstractButton::clicked, this, &SettingsWidget::slotRecordPreviewClicked); + + connect(ui->recordPathButton, &QAbstractButton::clicked, this, &SettingsWidget::openRecordFolderSlot); + + connect(ui->recordQualitySlider, &QAbstractSlider::valueChanged, this, &SettingsWidget::slotRecordQualityChanged); connect(ui->hardwareAccelCheckBox, &QAbstractButton::clicked, this, &SettingsWidget::slotSetHardwareAccel); } @@ -795,7 +801,17 @@ void SettingsWidget::populateGeneralSettings() auto notifs = settings.value(SettingsKey::enableNotifications).toBool(); ui->notificationCheckBox->setChecked(notifs); - //recordings + // recording + auto alwaysRecord = LRCInstance::avModel().getAlwaysRecord(); + ui->alwaysRecordingCheckBox->setChecked(alwaysRecord); + + auto recordPreview = LRCInstance::avModel().getRecordPreview(); + ui->recordPreviewCheckBox->setChecked(recordPreview); + + auto recordQuality = LRCInstance::avModel().getRecordQuality(); + ui->recordQualityValueLabel->setText(QString::number(recordQuality / 1000) + " MB/s"); + ui->recordQualitySlider->setValue(recordQuality); + if (LRCInstance::avModel().getRecordPath().empty()) { QString recordPath = QDir::toNativeSeparators( QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation)); @@ -805,6 +821,7 @@ void SettingsWidget::populateGeneralSettings() Utils::setElidedText(ui->recordPathButton, QString::fromStdString(LRCInstance::avModel().getRecordPath())); + // updates #ifdef Q_OS_WIN ui->autoUpdateCheckBox->setChecked(settings.value(SettingsKey::autoUpdate).toBool()); #endif @@ -867,7 +884,23 @@ void SettingsWidget::openRecordFolderSlot() } } -// ************************* Audio/Visual Settings ************************* +void SettingsWidget::slotAlwaysRecordingClicked(bool state) +{ + LRCInstance::avModel().setAlwaysRecord(state); +} + +void SettingsWidget::slotRecordPreviewClicked(bool state) +{ + LRCInstance::avModel().setRecordPreview(state); +} + +void SettingsWidget::slotRecordQualityChanged(int value) +{ + ui->recordQualityValueLabel->setText(QString::number(value / 1000) + " MB/s"); + LRCInstance::avModel().setRecordQuality(value); +} + +// ************************* Audio/Visual Settings ************recordQuality************* void SettingsWidget::populateAVSettings() { diff --git a/settingswidget.h b/settingswidget.h index 7c7f9ee11d1aeeae0d025539556d1b1dd4a7dfb1..36d080c902a5363f21e76389b2879856a3c095fb 100644 --- a/settingswidget.h +++ b/settingswidget.h @@ -115,7 +115,7 @@ private slots: void verifyRegisteredNameSlot(); void beforeNameLookup(); void receiveRegNameSlot(const std::string& accountID, lrc::api::account::LookupStatus status, - const std::string& address, const std::string& name); + const std::string& address, const std::string& name); void slotRegisterName(); void setAccEnableSlot(int state); void delAccountSlot(); @@ -131,6 +131,9 @@ private slots: void slotSetClosedOrMin(bool state); void openDownloadFolderSlot(); void openRecordFolderSlot(); + void slotAlwaysRecordingClicked(bool state); + void slotRecordPreviewClicked(bool state); + void slotRecordQualityChanged(int value); void slotSetUpdateAutomatic(bool state); void outputDevIndexChangedSlot(int index); void inputdevIndexChangedSlot(int index); diff --git a/settingswidget.ui b/settingswidget.ui index 0dc9b7466f768f882ecaa366c15899a4c96ea5e8..ffb67f2040426710294a4d0e19790c4fa07be7f7 100644 --- a/settingswidget.ui +++ b/settingswidget.ui @@ -753,7 +753,7 @@ - false + true @@ -789,6 +789,212 @@ 0 + + + + 0 + + + + + + 0 + 0 + + + + + 0 + 30 + + + + + 10 + + + + false + + + Toggle automatic updates + + + Always record calls + + + true + + + + + + + + + 0 + + + + + + 0 + 0 + + + + + 0 + 30 + + + + + 10 + + + + false + + + Toggle automatic updates + + + Record preview video for a call + + + true + + + + + + + + + 0 + + + + + true + + + + 10 + + + + Quality + + + + + + + Qt::Horizontal + + + QSizePolicy::MinimumExpanding + + + + 40 + 20 + + + + + + + + 0 + + + 0 + + + + + Qt::Vertical + + + + 20 + 1 + + + + + + + + true + + + + 10 + + + + VALUE + + + + + + + Qt::Vertical + + + + 20 + 8 + + + + + + + + + + + 320 + 30 + + + + + 180 + 30 + + + + 50000 + + + 10 + + + 500 + + + Qt::Horizontal + + + false + + + QSlider::TicksBothSides + + + 5000 + + + + + @@ -800,7 +1006,7 @@ - false + true @@ -831,7 +1037,7 @@ - false + true diff --git a/videooverlay.cpp b/videooverlay.cpp index 820065c2edf742d6a0cfa3283b6c3848a7560a3b..30cb5dc2bf7dec861ac5c552cd92947de2465eda 100644 --- a/videooverlay.cpp +++ b/videooverlay.cpp @@ -43,8 +43,6 @@ VideoOverlay::VideoOverlay(QWidget* parent) : ui->onHoldLabel->setVisible(false); - ui->recButton->setVisible(false); - ui->transferCallButton->setVisible(false); ui->transferCallButton->setCheckable(true);