Skip to content

Commit db4f9e4

Browse files
authored
QTFred: Ship Editor Modernization 2 Part 2 (#7026)
* Switch to using signals/slots rather than connect * Adds coloured persona box Adds coloured persona box/ fixes persona loading, and reduces amount of data reset on model change * Update To new flags widget Updates To new flags widget this reqires moving several non flag items to other dialogs, which also lead to adding a new feature that lets a custom guardian threshold be set in editor * Switch to size_t * Make Mission Spec work with changes to Flaglist * Remove Duplicate member * Clang Appeasement * Make static * Properly initialise guardian threshold * Convert Player Orders dialog to Checklist box Unfortunately also formats Shipeditordialogmodel * Update Custom warp to modern style * Update Initial status to modern style * Missed a file * Update Ship Flags Closing * Remove QT Code from model * Update Ship Goals Closing * Update Special Stats Closing * Minor Changes * Replace Paths Dialog With generic checkbox dialog * Update Texture Replace to modern style * Cast to int * Initialize then append * Clang Fixes * Two didn't save * More Clang * Tighten NOLINT's * Remove dead code * Change to built in buttons
1 parent a3691ed commit db4f9e4

37 files changed

+2743
-3298
lines changed

code/mission/missionparse.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3537,8 +3537,8 @@ int parse_object(mission *pm, int /*flag*/, p_object *p_objp)
35373537
stuff_int(&p_objp->escort_priority);
35383538
}
35393539

3540-
if (optional_string("+Guardian Threshold:")) {
3541-
3540+
if (optional_string("+Guardian Threshold:"))
3541+
{
35423542
stuff_int(&p_objp->ship_guardian_threshold);
35433543
} else {
35443544
if (p_objp->flags[Mission::Parse_Object_Flags::SF_Guardian]) {

qtfred/source_groups.cmake

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,6 @@ add_file_folder("Source/Mission/Dialogs/ShipEditor"
110110
src/mission/dialogs/ShipEditor/ShipGoalsDialogModel.cpp
111111
src/mission/dialogs/ShipEditor/ShipFlagsDialogModel.cpp
112112
src/mission/dialogs/ShipEditor/ShipFlagsDialogModel.h
113-
src/mission/dialogs/ShipEditor/PlayerOrdersDialogModel.h
114-
src/mission/dialogs/ShipEditor/PlayerOrdersDialogModel.cpp
115113
src/mission/dialogs/ShipEditor/ShipSpecialStatsDialogModel.h
116114
src/mission/dialogs/ShipEditor/ShipSpecialStatsDialogModel.cpp
117115
src/mission/dialogs/ShipEditor/ShipTextureReplacementDialogModel.h
@@ -122,8 +120,6 @@ add_file_folder("Source/Mission/Dialogs/ShipEditor"
122120
src/mission/dialogs/ShipEditor/ShipWeaponsDialogModel.h
123121
src/mission/dialogs/ShipEditor/WeaponsTBLViewerModel.cpp
124122
src/mission/dialogs/ShipEditor/WeaponsTBLViewerModel.h
125-
src/mission/dialogs/ShipEditor/ShipPathsDialogModel.cpp
126-
src/mission/dialogs/ShipEditor/ShipPathsDialogModel.h
127123
src/mission/dialogs/ShipEditor/ShipCustomWarpDialogModel.h
128124
src/mission/dialogs/ShipEditor/ShipCustomWarpDialogModel.cpp
129125
src/mission/dialogs/ShipEditor/ShipAltShipClassModel.h
@@ -212,8 +208,6 @@ add_file_folder("Source/UI/Dialogs/ShipEditor"
212208
src/ui/dialogs/ShipEditor/ShipGoalsDialog.h
213209
src/ui/dialogs/ShipEditor/ShipFlagsDialog.h
214210
src/ui/dialogs/ShipEditor/ShipFlagsDialog.cpp
215-
src/ui/dialogs/ShipEditor/PlayerOrdersDialog.h
216-
src/ui/dialogs/ShipEditor/PlayerOrdersDialog.cpp
217211
src/ui/dialogs/ShipEditor/ShipSpecialStatsDialog.cpp
218212
src/ui/dialogs/ShipEditor/ShipSpecialStatsDialog.h
219213
src/ui/dialogs/ShipEditor/ShipTextureReplacementDialog.h
@@ -224,8 +218,6 @@ add_file_folder("Source/UI/Dialogs/ShipEditor"
224218
src/ui/dialogs/ShipEditor/ShipWeaponsDialog.h
225219
src/ui/dialogs/ShipEditor/BankModel.cpp
226220
src/ui/dialogs/ShipEditor/BankModel.h
227-
src/ui/dialogs/ShipEditor/ShipPathsDialog.h
228-
src/ui/dialogs/ShipEditor/ShipPathsDialog.cpp
229221
src/ui/dialogs/ShipEditor/ShipCustomWarpDialog.h
230222
src/ui/dialogs/ShipEditor/ShipCustomWarpDialog.cpp
231223
src/ui/dialogs/ShipEditor/ShipAltShipClass.h
@@ -308,10 +300,8 @@ add_file_folder("UI"
308300
ui/ShipGoalsDialog.ui
309301
ui/ShipSpecialStatsDialog.ui
310302
ui/ShipFlagsDialog.ui
311-
ui/PlayerOrdersDialog.ui
312303
ui/ShipTextureReplacementDialog.ui
313304
ui/ShipTBLViewer.ui
314-
ui/ShipPathsDialog.ui
315305
ui/ShipCustomWarpDialog.ui
316306
ui/ShipAltShipClass.ui
317307
ui/ShipWeaponsDialog.ui

qtfred/src/mission/dialogs/ShipEditor/PlayerOrdersDialogModel.cpp

Lines changed: 0 additions & 156 deletions
This file was deleted.

qtfred/src/mission/dialogs/ShipEditor/PlayerOrdersDialogModel.h

Lines changed: 0 additions & 34 deletions
This file was deleted.

0 commit comments

Comments
 (0)