Commit suite au Fuck-Up de Windows

This commit is contained in:
2023-03-06 08:17:08 -05:00
parent ac4e5aeb93
commit 526f4f76d8
16 changed files with 471 additions and 29 deletions
+6
View File
@@ -18,6 +18,7 @@ CLoraSettingsGui::SetSettings(CSettings *settings)
{
ui->mLoraAddressSpinBx->setValue(settings->mChaletLoraAddress);
ui->mComportComboBox->setCurrentText(settings->mChaletComPort);
ui->mUseLoraIFCheckBx->setChecked(settings->mChaletUseLoraIF);
return RET_OK;
}
@@ -36,3 +37,8 @@ QString CLoraSettingsGui::GetChaletLoraComPort()
{
return ui->mComportComboBox->currentText();
}
bool CLoraSettingsGui::GetChaletUseLoraIF()
{
return ui->mUseLoraIFCheckBx->isChecked();
}
+1
View File
@@ -20,6 +20,7 @@ public:
QString GetChaletLoraComPort();
quint8 GetChaletLoraChannel();
quint16 GetChaletLoraAddress();
bool GetChaletUseLoraIF();
private:
Ui::CLoraSettingsGui *ui;
+13
View File
@@ -188,6 +188,19 @@
Chaloupe = 8</string>
</property>
</widget>
<widget class="QCheckBox" name="mUseLoraIFCheckBx">
<property name="geometry">
<rect>
<x>20</x>
<y>160</y>
<width>191</width>
<height>20</height>
</rect>
</property>
<property name="text">
<string>Use LoraInterface (restart needed)</string>
</property>
</widget>
</widget>
</widget>
<resources/>
+1
View File
@@ -235,6 +235,7 @@ void CSettingsWindow::DoneButtonClicked(bool checked)
Settings->mChaletComPort = mLoraSettingsPage->GetChaletLoraComPort();
Settings->mChaletLoraAddress = mLoraSettingsPage->GetChaletLoraAddress();
Settings->mChaletLoraChannel = mLoraSettingsPage->GetChaletLoraChannel();
Settings->mChaletUseLoraIF = mLoraSettingsPage->GetChaletUseLoraIF();
mProgramHandle->SaveSettings(Settings);
mProgramHandle->SettingsWindowClosed();