mirror
/
wfview
kopia lustrzana https://gitlab.com/eliggett/wfview
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Few small fixes and add settings confirm save.

translations
Phil Taylor 2024-05-04 23:40:34 +01:00
rodzic 7bd35772dc
commit c5b8ef93a4
4 zmienionych plików z 97 dodań i 37 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

1
prefs.h
Wyświetl plik

@ -186,6 +186,7 @@ struct preferences {
QString stylesheetPath;
bool confirmExit;
bool confirmPowerOff;
bool confirmSettingsChanged;
meter_t meter2Type;
meter_t meter3Type;
bool compMeterReverse = false;

24
settingswidget.cpp
Wyświetl plik

@ -1137,6 +1137,30 @@ void settingswidget::updateAllPrefs()
updatingUIFromPrefs = false;
}
void settingswidget::hideModSource(uchar num)
{
QComboBox* combo;
switch (num)
{
case 0:
combo = ui->modInputCombo;
break;
case 1:
combo = ui->modInputData1Combo;
break;
case 2:
combo = ui->modInputData2Combo;
ui->modInputData2ComboText->setVisible(false);
break;
case 3:
combo = ui->modInputData3Combo;
ui->modInputData3ComboText->setVisible(false);
break;
default:
return;
}
combo->setVisible(false);
}
void settingswidget::updateModSourceList(uchar num, QVector<rigInput> data)
{

1
settingswidget.h
Wyświetl plik

@ -67,6 +67,7 @@ public slots:
void updateModSourceList(uchar num, QVector<rigInput> data);
void hideModSource(uchar num);
void setAudioDevicesUI();
void connectionStatus(bool conn);

108
wfmain.cpp
Wyświetl plik

@ -1542,6 +1542,7 @@ void wfmain::setDefPrefs()
defPrefs.scopeScrollY = 120;
defPrefs.confirmExit = true;
defPrefs.confirmPowerOff = true;
defPrefs.confirmSettingsChanged = true;
defPrefs.meter2Type = meterNone;
defPrefs.meter3Type = meterNone;
defPrefs.compMeterReverse = false;
@ -1618,6 +1619,7 @@ void wfmain::loadSettings()
setWindowState(Qt::WindowActive); // Works around QT bug to returns window+keyboard focus.
prefs.confirmExit = settings->value("ConfirmExit", defPrefs.confirmExit).toBool();
prefs.confirmPowerOff = settings->value("ConfirmPowerOff", defPrefs.confirmPowerOff).toBool();
prefs.confirmSettingsChanged = settings->value("ConfirmSettingsChanged", defPrefs.confirmSettingsChanged).toBool();
prefs.meter2Type = static_cast<meter_t>(settings->value("Meter2Type", defPrefs.meter2Type).toInt());
prefs.meter3Type = static_cast<meter_t>(settings->value("Meter3Type", defPrefs.meter3Type).toInt());
prefs.compMeterReverse = settings->value("compMeterReverse", defPrefs.compMeterReverse).toBool();
@ -2798,6 +2800,7 @@ void wfmain::saveSettings()
settings->setValue("SubWFLength", prefs.subWflength);
settings->setValue("ConfirmExit", prefs.confirmExit);
settings->setValue("ConfirmPowerOff", prefs.confirmPowerOff);
settings->setValue("ConfirmSettingsChanged", prefs.confirmSettingsChanged);
settings->setValue("Meter2Type", (int)prefs.meter2Type);
settings->setValue("Meter3Type", (int)prefs.meter3Type);
settings->setValue("compMeterReverse", prefs.compMeterReverse);
@ -4004,53 +4007,78 @@ void wfmain::on_tuneEnableChk_clicked(bool checked)
bool wfmain::on_exitBtn_clicked()
{
bool ret=false;
if (prefs.settingsChanged)
if (prefs.settingsChanged && prefs.confirmSettingsChanged)
{
// Settings have changed since last save
qInfo() << "Settings have changed since last save";
int reply = QMessageBox::question(this,"wfview","Settings have changed since last save, exit anyway?",QMessageBox::Save | QMessageBox::No |QMessageBox::Yes);
if (reply == QMessageBox::Save)
{
QCheckBox *cb = new QCheckBox("Don't ask me again");
cb->setToolTip("Don't ask me to confirm exit again");
QMessageBox msgbox;
msgbox.setText("Settings have changed since last save, exit anyway?\n");
msgbox.setIcon(QMessageBox::Icon::Question);
QAbstractButton *yesButton = msgbox.addButton(QMessageBox::Yes);
QAbstractButton *saveButton = msgbox.addButton(QMessageBox::Save);
msgbox.addButton(QMessageBox::No);
msgbox.setDefaultButton(QMessageBox::Yes);
msgbox.setCheckBox(cb);
QObject::connect(cb, &QCheckBox::stateChanged, this, [this](int state){
if (static_cast<Qt::CheckState>(state) == Qt::CheckState::Checked) {
prefs.confirmSettingsChanged=false;
} else {
prefs.confirmSettingsChanged=true;
}
settings->beginGroup("Interface");
settings->setValue("ConfirmSettingsChanged", this->prefs.confirmSettingsChanged);
settings->endGroup();
settings->sync();
});
msgbox.exec();
delete cb;
if (msgbox.clickedButton() == yesButton) {
QApplication::exit();
} else if (msgbox.clickedButton() == saveButton) {
saveSettings();
} else if (reply == QMessageBox::No)
{
} else {
return true;
}
}
// Are you sure?
if (!prefs.confirmExit) {
QApplication::exit();
}
QCheckBox *cb = new QCheckBox("Don't ask me again");
cb->setToolTip("Don't ask me to confirm exit again");
QMessageBox msgbox;
msgbox.setText("Are you sure you wish to exit?\n");
msgbox.setIcon(QMessageBox::Icon::Question);
QAbstractButton *yesButton = msgbox.addButton(QMessageBox::Yes);
msgbox.addButton(QMessageBox::No);
msgbox.setDefaultButton(QMessageBox::Yes);
msgbox.setCheckBox(cb);
QObject::connect(cb, &QCheckBox::stateChanged, this, [this](int state){
if (static_cast<Qt::CheckState>(state) == Qt::CheckState::Checked) {
prefs.confirmExit=false;
} else {
prefs.confirmExit=true;
}
settings->beginGroup("Interface");
settings->setValue("ConfirmExit", this->prefs.confirmExit);
settings->endGroup();
settings->sync();
});
msgbox.exec();
delete cb;
if (msgbox.clickedButton() == yesButton) {
QApplication::exit();
} else {
ret=true;
QCheckBox *cb = new QCheckBox("Don't ask me again");
cb->setToolTip("Don't ask me to confirm exit again");
QMessageBox msgbox;
msgbox.setText("Are you sure you wish to exit?\n");
msgbox.setIcon(QMessageBox::Icon::Question);
QAbstractButton *yesButton = msgbox.addButton(QMessageBox::Yes);
msgbox.addButton(QMessageBox::No);
msgbox.setDefaultButton(QMessageBox::Yes);
msgbox.setCheckBox(cb);
QObject::connect(cb, &QCheckBox::stateChanged, this, [this](int state){
if (static_cast<Qt::CheckState>(state) == Qt::CheckState::Checked) {
prefs.confirmExit=false;
} else {
prefs.confirmExit=true;
}
settings->beginGroup("Interface");
settings->setValue("ConfirmExit", this->prefs.confirmExit);
settings->endGroup();
settings->sync();
});
msgbox.exec();
delete cb;
if (msgbox.clickedButton() == yesButton) {
QApplication::exit();
} else {
ret=true;
}
}
return ret;
}
@ -5798,6 +5826,8 @@ void wfmain::receiveRigCaps(rigCapabilities* caps)
{
receiver->addData("Data On", 2);
}
} else {
setupui->hideModSource(1);
}
if (rigCaps->commands.contains(funcDATA2Mod))
@ -5805,12 +5835,16 @@ void wfmain::receiveRigCaps(rigCapabilities* caps)
setupui->updateModSourceList(2, rigCaps->inputs);
receiver->addData("Data 1", 2);
receiver->addData("Data 2", 2);
} else {
setupui->hideModSource(2);
}
if (rigCaps->commands.contains(funcDATA3Mod))
{
setupui->updateModSourceList(3, rigCaps->inputs);
receiver->addData("Data 3", 3);
} else {
setupui->hideModSource(3);
}
receiver->clearSpans();