Qtfred general table viewer dialog (#7344)

* qtfred reusable table viewer dialog

* better error messages

char

Author: MjnMixael

qtfred/source_groups.cmake

@@ -70,8 +70,6 @@ add_file_folder("Source/Mission/Dialogs"
 	src/mission/dialogs/MissionSpecDialogModel.h
 	src/mission/dialogs/MusicPlayerDialogModel.cpp
 	src/mission/dialogs/MusicPlayerDialogModel.h
-	src/mission/dialogs/MusicTBLViewerModel.cpp
-	src/mission/dialogs/MusicTBLViewerModel.h
 	src/mission/dialogs/ObjectOrientEditorDialogModel.cpp
 	src/mission/dialogs/ObjectOrientEditorDialogModel.h
 	src/mission/dialogs/PropEditorDialogModel.cpp
@@ -86,6 +84,8 @@ add_file_folder("Source/Mission/Dialogs"
 	src/mission/dialogs/ShieldSystemDialogModel.h
 	src/mission/dialogs/TeamLoadoutDialogModel.cpp
 	src/mission/dialogs/TeamLoadoutDialogModel.h
+	src/mission/dialogs/TableViewerModel.cpp
+	src/mission/dialogs/TableViewerModel.h
 	src/mission/dialogs/VariableDialogModel.cpp
 	src/mission/dialogs/VariableDialogModel.h
 	src/mission/dialogs/VoiceActingManagerModel.h
@@ -120,12 +120,8 @@ add_file_folder("Source/Mission/Dialogs/ShipEditor"
 	src/mission/dialogs/ShipEditor/ShipSpecialStatsDialogModel.cpp
 	src/mission/dialogs/ShipEditor/ShipTextureReplacementDialogModel.h
 	src/mission/dialogs/ShipEditor/ShipTextureReplacementDialogModel.cpp
-	src/mission/dialogs/ShipEditor/ShipTBLViewerModel.cpp
-	src/mission/dialogs/ShipEditor/ShipTBLViewerModel.h
 	src/mission/dialogs/ShipEditor/ShipWeaponsDialogModel.cpp
 	src/mission/dialogs/ShipEditor/ShipWeaponsDialogModel.h
-	src/mission/dialogs/ShipEditor/WeaponsTBLViewerModel.cpp
-	src/mission/dialogs/ShipEditor/WeaponsTBLViewerModel.h
 	src/mission/dialogs/ShipEditor/ShipCustomWarpDialogModel.h
 	src/mission/dialogs/ShipEditor/ShipCustomWarpDialogModel.cpp
 	src/mission/dialogs/ShipEditor/ShipAltShipClassModel.h
@@ -178,8 +174,6 @@ add_file_folder("Source/UI/Dialogs"
 	src/ui/dialogs/MissionSpecDialog.h
 	src/ui/dialogs/MusicPlayerDialog.cpp
 	src/ui/dialogs/MusicPlayerDialog.h
-	src/ui/dialogs/MusicTBLViewer.cpp
-	src/ui/dialogs/MusicTBLViewer.h
 	src/ui/dialogs/ObjectOrientEditorDialog.cpp
 	src/ui/dialogs/ObjectOrientEditorDialog.h
 	src/ui/dialogs/PropEditorDialog.cpp
@@ -194,7 +188,9 @@ add_file_folder("Source/UI/Dialogs"
 	src/ui/dialogs/SelectionDialog.h
 	src/ui/dialogs/ShieldSystemDialog.h
 	src/ui/dialogs/ShieldSystemDialog.cpp
-	src/ui/dialogs/TeamLoadoutDialog.cpp	
+	src/ui/dialogs/TableViewerDialog.cpp
+	src/ui/dialogs/TableViewerDialog.h
+	src/ui/dialogs/TeamLoadoutDialog.cpp
 	src/ui/dialogs/TeamLoadoutDialog.h
 	src/ui/dialogs/TemplateBrowserDialog.cpp
 	src/ui/dialogs/TemplateBrowserDialog.h
@@ -232,8 +228,6 @@ add_file_folder("Source/UI/Dialogs/ShipEditor"
 	src/ui/dialogs/ShipEditor/ShipSpecialStatsDialog.h
 	src/ui/dialogs/ShipEditor/ShipTextureReplacementDialog.h
 	src/ui/dialogs/ShipEditor/ShipTextureReplacementDialog.cpp
-	src/ui/dialogs/ShipEditor/ShipTBLViewer.h
-	src/ui/dialogs/ShipEditor/ShipTBLViewer.cpp
 	src/ui/dialogs/ShipEditor/ShipWeaponsDialog.cpp
 	src/ui/dialogs/ShipEditor/ShipWeaponsDialog.h
 	src/ui/dialogs/ShipEditor/BankModel.cpp
@@ -242,8 +236,6 @@ add_file_folder("Source/UI/Dialogs/ShipEditor"
 	src/ui/dialogs/ShipEditor/ShipCustomWarpDialog.cpp
 	src/ui/dialogs/ShipEditor/ShipAltShipClass.h
 	src/ui/dialogs/ShipEditor/ShipAltShipClass.cpp
-	src/ui/dialogs/ShipEditor/WeaponsTBLViewer.cpp
-	src/ui/dialogs/ShipEditor/WeaponsTBLViewer.h
 )
 add_file_folder("Source/UI/Dialogs/EventEditor"
 	src/ui/dialogs/EventEditor/HeadAnimationPickerDialog.cpp
@@ -331,6 +323,7 @@ add_file_folder("UI"
 	ui/SelectionDialog.ui
 	ui/ShieldSystemDialog.ui
 	ui/SoundEnvironmentDialog.ui
+	ui/TableViewerDialog.ui
 	ui/VoiceActingManager.ui
 	ui/VolumetricNebulaDialog.ui
     ui/WaypointEditorDialog.ui
@@ -340,7 +333,6 @@ add_file_folder("UI"
 	ui/ShipSpecialStatsDialog.ui
 	ui/ShipFlagsDialog.ui
 	ui/ShipTextureReplacementDialog.ui
-	ui/ShipTBLViewer.ui
 	ui/ShipCustomWarpDialog.ui
 	ui/ShipAltShipClass.ui
 	ui/ShipWeaponsDialog.ui

qtfred/src/mission/dialogs/MusicTBLViewerModel.cpp

@@ -0,0 +1,46 @@
+#include "TableViewerModel.h"
+
+#include <utils/table_viewer.h>
+
+namespace fso::fred::dialogs {
+
+TableViewerModel::TableViewerModel(QObject* parent, EditorViewport* viewport,
+                                   const char* table_filename, const char* modular_pattern)
+	: AbstractDialogModel(parent, viewport)
+{
+	initializeData(table_filename, modular_pattern, nullptr);
+}
+
+TableViewerModel::TableViewerModel(QObject* parent, EditorViewport* viewport,
+                                   const char* table_filename, const char* modular_pattern,
+                                   const char* entry_name)
+	: AbstractDialogModel(parent, viewport)
+{
+	initializeData(table_filename, modular_pattern, entry_name);
+}
+
+bool TableViewerModel::apply()
+{
+	return true;
+}
+void TableViewerModel::reject() {}
+
+void TableViewerModel::initializeData(const char* table_filename, const char* modular_pattern,
+                                       const char* entry_name)
+{
+	if (entry_name) {
+		const SCP_string msg = "Could not find table entry: " + SCP_string(entry_name) + " in table: " + SCP_string(table_filename);
+		_text = table_viewer::get_table_entry_text(table_filename, modular_pattern, entry_name, msg.c_str());
+	} else {
+		const SCP_string msg = "Could not find table: " + SCP_string(table_filename);
+		_text = table_viewer::get_complete_table_text(table_filename, modular_pattern, msg.c_str());
+	}
+	modelChanged();
+}
+
+SCP_string TableViewerModel::getText() const
+{
+	return _text;
+}
+
+} // namespace fso::fred::dialogs

qtfred/src/mission/dialogs/MusicTBLViewerModel.h

@@ -0,0 +1,27 @@
+#pragma once
+
+#include "AbstractDialogModel.h"
+
+namespace fso::fred::dialogs {
+
+class TableViewerModel : public AbstractDialogModel {
+	SCP_string _text;
+
+  public:
+	// For a full table (e.g. music.tbl)
+	TableViewerModel(QObject* parent, EditorViewport* viewport,
+	                 const char* table_filename, const char* modular_pattern);
+	// For a specific entry (e.g. a ship or weapon by name)
+	TableViewerModel(QObject* parent, EditorViewport* viewport,
+	                 const char* table_filename, const char* modular_pattern,
+	                 const char* entry_name);
+
+	bool apply() override;
+	void reject() override;
+	SCP_string getText() const;
+
+  private:
+	void initializeData(const char* table_filename, const char* modular_pattern, const char* entry_name);
+};
+
+} // namespace fso::fred::dialogs

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

@@ -1,6 +1,6 @@
 #include <QMessageBox>
 #include <QCloseEvent>
-#include "MusicTBLViewer.h"
+#include <ui/dialogs/TableViewerDialog.h>
 #include "MusicPlayerDialog.h"
 #include "ui/util/SignalBlockers.h"
 #include "ui_MusicPlayerDialog.h"
@@ -128,7 +128,7 @@ void MusicPlayerDialog::on_autoplayCheck_toggled(bool on)
 
 void MusicPlayerDialog::on_musicTblButton_clicked()
 {
-	auto dialog = new MusicTBLViewer(this, _viewport);
+	auto dialog = new TableViewerDialog(this, _viewport, "Music TBL Data", "music.tbl", "*-mus.tbm");
 	dialog->show();
 }