Merge branch 'master' into qt6_cmake_joshua

sources/properties/terminaldata.h

@@ -21,6 +21,8 @@
 #include "../qet.h"
 #include "propertiesinterface.h"
 
+#include <QColor>
+#include <QFont>
 #include <QPointF>
 #include <QUuid>
 
@@ -115,6 +117,28 @@ class TerminalData : public PropertiesInterface
 
 		TerminalData::Type m_type = TerminalData::Generic;
 
+		/// Whether to display the terminal name as a text label
+		bool m_show_name = false;
+		/// Position of the text label relative to the terminal
+		QPointF m_label_pos{0.0, 0.0};
+		/// Font used for the text label
+		QFont m_label_font;
+		/// Rotation of the text label in degrees
+		qreal m_label_rotation = 0.0;
+		/// Horizontal alignment of the text label
+		Qt::Alignment m_label_halignment = Qt::AlignHCenter;
+		/// Vertical alignment of the text label
+		Qt::Alignment m_label_valignment = Qt::AlignVCenter;
+		/// Whether to draw a frame around the text label
+		bool m_label_frame = false;
+		/// Color of the text label
+		QColor m_label_color = Qt::black;
+
+		/// Whether this terminal uses a label from the master's contact group
+		bool m_use_master_label = false;
+		/// Index into the master's contact group labels (T1=0, T2=1, ..., T20=19)
+		int m_master_label_index = 0;
+
 	private:
 		QGraphicsObject* q{nullptr};
 };