QtFRED campaign editor

code/menuui/readyroom.cpp

@@ -1199,7 +1199,7 @@ void sim_room_close()
 //
 void sim_room_do_frame(float  /*frametime*/)
 {
-	char buf[256];
+	char buf[CF_MAX_PATHNAME_LENGTH + 4];
 	int i, k, y, line;
 	int font_height = gr_get_font_height();
 	int select_tease_line = -1;  // line mouse is down on, but won't be selected until button released	

code/mission/missioncampaign.cpp

@@ -465,7 +465,7 @@ int mission_campaign_load(const char* filename, player* pl, int load_savefile, b
 
 		// copy filename to campaign structure minus the extension
 		auto len = strlen(filename) - 4;
-		Assert(len < MAX_FILENAME_LEN);
+		Assert(len < CF_MAX_PATHNAME_LENGTH);
 		strncpy(Campaign.filename, filename, len);
 		Campaign.filename[len] = '\0';
 

code/mission/missioncampaign.h

@@ -14,6 +14,7 @@
 
 #include "stats/scoring.h"
 #include "parse/sexp.h"
+#include "cfile/cfile.h"
 #include "parse/sexp_container.h"
 
 struct sexp_variable;
@@ -109,7 +110,7 @@ class campaign
 {
 public:
 	char	name[NAME_LENGTH];						// name of the campaign
-	char	filename[MAX_FILENAME_LEN];				// filename the campaign info is in
+	char	filename[CF_MAX_PATHNAME_LENGTH];			// filename the campaign info is in
 	char	*desc;									// description of campaign
 	int		type;									// type of campaign
 	int		flags;									// flags - Goober5000

qtfred/source_groups.cmake

@@ -42,6 +42,8 @@ add_file_folder("Source/Mission/Dialogs"
     src/mission/dialogs/AbstractDialogModel.h
 	src/mission/dialogs/AsteroidEditorDialogModel.cpp
 	src/mission/dialogs/AsteroidEditorDialogModel.h
+	src/mission/dialogs/CampaignEditorDialogModel.cpp
+	src/mission/dialogs/CampaignEditorDialogModel.h
 	src/mission/dialogs/CommandBriefingDialogModel.cpp
 	src/mission/dialogs/CommandBriefingDialogModel.h
 	src/mission/dialogs/CustomWingNamesDialogModel.cpp
@@ -92,6 +94,8 @@ add_file_folder("Source/UI/Dialogs"
 	src/ui/dialogs/BackgroundEditorDialog.cpp
     src/ui/dialogs/BriefingEditorDialog.cpp
     src/ui/dialogs/BriefingEditorDialog.h
+	src/ui/dialogs/CampaignEditorDialog.h
+	src/ui/dialogs/CampaignEditorDialog.cpp
 	src/ui/dialogs/CommandBriefingDialog.cpp
 	src/ui/dialogs/CommandBriefingDialog.h
 	src/ui/dialogs/CustomWingNamesDialog.cpp
@@ -155,6 +159,7 @@ add_file_folder("UI"
 	ui/AsteroidEditorDialog.ui
 	ui/BackgroundEditor.ui
 	ui/BriefingEditorDialog.ui
+	ui/CampaignEditorDialog.ui
 	ui/CommandBriefingDialog.ui
 	ui/CustomWingNamesDialog.ui
     ui/EventEditorDialog.ui

qtfred/src/CheckedDataListModel.h

@@ -36,6 +36,7 @@ class CheckedDataListModel : public QAbstractListModel
 		RowData& operator=(RowData&& move) = delete;
 
 		inline U& internalData() {return _internalData;}
+		inline const U& internalData() const {return _internalData;}
 	};
 
 	template<class U>
@@ -51,6 +52,7 @@ class CheckedDataListModel : public QAbstractListModel
 		RowData& operator=(RowData&& move) = delete;
 
 		inline U& internalData() {return *_internalData;}
+		inline const U& internalData() const {return *_internalData;}
 	};
 
 public:
@@ -86,11 +88,11 @@ class CheckedDataListModel : public QAbstractListModel
 
 	QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override {
 		if (!index.isValid())
-			return QVariant();
+			return {};
 
 		auto srow = static_cast<size_t>(index.row());
 		if (srow >= items.size())
-			return QVariant();
+			return {};
 
 		if (role == Qt::DisplayRole)
 			return items[srow]._text;
@@ -99,15 +101,20 @@ class CheckedDataListModel : public QAbstractListModel
 		else if (items[srow]._color != Qt::color0 && role == Qt::ForegroundRole)
 			return QBrush(items[srow]._color);
 		else
-			return QVariant();
+			return {};
 	}
 
-	inline T& internalData(const QModelIndex &index) {
-		return items[static_cast<size_t>(index.row())].internalData();
+	inline const T* internalData(const QModelIndex &index) const {
+		if (! index.isValid()) return nullptr;
+		size_t row{static_cast<size_t>(index.row())};
+		if (row >= items.size()) return nullptr;
+		return &items[row].internalData();
 	}
 
-	inline const T& internalDataConst(const QModelIndex &index) const {
-		return items[static_cast<size_t>(index.row())].internalData();
+	inline T* internalData(const QModelIndex &index) {
+		return const_cast<T*>(
+					const_cast<const CheckedDataListModel<T>*>(this)
+					->internalData(index));
 	}
 
 	bool setData(const QModelIndex &index, const QVariant &value,
@@ -119,14 +126,7 @@ class CheckedDataListModel : public QAbstractListModel
 			return false;
 
 		if (data(index, role) != value) {
-			items[srow]._checked = value == Qt::Checked;
-			if (items[srow]._checked) {
-				checkeds.insert(&items[srow].internalData());
-				checkedsConst.insert(&items[srow].internalData());
-			} else {
-				checkeds.erase(&items[srow].internalData());
-				checkedsConst.erase(&items[srow].internalData());
-			}
+			items[srow]._checked = (value == Qt::Checked);
 			dataChanged(index, index, QVector<int>() << role);
 			return true;
 		} else
@@ -141,21 +141,84 @@ class CheckedDataListModel : public QAbstractListModel
 			return defaultFlags;
 	}
 
-	inline const SCP_unordered_set<T*>& getCheckedData() {
-		return checkeds;
+private:
+	template<typename V>
+	inline void getCheckedData2(SCP_unordered_set<V*> &set) {
+		for (auto& it : items)
+			if (it._checked)
+				set.insert(&it.internalData());
 	}
 
-	inline const SCP_unordered_set<const T*>& getCheckedDataConst() const {
-		return checkedsConst;
+public:
+	inline SCP_unordered_set<T*> getCheckedData() {
+		SCP_unordered_set<T*> ret{items.size() / 2};
+		getCheckedData2(ret);
+		return ret;
 	}
 
+	inline SCP_unordered_set<const T*> getCheckedData() const {
+		SCP_unordered_set<const T*> ret{items.size() / 2};
+		const_cast<CheckedDataListModel<T>*>(this)->getCheckedData2(ret);
+		return ret;
+	}
+
+	struct Iterator
+	{
+		using iterator_delegate = typename SCP_vector<RowData<T>>::iterator;
+
+		using iterator_category = std::forward_iterator_tag;
+		using difference_type   = typename SCP_vector<RowData<T>>::iterator::difference_type;
+		using value_type        = std::pair<T, bool>;
+		using pointer           = std::pair<const T*, bool>;
+		using reference         = std::pair<T&, bool>;
+
+		Iterator(iterator_delegate it) : _it(it) {}
+
+		reference operator*() const { return reference(_it->internalData(), _it->_checked); }
+		pointer operator->() { return pointer(&_it->internalData(), _it->_checked); }
+		Iterator& operator++() { _it++; return *this; }
+		Iterator operator++(int) { Iterator tmp = *this; ++(*this); return tmp; }
+		friend bool operator== (const Iterator &a, const Iterator &b) { return a._it == b._it;}
+		friend bool operator!= (const Iterator &a, const Iterator &b) { return a._it != b._it;}
+
+	private:
+		iterator_delegate _it;
+	};
+
+	inline Iterator begin() { return Iterator(items.begin()); }
+	inline Iterator end() { return Iterator(items.end()); }
+
+	struct ConstIterator
+	{
+		using iterator_delegate = typename SCP_vector<RowData<T>>::const_iterator;
+
+		using iterator_category = std::forward_iterator_tag;
+		using difference_type   = typename SCP_vector<RowData<T>>::iterator::difference_type;
+		using value_type        = std::pair<T, bool>;
+		using pointer           = std::pair<const T*, bool>;
+		using reference         = std::pair<const T&, bool>;
+
+		ConstIterator(iterator_delegate it) : _it(it) {}
+
+		reference operator*() const { return reference(_it->internalData(), _it->_checked); }
+		pointer operator->() { return pointer(&_it->internalData(), _it->_checked); }
+		ConstIterator& operator++() { _it++; return *this; }
+		ConstIterator operator++(int) { ConstIterator tmp = *this; ++(*this); return tmp; }
+		friend bool operator== (const ConstIterator &a, const ConstIterator &b) { return a._it == b._it;}
+		friend bool operator!= (const ConstIterator &a, const ConstIterator &b) { return a._it != b._it;}
+
+	private:
+		iterator_delegate _it;
+	};
+
+	inline ConstIterator begin() const { return ConstIterator(items.cbegin()); }
+	inline ConstIterator end() const { return ConstIterator(items.cend()); }
+	inline ConstIterator cbegin() const { return begin(); }
+	inline ConstIterator cend() const { return end(); }
+
 	template<class... Args>
 	inline void initRow(Args&&... args) {
 		items.emplace_back(std::forward<Args>(args)...);
-		if (items.back()._checked) {
-			checkeds.insert(&items.back().internalData());
-			checkedsConst.insert(&items.back().internalData());
-		}
 	}
 
 	template<class... Args>
@@ -173,8 +236,6 @@ class CheckedDataListModel : public QAbstractListModel
 
 private:
 	SCP_vector<RowData<T>> items;
-	SCP_unordered_set<T*> checkeds;
-	SCP_unordered_set<const T*> checkedsConst;
 };
 }
 }

qtfred/src/main.cpp

@@ -102,7 +102,7 @@ int main(int argc, char* argv[]) {
 	// Expect that the platform library is in the same directory
 	QCoreApplication::addLibraryPath(QCoreApplication::applicationDirPath());	
 
-	QGuiApplication::setApplicationDisplayName(app.tr("qtFRED v%1").arg(FS_VERSION_FULL));
+	QGuiApplication::setApplicationDisplayName(QApplication::tr("qtFRED v%1").arg(FS_VERSION_FULL));
 
 #ifndef NDEBUG
 	QLoggingCategory::defaultCategory()->setEnabled(QtDebugMsg, true);
@@ -122,47 +122,50 @@ int main(int argc, char* argv[]) {
 	auto baseDir = QDir::toNativeSeparators(QDir::current().absolutePath());
 
 	typedef std::unordered_map<SubSystem, QString> SubsystemMap;
-	SubsystemMap initializers = {{ SubSystem::OS,                app.tr("Initializing OS interface") },
-								 { SubSystem::CommandLine,       app.tr("Parsing command line") },
-								 { SubSystem::Timer,             app.tr("Initializing Timer") },
-								 { SubSystem::CFile,             app.tr("Initializing CFile") },
-								 { SubSystem::Locale,            app.tr("Initializing locale") },
-								 { SubSystem::Sound,             app.tr("Initializing sound") },
-								 { SubSystem::Graphics,          app.tr("Initializing graphics") },
-								 { SubSystem::Scripting,         app.tr("Initializing scripting") },
-								 { SubSystem::Fonts,             app.tr("Initializing Fonts") },
-								 { SubSystem::Keyboard,          app.tr("Initializing keyboard") },
-								 { SubSystem::Mouse,             app.tr("Initializing mouse") },
-								 { SubSystem::Particles,         app.tr("Initializing particles") },
-								 { SubSystem::Iff,               app.tr("Initializing IFF") },
-								 { SubSystem::Objects,           app.tr("Initializing objects") },
-								 { SubSystem::Models,            app.tr("Initializing model system") },
-								 { SubSystem::Species,           app.tr("Initializing species") },
-								 { SubSystem::BriefingIcons,     app.tr("Initializing briefing icons") },
-								 { SubSystem::HudCommOrders,     app.tr("Initializing HUD comm orders") },
-								 { SubSystem::AlphaColors,       app.tr("Initializing alpha colors") },
-								 { SubSystem::GameSound,         app.tr("Initializing briefing icons") },
-								 { SubSystem::MissionBrief,      app.tr("Initializing briefings") },
-								 { SubSystem::AI,                app.tr("Initializing AI") },
-								 { SubSystem::AIProfiles,        app.tr("Initializing AI profiles") },
-								 { SubSystem::Armor,             app.tr("Initializing armors") },
-								 { SubSystem::Weapon,            app.tr("Initializing weaponry") },
-								 { SubSystem::Medals,            app.tr("Initializing medals") },
-								 { SubSystem::Glowpoints,        app.tr("Initializing glow points") },
-								 { SubSystem::Ships,             app.tr("Initializing ships") },
-								 { SubSystem::Parse,             app.tr("Initializing parser") },
-								 { SubSystem::TechroomIntel,     app.tr("Initializing techroom intel") },
-								 { SubSystem::Nebulas,           app.tr("Initializing nebulas") },
-								 { SubSystem::Stars,             app.tr("Initializing stars") },
-								 { SubSystem::Ssm,               app.tr("Initializing SSMs") },
-								 { SubSystem::EventMusic,        app.tr("Initializing event music") },
-								 { SubSystem::FictionViewer,     app.tr("Initializing fiction viewer") },
-								 { SubSystem::CommandBriefing,   app.tr("Initializing command briefing") },
-								 { SubSystem::Campaign,          app.tr("Initializing campaign system") },
-								 { SubSystem::NebulaLightning,   app.tr("Initializing nebula lightning") },
-								 { SubSystem::FFmpeg,            app.tr("Initializing FFmpeg") },
-								 { SubSystem::DynamicSEXPs,      app.tr("Initializing dynamic SEXP system") },
-								 { SubSystem::ScriptingInitHook, app.tr("Running game init scripting hook") },
+	SubsystemMap initializers = {{ SubSystem::OS,                QApplication::tr("Initializing OS interface") },
+								 { SubSystem::CommandLine,       QApplication::tr("Parsing command line") },
+								 { SubSystem::Timer,             QApplication::tr("Initializing Timer") },
+								 { SubSystem::CFile,             QApplication::tr("Initializing CFile") },
+								 { SubSystem::Locale,            QApplication::tr("Initializing locale") },
+								 { SubSystem::Sound,             QApplication::tr("Initializing sound") },
+								 { SubSystem::Graphics,          QApplication::tr("Initializing graphics") },
+								 { SubSystem::Scripting,         QApplication::tr("Initializing scripting") },
+								 { SubSystem::Fonts,             QApplication::tr("Initializing Fonts") },
+								 { SubSystem::Keyboard,          QApplication::tr("Initializing keyboard") },
+								 { SubSystem::Mouse,             QApplication::tr("Initializing mouse") },
+								 { SubSystem::Particles,         QApplication::tr("Initializing particles") },
+								 { SubSystem::Iff,               QApplication::tr("Initializing IFF") },
+								 { SubSystem::Objects,           QApplication::tr("Initializing objects") },
+								 { SubSystem::Models,            QApplication::tr("Initializing model system") },
+								 { SubSystem::Species,           QApplication::tr("Initializing species") },
+								 { SubSystem::BriefingIcons,     QApplication::tr("Initializing briefing icons") },
+								 { SubSystem::HudCommOrders,     QApplication::tr("Initializing HUD comm orders") },
+								 { SubSystem::AlphaColors,       QApplication::tr("Initializing alpha colors") },
+								 { SubSystem::GameSound,         QApplication::tr("Initializing briefing icons") },
+								 { SubSystem::MissionBrief,      QApplication::tr("Initializing briefings") },
+								 { SubSystem::AI,                QApplication::tr("Initializing AI") },
+								 { SubSystem::AIProfiles,        QApplication::tr("Initializing AI profiles") },
+								 { SubSystem::Armor,             QApplication::tr("Initializing armors") },
+								 { SubSystem::Weapon,            QApplication::tr("Initializing weaponry") },
+								 { SubSystem::Medals,            QApplication::tr("Initializing medals") },
+								 { SubSystem::Glowpoints,        QApplication::tr("Initializing glow points") },
+								 { SubSystem::Ships,             QApplication::tr("Initializing ships") },
+								 { SubSystem::Parse,             QApplication::tr("Initializing parser") },
+								 { SubSystem::TechroomIntel,     QApplication::tr("Initializing techroom intel") },
+								 { SubSystem::Nebulas,           QApplication::tr("Initializing nebulas") },
+								 { SubSystem::Stars,             QApplication::tr("Initializing stars") },
+								 { SubSystem::Ssm,               QApplication::tr("Initializing SSMs") },
+								 { SubSystem::EventMusic,        QApplication::tr("Initializing event music") },
+								 { SubSystem::FictionViewer,     QApplication::tr("Initializing fiction viewer") },
+								 { SubSystem::CommandBriefing,   QApplication::tr("Initializing command briefing") },
+								 { SubSystem::Cutscenes,         QApplication::tr("Initializing cutscenes")},
+								 { SubSystem::Mainhalls,         QApplication::tr("Initializing mainhalls")},
+								 { SubSystem::Ranks,             QApplication::tr("Initializing ranks")},
+								 { SubSystem::Campaign,          QApplication::tr("Initializing campaign system") },
+								 { SubSystem::NebulaLightning,   QApplication::tr("Initializing nebula lightning") },
+								 { SubSystem::FFmpeg,            QApplication::tr("Initializing FFmpeg") },
+								 { SubSystem::DynamicSEXPs,      QApplication::tr("Initializing dynamic SEXP system") },
+								 { SubSystem::ScriptingInitHook, QApplication::tr("Running game init scripting hook") },
 	};
 
 	auto initSuccess = fso::fred::initialize(baseDir.toStdString(), argc, argv, fred.get(), [&](const SubSystem& which) {
@@ -176,7 +179,7 @@ int main(int argc, char* argv[]) {
 		return -1;
 	}
 
-	splash.showMessage(app.tr("Showing editor window"), Qt::AlignHCenter | Qt::AlignBottom, Qt::white);
+	splash.showMessage(QApplication::tr("Showing editor window"), Qt::AlignHCenter | Qt::AlignBottom, Qt::white);
 	splash.finish(qApp->activeWindow());
 
 	// Use this to keep the app responsive