blakeridgway/supercell-wx
1
0
Fork 0
mirror of https://github.com/ciphervance/supercell-wx.git synced 2025-11-02 16:30:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add alert palette settings widget to settings dialog

Browse source
This commit is contained in:
Dan Paulat 2024-09-21 23:39:32 -05:00
parent 6b0aaea773
commit 928b3397d2
2 changed files with 22 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -26,6 +26,7 @@
#include <scwx/qt/ui/wfo_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/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/util/color.hpp> #include <scwx/qt/util/color.hpp>
@ -224,6 +225,7 @@ public:
manager::PositionManager::Instance()}; manager::PositionManager::Instance()};
std::vector<SettingsPageWidget*> settingsPages_ {}; std::vector<SettingsPageWidget*> settingsPages_ {};
AlertPaletteSettingsWidget* alertPaletteSettingsWidget_ {};
HotkeySettingsWidget* hotkeySettingsWidget_ {}; HotkeySettingsWidget* hotkeySettingsWidget_ {};
UnitSettingsWidget* unitSettingsWidget_ {}; UnitSettingsWidget* unitSettingsWidget_ {};
@ -807,6 +809,15 @@ void SettingsDialogImpl::SetupPalettesAlertsTab()
settings::PaletteSettings::Instance(); settings::PaletteSettings::Instance();
// Palettes > Alerts // Palettes > Alerts
QVBoxLayout* layout = new QVBoxLayout(self_->ui->alertsPalette);
alertPaletteSettingsWidget_ =
new AlertPaletteSettingsWidget(self_->ui->hotkeys);
layout->addWidget(alertPaletteSettingsWidget_);
settingsPages_.push_back(alertPaletteSettingsWidget_);
// Palettes > Old Alerts
QGridLayout* alertsLayout = QGridLayout* alertsLayout =
reinterpret_cast<QGridLayout*>(self_->ui->alertsFrame->layout()); reinterpret_cast<QGridLayout*>(self_->ui->alertsFrame->layout());

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

@ -122,7 +122,7 @@
</sizepolicy> </sizepolicy>
</property> </property>
<property name="currentIndex"> <property name="currentIndex">
<number>3</number> <number>0</number>
</property> </property>
<widget class="QWidget" name="general"> <widget class="QWidget" name="general">
<layout class="QVBoxLayout" name="verticalLayout_2"> <layout class="QVBoxLayout" name="verticalLayout_2">
@ -136,8 +136,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>274</width> <width>513</width>
<height>691</height> <height>622</height>
</rect> </rect>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QVBoxLayout" name="verticalLayout">
@ -610,8 +610,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>98</width> <width>506</width>
<height>28</height> <height>383</height>
</rect> </rect>
</property> </property>
<layout class="QGridLayout" name="gridLayout_3"> <layout class="QGridLayout" name="gridLayout_3">
@ -634,10 +634,15 @@
</item> </item>
</layout> </layout>
</widget> </widget>
<widget class="QWidget" name="tab_2"> <widget class="QWidget" name="alertsPalette">
<attribute name="title"> <attribute name="title">
<string>Alerts</string> <string>Alerts</string>
</attribute> </attribute>
</widget>
<widget class="QWidget" name="tab_2">
<attribute name="title">
<string>Old Alerts</string>
</attribute>
<layout class="QVBoxLayout" name="verticalLayout_3"> <layout class="QVBoxLayout" name="verticalLayout_3">
<item> <item>
<widget class="QFrame" name="alertsFrame"> <widget class="QFrame" name="alertsFrame">