blakeridgway/supercell-wx
1
0
Fork 0
mirror of https://github.com/ciphervance/supercell-wx.git synced 2025-10-31 08:50:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Settings dialog formatting

Browse source
This commit is contained in:
Dan Paulat 2024-09-21 23:39:51 -05:00
parent 928b3397d2
commit 6063de2095
1 changed files with 28 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

71
scwx-qt/source/scwx/qt/ui/settings_dialog.cpp
View file

@ -23,12 +23,12 @@
#include <scwx/qt/types/time_types.hpp> #include <scwx/qt/types/time_types.hpp>
#include <scwx/qt/types/unit_types.hpp> #include <scwx/qt/types/unit_types.hpp>
#include <scwx/qt/ui/county_dialog.hpp> #include <scwx/qt/ui/county_dialog.hpp>
#include <scwx/qt/ui/wfo_dialog.hpp>
#include <scwx/qt/ui/radar_site_dialog.hpp> #include <scwx/qt/ui/radar_site_dialog.hpp>
#include <scwx/qt/ui/serial_port_dialog.hpp> #include <scwx/qt/ui/serial_port_dialog.hpp>
#include <scwx/qt/ui/settings/alert_palette_settings_widget.hpp> #include <scwx/qt/ui/settings/alert_palette_settings_widget.hpp>
#include <scwx/qt/ui/settings/hotkey_settings_widget.hpp> #include <scwx/qt/ui/settings/hotkey_settings_widget.hpp>
#include <scwx/qt/ui/settings/unit_settings_widget.hpp> #include <scwx/qt/ui/settings/unit_settings_widget.hpp>
#include <scwx/qt/ui/wfo_dialog.hpp>
#include <scwx/qt/util/color.hpp> #include <scwx/qt/util/color.hpp>
#include <scwx/qt/util/file.hpp> #include <scwx/qt/util/file.hpp>
#include <scwx/util/logger.hpp> #include <scwx/util/logger.hpp>
@ -360,24 +360,23 @@ void SettingsDialogImpl::ConnectSignals()
self_, self_,
[this]() { alertAudioRadarSiteDialog_->show(); }); [this]() { alertAudioRadarSiteDialog_->show(); });
QObject::connect(alertAudioRadarSiteDialog_, QObject::connect(
&RadarSiteDialog::accepted, alertAudioRadarSiteDialog_,
self_, &RadarSiteDialog::accepted,
[this]() self_,
{ [this]()
std::string id = {
alertAudioRadarSiteDialog_->radar_site(); std::string id = alertAudioRadarSiteDialog_->radar_site();
std::shared_ptr<config::RadarSite> radarSite = std::shared_ptr<config::RadarSite> radarSite =
config::RadarSite::Get(id); config::RadarSite::Get(id);
if (radarSite != nullptr) if (radarSite != nullptr)
{ {
self_->ui->alertAudioRadarSiteComboBox self_->ui->alertAudioRadarSiteComboBox->setCurrentText(
->setCurrentText(QString::fromStdString( QString::fromStdString(RadarSiteLabel(radarSite)));
RadarSiteLabel(radarSite))); }
} });
});
QObject::connect(self_->ui->gpsSourceSelectButton, QObject::connect(self_->ui->gpsSourceSelectButton,
&QAbstractButton::clicked, &QAbstractButton::clicked,
@ -923,13 +922,11 @@ void SettingsDialogImpl::SetupPalettesAlertsTab()
QObject::connect(activeButton, QObject::connect(activeButton,
&QAbstractButton::clicked, &QAbstractButton::clicked,
self_, self_,
[=, this]() [=, this]() { ShowColorDialog(activeEdit); });
{ ShowColorDialog(activeEdit); });
QObject::connect(inactiveButton, QObject::connect(inactiveButton,
&QAbstractButton::clicked, &QAbstractButton::clicked,
self_, self_,
[=, this]() [=, this]() { ShowColorDialog(inactiveEdit); });
{ ShowColorDialog(inactiveEdit); });
} }
} }
@ -964,8 +961,7 @@ void SettingsDialogImpl::SetupAudioTab()
locationMethod == types::LocationMethod::RadarSite; locationMethod == types::LocationMethod::RadarSite;
bool countyEntryEnabled = bool countyEntryEnabled =
locationMethod == types::LocationMethod::County; locationMethod == types::LocationMethod::County;
bool wfoEntryEnabled = bool wfoEntryEnabled = locationMethod == types::LocationMethod::WFO;
locationMethod == types::LocationMethod::WFO;
self_->ui->alertAudioLatitudeSpinBox->setEnabled( self_->ui->alertAudioLatitudeSpinBox->setEnabled(
coordinateEntryEnabled); coordinateEntryEnabled);
@ -983,10 +979,8 @@ void SettingsDialogImpl::SetupAudioTab()
self_->ui->resetAlertAudioRadarSiteButton->setEnabled( self_->ui->resetAlertAudioRadarSiteButton->setEnabled(
radarSiteEntryEnable); radarSiteEntryEnable);
self_->ui->alertAudioRadiusSpinBox->setEnabled( self_->ui->alertAudioRadiusSpinBox->setEnabled(radiusEntryEnable);
radiusEntryEnable); self_->ui->resetAlertAudioRadiusButton->setEnabled(radiusEntryEnable);
self_->ui->resetAlertAudioRadiusButton->setEnabled(
radiusEntryEnable);
self_->ui->alertAudioCountyLineEdit->setEnabled(countyEntryEnabled); self_->ui->alertAudioCountyLineEdit->setEnabled(countyEntryEnabled);
self_->ui->alertAudioCountySelectButton->setEnabled( self_->ui->alertAudioCountySelectButton->setEnabled(
@ -1102,8 +1096,7 @@ void SettingsDialogImpl::SetupAudioTab()
alertAudioRadius_.SetSettingsVariable(audioSettings.alert_radius()); alertAudioRadius_.SetSettingsVariable(audioSettings.alert_radius());
alertAudioRadius_.SetEditWidget(self_->ui->alertAudioRadiusSpinBox); alertAudioRadius_.SetEditWidget(self_->ui->alertAudioRadiusSpinBox);
alertAudioRadius_.SetResetButton( alertAudioRadius_.SetResetButton(self_->ui->resetAlertAudioRadiusButton);
self_->ui->resetAlertAudioRadiusButton);
alertAudioRadius_.SetUnitLabel(self_->ui->alertAudioRadiusUnitsLabel); alertAudioRadius_.SetUnitLabel(self_->ui->alertAudioRadiusUnitsLabel);
auto alertAudioRadiusUpdateUnits = [this](const std::string& newValue) auto alertAudioRadiusUpdateUnits = [this](const std::string& newValue)
{ {
@ -1217,14 +1210,10 @@ void SettingsDialogImpl::SetupAudioTab()
alertAudioCounty_.SetEditWidget(self_->ui->alertAudioCountyLineEdit); alertAudioCounty_.SetEditWidget(self_->ui->alertAudioCountyLineEdit);
alertAudioCounty_.SetResetButton(self_->ui->resetAlertAudioCountyButton); alertAudioCounty_.SetResetButton(self_->ui->resetAlertAudioCountyButton);
QObject::connect( QObject::connect(self_->ui->alertAudioWFOSelectButton,
self_->ui->alertAudioWFOSelectButton, &QAbstractButton::clicked,
&QAbstractButton::clicked, self_,
self_, [this]() { wfoDialog_->show(); });
[this]()
{
wfoDialog_->show();
});
QObject::connect(wfoDialog_, QObject::connect(wfoDialog_,
&WFODialog::accepted, &WFODialog::accepted,
self_, self_,
@ -1243,9 +1232,8 @@ void SettingsDialogImpl::SetupAudioTab()
self_, self_,
[this](const QString& text) [this](const QString& text)
{ {
std::string wfoName = std::string wfoName = config::CountyDatabase::GetWFOName(
config::CountyDatabase::GetWFOName( text.toStdString());
text.toStdString());
self_->ui->alertAudioWFOLabel->setText( self_->ui->alertAudioWFOLabel->setText(
QString::fromStdString(wfoName)); QString::fromStdString(wfoName));
}); });
@ -1253,7 +1241,6 @@ void SettingsDialogImpl::SetupAudioTab()
alertAudioWFO_.SetSettingsVariable(audioSettings.alert_wfo()); alertAudioWFO_.SetSettingsVariable(audioSettings.alert_wfo());
alertAudioWFO_.SetEditWidget(self_->ui->alertAudioWFOLineEdit); alertAudioWFO_.SetEditWidget(self_->ui->alertAudioWFOLineEdit);
alertAudioWFO_.SetResetButton(self_->ui->resetAlertAudioWFOButton); alertAudioWFO_.SetResetButton(self_->ui->resetAlertAudioWFOButton);
} }
void SettingsDialogImpl::SetupTextTab() void SettingsDialogImpl::SetupTextTab()
@ -1455,8 +1442,6 @@ void SettingsDialogImpl::UpdateAlertRadarDialogLocation(const std::string& id)
} }
} }
QFont SettingsDialogImpl::GetSelectedFont() QFont SettingsDialogImpl::GetSelectedFont()
{ {
std::string fontFamily = fontFamilies_.at(selectedFontCategory_) std::string fontFamily = fontFamilies_.at(selectedFontCategory_)