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

Support editing integer arrays in settings interface (font sizes)

Browse source
This commit is contained in:
Dan Paulat 2022-12-21 00:52:48 -06:00
parent b2dbcfefb0
commit 9b5b841903
4 changed files with 110 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -55,11 +55,12 @@ public:
SettingsDialog* self_;
settings::SettingsInterface<std::string> defaultRadarSite_ {};
settings::SettingsInterface<int64_t> gridWidth_ {};
settings::SettingsInterface<int64_t> gridHeight_ {};
settings::SettingsInterface<std::string> mapboxApiKey_ {};
settings::SettingsInterface<bool> debugEnabled_ {};
settings::SettingsInterface<std::string> defaultRadarSite_ {};
settings::SettingsInterface<std::vector<std::int64_t>> fontSizes_ {};
settings::SettingsInterface<std::int64_t> gridWidth_ {};
settings::SettingsInterface<std::int64_t> gridHeight_ {};
settings::SettingsInterface<std::string> mapboxApiKey_ {};
settings::SettingsInterface<bool> debugEnabled_ {};
std::unordered_map<std::string, settings::SettingsInterface<std::string>>
colorTables_ {};
@ -150,6 +151,10 @@ void SettingsDialogImpl::SetupGeneralTab()
defaultRadarSite_.SetEditWidget(self_->ui->radarSiteComboBox);
defaultRadarSite_.SetResetButton(self_->ui->resetRadarSiteButton);
fontSizes_.SetSettingsVariable(generalSettings.font_sizes());
fontSizes_.SetEditWidget(self_->ui->fontSizesLineEdit);
fontSizes_.SetResetButton(self_->ui->resetFontSizesButton);
gridWidth_.SetSettingsVariable(generalSettings.grid_width());
gridWidth_.SetEditWidget(self_->ui->gridWidthSpinBox);
gridWidth_.SetResetButton(self_->ui->resetGridWidthButton);

45
scwx-qt/source/scwx/qt/ui/settings_dialog.ui
View file

@ -116,17 +116,17 @@
</property>
</widget>
</item>
<item row="2" column="0">
<item row="3" column="0">
<widget class="QLabel" name="label_3">
<property name="text">
<string>Grid Height</string>
</property>
</widget>
</item>
<item row="2" column="1">
<item row="3" column="2">
<widget class="QSpinBox" name="gridHeightSpinBox"/>
</item>
<item row="1" column="2">
<item row="2" column="3">
<widget class="QToolButton" name="resetGridWidthButton">
<property name="text">
<string>...</string>
@ -137,10 +137,7 @@
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QLineEdit" name="mapboxApiKeyLineEdit"/>
</item>
<item row="3" column="2">
<item row="4" column="3">
<widget class="QToolButton" name="resetMapboxApiKeyButton">
<property name="text">
<string>...</string>
@ -151,7 +148,7 @@
</property>
</widget>
</item>
<item row="0" column="2">
<item row="0" column="3">
<widget class="QToolButton" name="resetRadarSiteButton">
<property name="text">
<string>...</string>
@ -162,13 +159,13 @@
</property>
</widget>
</item>
<item row="1" column="1">
<item row="2" column="2">
<widget class="QSpinBox" name="gridWidthSpinBox"/>
</item>
<item row="0" column="1">
<item row="0" column="2">
<widget class="QComboBox" name="radarSiteComboBox"/>
</item>
<item row="2" column="2">
<item row="3" column="3">
<widget class="QToolButton" name="resetGridHeightButton">
<property name="text">
<string>...</string>
@ -179,20 +176,44 @@
</property>
</widget>
</item>
<item row="3" column="0">
<item row="4" column="0">
<widget class="QLabel" name="label_4">
<property name="text">
<string>Mapbox API Key</string>
</property>
</widget>
</item>
<item row="4" column="2">
<widget class="QLineEdit" name="mapboxApiKeyLineEdit"/>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_5">
<property name="text">
<string>Font Sizes</string>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label_2">
<property name="text">
<string>Grid Width</string>
</property>
</widget>
</item>
<item row="1" column="2">
<widget class="QLineEdit" name="fontSizesLineEdit"/>
</item>
<item row="1" column="3">
<widget class="QToolButton" name="resetFontSizesButton">
<property name="text">
<string>...</string>
</property>
<property name="icon">
<iconset resource="../../../../scwx-qt.qrc">
<normaloff>:/res/icons/font-awesome-6/rotate-left-solid.svg</normaloff>:/res/icons/font-awesome-6/rotate-left-solid.svg</iconset>
</property>
</widget>
</item>
</layout>
</widget>
</item>