diff --git a/src/autoapp/UI/SettingsWindow.cpp b/src/autoapp/UI/SettingsWindow.cpp index 02d5d4c..74cfaba 100644 --- a/src/autoapp/UI/SettingsWindow.cpp +++ b/src/autoapp/UI/SettingsWindow.cpp @@ -185,6 +185,14 @@ void SettingsWindow::onSave() params.append("#"); params.append( std::string(ui_->lineEditWifiClientPassword->text().toStdString()) ); params.append("#"); + if (ui_->checkBoxHotspot->isChecked()) { + params.append("1"); + } else { + params.append("0"); + } + params.append("#"); + params.append( std::string(ui_->lineEditWifiHotspotPassword->text().toStdString()) ); + params.append("#"); system((std::string("/usr/local/bin/autoapp_helper setparams#") + std::string(params) + std::string(" &") ).c_str()); this->close(); } @@ -553,6 +561,16 @@ void SettingsWindow::loadSystemValues() // Wifi Credentials ui_->lineEditWifiClientSSID->setText(getparams[30]); ui_->lineEditWifiClientPassword->setText(getparams[31]); + + // Wifi Hotspot Credentials + if (getparams[32] == "1") { + ui_->checkBoxHotspot->setChecked(true); + } else { + ui_->checkBoxHotspot->setChecked(false); + } + + ui_->lineEditWifiHotspotSSID->setText(getparams[33]); + ui_->lineEditWifiHotspotPassword->setText(getparams[34]); } } diff --git a/src/autoapp/UI/settingswindow.ui b/src/autoapp/UI/settingswindow.ui index c9b401b..3d86aab 100644 --- a/src/autoapp/UI/settingswindow.ui +++ b/src/autoapp/UI/settingswindow.ui @@ -615,8 +615,8 @@ QSlider::groove:horizontal { background: #6d6d6d; height: 32px;} 80 - 30 - 471 + 36 + 531 30 @@ -628,7 +628,7 @@ QSlider::groove:horizontal { background: #6d6d6d; height: 32px;} 20 - 30 + 36 61 30 @@ -641,8 +641,8 @@ QSlider::groove:horizontal { background: #6d6d6d; height: 32px;} 80 - 70 - 471 + 76 + 531 30 @@ -654,7 +654,7 @@ QSlider::groove:horizontal { background: #6d6d6d; height: 32px;} 20 - 70 + 76 61 30 @@ -667,8 +667,8 @@ QSlider::groove:horizontal { background: #6d6d6d; height: 32px;} 80 - 106 - 471 + 114 + 561 31 @@ -678,7 +678,7 @@ QSlider::groove:horizontal { background: #6d6d6d; height: 32px;} - To activate changed audio device you have to save settings and disconnect / reconnect phone! + To activate changed audio device you have to save settings and reconnect phone! Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter @@ -691,7 +691,7 @@ QSlider::groove:horizontal { background: #6d6d6d; height: 32px;} 20 - 108 + 116 31 31 @@ -1094,7 +1094,7 @@ QSlider::groove:horizontal { background: #6d6d6d; height: 32px;} - + Wireless @@ -1228,6 +1228,11 @@ QSlider::groove:horizontal { background: #6d6d6d; height: 32px;} 31 + + + true + + In order to use bluetooth features please remember to pair your device. @@ -1248,9 +1253,9 @@ QSlider::groove:horizontal { background: #6d6d6d; height: 32px;} - 410 + 390 30 - 231 + 251 31 @@ -1267,7 +1272,7 @@ QSlider::groove:horizontal { background: #6d6d6d; height: 32px;} - 330 + 310 30 71 31 @@ -1299,6 +1304,11 @@ QSlider::groove:horizontal { background: #6d6d6d; height: 32px;} 31 + + + true + + The wifi connection is only available in dev mode or debug mode! @@ -1308,7 +1318,7 @@ QSlider::groove:horizontal { background: #6d6d6d; height: 32px;} 90 30 - 231 + 200 31 @@ -1327,8 +1337,126 @@ QSlider::groove:horizontal { background: #6d6d6d; height: 32px;} + + + + 0 + 310 + 646 + 141 + + + + Hotspot settings + + + + + 390 + 60 + 251 + 31 + + + + true + + + QLineEdit::Normal + + + false + + + + + + 310 + 60 + 71 + 31 + + + + Password: + + + + + + 50 + 100 + 31 + 31 + + + + <html><head/><body><p><img src=":/ico_warning.png"/></p></body></html> + + + + + + 90 + 100 + 481 + 31 + + + + + true + + + + The hotspot is only available in dev mode and overrides client mode! + + + + + + 90 + 60 + 200 + 31 + + + + + + + true + + + + + + 10 + 60 + 71 + 31 + + + + SSID: + + + + + + 10 + 30 + 141 + 23 + + + + Enable Hotspot + + + - + CS Base @@ -1338,7 +1466,7 @@ QSlider::groove:horizontal { background: #6d6d6d; height: 32px;} 0 10 646 - 91 + 111 @@ -1374,7 +1502,7 @@ QSlider::groove:horizontal { background: #6d6d6d; height: 32px;} 10 - 60 + 66 80 23 @@ -1387,7 +1515,7 @@ QSlider::groove:horizontal { background: #6d6d6d; height: 32px;} 90 - 64 + 70 80 23 @@ -1426,7 +1554,7 @@ QSlider::groove:horizontal { background: #6d6d6d; height: 32px;} 200 - 60 + 66 110 23 @@ -1439,7 +1567,7 @@ QSlider::groove:horizontal { background: #6d6d6d; height: 32px;} 310 - 64 + 70 80 23 @@ -1641,7 +1769,7 @@ subcontrol-position: center left; - 540 + 550 40 71 23 @@ -1654,7 +1782,7 @@ subcontrol-position: center left; - 540 + 550 84 71 23 @@ -1669,9 +1797,9 @@ subcontrol-position: center left; 0 - 110 + 130 311 - 91 + 71 @@ -1707,82 +1835,6 @@ subcontrol-position: center left; - - - - 320 - 110 - 326 - 91 - - - - Debugmode - - - - - 120 - 30 - 120 - 23 - - - - Enabled - - - - - - 10 - 30 - 80 - 23 - - - - Disabled - - - true - - - - - - 10 - 56 - 21 - 31 - - - - <html><head/><body><p><img src=":/ico_info.png"/></p></body></html> - - - - - - 40 - 60 - 241 - 23 - - - - - true - - - - Debud Mode overrides dev mode! - - - true - - - @@ -1951,8 +2003,50 @@ subcontrol-position: center left; <html><head/><body><p align="justify"><img src=":/ico_warning.png"/></p></body></html> + + + + 320 + 130 + 326 + 71 + + + + Start Mode Openauto + + + + + 120 + 30 + 81 + 23 + + + + X11 + + + + + + 10 + 30 + 81 + 23 + + + + EGL + + + true + + + - + CS Env @@ -2675,13 +2769,13 @@ subcontrol-position: center left; <html><head/><body><p align="justify"><img src=":/ico_warning.png"/></p></body></html> - + - 230 + 325 250 - 416 - 61 + 321 + 91 @@ -3093,50 +3187,84 @@ subcontrol-position: center left; - + 0 250 - 221 - 61 + 321 + 91 - Start Mode Openauto + Debugmode - + 120 30 - 81 + 120 23 - X11 + Enabled - + 10 30 - 81 + 80 23 - EGL + Disabled true + + + + 10 + 56 + 21 + 31 + + + + <html><head/><body><p><img src=":/ico_info.png"/></p></body></html> + + + + + + 40 + 60 + 241 + 23 + + + + + true + + + + Debud Mode overrides dev mode! + + + true + + - + CS HW @@ -3352,7 +3480,7 @@ subcontrol-position: center left; - + 10 @@ -3403,7 +3531,7 @@ subcontrol-position: center left; 2 425 - 646 + 644 26