Set new object definitions to Levels 2.5 and 3.5

Ensure Level 1.5 active position warnings are cleared
Update copyright notices to 2026
2026-02-12 20:56:38 +00:00 · 2026-02-12 14:14:46 +00:00 · 2025-12-31 09:39:04 +00:00
50 changed files with 60 additions and 57 deletions
--- a/src/qteletextdecoder/decode.cpp
+++ b/src/qteletextdecoder/decode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2025 Gavin MacGregor
+ * Copyright (C) 2020-2026 Gavin MacGregor
 *
 * This file is part of QTeletextMaker.
 *
--- a/src/qteletextdecoder/decode.h
+++ b/src/qteletextdecoder/decode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2025 Gavin MacGregor
+ * Copyright (C) 2020-2026 Gavin MacGregor
 *
 * This file is part of QTeletextMaker.
 *
--- a/src/qteletextdecoder/drcspage.cpp
+++ b/src/qteletextdecoder/drcspage.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2025 Gavin MacGregor
+ * Copyright (C) 2020-2026 Gavin MacGregor
 *
 * This file is part of QTeletextMaker.
 *
--- a/src/qteletextdecoder/drcspage.h
+++ b/src/qteletextdecoder/drcspage.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2025 Gavin MacGregor
+ * Copyright (C) 2020-2026 Gavin MacGregor
 *
 * This file is part of QTeletextMaker.
 *
--- a/src/qteletextdecoder/levelonepage.cpp
+++ b/src/qteletextdecoder/levelonepage.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2025 Gavin MacGregor
+ * Copyright (C) 2020-2026 Gavin MacGregor
 *
 * This file is part of QTeletextMaker.
 *
--- a/src/qteletextdecoder/levelonepage.h
+++ b/src/qteletextdecoder/levelonepage.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2025 Gavin MacGregor
+ * Copyright (C) 2020-2026 Gavin MacGregor
 *
 * This file is part of QTeletextMaker.
 *
--- a/src/qteletextdecoder/pagebase.cpp
+++ b/src/qteletextdecoder/pagebase.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2025 Gavin MacGregor
+ * Copyright (C) 2020-2026 Gavin MacGregor
 *
 * This file is part of QTeletextMaker.
 *
--- a/src/qteletextdecoder/pagebase.h
+++ b/src/qteletextdecoder/pagebase.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2025 Gavin MacGregor
+ * Copyright (C) 2020-2026 Gavin MacGregor
 *
 * This file is part of QTeletextMaker.
 *
--- a/src/qteletextdecoder/pagex26base.cpp
+++ b/src/qteletextdecoder/pagex26base.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2025 Gavin MacGregor
+ * Copyright (C) 2020-2026 Gavin MacGregor
 *
 * This file is part of QTeletextMaker.
 *
--- a/src/qteletextdecoder/pagex26base.h
+++ b/src/qteletextdecoder/pagex26base.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2025 Gavin MacGregor
+ * Copyright (C) 2020-2026 Gavin MacGregor
 *
 * This file is part of QTeletextMaker.
 *
--- a/src/qteletextdecoder/render.cpp
+++ b/src/qteletextdecoder/render.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2025 Gavin MacGregor
+ * Copyright (C) 2020-2026 Gavin MacGregor
 *
 * This file is part of QTeletextMaker.
 *
--- a/src/qteletextdecoder/render.h
+++ b/src/qteletextdecoder/render.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2025 Gavin MacGregor
+ * Copyright (C) 2020-2026 Gavin MacGregor
 *
 * This file is part of QTeletextMaker.
 *
--- a/src/qteletextdecoder/x26triplets.cpp
+++ b/src/qteletextdecoder/x26triplets.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2025 Gavin MacGregor
+ * Copyright (C) 2020-2026 Gavin MacGregor
 *
 * This file is part of QTeletextMaker.
 *
@@ -346,17 +346,16 @@ void X26TripletList::updateInternalData()
 			case 0x2f: // G2 character
 				activePosition.setColumn(triplet->addressColumn());

-				if (activePosition.row() != triplet->m_activePositionRow || activePosition.column() != triplet->m_activePositionColumn)
-					triplet->m_activePosition1p5Differs = true;
+				triplet->m_activePosition1p5Differs = activePosition.row() != triplet->m_activePositionRow || activePosition.column() != triplet->m_activePositionColumn;
 				break;
 			default:
 				if (triplet->modeExt() >= 0x30 && triplet->modeExt() <= 0x3f) {
 					// G0 diacritical mark
 					activePosition.setColumn(triplet->addressColumn());

-					if (activePosition.row() != triplet->m_activePositionRow || activePosition.column() != triplet->m_activePositionColumn)
-						triplet->m_activePosition1p5Differs = true;
-				}
+					triplet->m_activePosition1p5Differs = activePosition.row() != triplet->m_activePositionRow || activePosition.column() != triplet->m_activePositionColumn;
+				} else
+					triplet->m_activePosition1p5Differs = false;
 		}

 		triplet->m_activePositionRow1p5 = activePosition.row();
--- a/src/qteletextdecoder/x26triplets.h
+++ b/src/qteletextdecoder/x26triplets.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2025 Gavin MacGregor
+ * Copyright (C) 2020-2026 Gavin MacGregor
 *
 * This file is part of QTeletextMaker.
 *
--- a/src/qteletextmaker/dclutdockwidget.cpp
+++ b/src/qteletextmaker/dclutdockwidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2025 Gavin MacGregor
+ * Copyright (C) 2020-2026 Gavin MacGregor
 *
 * This file is part of QTeletextMaker.
 *
--- a/src/qteletextmaker/dclutdockwidget.h
+++ b/src/qteletextmaker/dclutdockwidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2025 Gavin MacGregor
+ * Copyright (C) 2020-2026 Gavin MacGregor
 *
 * This file is part of QTeletextMaker.
 *
--- a/src/qteletextmaker/document.cpp
+++ b/src/qteletextmaker/document.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2025 Gavin MacGregor
+ * Copyright (C) 2020-2026 Gavin MacGregor
 *
 * This file is part of QTeletextMaker.
 *
--- a/src/qteletextmaker/document.h
+++ b/src/qteletextmaker/document.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2025 Gavin MacGregor
+ * Copyright (C) 2020-2026 Gavin MacGregor
 *
 * This file is part of QTeletextMaker.
 *
--- a/src/qteletextmaker/hashformats.cpp
+++ b/src/qteletextmaker/hashformats.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2025 Gavin MacGregor
+ * Copyright (C) 2020-2026 Gavin MacGregor
 *
 * This file is part of QTeletextMaker.
 *
--- a/src/qteletextmaker/hashformats.h
+++ b/src/qteletextmaker/hashformats.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2025 Gavin MacGregor
+ * Copyright (C) 2020-2026 Gavin MacGregor
 *
 * This file is part of QTeletextMaker.
 *
--- a/src/qteletextmaker/keymap.h
+++ b/src/qteletextmaker/keymap.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2025 Gavin MacGregor
+ * Copyright (C) 2020-2026 Gavin MacGregor
 *
 * This file is part of QTeletextMaker.
 *
--- a/src/qteletextmaker/levelonecommands.cpp
+++ b/src/qteletextmaker/levelonecommands.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2025 Gavin MacGregor
+ * Copyright (C) 2020-2026 Gavin MacGregor
 *
 * This file is part of QTeletextMaker.
 *
--- a/src/qteletextmaker/levelonecommands.h
+++ b/src/qteletextmaker/levelonecommands.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2025 Gavin MacGregor
+ * Copyright (C) 2020-2026 Gavin MacGregor
 *
 * This file is part of QTeletextMaker.
 *
--- a/src/qteletextmaker/loadformats.cpp
+++ b/src/qteletextmaker/loadformats.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2025 Gavin MacGregor
+ * Copyright (C) 2020-2026 Gavin MacGregor
 *
 * This file is part of QTeletextMaker.
 *
--- a/src/qteletextmaker/loadformats.h
+++ b/src/qteletextmaker/loadformats.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2025 Gavin MacGregor
+ * Copyright (C) 2020-2026 Gavin MacGregor
 *
 * This file is part of QTeletextMaker.
 *
--- a/src/qteletextmaker/main.cpp
+++ b/src/qteletextmaker/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2025 Gavin MacGregor
+ * Copyright (C) 2020-2026 Gavin MacGregor
 *
 * This file is part of QTeletextMaker.
 *
--- a/src/qteletextmaker/mainwidget.cpp
+++ b/src/qteletextmaker/mainwidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2025 Gavin MacGregor
+ * Copyright (C) 2020-2026 Gavin MacGregor
 *
 * This file is part of QTeletextMaker.
 *
--- a/src/qteletextmaker/mainwidget.h
+++ b/src/qteletextmaker/mainwidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2025 Gavin MacGregor
+ * Copyright (C) 2020-2026 Gavin MacGregor
 *
 * This file is part of QTeletextMaker.
 *
--- a/src/qteletextmaker/mainwindow.cpp
+++ b/src/qteletextmaker/mainwindow.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2025 Gavin MacGregor
+ * Copyright (C) 2020-2026 Gavin MacGregor
 *
 * This file is part of QTeletextMaker.
 *
@@ -371,7 +371,7 @@ void MainWindow::about()
 	QMessageBox::about(this, tr("About"), QString("<b>%1</b><br>"
 	"An open source Level 2.5 teletext page editor.<br>"
 	"<i>Version %2</i><br><br>"
-	"Copyright (C) 2020-2025 Gavin MacGregor<br><br>"
+	"Copyright (C) 2020-2026 Gavin MacGregor<br><br>"
 	"Released under the GNU General Public License version 3<br>"
 	"<a href=\"https://github.com/gkthemac/qteletextmaker\">https://github.com/gkthemac/qteletextmaker</a>").arg(QApplication::applicationDisplayName()).arg(QApplication::applicationVersion()));
 }
--- a/src/qteletextmaker/mainwindow.h
+++ b/src/qteletextmaker/mainwindow.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2025 Gavin MacGregor
+ * Copyright (C) 2020-2026 Gavin MacGregor
 *
 * This file is part of QTeletextMaker.
 *
--- a/src/qteletextmaker/pagecomposelinksdockwidget.cpp
+++ b/src/qteletextmaker/pagecomposelinksdockwidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2025 Gavin MacGregor
+ * Copyright (C) 2020-2026 Gavin MacGregor
 *
 * This file is part of QTeletextMaker.
 *
--- a/src/qteletextmaker/pagecomposelinksdockwidget.h
+++ b/src/qteletextmaker/pagecomposelinksdockwidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2025 Gavin MacGregor
+ * Copyright (C) 2020-2026 Gavin MacGregor
 *
 * This file is part of QTeletextMaker.
 *
--- a/src/qteletextmaker/pageenhancementsdockwidget.cpp
+++ b/src/qteletextmaker/pageenhancementsdockwidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2025 Gavin MacGregor
+ * Copyright (C) 2020-2026 Gavin MacGregor
 *
 * This file is part of QTeletextMaker.
 *
--- a/src/qteletextmaker/pageenhancementsdockwidget.h
+++ b/src/qteletextmaker/pageenhancementsdockwidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2025 Gavin MacGregor
+ * Copyright (C) 2020-2026 Gavin MacGregor
 *
 * This file is part of QTeletextMaker.
 *
--- a/src/qteletextmaker/pageoptionsdockwidget.cpp
+++ b/src/qteletextmaker/pageoptionsdockwidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2025 Gavin MacGregor
+ * Copyright (C) 2020-2026 Gavin MacGregor
 *
 * This file is part of QTeletextMaker.
 *
--- a/src/qteletextmaker/pageoptionsdockwidget.h
+++ b/src/qteletextmaker/pageoptionsdockwidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2025 Gavin MacGregor
+ * Copyright (C) 2020-2026 Gavin MacGregor
 *
 * This file is part of QTeletextMaker.
 *
--- a/src/qteletextmaker/palettedockwidget.cpp
+++ b/src/qteletextmaker/palettedockwidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2025 Gavin MacGregor
+ * Copyright (C) 2020-2026 Gavin MacGregor
 *
 * This file is part of QTeletextMaker.
 *
--- a/src/qteletextmaker/palettedockwidget.h
+++ b/src/qteletextmaker/palettedockwidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2025 Gavin MacGregor
+ * Copyright (C) 2020-2026 Gavin MacGregor
 *
 * This file is part of QTeletextMaker.
 *
--- a/src/qteletextmaker/saveformats.cpp
+++ b/src/qteletextmaker/saveformats.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2025 Gavin MacGregor
+ * Copyright (C) 2020-2026 Gavin MacGregor
 *
 * This file is part of QTeletextMaker.
 *
--- a/src/qteletextmaker/saveformats.h
+++ b/src/qteletextmaker/saveformats.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2025 Gavin MacGregor
+ * Copyright (C) 2020-2026 Gavin MacGregor
 *
 * This file is part of QTeletextMaker.
 *
--- a/src/qteletextmaker/x26commands.cpp
+++ b/src/qteletextmaker/x26commands.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2025 Gavin MacGregor
+ * Copyright (C) 2020-2026 Gavin MacGregor
 *
 * This file is part of QTeletextMaker.
 *
--- a/src/qteletextmaker/x26commands.h
+++ b/src/qteletextmaker/x26commands.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2025 Gavin MacGregor
+ * Copyright (C) 2020-2026 Gavin MacGregor
 *
 * This file is part of QTeletextMaker.
 *
--- a/src/qteletextmaker/x26dockwidget.cpp
+++ b/src/qteletextmaker/x26dockwidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2025 Gavin MacGregor
+ * Copyright (C) 2020-2026 Gavin MacGregor
 *
 * This file is part of QTeletextMaker.
 *
@@ -1066,11 +1066,15 @@ void X26DockWidget::insertTriplet(int modeExt, int row)
 	} else
 		row = 0;

-	// Avoid reserved bits
+	// Avoid reserved bits or suggest sane defaults
 	switch (modeExt) {
 		case 0x07: // Address Row 0
 			newTriplet.setAddress(63); // set Address to notreserved
 			break;
+		case 0x15: // Define Active Object
+		case 0x16: // Define Adaptive Object
+		case 0x17: // Define Passive Object
+			newTriplet.setAddress(0x38); // Required at Levels 2.5 and 3.5
 		case 0x18: // DRCS mode
 			newTriplet.setData(0x70); // Normal DRCS at Levels 2.5 and 3.5
 			break;
--- a/src/qteletextmaker/x26dockwidget.h
+++ b/src/qteletextmaker/x26dockwidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2025 Gavin MacGregor
+ * Copyright (C) 2020-2026 Gavin MacGregor
 *
 * This file is part of QTeletextMaker.
 *
--- a/src/qteletextmaker/x26menus.cpp
+++ b/src/qteletextmaker/x26menus.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2025 Gavin MacGregor
+ * Copyright (C) 2020-2026 Gavin MacGregor
 *
 * This file is part of QTeletextMaker.
 *
--- a/src/qteletextmaker/x26menus.h
+++ b/src/qteletextmaker/x26menus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2025 Gavin MacGregor
+ * Copyright (C) 2020-2026 Gavin MacGregor
 *
 * This file is part of QTeletextMaker.
 *
--- a/src/qteletextmaker/x26model.cpp
+++ b/src/qteletextmaker/x26model.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2025 Gavin MacGregor
+ * Copyright (C) 2020-2026 Gavin MacGregor
 *
 * This file is part of QTeletextMaker.
 *
--- a/src/qteletextmaker/x26model.h
+++ b/src/qteletextmaker/x26model.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2025 Gavin MacGregor
+ * Copyright (C) 2020-2026 Gavin MacGregor
 *
 * This file is part of QTeletextMaker.
 *
--- a/src/qteletextmaker/x28commands.cpp
+++ b/src/qteletextmaker/x28commands.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2025 Gavin MacGregor
+ * Copyright (C) 2020-2026 Gavin MacGregor
 *
 * This file is part of QTeletextMaker.
 *
--- a/src/qteletextmaker/x28commands.h
+++ b/src/qteletextmaker/x28commands.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2025 Gavin MacGregor
+ * Copyright (C) 2020-2026 Gavin MacGregor
 *
 * This file is part of QTeletextMaker.
 *
Author	SHA1	Message	Date
Gavin MacGregor	df7ce90d0f	Set new object definitions to Levels 2.5 and 3.5	2026-02-12 20:56:38 +00:00
Gavin MacGregor	838a54d528	Ensure Level 1.5 active position warnings are cleared	2026-02-12 14:14:46 +00:00
Gavin MacGregor	2682554b79	Update copyright notices to 2026	2025-12-31 09:39:04 +00:00