Skip to content

Commit 8ee9678

Browse files
authored
QtFRED Team Loadout Dialog (#7016)
* unify naming and some ui cleanup * sidetracked by a typo * another sidetrack * show team list as dropdown like other dialogs * This is a mess * cleanup model init and apply * tweaks * clear string vars * validate variables * some cleanup * refactor data model * finish the model and begin the ui * start getting the ship list working * fix multi select issues * activate all 4 lists * activate teams, filters, selection stuff * fixes * clang * one more cleanup
1 parent 58ff297 commit 8ee9678

26 files changed

+3237
-3069
lines changed
2.22 KB
Loading
2.2 KB
Loading
67 Bytes
Loading

qtfred/resources/resources.qrc

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
<RCC>
22
<qresource prefix="/">
3+
<file>images/arrow_left.png</file>
4+
<file>images/arrow_right.png</file>
5+
<file>images/next.png</file>
6+
<file>images/prev.png</file>
7+
<file>images/stop.png</file>
38
<file>images/arrow_down.png</file>
49
<file>images/arrow_up.png</file>
510
<file>images/next.bmp</file>

qtfred/source_groups.cmake

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,6 @@ add_file_folder("Source/Mission/Dialogs"
5656
src/mission/dialogs/GlobalShipFlagsDialogModel.h
5757
src/mission/dialogs/JumpNodeEditorDialogModel.cpp
5858
src/mission/dialogs/JumpNodeEditorDialogModel.h
59-
src/mission/dialogs/LoadoutEditorDialogModel.cpp
60-
src/mission/dialogs/LoadoutEditorDialogModel.h
6159
src/mission/dialogs/MissionCutscenesDialogModel.cpp
6260
src/mission/dialogs/MissionCutscenesDialogModel.h
6361
src/mission/dialogs/MissionEventsDialogModel.cpp
@@ -80,6 +78,8 @@ add_file_folder("Source/Mission/Dialogs"
8078
src/mission/dialogs/SelectionDialogModel.h
8179
src/mission/dialogs/ShieldSystemDialogModel.cpp
8280
src/mission/dialogs/ShieldSystemDialogModel.h
81+
src/mission/dialogs/TeamLoadoutDialogModel.cpp
82+
src/mission/dialogs/TeamLoadoutDialogModel.h
8383
src/mission/dialogs/VariableDialogModel.cpp
8484
src/mission/dialogs/VariableDialogModel.h
8585
src/mission/dialogs/VoiceActingManagerModel.h
@@ -158,8 +158,6 @@ add_file_folder("Source/UI/Dialogs"
158158
src/ui/dialogs/GlobalShipFlagsDialog.h
159159
src/ui/dialogs/JumpNodeEditorDialog.cpp
160160
src/ui/dialogs/JumpNodeEditorDialog.h
161-
src/ui/dialogs/LoadoutDialog.cpp
162-
src/ui/dialogs/LoadoutDialog.h
163161
src/ui/dialogs/MissionCutscenesDialog.cpp
164162
src/ui/dialogs/MissionCutscenesDialog.h
165163
src/ui/dialogs/MissionEventsDialog.cpp
@@ -182,6 +180,8 @@ add_file_folder("Source/UI/Dialogs"
182180
src/ui/dialogs/SelectionDialog.h
183181
src/ui/dialogs/ShieldSystemDialog.h
184182
src/ui/dialogs/ShieldSystemDialog.cpp
183+
src/ui/dialogs/TeamLoadoutDialog.cpp
184+
src/ui/dialogs/TeamLoadoutDialog.h
185185
src/ui/dialogs/VariableDialog.cpp
186186
src/ui/dialogs/VariableDialog.h
187187
src/ui/dialogs/VoiceActingManager.h
@@ -254,6 +254,10 @@ add_file_folder("Source/UI/Widgets"
254254
src/ui/widgets/ColorComboBox.h
255255
src/ui/widgets/FlagList.cpp
256256
src/ui/widgets/FlagList.h
257+
src/ui/widgets/NoWheelComboBox.cpp
258+
src/ui/widgets/NoWheelComboBox.h
259+
src/ui/widgets/NoWheelSpinBox.cpp
260+
src/ui/widgets/NoWheelSpinBox.h
257261
src/ui/widgets/renderwidget.cpp
258262
src/ui/widgets/renderwidget.h
259263
src/ui/widgets/sexp_tree.cpp
@@ -284,7 +288,7 @@ add_file_folder("UI"
284288
ui/FredView.ui
285289
ui/GlobalShipFlagsDialog.ui
286290
ui/JumpNodeEditorDialog.ui
287-
ui/LoadoutDialog.ui
291+
ui/TeamLoadoutDialog.ui
288292
ui/MissionCutscenesDialog.ui
289293
ui/MissionEventsDialog.ui
290294
ui/MissionGoalsDialog.ui
@@ -327,6 +331,10 @@ if (WIN32)
327331
endif()
328332

329333
add_file_folder("Resources/Images"
334+
resources/images/arrow_down.png
335+
resources/images/arrow_left.png
336+
resources/images/arrow_right.png
337+
resources/images/arrow_up.png
330338
resources/images/bitmap1.png
331339
resources/images/black_do.png
332340
resources/images/bmp00001.png

0 commit comments

Comments
 (0)