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

Move modified_widgets to widgets

Browse source
This commit is contained in:
AdenKoperczak 2025-05-24 17:52:45 -04:00
parent e78aca7377
commit 81b0402e8a
No known key found for this signature in database
GPG key ID: 9843017036F62EE7
6 changed files with 9 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

11
scwx-qt/scwx-qt.cmake
View file

@ -342,10 +342,6 @@ set(UI_UI source/scwx/qt/ui/about_dialog.ui
source/scwx/qt/ui/serial_port_dialog.ui source/scwx/qt/ui/serial_port_dialog.ui
source/scwx/qt/ui/update_dialog.ui source/scwx/qt/ui/update_dialog.ui
source/scwx/qt/ui/wfo_dialog.ui) source/scwx/qt/ui/wfo_dialog.ui)
set(HDR_UI_MODIFIED_WIDGETS
source/scwx/qt/ui/modified_widgets/focused_combo_box.hpp
source/scwx/qt/ui/modified_widgets/focused_double_spin_box.hpp
source/scwx/qt/ui/modified_widgets/focused_spin_box.hpp)
set(HDR_UI_SETTINGS source/scwx/qt/ui/settings/alert_palette_settings_widget.hpp set(HDR_UI_SETTINGS source/scwx/qt/ui/settings/alert_palette_settings_widget.hpp
source/scwx/qt/ui/settings/hotkey_settings_widget.hpp source/scwx/qt/ui/settings/hotkey_settings_widget.hpp
source/scwx/qt/ui/settings/settings_page_widget.hpp source/scwx/qt/ui/settings/settings_page_widget.hpp
@ -366,6 +362,9 @@ set(SRC_UI_SETUP source/scwx/qt/ui/setup/audio_codec_page.cpp
source/scwx/qt/ui/setup/map_provider_page.cpp source/scwx/qt/ui/setup/map_provider_page.cpp
source/scwx/qt/ui/setup/setup_wizard.cpp source/scwx/qt/ui/setup/setup_wizard.cpp
source/scwx/qt/ui/setup/welcome_page.cpp) source/scwx/qt/ui/setup/welcome_page.cpp)
set(HDR_UI_WIDGETS source/scwx/qt/ui/widgets/focused_combo_box.hpp
source/scwx/qt/ui/widgets/focused_double_spin_box.hpp
source/scwx/qt/ui/widgets/focused_spin_box.hpp)
set(HDR_UTIL source/scwx/qt/util/color.hpp set(HDR_UTIL source/scwx/qt/util/color.hpp
source/scwx/qt/util/file.hpp source/scwx/qt/util/file.hpp
source/scwx/qt/util/geographic_lib.hpp source/scwx/qt/util/geographic_lib.hpp
@ -473,11 +472,11 @@ set(PROJECT_SOURCES ${HDR_MAIN}
${HDR_UI} ${HDR_UI}
${SRC_UI} ${SRC_UI}
${UI_UI} ${UI_UI}
${HDR_UI_MODIFIED_WIDGETS}
${HDR_UI_SETTINGS} ${HDR_UI_SETTINGS}
${SRC_UI_SETTINGS} ${SRC_UI_SETTINGS}
${HDR_UI_SETUP} ${HDR_UI_SETUP}
${SRC_UI_SETUP} ${SRC_UI_SETUP}
${HDR_UI_WIDGETS}
${HDR_UTIL} ${HDR_UTIL}
${SRC_UTIL} ${SRC_UTIL}
${HDR_VIEW} ${HDR_VIEW}
@ -513,11 +512,11 @@ source_group("Header Files\\types" FILES ${HDR_TYPES})
source_group("Source Files\\types" FILES ${SRC_TYPES}) source_group("Source Files\\types" FILES ${SRC_TYPES})
source_group("Header Files\\ui" FILES ${HDR_UI}) source_group("Header Files\\ui" FILES ${HDR_UI})
source_group("Source Files\\ui" FILES ${SRC_UI}) source_group("Source Files\\ui" FILES ${SRC_UI})
source_group("Header Files\\ui\\modified_widgets" FILES ${HDR_UI_MODIFIED_WIDGETS})
source_group("Header Files\\ui\\settings" FILES ${HDR_UI_SETTINGS}) source_group("Header Files\\ui\\settings" FILES ${HDR_UI_SETTINGS})
source_group("Source Files\\ui\\settings" FILES ${SRC_UI_SETTINGS}) source_group("Source Files\\ui\\settings" FILES ${SRC_UI_SETTINGS})
source_group("Header Files\\ui\\setup" FILES ${HDR_UI_SETUP}) source_group("Header Files\\ui\\setup" FILES ${HDR_UI_SETUP})
source_group("Source Files\\ui\\setup" FILES ${SRC_UI_SETUP}) source_group("Source Files\\ui\\setup" FILES ${SRC_UI_SETUP})
source_group("Header Files\\ui\\widgets" FILES ${HDR_UI_WIDGETS})
source_group("UI Files\\ui" FILES ${UI_UI}) source_group("UI Files\\ui" FILES ${UI_UI})
source_group("Header Files\\util" FILES ${HDR_UTIL}) source_group("Header Files\\util" FILES ${HDR_UTIL})
source_group("Source Files\\util" FILES ${SRC_UTIL}) source_group("Source Files\\util" FILES ${SRC_UTIL})

2
scwx-qt/source/scwx/qt/ui/settings/unit_settings_widget.cpp
View file

@ -2,7 +2,7 @@
#include <scwx/qt/settings/settings_interface.hpp> #include <scwx/qt/settings/settings_interface.hpp>
#include <scwx/qt/settings/unit_settings.hpp> #include <scwx/qt/settings/unit_settings.hpp>
#include <scwx/qt/types/unit_types.hpp> #include <scwx/qt/types/unit_types.hpp>
#include <scwx/qt/ui/modified_widgets/focused_combo_box.hpp> #include <scwx/qt/ui/widgets/focused_combo_box.hpp>
#include <boost/algorithm/string.hpp> #include <boost/algorithm/string.hpp>
#include <boost/unordered/unordered_flat_map.hpp> #include <boost/unordered/unordered_flat_map.hpp>

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

@ -1517,17 +1517,17 @@
<customwidget> <customwidget>
<class>QFocusedDoubleSpinBox</class> <class>QFocusedDoubleSpinBox</class>
<extends>QDoubleSpinBox</extends> <extends>QDoubleSpinBox</extends>
<header>scwx/qt/ui/modified_widgets/focused_double_spin_box.hpp</header> <header>scwx/qt/ui/widgets/focused_double_spin_box.hpp</header>
</customwidget> </customwidget>
<customwidget> <customwidget>
<class>QFocusedSpinBox</class> <class>QFocusedSpinBox</class>
<extends>QSpinBox</extends> <extends>QSpinBox</extends>
<header>scwx/qt/ui/modified_widgets/focused_spin_box.hpp</header> <header>scwx/qt/ui/widgets/focused_spin_box.hpp</header>
</customwidget> </customwidget>
<customwidget> <customwidget>
<class>QFocusedComboBox</class> <class>QFocusedComboBox</class>
<extends>QComboBox</extends> <extends>QComboBox</extends>
<header>scwx/qt/ui/modified_widgets/focused_combo_box.hpp</header> <header>scwx/qt/ui/widgets/focused_combo_box.hpp</header>
</customwidget> </customwidget>
</customwidgets> </customwidgets>
<resources> <resources>

0
scwx-qt/source/scwx/qt/ui/modified_widgets/focused_combo_box.hpp → scwx-qt/source/scwx/qt/ui/widgets/focused_combo_box.hpp
View file

0
scwx-qt/source/scwx/qt/ui/modified_widgets/focused_double_spin_box.hpp → scwx-qt/source/scwx/qt/ui/widgets/focused_double_spin_box.hpp
View file

0
scwx-qt/source/scwx/qt/ui/modified_widgets/focused_spin_box.hpp → scwx-qt/source/scwx/qt/ui/widgets/focused_spin_box.hpp
View file