tza/openauto
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Some reworks and handling changes

Browse Source
This commit is contained in:
hawkeyexp 2018-07-29 18:15:14 +02:00
parent b8bbddabe0
commit d6b7bee928
3 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/autoapp/UI/SettingsWindow.cpp
View File

@ -390,7 +390,7 @@ void SettingsWindow::loadSystemValues()
QStringList inputs = data_return.readAll().split("\n"); QStringList inputs = data_return.readAll().split("\n");
inputsFile.close(); inputsFile.close();
int cleaner = ui_->comboBoxPulseInput->count(); int cleaner = ui_->comboBoxPulseInput->count();
while (cleaner > 0) { while (cleaner > -1) {
ui_->comboBoxPulseInput->removeItem(cleaner); ui_->comboBoxPulseInput->removeItem(cleaner);
cleaner--; cleaner--;
} }
@ -410,7 +410,7 @@ void SettingsWindow::loadSystemValues()
QStringList outputs = data_return.readAll().split("\n"); QStringList outputs = data_return.readAll().split("\n");
outputsFile.close(); outputsFile.close();
int cleaner = ui_->comboBoxPulseOutput->count(); int cleaner = ui_->comboBoxPulseOutput->count();
while (cleaner > 0) { while (cleaner > -1) {
ui_->comboBoxPulseOutput->removeItem(cleaner); ui_->comboBoxPulseOutput->removeItem(cleaner);
cleaner--; cleaner--;
} }
@ -469,10 +469,10 @@ void SettingsWindow::loadSystemValues()
// set dac // set dac
QString dac = "Custom"; QString dac = "Custom";
if (getparams[23] == "allo-boss-dac-pcm512x-audio,slave") { if (getparams[23] == "allo-boss-dac-pcm512x-audio") {
dac = "Allo - Boss"; dac = "Allo - Boss";
} }
if (getparams[23] == "allo-piano-dac-pcm512x-audio,slave") { if (getparams[23] == "allo-piano-dac-pcm512x-audio") {
dac = "Allo - Piano"; dac = "Allo - Piano";
} }
if (getparams[23] == "iqaudio-dacplus") { if (getparams[23] == "iqaudio-dacplus") {

2
src/autoapp/UI/mainwindow.ui
View File

@ -748,7 +748,6 @@ QPushButton:pressed { background: orange; border: none; }</string>
<bool>true</bool> <bool>true</bool>
</property> </property>
</widget> </widget>
<zorder>dashcamBG</zorder>
<zorder>masterButtonBG</zorder> <zorder>masterButtonBG</zorder>
<zorder>pushButtonSettings</zorder> <zorder>pushButtonSettings</zorder>
<zorder>pushButtonLock</zorder> <zorder>pushButtonLock</zorder>
@ -767,6 +766,7 @@ QPushButton:pressed { background: orange; border: none; }</string>
<zorder>systemDebugging</zorder> <zorder>systemDebugging</zorder>
<zorder>versionString</zorder> <zorder>versionString</zorder>
<zorder>dateString</zorder> <zorder>dateString</zorder>
<zorder>dashcamBG</zorder>
<zorder>pushButtonStop</zorder> <zorder>pushButtonStop</zorder>
<zorder>pushButtonRecord</zorder> <zorder>pushButtonRecord</zorder>
<zorder>pushButtonRecordActive</zorder> <zorder>pushButtonRecordActive</zorder>

8
src/autoapp/UI/settingswindow.ui
View File

@ -620,14 +620,6 @@ QSlider::groove:horizontal { background: #6d6d6d; height: 32px;}</string>
<property name="editable"> <property name="editable">
<bool>false</bool> <bool>false</bool>
</property> </property>
<property name="currentText">
<string>not selected</string>
</property>
<item>
<property name="text">
<string>not selected</string>
</property>
</item>
</widget> </widget>
<widget class="QLabel" name="labelPulseOutput"> <widget class="QLabel" name="labelPulseOutput">
<property name="geometry"> <property name="geometry">