remove leftover volume stuff
This commit is contained in:
parent
7e940ef815
commit
da0193dd19
@ -111,8 +111,6 @@ MainWindow::MainWindow(configuration::IConfiguration::Pointer configuration, QWi
|
||||
connect(ui_->pushButtonDebug, &QPushButton::clicked, this, &MainWindow::createDebuglog);
|
||||
connect(ui_->pushButtonDebug2, &QPushButton::clicked, this, &MainWindow::createDebuglog);
|
||||
connect(ui_->pushButtonBluetooth, &QPushButton::clicked, this, &MainWindow::setPairable);
|
||||
connect(ui_->pushButtonMute, &QPushButton::clicked, this, &MainWindow::toggleMuteButton);
|
||||
connect(ui_->pushButtonMute, &QPushButton::clicked, this, &MainWindow::setMute);
|
||||
connect(ui_->pushButtonUnMute, &QPushButton::clicked, this, &MainWindow::toggleMuteButton);
|
||||
connect(ui_->pushButtonUnMute, &QPushButton::clicked, this, &MainWindow::setUnMute);
|
||||
connect(ui_->pushButtonToggleGUI, &QPushButton::clicked, this, &MainWindow::toggleGUI);
|
||||
@ -412,14 +410,6 @@ MainWindow::MainWindow(configuration::IConfiguration::Pointer configuration, QWi
|
||||
this->customBrightnessControl = true;
|
||||
}
|
||||
|
||||
// read param file
|
||||
if (std::ifstream("/boot/crankshaft/volume")) {
|
||||
// init volume
|
||||
QString vol=QString::number(configuration_->readFileContent("/boot/crankshaft/volume").toInt());
|
||||
ui_->volumeValueLabel->setText(vol+"%");
|
||||
ui_->horizontalSliderVolume->setValue(vol.toInt());
|
||||
}
|
||||
|
||||
// switch to old menu if set in settings
|
||||
if (!configuration->oldGUI()) {
|
||||
this->oldGUIStyle = false;
|
||||
@ -729,13 +719,6 @@ void f1x::openauto::autoapp::ui::MainWindow::on_horizontalSliderBrightness_value
|
||||
ui_->brightnessValueLabel->setText(bri);
|
||||
}
|
||||
|
||||
void f1x::openauto::autoapp::ui::MainWindow::on_horizontalSliderVolume_valueChanged(int value)
|
||||
{
|
||||
QString vol=QString::number(value);
|
||||
ui_->volumeValueLabel->setText(vol+"%");
|
||||
system(("/usr/local/bin/autoapp_helper setvolume " + std::to_string(value) + "&").c_str());
|
||||
}
|
||||
|
||||
void f1x::openauto::autoapp::ui::MainWindow::updateAlpha()
|
||||
{
|
||||
int value = configuration_->getAlphaTrans();
|
||||
@ -915,19 +898,6 @@ void f1x::openauto::autoapp::ui::MainWindow::toggleExit()
|
||||
}
|
||||
}
|
||||
|
||||
void f1x::openauto::autoapp::ui::MainWindow::toggleMuteButton()
|
||||
{
|
||||
if (!this->toggleMute) {
|
||||
ui_->pushButtonMute->hide();
|
||||
ui_->pushButtonUnMute->show();
|
||||
this->toggleMute = true;
|
||||
} else {
|
||||
ui_->pushButtonUnMute->hide();
|
||||
ui_->pushButtonMute->show();
|
||||
this->toggleMute = false;
|
||||
}
|
||||
}
|
||||
|
||||
void f1x::openauto::autoapp::ui::MainWindow::toggleGUI()
|
||||
{
|
||||
if (!this->oldGUIStyle) {
|
||||
@ -1105,12 +1075,6 @@ void f1x::openauto::autoapp::ui::MainWindow::on_horizontalSliderProgressPlayer_s
|
||||
player->setPosition(position);
|
||||
}
|
||||
|
||||
void f1x::openauto::autoapp::ui::MainWindow::on_horizontalSliderVolumePlayer_sliderMoved(int position)
|
||||
{
|
||||
player->setVolume(position);
|
||||
ui_->volumeValueLabelPlayer->setText(QString::number(position) + "%");
|
||||
}
|
||||
|
||||
void f1x::openauto::autoapp::ui::MainWindow::on_pushButtonList_clicked()
|
||||
{
|
||||
ui_->mp3selectWidget->show();
|
||||
@ -2047,14 +2011,12 @@ void f1x::openauto::autoapp::ui::MainWindow::tmpChanged()
|
||||
ui_->pushButtonBrightness->hide();
|
||||
ui_->pushButtonBrightness2->hide();
|
||||
ui_->BrightnessSliderControl->hide();
|
||||
// also hide volume button if brightness hidden
|
||||
}
|
||||
} else {
|
||||
if (!this->lightsensor) {
|
||||
if ((ui_->pushButtonBrightness->isVisible() == false) || (ui_->pushButtonBrightness->isVisible() == false)) {
|
||||
ui_->pushButtonBrightness->show();
|
||||
ui_->pushButtonBrightness2->show();
|
||||
// also show volume button if brightness visible
|
||||
ui_->BrightnessSliderControl->hide();
|
||||
}
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user