Tag version 0.6.4-beta

When a selection box is dragged, holding Ctrl while pressing the arrow
keys will shift the mosaics one sixel at a time.

If a shifting sixel encounters a non-mosaic cell it will pass through to
the other side of it.

README.md

@@ -1,5 +1,7 @@
 # QTeletextMaker
-QTeletextMaker is a teletext page editor in development. It is written in C++ using the Qt 5 widget libraries, and released under the GNU General Public License v3.0
+QTeletextMaker is a teletext page editor with an emphasis on Level 2.5 enhancement editing, released under the GNU General Public License v3.0
+
+It is written in C++ using the Qt 5 widget libraries but should also compile with Qt 6.
 
 Features
 - Load and save teletext pages in .tti format.
@@ -14,11 +16,11 @@ Features
 - Configurable zoom.
 - View teletext pages in 4:3, 16:9 pillar-box and 16:9 stretch aspect ratios.
 
-Although designed on and developed for Linux, the Qt 5 libraries are cross platform so a Windows executable can be built. A Windows executable can be found within the "Releases" link, compiled on a Linux host using [MXE](https://github.com/mxe/mxe) based on [these instructions](https://blog.8bitbuddhism.com/2018/08/22/cross-compiling-windows-applications-with-mxe/). After MXE is installed `make qtbase` should build and install the required dependencies to build QTeletextMaker.
+Although designed on and developed for Linux, the Qt libraries are cross platform so a Windows executable can be built. A Windows executable can be found within the "Releases" link, compiled on a Linux host using [MXE](https://github.com/mxe/mxe) based on [these instructions](https://blog.8bitbuddhism.com/2018/08/22/cross-compiling-windows-applications-with-mxe/). After MXE is installed `make qtbase` should build and install the required dependencies to build QTeletextMaker.
 
 ## Building
 ### Linux
-Install the QtCore, QtGui and QtWidgets libraries and build headers, along with the qmake tool. Depending on how qmake is installed, type `qmake && make -j3` or `qmake5 && make -j3` in a terminal to build, you can replace -j3 with the number of processor cores used for the compile process.
+Install version 5 or 6 of the QtCore, QtGui and QtWidgets libraries and build headers, along with the qmake tool. Depending on how qmake is installed, type `qmake && make -j3` or `qmake5 && make -j3` or `qmake6 && make -j3` in a terminal to build, you can replace -j3 with the number of processor cores used for the compile process.
 
 The above should place the qteletextmaker executable in the same directory as the source, type `./qteletextmaker` in the terminal to launch. Some Qt installs may place the executable into a "release" directory.
 
@@ -28,7 +30,6 @@ Optionally, type `make install` afterwards to place the executable into /usr/loc
 The following X/26 enhancement triplets are not rendered by the editor, although the list is fully aware of them.
 - Invocation of Objects from POP and GPOP pages.
 - DRCS characters.
-- Modified G0 and G2 character set designation using X/26 triplets with mode 01000.
 - Proportional font spacing on Level 3.5
 
 ## Using the X/26 triplet editor
@@ -46,7 +47,7 @@ Most triplet modes will present varying widgets below which can be used to alter
 
 By checking "raw values" it is also possible to view and edit the raw Address, Mode and Data numbers of the triplets. When editing triplets this way, remember that address values 0-39 select a column triplet which has one set of modes and address values 40-63 select a row triplet which has a different set of modes.
 
-The full behaviour of X/26 enhancement triplets can be found in section 12.3 of the [Enhanced Teletext specification ETS 300 706](https://web.archive.org/web/20160326062859/https://www.phecap.nl/download/enhenced-teletext-specs.pdf).
+The full behaviour of X/26 enhancement triplets can be found in section 12.3 of the [Enhanced Teletext specification ETS 300 706](https://www.etsi.org/deliver/etsi_en/300700_300799/300706/01.02.01_60/en_300706v010201p.pdf).
 
 ### Setting the Active Position
 The Active Position, whether set explicitly by a "Set Active Position" triplet or by a row or column triplet, can only be moved in screen address order i.e. from left to right within a row and then from top to bottom across rows. In other words:

decode.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2023 Gavin MacGregor
+ * Copyright (C) 2020-2024 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *
@@ -67,7 +67,7 @@ void TeletextPageDecode::Invocation::buildMap(int level)
 	int endTripletNumber;
 
 	if (m_endTripletNumber == -1)
-		endTripletNumber = m_tripletList->size();
+		endTripletNumber = m_tripletList->size()-1;
 	else
 		endTripletNumber = m_endTripletNumber;
 
@@ -98,26 +98,6 @@ void TeletextPageDecode::Invocation::buildMap(int level)
 			continue;
 
 		switch (triplet.modeExt()) {
-			case 0x21: // G1 character
-			case 0x22: // G3 character at Level 1.5
-			case 0x29: // G0 character
-			case 0x2b: // G3 character at Level 2.5
-			case 0x2f: // G2 character
-			case 0x30 ... 0x3f: // G0 character with diacritical
-				m_characterMap.insert(qMakePair(targetRow, targetColumn), triplet);
-				// Store rightmost column in this row for Adaptive Object attribute tracking
-				// QMap stores one value per key, QMap::insert will replace the value if the key already exists
-				m_rightMostColumn.insert(targetRow, targetColumn);
-				break;
-			case 0x20: // Foreground colour
-			case 0x23: // Background colour
-			case 0x27: // Additional flash functions
-			case 0x28: // Modified G0 and G2 character set designation
-			case 0x2c: // Display attributes
-			case 0x2e: // Font style
-				m_attributeMap.insert(qMakePair(targetRow, targetColumn), triplet);
-				m_rightMostColumn.insert(targetRow, targetColumn);
-				break;
 			case 0x00: // Full screen colour
 				if ((triplet.data() & 0x60) != 0x00)
 					break;
@@ -133,6 +113,31 @@ void TeletextPageDecode::Invocation::buildMap(int level)
 				if (targetRow == 0)
 					m_fullRowCLUTMap.insert(targetRow, triplet);
 				break;
+			case 0x20: // Foreground colour
+			case 0x23: // Background colour
+			case 0x27: // Additional flash functions
+			case 0x28: // Modified G0 and G2 character set designation
+			case 0x2c: // Display attributes
+			case 0x2e: // Font style
+				m_attributeMap.insert(qMakePair(targetRow, targetColumn), triplet);
+				// Store rightmost column in this row for Adaptive Object attribute tracking
+				// QMap stores one value per key, QMap::insert will replace the value if the key already exists
+				m_rightMostColumn.insert(targetRow, targetColumn);
+				break;
+			case 0x21: // G1 character
+			case 0x22: // G3 character at Level 1.5
+			case 0x29: // G0 character
+			case 0x2b: // G3 character at Level 2.5
+			case 0x2f: // G2 character
+				m_characterMap.insert(qMakePair(targetRow, targetColumn), triplet);
+				m_rightMostColumn.insert(targetRow, targetColumn);
+				break;
+			default:
+				if (triplet.modeExt() >= 0x30 && triplet.modeExt() <= 0x3f) {
+					// G0 character with diacritical
+					m_characterMap.insert(qMakePair(targetRow, targetColumn), triplet);
+					m_rightMostColumn.insert(targetRow, targetColumn);
+				}
 		}
 	}
 }
@@ -164,7 +169,8 @@ TeletextPageDecode::TeletextPageDecode()
 		m_rowHeight[r] = NormalHeight;
 		for (int c=0; c<72; c++) {
 			if (c < 40) {
-				m_cellLevel1Mosaic[r][c] = false;
+				m_cellLevel1MosaicAttr[r][c] = false;
+				m_cellLevel1MosaicChar[r][c] = false;
 				m_cellLevel1CharSet[r][c] = 0;
 			}
 			m_refresh[r][c] = true;
@@ -322,9 +328,10 @@ TeletextPageDecode::textCharacter TeletextPageDecode::characterFromTriplets(cons
 			case 0x2f: // G2 character
 				result = { charCode, 2, 0 };
 				break;
-			case 0x30 ... 0x3f: // G0 character with diacritical
+			default:
+				if (triplet.modeExt() >= 0x30 && triplet.modeExt() <= 0x3f)
+					// G0 character with diacritical
 					result = { charCode, 0, triplet.mode() & 0xf };
-				break;
 		}
 
 		if (m_level == 1)
@@ -466,8 +473,8 @@ void TeletextPageDecode::decodeRow(int r)
 		if (c == 0 || c == 40 || c == 56) {
 			level1CharSet = m_level1DefaultCharSet;
 
-			m_level1ActivePainter.g0CharSet = m_g0CharacterMap.value(m_defaultG0andG2, 0);
-			m_level1ActivePainter.g2CharSet = m_g2CharacterMap.value(m_defaultG0andG2, 7);
+			m_level1ActivePainter.result.g0Set = m_g0CharacterMap.value(m_defaultG0andG2, 0);
+			m_level1ActivePainter.result.g2Set = m_g2CharacterMap.value(m_defaultG0andG2, 7);
 
 			m_level1ActivePainter.attribute.flash.mode = 0;
 			m_level1ActivePainter.attribute.flash.ratePhase = 0;
@@ -661,12 +668,12 @@ void TeletextPageDecode::decodeRow(int r)
 								break;
 							case 0x28: // Modified G0 and G2 character set designation
 								if (m_level == 3 || triplet.data() == m_defaultG0andG2 || triplet.data() == m_secondG0andG2) {
-									painter->g0CharSet = m_g0CharacterMap.value(triplet.data(), 0);
-									painter->g2CharSet = m_g2CharacterMap.value(triplet.data(), 7);
+									painter->result.g0Set = m_g0CharacterMap.value(triplet.data(), 0);
+									painter->result.g2Set = m_g2CharacterMap.value(triplet.data(), 7);
 								} else if (m_secondG0andG2 == -1) {
 									m_secondG0andG2 = triplet.data();
-									painter->g0CharSet = m_g0CharacterMap.value(triplet.data(), 0);
-									painter->g2CharSet = m_g2CharacterMap.value(triplet.data(), 7);
+									painter->result.g0Set = m_g0CharacterMap.value(triplet.data(), 0);
+									painter->result.g2Set = m_g2CharacterMap.value(triplet.data(), 7);
 								}
 								break;
 							case 0x2c: // Display attributes
@@ -717,13 +724,18 @@ void TeletextPageDecode::decodeRow(int r)
 			}
 
 		// Level 1 character
+		if (c < 40) {
+			m_cellLevel1CharSet[r][c] = level1CharSet;
+			m_cellLevel1MosaicAttr[r][c] = level1Mosaics;
+			// Set to true on mosaic CHARACTER - not on blast through alphanumerics
+			m_cellLevel1MosaicChar[r][c] = level1Mosaics && (m_levelOnePage->character(r, c) & 0x20);
+		}
+
 		if (c < 40 && m_rowHeight[r] != BottomHalf) {
 			m_level1ActivePainter.result.character.diacritical = 0;
 			if (m_levelOnePage->character(r, c) >= 0x20) {
 				m_level1ActivePainter.result.character.code = m_levelOnePage->character(r, c);
-				// Set to true on mosaic character - not on blast through alphanumerics
-				m_cellLevel1Mosaic[r][c] = level1Mosaics && (m_levelOnePage->character(r, c) & 0x20);
-				if (m_cellLevel1Mosaic[r][c]) {
+				if (m_cellLevel1MosaicChar[r][c]) {
 					m_level1ActivePainter.result.character.set = 24 + (level1SeparatedMosaics || m_level1ActivePainter.attribute.display.underlineSeparated);
 					level1HoldMosaicCharacter = m_levelOnePage->character(r, c);
 					level1HoldMosaicSeparated = level1SeparatedMosaics;
@@ -737,9 +749,6 @@ void TeletextPageDecode::decodeRow(int r)
 			// In side panel or on bottom half of Level 1 double height row, no Level 1 characters here
 			m_level1ActivePainter.result.character = { 0x20, 0, 0 };
 
-		if (c < 40)
-			m_cellLevel1CharSet[r][c] = level1CharSet;
-
 		// X/26 characters
 
 		// Used to track if character was placed by X/26 data
@@ -754,9 +763,9 @@ void TeletextPageDecode::decodeRow(int r)
 			if (result.code != 0x00) {
 				m_level1ActivePainter.result.character = result;
 				if (result.set == 0)
-					m_level1ActivePainter.result.character.set = m_level1ActivePainter.g0CharSet;
+					m_level1ActivePainter.result.character.set = m_level1ActivePainter.result.g0Set;
 				else if (result.set == 2)
-					m_level1ActivePainter.result.character.set = m_level1ActivePainter.g2CharSet;
+					m_level1ActivePainter.result.character.set = m_level1ActivePainter.result.g2Set;
 				x26Character = 1;
 			}
 		} else if (m_level >= 2)
@@ -779,10 +788,10 @@ void TeletextPageDecode::decodeRow(int r)
 					painter->result.character = result;
 					switch (result.set) {
 						case 0:
-							painter->result.character.set = painter->g0CharSet;
+							painter->result.character.set = painter->result.g0Set;
 							break;
 						case 2:
-							painter->result.character.set = painter->g2CharSet;
+							painter->result.character.set = painter->result.g2Set;
 							break;
 						case 24:
 							if (painter->attribute.display.underlineSeparated)
@@ -848,8 +857,17 @@ void TeletextPageDecode::decodeRow(int r)
 							painter->bottomHalfCell[c].fragment = DoubleSizeBottomLeftQuarter;
 							painter->rightHalfCell = painter->result;
 							painter->rightHalfCell.fragment = DoubleSizeTopRightQuarter;
+							// The right half of this "if" statement (without the t != 2) is meant
+							// to a fix a bug where the bottom half of double-size characters in
+							// Passive Objects didn't appear.
+							// But the fix also caused the bottom right quarter of double-size
+							// characters in Active Objects to go missing when they overlapped
+							// the bottom half of a Level 1 double-height row.
+							// Hence the t != 2
+							if (t != 2 || painter->bottomHalfCell[c+1].character.code == 0x00) {
 								painter->bottomHalfCell[c+1] = painter->result;
 								painter->bottomHalfCell[c+1].fragment = DoubleSizeBottomRightQuarter;
+							}
 						} else {
 							// Double height
 							painter->result.fragment = DoubleHeightTopHalf;
@@ -936,7 +954,14 @@ void TeletextPageDecode::decodeRow(int r)
 		// Level 1 set-after spacing attributes
 		if (c < 40 && m_rowHeight[r] != BottomHalf)
 			switch (m_levelOnePage->character(r, c)) {
-				case 0x00 ... 0x07: // Alphanumeric and foreground colour
+				case 0x00:
+				case 0x01:
+				case 0x02:
+				case 0x03:
+				case 0x04:
+				case 0x05:
+				case 0x06:
+				case 0x07: // Alphanumeric and foreground colour
 					level1Mosaics = false;
 					level1ForegroundCLUT = m_levelOnePage->character(r, c);
 					if (m_level >= 2)
@@ -948,7 +973,14 @@ void TeletextPageDecode::decodeRow(int r)
 					level1HoldMosaicCharacter = 0x20;
 					level1HoldMosaicSeparated = false;
 					break;
-				case 0x10 ... 0x17: // Mosaic and foreground colour
+				case 0x10:
+				case 0x11:
+				case 0x12:
+				case 0x13:
+				case 0x14:
+				case 0x15:
+				case 0x16:
+				case 0x17: // Mosaic and foreground colour
 					level1Mosaics = true;
 					level1ForegroundCLUT = m_levelOnePage->character(r, c) & 0x07;
 					if (m_level >= 2)

decode.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2023 Gavin MacGregor
+ * Copyright (C) 2020-2024 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *
@@ -37,20 +37,22 @@ public:
 	TeletextPageDecode();
 	~TeletextPageDecode();
 	bool refresh(int r, int c) const { return m_refresh[r][c]; }
-	void setRefresh(int, int, bool);
+	void setRefresh(int r, int c, bool refresh);
 	void decodePage();
 	LevelOnePage *teletextPage() const { return m_levelOnePage; };
-	void setTeletextPage(LevelOnePage *);
+	void setTeletextPage(LevelOnePage *newCurrentPage);
 	void updateSidePanels();
 
 	unsigned char cellCharacterCode(int r, int c) const { return m_cell[r][c].character.code; };
 	int cellCharacterSet(int r, int c) const { return m_cell[r][c].character.set; };
 	int cellCharacterDiacritical(int r, int c) const { return m_cell[r][c].character.diacritical; };
+	int cellG0CharacterSet(int r, int c) const { return m_cell[r][c].g0Set; };
+	int cellG2CharacterSet(int r, int c) const { return m_cell[r][c].g2Set; };
 	int cellForegroundCLUT(int r, int c) const { return m_cell[r][c].attribute.foregroundCLUT; };
 	int cellBackgroundCLUT(int r, int c) const { return m_cell[r][c].attribute.backgroundCLUT; };
-	QColor cellForegroundQColor(int, int);
-	QColor cellBackgroundQColor(int, int);
-	QColor cellFlashForegroundQColor(int, int);
+	QColor cellForegroundQColor(int r, int c);
+	QColor cellBackgroundQColor(int r, int c);
+	QColor cellFlashForegroundQColor(int r, int c);
 	int cellFlashMode(int r, int c) const { return m_cell[r][c].attribute.flash.mode; };
 	int cellFlashRatePhase(int r, int c) const { return m_cell[r][c].attribute.flash.ratePhase; };
 	int cellFlash2HzPhaseNumber(int r, int c) const { return m_cell[r][c].attribute.flash.phase2HzShown; };
@@ -62,7 +64,8 @@ public:
 	bool cellItalic(int r, int c) const { return m_cell[r][c].attribute.style.italic; };
 	bool cellProportional(int r, int c) const { return m_cell[r][c].attribute.style.proportional; };
 
-	bool level1MosaicAttribute(int r, int c) const { return m_cellLevel1Mosaic[r][c]; };
+	bool level1MosaicAttr(int r, int c) const { return m_cellLevel1MosaicAttr[r][c]; };
+	bool level1MosaicChar(int r, int c) const { return m_cellLevel1MosaicChar[r][c]; };
 	int level1CharSet(int r, int c) const { return m_cellLevel1CharSet[r][c]; };
 
 	RowHeight rowHeight(int r) const { return m_rowHeight[r]; };
@@ -73,16 +76,16 @@ public:
 	int rightSidePanelColumns() const { return m_rightSidePanelColumns; };
 
 public slots:
-	void setLevel(int);
+	void setLevel(int level);
 
 signals:
-	void fullScreenColourChanged(QColor);
-	void fullRowColourChanged(int, QColor);
+	void fullScreenColourChanged(QColor newColour);
+	void fullRowColourChanged(int r, QColor newColour);
 	void sidePanelsChanged();
 
 protected:
-	inline void setFullScreenColour(int);
-	inline void setFullRowColour(int, int);
+	inline void setFullScreenColour(int newColour);
+	inline void setFullRowColour(int row, int newColour);
 
 	int m_finalFullScreenColour, m_level;
 	QColor m_finalFullScreenQColor;
@@ -164,6 +167,8 @@ private:
 		textCharacter character;
 		textAttributes attribute;
 		CharacterFragment fragment=NormalSize;
+		int g0Set=0;
+		int g2Set=7;
 	};
 
 	friend inline bool operator!=(const textCell &lhs, const textCell &rhs)
@@ -179,9 +184,6 @@ private:
 		textCell rightHalfCell;
 		textCell bottomHalfCell[72];
 
-		int g0CharSet=0;
-		int g2CharSet=7;
-
 		int styleSpreadRows=0;
 		int setProportionalRows[72], clearProportionalRows[72];
 		int setBoldRows[72], clearBoldRows[72];
@@ -218,15 +220,15 @@ private:
 
 		X26TripletList *tripletList() const { return m_tripletList; };
 		void clear();
-		void setTripletList(X26TripletList *);
+		void setTripletList(X26TripletList *tripletList);
 		int startTripletNumber() const { return m_startTripletNumber; };
-		void setStartTripletNumber(int);
+		void setStartTripletNumber(int n);
 		int endTripletNumber() const { return m_endTripletNumber; };
-		void setEndTripletNumber(int);
+		void setEndTripletNumber(int n);
 		int originRow() const { return m_originRow; };
 		int originColumn() const { return m_originColumn; };
-		void setOrigin(int, int);
-		void buildMap(int);
+		void setOrigin(int row, int column);
+		void buildMap(int level);
 
 		QList<QPair<int, int>> charPositions() const { return m_characterMap.uniqueKeys(); };
 		QList<QPair<int, int>> attrPositions() const { return m_attributeMap.uniqueKeys(); };
@@ -252,15 +254,16 @@ private:
 	static textPainter s_blankPainter;
 
 	void decodeRow(int r);
-	QColor cellQColor(int, int, ColourPart);
-	textCell& cellAtCharacterOrigin(int, int);
-	void buildInvocationList(Invocation &, int);
-	textCharacter characterFromTriplets(const QList<X26Triplet>);
-	inline void rotateFlashMovement(flashFunctions &);
+	QColor cellQColor(int r, int c, ColourPart colourPart);
+	textCell& cellAtCharacterOrigin(int r, int c);
+	void buildInvocationList(Invocation &invocation, int objectType);
+	textCharacter characterFromTriplets(const QList<X26Triplet> triplets);
+	inline void rotateFlashMovement(flashFunctions &flash);
 
 	bool m_refresh[25][72];
 	textCell m_cell[25][72];
-	bool m_cellLevel1Mosaic[25][40];
+	bool m_cellLevel1MosaicAttr[25][40];
+	bool m_cellLevel1MosaicChar[25][40];
 	int m_cellLevel1CharSet[25][40];
 	LevelOnePage* m_levelOnePage;
 	int m_fullRowColour[25];

document.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2023 Gavin MacGregor
+ * Copyright (C) 2020-2024 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *

document.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2023 Gavin MacGregor
+ * Copyright (C) 2020-2024 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *
@@ -67,19 +67,19 @@ public:
 	LevelOnePage* subPage(int p) const { return m_subPages[p]; }
 	LevelOnePage* currentSubPage() const { return m_subPages[m_currentSubPageIndex]; }
 	int currentSubPageIndex() const { return m_currentSubPageIndex; }
-	void selectSubPageIndex(int, bool=false);
+	void selectSubPageIndex(int newSubPageIndex, bool refresh=false);
 	void selectSubPageNext();
 	void selectSubPagePrevious();
-	void insertSubPage(int, bool);
-	void deleteSubPage(int);
-	void deleteSubPageToRecycle(int);
-	void unDeleteSubPageFromRecycle(int);
+	void insertSubPage(int beforeSubPageIndex, bool copySubPage);
+	void deleteSubPage(int subPageToDelete);
+	void deleteSubPageToRecycle(int subPageToRecycle);
+	void unDeleteSubPageFromRecycle(int subPage);
 	int pageNumber() const { return m_pageNumber; }
-	void setPageNumber(int);
-	void setPageNumberFromString(QString);
+	void setPageNumber(int pageNumber);
+	void setPageNumberFromString(QString pageNumberString);
 	QString description() const { return m_description; }
-	void setDescription(QString);
-	void setFastTextLinkPageNumberOnAllSubPages(int, int);
+	void setDescription(QString newDescription);
+	void setFastTextLinkPageNumberOnAllSubPages(int linkNumber, int pageNumber);
 	QUndoStack *undoStack() const { return m_undoStack; }
 	ClutModel *clutModel() const { return m_clutModel; }
 	int cursorRow() const { return m_cursorRow; }
@@ -88,7 +88,7 @@ public:
 	void cursorDown(bool shiftKey=false);
 	void cursorLeft(bool shiftKey=false);
 	void cursorRight(bool shiftKey=false);
-	void moveCursor(int, int, bool selectionInProgress=false);
+	void moveCursor(int cursorRow, int cursorColumn, bool selectionInProgress=false);
 	int selectionTopRow() const { return m_selectionCornerRow == -1 ? m_cursorRow : qMin(m_selectionCornerRow, m_cursorRow); }
 	int selectionBottomRow() const { return qMax(m_selectionCornerRow, m_cursorRow); }
 	int selectionLeftColumn() const { return m_selectionCornerColumn == -1 ? m_cursorColumn : qMin(m_selectionCornerColumn, m_cursorColumn); }
@@ -98,21 +98,21 @@ public:
 	bool selectionActive() const { return m_selectionSubPage == currentSubPage(); }
 	int selectionCornerRow() const { return m_selectionCornerRow == -1 ? m_cursorRow : m_selectionCornerRow; }
 	int selectionCornerColumn() const { return m_selectionCornerColumn == -1 ? m_cursorColumn : m_selectionCornerColumn; }
-	void setSelectionCorner(int, int);
-	void setSelection(int, int, int, int);
+	void setSelectionCorner(int row, int column);
+	void setSelection(int topRow, int leftColumn, int bottomRow, int rightColumn);
 	void cancelSelection();
 	int levelRequired() const;
 
 signals:
 	void cursorMoved();
 	void selectionMoved();
-	void colourChanged(int);
-	void contentsChange(int);
+	void colourChanged(int i);
+	void pageOptionsChanged();
 	void aboutToChangeSubPage();
 	void subPageSelected();
-	void refreshNeeded();
+	void contentsChanged();
 
-	void tripletCommandHighlight(int);
+	void tripletCommandHighlight(int tripletNumber);
 
 private:
 	QString m_description;

examples/Level3p5-CharDesignation.tti

@@ -0,0 +1,71 @@
+DE,Unlimited character sets with Level 3.5
+PN,19901
+SC,0001
+PS,8000
+CT,8,T
+OL,28,@@@|gpCu_@|wKpZA`UB_GQd^w}ww]_}_wM@D
+OL,28,D@@|g@@pC@|p@@CO|O@pA@\p]@@wAG\gYF@D
+OL,26,@laIA@Bma|mDRdo}eO~fo~gOoayA@BpawXH@Xi`
+OL,26,AYIaZia[Ib]ip^Iq_iq`IrbI~do}eO~fo~gOrA|
+OL,26,BXHPXi`YIaZia[Ib]ip^Iq_iq`IrbI~do}eO~fo~
+OL,26,CgOtawXHRXi`YIaZia[Ib]ip^Iq_iq`IrbI~do}
+OL,26,DeO~fo~gOvA|XhRXi`YIaZia[Ib]ip^Iq_iq`Ir
+OL,26,EbI~do}eO~fo~gOxawXh[Xi`YIaZia[Ib]ip^Iq
+OL,26,F_iq`IrbI~do}eO~fo~gOzA|XhjXi`YIaZia[Ib
+OL,26,G]ip^Iq_iq`IrbI~do}eO~fo~gO|awXhkXi`YIa
+OL,26,HZia[Ib]ip^Iq_iq`IrbI~do}eO~fo~gO~A|XH`
+OL,26,IXi`YIaZia[Ib]ip^Iq_iq`IrbI~do}eO~fo~gO
+OL,26,JhApCCCCCCCCCCCC
+OL,1, Level 3.5 allows unlimited char  F(1/2)
+OL,2, sets using the "Modified G0 and G2     
+OL,3, Character Set Designation" triplet.    
+OL,4,F                       `G0 lvl 1`` -G2`
+OL,5,FLevel 1 with         G ABCD abcd |     
+OL,6,F  Level 1.5 G2 chars                   
+OL,7,F`Char set```` `Bits``  `G0 X/26``` `G2`
+OL,8,FLatin        B0000xxxG                 
+OL,10,FCyrillic 1   B0100000G                 
+OL,11,F  Serbian/Croatian                     
+OL,12,FCyrillic 2   B0100100G                 
+OL,13,F  Russian/Bulgarian                    
+OL,14,FCyrillic 3   B0100101G                 
+OL,15,F  Ukranian                             
+OL,16,FGreek        B0110111G                 
+OL,18,FHebrew       B1010101G                 
+OL,20,FArabic       B1010111G                 
+OL,22,FLatin with   B1000000G                 
+OL,23,F  Arabic G2                            
+PN,19902
+SC,0002
+PS,8000
+CT,8,T
+OL,28,@@@|gpCu_@|wKpZA`UB_GQd^w}ww]_}_wM@D
+OL,28,D@@|g@@pC@|p@@CO|O@pA@\p]@@wAG\gYF@D
+OL,26,@layA@Bma|nD@Ao|BO}Co}DO~Eo~FOoayA@Bpaw
+OL,26,AhQaHH@qD@@H@rA|hQaHHPsD@@HPtawhQaHHRuD@
+OL,26,B@HRvA|hQaHhRwD@@hRxawhQaHh[yD@@h[zA|hQa
+OL,26,CHhj{D@@hj|awhQaHhk}D@@hk~A|hQaHH`D@@H`
+OL,26,DhAp_CxUaHI`Ii`JIaKiaLIbMibNIcOicPIdQid
+OL,26,ERIeSieTIfUifVIgWigXIhYihZIi[ii\Ij]ij^Ik
+OL,26,F_ik`IlailbImcimdIneinfIogioiD@Ao|BO}Co}
+OL,26,GDO~Eo~FOHIpIipJIqKiqLIrMirNIsOisPItQit
+OL,26,HRIuSiuTIvUivVIwWiwXIxYixZIy[iy\Iz]iz^I{
+OL,26,I_i{`I|ai|bI}ci}dI~ei~fIBBBBB
+OL,1, Level 3.5 allows unlimited char  F(2/2)
+OL,2, sets using the "Modified G0 and G2     
+OL,3, Character Set Designation" triplet.    
+OL,4,F`G2``` `G0 from level 1`````````` `NOS`
+OL,5,FL1.5  G@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_
+OL,6,        `abcdefghijklmnopqrstuvwxyz{|}~ 
+OL,7,F`G2``` `G0 from X/26 enhancements``````
+OL,8,FLatin G                                
+OL,10,FCyr 1 CG        CG    C G   C  FGCFC F 
+OL,11,       CG        CG    C G   C  FGCFC   
+OL,12,FCyr 2 CG        CG    C G   C  FGCFC F 
+OL,13,       CG        CG    C G   C  FGCFC   
+OL,14,FCyr 3 CG        CG    C G   C  FGCFC F 
+OL,15,       CG        CG    C G   C  FGCFC   
+OL,16,FGreek G                                
+OL,18,FHebrewG                                
+OL,20,FArabicG                                
+OL,22,FL/AbG2G                                

examples/SubObjects-TeletextStoreBag.tti

@@ -0,0 +1,36 @@
+DE,Parody of Microsoft Store icon
+PN,15400
+SC,0000
+PS,8000
+CT,8,T
+OL,28,@@@|gpCu_@|wKpZA`UB_GdN`M\LXKTJPILXwM@@
+OL,26,@iD@hq]jD@hq]kD@hq]lD@hq]mD@hq]nD@hq]oD@
+OL,26,Ahq]pD@ACLN@LPbZQ`OQcOXCOXbRqD@hQarD@hQa
+OL,26,BsD@ACLJcO_COtD@hQdvD@hQdxD@hQdzD@hQd|D@
+OL,26,CACLJBp^CO^Bx}D@hq]~D@hq]D@hq]_Cxu]A@L
+OL,26,DhshXCOxUaACLhshN@LQ@LYCOxUdACL_COiD@ACL
+OL,26,E_COxwhQ`LQaR@MRaS`MSaT@NTaU`NUaV@O
+OL,26,FVaBBBBBBBBBBBB
+OL,1,Twwf$$$                
+OL,2,T==9111                
+OL,3,Twwf$$$FWelcome to the 
+OL,4,T==9111                
+OL,5,Twwf$$$WTELETEXT STORE 
+OL,6,T==9111                
+OL,7,Twwf$$$                
+OL,8,T]           ^xWV]    tW\               
+OL,9,T]           ^WT\wwf$$W               
+OL,10,T]           ^WT\==911W               
+OL,11,T]       V]W                 \        
+OL,12,T]       W]                    \        
+OL,13,T]       W]                    \        
+OL,14,T]       W]Q   RS     \        
+OL,15,T]       W]Q   RS     \        
+OL,16,T]       W]Q                   \        
+OL,17,T]       W]Q  TUV     \        
+OL,18,T]       W]Q  TUV     \        
+OL,19,T]       W]                    \        
+OL,20,T]       Wo]                ^?\         
+OL,21,Twwf$$$                
+OL,22,T==9111                
+OL,23,Twwf$$$                

examples/Template-ActivePosition.tti

@@ -0,0 +1,9 @@
+PN,19900
+SC,0000
+PS,8000
+CT,8,T
+OL,26,@iD@@kfjD@@kfkD@@kflD@@kfmD@@kfnD@@kfoD@
+OL,26,A@kfpD@@kfqD@@kfrD@@kfsD@@kftD@@kfuD@@kf
+OL,26,BvD@@kfwD@@kfxD@@kfxD@@kfyD@@kfzD@@kf{D@
+OL,26,C@kf|D@@kf}D@@kf~D@@kfD@@kfCCCC
+OL,1,  Active Position across every row      

keymap.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2023 Gavin MacGregor
+ * Copyright (C) 2020-2024 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *
@@ -28,304 +28,304 @@ static const QMap<QChar, char> keymapping[24] = {
 	},
 
 	{ // 1 Cyrillic G0 1 Serbian/Croatian
-		{ 0x0427, 0x40 }, // Ч CYRILLIC CAPITAL LETTER CHE
-		{ 0x0410, 0x41 }, // А CYRILLIC CAPITAL LETTER A
-		{ 0x0411, 0x42 }, // Б CYRILLIC CAPITAL LETTER BE
-		{ 0x0426, 0x43 }, // Ц CYRILLIC CAPITAL LETTER TSE
-		{ 0x0414, 0x44 }, // Д CYRILLIC CAPITAL LETTER DE
-		{ 0x0415, 0x45 }, // Е CYRILLIC CAPITAL LETTER IE
-		{ 0x0424, 0x46 }, // Ф CYRILLIC CAPITAL LETTER EF
-		{ 0x0413, 0x47 }, // Г CYRILLIC CAPITAL LETTER GHE
-		{ 0x0425, 0x48 }, // Х CYRILLIC CAPITAL LETTER HA
-		{ 0x0418, 0x49 }, // И CYRILLIC CAPITAL LETTER I
-		{ 0x0408, 0x4a }, // Ј CYRILLIC CAPITAL LETTER JE
-		{ 0x041a, 0x4b }, // К CYRILLIC CAPITAL LETTER KA
-		{ 0x041b, 0x4c }, // Л CYRILLIC CAPITAL LETTER EL
-		{ 0x041c, 0x4d }, // М CYRILLIC CAPITAL LETTER EM
-		{ 0x041d, 0x4e }, // Н CYRILLIC CAPITAL LETTER EN
-		{ 0x041e, 0x4f }, // О CYRILLIC CAPITAL LETTER O
-		{ 0x041f, 0x50 }, // П CYRILLIC CAPITAL LETTER PE
-		{ 0x040c, 0x51 }, // Ќ CYRILLIC CAPITAL LETTER KJE
-		{ 0x0420, 0x52 }, // Р CYRILLIC CAPITAL LETTER ER
-		{ 0x0421, 0x53 }, // С CYRILLIC CAPITAL LETTER ES
-		{ 0x0422, 0x54 }, // Т CYRILLIC CAPITAL LETTER TE
-		{ 0x0423, 0x55 }, // У CYRILLIC CAPITAL LETTER U
-		{ 0x0412, 0x56 }, // В CYRILLIC CAPITAL LETTER VE
-		{ 0x0403, 0x57 }, // Ѓ CYRILLIC CAPITAL LETTER GJE
-		{ 0x0409, 0x58 }, // Љ CYRILLIC CAPITAL LETTER LJE
-		{ 0x040a, 0x59 }, // Њ CYRILLIC CAPITAL LETTER NJE
-		{ 0x0417, 0x5a }, // З CYRILLIC CAPITAL LETTER ZE
-		{ 0x040b, 0x5b }, // Ћ CYRILLIC CAPITAL LETTER TSHE
-		{ 0x0416, 0x5c }, // Ж CYRILLIC CAPITAL LETTER ZHE
-		{ 0x0402, 0x5d }, // Ђ CYRILLIC CAPITAL LETTER DJE
-		{ 0x0428, 0x5e }, // Ш CYRILLIC CAPITAL LETTER SHA
-		{ 0x040f, 0x5f }, // Џ CYRILLIC CAPITAL LETTER DZHE
-		{ 0x0447, 0x60 }, // ч CYRILLIC SMALL LETTER CHE
-		{ 0x0430, 0x61 }, // а CYRILLIC SMALL LETTER A
-		{ 0x0431, 0x62 }, // б CYRILLIC SMALL LETTER BE
-		{ 0x0446, 0x63 }, // ц CYRILLIC SMALL LETTER TSE
-		{ 0x0434, 0x64 }, // д CYRILLIC SMALL LETTER DE
-		{ 0x0435, 0x65 }, // е CYRILLIC SMALL LETTER IE
-		{ 0x0444, 0x66 }, // ф CYRILLIC SMALL LETTER EF
-		{ 0x0433, 0x67 }, // г CYRILLIC SMALL LETTER GHE
-		{ 0x0445, 0x68 }, // х CYRILLIC SMALL LETTER HA
-		{ 0x0438, 0x69 }, // и CYRILLIC SMALL LETTER I
-		{ 0x0458, 0x6a }, // ј CYRILLIC SMALL LETTER JE
-		{ 0x043a, 0x6b }, // к CYRILLIC SMALL LETTER KA
-		{ 0x043b, 0x6c }, // л CYRILLIC SMALL LETTER EL
-		{ 0x043c, 0x6d }, // м CYRILLIC SMALL LETTER EM
-		{ 0x043d, 0x6e }, // н CYRILLIC SMALL LETTER EN
-		{ 0x043e, 0x6f }, // о CYRILLIC SMALL LETTER O
-		{ 0x043f, 0x70 }, // п CYRILLIC SMALL LETTER PE
-		{ 0x045c, 0x71 }, // ќ CYRILLIC SMALL LETTER KJE
-		{ 0x0440, 0x72 }, // р CYRILLIC SMALL LETTER ER
-		{ 0x0441, 0x73 }, // с CYRILLIC SMALL LETTER ES
-		{ 0x0442, 0x74 }, // т CYRILLIC SMALL LETTER TE
-		{ 0x0443, 0x75 }, // у CYRILLIC SMALL LETTER U
-		{ 0x0432, 0x76 }, // в CYRILLIC SMALL LETTER VE
-		{ 0x0453, 0x77 }, // ѓ CYRILLIC SMALL LETTER GJE
-		{ 0x0459, 0x78 }, // љ CYRILLIC SMALL LETTER LJE
-		{ 0x045a, 0x79 }, // њ CYRILLIC SMALL LETTER NJE
-		{ 0x0437, 0x7a }, // з CYRILLIC SMALL LETTER ZE
-		{ 0x045b, 0x7b }, // ћ CYRILLIC SMALL LETTER TSHE
-		{ 0x0436, 0x7c }, // ж CYRILLIC SMALL LETTER ZHE
-		{ 0x0452, 0x7d }, // ђ CYRILLIC SMALL LETTER DJE
-		{ 0x0448, 0x7e }  // ш CYRILLIC SMALL LETTER SHA
+		{ QChar(0x0427), 0x40 }, // Ч CYRILLIC CAPITAL LETTER CHE
+		{ QChar(0x0410), 0x41 }, // А CYRILLIC CAPITAL LETTER A
+		{ QChar(0x0411), 0x42 }, // Б CYRILLIC CAPITAL LETTER BE
+		{ QChar(0x0426), 0x43 }, // Ц CYRILLIC CAPITAL LETTER TSE
+		{ QChar(0x0414), 0x44 }, // Д CYRILLIC CAPITAL LETTER DE
+		{ QChar(0x0415), 0x45 }, // Е CYRILLIC CAPITAL LETTER IE
+		{ QChar(0x0424), 0x46 }, // Ф CYRILLIC CAPITAL LETTER EF
+		{ QChar(0x0413), 0x47 }, // Г CYRILLIC CAPITAL LETTER GHE
+		{ QChar(0x0425), 0x48 }, // Х CYRILLIC CAPITAL LETTER HA
+		{ QChar(0x0418), 0x49 }, // И CYRILLIC CAPITAL LETTER I
+		{ QChar(0x0408), 0x4a }, // Ј CYRILLIC CAPITAL LETTER JE
+		{ QChar(0x041a), 0x4b }, // К CYRILLIC CAPITAL LETTER KA
+		{ QChar(0x041b), 0x4c }, // Л CYRILLIC CAPITAL LETTER EL
+		{ QChar(0x041c), 0x4d }, // М CYRILLIC CAPITAL LETTER EM
+		{ QChar(0x041d), 0x4e }, // Н CYRILLIC CAPITAL LETTER EN
+		{ QChar(0x041e), 0x4f }, // О CYRILLIC CAPITAL LETTER O
+		{ QChar(0x041f), 0x50 }, // П CYRILLIC CAPITAL LETTER PE
+		{ QChar(0x040c), 0x51 }, // Ќ CYRILLIC CAPITAL LETTER KJE
+		{ QChar(0x0420), 0x52 }, // Р CYRILLIC CAPITAL LETTER ER
+		{ QChar(0x0421), 0x53 }, // С CYRILLIC CAPITAL LETTER ES
+		{ QChar(0x0422), 0x54 }, // Т CYRILLIC CAPITAL LETTER TE
+		{ QChar(0x0423), 0x55 }, // У CYRILLIC CAPITAL LETTER U
+		{ QChar(0x0412), 0x56 }, // В CYRILLIC CAPITAL LETTER VE
+		{ QChar(0x0403), 0x57 }, // Ѓ CYRILLIC CAPITAL LETTER GJE
+		{ QChar(0x0409), 0x58 }, // Љ CYRILLIC CAPITAL LETTER LJE
+		{ QChar(0x040a), 0x59 }, // Њ CYRILLIC CAPITAL LETTER NJE
+		{ QChar(0x0417), 0x5a }, // З CYRILLIC CAPITAL LETTER ZE
+		{ QChar(0x040b), 0x5b }, // Ћ CYRILLIC CAPITAL LETTER TSHE
+		{ QChar(0x0416), 0x5c }, // Ж CYRILLIC CAPITAL LETTER ZHE
+		{ QChar(0x0402), 0x5d }, // Ђ CYRILLIC CAPITAL LETTER DJE
+		{ QChar(0x0428), 0x5e }, // Ш CYRILLIC CAPITAL LETTER SHA
+		{ QChar(0x040f), 0x5f }, // Џ CYRILLIC CAPITAL LETTER DZHE
+		{ QChar(0x0447), 0x60 }, // ч CYRILLIC SMALL LETTER CHE
+		{ QChar(0x0430), 0x61 }, // а CYRILLIC SMALL LETTER A
+		{ QChar(0x0431), 0x62 }, // б CYRILLIC SMALL LETTER BE
+		{ QChar(0x0446), 0x63 }, // ц CYRILLIC SMALL LETTER TSE
+		{ QChar(0x0434), 0x64 }, // д CYRILLIC SMALL LETTER DE
+		{ QChar(0x0435), 0x65 }, // е CYRILLIC SMALL LETTER IE
+		{ QChar(0x0444), 0x66 }, // ф CYRILLIC SMALL LETTER EF
+		{ QChar(0x0433), 0x67 }, // г CYRILLIC SMALL LETTER GHE
+		{ QChar(0x0445), 0x68 }, // х CYRILLIC SMALL LETTER HA
+		{ QChar(0x0438), 0x69 }, // и CYRILLIC SMALL LETTER I
+		{ QChar(0x0458), 0x6a }, // ј CYRILLIC SMALL LETTER JE
+		{ QChar(0x043a), 0x6b }, // к CYRILLIC SMALL LETTER KA
+		{ QChar(0x043b), 0x6c }, // л CYRILLIC SMALL LETTER EL
+		{ QChar(0x043c), 0x6d }, // м CYRILLIC SMALL LETTER EM
+		{ QChar(0x043d), 0x6e }, // н CYRILLIC SMALL LETTER EN
+		{ QChar(0x043e), 0x6f }, // о CYRILLIC SMALL LETTER O
+		{ QChar(0x043f), 0x70 }, // п CYRILLIC SMALL LETTER PE
+		{ QChar(0x045c), 0x71 }, // ќ CYRILLIC SMALL LETTER KJE
+		{ QChar(0x0440), 0x72 }, // р CYRILLIC SMALL LETTER ER
+		{ QChar(0x0441), 0x73 }, // с CYRILLIC SMALL LETTER ES
+		{ QChar(0x0442), 0x74 }, // т CYRILLIC SMALL LETTER TE
+		{ QChar(0x0443), 0x75 }, // у CYRILLIC SMALL LETTER U
+		{ QChar(0x0432), 0x76 }, // в CYRILLIC SMALL LETTER VE
+		{ QChar(0x0453), 0x77 }, // ѓ CYRILLIC SMALL LETTER GJE
+		{ QChar(0x0459), 0x78 }, // љ CYRILLIC SMALL LETTER LJE
+		{ QChar(0x045a), 0x79 }, // њ CYRILLIC SMALL LETTER NJE
+		{ QChar(0x0437), 0x7a }, // з CYRILLIC SMALL LETTER ZE
+		{ QChar(0x045b), 0x7b }, // ћ CYRILLIC SMALL LETTER TSHE
+		{ QChar(0x0436), 0x7c }, // ж CYRILLIC SMALL LETTER ZHE
+		{ QChar(0x0452), 0x7d }, // ђ CYRILLIC SMALL LETTER DJE
+		{ QChar(0x0448), 0x7e }  // ш CYRILLIC SMALL LETTER SHA
 	},
 
 	{ // 2 Cyrillic G0 2 Russian/Bulgarian
-		{ 0x044b, 0x26 }, // ы CYRILLIC SMALL LETTER YERU
-		{ 0x042e, 0x40 }, // Ю CYRILLIC CAPITAL LETTER YU
-		{ 0x0410, 0x41 }, // А CYRILLIC CAPITAL LETTER A
-		{ 0x0411, 0x42 }, // Б CYRILLIC CAPITAL LETTER BE
-		{ 0x0426, 0x43 }, // Ц CYRILLIC CAPITAL LETTER TSE
-		{ 0x0414, 0x44 }, // Д CYRILLIC CAPITAL LETTER DE
-		{ 0x0415, 0x45 }, // Е CYRILLIC CAPITAL LETTER IE
-		{ 0x0424, 0x46 }, // Ф CYRILLIC CAPITAL LETTER EF
-		{ 0x0413, 0x47 }, // Г CYRILLIC CAPITAL LETTER GHE
-		{ 0x0425, 0x48 }, // Х CYRILLIC CAPITAL LETTER HA
-		{ 0x0418, 0x49 }, // И CYRILLIC CAPITAL LETTER I
-		{ 0x0419, 0x4a }, // Й CYRILLIC CAPITAL LETTER SHORT I
-		{ 0x041a, 0x4b }, // К CYRILLIC CAPITAL LETTER KA
-		{ 0x041b, 0x4c }, // Л CYRILLIC CAPITAL LETTER EL
-		{ 0x041c, 0x4d }, // М CYRILLIC CAPITAL LETTER EM
-		{ 0x041d, 0x4e }, // Н CYRILLIC CAPITAL LETTER EN
-		{ 0x041e, 0x4f }, // О CYRILLIC CAPITAL LETTER O
-		{ 0x041f, 0x50 }, // П CYRILLIC CAPITAL LETTER PE
-		{ 0x042f, 0x51 }, // Я CYRILLIC CAPITAL LETTER YA
-		{ 0x0420, 0x52 }, // Р CYRILLIC CAPITAL LETTER ER
-		{ 0x0421, 0x53 }, // С CYRILLIC CAPITAL LETTER ES
-		{ 0x0422, 0x54 }, // Т CYRILLIC CAPITAL LETTER TE
-		{ 0x0423, 0x55 }, // У CYRILLIC CAPITAL LETTER U
-		{ 0x0416, 0x56 }, // Ж CYRILLIC CAPITAL LETTER ZHE
-		{ 0x0412, 0x57 }, // В CYRILLIC CAPITAL LETTER VE
-		{ 0x042c, 0x58 }, // Ь CYRILLIC CAPITAL LETTER SOFT SIGN
-		{ 0x042a, 0x59 }, // Ъ CYRILLIC CAPITAL LETTER HARD SIGN
-		{ 0x0417, 0x5a }, // З CYRILLIC CAPITAL LETTER ZE
-		{ 0x0428, 0x5b }, // Ш CYRILLIC CAPITAL LETTER SHA
-		{ 0x042d, 0x5c }, // Э CYRILLIC CAPITAL LETTER E
-		{ 0x0429, 0x5d }, // Щ CYRILLIC CAPITAL LETTER SHCHA
-		{ 0x0427, 0x5e }, // Ч CYRILLIC CAPITAL LETTER CHE
-		{ 0x042b, 0x5f }, // Ы CYRILLIC CAPITAL LETTER YERU
-		{ 0x044e, 0x60 }, // ю CYRILLIC SMALL LETTER YU
-		{ 0x0430, 0x61 }, // а CYRILLIC SMALL LETTER A
-		{ 0x0431, 0x62 }, // б CYRILLIC SMALL LETTER BE
-		{ 0x0446, 0x63 }, // ц CYRILLIC SMALL LETTER TSE
-		{ 0x0434, 0x64 }, // д CYRILLIC SMALL LETTER DE
-		{ 0x0435, 0x65 }, // е CYRILLIC SMALL LETTER IE
-		{ 0x0444, 0x66 }, // ф CYRILLIC SMALL LETTER EF
-		{ 0x0433, 0x67 }, // г CYRILLIC SMALL LETTER GHE
-		{ 0x0445, 0x68 }, // х CYRILLIC SMALL LETTER HA
-		{ 0x0438, 0x69 }, // и CYRILLIC SMALL LETTER I
-		{ 0x0439, 0x6a }, // й CYRILLIC SMALL LETTER SHORT I
-		{ 0x043a, 0x6b }, // к CYRILLIC SMALL LETTER KA
-		{ 0x043b, 0x6c }, // л CYRILLIC SMALL LETTER EL
-		{ 0x043c, 0x6d }, // м CYRILLIC SMALL LETTER EM
-		{ 0x043d, 0x6e }, // н CYRILLIC SMALL LETTER EN
-		{ 0x043e, 0x6f }, // о CYRILLIC SMALL LETTER O
-		{ 0x043f, 0x70 }, // п CYRILLIC SMALL LETTER PE
-		{ 0x044f, 0x71 }, // я CYRILLIC SMALL LETTER YA
-		{ 0x0440, 0x72 }, // р CYRILLIC SMALL LETTER ER
-		{ 0x0441, 0x73 }, // с CYRILLIC SMALL LETTER ES
-		{ 0x0442, 0x74 }, // т CYRILLIC SMALL LETTER TE
-		{ 0x0443, 0x75 }, // у CYRILLIC SMALL LETTER U
-		{ 0x0436, 0x76 }, // ж CYRILLIC SMALL LETTER ZHE
-		{ 0x0432, 0x77 }, // в CYRILLIC SMALL LETTER VE
-		{ 0x044c, 0x78 }, // ь CYRILLIC SMALL LETTER SOFT SIGN
-		{ 0x044a, 0x79 }, // ъ CYRILLIC SMALL LETTER HARD SIGN
-		{ 0x0437, 0x7a }, // з CYRILLIC SMALL LETTER ZE
-		{ 0x0448, 0x7b }, // ш CYRILLIC SMALL LETTER SHA
-		{ 0x044d, 0x7c }, // э CYRILLIC SMALL LETTER E
-		{ 0x0449, 0x7d }, // щ CYRILLIC SMALL LETTER SHCHA
-		{ 0x0447, 0x7e }  // ч CYRILLIC SMALL LETTER CHE
+		{ QChar(0x044b), 0x26 }, // ы CYRILLIC SMALL LETTER YERU
+		{ QChar(0x042e), 0x40 }, // Ю CYRILLIC CAPITAL LETTER YU
+		{ QChar(0x0410), 0x41 }, // А CYRILLIC CAPITAL LETTER A
+		{ QChar(0x0411), 0x42 }, // Б CYRILLIC CAPITAL LETTER BE
+		{ QChar(0x0426), 0x43 }, // Ц CYRILLIC CAPITAL LETTER TSE
+		{ QChar(0x0414), 0x44 }, // Д CYRILLIC CAPITAL LETTER DE
+		{ QChar(0x0415), 0x45 }, // Е CYRILLIC CAPITAL LETTER IE
+		{ QChar(0x0424), 0x46 }, // Ф CYRILLIC CAPITAL LETTER EF
+		{ QChar(0x0413), 0x47 }, // Г CYRILLIC CAPITAL LETTER GHE
+		{ QChar(0x0425), 0x48 }, // Х CYRILLIC CAPITAL LETTER HA
+		{ QChar(0x0418), 0x49 }, // И CYRILLIC CAPITAL LETTER I
+		{ QChar(0x0419), 0x4a }, // Й CYRILLIC CAPITAL LETTER SHORT I
+		{ QChar(0x041a), 0x4b }, // К CYRILLIC CAPITAL LETTER KA
+		{ QChar(0x041b), 0x4c }, // Л CYRILLIC CAPITAL LETTER EL
+		{ QChar(0x041c), 0x4d }, // М CYRILLIC CAPITAL LETTER EM
+		{ QChar(0x041d), 0x4e }, // Н CYRILLIC CAPITAL LETTER EN
+		{ QChar(0x041e), 0x4f }, // О CYRILLIC CAPITAL LETTER O
+		{ QChar(0x041f), 0x50 }, // П CYRILLIC CAPITAL LETTER PE
+		{ QChar(0x042f), 0x51 }, // Я CYRILLIC CAPITAL LETTER YA
+		{ QChar(0x0420), 0x52 }, // Р CYRILLIC CAPITAL LETTER ER
+		{ QChar(0x0421), 0x53 }, // С CYRILLIC CAPITAL LETTER ES
+		{ QChar(0x0422), 0x54 }, // Т CYRILLIC CAPITAL LETTER TE
+		{ QChar(0x0423), 0x55 }, // У CYRILLIC CAPITAL LETTER U
+		{ QChar(0x0416), 0x56 }, // Ж CYRILLIC CAPITAL LETTER ZHE
+		{ QChar(0x0412), 0x57 }, // В CYRILLIC CAPITAL LETTER VE
+		{ QChar(0x042c), 0x58 }, // Ь CYRILLIC CAPITAL LETTER SOFT SIGN
+		{ QChar(0x042a), 0x59 }, // Ъ CYRILLIC CAPITAL LETTER HARD SIGN
+		{ QChar(0x0417), 0x5a }, // З CYRILLIC CAPITAL LETTER ZE
+		{ QChar(0x0428), 0x5b }, // Ш CYRILLIC CAPITAL LETTER SHA
+		{ QChar(0x042d), 0x5c }, // Э CYRILLIC CAPITAL LETTER E
+		{ QChar(0x0429), 0x5d }, // Щ CYRILLIC CAPITAL LETTER SHCHA
+		{ QChar(0x0427), 0x5e }, // Ч CYRILLIC CAPITAL LETTER CHE
+		{ QChar(0x042b), 0x5f }, // Ы CYRILLIC CAPITAL LETTER YERU
+		{ QChar(0x044e), 0x60 }, // ю CYRILLIC SMALL LETTER YU
+		{ QChar(0x0430), 0x61 }, // а CYRILLIC SMALL LETTER A
+		{ QChar(0x0431), 0x62 }, // б CYRILLIC SMALL LETTER BE
+		{ QChar(0x0446), 0x63 }, // ц CYRILLIC SMALL LETTER TSE
+		{ QChar(0x0434), 0x64 }, // д CYRILLIC SMALL LETTER DE
+		{ QChar(0x0435), 0x65 }, // е CYRILLIC SMALL LETTER IE
+		{ QChar(0x0444), 0x66 }, // ф CYRILLIC SMALL LETTER EF
+		{ QChar(0x0433), 0x67 }, // г CYRILLIC SMALL LETTER GHE
+		{ QChar(0x0445), 0x68 }, // х CYRILLIC SMALL LETTER HA
+		{ QChar(0x0438), 0x69 }, // и CYRILLIC SMALL LETTER I
+		{ QChar(0x0439), 0x6a }, // й CYRILLIC SMALL LETTER SHORT I
+		{ QChar(0x043a), 0x6b }, // к CYRILLIC SMALL LETTER KA
+		{ QChar(0x043b), 0x6c }, // л CYRILLIC SMALL LETTER EL
+		{ QChar(0x043c), 0x6d }, // м CYRILLIC SMALL LETTER EM
+		{ QChar(0x043d), 0x6e }, // н CYRILLIC SMALL LETTER EN
+		{ QChar(0x043e), 0x6f }, // о CYRILLIC SMALL LETTER O
+		{ QChar(0x043f), 0x70 }, // п CYRILLIC SMALL LETTER PE
+		{ QChar(0x044f), 0x71 }, // я CYRILLIC SMALL LETTER YA
+		{ QChar(0x0440), 0x72 }, // р CYRILLIC SMALL LETTER ER
+		{ QChar(0x0441), 0x73 }, // с CYRILLIC SMALL LETTER ES
+		{ QChar(0x0442), 0x74 }, // т CYRILLIC SMALL LETTER TE
+		{ QChar(0x0443), 0x75 }, // у CYRILLIC SMALL LETTER U
+		{ QChar(0x0436), 0x76 }, // ж CYRILLIC SMALL LETTER ZHE
+		{ QChar(0x0432), 0x77 }, // в CYRILLIC SMALL LETTER VE
+		{ QChar(0x044c), 0x78 }, // ь CYRILLIC SMALL LETTER SOFT SIGN
+		{ QChar(0x044a), 0x79 }, // ъ CYRILLIC SMALL LETTER HARD SIGN
+		{ QChar(0x0437), 0x7a }, // з CYRILLIC SMALL LETTER ZE
+		{ QChar(0x0448), 0x7b }, // ш CYRILLIC SMALL LETTER SHA
+		{ QChar(0x044d), 0x7c }, // э CYRILLIC SMALL LETTER E
+		{ QChar(0x0449), 0x7d }, // щ CYRILLIC SMALL LETTER SHCHA
+		{ QChar(0x0447), 0x7e }  // ч CYRILLIC SMALL LETTER CHE
 	},
 
 	{ // 3 Cyrillic G0 3 Ukranian
-		{ 0x0457, 0x26 }, // ї CYRILLIC SMALL LETTER YI
-		{ 0x042e, 0x40 }, // Ю CYRILLIC CAPITAL LETTER YU
-		{ 0x0410, 0x41 }, // А CYRILLIC CAPITAL LETTER A
-		{ 0x0411, 0x42 }, // Б CYRILLIC CAPITAL LETTER BE
-		{ 0x0426, 0x43 }, // Ц CYRILLIC CAPITAL LETTER TSE
-		{ 0x0414, 0x44 }, // Д CYRILLIC CAPITAL LETTER DE
-		{ 0x0415, 0x45 }, // Е CYRILLIC CAPITAL LETTER IE
-		{ 0x0424, 0x46 }, // Ф CYRILLIC CAPITAL LETTER EF
-		{ 0x0413, 0x47 }, // Г CYRILLIC CAPITAL LETTER GHE
-		{ 0x0425, 0x48 }, // Х CYRILLIC CAPITAL LETTER HA
-		{ 0x0418, 0x49 }, // И CYRILLIC CAPITAL LETTER I
-		{ 0x0419, 0x4a }, // Й CYRILLIC CAPITAL LETTER SHORT I
-		{ 0x041a, 0x4b }, // К CYRILLIC CAPITAL LETTER KA
-		{ 0x041b, 0x4c }, // Л CYRILLIC CAPITAL LETTER EL
-		{ 0x041c, 0x4d }, // М CYRILLIC CAPITAL LETTER EM
-		{ 0x041d, 0x4e }, // Н CYRILLIC CAPITAL LETTER EN
-		{ 0x041e, 0x4f }, // О CYRILLIC CAPITAL LETTER O
-		{ 0x041f, 0x50 }, // П CYRILLIC CAPITAL LETTER PE
-		{ 0x042f, 0x51 }, // Я CYRILLIC CAPITAL LETTER YA
-		{ 0x0420, 0x52 }, // Р CYRILLIC CAPITAL LETTER ER
-		{ 0x0421, 0x53 }, // С CYRILLIC CAPITAL LETTER ES
-		{ 0x0422, 0x54 }, // Т CYRILLIC CAPITAL LETTER TE
-		{ 0x0423, 0x55 }, // У CYRILLIC CAPITAL LETTER U
-		{ 0x0416, 0x56 }, // Ж CYRILLIC CAPITAL LETTER ZHE
-		{ 0x0412, 0x57 }, // В CYRILLIC CAPITAL LETTER VE
-		{ 0x042c, 0x58 }, // Ь CYRILLIC CAPITAL LETTER SOFT SIGN
-		{ 0x0406, 0x59 }, // І CYRILLIC CAPITAL LETTER BYELORUSSIAN-UKRAINIAN I
-		{ 0x0417, 0x5a }, // З CYRILLIC CAPITAL LETTER ZE
-		{ 0x0428, 0x5b }, // Ш CYRILLIC CAPITAL LETTER SHA
-		{ 0x0404, 0x5c }, // Є CYRILLIC CAPITAL LETTER UKRAINIAN IE
-		{ 0x0429, 0x5d }, // Щ CYRILLIC CAPITAL LETTER SHCHA
-		{ 0x0427, 0x5e }, // Ч CYRILLIC CAPITAL LETTER CHE
-		{ 0x0407, 0x5f }, // Ї CYRILLIC CAPITAL LETTER YI
-		{ 0x044e, 0x60 }, // ю CYRILLIC SMALL LETTER YU
-		{ 0x0430, 0x61 }, // а CYRILLIC SMALL LETTER A
-		{ 0x0431, 0x62 }, // б CYRILLIC SMALL LETTER BE
-		{ 0x0446, 0x63 }, // ц CYRILLIC SMALL LETTER TSE
-		{ 0x0434, 0x64 }, // д CYRILLIC SMALL LETTER DE
-		{ 0x0435, 0x65 }, // е CYRILLIC SMALL LETTER IE
-		{ 0x0444, 0x66 }, // ф CYRILLIC SMALL LETTER EF
-		{ 0x0433, 0x67 }, // г CYRILLIC SMALL LETTER GHE
-		{ 0x0445, 0x68 }, // х CYRILLIC SMALL LETTER HA
-		{ 0x0438, 0x69 }, // и CYRILLIC SMALL LETTER I
-		{ 0x0439, 0x6a }, // й CYRILLIC SMALL LETTER SHORT I
-		{ 0x043a, 0x6b }, // к CYRILLIC SMALL LETTER KA
-		{ 0x043b, 0x6c }, // л CYRILLIC SMALL LETTER EL
-		{ 0x043c, 0x6d }, // м CYRILLIC SMALL LETTER EM
-		{ 0x043d, 0x6e }, // н CYRILLIC SMALL LETTER EN
-		{ 0x043e, 0x6f }, // о CYRILLIC SMALL LETTER O
-		{ 0x043f, 0x70 }, // п CYRILLIC SMALL LETTER PE
-		{ 0x044f, 0x71 }, // я CYRILLIC SMALL LETTER YA
-		{ 0x0440, 0x72 }, // р CYRILLIC SMALL LETTER ER
-		{ 0x0441, 0x73 }, // с CYRILLIC SMALL LETTER ES
-		{ 0x0442, 0x74 }, // т CYRILLIC SMALL LETTER TE
-		{ 0x0443, 0x75 }, // у CYRILLIC SMALL LETTER U
-		{ 0x0436, 0x76 }, // ж CYRILLIC SMALL LETTER ZHE
-		{ 0x0432, 0x77 }, // в CYRILLIC SMALL LETTER VE
-		{ 0x044c, 0x78 }, // ь CYRILLIC SMALL LETTER SOFT SIGN
-		{ 0x0456, 0x79 }, // і CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I
-		{ 0x0437, 0x7a }, // з CYRILLIC SMALL LETTER ZE
-		{ 0x0448, 0x7b }, // ш CYRILLIC SMALL LETTER SHA
-		{ 0x0454, 0x7c }, // є CYRILLIC SMALL LETTER UKRAINIAN IE
-		{ 0x0449, 0x7d }, // щ CYRILLIC SMALL LETTER SHCHA
-		{ 0x0447, 0x7e }  // ч CYRILLIC SMALL LETTER CHE
+		{ QChar(0x0457), 0x26 }, // ї CYRILLIC SMALL LETTER YI
+		{ QChar(0x042e), 0x40 }, // Ю CYRILLIC CAPITAL LETTER YU
+		{ QChar(0x0410), 0x41 }, // А CYRILLIC CAPITAL LETTER A
+		{ QChar(0x0411), 0x42 }, // Б CYRILLIC CAPITAL LETTER BE
+		{ QChar(0x0426), 0x43 }, // Ц CYRILLIC CAPITAL LETTER TSE
+		{ QChar(0x0414), 0x44 }, // Д CYRILLIC CAPITAL LETTER DE
+		{ QChar(0x0415), 0x45 }, // Е CYRILLIC CAPITAL LETTER IE
+		{ QChar(0x0424), 0x46 }, // Ф CYRILLIC CAPITAL LETTER EF
+		{ QChar(0x0413), 0x47 }, // Г CYRILLIC CAPITAL LETTER GHE
+		{ QChar(0x0425), 0x48 }, // Х CYRILLIC CAPITAL LETTER HA
+		{ QChar(0x0418), 0x49 }, // И CYRILLIC CAPITAL LETTER I
+		{ QChar(0x0419), 0x4a }, // Й CYRILLIC CAPITAL LETTER SHORT I
+		{ QChar(0x041a), 0x4b }, // К CYRILLIC CAPITAL LETTER KA
+		{ QChar(0x041b), 0x4c }, // Л CYRILLIC CAPITAL LETTER EL
+		{ QChar(0x041c), 0x4d }, // М CYRILLIC CAPITAL LETTER EM
+		{ QChar(0x041d), 0x4e }, // Н CYRILLIC CAPITAL LETTER EN
+		{ QChar(0x041e), 0x4f }, // О CYRILLIC CAPITAL LETTER O
+		{ QChar(0x041f), 0x50 }, // П CYRILLIC CAPITAL LETTER PE
+		{ QChar(0x042f), 0x51 }, // Я CYRILLIC CAPITAL LETTER YA
+		{ QChar(0x0420), 0x52 }, // Р CYRILLIC CAPITAL LETTER ER
+		{ QChar(0x0421), 0x53 }, // С CYRILLIC CAPITAL LETTER ES
+		{ QChar(0x0422), 0x54 }, // Т CYRILLIC CAPITAL LETTER TE
+		{ QChar(0x0423), 0x55 }, // У CYRILLIC CAPITAL LETTER U
+		{ QChar(0x0416), 0x56 }, // Ж CYRILLIC CAPITAL LETTER ZHE
+		{ QChar(0x0412), 0x57 }, // В CYRILLIC CAPITAL LETTER VE
+		{ QChar(0x042c), 0x58 }, // Ь CYRILLIC CAPITAL LETTER SOFT SIGN
+		{ QChar(0x0406), 0x59 }, // І CYRILLIC CAPITAL LETTER BYELORUSSIAN-UKRAINIAN I
+		{ QChar(0x0417), 0x5a }, // З CYRILLIC CAPITAL LETTER ZE
+		{ QChar(0x0428), 0x5b }, // Ш CYRILLIC CAPITAL LETTER SHA
+		{ QChar(0x0404), 0x5c }, // Є CYRILLIC CAPITAL LETTER UKRAINIAN IE
+		{ QChar(0x0429), 0x5d }, // Щ CYRILLIC CAPITAL LETTER SHCHA
+		{ QChar(0x0427), 0x5e }, // Ч CYRILLIC CAPITAL LETTER CHE
+		{ QChar(0x0407), 0x5f }, // Ї CYRILLIC CAPITAL LETTER YI
+		{ QChar(0x044e), 0x60 }, // ю CYRILLIC SMALL LETTER YU
+		{ QChar(0x0430), 0x61 }, // а CYRILLIC SMALL LETTER A
+		{ QChar(0x0431), 0x62 }, // б CYRILLIC SMALL LETTER BE
+		{ QChar(0x0446), 0x63 }, // ц CYRILLIC SMALL LETTER TSE
+		{ QChar(0x0434), 0x64 }, // д CYRILLIC SMALL LETTER DE
+		{ QChar(0x0435), 0x65 }, // е CYRILLIC SMALL LETTER IE
+		{ QChar(0x0444), 0x66 }, // ф CYRILLIC SMALL LETTER EF
+		{ QChar(0x0433), 0x67 }, // г CYRILLIC SMALL LETTER GHE
+		{ QChar(0x0445), 0x68 }, // х CYRILLIC SMALL LETTER HA
+		{ QChar(0x0438), 0x69 }, // и CYRILLIC SMALL LETTER I
+		{ QChar(0x0439), 0x6a }, // й CYRILLIC SMALL LETTER SHORT I
+		{ QChar(0x043a), 0x6b }, // к CYRILLIC SMALL LETTER KA
+		{ QChar(0x043b), 0x6c }, // л CYRILLIC SMALL LETTER EL
+		{ QChar(0x043c), 0x6d }, // м CYRILLIC SMALL LETTER EM
+		{ QChar(0x043d), 0x6e }, // н CYRILLIC SMALL LETTER EN
+		{ QChar(0x043e), 0x6f }, // о CYRILLIC SMALL LETTER O
+		{ QChar(0x043f), 0x70 }, // п CYRILLIC SMALL LETTER PE
+		{ QChar(0x044f), 0x71 }, // я CYRILLIC SMALL LETTER YA
+		{ QChar(0x0440), 0x72 }, // р CYRILLIC SMALL LETTER ER
+		{ QChar(0x0441), 0x73 }, // с CYRILLIC SMALL LETTER ES
+		{ QChar(0x0442), 0x74 }, // т CYRILLIC SMALL LETTER TE
+		{ QChar(0x0443), 0x75 }, // у CYRILLIC SMALL LETTER U
+		{ QChar(0x0436), 0x76 }, // ж CYRILLIC SMALL LETTER ZHE
+		{ QChar(0x0432), 0x77 }, // в CYRILLIC SMALL LETTER VE
+		{ QChar(0x044c), 0x78 }, // ь CYRILLIC SMALL LETTER SOFT SIGN
+		{ QChar(0x0456), 0x79 }, // і CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I
+		{ QChar(0x0437), 0x7a }, // з CYRILLIC SMALL LETTER ZE
+		{ QChar(0x0448), 0x7b }, // ш CYRILLIC SMALL LETTER SHA
+		{ QChar(0x0454), 0x7c }, // є CYRILLIC SMALL LETTER UKRAINIAN IE
+		{ QChar(0x0449), 0x7d }, // щ CYRILLIC SMALL LETTER SHCHA
+		{ QChar(0x0447), 0x7e }  // ч CYRILLIC SMALL LETTER CHE
 	},
 
 	{ // 4 Greek
-		{ 0x0390, 0x40 }, // ΐ GREEK SMALL LETTER IOTA WITH DIALYTIKA AND TONOS
-		{ 0x0391, 0x41 }, // Α GREEK CAPITAL LETTER ALPHA
-		{ 0x0392, 0x42 }, // Β GREEK CAPITAL LETTER BETA
-		{ 0x0393, 0x43 }, // Γ GREEK CAPITAL LETTER GAMMA
-		{ 0x0394, 0x44 }, // Δ GREEK CAPITAL LETTER DELTA
-		{ 0x0395, 0x45 }, // Ε GREEK CAPITAL LETTER EPSILON
-		{ 0x0396, 0x46 }, // Ζ GREEK CAPITAL LETTER ZETA
-		{ 0x0397, 0x47 }, // Η GREEK CAPITAL LETTER ETA
-		{ 0x0398, 0x48 }, // Θ GREEK CAPITAL LETTER THETA
-		{ 0x0399, 0x49 }, // Ι GREEK CAPITAL LETTER IOTA
-		{ 0x039a, 0x4a }, // Κ GREEK CAPITAL LETTER KAPPA
-		{ 0x039b, 0x4b }, // Λ GREEK CAPITAL LETTER LAMBDA
-		{ 0x039c, 0x4c }, // Μ GREEK CAPITAL LETTER MU
-		{ 0x039d, 0x4d }, // Ν GREEK CAPITAL LETTER NU
-		{ 0x039e, 0x4e }, // Ξ GREEK CAPITAL LETTER XI
-		{ 0x039f, 0x4f }, // Ο GREEK CAPITAL LETTER OMICRON
-		{ 0x03a0, 0x50 }, // Π GREEK CAPITAL LETTER PI
-		{ 0x03a1, 0x51 }, // Ρ GREEK CAPITAL LETTER RHO
-		{ 0x03a3, 0x53 }, // Σ GREEK CAPITAL LETTER SIGMA
-		{ 0x03a4, 0x54 }, // Τ GREEK CAPITAL LETTER TAU
-		{ 0x03a5, 0x55 }, // Υ GREEK CAPITAL LETTER UPSILON
-		{ 0x03a6, 0x56 }, // Φ GREEK CAPITAL LETTER PHI
-		{ 0x03a7, 0x57 }, // Χ GREEK CAPITAL LETTER CHI
-		{ 0x03a8, 0x58 }, // Ψ GREEK CAPITAL LETTER PSI
-		{ 0x03a9, 0x59 }, // Ω GREEK CAPITAL LETTER OMEGA
-		{ 0x03aa, 0x5a }, // Ϊ GREEK CAPITAL LETTER IOTA WITH DIALYTIKA
-		{ 0x03ab, 0x5b }, // Ϋ GREEK CAPITAL LETTER UPSILON WITH DIALYTIKA
-		{ 0x03ac, 0x5c }, // ά GREEK SMALL LETTER ALPHA WITH TONOS
-		{ 0x03ad, 0x5d }, // έ GREEK SMALL LETTER EPSILON WITH TONOS
-		{ 0x03ae, 0x5e }, // ή GREEK SMALL LETTER ETA WITH TONOS
-		{ 0x03af, 0x5f }, // ί GREEK SMALL LETTER IOTO WITH TONOS
-		{ 0x03b0, 0x60 }, // ΰ GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND TONOS
-		{ 0x03b1, 0x61 }, // α GREEK SMALL LETTER ALPHA
-		{ 0x03b2, 0x62 }, // β GREEK SMALL LETTER BETA
-		{ 0x03b3, 0x63 }, // γ GREEK SMALL LETTER GAMMA
-		{ 0x03b4, 0x64 }, // δ GREEK SMALL LETTER DELTA
-		{ 0x03b5, 0x65 }, // ε GREEK SMALL LETTER EPSILON
-		{ 0x03b6, 0x66 }, // ζ GREEK SMALL LETTER ZETA
-		{ 0x03b7, 0x67 }, // η GREEK SMALL LETTER ETA
-		{ 0x03b8, 0x68 }, // θ GREEK SMALL LETTER THETA
-		{ 0x03b9, 0x69 }, // ι GREEK SMALL LETTER IOTA
-		{ 0x03ba, 0x6a }, // κ GREEK SMALL LETTER KAPPA
-		{ 0x03bb, 0x6b }, // λ GREEK SMALL LETTER LAMBDA
-		{ 0x03bc, 0x6c }, // μ GREEK SMALL LETTER MU
-		{ 0x03bd, 0x6d }, // ν GREEK SMALL LETTER NU
-		{ 0x03be, 0x6e }, // ξ GREEK SMALL LETTER XI
-		{ 0x03bf, 0x6f }, // ο GREEK SMALL LETTER OMICRON
-		{ 0x03c0, 0x70 }, // π GREEK SMALL LETTER PI
-		{ 0x03c1, 0x71 }, // ρ GREEK SMALL LETTER RHO
-		{ 0x03c2, 0x72 }, // ς GREEK SMALL LETTER FINAL SIGMA
-		{ 0x03c3, 0x73 }, // σ GREEK SMALL LETTER SIGMA
-		{ 0x03c4, 0x74 }, // τ GREEK SMALL LETTER TAU
-		{ 0x03c5, 0x75 }, // υ GREEK SMALL LETTER UPSILON
-		{ 0x03c6, 0x76 }, // φ GREEK SMALL LETTER PHI
-		{ 0x03c7, 0x77 }, // χ GREEK SMALL LETTER CHI
-		{ 0x03c8, 0x78 }, // ψ GREEK SMALL LETTER PSI
-		{ 0x03c9, 0x79 }, // ω GREEK SMALL LETTER OMEGA
-		{ 0x03ca, 0x7a }, // ϊ GREEK SMALL LETTER IOTA WITH DIALYTIKA
-		{ 0x03cb, 0x7b }, // ϋ GREEK SMALL LETTER UPSILON WITH DIALYTIKA
-		{ 0x03cc, 0x7c }, // ό GREEK SMALL LETTER OMICRON WITH TONOS
-		{ 0x03cd, 0x7d }, // ύ GREEK SMALL LETTER UPSILON WITH TONOS
-		{ 0x03ce, 0x7e }  // ώ GREEK SMALL LETTER OMEGA WITH TONOS
+		{ QChar(0x0390), 0x40 }, // ΐ GREEK SMALL LETTER IOTA WITH DIALYTIKA AND TONOS
+		{ QChar(0x0391), 0x41 }, // Α GREEK CAPITAL LETTER ALPHA
+		{ QChar(0x0392), 0x42 }, // Β GREEK CAPITAL LETTER BETA
+		{ QChar(0x0393), 0x43 }, // Γ GREEK CAPITAL LETTER GAMMA
+		{ QChar(0x0394), 0x44 }, // Δ GREEK CAPITAL LETTER DELTA
+		{ QChar(0x0395), 0x45 }, // Ε GREEK CAPITAL LETTER EPSILON
+		{ QChar(0x0396), 0x46 }, // Ζ GREEK CAPITAL LETTER ZETA
+		{ QChar(0x0397), 0x47 }, // Η GREEK CAPITAL LETTER ETA
+		{ QChar(0x0398), 0x48 }, // Θ GREEK CAPITAL LETTER THETA
+		{ QChar(0x0399), 0x49 }, // Ι GREEK CAPITAL LETTER IOTA
+		{ QChar(0x039a), 0x4a }, // Κ GREEK CAPITAL LETTER KAPPA
+		{ QChar(0x039b), 0x4b }, // Λ GREEK CAPITAL LETTER LAMBDA
+		{ QChar(0x039c), 0x4c }, // Μ GREEK CAPITAL LETTER MU
+		{ QChar(0x039d), 0x4d }, // Ν GREEK CAPITAL LETTER NU
+		{ QChar(0x039e), 0x4e }, // Ξ GREEK CAPITAL LETTER XI
+		{ QChar(0x039f), 0x4f }, // Ο GREEK CAPITAL LETTER OMICRON
+		{ QChar(0x03a0), 0x50 }, // Π GREEK CAPITAL LETTER PI
+		{ QChar(0x03a1), 0x51 }, // Ρ GREEK CAPITAL LETTER RHO
+		{ QChar(0x03a3), 0x53 }, // Σ GREEK CAPITAL LETTER SIGMA
+		{ QChar(0x03a4), 0x54 }, // Τ GREEK CAPITAL LETTER TAU
+		{ QChar(0x03a5), 0x55 }, // Υ GREEK CAPITAL LETTER UPSILON
+		{ QChar(0x03a6), 0x56 }, // Φ GREEK CAPITAL LETTER PHI
+		{ QChar(0x03a7), 0x57 }, // Χ GREEK CAPITAL LETTER CHI
+		{ QChar(0x03a8), 0x58 }, // Ψ GREEK CAPITAL LETTER PSI
+		{ QChar(0x03a9), 0x59 }, // Ω GREEK CAPITAL LETTER OMEGA
+		{ QChar(0x03aa), 0x5a }, // Ϊ GREEK CAPITAL LETTER IOTA WITH DIALYTIKA
+		{ QChar(0x03ab), 0x5b }, // Ϋ GREEK CAPITAL LETTER UPSILON WITH DIALYTIKA
+		{ QChar(0x03ac), 0x5c }, // ά GREEK SMALL LETTER ALPHA WITH TONOS
+		{ QChar(0x03ad), 0x5d }, // έ GREEK SMALL LETTER EPSILON WITH TONOS
+		{ QChar(0x03ae), 0x5e }, // ή GREEK SMALL LETTER ETA WITH TONOS
+		{ QChar(0x03af), 0x5f }, // ί GREEK SMALL LETTER IOTO WITH TONOS
+		{ QChar(0x03b0), 0x60 }, // ΰ GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND TONOS
+		{ QChar(0x03b1), 0x61 }, // α GREEK SMALL LETTER ALPHA
+		{ QChar(0x03b2), 0x62 }, // β GREEK SMALL LETTER BETA
+		{ QChar(0x03b3), 0x63 }, // γ GREEK SMALL LETTER GAMMA
+		{ QChar(0x03b4), 0x64 }, // δ GREEK SMALL LETTER DELTA
+		{ QChar(0x03b5), 0x65 }, // ε GREEK SMALL LETTER EPSILON
+		{ QChar(0x03b6), 0x66 }, // ζ GREEK SMALL LETTER ZETA
+		{ QChar(0x03b7), 0x67 }, // η GREEK SMALL LETTER ETA
+		{ QChar(0x03b8), 0x68 }, // θ GREEK SMALL LETTER THETA
+		{ QChar(0x03b9), 0x69 }, // ι GREEK SMALL LETTER IOTA
+		{ QChar(0x03ba), 0x6a }, // κ GREEK SMALL LETTER KAPPA
+		{ QChar(0x03bb), 0x6b }, // λ GREEK SMALL LETTER LAMBDA
+		{ QChar(0x03bc), 0x6c }, // μ GREEK SMALL LETTER MU
+		{ QChar(0x03bd), 0x6d }, // ν GREEK SMALL LETTER NU
+		{ QChar(0x03be), 0x6e }, // ξ GREEK SMALL LETTER XI
+		{ QChar(0x03bf), 0x6f }, // ο GREEK SMALL LETTER OMICRON
+		{ QChar(0x03c0), 0x70 }, // π GREEK SMALL LETTER PI
+		{ QChar(0x03c1), 0x71 }, // ρ GREEK SMALL LETTER RHO
+		{ QChar(0x03c2), 0x72 }, // ς GREEK SMALL LETTER FINAL SIGMA
+		{ QChar(0x03c3), 0x73 }, // σ GREEK SMALL LETTER SIGMA
+		{ QChar(0x03c4), 0x74 }, // τ GREEK SMALL LETTER TAU
+		{ QChar(0x03c5), 0x75 }, // υ GREEK SMALL LETTER UPSILON
+		{ QChar(0x03c6), 0x76 }, // φ GREEK SMALL LETTER PHI
+		{ QChar(0x03c7), 0x77 }, // χ GREEK SMALL LETTER CHI
+		{ QChar(0x03c8), 0x78 }, // ψ GREEK SMALL LETTER PSI
+		{ QChar(0x03c9), 0x79 }, // ω GREEK SMALL LETTER OMEGA
+		{ QChar(0x03ca), 0x7a }, // ϊ GREEK SMALL LETTER IOTA WITH DIALYTIKA
+		{ QChar(0x03cb), 0x7b }, // ϋ GREEK SMALL LETTER UPSILON WITH DIALYTIKA
+		{ QChar(0x03cc), 0x7c }, // ό GREEK SMALL LETTER OMICRON WITH TONOS
+		{ QChar(0x03cd), 0x7d }, // ύ GREEK SMALL LETTER UPSILON WITH TONOS
+		{ QChar(0x03ce), 0x7e }  // ώ GREEK SMALL LETTER OMEGA WITH TONOS
 	},
 
 	{ // TODO 5 Arabic G0
 	},
 
 	{ // 6 Hebrew G0
-		{ 0x05d0, 0x60 }, // א HEBREW LETTER ALEF
-		{ 0x05d1, 0x61 }, // ב HEBREW LETTER BET
-		{ 0x05d2, 0x62 }, // ג HEBREW LETTER GIMEL
-		{ 0x05d3, 0x63 }, // ד HEBREW LETTER DALET
-		{ 0x05d4, 0x64 }, // ה HEBREW LETTER HE
-		{ 0x05d5, 0x65 }, // ו HEBREW LETTER VAV
-		{ 0x05d6, 0x66 }, // ז HEBREW LETTER ZAYIN
-		{ 0x05d7, 0x67 }, // ח HEBREW LETTER HET
-		{ 0x05d8, 0x68 }, // ט HEBREW LETTER TET
-		{ 0x05d9, 0x69 }, // י HEBREW LETTER YOD
-		{ 0x05da, 0x6a }, // ך HEBREW LETTER FINAL KAF
-		{ 0x05db, 0x6b }, // כ HEBREW LETTER KAF
-		{ 0x05dc, 0x6c }, // ל HEBREW LETTER LAMED
-		{ 0x05dd, 0x6d }, // ם HEBREW LETTER FINAL MEM
-		{ 0x05de, 0x6e }, // מ HEBREW LETTER MEM
-		{ 0x05df, 0x6f }, // ן HEBREW LETTER FINAL NUN
-		{ 0x05e0, 0x70 }, // נ HEBREW LETTER NUN
-		{ 0x05e1, 0x71 }, // ס HEBREW LETTER SAMEKH
-		{ 0x05e2, 0x72 }, // ע HEBREW LETTER AYIN
-		{ 0x05e3, 0x73 }, // ף HEBREW LETTER FINAL PE
-		{ 0x05e4, 0x74 }, // פ HEBREW LETTER PE
-		{ 0x05e5, 0x75 }, // ץ HEBREW LETTER FINAL TSADI
-		{ 0x05e6, 0x76 }, // צ HEBREW LETTER TSADI
-		{ 0x05e7, 0x77 }, // ק HEBREW LETTER QOF
-		{ 0x05e8, 0x78 }, // ר HEBREW LETTER RESH
-		{ 0x05e9, 0x79 }, // ש HEBREW LETTER SHIN
-		{ 0x05ea, 0x7a }, // ת HEBREW LETTER TAV
-		{ 0x20aa, 0x7b }, // ₪ NEW SHEQEL SIGN
-		{ 0x00be, 0x7d }, // ½ VULGAR FRACTION THREE QUARTERS
-		{ 0x00f7, 0x7e }  // ÷ DIVISION SIGN
+		{ QChar(0x05d0), 0x60 }, // א HEBREW LETTER ALEF
+		{ QChar(0x05d1), 0x61 }, // ב HEBREW LETTER BET
+		{ QChar(0x05d2), 0x62 }, // ג HEBREW LETTER GIMEL
+		{ QChar(0x05d3), 0x63 }, // ד HEBREW LETTER DALET
+		{ QChar(0x05d4), 0x64 }, // ה HEBREW LETTER HE
+		{ QChar(0x05d5), 0x65 }, // ו HEBREW LETTER VAV
+		{ QChar(0x05d6), 0x66 }, // ז HEBREW LETTER ZAYIN
+		{ QChar(0x05d7), 0x67 }, // ח HEBREW LETTER HET
+		{ QChar(0x05d8), 0x68 }, // ט HEBREW LETTER TET
+		{ QChar(0x05d9), 0x69 }, // י HEBREW LETTER YOD
+		{ QChar(0x05da), 0x6a }, // ך HEBREW LETTER FINAL KAF
+		{ QChar(0x05db), 0x6b }, // כ HEBREW LETTER KAF
+		{ QChar(0x05dc), 0x6c }, // ל HEBREW LETTER LAMED
+		{ QChar(0x05dd), 0x6d }, // ם HEBREW LETTER FINAL MEM
+		{ QChar(0x05de), 0x6e }, // מ HEBREW LETTER MEM
+		{ QChar(0x05df), 0x6f }, // ן HEBREW LETTER FINAL NUN
+		{ QChar(0x05e0), 0x70 }, // נ HEBREW LETTER NUN
+		{ QChar(0x05e1), 0x71 }, // ס HEBREW LETTER SAMEKH
+		{ QChar(0x05e2), 0x72 }, // ע HEBREW LETTER AYIN
+		{ QChar(0x05e3), 0x73 }, // ף HEBREW LETTER FINAL PE
+		{ QChar(0x05e4), 0x74 }, // פ HEBREW LETTER PE
+		{ QChar(0x05e5), 0x75 }, // ץ HEBREW LETTER FINAL TSADI
+		{ QChar(0x05e6), 0x76 }, // צ HEBREW LETTER TSADI
+		{ QChar(0x05e7), 0x77 }, // ק HEBREW LETTER QOF
+		{ QChar(0x05e8), 0x78 }, // ר HEBREW LETTER RESH
+		{ QChar(0x05e9), 0x79 }, // ש HEBREW LETTER SHIN
+		{ QChar(0x05ea), 0x7a }, // ת HEBREW LETTER TAV
+		{ QChar(0x20aa), 0x7b }, // ₪ NEW SHEQEL SIGN
+		{ QChar(0x00be), 0x7d }, // ½ VULGAR FRACTION THREE QUARTERS
+		{ QChar(0x00f7), 0x7e }  // ÷ DIVISION SIGN
 	},
 
 	// Only used by X/26 enhancements, not directly by keyboard
@@ -339,189 +339,189 @@ static const QMap<QChar, char> keymapping[24] = {
 	},
 
 	{ // 11 Czech/Slovak
-		{ 0x016f, 0x24 }, // ů LATIN SMALL LETTER U WITH RING ABOVE
-		{ 0x010d, 0x40 }, // č LATIN SMALL LETTER C WITH CARON
-		{ 0x0165, 0x5b }, // ť LATIN SMALL LETTER T WITH CARON
-		{ 0x017e, 0x5c }, // ž LATIN SMALL LETTER Z WITH CARON
-		{ 0x00fd, 0x5d }, // ý LATIN SMALL LETTER Y WITH ACUTE
-		{ 0x00ed, 0x5e }, // í LATIN SMALL LETTER I WITH ACUTE
-		{ 0x0159, 0x5f }, // ř LATIN SMALL LETTER R WITH CARON
-		{ 0x00e9, 0x60 }, // é LATIN SMALL LETTER E WITH ACUTE
-		{ 0x00e1, 0x7b }, // á LATIN SMALL LETTER A WITH ACUTE
-		{ 0x011b, 0x7c }, // ě LATIN SMALL LETTER E WITH CARON
-		{ 0x00fa, 0x7d }, // ú LATIN SMALL LETTER U WITH ACUTE
-		{ 0x0161, 0x7e }  // š LATIN SMALL LETTER S WITH CARON
+		{ QChar(0x016f), 0x24 }, // ů LATIN SMALL LETTER U WITH RING ABOVE
+		{ QChar(0x010d), 0x40 }, // č LATIN SMALL LETTER C WITH CARON
+		{ QChar(0x0165), 0x5b }, // ť LATIN SMALL LETTER T WITH CARON
+		{ QChar(0x017e), 0x5c }, // ž LATIN SMALL LETTER Z WITH CARON
+		{ QChar(0x00fd), 0x5d }, // ý LATIN SMALL LETTER Y WITH ACUTE
+		{ QChar(0x00ed), 0x5e }, // í LATIN SMALL LETTER I WITH ACUTE
+		{ QChar(0x0159), 0x5f }, // ř LATIN SMALL LETTER R WITH CARON
+		{ QChar(0x00e9), 0x60 }, // é LATIN SMALL LETTER E WITH ACUTE
+		{ QChar(0x00e1), 0x7b }, // á LATIN SMALL LETTER A WITH ACUTE
+		{ QChar(0x011b), 0x7c }, // ě LATIN SMALL LETTER E WITH CARON
+		{ QChar(0x00fa), 0x7d }, // ú LATIN SMALL LETTER U WITH ACUTE
+		{ QChar(0x0161), 0x7e }  // š LATIN SMALL LETTER S WITH CARON
 	},
 
 	{ // 12 English
-		{ 0x00a3, 0x23 }, // £ POUND SIGN
-		{ 0x0023, 0x5f }, // # NUMBER SIGN
-		{ 0x005f, 0x60 }, // ─ LOW LINE - rendered as U+2500 BOX DRAWINGS LIGHT HORIZONTAL
+		{ QChar(0x00a3), 0x23 }, // £ POUND SIGN
+		{ QChar(0x0023), 0x5f }, // # NUMBER SIGN
+		{ QChar(0x005f), 0x60 }, // ─ LOW LINE - rendered as U+2500 BOX DRAWINGS LIGHT HORIZONTAL
 
-		{ 0x00bc, 0x7b }, // ¼ VULGAR FRACTION ONE QUARTER
-		{ 0x00bd, 0x5c }, // ½ VULGAR FRACTION ONE HALF
-		{ 0x00be, 0x7b }, // ¾ VULGAR FRACTION THREE QUARTERS
-		{ 0x00f7, 0x7e }  // ÷ DIVISION SIGN
+		{ QChar(0x00bc), 0x7b }, // ¼ VULGAR FRACTION ONE QUARTER
+		{ QChar(0x00bd), 0x5c }, // ½ VULGAR FRACTION ONE HALF
+		{ QChar(0x00be), 0x7b }, // ¾ VULGAR FRACTION THREE QUARTERS
+		{ QChar(0x00f7), 0x7e }  // ÷ DIVISION SIGN
 	},
 
 	{ // 13 Estonian
-		{ 0x00f5, 0x24 }, // õ LATIN SMALL LETTER O WITH TILDE
-		{ 0x0160, 0x40 }, // Š LATIN CAPITAL LETTER S WITH CARON
-		{ 0x00c4, 0x5b }, // Ä LATIN CAPITAL LETTER A WITH DIAERESIS
-		{ 0x00d6, 0x5c }, // Ö LATIN CAPITAL LETTER O WITH DIAERESIS
-		{ 0x017d, 0x5d }, // Ž LATIN CAPITAL LETTER Z WITH CARON
-		{ 0x00dc, 0x5e }, // Ü LATIN CAPITAL LETTER U WITH DIAERESIS
-		{ 0x00d5, 0x5f }, // Õ LATIN CAPITAL LETTER O WITH TILDE
-		{ 0x0161, 0x60 }, // š LATIN SMALL LETTER S WITH CARON
-		{ 0x00e4, 0x7b }, // ä LATIN SMALL LETTER A WITH DIAERESIS
-		{ 0x00f6, 0x7c }, // ö LATIN SMALL LETTER O WITH DIAERESIS
-		{ 0x017e, 0x7d }, // ž LATIN SMALL LETTER Z WITH CARON
-		{ 0x00fc, 0x7e }  // ü LATIN SMALL LETTER U WITH DIAERESIS
+		{ QChar(0x00f5), 0x24 }, // õ LATIN SMALL LETTER O WITH TILDE
+		{ QChar(0x0160), 0x40 }, // Š LATIN CAPITAL LETTER S WITH CARON
+		{ QChar(0x00c4), 0x5b }, // Ä LATIN CAPITAL LETTER A WITH DIAERESIS
+		{ QChar(0x00d6), 0x5c }, // Ö LATIN CAPITAL LETTER O WITH DIAERESIS
+		{ QChar(0x017d), 0x5d }, // Ž LATIN CAPITAL LETTER Z WITH CARON
+		{ QChar(0x00dc), 0x5e }, // Ü LATIN CAPITAL LETTER U WITH DIAERESIS
+		{ QChar(0x00d5), 0x5f }, // Õ LATIN CAPITAL LETTER O WITH TILDE
+		{ QChar(0x0161), 0x60 }, // š LATIN SMALL LETTER S WITH CARON
+		{ QChar(0x00e4), 0x7b }, // ä LATIN SMALL LETTER A WITH DIAERESIS
+		{ QChar(0x00f6), 0x7c }, // ö LATIN SMALL LETTER O WITH DIAERESIS
+		{ QChar(0x017e), 0x7d }, // ž LATIN SMALL LETTER Z WITH CARON
+		{ QChar(0x00fc), 0x7e }  // ü LATIN SMALL LETTER U WITH DIAERESIS
 	},
 
 	{ // 14 French - aze qsd wxc
-		{ 0x00e9, 0x23 }, // é LATIN SMALL LETTER E WITH ACUTE
-		{ 0x00ef, 0x24 }, // ï LATIN SMALL LETTER I WITH DIAERESIS
-		{ 0x00e0, 0x40 }, // à LATIN SMALL LETTER A WITH GRAVE
-		{ 0x00eb, 0x5b }, // ë LATIN SMALL LETTER E WITH DIAERESIS
-		{ 0x00ea, 0x5c }, // ê LATIN SMALL LETTER E WITH CIRCUMFLEX
-		{ 0x00f9, 0x5d }, // ù LATIN SMALL LETTER U WITH GRAVE
-		{ 0x00ee, 0x5e }, // î LATIN SMALL LETTER I WITH CIRCUMFLEX
-		{ 0x0023, 0x5f }, // # NUMBER SIGN
-		{ 0x00e8, 0x60 }, // è LATIN SMALL LETTER E WITH GRAVE
-		{ 0x00e2, 0x7b }, // â LATIN SMALL LETTER A WITH CIRCUMFLEX
-		{ 0x00f4, 0x7c }, // ô LATIN SMALL LETTER O WITH CIRCUMFLEX
-		{ 0x00fb, 0x7d }, // û LATIN SMALL LETTER U WITH CIRCUMFLEX
-		{ 0x00e7, 0x7e }  // ç LATIN SMALL LETTER C WITH CEDILLA
+		{ QChar(0x00e9), 0x23 }, // é LATIN SMALL LETTER E WITH ACUTE
+		{ QChar(0x00ef), 0x24 }, // ï LATIN SMALL LETTER I WITH DIAERESIS
+		{ QChar(0x00e0), 0x40 }, // à LATIN SMALL LETTER A WITH GRAVE
+		{ QChar(0x00eb), 0x5b }, // ë LATIN SMALL LETTER E WITH DIAERESIS
+		{ QChar(0x00ea), 0x5c }, // ê LATIN SMALL LETTER E WITH CIRCUMFLEX
+		{ QChar(0x00f9), 0x5d }, // ù LATIN SMALL LETTER U WITH GRAVE
+		{ QChar(0x00ee), 0x5e }, // î LATIN SMALL LETTER I WITH CIRCUMFLEX
+		{ QChar(0x0023), 0x5f }, // # NUMBER SIGN
+		{ QChar(0x00e8), 0x60 }, // è LATIN SMALL LETTER E WITH GRAVE
+		{ QChar(0x00e2), 0x7b }, // â LATIN SMALL LETTER A WITH CIRCUMFLEX
+		{ QChar(0x00f4), 0x7c }, // ô LATIN SMALL LETTER O WITH CIRCUMFLEX
+		{ QChar(0x00fb), 0x7d }, // û LATIN SMALL LETTER U WITH CIRCUMFLEX
+		{ QChar(0x00e7), 0x7e }  // ç LATIN SMALL LETTER C WITH CEDILLA
 	},
 
 	{ // 15 German
-		{ 0x00a7, 0x40 }, // § SECTION SIGN
-		{ 0x00c4, 0x5b }, // Ä LATIN CAPITAL LETTER A WITH DIAERESIS
-		{ 0x00d6, 0x5c }, // Ö LATIN CAPITAL LETTER O WITH DIAERESIS
-		{ 0x00dc, 0x5d }, // Ü LATIN CAPITAL LETTER U WITH DIAERESIS
-		{ 0x00b0, 0x60 }, // ° DEGREE SIGN
-		{ 0x00e4, 0x7b }, // ä LATIN SMALL LETTER A WITH DIAERESIS
-		{ 0x00f6, 0x7c }, // ö LATIN SMALL LETTER O WITH DIAERESIS
-		{ 0x00fc, 0x7d }, // ü LATIN SMALL LETTER U WITH DIAERESIS
-		{ 0x00df, 0x7e }  // ß LATIN SMALL LETTER SHARP S
+		{ QChar(0x00a7), 0x40 }, // § SECTION SIGN
+		{ QChar(0x00c4), 0x5b }, // Ä LATIN CAPITAL LETTER A WITH DIAERESIS
+		{ QChar(0x00d6), 0x5c }, // Ö LATIN CAPITAL LETTER O WITH DIAERESIS
+		{ QChar(0x00dc), 0x5d }, // Ü LATIN CAPITAL LETTER U WITH DIAERESIS
+		{ QChar(0x00b0), 0x60 }, // ° DEGREE SIGN
+		{ QChar(0x00e4), 0x7b }, // ä LATIN SMALL LETTER A WITH DIAERESIS
+		{ QChar(0x00f6), 0x7c }, // ö LATIN SMALL LETTER O WITH DIAERESIS
+		{ QChar(0x00fc), 0x7d }, // ü LATIN SMALL LETTER U WITH DIAERESIS
+		{ QChar(0x00df), 0x7e }  // ß LATIN SMALL LETTER SHARP S
 	},
 
 	{ // 16 Italian
-		{ 0x00a3, 0x23 }, // £ POUND SIGN
-		{ 0x00e9, 0x40 }, // é LATIN SMALL LETTER E WITH ACUTE
-		{ 0x00b0, 0x5b }, // ° DEGREE SIGN
-		{ 0x00e7, 0x5c }, // ç LATIN SMALL LETTER C WITH CEDILLA
-		{ 0x0023, 0x5f }, // # NUMBER SIGN
-		{ 0x00f9, 0x60 }, // ù LATIN SMALL LETTER U WITH GRAVE
-		{ 0x00e0, 0x7b }, // à LATIN SMALL LETTER A WITH GRAVE
-		{ 0x00f2, 0x7c }, // ò LATIN SMALL LETTER O WITH GRAVE
-		{ 0x00e8, 0x7d }, // è LATIN SMALL LETTER E WITH GRAVE
-		{ 0x00ec, 0x7e }  // ì LATIN SMALL LETTER I WITH GRAVE
+		{ QChar(0x00a3), 0x23 }, // £ POUND SIGN
+		{ QChar(0x00e9), 0x40 }, // é LATIN SMALL LETTER E WITH ACUTE
+		{ QChar(0x00b0), 0x5b }, // ° DEGREE SIGN
+		{ QChar(0x00e7), 0x5c }, // ç LATIN SMALL LETTER C WITH CEDILLA
+		{ QChar(0x0023), 0x5f }, // # NUMBER SIGN
+		{ QChar(0x00f9), 0x60 }, // ù LATIN SMALL LETTER U WITH GRAVE
+		{ QChar(0x00e0), 0x7b }, // à LATIN SMALL LETTER A WITH GRAVE
+		{ QChar(0x00f2), 0x7c }, // ò LATIN SMALL LETTER O WITH GRAVE
+		{ QChar(0x00e8), 0x7d }, // è LATIN SMALL LETTER E WITH GRAVE
+		{ QChar(0x00ec), 0x7e }  // ì LATIN SMALL LETTER I WITH GRAVE
 	},
 
 	{ // 17 Lettish/Lithuanian
-		{ 0x0160, 0x40 }, // Š LATIN CAPITAL LETTER S WITH CARON
-		{ 0x0117, 0x5b }, // ė LATIN SMALL LETTER E WITH DOT ABOVE
-		{ 0x0119, 0x5c }, // ę LATIN SMALL LETTER E WITH OGONEK
-		{ 0x017d, 0x5d }, // Ž LATIN CAPITAL LETTER Z WITH CARON
-		{ 0x010d, 0x5e }, // č LATIN SMALL LETTER C WITH CARON
-		{ 0x016b, 0x5f }, // ū LATIN SMALL LETTER U WITH MACRON
-		{ 0x0161, 0x60 }, // š LATIN SMALL LETTER S WITH CARON
-		{ 0x0105, 0x7b }, // ą LATIN SMALL LETTER A WITH OGONEK
-		{ 0x0173, 0x7c }, // ų LATIN SMALL LETTER U WITH OGONEK
-		{ 0x017e, 0x7d }, // ž LATIN SMALL LETTER Z WITH CARON
-		{ 0x012f, 0x7e }  // į LATIN SMALL LETTER I WITH OGONEK
+		{ QChar(0x0160), 0x40 }, // Š LATIN CAPITAL LETTER S WITH CARON
+		{ QChar(0x0117), 0x5b }, // ė LATIN SMALL LETTER E WITH DOT ABOVE
+		{ QChar(0x0119), 0x5c }, // ę LATIN SMALL LETTER E WITH OGONEK
+		{ QChar(0x017d), 0x5d }, // Ž LATIN CAPITAL LETTER Z WITH CARON
+		{ QChar(0x010d), 0x5e }, // č LATIN SMALL LETTER C WITH CARON
+		{ QChar(0x016b), 0x5f }, // ū LATIN SMALL LETTER U WITH MACRON
+		{ QChar(0x0161), 0x60 }, // š LATIN SMALL LETTER S WITH CARON
+		{ QChar(0x0105), 0x7b }, // ą LATIN SMALL LETTER A WITH OGONEK
+		{ QChar(0x0173), 0x7c }, // ų LATIN SMALL LETTER U WITH OGONEK
+		{ QChar(0x017e), 0x7d }, // ž LATIN SMALL LETTER Z WITH CARON
+		{ QChar(0x012f), 0x7e }  // į LATIN SMALL LETTER I WITH OGONEK
 	},
 
 	{ // 18 Polish
-		{ 0x0144, 0x24 }, // ń LATIN SMALL LETTER N WITH ACUTE
-		{ 0x0105, 0x40 }, // ą LATIN SMALL LETTER A WITH OGONEK
-		{ 0x017b, 0x5b }, // Ż LATIN CAPITAL LETTER Z WITH DOT ABOVE - rendered as U+01B5 ...WITH STROKE
-		{ 0x015a, 0x5c }, // Ś LATIN CAPITAL LETTER S WITH ACUTE
-		{ 0x0141, 0x5d }, // Ł LATIN CAPITAL LETTER L WITH STROKE
-		{ 0x0107, 0x5e }, // ć LATIN SMALL LETTER C WITH ACUTE
-		{ 0x00f3, 0x5f }, // ó LATIN SMALL LETTER O WITH ACUTE
-		{ 0x0119, 0x60 }, // ę LATIN SMALL LETTER E WITH OGONEK
-		{ 0x017c, 0x7b }, // ż LATIN SMALL LETTER Z WITH DOT ABOVE
-		{ 0x015b, 0x7c }, // ś LATIN SMALL LETTER S WITH ACUTE
-		{ 0x0142, 0x7d }, // ł LATIN SMALL LETTER L WITH STROKE
-		{ 0x017a, 0x7e }  // ź LATIN SMALL LETTER Z WITH ACUTE
+		{ QChar(0x0144), 0x24 }, // ń LATIN SMALL LETTER N WITH ACUTE
+		{ QChar(0x0105), 0x40 }, // ą LATIN SMALL LETTER A WITH OGONEK
+		{ QChar(0x017b), 0x5b }, // Ż LATIN CAPITAL LETTER Z WITH DOT ABOVE - rendered as U+01B5 ...WITH STROKE
+		{ QChar(0x015a), 0x5c }, // Ś LATIN CAPITAL LETTER S WITH ACUTE
+		{ QChar(0x0141), 0x5d }, // Ł LATIN CAPITAL LETTER L WITH STROKE
+		{ QChar(0x0107), 0x5e }, // ć LATIN SMALL LETTER C WITH ACUTE
+		{ QChar(0x00f3), 0x5f }, // ó LATIN SMALL LETTER O WITH ACUTE
+		{ QChar(0x0119), 0x60 }, // ę LATIN SMALL LETTER E WITH OGONEK
+		{ QChar(0x017c), 0x7b }, // ż LATIN SMALL LETTER Z WITH DOT ABOVE
+		{ QChar(0x015b), 0x7c }, // ś LATIN SMALL LETTER S WITH ACUTE
+		{ QChar(0x0142), 0x7d }, // ł LATIN SMALL LETTER L WITH STROKE
+		{ QChar(0x017a), 0x7e }  // ź LATIN SMALL LETTER Z WITH ACUTE
 	},
 
 	{ // 19 Portuguese/Spanish
-		{ 0x00e7, 0x23 }, // ç LATIN SMALL LETTER C WITH CEDILLA
-		{ 0x00a1, 0x40 }, // ¡ INVERTED EXCLAMATION MARK
-		{ 0x00e1, 0x5b }, // á LATIN SMALL LETTER A WITH ACUTE
-		{ 0x00e9, 0x5c }, // é LATIN SMALL LETTER E WITH ACUTE
-		{ 0x00ed, 0x5d }, // í LATIN SMALL LETTER I WITH ACUTE
-		{ 0x00f3, 0x5e }, // ó LATIN SMALL LETTER O WITH ACUTE
-		{ 0x00fa, 0x5f }, // ú LATIN SMALL LETTER U WITH ACUTE
-		{ 0x00bf, 0x60 }, // ¿ INVERTED QUESTION MARK
-		{ 0x00fc, 0x7b }, // ü LATIN SMALL LETTER U WITH DIAERESIS
-		{ 0x00f1, 0x7c }, // ñ LATIN SMALL LETTER N WITH TILDE
-		{ 0x00e8, 0x7d }, // è LATIN SMALL LETTER E WITH GRAVE
-		{ 0x00e0, 0x7e }  // à LATIN SMALL LETTER A WITH GRAVE
+		{ QChar(0x00e7), 0x23 }, // ç LATIN SMALL LETTER C WITH CEDILLA
+		{ QChar(0x00a1), 0x40 }, // ¡ INVERTED EXCLAMATION MARK
+		{ QChar(0x00e1), 0x5b }, // á LATIN SMALL LETTER A WITH ACUTE
+		{ QChar(0x00e9), 0x5c }, // é LATIN SMALL LETTER E WITH ACUTE
+		{ QChar(0x00ed), 0x5d }, // í LATIN SMALL LETTER I WITH ACUTE
+		{ QChar(0x00f3), 0x5e }, // ó LATIN SMALL LETTER O WITH ACUTE
+		{ QChar(0x00fa), 0x5f }, // ú LATIN SMALL LETTER U WITH ACUTE
+		{ QChar(0x00bf), 0x60 }, // ¿ INVERTED QUESTION MARK
+		{ QChar(0x00fc), 0x7b }, // ü LATIN SMALL LETTER U WITH DIAERESIS
+		{ QChar(0x00f1), 0x7c }, // ñ LATIN SMALL LETTER N WITH TILDE
+		{ QChar(0x00e8), 0x7d }, // è LATIN SMALL LETTER E WITH GRAVE
+		{ QChar(0x00e0), 0x7e }  // à LATIN SMALL LETTER A WITH GRAVE
 	},
 
 	{ // 20 Rumanian
-		{ 0x00a4, 0x24 }, // ¤ CURRENCY SIGN
-		{ 0x021a, 0x40 }, // Ț LATIN CAPITAL LETTER T WITH COMMA BELOW
-		{ 0x00c2, 0x5b }, // Â LATIN CAPITAL LETTER A WITH CIRCUMFLEX
-		{ 0x0218, 0x5c }, // Ș LATIN CAPITAL LETTER S WITH COMMA BELOW
-		{ 0x0102, 0x5d }, // Ă LATIN CAPITAL LETTER A WITH BREVE
-		{ 0x00c3, 0x5e }, // Î LATIN CAPITAL LETTER I WITH CIRCUMFLEX
-		{ 0x0131, 0x5f }, // ı LATIN SMALL LETTER DOTLESS I
-		{ 0x021b, 0x60 }, // ț LATIN SMALL LETTER T WITH COMMA BELOW
-		{ 0x00e2, 0x7b }, // â LATIN SMALL LETTER A WITH CIRCUMFLEX
-		{ 0x0219, 0x7c }, // ș LATIN SMALL LETTER S WITH COMMA BELOW
-		{ 0x0103, 0x7d }, // ă LATIN SMALL LETTER A WITH BREVE
-		{ 0x00ee, 0x7e }  // î LATIN SMALL LETTER I WITH CIRCUMFLEX
+		{ QChar(0x00a4), 0x24 }, // ¤ CURRENCY SIGN
+		{ QChar(0x021a), 0x40 }, // Ț LATIN CAPITAL LETTER T WITH COMMA BELOW
+		{ QChar(0x00c2), 0x5b }, // Â LATIN CAPITAL LETTER A WITH CIRCUMFLEX
+		{ QChar(0x0218), 0x5c }, // Ș LATIN CAPITAL LETTER S WITH COMMA BELOW
+		{ QChar(0x0102), 0x5d }, // Ă LATIN CAPITAL LETTER A WITH BREVE
+		{ QChar(0x00c3), 0x5e }, // Î LATIN CAPITAL LETTER I WITH CIRCUMFLEX
+		{ QChar(0x0131), 0x5f }, // ı LATIN SMALL LETTER DOTLESS I
+		{ QChar(0x021b), 0x60 }, // ț LATIN SMALL LETTER T WITH COMMA BELOW
+		{ QChar(0x00e2), 0x7b }, // â LATIN SMALL LETTER A WITH CIRCUMFLEX
+		{ QChar(0x0219), 0x7c }, // ș LATIN SMALL LETTER S WITH COMMA BELOW
+		{ QChar(0x0103), 0x7d }, // ă LATIN SMALL LETTER A WITH BREVE
+		{ QChar(0x00ee), 0x7e }  // î LATIN SMALL LETTER I WITH CIRCUMFLEX
 	},
 
 	{ // 21 Serbian/Croatian/Slovenian
-		{ 0x00cb, 0x24 }, // Ë LATIN CAPITAL LETTER E WITH DIAERESIS
-		{ 0x010c, 0x40 }, // Č LATIN CAPITAL LETTER C WITH CARON
-		{ 0x0106, 0x5b }, // Ć LATIN CAPITAL LETTER C WITH ACUTE
-		{ 0x017d, 0x5c }, // Ž LATIN CAPITAL LETTER Z WITH CARON
-		{ 0x0110, 0x5d }, // Đ LATIN CAPITAL LETTER D WITH STROKE
-		{ 0x0160, 0x5e }, // Š LATIN CAPITAL LETTER S WITH CARON
-		{ 0x00eb, 0x5f }, // ë LATIN SMALL LETTER E WITH DIAERESIS
-		{ 0x010d, 0x60 }, // č LATIN SMALL LETTER C WITH CARON
-		{ 0x0107, 0x7b }, // ć LATIN SMALL LETTER C WITH ACUTE
-		{ 0x017e, 0x7c }, // ž LATIN SMALL LETTER Z WITH CARON
-		{ 0x0111, 0x7d }, // đ LATIN SMALL LETTER D WITH STROKE
-		{ 0x0161, 0x7e }  // š LATIN SMALL LETTER S WITH CARON
+		{ QChar(0x00cb), 0x24 }, // Ë LATIN CAPITAL LETTER E WITH DIAERESIS
+		{ QChar(0x010c), 0x40 }, // Č LATIN CAPITAL LETTER C WITH CARON
+		{ QChar(0x0106), 0x5b }, // Ć LATIN CAPITAL LETTER C WITH ACUTE
+		{ QChar(0x017d), 0x5c }, // Ž LATIN CAPITAL LETTER Z WITH CARON
+		{ QChar(0x0110), 0x5d }, // Đ LATIN CAPITAL LETTER D WITH STROKE
+		{ QChar(0x0160), 0x5e }, // Š LATIN CAPITAL LETTER S WITH CARON
+		{ QChar(0x00eb), 0x5f }, // ë LATIN SMALL LETTER E WITH DIAERESIS
+		{ QChar(0x010d), 0x60 }, // č LATIN SMALL LETTER C WITH CARON
+		{ QChar(0x0107), 0x7b }, // ć LATIN SMALL LETTER C WITH ACUTE
+		{ QChar(0x017e), 0x7c }, // ž LATIN SMALL LETTER Z WITH CARON
+		{ QChar(0x0111), 0x7d }, // đ LATIN SMALL LETTER D WITH STROKE
+		{ QChar(0x0161), 0x7e }  // š LATIN SMALL LETTER S WITH CARON
 	},
 
 	{ // 22 Swedish/Finnish/Hungarian
-		{ 0x00a4, 0x24 }, // ¤ CURRENCY SIGN
-		{ 0x00c9, 0x40 }, // É LATIN CAPITAL LETTER E WITH ACUTE
-		{ 0x00c4, 0x5b }, // Ä LATIN CAPITAL LETTER A WITH DIAERESIS
-		{ 0x00d6, 0x5c }, // Ö LATIN CAPITAL LETTER O WITH DIAERESIS
-		{ 0x00c5, 0x5d }, // Å LATIN CAPITAL LETTER A WITH RING ABOVE
-		{ 0x00dc, 0x5e }, // Ü LATIN CAPITAL LETTER U WITH DIAERESIS
-		{ 0x00e9, 0x60 }, // é LATIN SMALL LETTER E WITH ACUTE
-		{ 0x00e4, 0x7b }, // ä LATIN SMALL LETTER A WITH DIAERESIS
-		{ 0x00f6, 0x7c }, // ö LATIN SMALL LETTER O WITH DIAERESIS
-		{ 0x00e5, 0x7d }, // å LATIN SMALL LETTER A WITH RING ABOVE
-		{ 0x00fc, 0x7e }  // ü LATIN SMALL LETTER U WITH DIAERESIS
+		{ QChar(0x00a4), 0x24 }, // ¤ CURRENCY SIGN
+		{ QChar(0x00c9), 0x40 }, // É LATIN CAPITAL LETTER E WITH ACUTE
+		{ QChar(0x00c4), 0x5b }, // Ä LATIN CAPITAL LETTER A WITH DIAERESIS
+		{ QChar(0x00d6), 0x5c }, // Ö LATIN CAPITAL LETTER O WITH DIAERESIS
+		{ QChar(0x00c5), 0x5d }, // Å LATIN CAPITAL LETTER A WITH RING ABOVE
+		{ QChar(0x00dc), 0x5e }, // Ü LATIN CAPITAL LETTER U WITH DIAERESIS
+		{ QChar(0x00e9), 0x60 }, // é LATIN SMALL LETTER E WITH ACUTE
+		{ QChar(0x00e4), 0x7b }, // ä LATIN SMALL LETTER A WITH DIAERESIS
+		{ QChar(0x00f6), 0x7c }, // ö LATIN SMALL LETTER O WITH DIAERESIS
+		{ QChar(0x00e5), 0x7d }, // å LATIN SMALL LETTER A WITH RING ABOVE
+		{ QChar(0x00fc), 0x7e }  // ü LATIN SMALL LETTER U WITH DIAERESIS
 	},
 
 	{ // 23 Turkish
-		{ 0x20ba, 0x23 }, // ₺ TURKISH LIRA SIGN
-		{ 0x011f, 0x24 }, // ğ LATIN SMALL LETTER G WITH BREVE
-		{ 0x0130, 0x40 }, // İ LATIN CAPITAL LETTER I WITH DOT ABOVE
-		{ 0x015e, 0x5b }, // Ş LATIN CAPITAL LETTER S WITH CEDILLA
-		{ 0x00d6, 0x5c }, // Ö LATIN CAPITAL LETTER O WITH DIAERESIS
-		{ 0x00c7, 0x5d }, // Ç LATIN CAPITAL LETTER C WITH CEDILLA
-		{ 0x00dc, 0x5e }, // Ü LATIN CAPITAL LETTER U WITH DIAERESIS
-		{ 0x011e, 0x5f }, // Ğ LATIN CAPITAL LETTER G WITH BREVE
-		{ 0x0131, 0x60 }, // ı LATIN SMALL LETTER DOTLESS I
-		{ 0x015f, 0x7b }, // ş LATIN SMALL LETTER S WITH CEDILLA
-		{ 0x00f6, 0x7c }, // ö LATIN SMALL LETTER O WITH DIAERESIS
-		{ 0x00e7, 0x7d }, // ç LATIN SMALL LETTER C WITH CEDILLA
-		{ 0x00fc, 0x7e }  // ü LATIN SMALL LETTER U WITH DIAERESIS
+		{ QChar(0x20ba), 0x23 }, // ₺ TURKISH LIRA SIGN
+		{ QChar(0x011f), 0x24 }, // ğ LATIN SMALL LETTER G WITH BREVE
+		{ QChar(0x0130), 0x40 }, // İ LATIN CAPITAL LETTER I WITH DOT ABOVE
+		{ QChar(0x015e), 0x5b }, // Ş LATIN CAPITAL LETTER S WITH CEDILLA
+		{ QChar(0x00d6), 0x5c }, // Ö LATIN CAPITAL LETTER O WITH DIAERESIS
+		{ QChar(0x00c7), 0x5d }, // Ç LATIN CAPITAL LETTER C WITH CEDILLA
+		{ QChar(0x00dc), 0x5e }, // Ü LATIN CAPITAL LETTER U WITH DIAERESIS
+		{ QChar(0x011e), 0x5f }, // Ğ LATIN CAPITAL LETTER G WITH BREVE
+		{ QChar(0x0131), 0x60 }, // ı LATIN SMALL LETTER DOTLESS I
+		{ QChar(0x015f), 0x7b }, // ş LATIN SMALL LETTER S WITH CEDILLA
+		{ QChar(0x00f6), 0x7c }, // ö LATIN SMALL LETTER O WITH DIAERESIS
+		{ QChar(0x00e7), 0x7d }, // ç LATIN SMALL LETTER C WITH CEDILLA
+		{ QChar(0x00fc), 0x7e }  // ü LATIN SMALL LETTER U WITH DIAERESIS
 	}
 };
 

levelonecommands.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2023 Gavin MacGregor
+ * Copyright (C) 2020-2024 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *
@@ -21,7 +21,10 @@
 #include <QByteArray>
 #include <QByteArrayList>
 #include <QClipboard>
+#include <QImage>
 #include <QMimeData>
+#include <QRegularExpression>
+#include <QSet>
 
 #include "levelonecommands.h"
 
@@ -37,6 +40,51 @@ LevelOneCommand::LevelOneCommand(TeletextDocument *teletextDocument, QUndoComman
 	m_firstDo = true;
 }
 
+QByteArrayList LevelOneCommand::storeCharacters(int topRow, int leftColumn, int bottomRow, int rightColumn)
+{
+	QByteArrayList result;
+
+	for (int r=topRow; r<=bottomRow; r++) {
+		QByteArray rowArray;
+
+		for (int c=leftColumn; c<=rightColumn; c++)
+			// Guard against size of pasted block going beyond last line or column
+			if (r < 25 && c < 40)
+				rowArray.append(m_teletextDocument->currentSubPage()->character(r, c));
+			else
+				// Gone beyond last line or column - store a filler character which we won't see
+				// Not sure if this is really necessary as out-of-bounds access might not occur?
+				rowArray.append(0x7f);
+
+		result.append(rowArray);
+	}
+
+	return result;
+}
+
+void LevelOneCommand::retrieveCharacters(int topRow, int leftColumn, const QByteArrayList &storedChars)
+{
+	const int bottomRow = topRow + storedChars.size() - 1;
+	const int rightColumn = leftColumn + storedChars.at(0).size() - 1;
+
+	int arrayR = 0;
+	int arrayC;
+
+	for (int r=topRow; r<=bottomRow; r++) {
+		arrayC = 0;
+		for (int c=leftColumn; c<=rightColumn; c++)
+			// Guard against size of pasted block going beyond last line or column
+			if (r < 25 && c < 40) {
+				m_teletextDocument->currentSubPage()->setCharacter(r, c, storedChars.at(arrayR).at(arrayC));
+
+				arrayC++;
+			}
+
+		arrayR++;
+	}
+}
+
+
 TypeCharacterCommand::TypeCharacterCommand(TeletextDocument *teletextDocument, unsigned char newCharacter, bool insertMode, QUndoCommand *parent) : LevelOneCommand(teletextDocument, parent)
 {
 	m_columnStart = m_columnEnd = m_column;
@@ -71,7 +119,7 @@ void TypeCharacterCommand::redo()
 
 	m_teletextDocument->moveCursor(m_row, m_columnEnd);
 	m_teletextDocument->cursorRight();
-	emit m_teletextDocument->contentsChange(m_row);
+	emit m_teletextDocument->contentsChanged();
 }
 
 void TypeCharacterCommand::undo()
@@ -82,7 +130,7 @@ void TypeCharacterCommand::undo()
 		m_teletextDocument->currentSubPage()->setCharacter(m_row, c, m_oldRowContents[c]);
 
 	m_teletextDocument->moveCursor(m_row, m_columnStart);
-	emit m_teletextDocument->contentsChange(m_row);
+	emit m_teletextDocument->contentsChanged();
 }
 
 bool TypeCharacterCommand::mergeWith(const QUndoCommand *command)
@@ -104,12 +152,19 @@ bool TypeCharacterCommand::mergeWith(const QUndoCommand *command)
 ToggleMosaicBitCommand::ToggleMosaicBitCommand(TeletextDocument *teletextDocument, unsigned char bitToToggle, QUndoCommand *parent) : LevelOneCommand(teletextDocument, parent)
 {
 	m_oldCharacter = teletextDocument->currentSubPage()->character(m_row, m_column);
+
 	if (bitToToggle == 0x20 || bitToToggle == 0x7f)
+		// Clear or fill the whole mosaic character
 		m_newCharacter = bitToToggle;
 	else if (bitToToggle == 0x66)
+		// Dither
 		m_newCharacter = (m_row & 1) ? 0x66 : 0x39;
-	else
+	else if (m_oldCharacter & 0x20)
+		// Previous character was mosaic, just toggle the bit(s)
 		m_newCharacter = m_oldCharacter ^ bitToToggle;
+	else
+		// Previous character was blast-through, change to mosaic and set bit alone
+		m_newCharacter = bitToToggle | 0x20;
 
 	setText(QObject::tr("mosaic"));
 
@@ -121,7 +176,7 @@ void ToggleMosaicBitCommand::redo()
 	m_teletextDocument->currentSubPage()->setCharacter(m_row, m_column, m_newCharacter);
 
 	m_teletextDocument->moveCursor(m_row, m_column);
-	emit m_teletextDocument->contentsChange(m_row);
+	emit m_teletextDocument->contentsChanged();
 }
 
 void ToggleMosaicBitCommand::undo()
@@ -130,7 +185,7 @@ void ToggleMosaicBitCommand::undo()
 	m_teletextDocument->currentSubPage()->setCharacter(m_row, m_column, m_oldCharacter);
 
 	m_teletextDocument->moveCursor(m_row, m_column);
-	emit m_teletextDocument->contentsChange(m_row);
+	emit m_teletextDocument->contentsChanged();
 }
 
 bool ToggleMosaicBitCommand::mergeWith(const QUndoCommand *command)
@@ -182,7 +237,7 @@ void BackspaceKeyCommand::redo()
 		m_teletextDocument->currentSubPage()->setCharacter(m_row, c, m_newRowContents[c]);
 
 	m_teletextDocument->moveCursor(m_row, m_columnEnd);
-	emit m_teletextDocument->contentsChange(m_row);
+	emit m_teletextDocument->contentsChanged();
 }
 
 void BackspaceKeyCommand::undo()
@@ -194,7 +249,7 @@ void BackspaceKeyCommand::undo()
 
 	m_teletextDocument->moveCursor(m_row, m_columnStart);
 	m_teletextDocument->cursorRight();
-	emit m_teletextDocument->contentsChange(m_row);
+	emit m_teletextDocument->contentsChanged();
 }
 
 bool BackspaceKeyCommand::mergeWith(const QUndoCommand *command)
@@ -236,7 +291,7 @@ void DeleteKeyCommand::redo()
 		m_teletextDocument->currentSubPage()->setCharacter(m_row, c, m_newRowContents[c]);
 
 	m_teletextDocument->moveCursor(m_row, m_column);
-	emit m_teletextDocument->contentsChange(m_row);
+	emit m_teletextDocument->contentsChanged();
 }
 
 void DeleteKeyCommand::undo()
@@ -247,7 +302,7 @@ void DeleteKeyCommand::undo()
 		m_teletextDocument->currentSubPage()->setCharacter(m_row, c, m_oldRowContents[c]);
 
 	m_teletextDocument->moveCursor(m_row, m_column);
-	emit m_teletextDocument->contentsChange(m_row);
+	emit m_teletextDocument->contentsChanged();
 }
 
 bool DeleteKeyCommand::mergeWith(const QUndoCommand *command)
@@ -264,6 +319,145 @@ bool DeleteKeyCommand::mergeWith(const QUndoCommand *command)
 }
 
 
+ShiftMosaicsCommand::ShiftMosaicsCommand(TeletextDocument *teletextDocument, const QSet<QPair<int, int>> &mosaicList, QUndoCommand *parent) : LevelOneCommand(teletextDocument, parent)
+{
+	m_selectionTopRow = m_teletextDocument->selectionTopRow();
+	m_selectionLeftColumn = m_teletextDocument->selectionLeftColumn();
+	m_selectionBottomRow = m_teletextDocument->selectionBottomRow();
+	m_selectionRightColumn = m_teletextDocument->selectionRightColumn();
+
+	m_selectionCornerRow = m_teletextDocument->selectionCornerRow();
+	m_selectionCornerColumn = m_teletextDocument->selectionCornerColumn();
+
+	m_mosaicList = mosaicList;
+
+	m_oldCharacters = storeCharacters(m_selectionTopRow, m_selectionLeftColumn, m_selectionBottomRow, m_selectionRightColumn);
+	m_newCharacters = m_oldCharacters;
+}
+
+void ShiftMosaicsCommand::redo()
+{
+	m_teletextDocument->selectSubPageIndex(m_subPageIndex);
+	retrieveCharacters(m_selectionTopRow, m_selectionLeftColumn, m_newCharacters);
+
+	emit m_teletextDocument->contentsChanged();
+
+	m_teletextDocument->setSelectionCorner(m_selectionCornerRow, m_selectionCornerColumn);
+	m_teletextDocument->moveCursor(m_row, m_column, true);
+}
+
+void ShiftMosaicsCommand::undo()
+{
+	m_teletextDocument->selectSubPageIndex(m_subPageIndex);
+	retrieveCharacters(m_selectionTopRow, m_selectionLeftColumn, m_oldCharacters);
+
+	emit m_teletextDocument->contentsChanged();
+
+	m_teletextDocument->setSelectionCorner(m_selectionCornerRow, m_selectionCornerColumn);
+	m_teletextDocument->moveCursor(m_row, m_column, true);
+}
+
+bool ShiftMosaicsCommand::mergeWith(const QUndoCommand *command)
+{
+	const ShiftMosaicsCommand *newerCommand = static_cast<const ShiftMosaicsCommand *>(command);
+
+	if (m_subPageIndex != newerCommand->m_subPageIndex || m_selectionTopRow != newerCommand->m_selectionTopRow || m_selectionLeftColumn != newerCommand->m_selectionLeftColumn || m_selectionBottomRow != newerCommand->m_selectionBottomRow || m_selectionRightColumn != newerCommand->m_selectionRightColumn)
+		return false;
+
+	m_newCharacters = newerCommand->m_newCharacters;
+
+	return true;
+}
+
+ShiftMosaicsUpCommand::ShiftMosaicsUpCommand(TeletextDocument *teletextDocument, const QSet<QPair<int, int>> &mosaicList, QUndoCommand *parent) : ShiftMosaicsCommand(teletextDocument, mosaicList, parent)
+{
+	for (int r=m_selectionTopRow; r<=m_selectionBottomRow; r++)
+		for (int c=m_selectionLeftColumn; c<=m_selectionRightColumn; c++)
+			if (m_mosaicList.contains(qMakePair(r, c))) {
+				const int lr = r - m_selectionTopRow;
+				const int lc = c - m_selectionLeftColumn;
+				unsigned char mosaicWrap = 0x00;
+
+				for (int sr=r+1; sr<=m_selectionBottomRow; sr++)
+					if (m_mosaicList.contains(qMakePair(sr, c))) {
+						mosaicWrap = m_newCharacters[sr - m_selectionTopRow][lc];
+						mosaicWrap = ((mosaicWrap & 0x01) << 4) | ((mosaicWrap & 0x02) << 5);
+						break;
+					}
+
+				m_newCharacters[lr][lc] = ((m_newCharacters[lr][lc] >> 2) & 0x07) | ((m_newCharacters[lr][lc] & 0x40) >> 3) | mosaicWrap | 0x20;
+			}
+
+	setText(QObject::tr("shift mosaics up"));
+}
+
+ShiftMosaicsDownCommand::ShiftMosaicsDownCommand(TeletextDocument *teletextDocument, const QSet<QPair<int, int>> &mosaicList, QUndoCommand *parent) : ShiftMosaicsCommand(teletextDocument, mosaicList, parent)
+{
+	for (int r=m_selectionBottomRow; r>=m_selectionTopRow; r--)
+		for (int c=m_selectionLeftColumn; c<=m_selectionRightColumn; c++)
+			if (m_mosaicList.contains(qMakePair(r, c))) {
+				const int lr = r - m_selectionTopRow;
+				const int lc = c - m_selectionLeftColumn;
+				unsigned char mosaicWrap = 0x00;
+
+				for (int sr=r-1; sr>=m_selectionTopRow; sr--)
+					if (m_mosaicList.contains(qMakePair(sr, c))) {
+						mosaicWrap = m_newCharacters[sr - m_selectionTopRow][lc];
+						mosaicWrap = ((mosaicWrap & 0x10) >> 4) | ((mosaicWrap & 0x40) >> 5);
+						break;
+					}
+
+				m_newCharacters[lr][lc] = ((m_newCharacters[lr][lc] & 0x07) << 2) | ((m_newCharacters[lr][lc] & 0x08) << 3) | mosaicWrap | 0x20;
+			}
+
+	setText(QObject::tr("shift mosaics down"));
+}
+
+ShiftMosaicsLeftCommand::ShiftMosaicsLeftCommand(TeletextDocument *teletextDocument, const QSet<QPair<int, int>> &mosaicList, QUndoCommand *parent) : ShiftMosaicsCommand(teletextDocument, mosaicList, parent)
+{
+	for (int c=m_selectionLeftColumn; c<=m_selectionRightColumn; c++)
+		for (int r=m_selectionTopRow; r<=m_selectionBottomRow; r++)
+			if (m_mosaicList.contains(qMakePair(r, c))) {
+				const int lr = r - m_selectionTopRow;
+				const int lc = c - m_selectionLeftColumn;
+				unsigned char mosaicWrap = 0x00;
+
+				for (int sc=c+1; sc<=m_selectionRightColumn; sc++)
+					if (m_mosaicList.contains(qMakePair(r, sc))) {
+						mosaicWrap = m_newCharacters[lr][sc - m_selectionLeftColumn];
+						mosaicWrap = ((mosaicWrap & 0x05) << 1) | ((mosaicWrap & 0x10) << 2);
+						break;
+					}
+
+				m_newCharacters[lr][lc] = ((m_newCharacters[lr][lc] & 0x0a) >> 1) | ((m_newCharacters[lr][lc] & 0x40) >> 2) | mosaicWrap | 0x20;
+			}
+
+	setText(QObject::tr("shift mosaics left"));
+}
+
+ShiftMosaicsRightCommand::ShiftMosaicsRightCommand(TeletextDocument *teletextDocument, const QSet<QPair<int, int>> &mosaicList, QUndoCommand *parent) : ShiftMosaicsCommand(teletextDocument, mosaicList, parent)
+{
+	for (int c=m_selectionRightColumn; c>=m_selectionLeftColumn; c--)
+		for (int r=m_selectionTopRow; r<=m_selectionBottomRow; r++)
+			if (m_mosaicList.contains(qMakePair(r, c))) {
+				const int lr = r - m_selectionTopRow;
+				const int lc = c - m_selectionLeftColumn;
+				unsigned char mosaicWrap = 0x00;
+
+				for (int sc=c-1; sc>=m_selectionLeftColumn; sc--)
+					if (m_mosaicList.contains(qMakePair(r, sc))) {
+						mosaicWrap = m_newCharacters[lr][sc - m_selectionLeftColumn];
+						mosaicWrap = ((mosaicWrap & 0x0a) >> 1) | ((mosaicWrap & 0x40) >> 2);
+						break;
+					}
+
+				m_newCharacters[lr][lc] = ((m_newCharacters[lr][lc] & 0x05) << 1) | ((m_newCharacters[lr][lc] & 0x10) << 2) | mosaicWrap | 0x20;
+			}
+
+	setText(QObject::tr("shift mosaics right"));
+}
+
+
 InsertRowCommand::InsertRowCommand(TeletextDocument *teletextDocument, bool copyRow, QUndoCommand *parent) : LevelOneCommand(teletextDocument, parent)
 {
 	m_copyRow = copyRow;
@@ -290,7 +484,7 @@ void InsertRowCommand::redo()
 		for (int c=0; c<40; c++)
 			m_teletextDocument->currentSubPage()->setCharacter(m_row, c, ' ');
 
-	emit m_teletextDocument->refreshNeeded();
+	emit m_teletextDocument->contentsChanged();
 }
 
 void InsertRowCommand::undo()
@@ -305,7 +499,7 @@ void InsertRowCommand::undo()
 	for (int c=0; c<40; c++)
 		m_teletextDocument->currentSubPage()->setCharacter(23, c, m_deletedBottomRow[c]);
 
-	emit m_teletextDocument->refreshNeeded();
+	emit m_teletextDocument->contentsChanged();
 }
 
 
@@ -330,7 +524,7 @@ void DeleteRowCommand::redo()
 		for (int c=0; c<40; c++)
 			m_teletextDocument->currentSubPage()->setCharacter(blankingRow, c, ' ');
 
-	emit m_teletextDocument->refreshNeeded();
+	emit m_teletextDocument->contentsChanged();
 }
 
 void DeleteRowCommand::undo()
@@ -345,7 +539,7 @@ void DeleteRowCommand::undo()
 	for (int c=0; c<40; c++)
 		m_teletextDocument->currentSubPage()->setCharacter(m_row, c, m_deletedRow[c]);
 
-	emit m_teletextDocument->refreshNeeded();
+	emit m_teletextDocument->contentsChanged();
 }
 
 
@@ -360,15 +554,7 @@ CutCommand::CutCommand(TeletextDocument *teletextDocument, QUndoCommand *parent)
 	m_selectionCornerRow = m_teletextDocument->selectionCornerRow();
 	m_selectionCornerColumn = m_teletextDocument->selectionCornerColumn();
 
-	// Store copy of the characters that we're about to blank
-	for (int r=m_selectionTopRow; r<=m_selectionBottomRow; r++) {
-		QByteArray rowArray;
-
-		for (int c=m_selectionLeftColumn; c<=m_selectionRightColumn; c++)
-			rowArray.append(m_teletextDocument->currentSubPage()->character(r, c));
-
-		m_deletedCharacters.append(rowArray);
-	}
+	m_oldCharacters = storeCharacters(m_selectionTopRow, m_selectionLeftColumn, m_selectionBottomRow, m_selectionRightColumn);
 
 	setText(QObject::tr("cut"));
 }
@@ -380,25 +566,18 @@ void CutCommand::redo()
 	for (int r=m_selectionTopRow; r<=m_selectionBottomRow; r++) {
 		for (int c=m_selectionLeftColumn; c<=m_selectionRightColumn; c++)
 			m_teletextDocument->currentSubPage()->setCharacter(r, c, 0x20);
-		emit m_teletextDocument->contentsChange(r);
 	}
+
+	emit m_teletextDocument->contentsChanged();
 }
 
 void CutCommand::undo()
 {
 	m_teletextDocument->selectSubPageIndex(m_subPageIndex);
 
-	int arrayR = 0;
-	int arrayC;
+	retrieveCharacters(m_selectionTopRow, m_selectionLeftColumn, m_oldCharacters);
 
-	for (int r=m_selectionTopRow; r<=m_selectionBottomRow; r++) {
-		arrayC = 0;
-		for (int c=m_selectionLeftColumn; c<=m_selectionRightColumn; c++)
-			m_teletextDocument->currentSubPage()->setCharacter(r, c, m_deletedCharacters[arrayR].at(arrayC++));
-
-		emit m_teletextDocument->contentsChange(r);
-		arrayR++;
-	}
+	emit m_teletextDocument->contentsChanged();
 
 	m_teletextDocument->setSelectionCorner(m_selectionCornerRow, m_selectionCornerColumn);
 	m_teletextDocument->moveCursor(m_row, m_column, true);
@@ -459,7 +638,7 @@ PasteCommand::PasteCommand(TeletextDocument *teletextDocument, int pageCharSet,
 		const int rightColumn = m_selectionActive ? m_pasteRightColumn : 39;
 
 		// Parse line-feeds in the clipboard data
-		QStringList plainTextData = mimeData->text().split(QRegExp("\n|\r\n|\r"));
+		QStringList plainTextData = mimeData->text().split(QRegularExpression("\n|\r\n|\r"));
 
 		// "if" statement will be false if clipboard data is a single line of text
 		// that will fit from the cursor position
@@ -468,9 +647,7 @@ PasteCommand::PasteCommand(TeletextDocument *teletextDocument, int pageCharSet,
 
 			if (!m_selectionActive) {
 				// If selection is NOT active, use the full width of the page to paste.
-				// The second and subsequent lines will start at column 1, unless the
-				// cursor is explicitly on column 0.
-				if (m_pasteLeftColumn != 0)
+				// The second and subsequent lines will start at column 1
 				m_pasteLeftColumn = 1;
 
 				// Check if first word in the first line will fit from the cursor position
@@ -552,7 +729,7 @@ PasteCommand::PasteCommand(TeletextDocument *teletextDocument, int pageCharSet,
 				// that won't overwrite what's on the page
 				if (charToConvert == QChar::Null)
 					convertedChar = -1;
-				else if (charToConvert >= 0x01 && charToConvert <= 0x1f)
+				else if (charToConvert >= QChar(0x01) && charToConvert <= QChar(0x1f))
 					convertedChar = ' ';
 				else if (keymapping[pageCharSet].contains(charToConvert))
 					// Remapped character or non-Latin character converted successfully
@@ -561,7 +738,7 @@ PasteCommand::PasteCommand(TeletextDocument *teletextDocument, int pageCharSet,
 					// Either a Latin character or non-Latin character that can't be converted
 					// See if it's a Latin character
 					convertedChar = charToConvert.toLatin1();
-					if (convertedChar == 0)
+					if (convertedChar <= 0)
 						// Couldn't convert - make it a block character so it doesn't need to be inserted-between later on
 						convertedChar = 0x7f;
 				}
@@ -578,26 +755,81 @@ PasteCommand::PasteCommand(TeletextDocument *teletextDocument, int pageCharSet,
 			m_pasteBottomRow = m_pasteTopRow + m_clipboardDataHeight - 1;
 			m_pasteRightColumn = m_pasteLeftColumn + m_clipboardDataWidth - 1;
 		}
+	} else if (mimeData->hasImage()) {
+		QImage imageData = qvariant_cast<QImage>(mimeData->imageData());
+		m_plainText = false;
+		// Round up when dividing pixel size into character cell size
+		m_clipboardDataHeight = (imageData.height() + 2) / 3;
+		m_clipboardDataWidth = (imageData.width() + 1) / 2;
+
+		// Format_MonoLSB reverses the bits which makes them easier to shuffle into sixels
+		if (imageData.depth() == 1)
+			imageData.convertTo(QImage::Format_MonoLSB);
+		else
+			// Only pure black and white images convert reliably this way...
+			imageData = imageData.convertToFormat(QImage::Format_MonoLSB, QVector<QRgb>{0x000000ff, 0xffffffff});
+
+		for (int r=0; r<m_clipboardDataHeight; r++)
+			m_pastingCharacters.append(QByteArray(m_clipboardDataWidth, 0x00));
+
+		// Directly read the pixel-bits and convert them to sixels with some funky bit manipulation
+		for (int y=0; y<imageData.height(); y++) {
+			const unsigned char *bytePointer = imageData.constScanLine(y);
+			// Three rows of sixels per character cell
+			const int r = y / 3;
+			// Where to shuffle the bits into the top, middle or bottom row of sixels
+			// Yes it does put the bottom right sixel into bit 5 instead of bit 6;
+			// this gets remedied further on
+			const int yShift = (y % 3) * 2;
+			// The loop does eight horizontal pixels into four character cells at a time
+			for (int x=0; x<imageData.width(); x+=8) {
+				const unsigned char byteScanned = *bytePointer;
+				const int c = x / 2;
+
+				m_pastingCharacters[r][c] = m_pastingCharacters[r][c] | ((byteScanned & 0x03) << yShift);
+				// Since we're doing four character cells at a time, we need to exit the loop
+				// early before we go out of bounds.
+				// Yes it does leave an undefined last column of sixels from images that are an
+				// odd numbered number of pixels wide; this gets remedied further on
+				if (x + 2 >= imageData.width())
+					continue;
+				m_pastingCharacters[r][c+1] = m_pastingCharacters[r][c+1] | (((byteScanned >> 2) & 0x03) << yShift);
+				if (x + 4 >= imageData.width())
+					continue;
+				m_pastingCharacters[r][c+2] = m_pastingCharacters[r][c+2] | (((byteScanned >> 4) & 0x03) << yShift);
+				if (x + 6 >= imageData.width())
+					continue;
+				m_pastingCharacters[r][c+3] = m_pastingCharacters[r][c+3] | (((byteScanned >> 6) & 0x03) << yShift);
+
+				bytePointer++;
+			}
+		}
+
+		for (int r=0; r<m_clipboardDataHeight; r++) {
+			for (int c=0; c<m_clipboardDataWidth; c++)
+				if (m_pastingCharacters.at(r).at(c) & 0x20)
+					// If bit 5 was set, correct this to bit 6
+					// but we keep bit 5 set as all mosaic characters have bit 5 set
+					m_pastingCharacters[r][c] = m_pastingCharacters.at(r).at(c) | 0x40;
+				else
+					// Set bit 5 to have it recognised as a mosaic character
+					m_pastingCharacters[r][c] = m_pastingCharacters.at(r).at(c) | 0x20;
+			// If image was an odd numbered width, neutralise the undefined sixels
+			// on the right half
+			if (imageData.width() & 0x01)
+				m_pastingCharacters[r][m_clipboardDataWidth-1] = m_pastingCharacters.at(r).at(m_clipboardDataWidth-1) & 0x35;
+		}
+
+		if (!m_selectionActive) {
+			m_pasteBottomRow = m_row + m_clipboardDataHeight - 1;
+			m_pasteRightColumn = m_column + m_clipboardDataWidth - 1;
+		}
 	}
 
 	if (m_clipboardDataWidth == 0 || m_clipboardDataHeight == 0)
 		return;
 
-	// Store copy of the characters that we're about to overwrite
-	for (int r=m_pasteTopRow; r<=m_pasteBottomRow; r++) {
-		QByteArray rowArray;
-
-		for (int c=m_pasteLeftColumn; c<=m_pasteRightColumn; c++)
-			// Guard against size of pasted block going beyond last line or column
-			if (r < 25 && c < 40)
-				rowArray.append(m_teletextDocument->currentSubPage()->character(r, c));
-			else
-				// Gone beyond last line or column - store a filler character which we won't see
-				// Not sure if this is really necessary as out-of-bounds access might not occur?
-				rowArray.append(0x7f);
-
-		m_deletedCharacters.append(rowArray);
-	}
+	m_oldCharacters = storeCharacters(m_pasteTopRow, m_pasteLeftColumn, m_pasteBottomRow, m_pasteRightColumn);
 
 	setText(QObject::tr("paste"));
 }
@@ -634,9 +866,6 @@ void PasteCommand::redo()
 				}
 			}
 
-		if (r < 25)
-			emit m_teletextDocument->contentsChange(r);
-
 		arrayR++;
 		// If paste area is taller than clipboard data, repeat the pattern
 		// if it wasn't plain text
@@ -648,6 +877,8 @@ void PasteCommand::redo()
 		}
 	}
 
+	emit m_teletextDocument->contentsChanged();
+
 	if (m_selectionActive) {
 		m_teletextDocument->setSelectionCorner(m_selectionCornerRow, m_selectionCornerColumn);
 		m_teletextDocument->moveCursor(m_row, m_column, true);
@@ -664,24 +895,9 @@ void PasteCommand::undo()
 
 	m_teletextDocument->selectSubPageIndex(m_subPageIndex);
 
-	int arrayR = 0;
-	int arrayC;
+	retrieveCharacters(m_pasteTopRow, m_pasteLeftColumn, m_oldCharacters);
 
-	for (int r=m_pasteTopRow; r<=m_pasteBottomRow; r++) {
-		arrayC = 0;
-		for (int c=m_pasteLeftColumn; c<=m_pasteRightColumn; c++)
-			// Guard against size of pasted block going beyond last line or column
-			if (r < 25 && c < 40) {
-				m_teletextDocument->currentSubPage()->setCharacter(r, c, m_deletedCharacters[arrayR].at(arrayC));
-
-				arrayC++;
-			}
-
-		if (r < 25)
-			emit m_teletextDocument->contentsChange(r);
-
-		arrayR++;
-	}
+	emit m_teletextDocument->contentsChanged();
 
 	if (!m_selectionActive)
 		m_teletextDocument->moveCursor(m_row, m_column);
@@ -730,64 +946,3 @@ void DeleteSubPageCommand::undo()
 	m_teletextDocument->unDeleteSubPageFromRecycle(m_subPageIndex);
 	m_teletextDocument->selectSubPageIndex(m_subPageIndex, true);
 }
-
-
-SetColourCommand::SetColourCommand(TeletextDocument *teletextDocument, int colourIndex, int newColour, QUndoCommand *parent) : LevelOneCommand(teletextDocument, parent)
-{
-	m_colourIndex = colourIndex;
-	m_oldColour = teletextDocument->currentSubPage()->CLUT(colourIndex);
-	m_newColour = newColour;
-
-	setText(QObject::tr("colour change"));
-
-}
-
-void SetColourCommand::redo()
-{
-	m_teletextDocument->selectSubPageIndex(m_subPageIndex);
-	m_teletextDocument->currentSubPage()->setCLUT(m_colourIndex, m_newColour);
-
-	emit m_teletextDocument->colourChanged(m_colourIndex);
-	emit m_teletextDocument->refreshNeeded();
-}
-
-void SetColourCommand::undo()
-{
-	m_teletextDocument->selectSubPageIndex(m_subPageIndex);
-	m_teletextDocument->currentSubPage()->setCLUT(m_colourIndex, m_oldColour);
-
-	emit m_teletextDocument->colourChanged(m_colourIndex);
-	emit m_teletextDocument->refreshNeeded();
-}
-
-
-ResetCLUTCommand::ResetCLUTCommand(TeletextDocument *teletextDocument, int colourTable, QUndoCommand *parent) : LevelOneCommand(teletextDocument, parent)
-{
-	m_colourTable = colourTable;
-	for (int i=m_colourTable*8; i<m_colourTable*8+8; i++)
-		m_oldColourEntry[i&7] = teletextDocument->currentSubPage()->CLUT(i);
-
-	setText(QObject::tr("CLUT %1 reset").arg(m_colourTable));
-}
-
-void ResetCLUTCommand::redo()
-{
-	m_teletextDocument->selectSubPageIndex(m_subPageIndex);
-	for (int i=m_colourTable*8; i<m_colourTable*8+8; i++) {
-		m_teletextDocument->currentSubPage()->setCLUT(i, m_teletextDocument->currentSubPage()->CLUT(i, 0));
-		emit m_teletextDocument->colourChanged(i);
-	}
-
-	emit m_teletextDocument->refreshNeeded();
-}
-
-void ResetCLUTCommand::undo()
-{
-	m_teletextDocument->selectSubPageIndex(m_subPageIndex);
-	for (int i=m_colourTable*8; i<m_colourTable*8+8; i++) {
-		m_teletextDocument->currentSubPage()->setCLUT(i, m_oldColourEntry[i&7]);
-		emit m_teletextDocument->colourChanged(i);
-	}
-
-	emit m_teletextDocument->refreshNeeded();
-}

levelonecommands.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2023 Gavin MacGregor
+ * Copyright (C) 2020-2024 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *
@@ -21,6 +21,7 @@
 #define LEVELONECOMMANDS_H
 
 #include <QByteArrayList>
+#include <QSet>
 #include <QUndoCommand>
 
 #include "document.h"
@@ -28,9 +29,12 @@
 class LevelOneCommand : public QUndoCommand
 {
 public:
-	LevelOneCommand(TeletextDocument *, QUndoCommand *parent = 0);
+	LevelOneCommand(TeletextDocument *teletextDocument, QUndoCommand *parent = 0);
 
 protected:
+	QByteArrayList storeCharacters(int topRow, int leftColumn, int bottomRow, int rightColumn);
+	void retrieveCharacters(int topRow, int leftColumn, const QByteArrayList &oldChars);
+
 	TeletextDocument *m_teletextDocument;
 	int m_subPageIndex, m_row, m_column;
 	bool m_firstDo;
@@ -41,11 +45,11 @@ class TypeCharacterCommand : public LevelOneCommand
 public:
 	enum { Id = 101 };
 
-	TypeCharacterCommand(TeletextDocument *, unsigned char, bool, QUndoCommand *parent = 0);
+	TypeCharacterCommand(TeletextDocument *teletextDocument, unsigned char newCharacter, bool insertMode, QUndoCommand *parent = 0);
 
 	void redo() override;
 	void undo() override;
-	bool mergeWith(const QUndoCommand *) override;
+	bool mergeWith(const QUndoCommand *command) override;
 	int id() const override { return Id; }
 
 private:
@@ -59,11 +63,11 @@ class ToggleMosaicBitCommand : public LevelOneCommand
 public:
 	enum { Id = 102 };
 
-	ToggleMosaicBitCommand(TeletextDocument *, unsigned char, QUndoCommand *parent = 0);
+	ToggleMosaicBitCommand(TeletextDocument *teletextDocument, unsigned char bitToToggle, QUndoCommand *parent = 0);
 
 	void redo() override;
 	void undo() override;
-	bool mergeWith(const QUndoCommand *) override;
+	bool mergeWith(const QUndoCommand *command) override;
 	int id() const override { return Id; }
 
 private:
@@ -75,11 +79,11 @@ class BackspaceKeyCommand : public LevelOneCommand
 public:
 	enum { Id = 103 };
 
-	BackspaceKeyCommand(TeletextDocument *, bool insertMode, QUndoCommand *parent = 0);
+	BackspaceKeyCommand(TeletextDocument *teletextDocument, bool insertMode, QUndoCommand *parent = 0);
 
 	void redo() override;
 	void undo() override;
-	bool mergeWith(const QUndoCommand *) override;
+	bool mergeWith(const QUndoCommand *command) override;
 	int id() const override { return Id; }
 
 private:
@@ -93,21 +97,77 @@ class DeleteKeyCommand : public LevelOneCommand
 public:
 	enum { Id = 104 };
 
-	DeleteKeyCommand(TeletextDocument *, QUndoCommand *parent = 0);
+	DeleteKeyCommand(TeletextDocument *teletextDocument, QUndoCommand *parent = 0);
 
 	void redo() override;
 	void undo() override;
-	bool mergeWith(const QUndoCommand *) override;
+	bool mergeWith(const QUndoCommand *command) override;
 	int id() const override { return Id; }
 
 private:
 	unsigned char m_oldRowContents[40], m_newRowContents[40];
 };
 
+class ShiftMosaicsCommand : public LevelOneCommand
+{
+public:
+	ShiftMosaicsCommand(TeletextDocument *teletextDocument, const QSet<QPair<int, int>> &mosaicList, QUndoCommand *parent = 0);
+
+	void redo() override;
+	void undo() override;
+	bool mergeWith(const QUndoCommand *command) override;
+
+protected:
+	QByteArrayList m_oldCharacters, m_newCharacters;
+	QSet<QPair<int, int>> m_mosaicList;
+	int m_selectionTopRow, m_selectionBottomRow, m_selectionLeftColumn, m_selectionRightColumn;
+	int m_selectionCornerRow, m_selectionCornerColumn;
+};
+
+class ShiftMosaicsUpCommand : public ShiftMosaicsCommand
+{
+public:
+	enum { Id = 110 };
+
+	ShiftMosaicsUpCommand(TeletextDocument *teletextDocument, const QSet<QPair<int, int>> &mosaicList, QUndoCommand *parent = 0);
+
+	int id() const override { return Id; }
+};
+
+class ShiftMosaicsDownCommand : public ShiftMosaicsCommand
+{
+public:
+	enum { Id = 111 };
+
+	ShiftMosaicsDownCommand(TeletextDocument *teletextDocument, const QSet<QPair<int, int>> &mosaicList, QUndoCommand *parent = 0);
+
+	int id() const override { return Id; }
+};
+
+class ShiftMosaicsLeftCommand : public ShiftMosaicsCommand
+{
+public:
+	enum { Id = 112 };
+
+	ShiftMosaicsLeftCommand(TeletextDocument *teletextDocument, const QSet<QPair<int, int>> &mosaicList, QUndoCommand *parent = 0);
+
+	int id() const override { return Id; }
+};
+
+class ShiftMosaicsRightCommand : public ShiftMosaicsCommand
+{
+public:
+	enum { Id = 113 };
+
+	ShiftMosaicsRightCommand(TeletextDocument *teletextDocument, const QSet<QPair<int, int>> &mosaicList, QUndoCommand *parent = 0);
+
+	int id() const override { return Id; }
+};
+
 class InsertSubPageCommand : public LevelOneCommand
 {
 public:
-	InsertSubPageCommand(TeletextDocument *, bool, bool, QUndoCommand *parent = 0);
+	InsertSubPageCommand(TeletextDocument *teletextDocument, bool afterCurrentSubPage, bool copySubPage, QUndoCommand *parent = 0);
 
 	void redo() override;
 	void undo() override;
@@ -120,7 +180,7 @@ private:
 class DeleteSubPageCommand : public LevelOneCommand
 {
 public:
-	DeleteSubPageCommand(TeletextDocument *, QUndoCommand *parent = 0);
+	DeleteSubPageCommand(TeletextDocument *teletextDocument, QUndoCommand *parent = 0);
 
 	void redo() override;
 	void undo() override;
@@ -129,7 +189,7 @@ public:
 class InsertRowCommand : public LevelOneCommand
 {
 public:
-	InsertRowCommand(TeletextDocument *, bool, QUndoCommand *parent = 0);
+	InsertRowCommand(TeletextDocument *teletextDocument, bool copyRow, QUndoCommand *parent = 0);
 
 	void redo() override;
 	void undo() override;
@@ -142,7 +202,7 @@ private:
 class DeleteRowCommand : public LevelOneCommand
 {
 public:
-	DeleteRowCommand(TeletextDocument *, QUndoCommand *parent = 0);
+	DeleteRowCommand(TeletextDocument *teletextDocument, QUndoCommand *parent = 0);
 
 	void redo() override;
 	void undo() override;
@@ -155,13 +215,13 @@ private:
 class CutCommand : public LevelOneCommand
 {
 public:
-	CutCommand(TeletextDocument *, QUndoCommand *parent = 0);
+	CutCommand(TeletextDocument *teletextDocument, QUndoCommand *parent = 0);
 
 	void redo() override;
 	void undo() override;
 
 private:
-	QByteArrayList m_deletedCharacters;
+	QByteArrayList m_oldCharacters;
 	int m_selectionTopRow, m_selectionBottomRow, m_selectionLeftColumn, m_selectionRightColumn;
 	int m_selectionCornerRow, m_selectionCornerColumn;
 };
@@ -169,13 +229,13 @@ private:
 class PasteCommand : public LevelOneCommand
 {
 public:
-	PasteCommand(TeletextDocument *, int, QUndoCommand *parent = 0);
+	PasteCommand(TeletextDocument *teletextDocument, int pageCharSet, QUndoCommand *parent = 0);
 
 	void redo() override;
 	void undo() override;
 
 private:
-	QByteArrayList m_deletedCharacters, m_pastingCharacters;
+	QByteArrayList m_oldCharacters, m_pastingCharacters;
 	int m_pasteTopRow, m_pasteBottomRow, m_pasteLeftColumn, m_pasteRightColumn;
 	int m_clipboardDataHeight, m_clipboardDataWidth;
 	int m_selectionCornerRow, m_selectionCornerColumn;
@@ -183,29 +243,4 @@ private:
 };
 #endif // !QT_NO_CLIPBOARD
 
-class SetColourCommand : public LevelOneCommand
-{
-public:
-	SetColourCommand(TeletextDocument *, int, int, QUndoCommand *parent = 0);
-
-	void redo() override;
-	void undo() override;
-
-private:
-	int m_colourIndex, m_oldColour, m_newColour;
-};
-
-class ResetCLUTCommand : public LevelOneCommand
-{
-public:
-	ResetCLUTCommand(TeletextDocument *, int, QUndoCommand *parent = 0);
-
-	void redo() override;
-	void undo() override;
-
-private:
-	int m_colourTable;
-	int m_oldColourEntry[8];
-};
-
 #endif

levelonepage.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2023 Gavin MacGregor
+ * Copyright (C) 2020-2024 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *
@@ -64,7 +64,7 @@ void LevelOnePage::clearPage()
 		m_fastTextLink[i] = { 0x0ff, 0x3f7f };
 
 /*	m_subPageNumber = 0x0000; */
-	m_cycleValue = 8;
+	m_cycleValue = 20;
 	m_cycleType = CTseconds;
 	m_defaultCharSet = 0;
 	m_defaultNOS = 0;
@@ -431,9 +431,12 @@ int LevelOnePage::levelRequired() const
 				case 0x1f: // Termination
 				case 0x22: // G3 character @ Level 1.5
 				case 0x2f: // G2 character
-				case 0x30 ... 0x3f: // G0 character with diacritical
 					levelSeen = 1;
 					break;
+				default:
+					if (m_enhancements.at(i).modeExt() >= 0x30 && m_enhancements.at(i).modeExt() <= 0x3f)
+						// G0 character with diacritical
+						levelSeen = 1;
 			}
 
 		if (levelSeen < 2)
@@ -441,14 +444,23 @@ int LevelOnePage::levelRequired() const
 				// Check for Level 2.5 triplets
 				case 0x00: // Full screen colour
 				case 0x01: // Full row colour
-				case 0x10 ... 0x13: // Origin Modifer and Object Invocation
-				case 0x15 ... 0x17: // Object Definition
+				case 0x10: // Origin Modifier
+				case 0x11: // Invoke Active Object
+				case 0x12: // Invoke Adaptive Object
+				case 0x13: // Invoke Passive Object
+				case 0x15: // Define Active Object
+				case 0x16: // Define Adaptive Object
+				case 0x17: // Define Passive Object
 				case 0x18: // DRCS Mode
 				case 0x20: // Foreground colour
 				case 0x21: // G1 character
 				case 0x23: // Background colour
-				case 0x27 ... 0x29: // Flash functions, G0 and G2 charset designation, G0 character @ Level 2.5
-				case 0x2b ... 0x2d: // G3 character @ Level 2.5, display attributes, DRCS character
+				case 0x27: // Flash functions
+				case 0x28: // G0 and G2 charset designation
+				case 0x29: // G0 character @ Level 2.5
+				case 0x2b: // G3 character @ Level 2.5
+				case 0x2c: // Display attributes
+				case 0x2d: // DRCS character
 					levelSeen = 2;
 					break;
 			}
@@ -456,7 +468,9 @@ int LevelOnePage::levelRequired() const
 		if (levelSeen == 2)
 			switch (m_enhancements.at(i).modeExt()) {
 				// Check for triplets with "required at Level 3.5 only" parameters
-				case 0x15 ... 0x17: // Object Definition
+				case 0x15: // Define Active Object
+				case 0x16: // Define Adaptive Object
+				case 0x17: // Define Passive Object
 					if ((m_enhancements.at(i).address() & 0x18) == 0x10)
 						return 3;
 					break;

levelonepage.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2023 Gavin MacGregor
+ * Copyright (C) 2020-2024 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *
@@ -36,19 +36,19 @@ public:
 	enum CycleTypeEnum { CTcycles, CTseconds };
 
 	LevelOnePage();
-	LevelOnePage(const PageBase &);
+	LevelOnePage(const PageBase &other);
 
 	bool isEmpty() const override;
 
-	QByteArray packet(int) const override;
-	QByteArray packet(int, int) const override;
-	bool packetExists(int) const override;
-	bool packetExists(int, int) const override;
-	bool setPacket(int, QByteArray) override;
-	bool setPacket(int, int, QByteArray) override;
+	QByteArray packet(int packetNumber) const override;
+	QByteArray packet(int packetNumber, int designationCode) const override;
+	bool packetExists(int packetNumber) const override;
+	bool packetExists(int packetNumber, int designationCode) const override;
+	bool setPacket(int packetNumber, QByteArray packetContents) override;
+	bool setPacket(int packetNumber, int designationCode, QByteArray packetContents) override;
 
 	bool controlBit(int bitNumber) const override;
-	bool setControlBit(int, bool) override;
+	bool setControlBit(int bitNumber, bool active) override;
 
 	void clearPage();
 
@@ -56,53 +56,53 @@ public:
 
 /*	void setSubPageNumber(int); */
 	int cycleValue() const { return m_cycleValue; };
-	void setCycleValue(int);
+	void setCycleValue(int newValue);
 	CycleTypeEnum cycleType() const { return m_cycleType; };
-	void setCycleType(CycleTypeEnum);
+	void setCycleType(CycleTypeEnum newType);
 	int defaultCharSet() const { return m_defaultCharSet; }
-	void setDefaultCharSet(int);
+	void setDefaultCharSet(int newDefaultCharSet);
 	int defaultNOS() const { return m_defaultNOS; }
-	void setDefaultNOS(int);
+	void setDefaultNOS(int defaultNOS);
 	int secondCharSet() const { return m_secondCharSet; }
-	void setSecondCharSet(int);
+	void setSecondCharSet(int newSecondCharSet);
 	int secondNOS() const { return m_secondNOS; }
-	void setSecondNOS(int);
+	void setSecondNOS(int newSecondNOS);
 	unsigned char character(int row, int column) const { return m_level1Page[row][column]; }
-	void setCharacter(int, int, unsigned char);
+	void setCharacter(int row, int column, unsigned char newCharacter);
 	int defaultScreenColour() const { return m_defaultScreenColour; }
-	void setDefaultScreenColour(int);
+	void setDefaultScreenColour(int newDefaultScreenColour);
 	int defaultRowColour() const { return m_defaultRowColour; }
-	void setDefaultRowColour(int);
+	void setDefaultRowColour(int newDefaultRowColour);
 	int colourTableRemap() const { return m_colourTableRemap; }
-	void setColourTableRemap(int);
+	void setColourTableRemap(int newColourTableRemap);
 	bool blackBackgroundSubst() const { return m_blackBackgroundSubst; }
-	void setBlackBackgroundSubst(bool);
+	void setBlackBackgroundSubst(bool newBlackBackgroundSubst);
 	int CLUT(int index, int renderLevel=3) const;
-	void setCLUT(int, int);
+	void setCLUT(int index, int newColour);
 	QColor CLUTtoQColor(int index, int renderlevel=3) const;
-	bool isPaletteDefault(int) const;
-	bool isPaletteDefault(int, int) const;
+	bool isPaletteDefault(int colour) const;
+	bool isPaletteDefault(int fromColour, int toColour) const;
 	int levelRequired() const;
 	bool leftSidePanelDisplayed() const { return m_leftSidePanelDisplayed; }
-	void setLeftSidePanelDisplayed(bool);
+	void setLeftSidePanelDisplayed(bool newLeftSidePanelDisplayed);
 	bool rightSidePanelDisplayed() const { return m_rightSidePanelDisplayed; }
-	void setRightSidePanelDisplayed(bool);
+	void setRightSidePanelDisplayed(bool newRightSidePanelDisplayed);
 	int sidePanelColumns() const { return m_sidePanelColumns; }
-	void setSidePanelColumns(int);
+	void setSidePanelColumns(int newSidePanelColumns);
 	bool sidePanelStatusL25() const { return m_sidePanelStatusL25; }
-	void setSidePanelStatusL25(bool);
+	void setSidePanelStatusL25(bool newSidePanelStatusL25);
 	int fastTextLinkPageNumber(int linkNumber) const { return m_fastTextLink[linkNumber].pageNumber; }
-	void setFastTextLinkPageNumber(int, int);
+	void setFastTextLinkPageNumber(int linkNumber, int pageNumber);
 	int composeLinkFunction(int linkNumber) const { return m_composeLink[linkNumber].function; }
-	void setComposeLinkFunction(int, int);
+	void setComposeLinkFunction(int linkNumber, int newFunction);
 	bool composeLinkLevel2p5(int linkNumber) const { return m_composeLink[linkNumber].level2p5; }
-	void setComposeLinkLevel2p5(int, bool);
+	void setComposeLinkLevel2p5(int linkNumber, bool newRequired);
 	bool composeLinkLevel3p5(int linkNumber) const { return m_composeLink[linkNumber].level3p5; }
-	void setComposeLinkLevel3p5(int, bool);
+	void setComposeLinkLevel3p5(int linkNumber, bool newRequired);
 	int composeLinkPageNumber(int linkNumber) const { return m_composeLink[linkNumber].pageNumber; }
-	void setComposeLinkPageNumber(int, int);
+	void setComposeLinkPageNumber(int linkNumber, int newPageNumber);
 	int composeLinkSubPageCodes(int linkNumber) const { return m_composeLink[linkNumber].subPageCodes; }
-	void setComposeLinkSubPageCodes(int, int);
+	void setComposeLinkSubPageCodes(int linkNumber, int newSubPageCodes);
 
 private:
 	unsigned char m_level1Page[25][40];

loadsave.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2023 Gavin MacGregor
+ * Copyright (C) 2020-2024 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *
@@ -419,7 +419,11 @@ void saveTTI(QSaveFile &file, const TeletextDocument &document)
 		}
 	};
 
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 	outStream.setCodec("ISO-8859-1");
+#else
+	outStream.setEncoding(QStringConverter::Latin1);
+#endif
 
 	if (!document.description().isEmpty())
 #if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
@@ -558,7 +562,11 @@ void exportM29File(QSaveFile &file, const TeletextDocument &document)
 		}
 	};
 
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 	outStream.setCodec("ISO-8859-1");
+#else
+	outStream.setEncoding(QStringConverter::Latin1);
+#endif
 
 	if (!document.description().isEmpty())
 #if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)

loadsave.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2023 Gavin MacGregor
+ * Copyright (C) 2020-2024 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *
@@ -30,18 +30,18 @@
 #include "levelonepage.h"
 #include "pagebase.h"
 
-void loadTTI(QFile *, TeletextDocument *);
-void importT42(QFile *, TeletextDocument *);
+void loadTTI(QFile *inFile, TeletextDocument *document);
+void importT42(QFile *inFile, TeletextDocument *document);
 
-int controlBitsToPS(PageBase *);
+int controlBitsToPS(PageBase *subPage);
 
-void saveTTI(QSaveFile &, const TeletextDocument &);
-void exportT42File(QSaveFile &, const TeletextDocument &);
-void exportM29File(QSaveFile &, const TeletextDocument &);
+void saveTTI(QSaveFile &file, const TeletextDocument &document);
+void exportT42File(QSaveFile &file, const TeletextDocument &document);
+void exportM29File(QSaveFile &file, const TeletextDocument &document);
 
-QByteArray rowPacketAlways(PageBase *, int);
+QByteArray rowPacketAlways(PageBase *subPage, int packetNumber);
 
-QString exportHashStringPage(LevelOnePage *);
+QString exportHashStringPage(LevelOnePage *subPage);
 QString exportHashStringPackets(LevelOnePage *subPage);
 
 #endif

main.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2023 Gavin MacGregor
+ * Copyright (C) 2020-2024 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *
@@ -30,7 +30,7 @@ int main(int argc, char *argv[])
 	QApplication::setApplicationDisplayName(QApplication::applicationName());
 	QApplication::setOrganizationName("gkmac.co.uk");
 	QApplication::setOrganizationDomain("gkmac.co.uk");
-	QApplication::setApplicationVersion("0.6.1-alpha");
+	QApplication::setApplicationVersion("0.6.4-beta");
 	QCommandLineParser parser;
 	parser.setApplicationDescription(QApplication::applicationName());
 	parser.addHelpOption();

mainwidget.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2023 Gavin MacGregor
+ * Copyright (C) 2020-2024 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *
@@ -26,11 +26,13 @@
 #include <QGraphicsProxyWidget>
 #include <QGraphicsScene>
 #include <QGraphicsSceneEvent>
+#include <QImage>
 #include <QKeyEvent>
 #include <QMenu>
 #include <QMimeData>
 #include <QPainter>
 #include <QPair>
+#include <QSet>
 #include <QUndoCommand>
 #include <QWidget>
 #include <vector>
@@ -62,8 +64,7 @@ TeletextWidget::TeletextWidget(QFrame *parent) : QFrame(parent)
 	connect(&m_pageRender, &TeletextPageRender::flashChanged, this, &TeletextWidget::updateFlashTimer);
 	connect(&m_pageDecode, &TeletextPageDecode::sidePanelsChanged, this, &TeletextWidget::changeSize);
 	connect(m_teletextDocument, &TeletextDocument::subPageSelected, this, &TeletextWidget::subPageSelected);
-	connect(m_teletextDocument, &TeletextDocument::contentsChange, this, &TeletextWidget::refreshRow);
-	connect(m_teletextDocument, &TeletextDocument::refreshNeeded, this, &TeletextWidget::refreshPage);
+	connect(m_teletextDocument, &TeletextDocument::contentsChanged, this, &TeletextWidget::refreshPage);
 	connect(m_teletextDocument, &TeletextDocument::colourChanged, &m_pageRender, &TeletextPageRender::colourChanged);
 }
 
@@ -94,15 +95,6 @@ void TeletextWidget::subPageSelected()
 	update();
 }
 
-void TeletextWidget::refreshRow(int rowChanged)
-{
-	Q_UNUSED(rowChanged);
-
-	// TODO trace signals where this is called so we can remove this
-	m_pageDecode.decodePage();
-	update();
-}
-
 void TeletextWidget::refreshPage()
 {
 	m_pageDecode.decodePage();
@@ -115,11 +107,11 @@ void TeletextWidget::paintEvent(QPaintEvent *event)
 	QPainter widgetPainter(this);
 
 	m_pageRender.renderPage();
-	widgetPainter.drawPixmap(m_pageDecode.leftSidePanelColumns()*12, 0, *m_pageRender.pagePixmap(m_flashPhase), 0, 0, 480, 250);
+	widgetPainter.drawImage(m_pageDecode.leftSidePanelColumns()*12, 0, *m_pageRender.image(m_flashPhase), 0, 0, 480, 250);
 	if (m_pageDecode.leftSidePanelColumns())
-		widgetPainter.drawPixmap(0, 0, *m_pageRender.pagePixmap(m_flashPhase), 864-m_pageDecode.leftSidePanelColumns()*12, 0, m_pageDecode.leftSidePanelColumns()*12, 250);
+		widgetPainter.drawImage(0, 0, *m_pageRender.image(m_flashPhase), 864-m_pageDecode.leftSidePanelColumns()*12, 0, m_pageDecode.leftSidePanelColumns()*12, 250);
 	if (m_pageDecode.rightSidePanelColumns())
-		widgetPainter.drawPixmap(480+m_pageDecode.leftSidePanelColumns()*12, 0, *m_pageRender.pagePixmap(m_flashPhase), 480, 0, m_pageDecode.rightSidePanelColumns()*12, 250);
+		widgetPainter.drawImage(480+m_pageDecode.leftSidePanelColumns()*12, 0, *m_pageRender.image(m_flashPhase), 480, 0, m_pageDecode.rightSidePanelColumns()*12, 250);
 }
 
 void TeletextWidget::updateFlashTimer(int newFlashTimer)
@@ -187,6 +179,7 @@ void TeletextWidget::setControlBit(int bitNumber, bool active)
 	if (bitNumber == 1 || bitNumber == 2) {
 		m_pageDecode.decodePage();
 		m_pageRender.renderPage(true);
+		update();
 	}
 }
 
@@ -200,33 +193,6 @@ void TeletextWidget::setDefaultNOS(int newDefaultNOS)
 	m_levelOnePage->setDefaultNOS(newDefaultNOS);
 }
 
-void TeletextWidget::setDefaultScreenColour(int newColour)
-{
-	m_levelOnePage->setDefaultScreenColour(newColour);
-	m_pageDecode.decodePage();
-}
-
-void TeletextWidget::setDefaultRowColour(int newColour)
-{
-	m_levelOnePage->setDefaultRowColour(newColour);
-	m_pageDecode.decodePage();
-	update();
-}
-
-void TeletextWidget::setColourTableRemap(int newMap)
-{
-	m_levelOnePage->setColourTableRemap(newMap);
-	m_pageDecode.decodePage();
-	update();
-}
-
-void TeletextWidget::setBlackBackgroundSubst(bool substOn)
-{
-	m_levelOnePage->setBlackBackgroundSubst(substOn);
-	m_pageDecode.decodePage();
-	update();
-}
-
 void TeletextWidget::setSidePanelWidths(int newLeftSidePanelColumns, int newRightSidePanelColumns)
 {
 	m_levelOnePage->setLeftSidePanelDisplayed(newLeftSidePanelColumns != 0);
@@ -262,7 +228,7 @@ void TeletextWidget::keyPressEvent(QKeyEvent *event)
 		// Map it to block character so it doesn't need to be inserted-between later on
 		if (mappedKeyPress & 0x80)
 			mappedKeyPress = 0x7f;
-		if (m_pageDecode.level1MosaicAttribute(m_teletextDocument->cursorRow(), m_teletextDocument->cursorColumn()) && (mappedKeyPress < 0x40 || mappedKeyPress > 0x5f)) {
+		if (m_pageDecode.level1MosaicAttr(m_teletextDocument->cursorRow(), m_teletextDocument->cursorColumn()) && (mappedKeyPress < 0x40 || mappedKeyPress > 0x5f)) {
 			// We're on a mosaic and a blast-through character was NOT pressed
 			if (event->key() >= Qt::Key_0 && event->key() <= Qt::Key_9 && event->modifiers() & Qt::KeypadModifier) {
 				switch (event->key()) {
@@ -353,6 +319,7 @@ void TeletextWidget::keyPressEvent(QKeyEvent *event)
 		setCharacter(mappedKeyPress);
 		return;
 	}
+
 	switch (event->key()) {
 		case Qt::Key_Backspace:
 			m_teletextDocument->undoStack()->push(new BackspaceKeyCommand(m_teletextDocument, m_insertMode));
@@ -368,15 +335,27 @@ void TeletextWidget::keyPressEvent(QKeyEvent *event)
 			break;
 
 		case Qt::Key_Up:
+			if (event->modifiers() & Qt::ControlModifier)
+				shiftMosaics(event->key());
+			else
 				m_teletextDocument->cursorUp(event->modifiers() & Qt::ShiftModifier);
 			break;
 		case Qt::Key_Down:
+			if (event->modifiers() & Qt::ControlModifier)
+				shiftMosaics(event->key());
+			else
 				m_teletextDocument->cursorDown(event->modifiers() & Qt::ShiftModifier);
 			break;
 		case Qt::Key_Left:
+			if (event->modifiers() & Qt::ControlModifier)
+				shiftMosaics(event->key());
+			else
 				m_teletextDocument->cursorLeft(event->modifiers() & Qt::ShiftModifier);
 			break;
 		case Qt::Key_Right:
+			if (event->modifiers() & Qt::ControlModifier)
+				shiftMosaics(event->key());
+			else
 				m_teletextDocument->cursorRight(event->modifiers() & Qt::ShiftModifier);
 			break;
 		case Qt::Key_Return:
@@ -397,11 +376,6 @@ void TeletextWidget::keyPressEvent(QKeyEvent *event)
 		case Qt::Key_PageDown:
 			m_teletextDocument->selectSubPagePrevious();
 			break;
-		case Qt::Key_F6:
-			m_pageDecode.decodePage();
-			m_pageRender.renderPage(true);
-			update();
-			break;
 		default:
 			QFrame::keyPressEvent(event);
 	}
@@ -417,10 +391,40 @@ void TeletextWidget::toggleCharacterBit(unsigned char bitToToggle)
 	m_teletextDocument->undoStack()->push(new ToggleMosaicBitCommand(m_teletextDocument, bitToToggle));
 }
 
+void TeletextWidget::shiftMosaics(int key)
+{
+	if (!m_teletextDocument->selectionActive())
+		return;
+
+	QSet<QPair<int, int>> mosaicList;
+
+	for (int r=m_teletextDocument->selectionTopRow(); r<=m_teletextDocument->selectionBottomRow(); r++)
+		for (int c=m_teletextDocument->selectionLeftColumn(); c<=m_teletextDocument->selectionRightColumn(); c++)
+			if (m_pageDecode.level1MosaicChar(r, c))
+				mosaicList.insert(qMakePair(r, c));
+
+	if (!mosaicList.isEmpty())
+		switch (key) {
+			case Qt::Key_Up:
+				m_teletextDocument->undoStack()->push(new ShiftMosaicsUpCommand(m_teletextDocument, mosaicList));
+				break;
+			case Qt::Key_Down:
+				m_teletextDocument->undoStack()->push(new ShiftMosaicsDownCommand(m_teletextDocument, mosaicList));
+				break;
+			case Qt::Key_Left:
+				m_teletextDocument->undoStack()->push(new ShiftMosaicsLeftCommand(m_teletextDocument, mosaicList));
+				break;
+			case Qt::Key_Right:
+				m_teletextDocument->undoStack()->push(new ShiftMosaicsRightCommand(m_teletextDocument, mosaicList));
+				break;
+		}
+}
+
 void TeletextWidget::selectionToClipboard()
 {
 	QByteArray nativeData;
 	QString plainTextData;
+	QImage *imageData = nullptr;
 	QClipboard *clipboard = QApplication::clipboard();
 
 	nativeData.resize(2 + m_teletextDocument->selectionWidth() * m_teletextDocument->selectionHeight());
@@ -429,16 +433,41 @@ void TeletextWidget::selectionToClipboard()
 
 	plainTextData.reserve((m_teletextDocument->selectionWidth()+1) * m_teletextDocument->selectionHeight() - 1);
 
-	int i=2;
+	int i = 2;
 
 	for (int r=m_teletextDocument->selectionTopRow(); r<=m_teletextDocument->selectionBottomRow(); r++) {
 		for (int c=m_teletextDocument->selectionLeftColumn(); c<=m_teletextDocument->selectionRightColumn(); c++) {
 			nativeData[i++] = m_teletextDocument->currentSubPage()->character(r, c);
 
 			if (m_teletextDocument->currentSubPage()->character(r, c) >= 0x20)
-				plainTextData.append(keymapping[m_pageDecode.level1CharSet(r, c)].key(m_teletextDocument->currentSubPage()->character(r, c), m_teletextDocument->currentSubPage()->character(r, c)));
+				plainTextData.append(keymapping[m_pageDecode.level1CharSet(r, c)].key(m_teletextDocument->currentSubPage()->character(r, c), QChar(m_teletextDocument->currentSubPage()->character(r, c))));
 			else
 				plainTextData.append(' ');
+
+			if (m_pageDecode.level1MosaicChar(r, c)) {
+				// A first mosaic character was found so create the image "just in time"
+				if (imageData == nullptr) {
+					imageData = new QImage(m_teletextDocument->selectionWidth() * 2, m_teletextDocument->selectionHeight() * 3, QImage::Format_Mono);
+
+					imageData->fill(0);
+				}
+
+				const int ix = (c - m_teletextDocument->selectionLeftColumn()) * 2;
+				const int iy = (r - m_teletextDocument->selectionTopRow()) * 3;
+
+				if (m_teletextDocument->currentSubPage()->character(r, c) & 0x01)
+					imageData->setPixel(ix, iy, 1);
+				if (m_teletextDocument->currentSubPage()->character(r, c) & 0x02)
+					imageData->setPixel(ix+1, iy, 1);
+				if (m_teletextDocument->currentSubPage()->character(r, c) & 0x04)
+					imageData->setPixel(ix, iy+1, 1);
+				if (m_teletextDocument->currentSubPage()->character(r, c) & 0x08)
+					imageData->setPixel(ix+1, iy+1, 1);
+				if (m_teletextDocument->currentSubPage()->character(r, c) & 0x10)
+					imageData->setPixel(ix, iy+2, 1);
+				if (m_teletextDocument->currentSubPage()->character(r, c) & 0x40)
+					imageData->setPixel(ix+1, iy+2, 1);
+			}
 		}
 
 		plainTextData.append('\n');
@@ -447,6 +476,11 @@ void TeletextWidget::selectionToClipboard()
 	QMimeData *mimeData = new QMimeData();
 	mimeData->setData("application/x-teletext", nativeData);
 	mimeData->setText(plainTextData);
+	if (imageData != nullptr) {
+		mimeData->setImageData(*imageData);
+		delete imageData;
+	}
+
 	clipboard->setMimeData(mimeData);
 }
 

mainwidget.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2023 Gavin MacGregor
+ * Copyright (C) 2020-2024 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *
@@ -43,15 +43,15 @@ class TeletextWidget : public QFrame
 public:
 	TeletextWidget(QFrame *parent = 0);
 	~TeletextWidget();
-	void setCharacter(unsigned char);
-	void toggleCharacterBit(unsigned char);
+	void setCharacter(unsigned char newCharacter);
+	void toggleCharacterBit(unsigned char bitToToggle);
 	bool insertMode() const { return m_insertMode; };
-	void setInsertMode(bool);
+	void setInsertMode(bool insertMode);
 	bool showControlCodes() const { return m_pageRender.showControlCodes(); };
 
 	QSize sizeHint() { return QSize(480+(pageDecode()->leftSidePanelColumns()+pageDecode()->rightSidePanelColumns())*12, 250); }
 
-	void inputMethodEvent(QInputMethodEvent *);
+	void inputMethodEvent(QInputMethodEvent *event);
 
 	TeletextDocument* document() const { return m_teletextDocument; }
 	TeletextPageDecode *pageDecode() { return &m_pageDecode; }
@@ -64,22 +64,17 @@ signals:
 public slots:
 	void subPageSelected();
 	void refreshPage();
-	void setReveal(bool);
-	void setMix(bool);
-	void setShowControlCodes(bool);
-	void updateFlashTimer(int);
-	void pauseFlash(bool);
-	void refreshRow(int);
+	void setReveal(bool reveal);
+	void setMix(bool mix);
+	void setShowControlCodes(bool showControlCodes);
+	void updateFlashTimer(int newFlashTimer);
+	void pauseFlash(bool pauseNow);
 
-	void setControlBit(int, bool);
-	void setDefaultCharSet(int);
-	void setDefaultNOS(int);
-	void setDefaultScreenColour(int);
-	void setDefaultRowColour(int);
-	void setColourTableRemap(int);
-	void setBlackBackgroundSubst(bool);
-	void setSidePanelWidths(int, int);
-	void setSidePanelAtL35Only(bool);
+	void setControlBit(int bitNumber, bool active);
+	void setDefaultCharSet(int newDefaultCharSet);
+	void setDefaultNOS(int newDefaultNOS);
+	void setSidePanelWidths(int newLeftSidePanelColumns, int newRightSidePanelColumns);
+	void setSidePanelAtL35Only(bool newSidePanelAtL35Only);
 
 	void cut();
 	void copy();
@@ -107,9 +102,10 @@ private:
 	int m_flashTiming, m_flashPhase;
 
 	void timerEvent(QTimerEvent *event) override;
+	void shiftMosaics(int key);
 	void selectionToClipboard();
 
-	QPair<int, int> mouseToRowAndColumn(const QPoint &);
+	QPair<int, int> mouseToRowAndColumn(const QPoint &mousePosition);
 };
 
 class LevelOneScene : public QGraphicsScene
@@ -117,27 +113,27 @@ class LevelOneScene : public QGraphicsScene
 	Q_OBJECT
 
 public:
-	LevelOneScene(QWidget *, QObject *parent = nullptr);
-	void setBorderDimensions(int, int, int, int, int);
+	LevelOneScene(QWidget *levelOneWidget, QObject *parent = nullptr);
+	void setBorderDimensions(int sceneWidth, int sceneHeight, int widgetWidth, int leftSidePanelColumns, int rightSidePanelColumns);
 	QGraphicsRectItem *cursorRectItem() const { return m_cursorRectItem; }
 
 public slots:
 	void updateCursor();
 	void updateSelection();
-	void setMix(bool);
-	void toggleGrid(bool);
-	void hideGUIElements(bool);
-	void setFullScreenColour(const QColor &);
-	void setFullRowColour(int, const QColor &);
+	void setMix(bool mix);
+	void toggleGrid(bool gridOn);
+	void hideGUIElements(bool hidden);
+	void setFullScreenColour(const QColor &newColor);
+	void setFullRowColour(int row, const QColor &newColor);
 
 signals:
 	void mouseZoomIn();
 	void mouseZoomOut();
 
 protected:
-	bool eventFilter(QObject *, QEvent *);
-	void keyPressEvent(QKeyEvent *);
-	void keyReleaseEvent(QKeyEvent *);
+	bool eventFilter(QObject *object, QEvent *event);
+	void keyPressEvent(QKeyEvent *event);
+	void keyReleaseEvent(QKeyEvent *keyEvent);
 
 private:
 	QGraphicsRectItem *m_fullScreenTopRectItem, *m_fullScreenBottomRectItem;

mainwindow.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2023 Gavin MacGregor
+ * Copyright (C) 2020-2024 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *
@@ -17,6 +17,7 @@
  * along with QTeletextMaker.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+#include <QActionGroup>
 #include <QApplication>
 #include <QDesktopServices>
 #include <QFileDialog>
@@ -27,11 +28,12 @@
 #include <QPainter>
 #include <QPushButton>
 #include <QRadioButton>
-#include <QRegExp>
+#include <QRegularExpression>
 #include <QSaveFile>
 #include <QScreen>
 #include <QSettings>
 #include <QShortcut>
+#include <QSlider>
 #include <QStatusBar>
 #include <QToolBar>
 #include <QToolButton>
@@ -241,7 +243,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-2023 Gavin MacGregor<br><br>"
+	"Copyright (C) 2020-2024 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()));
 }
@@ -277,7 +279,7 @@ void MainWindow::init()
 	if (m_viewSmoothTransform)
 		m_textView->setRenderHints(QPainter::SmoothPixmapTransform);
 	m_textView->setBackgroundBrush(QBrush(QColor(32, 48, 96)));
-	setSceneDimensions();
+	m_zoomSlider->setValue(m_viewZoom);
 	setCentralWidget(m_textView);
 
 	connect(m_textWidget->document(), &TeletextDocument::cursorMoved, this, &MainWindow::updateCursorPosition);
@@ -285,6 +287,7 @@ void MainWindow::init()
 	connect(m_textWidget->document()->undoStack(), &QUndoStack::cleanChanged, this, [=]() { setWindowModified(!m_textWidget->document()->undoStack()->isClean()); } );
 	connect(m_textWidget->document(), &TeletextDocument::aboutToChangeSubPage, m_x26DockWidget, &X26DockWidget::unloadX26List);
 	connect(m_textWidget->document(), &TeletextDocument::subPageSelected, this, &MainWindow::updatePageWidgets);
+	connect(m_textWidget->document(), &TeletextDocument::pageOptionsChanged, this, &MainWindow::updatePageWidgets);
 	connect(m_textWidget, &TeletextWidget::sizeChanged, this, &MainWindow::setSceneDimensions);
 	connect(m_textWidget->pageDecode(), &TeletextPageDecode::fullScreenColourChanged, m_textScene, &LevelOneScene::setFullScreenColour);
 	connect(m_textWidget->pageDecode(), &TeletextPageDecode::fullRowColourChanged, m_textScene, &LevelOneScene::setFullRowColour);
@@ -353,7 +356,7 @@ void MainWindow::createActions()
 
 	const QIcon reloadIcon = QIcon::fromTheme("document-revert");
 	QAction *reloadAct = fileMenu->addAction(reloadIcon, tr("Reload"), this, &MainWindow::reload);
-	reloadAct->setShortcuts(QKeySequence::Refresh);
+	reloadAct->setShortcut(QKeySequence(Qt::Key_F5));
 	reloadAct->setStatusTip(tr("Reload the document from disk"));
 
 	fileMenu->addSeparator();
@@ -460,17 +463,17 @@ void MainWindow::createActions()
 #endif // !QT_NO_CLIPBOARD
 
 	QAction *insertBlankRowAct = editMenu->addAction(tr("Insert blank row"));
-	insertBlankRowAct->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_I));
+	insertBlankRowAct->setShortcut(QKeySequence(Qt::CTRL | Qt::Key_I));
 	insertBlankRowAct->setStatusTip(tr("Insert a blank row at the cursor position"));
 	connect(insertBlankRowAct, &QAction::triggered, [=]() { insertRow(false); } );
 
 	QAction *insertCopyRowAct = editMenu->addAction(tr("Insert copy row"));
-	insertCopyRowAct->setShortcut(QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_I));
+	insertCopyRowAct->setShortcut(QKeySequence(Qt::CTRL | Qt::SHIFT | Qt::Key_I));
 	insertCopyRowAct->setStatusTip(tr("Insert a row that's a copy of the row at the cursor position"));
 	connect(insertCopyRowAct, &QAction::triggered, [=]() { insertRow(true); } );
 
 	QAction *deleteRowAct = editMenu->addAction(tr("Delete row"));
-	deleteRowAct->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_D));
+	deleteRowAct->setShortcut(QKeySequence(Qt::CTRL | Qt::Key_D));
 	deleteRowAct->setStatusTip(tr("Delete the row at the cursor position"));
 	connect(deleteRowAct, &QAction::triggered, this, &MainWindow::deleteRow);
 
@@ -496,26 +499,26 @@ void MainWindow::createActions()
 
 	QAction *revealAct = viewMenu->addAction(tr("&Reveal"));
 	revealAct->setCheckable(true);
-	revealAct->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_R));
+	revealAct->setShortcut(QKeySequence(Qt::CTRL | Qt::Key_R));
 	revealAct->setStatusTip(tr("Toggle reveal"));
 	connect(revealAct, &QAction::toggled, m_textWidget, &TeletextWidget::setReveal);
 
 	QAction *mixAct = viewMenu->addAction(tr("&Mix"));
 	mixAct->setCheckable(true);
-	mixAct->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_M));
+	mixAct->setShortcut(QKeySequence(Qt::CTRL | Qt::Key_M));
 	mixAct->setStatusTip(tr("Toggle mix"));
 	connect(mixAct, &QAction::toggled, m_textWidget, &TeletextWidget::setMix);
 	connect(mixAct, &QAction::toggled, m_textScene, &LevelOneScene::setMix);
 
 	QAction *gridAct = viewMenu->addAction(tr("&Grid"));
 	gridAct->setCheckable(true);
-	gridAct->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_G));
+	gridAct->setShortcut(QKeySequence(Qt::CTRL | Qt::Key_G));
 	gridAct->setStatusTip(tr("Toggle the text grid"));
 	connect(gridAct, &QAction::toggled, m_textScene, &LevelOneScene::toggleGrid);
 
 	QAction *showControlCodesAct = viewMenu->addAction(tr("Show control codes"));
 	showControlCodesAct->setCheckable(true);
-	showControlCodesAct->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_T));
+	showControlCodesAct->setShortcut(QKeySequence(Qt::CTRL | Qt::Key_T));
 	showControlCodesAct->setStatusTip(tr("Toggle showing of control codes"));
 	connect(showControlCodesAct, &QAction::toggled, m_textWidget, &TeletextWidget::setShowControlCodes);
 
@@ -570,7 +573,7 @@ void MainWindow::createActions()
 	connect(zoomOutAct, &QAction::triggered, this, &MainWindow::zoomOut);
 
 	QAction *zoomResetAct = viewMenu->addAction(tr("Reset zoom"));
-	zoomResetAct->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_0));
+	zoomResetAct->setShortcut(QKeySequence(Qt::CTRL | Qt::Key_0));
 	zoomResetAct->setStatusTip(tr("Reset zoom level"));
 	connect(zoomResetAct, &QAction::triggered, this, &MainWindow::zoomReset);
 
@@ -582,19 +585,19 @@ void MainWindow::createActions()
 		const char *colours[] = { "Black", "Red", "Green", "Yellow", "Blue", "Magenta", "Cyan", "White" };
 
 		QAction *alphaColour = alphaColourSubMenu->addAction(tr(colours[i]));
-		alphaColour->setShortcut(QKeySequence(Qt::Key_Escape, Qt::Key_0 + i));
+		alphaColour->setShortcut(QKeySequence(QString("Esc, %1").arg(i)));
 		alphaColour->setStatusTip(QString("Insert alphanumeric %1 attribute").arg(QString(colours[i]).toLower()));
 		connect(alphaColour, &QAction::triggered, [=]() { m_textWidget->setCharacter(i); });
 
 		QAction *mosaicColour = mosaicColourSubMenu->addAction(tr(colours[i]));
-		mosaicColour->setShortcut(QKeySequence(Qt::Key_Escape, Qt::SHIFT + Qt::Key_0 + i));
+		mosaicColour->setShortcut(QKeySequence(QString("Esc, Shift+%1").arg(i)));
 		mosaicColour->setStatusTip(QString("Insert mosaic %1 attribute").arg(QString(colours[i]).toLower()));
 		connect(mosaicColour, &QAction::triggered, [=]() { m_textWidget->setCharacter(i+0x10); });
 	}
 
 	QMenu *mosaicsStyleSubMenu = insertMenu->addMenu(tr("Mosaics style"));
 	QAction *mosaicsSeparatedAct = mosaicsStyleSubMenu->addAction(tr("Separated mosaics"));
-	mosaicsSeparatedAct->setShortcut(QKeySequence(Qt::Key_Escape, Qt::SHIFT + Qt::Key_S));
+	mosaicsSeparatedAct->setShortcut(QKeySequence(Qt::NoModifier | Qt::Key_Escape, Qt::SHIFT | Qt::Key_S));
 	mosaicsSeparatedAct->setStatusTip(tr("Insert separated mosaics attribute"));
 	connect(mosaicsSeparatedAct, &QAction::triggered, [=]() { m_textWidget->setCharacter(0x1a); });
 	QAction *mosaicsContiguousAct = mosaicsStyleSubMenu->addAction(tr("Contiguous mosaics"));
@@ -604,7 +607,7 @@ void MainWindow::createActions()
 
 	QMenu *mosaicsHoldSubMenu = insertMenu->addMenu(tr("Mosaics hold"));
 	QAction *mosaicsHoldAct = mosaicsHoldSubMenu->addAction(tr("Hold mosaics"));
-	mosaicsHoldAct->setShortcut(QKeySequence(Qt::Key_Escape, Qt::SHIFT + Qt::Key_H));
+	mosaicsHoldAct->setShortcut(QKeySequence(Qt::NoModifier | Qt::Key_Escape, Qt::SHIFT | Qt::Key_H));
 	mosaicsHoldAct->setStatusTip(tr("Insert hold mosaics attribute"));
 	connect(mosaicsHoldAct, &QAction::triggered, [=]() { m_textWidget->setCharacter(0x1e); });
 	QAction *mosaicsReleaseAct = mosaicsHoldSubMenu->addAction(tr("Release mosaics"));
@@ -614,7 +617,7 @@ void MainWindow::createActions()
 
 	QMenu *backgroundColourSubMenu = insertMenu->addMenu(tr("Background colour"));
 	QAction *backgroundNewAct = backgroundColourSubMenu->addAction(tr("New background"));
-	backgroundNewAct->setShortcut(QKeySequence(Qt::Key_Escape, Qt::SHIFT + Qt::Key_N));
+	backgroundNewAct->setShortcut(QKeySequence(Qt::NoModifier | Qt::Key_Escape, Qt::SHIFT | Qt::Key_N));
 	backgroundNewAct->setStatusTip(tr("Insert new background attribute"));
 	connect(backgroundNewAct, &QAction::triggered, [=]() { m_textWidget->setCharacter(0x1d); });
 	QAction *backgroundBlackAct = backgroundColourSubMenu->addAction(tr("Black background"));
@@ -628,15 +631,15 @@ void MainWindow::createActions()
 	textSizeNormalAct->setStatusTip(tr("Insert normal size attribute"));
 	connect(textSizeNormalAct, &QAction::triggered, [=]() { m_textWidget->setCharacter(0x0c); });
 	QAction *textSizeDoubleHeightAct = textSizeSubMenu->addAction(tr("Double height"));
-	textSizeDoubleHeightAct->setShortcut(QKeySequence(Qt::Key_Escape, Qt::SHIFT + Qt::Key_D));
+	textSizeDoubleHeightAct->setShortcut(QKeySequence(Qt::NoModifier | Qt::Key_Escape, Qt::SHIFT | Qt::Key_D));
 	textSizeDoubleHeightAct->setStatusTip(tr("Insert double height attribute"));
 	connect(textSizeDoubleHeightAct, &QAction::triggered, [=]() { m_textWidget->setCharacter(0x0d); });
 	QAction *textSizeDoubleWidthAct = textSizeSubMenu->addAction(tr("Double width"));
-	textSizeDoubleWidthAct->setShortcut(QKeySequence(Qt::Key_Escape, Qt::CTRL + Qt::Key_D));
+	textSizeDoubleWidthAct->setShortcut(QKeySequence(Qt::NoModifier | Qt::Key_Escape, Qt::CTRL | Qt::Key_D));
 	textSizeDoubleWidthAct->setStatusTip(tr("Insert double width attribute"));
 	connect(textSizeDoubleWidthAct, &QAction::triggered, [=]() { m_textWidget->setCharacter(0x0e); });
 	QAction *textSizeDoubleSizeAct = textSizeSubMenu->addAction(tr("Double size"));
-	textSizeDoubleSizeAct->setShortcut(QKeySequence(Qt::Key_Escape, Qt::CTRL + Qt::SHIFT + Qt::Key_D));
+	textSizeDoubleSizeAct->setShortcut(QKeySequence(Qt::NoModifier | Qt::Key_Escape, Qt::CTRL | Qt::SHIFT | Qt::Key_D));
 	textSizeDoubleSizeAct->setStatusTip(tr("Insert double size attribute"));
 	connect(textSizeDoubleSizeAct, &QAction::triggered, [=]() { m_textWidget->setCharacter(0x0f); });
 
@@ -647,7 +650,7 @@ void MainWindow::createActions()
 
 	QMenu *flashSubMenu = insertMenu->addMenu(tr("Flash"));
 	QAction *flashFlashingAct = flashSubMenu->addAction(tr("Flashing"));
-	flashFlashingAct->setShortcut(QKeySequence(Qt::Key_Escape, Qt::SHIFT + Qt::Key_F));
+	flashFlashingAct->setShortcut(QKeySequence(Qt::NoModifier | Qt::Key_Escape, Qt::SHIFT | Qt::Key_F));
 	flashFlashingAct->setStatusTip(tr("Insert flashing attribute"));
 	connect(flashFlashingAct, &QAction::triggered, [=]() { m_textWidget->setCharacter(0x08); });
 	QAction *flashSteadyAct = flashSubMenu->addAction(tr("Steady"));
@@ -657,7 +660,7 @@ void MainWindow::createActions()
 
 	QMenu *boxingSubMenu = insertMenu->addMenu(tr("Box"));
 	QAction *boxingStartAct = boxingSubMenu->addAction(tr("Start box"));
-	boxingStartAct->setShortcut(QKeySequence(Qt::Key_Escape, Qt::SHIFT + Qt::Key_X));
+	boxingStartAct->setShortcut(QKeySequence(Qt::NoModifier | Qt::Key_Escape, Qt::SHIFT | Qt::Key_X));
 	boxingStartAct->setStatusTip(tr("Insert start box attribute"));
 	connect(boxingStartAct, &QAction::triggered, [=]() { m_textWidget->setCharacter(0x0b); });
 	QAction *boxingEndAct = boxingSubMenu->addAction(tr("End box"));
@@ -666,7 +669,7 @@ void MainWindow::createActions()
 	connect(boxingEndAct, &QAction::triggered, [=]() { m_textWidget->setCharacter(0x0a); });
 
 	QAction *escSwitchAct = insertMenu->addAction(tr("ESC/switch"));
-	escSwitchAct->setShortcut(QKeySequence(Qt::Key_Escape, Qt::CTRL + Qt::Key_S));
+	escSwitchAct->setShortcut(QKeySequence(Qt::NoModifier | Qt::Key_Escape, Qt::CTRL | Qt::Key_S));
 	escSwitchAct->setStatusTip(tr("Insert ESC/switch character set attribute"));
 	connect(escSwitchAct, &QAction::triggered, [=]() { m_textWidget->setCharacter(0x1b); });
 
@@ -764,26 +767,36 @@ void MainWindow::setSmoothTransform(bool smoothTransform)
 
 void MainWindow::zoomIn()
 {
-	if (m_viewZoom < 4)
+	if (m_viewZoom < 4) {
 		m_viewZoom++;
-	else if (m_viewZoom < 12)
+		m_zoomSlider->setValue(m_viewZoom);
+	} else if (m_viewZoom < 12) {
 		m_viewZoom += 2;
-	setSceneDimensions();
+		m_zoomSlider->setValue(m_viewZoom / 2 + 2);
+	}
 }
 
 void MainWindow::zoomOut()
 {
-	if (m_viewZoom > 4)
+	if (m_viewZoom > 4) {
 		m_viewZoom -= 2;
-	else if (m_viewZoom > 0)
+		m_zoomSlider->setValue(m_viewZoom == 4 ? 4 : m_viewZoom / 2 + 2);
+	} else if (m_viewZoom > 0) {
 		m_viewZoom--;
+		m_zoomSlider->setValue(m_viewZoom);
+	}
+}
+
+void MainWindow::zoomSet(int viewZoom)
+{
+	m_viewZoom = (viewZoom < 5) ? viewZoom : (viewZoom - 2) * 2;
 	setSceneDimensions();
 }
 
 void MainWindow::zoomReset()
 {
 	m_viewZoom = 2;
-	setSceneDimensions();
+	m_zoomSlider->setValue(2);
 }
 
 void MainWindow::toggleInsertMode()
@@ -819,8 +832,21 @@ void MainWindow::createStatusBar()
 	m_cursorPositionLabel = new QLabel("1, 1");
 	statusBar()->insertWidget(3, m_cursorPositionLabel);
 
+	m_zoomSlider = new QSlider;
+	m_zoomSlider->setOrientation(Qt::Horizontal);
+	m_zoomSlider->setMinimumHeight(m_subPageLabel->height());
+	m_zoomSlider->setMaximumHeight(m_subPageLabel->height());
+	m_zoomSlider->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Fixed);
+	m_zoomSlider->setRange(0, 8);
+	m_zoomSlider->setPageStep(1);
+	m_zoomSlider->setFocusPolicy(Qt::NoFocus);
+	statusBar()->insertWidget(4, m_zoomSlider);
+	connect(m_zoomSlider, &QSlider::valueChanged, this, &MainWindow::zoomSet);
+
 	m_insertModePushButton = new QPushButton("OVERWRITE");
 	m_insertModePushButton->setFlat(true);
+	m_insertModePushButton->setMinimumHeight(m_subPageLabel->height());
+	m_insertModePushButton->setMaximumHeight(m_subPageLabel->height());
 	m_insertModePushButton->setFocusProxy(m_textWidget);
 	statusBar()->addPermanentWidget(m_insertModePushButton);
 	connect(m_insertModePushButton, &QPushButton::clicked, this, &MainWindow::toggleInsertMode);
@@ -840,6 +866,7 @@ void MainWindow::createStatusBar()
 	connect(m_levelRadioButton[1], &QAbstractButton::clicked, [=]() { m_textWidget->pageDecode()->setLevel(1); m_textWidget->update(); m_paletteDockWidget->setLevel3p5Accepted(false);});
 	connect(m_levelRadioButton[2], &QAbstractButton::clicked, [=]() { m_textWidget->pageDecode()->setLevel(2); m_textWidget->update(); m_paletteDockWidget->setLevel3p5Accepted(false);});
 	connect(m_levelRadioButton[3], &QAbstractButton::clicked, [=]() { m_textWidget->pageDecode()->setLevel(3); m_textWidget->update(); m_paletteDockWidget->setLevel3p5Accepted(true);});
+
 	statusBar()->showMessage(tr("Ready"));
 }
 
@@ -1131,7 +1158,7 @@ void MainWindow::exportM29()
 	else {
 		exportFileName = QFileInfo(m_curFile).fileName();
 		// Suggest a new filename to avoid clobbering the original file
-		if (QRegExp(("^[Pp]?[1-8][0-9A-Fa-f][0-9A-Fa-f]")).indexIn(exportFileName) != -1) {
+		if (QRegularExpression(("^[Pp]?[1-8][0-9A-Fa-f][0-9A-Fa-f]")).match(exportFileName).hasMatch()) {
 			// Page number forms start of file name, change it to xFF
 			if (exportFileName.at(0) == 'P' || exportFileName.at(0) == 'p') {
 				exportFileName[2] = 'F';

mainwindow.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2023 Gavin MacGregor
+ * Copyright (C) 2020-2024 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *
@@ -21,13 +21,13 @@
 #define MAINWINDOW_H
 
 #include <QCheckBox>
-#include <QComboBox>
 #include <QGraphicsProxyWidget>
 #include <QGraphicsScene>
 #include <QGraphicsView>
 #include <QMainWindow>
 #include <QLabel>
 #include <QPushButton>
+#include <QSlider>
 #include <QToolButton>
 
 #include "mainwidget.h"
@@ -61,7 +61,7 @@ private slots:
 	bool saveAs();
 	void reload();
 	void exportAuto();
-	void exportT42(bool);
+	void exportT42(bool fromAuto);
 	void exportZXNet();
 	void exportEditTF();
 	void exportPNG();
@@ -73,17 +73,18 @@ private slots:
 	void updatePageWidgets();
 	void updateCursorPosition();
 
-	void insertRow(bool);
+	void insertRow(bool copyRow);
 	void deleteRow();
-	void insertSubPage(bool, bool);
+	void insertSubPage(bool afterCurrentSubPage, bool copyCurrentSubPage);
 	void deleteSubPage();
 
 	void setSceneDimensions();
-	void setBorder(int);
-	void setAspectRatio(int);
-	void setSmoothTransform(bool);
+	void setBorder(int newViewBorder);
+	void setAspectRatio(int newViewAspectRatio);
+	void setSmoothTransform(bool smoothTransform);
 	void zoomIn();
 	void zoomOut();
+	void zoomSet(int viewZoom);
 	void zoomReset();
 
 	void toggleInsertMode();
@@ -131,6 +132,7 @@ private:
 
 	QLabel *m_subPageLabel, *m_cursorPositionLabel;
 	QToolButton *m_previousSubPageButton, *m_nextSubPageButton;
+	QSlider *m_zoomSlider;
 	QPushButton *m_insertModePushButton;
 	QRadioButton *m_levelRadioButton[4];
 

pagebase.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2023 Gavin MacGregor
+ * Copyright (C) 2020-2024 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *

pagebase.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2023 Gavin MacGregor
+ * Copyright (C) 2020-2024 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *
@@ -35,17 +35,17 @@ public:
 
 	virtual bool isEmpty() const;
 
-	virtual QByteArray packet(int) const;
-	virtual QByteArray packet(int, int) const;
+	virtual QByteArray packet(int i) const;
+	virtual QByteArray packet(int i, int j) const;
 	virtual bool packetExists(int i) const { return m_displayPackets[i] != nullptr; }
 	virtual bool packetExists(int i, int j) const { return m_designationPackets[i-26][j] != nullptr; }
-	virtual bool setPacket(int, QByteArray);
-	virtual bool setPacket(int, int, QByteArray);
+	virtual bool setPacket(int i, QByteArray packetContents);
+	virtual bool setPacket(int i, int j, QByteArray packetContents);
 //	bool deletePacket(int);
 //	bool deletePacket(int, int);
 
 	virtual bool controlBit(int bitNumber) const { return m_controlBits[bitNumber]; }
-	virtual bool setControlBit(int, bool);
+	virtual bool setControlBit(int bitNumber, bool active);
 
 private:
 	bool m_controlBits[11];

pagecomposelinksdockwidget.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2023 Gavin MacGregor
+ * Copyright (C) 2020-2024 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *
@@ -24,7 +24,7 @@
 #include <QLineEdit>
 #include <QMap>
 #include <QPair>
-#include <QRegExpValidator>
+#include <QRegularExpressionValidator>
 #include <QString>
 
 #include "pagecomposelinksdockwidget.h"
@@ -61,7 +61,7 @@ PageComposeLinksDockWidget::PageComposeLinksDockWidget(TeletextWidget *parent):
 	level3p5OnlyLabel->setAlignment(Qt::AlignCenter);
 	x27Layout->addWidget(level3p5OnlyLabel, 6, 0, 1, 5);
 
-	m_pageNumberValidator = new QRegExpValidator(QRegExp("[1-8][0-9A-Fa-f][0-9A-Fa-f]"), this);
+	m_pageNumberValidator = new QRegularExpressionValidator(QRegularExpression("[1-8][0-9A-Fa-f][0-9A-Fa-f]"), this);
 
 	for (int i=0; i<8; i++) {
 		if (i < 4) {
@@ -124,7 +124,7 @@ void PageComposeLinksDockWidget::setComposeLinkSubPageNumbers(int linkNumber, co
 	if (!newSubPagesString.isEmpty()) {
 		// Turn user-entered comma separated subpages and subpage-ranges into bits
 		// First we do the "comma separated"
-		const QStringList items = newSubPagesString.split(QLatin1Char(','), QString::SkipEmptyParts);
+		const QStringList items = newSubPagesString.split(QLatin1Char(','), Qt::SkipEmptyParts);
 		// Now see if there's valid single numbers or ranges between the commas
 		for (const QString &item : items) {
 			if (item.isEmpty())

pagecomposelinksdockwidget.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2023 Gavin MacGregor
+ * Copyright (C) 2020-2024 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *
@@ -24,7 +24,7 @@
 #include <QComboBox>
 #include <QDockWidget>
 #include <QLineEdit>
-#include <QRegExpValidator>
+#include <QRegularExpressionValidator>
 #include <QString>
 
 #include "mainwidget.h"
@@ -38,15 +38,15 @@ public:
 	void updateWidgets();
 
 private:
-	void setComposeLinkPageNumber(int, const QString &);
-	void setComposeLinkSubPageNumbers(int, const QString &);
+	void setComposeLinkPageNumber(int linkNumber, const QString &newPageNumberString);
+	void setComposeLinkSubPageNumbers(int linkNumber, const QString &newSubPagesString);
 
 	TeletextWidget *m_parentMainWidget;
 	QCheckBox *m_composeLinkLevelCheckbox[4][2]; // For links 0-3
 	QComboBox *m_composeLinkFunctionComboBox[4]; // For links 4-7; remember to subtract 4!
 	QLineEdit *m_composeLinkPageNumberLineEdit[8], *m_composeLinkSubPageNumbersLineEdit[8];
 
-	QRegExpValidator *m_pageNumberValidator;
+	QRegularExpressionValidator *m_pageNumberValidator;
 };
 
 #endif

pageenhancementsdockwidget.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2023 Gavin MacGregor
+ * Copyright (C) 2020-2024 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *
@@ -26,6 +26,8 @@
 
 #include "pageenhancementsdockwidget.h"
 
+#include "x28commands.h"
+
 PageEnhancementsDockWidget::PageEnhancementsDockWidget(TeletextWidget *parent): QDockWidget(parent)
 {
 	QVBoxLayout *pageEnhancementsLayout = new QVBoxLayout;
@@ -48,9 +50,9 @@ PageEnhancementsDockWidget::PageEnhancementsDockWidget(TeletextWidget *parent):
 	m_defaultRowColourCombo = new QComboBox;
 	m_defaultRowColourCombo->setModel(m_parentMainWidget->document()->clutModel());
 	colourLayout->addWidget(m_defaultScreenColourCombo, 0, 1, 1, 1, Qt::AlignTop);
-	connect(m_defaultScreenColourCombo, QOverload<int>::of(&QComboBox::currentIndexChanged), [=](int index){ m_parentMainWidget->setDefaultScreenColour(index); });
+	connect(m_defaultScreenColourCombo, QOverload<int>::of(&QComboBox::currentIndexChanged), [=](int index){ m_parentMainWidget->document()->undoStack()->push(new SetFullScreenColourCommand(m_parentMainWidget->document(), index)); });
 	colourLayout->addWidget(m_defaultRowColourCombo, 1, 1, 1, 1, Qt::AlignTop);
-	connect(m_defaultRowColourCombo, QOverload<int>::of(&QComboBox::currentIndexChanged), [=](int index){ m_parentMainWidget->setDefaultRowColour(index); });
+	connect(m_defaultRowColourCombo, QOverload<int>::of(&QComboBox::currentIndexChanged), [=](int index){ m_parentMainWidget->document()->undoStack()->push(new SetFullRowColourCommand(m_parentMainWidget->document(), index)); });
 
 	// CLUT remapping
 	colourLayout->addWidget(new QLabel(tr("CLUT remapping")), 2, 0, 1, 1);
@@ -64,12 +66,12 @@ PageEnhancementsDockWidget::PageEnhancementsDockWidget(TeletextWidget *parent):
 	m_colourTableCombo->addItem("Fore 2  Back 2");
 	m_colourTableCombo->addItem("Fore 2  Back 3");
 	colourLayout->addWidget(m_colourTableCombo, 2, 1, 1, 1, Qt::AlignTop);
-	connect(m_colourTableCombo, QOverload<int>::of(&QComboBox::currentIndexChanged), [=](int index){ m_parentMainWidget->setColourTableRemap(index); });
+	connect(m_colourTableCombo, QOverload<int>::of(&QComboBox::currentIndexChanged), [=](int index){ m_parentMainWidget->document()->undoStack()->push(new SetCLUTRemapCommand(m_parentMainWidget->document(), index)); });
 
 	// Black background colour substitution
 	m_blackBackgroundSubstAct = new QCheckBox("Black background colour substitution");
 	colourLayout->addWidget(m_blackBackgroundSubstAct, 3, 0, 1, 2, Qt::AlignTop);
-	connect(m_blackBackgroundSubstAct, &QCheckBox::stateChanged, m_parentMainWidget, &TeletextWidget::setBlackBackgroundSubst);
+	connect(m_blackBackgroundSubstAct, &QCheckBox::stateChanged, [=](int state){ m_parentMainWidget->document()->undoStack()->push(new SetBlackBackgroundSubstCommand(m_parentMainWidget->document(), state)); });
 
 	// Add group box to the main layout
 	colourGroupBox->setLayout(colourLayout);

pageenhancementsdockwidget.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2023 Gavin MacGregor
+ * Copyright (C) 2020-2024 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *
@@ -36,8 +36,8 @@ public:
 	void updateWidgets();
 
 private:
-	void setLeftSidePanelWidth(int);
-	void setRightSidePanelWidth(int);
+	void setLeftSidePanelWidth(int newLeftPanelSize);
+	void setRightSidePanelWidth(int newRightPanelSize);
 
 	TeletextWidget *m_parentMainWidget;
 	QComboBox *m_defaultScreenColourCombo, *m_defaultRowColourCombo, *m_colourTableCombo;

pageoptionsdockwidget.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2023 Gavin MacGregor
+ * Copyright (C) 2020-2024 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *
@@ -24,7 +24,7 @@
 #include <QHBoxLayout>
 #include <QLabel>
 #include <QLineEdit>
-#include <QRegExpValidator>
+#include <QRegularExpressionValidator>
 #include <QSpinBox>
 #include <QVBoxLayout>
 
@@ -41,7 +41,7 @@ PageOptionsDockWidget::PageOptionsDockWidget(TeletextWidget *parent): QDockWidge
 	this->setWindowTitle("Page options");
 
 	// Page number
-	m_pageNumberValidator = new QRegExpValidator(QRegExp("[1-8][0-9A-Fa-f][0-9A-Fa-f]"), this);
+	m_pageNumberValidator = new QRegularExpressionValidator(QRegularExpression("[1-8][0-9A-Fa-f][0-9A-Fa-f]"), this);
 
 	QHBoxLayout *pageNumberLayout = new QHBoxLayout;
 	pageNumberLayout->addWidget(new QLabel(tr("Page number")));
@@ -192,6 +192,9 @@ void PageOptionsDockWidget::updateWidgets()
 	m_defaultNOSCombo->setCurrentIndex(m_defaultNOSCombo->findData((m_parentMainWidget->document()->currentSubPage()->defaultCharSet() << 3) | m_parentMainWidget->document()->currentSubPage()->defaultNOS()));
 	m_defaultNOSCombo->blockSignals(false);
 	m_secondRegionCombo->blockSignals(true);
+	if (m_parentMainWidget->document()->currentSubPage()->secondCharSet() == 15)
+		m_secondRegionCombo->setCurrentIndex(0);
+	else
 		m_secondRegionCombo->setCurrentText(QString::number(m_parentMainWidget->document()->currentSubPage()->secondCharSet()));
 	m_secondRegionCombo->blockSignals(false);
 	m_secondNOSCombo->blockSignals(true);

pageoptionsdockwidget.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2023 Gavin MacGregor
+ * Copyright (C) 2020-2024 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *
@@ -24,7 +24,7 @@
 #include <QComboBox>
 #include <QDockWidget>
 #include <QLineEdit>
-#include <QRegExpValidator>
+#include <QRegularExpressionValidator>
 #include <QSpinBox>
 
 #include "mainwidget.h"
@@ -46,10 +46,10 @@ private:
 	QComboBox *m_defaultRegionCombo, *m_defaultNOSCombo, *m_secondRegionCombo, *m_secondNOSCombo;
 	QLineEdit *m_fastTextEdit[6];
 
-	QRegExpValidator *m_pageNumberValidator;
+	QRegularExpressionValidator *m_pageNumberValidator;
 
-	void addRegionList(QComboBox *);
-	void setFastTextLinkPageNumber(int, const QString &);
+	void addRegionList(QComboBox *regionCombo);
+	void setFastTextLinkPageNumber(int linkNumber, const QString &pageNumberString);
 	void setDefaultRegion();
 	void setDefaultNOS();
 	void setSecondRegion();

pagex26base.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2023 Gavin MacGregor
+ * Copyright (C) 2020-2024 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *

pagex26base.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2023 Gavin MacGregor
+ * Copyright (C) 2020-2024 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *
@@ -35,8 +35,8 @@ public:
 	virtual int maxEnhancements() const =0;
 
 protected:
-	QByteArray packetFromEnhancementList(int) const;
-	void setEnhancementListFromPacket(int, QByteArray);
+	QByteArray packetFromEnhancementList(int packetNumber) const;
+	void setEnhancementListFromPacket(int packetNumber, QByteArray packetContents);
 	bool packetFromEnhancementListNeeded(int n) const { return ((m_enhancements.size()+12) / 13) > n; };
 
 	X26TripletList m_enhancements;

palettedockwidget.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2023 Gavin MacGregor
+ * Copyright (C) 2020-2024 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *
@@ -28,7 +28,7 @@
 
 #include "palettedockwidget.h"
 
-#include "levelonecommands.h"
+#include "x28commands.h"
 #include "document.h"
 #include "mainwidget.h"
 

palettedockwidget.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2023 Gavin MacGregor
+ * Copyright (C) 2020-2024 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *
@@ -35,19 +35,19 @@ public:
 	void updateAllColourButtons();
 
 public slots:
-	void updateColourButton(int);
-	void setLevel3p5Accepted(bool);
+	void updateColourButton(int colourIndex);
+	void setLevel3p5Accepted(bool b);
 
 protected:
-	void showEvent(QShowEvent *);
+	void showEvent(QShowEvent *event);
 
 private slots:
-	void selectColour(int);
-	void setLevel3p5Seen(bool);
+	void selectColour(int colourIndex);
+	void setLevel3p5Seen(bool b);
 	void updateLevel3p5Cursor();
 
 private:
-	void resetCLUT(int);
+	void resetCLUT(int colourTable);
 
 	QPushButton *m_colourButton[32], *m_resetButton[4];
 	QCheckBox *m_showHexValuesCheckBox;

qteletextmaker.pro

@@ -19,8 +19,10 @@ HEADERS       = decode.h \
                 render.h \
                 x26commands.h \
                 x26dockwidget.h \
+                x26menus.h \
                 x26model.h \
-                x26triplets.h
+                x26triplets.h \
+                x28commands.h
 SOURCES       = decode.cpp \
                 document.cpp \
                 levelonecommands.cpp \
@@ -38,8 +40,10 @@ SOURCES       = decode.cpp \
                 render.cpp \
                 x26commands.cpp \
                 x26dockwidget.cpp \
+                x26menus.cpp \
                 x26model.cpp \
-                x26triplets.cpp
+                x26triplets.cpp \
+                x28commands.cpp
 RESOURCES     = qteletextmaker.qrc
 
 # install

render.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2023 Gavin MacGregor
+ * Copyright (C) 2020-2024 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *
@@ -18,6 +18,8 @@
  */
 
 #include <QBitmap>
+#include <QColor>
+#include <QImage>
 #include <QPainter>
 #include <QPixmap>
 
@@ -28,27 +30,31 @@
 int TeletextFontBitmap::s_instances = 0;
 
 QBitmap *TeletextFontBitmap::s_fontBitmap = nullptr;
+QImage *TeletextFontBitmap::s_fontImage = nullptr;
 
 TeletextFontBitmap::TeletextFontBitmap()
 {
-	if (s_instances == 0)
+	if (s_instances == 0) {
 		s_fontBitmap = new QBitmap(":/images/teletextfont.png");
+		s_fontImage = new QImage(s_fontBitmap->toImage());
+	}
 	s_instances++;
 }
 
 TeletextFontBitmap::~TeletextFontBitmap()
 {
 	s_instances--;
-	if (s_instances == 0)
+	if (s_instances == 0) {
+		delete s_fontImage;
 		delete s_fontBitmap;
+	}
 }
 
 
 TeletextPageRender::TeletextPageRender()
 {
 	for (int i=0; i<6; i++)
-		m_pagePixmap[i] = new QPixmap(864, 250);
-	m_pagePixmap[0]->fill(Qt::transparent);
+		m_pageImage[i] = new QImage(864, 250, QImage::Format_ARGB32_Premultiplied);
 
 	m_reveal = false;
 	m_mix = false;
@@ -65,7 +71,7 @@ TeletextPageRender::TeletextPageRender()
 TeletextPageRender::~TeletextPageRender()
 {
 	for (int i=0; i<6; i++)
-		delete m_pagePixmap[i];
+		delete m_pageImage[i];
 }
 
 void TeletextPageRender::setDecoder(TeletextPageDecode *decoder)
@@ -73,180 +79,146 @@ void TeletextPageRender::setDecoder(TeletextPageDecode *decoder)
 	m_decoder = decoder;
 }
 
-inline void TeletextPageRender::drawFromBitmap(QPainter &pixmapPainter, int r, int c, const QBitmap bitmap, TeletextPageDecode::CharacterFragment characterFragment)
+inline void TeletextPageRender::drawFromBitmap(QPainter &painter, int r, int c, const QImage image, TeletextPageDecode::CharacterFragment characterFragment)
 {
 	switch (characterFragment) {
 		case TeletextPageDecode::NormalSize:
-			pixmapPainter.drawPixmap(c*12, r*10, bitmap);
+			painter.drawImage(c*12, r*10, image);
 			break;
 		case TeletextPageDecode::DoubleHeightTopHalf:
-			pixmapPainter.drawPixmap(c*12, r*10, 12, 10, bitmap, 0, 0, 12, 5);
+			painter.drawImage(QRect(c*12, r*10, 12, 10), image, QRect(0, 0, 12, 5));
 			break;
 		case TeletextPageDecode::DoubleHeightBottomHalf:
-			pixmapPainter.drawPixmap(c*12, r*10, 12, 10, bitmap, 0, 5, 12, 5);
+			painter.drawImage(QRect(c*12, r*10, 12, 10), image, QRect(0, 5, 12, 5));
 			break;
 		case TeletextPageDecode::DoubleWidthLeftHalf:
-			pixmapPainter.drawPixmap(c*12, r*10, 12, 10, bitmap, 0, 0, 6, 10);
+			painter.drawImage(QRect(c*12, r*10, 12, 10), image, QRect(0, 0, 6, 10));
 			break;
 		case TeletextPageDecode::DoubleWidthRightHalf:
-			pixmapPainter.drawPixmap(c*12, r*10, 12, 10, bitmap, 6, 0, 6, 10);
+			painter.drawImage(QRect(c*12, r*10, 12, 10), image, QRect(6, 0, 6, 10));
 			break;
 		case TeletextPageDecode::DoubleSizeTopLeftQuarter:
-			pixmapPainter.drawPixmap(c*12, r*10, 12, 10, bitmap, 0, 0, 6, 5);
+			painter.drawImage(QRect(c*12, r*10, 12, 10), image, QRect(0, 0, 6, 5));
 			break;
 		case TeletextPageDecode::DoubleSizeTopRightQuarter:
-			pixmapPainter.drawPixmap(c*12, r*10, 12, 10, bitmap, 6, 0, 6, 5);
+			painter.drawImage(QRect(c*12, r*10, 12, 10), image, QRect(6, 0, 6, 5));
 			break;
 		case TeletextPageDecode::DoubleSizeBottomLeftQuarter:
-			pixmapPainter.drawPixmap(c*12, r*10, 12, 10, bitmap, 0, 5, 6, 5);
+			painter.drawImage(QRect(c*12, r*10, 12, 10), image, QRect(0, 5, 6, 5));
 			break;
 		case TeletextPageDecode::DoubleSizeBottomRightQuarter:
-			pixmapPainter.drawPixmap(c*12, r*10, 12, 10, bitmap, 6, 5, 6, 5);
+			painter.drawImage(QRect(c*12, r*10, 12, 10), image, QRect(6, 5, 6, 5));
 			break;
 	}
 }
 
-inline void TeletextPageRender::drawFromFontBitmap(QPainter &pixmapPainter, int r, int c, unsigned char characterCode, int characterSet, TeletextPageDecode::CharacterFragment characterFragment)
+inline void TeletextPageRender::drawFromFontBitmap(QPainter &painter, int r, int c, unsigned char characterCode, int characterSet, TeletextPageDecode::CharacterFragment characterFragment)
 {
 	switch (characterFragment) {
 		case TeletextPageDecode::NormalSize:
-			pixmapPainter.drawPixmap(c*12, r*10, *m_fontBitmap.rawBitmap(), (characterCode-32)*12, characterSet*10, 12, 10);
+			painter.drawImage(c*12, r*10, *m_fontBitmap.image(), (characterCode-32)*12, characterSet*10, 12, 10);
 			break;
 		case TeletextPageDecode::DoubleHeightTopHalf:
-			pixmapPainter.drawPixmap(c*12, r*10, 12, 10, *m_fontBitmap.rawBitmap(), (characterCode-32)*12, characterSet*10, 12, 5);
+			painter.drawImage(QRect(c*12, r*10, 12, 10), *m_fontBitmap.image(), QRect((characterCode-32)*12, characterSet*10, 12, 5));
 			break;
 		case TeletextPageDecode::DoubleHeightBottomHalf:
-			pixmapPainter.drawPixmap(c*12, r*10, 12, 10, *m_fontBitmap.rawBitmap(), (characterCode-32)*12, characterSet*10+5, 12, 5);
+			painter.drawImage(QRect(c*12, r*10, 12, 10), *m_fontBitmap.image(), QRect((characterCode-32)*12, characterSet*10+5, 12, 5));
 			break;
 		case TeletextPageDecode::DoubleWidthLeftHalf:
-			pixmapPainter.drawPixmap(c*12, r*10, 12, 10, *m_fontBitmap.rawBitmap(), (characterCode-32)*12, characterSet*10, 6, 10);
+			painter.drawImage(QRect(c*12, r*10, 12, 10), *m_fontBitmap.image(), QRect((characterCode-32)*12, characterSet*10, 6, 10));
 			break;
 		case TeletextPageDecode::DoubleWidthRightHalf:
-			pixmapPainter.drawPixmap(c*12, r*10, 12, 10, *m_fontBitmap.rawBitmap(), (characterCode-32)*12+6, characterSet*10, 6, 10);
+			painter.drawImage(QRect(c*12, r*10, 12, 10), *m_fontBitmap.image(), QRect((characterCode-32)*12+6, characterSet*10, 6, 10));
 			break;
 		case TeletextPageDecode::DoubleSizeTopLeftQuarter:
-			pixmapPainter.drawPixmap(c*12, r*10, 12, 10, *m_fontBitmap.rawBitmap(), (characterCode-32)*12, characterSet*10, 6, 5);
+			painter.drawImage(QRect(c*12, r*10, 12, 10), *m_fontBitmap.image(), QRect((characterCode-32)*12, characterSet*10, 6, 5));
 			break;
 		case TeletextPageDecode::DoubleSizeTopRightQuarter:
-			pixmapPainter.drawPixmap(c*12, r*10, 12, 10, *m_fontBitmap.rawBitmap(), (characterCode-32)*12+6, characterSet*10, 6, 5);
+			painter.drawImage(QRect(c*12, r*10, 12, 10), *m_fontBitmap.image(), QRect((characterCode-32)*12+6, characterSet*10, 6, 5));
 			break;
 		case TeletextPageDecode::DoubleSizeBottomLeftQuarter:
-			pixmapPainter.drawPixmap(c*12, r*10, 12, 10, *m_fontBitmap.rawBitmap(), (characterCode-32)*12, characterSet*10+5, 6, 5);
+			painter.drawImage(QRect(c*12, r*10, 12, 10), *m_fontBitmap.image(), QRect((characterCode-32)*12, characterSet*10+5, 6, 5));
 			break;
 		case TeletextPageDecode::DoubleSizeBottomRightQuarter:
-			pixmapPainter.drawPixmap(c*12, r*10, 12, 10, *m_fontBitmap.rawBitmap(), (characterCode-32)*12+6, characterSet*10+5, 6, 5);
+			painter.drawImage(QRect(c*12, r*10, 12, 10), *m_fontBitmap.image(), QRect((characterCode-32)*12+6, characterSet*10+5, 6, 5));
 			break;
 	}
 }
 
-inline void TeletextPageRender::drawCharacter(QPainter &pixmapPainter, int r, int c, unsigned char characterCode, int characterSet, int characterDiacritical, TeletextPageDecode::CharacterFragment characterFragment)
+inline void TeletextPageRender::drawCharacter(QPainter &painter, int r, int c, unsigned char characterCode, int characterSet, int characterDiacritical, TeletextPageDecode::CharacterFragment characterFragment)
 {
 	const bool dontUnderline = characterCode == 0x00;
 	if (dontUnderline)
 		characterCode = 0x20;
 
-	// If either foreground or background is set to transparent
-	// tinker with the QPainter settings so we get the desired result
-	if (!pixmapPainter.background().isOpaque()) {
-		if (pixmapPainter.pen().color().alpha() == 0) {
-			// Transparent foreground and background
-			pixmapPainter.setCompositionMode(QPainter::CompositionMode_Clear);
-			pixmapPainter.eraseRect(c*12, r*10, 12, 10);
-			pixmapPainter.setCompositionMode(QPainter::CompositionMode_SourceOver);
-
-			return;
-		} else
-			// Transparent background, opaque foreground
-			pixmapPainter.setCompositionMode(QPainter::CompositionMode_Source);
-	} else if (pixmapPainter.pen().color().alpha() == 0) {
-		// Transparent foreground, opaque background
-		// Deal with optimising G1 solid 7/F blocks and spaces now
-		// otherwise the same optimisations later on won't work with
-		// our tinkered QPainter settings
-		if (characterCode == 0x7f && characterSet == 24) {
-			pixmapPainter.setCompositionMode(QPainter::CompositionMode_Clear);
-			pixmapPainter.eraseRect(c*12, r*10, 12, 10);
-			pixmapPainter.setCompositionMode(QPainter::CompositionMode_SourceOver);
-
-			return;
-		}
-
-		pixmapPainter.fillRect(c*12, r*10, 12, 10, m_decoder->cellBackgroundQColor(r, c));
-
 	if (characterCode == 0x20 && characterSet < 25 && characterDiacritical == 0)
-			return;
-
-		pixmapPainter.setBackground(QColor(0, 0, 0, 0));
-		pixmapPainter.setPen(QColor(255, 255, 255, 255));
-		pixmapPainter.setCompositionMode(QPainter::CompositionMode_DestinationOut);
-	}
-
-	if (characterCode == 0x20 && characterSet < 25 && characterDiacritical == 0)
-		pixmapPainter.fillRect(c*12, r*10, 12, 10, pixmapPainter.background().color());
+		painter.fillRect(c*12, r*10, 12, 10, m_backgroundQColor);
 	else if (characterCode == 0x7f && characterSet == 24)
-		pixmapPainter.fillRect(c*12, r*10, 12, 10, pixmapPainter.pen().color());
+		painter.fillRect(c*12, r*10, 12, 10, m_foregroundQColor);
 	else if ((m_decoder->cellBold(r, c) || m_decoder->cellItalic(r, c)) && characterSet < 24)
-		drawBoldOrItalicCharacter(pixmapPainter, r, c, characterCode, characterSet, characterFragment);
-	else
-		drawFromFontBitmap(pixmapPainter, r, c, characterCode, characterSet, characterFragment);
+		drawBoldOrItalicCharacter(painter, r, c, characterCode, characterSet, characterFragment);
+	else {
+		m_fontBitmap.image()->setColorTable(QVector<QRgb>{m_backgroundQColor.rgba(), m_foregroundQColor.rgba()});
+		drawFromFontBitmap(painter, r, c, characterCode, characterSet, characterFragment);
+	}
 
-	if (m_decoder->cellUnderlined(r, c) && !dontUnderline)
+	if (m_decoder->cellUnderlined(r, c) && !dontUnderline) {
+		painter.setPen(m_foregroundQColor);
 		switch (characterFragment) {
 			case TeletextPageDecode::NormalSize:
 			case TeletextPageDecode::DoubleWidthLeftHalf:
 			case TeletextPageDecode::DoubleWidthRightHalf:
-				pixmapPainter.drawLine(c*12, r*10+9, c*12+11, r*10+9);
+				painter.drawLine(c*12, r*10+9, c*12+11, r*10+9);
 				break;
 			case TeletextPageDecode::DoubleHeightBottomHalf:
 			case TeletextPageDecode::DoubleSizeBottomLeftQuarter:
 			case TeletextPageDecode::DoubleSizeBottomRightQuarter:
-				pixmapPainter.drawRect(c*12, r*10+8, 11, 1);
+				painter.drawRect(c*12, r*10+8, 11, 1);
 				break;
 			default:
 				break;
 		}
+	}
 
 	if (characterDiacritical != 0) {
-		pixmapPainter.setCompositionMode(QPainter::CompositionMode_SourceOver);
-		pixmapPainter.setBackgroundMode(Qt::TransparentMode);
-		drawFromFontBitmap(pixmapPainter, r, c, characterDiacritical+64, 7, characterFragment);
-		pixmapPainter.setBackgroundMode(Qt::OpaqueMode);
+		painter.setCompositionMode(QPainter::CompositionMode_SourceOver);
+		m_fontBitmap.image()->setColorTable(QVector<QRgb>{0x00000000, m_foregroundQColor.rgba()});
+		drawFromFontBitmap(painter, r, c, characterDiacritical+64, 7, characterFragment);
+		painter.setCompositionMode(QPainter::CompositionMode_Source);
 	}
-
-	if (pixmapPainter.compositionMode() != QPainter::CompositionMode_SourceOver)
-		pixmapPainter.setCompositionMode(QPainter::CompositionMode_SourceOver);
 }
 
-inline void TeletextPageRender::drawBoldOrItalicCharacter(QPainter &pixmapPainter, int r, int c, unsigned char characterCode, int characterSet, TeletextPageDecode::CharacterFragment characterFragment)
+inline void TeletextPageRender::drawBoldOrItalicCharacter(QPainter &painter, int r, int c, unsigned char characterCode, int characterSet, TeletextPageDecode::CharacterFragment characterFragment)
 {
-	QBitmap bitmap = QBitmap(12, 10);
-	QPainter bitmapPainter;
+	QImage styledImage = QImage(12, 10, QImage::Format_Mono);
+	QPainter styledPainter;
+
+	m_fontBitmap.image()->setColorTable(QVector<QRgb>{m_backgroundQColor.rgba(), m_foregroundQColor.rgba()});
+	styledImage.setColorTable(QVector<QRgb>{m_backgroundQColor.rgba(), m_foregroundQColor.rgba()});
 
-	// TODO italic glyph-making is VERY slow!
 	if (m_decoder->cellItalic(r, c)) {
-		bitmap.clear();
+		styledImage.fill(0);
 
-		bitmapPainter.begin(&bitmap);
-		bitmapPainter.setBackgroundMode(Qt::OpaqueMode);
-		bitmapPainter.drawPixmap(1, 0, *m_fontBitmap.rawBitmap(), (characterCode-32)*12, characterSet*10, 11, 3);
-		bitmapPainter.drawPixmap(0, 3, *m_fontBitmap.rawBitmap(), (characterCode-32)*12, characterSet*10+3, 12, 3);
-		bitmapPainter.drawPixmap(0, 6, *m_fontBitmap.rawBitmap(), (characterCode-32)*12+1, characterSet*10+6, 11, 4);
-		bitmapPainter.end();
+		styledPainter.begin(&styledImage);
+		styledPainter.setCompositionMode(QPainter::CompositionMode_Source);
+		styledPainter.drawImage(1, 0, *m_fontBitmap.image(), (characterCode-32)*12, characterSet*10, 11, 3);
+		styledPainter.drawImage(0, 3, *m_fontBitmap.image(), (characterCode-32)*12, characterSet*10+3, 12, 3);
+		styledPainter.drawImage(0, 6, *m_fontBitmap.image(), (characterCode-32)*12+1, characterSet*10+6, 11, 4);
+		styledPainter.end();
 	} else
-		bitmap = m_fontBitmap.rawBitmap()->copy((characterCode-32)*12, characterSet*10, 12, 10);
+		styledImage = m_fontBitmap.image()->copy((characterCode-32)*12, characterSet*10, 12, 10);
 
 	if (m_decoder->cellBold(r, c)) {
-		QBitmap boldeningBitmap;
+		QImage boldeningImage;
 
-		boldeningBitmap = bitmap.copy();
-		bitmapPainter.begin(&bitmap);
-		// No idea why we need this setPen workaround when character is made italic first?!
-		if (!m_decoder->cellItalic(r, c))
-			bitmapPainter.setPen(Qt::color0);
-		bitmapPainter.drawPixmap(1, 0, boldeningBitmap);
-		bitmapPainter.end();
+		boldeningImage = styledImage.copy();
+		styledPainter.begin(&styledImage);
+		styledPainter.setCompositionMode(QPainter::CompositionMode_SourceOver);
+		boldeningImage.setColorTable(QVector<QRgb>{0x00000000, m_foregroundQColor.rgba()});
+		styledPainter.drawImage(1, 0, boldeningImage);
+		styledPainter.end();
 	}
-	drawFromBitmap(pixmapPainter, r, c, bitmap, characterFragment);
+	drawFromBitmap(painter, r, c, styledImage, characterFragment);
 }
 
 void TeletextPageRender::renderPage(bool force)
@@ -257,12 +229,12 @@ void TeletextPageRender::renderPage(bool force)
 
 void TeletextPageRender::renderRow(int r, int ph, bool force)
 {
-	QPainter pixmapPainter;
+	QPainter painter;
 	int flashingRow = 0;
 	bool rowRefreshed = false;
 
-	pixmapPainter.begin(m_pagePixmap[ph]);
-	pixmapPainter.setBackgroundMode(Qt::OpaqueMode);
+	painter.begin(m_pageImage[ph]);
+	painter.setCompositionMode(QPainter::CompositionMode_Source);
 
 	for (int c=0; c<72; c++) {
 		bool controlCodeChanged = false;
@@ -280,7 +252,7 @@ void TeletextPageRender::renderRow(int r, int ph, bool force)
 
 		if (ph == 0) {
 			if (m_decoder->cellFlashMode(r, c) != 0)
-				flashingRow = (m_decoder->cellFlashRatePhase(r, c) == 0) ? 1 : 2;
+				flashingRow = qMax(flashingRow, (m_decoder->cellFlashRatePhase(r, c) == 0) ? 1 : 2);
 		} else
 			force = m_decoder->cellFlashMode(r, c) != 0;
 
@@ -304,7 +276,7 @@ void TeletextPageRender::renderRow(int r, int ph, bool force)
 			}
 
 			if (m_decoder->cellFlashMode(r, c) == 0)
-				pixmapPainter.setPen(m_decoder->cellForegroundQColor(r, c));
+				m_foregroundQColor = m_decoder->cellForegroundQColor(r, c);
 			else {
 				// Flashing cell, decide if phase in this cycle is on or off
 				bool phaseOn;
@@ -316,9 +288,9 @@ void TeletextPageRender::renderRow(int r, int ph, bool force)
 
 				// If flashing to adjacent CLUT select the appropriate foreground colour
 				if (m_decoder->cellFlashMode(r, c) == 3 && !phaseOn)
-					pixmapPainter.setPen(m_decoder->cellFlashForegroundQColor(r, c));
+					m_foregroundQColor = m_decoder->cellFlashForegroundQColor(r, c);
 				else
-					pixmapPainter.setPen(m_decoder->cellForegroundQColor(r, c));
+					m_foregroundQColor = m_decoder->cellForegroundQColor(r, c);
 
 				// If flashing mode is Normal or Invert, draw a space instead of a character on phase
 				if ((m_decoder->cellFlashMode(r, c) == 1 || m_decoder->cellFlashMode(r, c) == 2) && !phaseOn) {
@@ -330,21 +302,22 @@ void TeletextPageRender::renderRow(int r, int ph, bool force)
 			}
 
 			if (!m_mix || m_decoder->cellBoxed(r, c))
-				pixmapPainter.setBackground(m_decoder->cellBackgroundQColor(r, c));
+				m_backgroundQColor = m_decoder->cellBackgroundQColor(r, c);
 			else
-				pixmapPainter.setBackground(Qt::transparent);
+				m_backgroundQColor = Qt::transparent;
 
-			drawCharacter(pixmapPainter, r, c, characterCode, characterSet, characterDiacritical, m_decoder->cellCharacterFragment(r, c));
+			drawCharacter(painter, r, c, characterCode, characterSet, characterDiacritical, m_decoder->cellCharacterFragment(r, c));
 
 			if (m_showControlCodes && c < 40 && m_decoder->teletextPage()->character(r, c) < 0x20) {
-				pixmapPainter.setBackground(QColor(0, 0, 0, 128));
-				pixmapPainter.setPen(QColor(255, 255, 255, 224));
-				pixmapPainter.drawPixmap(c*12, r*10, *m_fontBitmap.rawBitmap(), (m_decoder->teletextPage()->character(r, c)+32)*12, 250, 12, 10);
+				painter.setCompositionMode(QPainter::CompositionMode_SourceOver);
+				m_fontBitmap.image()->setColorTable(QVector<QRgb>{0x7f000000, 0xe0ffffff});
+				painter.drawImage(c*12, r*10, *m_fontBitmap.image(), (m_decoder->teletextPage()->character(r, c)+32)*12, 250, 12, 10);
+				painter.setCompositionMode(QPainter::CompositionMode_Source);
 			}
 		}
 	}
 
-	pixmapPainter.end();
+	painter.end();
 
 	if (ph != 0)
 		return;
@@ -361,30 +334,30 @@ void TeletextPageRender::renderRow(int r, int ph, bool force)
 	// copy this rendered line into the other flash pixmap buffers and then re-render
 	// the flashing cells in those buffers
 	if (rowRefreshed && m_flashBuffersHz > 0) {
-		pixmapPainter.begin(m_pagePixmap[3]);
-		pixmapPainter.setCompositionMode(QPainter::CompositionMode_Source);
-		pixmapPainter.drawPixmap(0, r*10, *m_pagePixmap[0], 0, r*10, 864, 10);
-		pixmapPainter.end();
+		painter.begin(m_pageImage[3]);
+		painter.setCompositionMode(QPainter::CompositionMode_Source);
+		painter.drawImage(0, r*10, *m_pageImage[0], 0, r*10, 864, 10);
+		painter.end();
 
 		renderRow(r, 3);
 
 		if (m_flashBuffersHz == 2) {
-			pixmapPainter.begin(m_pagePixmap[1]);
-			pixmapPainter.setCompositionMode(QPainter::CompositionMode_Source);
-			pixmapPainter.drawPixmap(0, r*10, *m_pagePixmap[0], 0, r*10, 864, 10);
-			pixmapPainter.end();
-			pixmapPainter.begin(m_pagePixmap[2]);
-			pixmapPainter.setCompositionMode(QPainter::CompositionMode_Source);
-			pixmapPainter.drawPixmap(0, r*10, *m_pagePixmap[0], 0, r*10, 864, 10);
-			pixmapPainter.end();
-			pixmapPainter.begin(m_pagePixmap[4]);
-			pixmapPainter.setCompositionMode(QPainter::CompositionMode_Source);
-			pixmapPainter.drawPixmap(0, r*10, *m_pagePixmap[3], 0, r*10, 864, 10);
-			pixmapPainter.end();
-			pixmapPainter.begin(m_pagePixmap[5]);
-			pixmapPainter.setCompositionMode(QPainter::CompositionMode_Source);
-			pixmapPainter.drawPixmap(0, r*10, *m_pagePixmap[3], 0, r*10, 864, 10);
-			pixmapPainter.end();
+			painter.begin(m_pageImage[1]);
+			painter.setCompositionMode(QPainter::CompositionMode_Source);
+			painter.drawImage(0, r*10, *m_pageImage[0], 0, r*10, 864, 10);
+			painter.end();
+			painter.begin(m_pageImage[2]);
+			painter.setCompositionMode(QPainter::CompositionMode_Source);
+			painter.drawImage(0, r*10, *m_pageImage[0], 0, r*10, 864, 10);
+			painter.end();
+			painter.begin(m_pageImage[4]);
+			painter.setCompositionMode(QPainter::CompositionMode_Source);
+			painter.drawImage(0, r*10, *m_pageImage[3], 0, r*10, 864, 10);
+			painter.end();
+			painter.begin(m_pageImage[5]);
+			painter.setCompositionMode(QPainter::CompositionMode_Source);
+			painter.drawImage(0, r*10, *m_pageImage[3], 0, r*10, 864, 10);
+			painter.end();
 
 			renderRow(r, 1);
 			renderRow(r, 2);
@@ -427,12 +400,12 @@ void TeletextPageRender::setRowFlashStatus(int r, int rowFlashHz)
 	// If we get here, new flash Hz for this row is higher than the entire flash Hz
 	// so prepare the pixmap flash buffers
 	if (m_flashBuffersHz == 0)
-		*m_pagePixmap[3] = m_pagePixmap[0]->copy();
+		*m_pageImage[3] = m_pageImage[0]->copy();
 	if (rowFlashHz == 2) {
-		*m_pagePixmap[1] = m_pagePixmap[0]->copy();
-		*m_pagePixmap[2] = m_pagePixmap[0]->copy();
-		*m_pagePixmap[4] = m_pagePixmap[3]->copy();
-		*m_pagePixmap[5] = m_pagePixmap[3]->copy();
+		*m_pageImage[1] = m_pageImage[0]->copy();
+		*m_pageImage[2] = m_pageImage[0]->copy();
+		*m_pageImage[4] = m_pageImage[3]->copy();
+		*m_pageImage[5] = m_pageImage[3]->copy();
 	}
 
 	m_flashBuffersHz = rowFlashHz;

render.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2023 Gavin MacGregor
+ * Copyright (C) 2020-2024 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *
@@ -21,6 +21,9 @@
 #define RENDER_H
 
 #include <QBitmap>
+#include <QColor>
+#include <QIcon>
+#include <QImage>
 #include <QPixmap>
 
 #include "decode.h"
@@ -31,11 +34,14 @@ public:
 	TeletextFontBitmap();
 	~TeletextFontBitmap();
 
-	QBitmap *rawBitmap() const { return s_fontBitmap; }
+	QImage *image() const { return s_fontImage; }
+	QPixmap charBitmap(int c, int s) const { return s_fontBitmap->copy((c-32)*12, s*10, 12, 10); }
+	QIcon charIcon(int c, int s) const { return QIcon(charBitmap(c, s)); }
 
 private:
 	static int s_instances;
 	static QBitmap* s_fontBitmap;
+	static QImage* s_fontImage;
 };
 
 class TeletextPageRender : public QObject
@@ -46,37 +52,38 @@ public:
 	TeletextPageRender();
 	~TeletextPageRender();
 
-	QPixmap* pagePixmap(int i) const { return m_pagePixmap[i]; };
+	QImage* image(int i) const { return m_pageImage[i]; };
 	bool mix() const { return m_mix; };
-	void setDecoder(TeletextPageDecode *);
+	void setDecoder(TeletextPageDecode *decoder);
 	void renderPage(bool force=false);
 	bool showControlCodes() const { return m_showControlCodes; };
 
 public slots:
-	void colourChanged(int);
-	void setReveal(bool);
-	void setMix(bool);
-	void setShowControlCodes(bool);
+	void colourChanged(int index);
+	void setReveal(bool reveal);
+	void setMix(bool mix);
+	void setShowControlCodes(bool showControlCodes);
 
 signals:
-	void flashChanged(int);
+	void flashChanged(int newFlashHz);
 
 protected:
 	TeletextFontBitmap m_fontBitmap;
-	QPixmap* m_pagePixmap[6];
+	QImage* m_pageImage[6];
 	unsigned char m_controlCodeCache[25][40];
 	bool m_reveal, m_mix, m_showControlCodes;
 	int m_flashBuffersHz;
 	int m_flashingRow[25];
 
 private:
-	inline void drawFromBitmap(QPainter &, int, int, const QBitmap, TeletextPageDecode::CharacterFragment);
-	inline void drawFromFontBitmap(QPainter &, int, int, unsigned char, int, TeletextPageDecode::CharacterFragment);
-	inline void drawCharacter(QPainter &, int, int, unsigned char, int, int, TeletextPageDecode::CharacterFragment);
-	inline void drawBoldOrItalicCharacter(QPainter &, int, int, unsigned char, int, TeletextPageDecode::CharacterFragment);
-	void renderRow(int, int, bool force=false);
-	void setRowFlashStatus(int, int);
+	inline void drawFromBitmap(QPainter &, int, int, const QImage, TeletextPageDecode::CharacterFragment);
+	inline void drawFromFontBitmap(QPainter &painter, int r, int c, unsigned char characterCode, int characterSet, TeletextPageDecode::CharacterFragment characterFragment);
+	inline void drawCharacter(QPainter &painter, int r, int c, unsigned char characterCode, int characterSet, int characterDiacritical, TeletextPageDecode::CharacterFragment characterFragment);
+	inline void drawBoldOrItalicCharacter(QPainter &painter, int r, int c, unsigned char characterCode, int characterSet, TeletextPageDecode::CharacterFragment characterFragment);
+	void renderRow(int r, int ph, bool force=false);
+	void setRowFlashStatus(int r, int rowFlashHz);
 
+	QColor m_foregroundQColor, m_backgroundQColor;
 	TeletextPageDecode *m_decoder;
 };
 

x26commands.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2023 Gavin MacGregor
+ * Copyright (C) 2020-2024 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *
@@ -68,7 +68,7 @@ void InsertTripletCommand::redo()
 	if (changingSubPage)
 		m_teletextDocument->emit subPageSelected();
 	else
-		m_teletextDocument->emit refreshNeeded();
+		m_teletextDocument->emit contentsChanged();
 
 	if (m_firstDo)
 		m_firstDo = false;
@@ -107,7 +107,7 @@ void InsertTripletCommand::undo()
 	if (changingSubPage)
 		m_teletextDocument->emit subPageSelected();
 	else
-		m_teletextDocument->emit refreshNeeded();
+		m_teletextDocument->emit contentsChanged();
 }
 
 
@@ -155,7 +155,7 @@ void DeleteTripletCommand::redo()
 	if (changingSubPage)
 		m_teletextDocument->emit subPageSelected();
 	else
-		m_teletextDocument->emit refreshNeeded();
+		m_teletextDocument->emit contentsChanged();
 }
 
 void DeleteTripletCommand::undo()
@@ -189,7 +189,7 @@ void DeleteTripletCommand::undo()
 	if (changingSubPage)
 		m_teletextDocument->emit subPageSelected();
 	else
-		m_teletextDocument->emit refreshNeeded();
+		m_teletextDocument->emit contentsChanged();
 
 	m_teletextDocument->emit tripletCommandHighlight(m_row);
 }
@@ -225,7 +225,7 @@ void EditTripletCommand::redo()
 
 	m_teletextDocument->currentSubPage()->enhancements()->replace(m_row, m_newTriplet);
 	m_x26Model->emit dataChanged(m_x26Model->createIndex(m_row, 0), m_x26Model->createIndex(m_row, 3), {m_role});
-	m_teletextDocument->emit refreshNeeded();
+	m_teletextDocument->emit contentsChanged();
 
 	if (m_firstDo)
 		m_firstDo = false;
@@ -240,7 +240,7 @@ void EditTripletCommand::undo()
 
 	m_teletextDocument->currentSubPage()->enhancements()->replace(m_row, m_oldTriplet);
 	m_x26Model->emit dataChanged(m_x26Model->createIndex(m_row, 0), m_x26Model->createIndex(m_row, 3), {m_role});
-	m_teletextDocument->emit refreshNeeded();
+	m_teletextDocument->emit contentsChanged();
 	m_teletextDocument->emit tripletCommandHighlight(m_row);
 }
 

x26commands.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2023 Gavin MacGregor
+ * Copyright (C) 2020-2024 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *
@@ -29,7 +29,7 @@
 class InsertTripletCommand : public QUndoCommand
 {
 public:
-	InsertTripletCommand(TeletextDocument *, X26Model *, int, int, const X26Triplet, QUndoCommand *parent = 0);
+	InsertTripletCommand(TeletextDocument *teletextDocument, X26Model *x26Model, int row, int count, const X26Triplet newTriplet, QUndoCommand *parent = 0);
 
 	void redo() override;
 	void undo() override;
@@ -45,7 +45,7 @@ private:
 class DeleteTripletCommand : public QUndoCommand
 {
 public:
-	DeleteTripletCommand(TeletextDocument *, X26Model *, int, int, QUndoCommand *parent = 0);
+	DeleteTripletCommand(TeletextDocument *teletextDocument, X26Model *x26Model, int row, int count, QUndoCommand *parent = 0);
 
 	void redo() override;
 	void undo() override;
@@ -63,7 +63,7 @@ public:
 	enum { Id = 201 };
 	enum EditTripletEnum { ETaddress, ETmode, ETdata };
 
-	EditTripletCommand(TeletextDocument *, X26Model *, int, int, int, int, int, QUndoCommand *parent = 0);
+	EditTripletCommand(TeletextDocument *teletextDocument, X26Model *x26Model, int row, int tripletPart, int bitsToKeep, int newValue, int role, QUndoCommand *parent = 0);
 
 	void redo() override;
 	void undo() override;

x26dockwidget.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2023 Gavin MacGregor
+ * Copyright (C) 2020-2024 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *
@@ -17,6 +17,8 @@
  * along with QTeletextMaker.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+#include "x26dockwidget.h"
+
 #include <QAbstractListModel>
 #include <QActionGroup>
 #include <QButtonGroup>
@@ -36,11 +38,12 @@
 #include <QVBoxLayout>
 
 #include "render.h"
-#include "x26dockwidget.h"
+#include "x26menus.h"
 
 CharacterListModel::CharacterListModel(QObject *parent): QAbstractListModel(parent)
 {
 	m_characterSet = 0;
+	m_mosaic = true;
 }
 
 int CharacterListModel::rowCount(const QModelIndex & /*parent*/) const
@@ -56,16 +59,30 @@ QVariant CharacterListModel::data(const QModelIndex &index, int role) const
 	if (role == Qt::DisplayRole)
 		return QString("0x%1").arg(index.row()+0x20, 2, 16);
 
-	if (role == Qt::DecorationRole)
-		return m_fontBitmap.rawBitmap()->copy(index.row()*12, m_characterSet*10, 12, 10);
+	if (role == Qt::DecorationRole) {
+		if (m_mosaic && (index.row()+32) & 0x20)
+			return m_fontBitmap.charBitmap(index.row()+32, 24);
+		else
+			return m_fontBitmap.charBitmap(index.row()+32, m_characterSet);
+	}
 
 	return QVariant();
 }
 
 void CharacterListModel::setCharacterSet(int characterSet)
 {
-	if (characterSet != m_characterSet) {
+	if (characterSet != m_characterSet || m_mosaic) {
 		m_characterSet = characterSet;
+		m_mosaic = false;
+		emit dataChanged(createIndex(0, 0), createIndex(95, 0), QVector<int>(Qt::DecorationRole));
+	}
+}
+
+void CharacterListModel::setG1AndBlastCharacterSet(int characterSet)
+{
+	if (characterSet != m_characterSet || !m_mosaic) {
+		m_characterSet = characterSet;
+		m_mosaic = true;
 		emit dataChanged(createIndex(0, 0), createIndex(95, 0), QVector<int>(Qt::DecorationRole));
 	}
 }
@@ -134,91 +151,15 @@ X26DockWidget::X26DockWidget(TeletextWidget *parent): QDockWidget(parent)
 	cookedTripletLayout->addWidget(m_cookedModePushButton);
 
 	// Cooked triplet menu
-	// We build the menus for both "Insert" buttons at the same time
-	m_cookedModeMenu = new QMenu(this);
-	m_insertBeforeMenu = new QMenu(this);
-	m_insertAfterMenu = new QMenu(this);
+	// We connect the menus for both "Insert" buttons at the same time
+	m_cookedModeMenu = new TripletModeQMenu(this);
+	m_insertBeforeMenu = new TripletModeQMenu(this);
+	m_insertAfterMenu = new TripletModeQMenu(this);
 
-	for (int m=0; m<3; m++) {
-		QMenu *menuToBuild;
-
-		if (m == 0)
-			menuToBuild = m_cookedModeMenu;
-		else if (m == 1)
-			menuToBuild = m_insertBeforeMenu;
-		else // if (m == 2)
-			menuToBuild = m_insertAfterMenu;
-
-		auto newModeMenuAction=[&](QMenu *menu, int mode)
-		{
-			QAction *action = menu->addAction(m_x26Model->modeTripletName(mode));
-			if (m == 0)
-				connect(action, &QAction::triggered, [=]() { cookedModeMenuSelected(mode); });
-			else if (m == 1)
-				connect(action, &QAction::triggered, [=]() { insertTriplet(mode, false); });
-			else // if (m == 2)
-				connect(action, &QAction::triggered, [=]() { insertTriplet(mode, true); });
-		};
-
-		newModeMenuAction(menuToBuild, 0x04);
-		QMenu *rowTripletSubMenu = menuToBuild->addMenu(tr("Row triplet"));
-		newModeMenuAction(rowTripletSubMenu, 0x00);
-		newModeMenuAction(rowTripletSubMenu, 0x01);
-		newModeMenuAction(rowTripletSubMenu, 0x07);
-		newModeMenuAction(rowTripletSubMenu, 0x18);
-		QMenu *columnTripletSubMenu = menuToBuild->addMenu(tr("Column triplet"));
-		newModeMenuAction(columnTripletSubMenu, 0x20);
-		newModeMenuAction(columnTripletSubMenu, 0x23);
-		newModeMenuAction(columnTripletSubMenu, 0x27);
-		newModeMenuAction(columnTripletSubMenu, 0x2c);
-		newModeMenuAction(columnTripletSubMenu, 0x2e);
-		newModeMenuAction(columnTripletSubMenu, 0x28);
-		columnTripletSubMenu->addSeparator();
-		newModeMenuAction(columnTripletSubMenu, 0x29);
-		newModeMenuAction(columnTripletSubMenu, 0x2f);
-		newModeMenuAction(columnTripletSubMenu, 0x21);
-		newModeMenuAction(columnTripletSubMenu, 0x22);
-		newModeMenuAction(columnTripletSubMenu, 0x2b);
-		newModeMenuAction(columnTripletSubMenu, 0x2d);
-		QMenu *diacriticalSubMenu = columnTripletSubMenu->addMenu(tr("G0 diacritical"));
-		for (int i=0; i<16; i++)
-			newModeMenuAction(diacriticalSubMenu, 0x30 + i);
-		QMenu *objectSubMenu = menuToBuild->addMenu(tr("Object"));
-		newModeMenuAction(objectSubMenu, 0x10);
-		newModeMenuAction(objectSubMenu, 0x11);
-		newModeMenuAction(objectSubMenu, 0x12);
-		newModeMenuAction(objectSubMenu, 0x13);
-		newModeMenuAction(objectSubMenu, 0x15);
-		newModeMenuAction(objectSubMenu, 0x16);
-		newModeMenuAction(objectSubMenu, 0x17);
-		newModeMenuAction(menuToBuild, 0x1f);
-		menuToBuild->addSeparator();
-		QMenu *pdcSubMenu = menuToBuild->addMenu(tr("PDC/reserved"));
-		newModeMenuAction(pdcSubMenu, 0x08);
-		newModeMenuAction(pdcSubMenu, 0x09);
-		newModeMenuAction(pdcSubMenu, 0x0a);
-		newModeMenuAction(pdcSubMenu, 0x0b);
-		newModeMenuAction(pdcSubMenu, 0x0c);
-		newModeMenuAction(pdcSubMenu, 0x0d);
-		newModeMenuAction(pdcSubMenu, 0x26);
-		QMenu *reservedRowSubMenu = pdcSubMenu->addMenu(tr("Reserved row"));
-		newModeMenuAction(reservedRowSubMenu, 0x02);
-		newModeMenuAction(reservedRowSubMenu, 0x03);
-		newModeMenuAction(reservedRowSubMenu, 0x05);
-		newModeMenuAction(reservedRowSubMenu, 0x06);
-		newModeMenuAction(reservedRowSubMenu, 0x0e);
-		newModeMenuAction(reservedRowSubMenu, 0x0f);
-		newModeMenuAction(reservedRowSubMenu, 0x14);
-		newModeMenuAction(reservedRowSubMenu, 0x19);
-		newModeMenuAction(reservedRowSubMenu, 0x1a);
-		newModeMenuAction(reservedRowSubMenu, 0x1b);
-		newModeMenuAction(reservedRowSubMenu, 0x1c);
-		newModeMenuAction(reservedRowSubMenu, 0x1d);
-		newModeMenuAction(reservedRowSubMenu, 0x1e);
-		QMenu *reservedColumnSubMenu = pdcSubMenu->addMenu(tr("Reserved column"));
-		newModeMenuAction(reservedColumnSubMenu, 0x24);
-		newModeMenuAction(reservedColumnSubMenu, 0x25);
-		newModeMenuAction(reservedColumnSubMenu, 0x2a);
+	for (int m=0; m<64; m++) {
+		connect(static_cast<TripletModeQMenu *>(m_cookedModeMenu)->action(m), &QAction::triggered, [=]() { cookedModeMenuSelected(m); });
+		connect(static_cast<TripletModeQMenu *>(m_insertBeforeMenu)->action(m), &QAction::triggered, [=]() { insertTriplet(m, false); });
+		connect(static_cast<TripletModeQMenu *>(m_insertAfterMenu)->action(m), &QAction::triggered, [=]() { insertTriplet(m, true); });
 	}
 
 	m_cookedModePushButton->setMenu(m_cookedModeMenu);
@@ -718,7 +659,7 @@ void X26DockWidget::updateAllCookedTripletWidgets(const QModelIndex &index)
 	const int modeExt = index.model()->data(index.model()->index(index.row(), 2), Qt::EditRole).toInt();
 
 	m_cookedModePushButton->setEnabled(true);
-	m_cookedModePushButton->setText(m_x26Model->modeTripletName(modeExt));
+	m_cookedModePushButton->setText(m_modeTripletNames.modeName(modeExt));
 
 	switch (modeExt) {
 		case 0x04: // Set active position
@@ -748,10 +689,26 @@ void X26DockWidget::updateAllCookedTripletWidgets(const QModelIndex &index)
 		case 0x22: // G3 character at Level 1.5
 		case 0x29: // G0 character
 		case 0x2b: // G3 character at Level 2.5
-		case 0x2f ... 0x3f: // G2 character, G0 character with diacritical
+		case 0x2f: // G2 character
+		case 0x30:
+		case 0x31:
+		case 0x32:
+		case 0x33:
+		case 0x34:
+		case 0x35:
+		case 0x36:
+		case 0x37:
+		case 0x38:
+		case 0x39:
+		case 0x3a:
+		case 0x3b:
+		case 0x3c:
+		case 0x3d:
+		case 0x3e:
+		case 0x3f: // G0 character with diacritical
 			m_characterCodeComboBox->blockSignals(true);
 			if (modeExt == 0x21)
-				m_characterListModel.setCharacterSet(24);
+				m_characterListModel.setG1AndBlastCharacterSet(index.model()->data(index.model()->index(index.row(), 0), Qt::UserRole+3).toInt());
 			else if (modeExt == 0x22 || modeExt == 0x2b)
 				m_characterListModel.setCharacterSet(26);
 			else
@@ -788,8 +745,12 @@ void X26DockWidget::updateAllCookedTripletWidgets(const QModelIndex &index)
 			m_displayAttributeUnderlineCheckBox->blockSignals(false);
 			m_tripletParameterStackedLayout->setCurrentIndex(4);
 			break;
-		case 0x11 ... 0x13: // Invoke object
-		case 0x15 ... 0x17: // Define object
+		case 0x11: // Invoke Active Object
+		case 0x12: // Invoke Adaptive Object
+		case 0x13: // Invoke Passive Object
+		case 0x15: // Define Active Object
+		case 0x16: // Define Adaptive Object
+		case 0x17: // Define Passive Object
 			if (index.model()->data(index.model()->index(index.row(), 1), Qt::UserRole).toInt() & 0x04) {
 				// Define object
 				m_objectSourceComboBox->setVisible(false);
@@ -1032,12 +993,21 @@ void X26DockWidget::updateModelFromCookedWidget(const int value, const int role)
 void X26DockWidget::insertTriplet(int modeExt, bool after)
 {
 	QModelIndex index = m_x26View->currentIndex();
+
+	if (index.isValid())
+		insertTriplet(modeExt, index.row()+after);
+	else
+		insertTriplet(modeExt);
+}
+
+void X26DockWidget::insertTriplet(int modeExt, int row)
+{
 	X26Triplet newTriplet(modeExt < 0x20 ? 41 : 0, modeExt & 0x1f, 0);
-	int newListRow;
+
+	if (row != -1) {
+		QModelIndex index = m_x26View->currentIndex();
 
 		if (index.isValid()) {
-		newListRow = index.row()+after;
-
 			// If we're inserting a column triplet next to another column triplet,
 			// duplicate the column number
 			// Avoid the PDC and reserved mode triplets
@@ -1050,7 +1020,7 @@ void X26DockWidget::insertTriplet(int modeExt, bool after)
 			// If we're inserting a Set Active Position or Full Row Colour triplet,
 			// look for a previous row setting triplet and set this one to the row after
 			if (modeExt == 0x04 || modeExt == 0x01) {
-			for (int i=newListRow-1; i>=0; i--) {
+				for (int i=row-1; i>=0; i--) {
 					const int scanTripletModeExt = index.model()->data(index.model()->index(i, 2), Qt::EditRole).toInt();
 
 					if (scanTripletModeExt == 0x04 || scanTripletModeExt == 0x01) {
@@ -1065,8 +1035,9 @@ void X26DockWidget::insertTriplet(int modeExt, bool after)
 					}
 				}
 			}
+		}
 	} else
-		newListRow = 0;
+		row = 0;
 
 	// For character triplets, ensure Data is not reserved
 	if (modeExt == 0x21 || modeExt == 0x22 || modeExt == 0x29 || modeExt == 0x2b || modeExt >= 0x2f)
@@ -1080,7 +1051,7 @@ void X26DockWidget::insertTriplet(int modeExt, bool after)
 		newTriplet.setData(7);
 	}
 
-	m_x26Model->insertRows(newListRow, 1, QModelIndex(), newTriplet);
+	m_x26Model->insertRows(row, 1, QModelIndex(), newTriplet);
 }
 
 void X26DockWidget::insertTripletCopy()
@@ -1103,17 +1074,161 @@ void X26DockWidget::deleteTriplet()
 
 void X26DockWidget::customMenuRequested(QPoint pos)
 {
+	QMenu *customMenu = nullptr;
+
 	QModelIndex index = m_x26View->indexAt(pos);
 
-	QMenu *menu = new QMenu(this);
-
-	QAction *insertAct = new QAction("Insert triplet copy", this);
-	menu->addAction(insertAct);
-	connect(insertAct, &QAction::triggered, this, &X26DockWidget::insertTripletCopy);
 	if (index.isValid()) {
-		QAction *deleteAct = new QAction("Delete triplet", this);
-		menu->addAction(deleteAct);
-		connect(deleteAct, &QAction::triggered, this, &X26DockWidget::deleteTriplet);
+		const int modeExt = index.model()->data(index.model()->index(index.row(), 2), Qt::EditRole).toInt();
+
+		switch (modeExt) {
+			case 0x11:
+			case 0x12:
+			case 0x13: {  // Invoke Object
+				QMenu *localDefMenu;
+				const QList objectList = m_parentMainWidget->document()->currentSubPage()->enhancements()->objects(modeExt - 0x11);
+
+				for (int i=0; i<objectList.size(); i++) {
+					// Messy way to create submenu only if definitions exist
+					if (i == 0) {
+						customMenu = new QMenu(this);
+						localDefMenu = customMenu->addMenu(tr("Local definition"));
 					}
-	menu->popup(m_x26View->viewport()->mapToGlobal(pos));
+
+					const int d = objectList.at(i) / 13;
+					const int t = objectList.at(i) % 13;
+					QAction *action = localDefMenu->addAction(QString("d%1 t%2").arg(d).arg(t));
+					connect(action, &QAction::triggered, [=]() {
+						updateModelFromCookedWidget(0, Qt::UserRole+1);
+						updateModelFromCookedWidget(d, Qt::UserRole+2);
+						updateModelFromCookedWidget(t, Qt::UserRole+3);
+						updateAllCookedTripletWidgets(index);
+					} );
+				}
+			} break;
+			case 0x01: // Full Row colour
+			case 0x07: // Address row 0
+				customMenu = new TripletCLUTQMenu(true, this);
+
+				connect(static_cast<TripletCLUTQMenu *>(customMenu)->action(32), &QAction::triggered, [=]() { updateModelFromCookedWidget(0, Qt::UserRole+2); updateAllCookedTripletWidgets(index); });
+				connect(static_cast<TripletCLUTQMenu *>(customMenu)->action(33), &QAction::triggered, [=]() { updateModelFromCookedWidget(1, Qt::UserRole+2); updateAllCookedTripletWidgets(index); });
+				// fall-through
+			case 0x00: // Full Screen colour
+			case 0x20: // Foreground colour
+			case 0x23: // Background colour
+				if (!customMenu)
+					customMenu = new TripletCLUTQMenu(false, this);
+
+				for (int i=0; i<32; i++) {
+					static_cast<TripletCLUTQMenu *>(customMenu)->setColour(i, m_parentMainWidget->document()->currentSubPage()->CLUTtoQColor(i));
+					connect(static_cast<TripletCLUTQMenu *>(customMenu)->action(i), &QAction::triggered, [=]() { updateModelFromCookedWidget(i, Qt::UserRole+1); updateAllCookedTripletWidgets(index); });
+				}
+				break;
+			case 0x27: // Additional flash functions
+				customMenu = new TripletFlashQMenu(this);
+
+				static_cast<TripletFlashQMenu *>(customMenu)->setModeChecked(index.model()->data(index.model()->index(index.row(), 0), Qt::UserRole+1).toInt());
+				static_cast<TripletFlashQMenu *>(customMenu)->setRatePhaseChecked(index.model()->data(index.model()->index(index.row(), 0), Qt::UserRole+2).toInt());
+
+				for (int i=0; i<4; i++)
+					connect(static_cast<TripletFlashQMenu *>(customMenu)->modeAction(i), &QAction::triggered, [=]() { updateModelFromCookedWidget(i, Qt::UserRole+1); updateAllCookedTripletWidgets(index); });
+				for (int i=0; i<6; i++)
+					connect(static_cast<TripletFlashQMenu *>(customMenu)->ratePhaseAction(i), &QAction::triggered, [=]() { updateModelFromCookedWidget(i, Qt::UserRole+2); updateAllCookedTripletWidgets(index); });
+				break;
+			case 0x2c: // Display attributes
+				customMenu = new TripletDisplayAttrsQMenu(this);
+
+				static_cast<TripletDisplayAttrsQMenu *>(customMenu)->setTextSizeChecked(index.model()->data(index.model()->index(index.row(), 0), Qt::UserRole+1).toInt());
+				for (int i=0; i<4; i++) {
+					static_cast<TripletDisplayAttrsQMenu *>(customMenu)->setOtherAttrChecked(i, index.model()->data(index.model()->index(index.row(), 0), Qt::UserRole+i+2).toBool());
+					connect(static_cast<TripletDisplayAttrsQMenu *>(customMenu)->textSizeAction(i), &QAction::triggered, [=]() { updateModelFromCookedWidget(i, Qt::UserRole+1); updateAllCookedTripletWidgets(index); });
+					connect(static_cast<TripletDisplayAttrsQMenu *>(customMenu)->otherAttrAction(i), &QAction::toggled, [=](const int checked) { updateModelFromCookedWidget(checked, Qt::UserRole+i+2); updateAllCookedTripletWidgets(index); });
+				}
+				break;
+			case 0x2e: // Font style
+				customMenu = new TripletFontStyleQMenu(this);
+
+				for (int i=0; i<3; i++) {
+					static_cast<TripletFontStyleQMenu *>(customMenu)->setStyleChecked(i, index.model()->data(index.model()->index(index.row(), 0), Qt::UserRole+i+1).toBool());
+					connect(static_cast<TripletFontStyleQMenu *>(customMenu)->styleAction(i), &QAction::toggled, [=](const int checked) { updateModelFromCookedWidget(checked, Qt::UserRole+i+1); updateAllCookedTripletWidgets(index); });
+				}
+				static_cast<TripletFontStyleQMenu *>(customMenu)->setRowsChecked(index.model()->data(index.model()->index(index.row(), 0), Qt::UserRole+4).toInt());
+				for (int i=0; i<8; i++)
+					connect(static_cast<TripletFontStyleQMenu *>(customMenu)->rowsAction(i), &QAction::triggered, [=]() { updateModelFromCookedWidget(i, Qt::UserRole+4); updateAllCookedTripletWidgets(index); });
+				break;
+			case 0x21: // G1 mosaic character
+				customMenu = new TripletCharacterQMenu(m_x26Model->data(index.model()->index(index.row(), 2), Qt::UserRole+3).toInt(), true, this);
+				// fall-through
+			case 0x22: // G3 mosaic character at level 1.5
+			case 0x2b: // G3 mosaic character at level >=2.5
+			case 0x29: // G0 character
+			case 0x2f: // G2 character
+			case 0x30:
+			case 0x31:
+			case 0x32:
+			case 0x33:
+			case 0x34:
+			case 0x35:
+			case 0x36:
+			case 0x37:
+			case 0x38:
+			case 0x39:
+			case 0x3a:
+			case 0x3b:
+			case 0x3c:
+			case 0x3d:
+			case 0x3e:
+			case 0x3f: // G0 character with diacritical
+				if (!customMenu)
+					customMenu = new TripletCharacterQMenu(m_x26Model->data(index.model()->index(index.row(), 2), Qt::UserRole+2).toInt(), false, this);
+
+				for (int i=0; i<96; i++)
+					connect(static_cast<TripletCharacterQMenu *>(customMenu)->action(i), &QAction::triggered, [=]() { updateModelFromCookedWidget(i+32, Qt::UserRole+1); updateAllCookedTripletWidgets(index); });
+				break;
+		}
+
+		if (customMenu)
+			customMenu->addSeparator();
+		else
+			customMenu = new QMenu(this);
+
+		TripletModeQMenu *modeChangeMenu = new TripletModeQMenu(this);
+		modeChangeMenu->setTitle(tr("Change triplet mode"));
+		customMenu->addMenu(modeChangeMenu);
+
+		customMenu->addSeparator();
+
+		TripletModeQMenu *insertBeforeQMenu = new TripletModeQMenu(this);
+		insertBeforeQMenu->setTitle(tr("Insert before"));
+		customMenu->addMenu(insertBeforeQMenu);
+
+		TripletModeQMenu *insertAfterQMenu = new TripletModeQMenu(this);
+		insertAfterQMenu->setTitle(tr("Insert after"));
+		customMenu->addMenu(insertAfterQMenu);
+
+		for (int i=0; i<64; i++) {
+			connect(static_cast<TripletModeQMenu *>(modeChangeMenu)->action(i), &QAction::triggered, [=]() { cookedModeMenuSelected(i); });
+			connect(static_cast<TripletModeQMenu *>(insertBeforeQMenu)->action(i), &QAction::triggered, [=]() { insertTriplet(i, false); });
+			connect(static_cast<TripletModeQMenu *>(insertAfterQMenu)->action(i), &QAction::triggered, [=]() { insertTriplet(i, true); });
+		}
+
+		QAction *insertCopyAct = new QAction(tr("Insert copy"), this);
+		customMenu->addAction(insertCopyAct);
+		connect(insertCopyAct, &QAction::triggered, this, &X26DockWidget::insertTripletCopy);
+
+		QAction *deleteAct = new QAction("Delete triplet", this);
+		customMenu->addAction(deleteAct);
+		connect(deleteAct, &QAction::triggered, this, &X26DockWidget::deleteTriplet);
+	} else {
+		customMenu = new QMenu(this);
+
+		TripletModeQMenu *appendModeMenu = new TripletModeQMenu(this);
+		appendModeMenu->setTitle(tr("Append"));
+		customMenu->addMenu(appendModeMenu);
+
+		for (int i=0; i<64; i++)
+			connect(static_cast<TripletModeQMenu *>(appendModeMenu)->action(i), &QAction::triggered, [=]() { insertTriplet(i, m_x26Model->rowCount()); });
+	}
+
+	customMenu->popup(m_x26View->viewport()->mapToGlobal(pos));
 }

x26dockwidget.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2023 Gavin MacGregor
+ * Copyright (C) 2020-2024 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *
@@ -35,6 +35,7 @@
 
 #include "mainwidget.h"
 #include "render.h"
+#include "x26menus.h"
 #include "x26model.h"
 
 class CharacterListModel : public QAbstractListModel
@@ -46,11 +47,13 @@ public:
 
 	int rowCount(const QModelIndex &parent = QModelIndex()) const override;
 	QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
-	void setCharacterSet(int);
+	void setCharacterSet(int characterSet);
+	void setG1AndBlastCharacterSet(int characterSet);
 
 private:
 	TeletextFontBitmap m_fontBitmap;
 	int m_characterSet;
+	bool m_mosaic;
 };
 
 class X26DockWidget : public QDockWidget
@@ -61,24 +64,25 @@ public:
 	X26DockWidget(TeletextWidget *parent);
 
 public slots:
-	void insertTriplet(int, bool);
+	void insertTriplet(int modeExt, bool after);
+	void insertTriplet(int modeExt, int row = -1);
 	void insertTripletCopy();
 	void deleteTriplet();
 	void customMenuRequested(QPoint pos);
 	void loadX26List();
 	void unloadX26List();
-	void rowSelected(const QModelIndex &, const QModelIndex &);
-	void updateAllRawTripletSpinBoxes(const QModelIndex &);
-	void updateRawTripletDataSpinBox(const QModelIndex &);
-	void updateAllCookedTripletWidgets(const QModelIndex &);
-	void rawTripletAddressSpinBoxChanged(int);
-	void rawTripletModeSpinBoxChanged(int);
-	void rawTripletDataSpinBoxChanged(int);
-	void cookedRowSpinBoxChanged(const int);
-	void cookedColumnSpinBoxChanged(const int);
-	void cookedModeMenuSelected(const int);
-	void updateModelFromCookedWidget(const int, const int);
-	void selectX26ListRow(int);
+	void rowSelected(const QModelIndex &current, const QModelIndex &previous);
+	void updateAllRawTripletSpinBoxes(const QModelIndex &index);
+	void updateRawTripletDataSpinBox(const QModelIndex &index);
+	void updateAllCookedTripletWidgets(const QModelIndex & index);
+	void rawTripletAddressSpinBoxChanged(int value);
+	void rawTripletModeSpinBoxChanged(int value);
+	void rawTripletDataSpinBoxChanged(int value);
+	void cookedRowSpinBoxChanged(const int value);
+	void cookedColumnSpinBoxChanged(const int value);
+	void cookedModeMenuSelected(const int value);
+	void updateModelFromCookedWidget(const int value, const int role);
+	void selectX26ListRow(int row);
 
 protected:
 	void keyPressEvent(QKeyEvent *event) override;
@@ -116,6 +120,8 @@ private:
 	QCheckBox *m_terminationMarkerMoreFollowsCheckBox;
 	QPushButton *m_insertBeforePushButton, *m_insertAfterPushButton, *m_insertCopyPushButton, *m_deletePushButton;
 
+	ModeTripletNames m_modeTripletNames;
+
 	TeletextWidget *m_parentMainWidget;
 
 	void disableTripletWidgets();

x26menus.cpp

@@ -0,0 +1,251 @@
+/*
+ * Copyright (C) 2020-2024 Gavin MacGregor
+ *
+ * This file is part of QTeletextMaker.
+ *
+ * QTeletextMaker is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QTeletextMaker is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QTeletextMaker.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "x26menus.h"
+
+#include <QActionGroup>
+#include <QColor>
+#include <QIcon>
+#include <QMenu>
+#include <QPixmap>
+#include <QString>
+
+#include "render.h"
+
+TripletModeQMenu::TripletModeQMenu(QWidget *parent): QMenu(parent)
+{
+	addModeAction(this, 0x04);
+
+	QMenu *rowTripletSubMenu = this->addMenu(tr("Row triplet"));
+	addModeAction(rowTripletSubMenu, 0x00);
+	addModeAction(rowTripletSubMenu, 0x01);
+	addModeAction(rowTripletSubMenu, 0x07);
+	addModeAction(rowTripletSubMenu, 0x18);
+
+	QMenu *columnTripletSubMenu = this->addMenu(tr("Column triplet"));
+	addModeAction(columnTripletSubMenu, 0x20);
+	addModeAction(columnTripletSubMenu, 0x23);
+	addModeAction(columnTripletSubMenu, 0x27);
+	addModeAction(columnTripletSubMenu, 0x2c);
+	addModeAction(columnTripletSubMenu, 0x2e);
+	addModeAction(columnTripletSubMenu, 0x28);
+	columnTripletSubMenu->addSeparator();
+	addModeAction(columnTripletSubMenu, 0x29);
+	addModeAction(columnTripletSubMenu, 0x2f);
+	addModeAction(columnTripletSubMenu, 0x21);
+	addModeAction(columnTripletSubMenu, 0x22);
+	addModeAction(columnTripletSubMenu, 0x2b);
+	addModeAction(columnTripletSubMenu, 0x2d);
+
+	QMenu *diacriticalSubMenu = columnTripletSubMenu->addMenu(tr("G0 diacritical"));
+	for (int i=0; i<16; i++)
+		addModeAction(diacriticalSubMenu, 0x30 + i);
+
+	QMenu *objectSubMenu = this->addMenu(tr("Object"));
+	addModeAction(objectSubMenu, 0x10);
+	addModeAction(objectSubMenu, 0x11);
+	addModeAction(objectSubMenu, 0x12);
+	addModeAction(objectSubMenu, 0x13);
+	addModeAction(objectSubMenu, 0x15);
+	addModeAction(objectSubMenu, 0x16);
+	addModeAction(objectSubMenu, 0x17);
+	addModeAction(this, 0x1f);
+	this->addSeparator();
+
+	QMenu *pdcSubMenu = this->addMenu(tr("PDC/reserved"));
+	addModeAction(pdcSubMenu, 0x08);
+	addModeAction(pdcSubMenu, 0x09);
+	addModeAction(pdcSubMenu, 0x0a);
+	addModeAction(pdcSubMenu, 0x0b);
+	addModeAction(pdcSubMenu, 0x0c);
+	addModeAction(pdcSubMenu, 0x0d);
+	addModeAction(pdcSubMenu, 0x26);
+
+	QMenu *reservedRowSubMenu = pdcSubMenu->addMenu(tr("Reserved row"));
+	addModeAction(reservedRowSubMenu, 0x02);
+	addModeAction(reservedRowSubMenu, 0x03);
+	addModeAction(reservedRowSubMenu, 0x05);
+	addModeAction(reservedRowSubMenu, 0x06);
+	addModeAction(reservedRowSubMenu, 0x0e);
+	addModeAction(reservedRowSubMenu, 0x0f);
+	addModeAction(reservedRowSubMenu, 0x14);
+	addModeAction(reservedRowSubMenu, 0x19);
+	addModeAction(reservedRowSubMenu, 0x1a);
+	addModeAction(reservedRowSubMenu, 0x1b);
+	addModeAction(reservedRowSubMenu, 0x1c);
+	addModeAction(reservedRowSubMenu, 0x1d);
+	addModeAction(reservedRowSubMenu, 0x1e);
+
+	QMenu *reservedColumnSubMenu = pdcSubMenu->addMenu(tr("Reserved column"));
+	addModeAction(reservedColumnSubMenu, 0x24);
+	addModeAction(reservedColumnSubMenu, 0x25);
+	addModeAction(reservedColumnSubMenu, 0x2a);
+}
+
+void TripletModeQMenu::addModeAction(QMenu *menu, int mode)
+{
+	m_actions[mode] = menu->addAction(m_modeTripletNames.modeName(mode));
+}
+
+
+TripletCLUTQMenu::TripletCLUTQMenu(bool rows, QWidget *parent): QMenu(parent)
+{
+	QMenu *clut[4];
+
+	for (int c=0; c<4; c++) {
+		clut[c] = this->addMenu(QString("CLUT %1").arg(c));
+
+		for (int e=0; e<8; e++)
+			m_actions[c*8+e] = clut[c]->addAction(QString("CLUT %1:%2").arg(c).arg(e));
+	}
+
+	if (rows) {
+		m_actions[32] = this->addAction(tr("This row only"));
+		m_actions[33] = this->addAction(tr("Down to bottom"));
+	}
+}
+
+void TripletCLUTQMenu::setColour(int i, QColor c)
+{
+	QPixmap menuColour(32, 32); // Should get downscaled to the menu text size
+
+	menuColour.fill(c);
+	m_actions[i]->setIcon(QIcon(menuColour));
+}
+
+
+TripletCharacterQMenu::TripletCharacterQMenu(int charSet, bool mosaic, QWidget *parent): QMenu(parent)
+{
+	QMenu *charRange[6];
+
+	for (int r=0; r<6; r++) {
+		charRange[r] = this->addMenu(QString("0x%010-0x%01f").arg(r+2));
+
+		const int charSetInColumn = (mosaic && ((r & 0x2) == 0)) ? 24 : charSet;
+
+		for (int c=0; c<16; c++)
+			m_actions[r*16+c] = charRange[r]->addAction(QIcon(m_fontBitmap.charBitmap(r*16+c+32, charSetInColumn)), QString("0x%1").arg(r*16+c+32, 2, 16, QChar('0')));
+	}
+}
+
+
+TripletFlashQMenu::TripletFlashQMenu(QWidget *parent): QMenu(parent)
+{
+	QMenu *flashModeMenu = this->addMenu(tr("Flash mode"));
+	m_actions[0] = flashModeMenu->addAction(tr("Steady"));
+	m_actions[1] = flashModeMenu->addAction(tr("Normal"));
+	m_actions[2] = flashModeMenu->addAction(tr("Invert"));
+	m_actions[3] = flashModeMenu->addAction(tr("Adjacent CLUT"));
+	m_modeActionGroup = new QActionGroup(this);
+	for (int i=0; i<4; i++) {
+		m_actions[i]->setCheckable(true);
+		m_modeActionGroup->addAction(m_actions[i]);
+	}
+
+	QMenu *flashRatePhaseMenu = this->addMenu(tr("Flash rate/phase"));
+	m_actions[4] = flashRatePhaseMenu->addAction(tr("Slow 1Hz"));
+	m_actions[5] = flashRatePhaseMenu->addAction(tr("Fast 2Hz phase 1"));
+	m_actions[6] = flashRatePhaseMenu->addAction(tr("Fast 2Hz phase 2"));
+	m_actions[7] = flashRatePhaseMenu->addAction(tr("Fast 2Hz phase 3"));
+	m_actions[8] = flashRatePhaseMenu->addAction(tr("Fast 2Hz inc/right"));
+	m_actions[9] = flashRatePhaseMenu->addAction(tr("Fast 2Hz dec/left"));
+	m_ratePhaseActionGroup = new QActionGroup(this);
+	for (int i=4; i<10; i++) {
+		m_actions[i]->setCheckable(true);
+		m_ratePhaseActionGroup->addAction(m_actions[i]);
+	}
+}
+
+void TripletFlashQMenu::setModeChecked(int n)
+{
+	m_actions[n]->setChecked(true);
+}
+
+void TripletFlashQMenu::setRatePhaseChecked(int n)
+{
+	m_actions[n+4]->setChecked(true);
+}
+
+
+TripletDisplayAttrsQMenu::TripletDisplayAttrsQMenu(QWidget *parent): QMenu(parent)
+{
+	QMenu *sizeMenu = this->addMenu(tr("Text size"));
+	m_actions[0] = sizeMenu->addAction(tr("Normal size"));
+	m_actions[1] = sizeMenu->addAction(tr("Double height"));
+	m_actions[2] = sizeMenu->addAction(tr("Double width"));
+	m_actions[3] = sizeMenu->addAction(tr("Double size"));
+	m_sizeActionGroup = new QActionGroup(this);
+	for (int i=0; i<4; i++) {
+		m_actions[i]->setCheckable(true);
+		m_sizeActionGroup->addAction(m_actions[i]);
+	}
+
+	m_actions[4] = this->addAction(tr("Boxing/Window"));
+	m_actions[5] = this->addAction(tr("Conceal"));
+	m_actions[6] = this->addAction(tr("Invert"));
+	m_actions[7] = this->addAction(tr("Underline/Separated"));
+	m_otherActionGroup = new QActionGroup(this);
+	m_otherActionGroup->setExclusive(false);
+	for (int i=4; i<8; i++) {
+		m_actions[i]->setCheckable(true);
+		m_otherActionGroup->addAction(m_actions[i]);
+	}
+}
+
+void TripletDisplayAttrsQMenu::setTextSizeChecked(int n)
+{
+	m_actions[n]->setChecked(true);
+}
+
+void TripletDisplayAttrsQMenu::setOtherAttrChecked(int n, bool b)
+{
+	m_actions[n+4]->setChecked(b);
+}
+
+
+TripletFontStyleQMenu::TripletFontStyleQMenu(QWidget *parent): QMenu(parent)
+{
+	m_actions[0] = this->addAction(tr("Proportional"));
+	m_actions[1] = this->addAction(tr("Bold"));
+	m_actions[2] = this->addAction(tr("Italic"));
+	m_styleActionGroup = new QActionGroup(this);
+	m_styleActionGroup->setExclusive(false);
+	for (int i=0; i<3; i++) {
+		m_actions[i]->setCheckable(true);
+		m_styleActionGroup->addAction(m_actions[i]);
+	}
+
+	QMenu *rowsMenu = this->addMenu(tr("Next rows"));
+	m_rowsActionGroup = new QActionGroup(this);
+	for (int i=3; i<11; i++) {
+		m_actions[i] = rowsMenu->addAction(QString("%1").arg(i-3));
+		m_actions[i]->setCheckable(true);
+		m_rowsActionGroup->addAction(m_actions[i]);
+	}
+}
+
+void TripletFontStyleQMenu::setStyleChecked(int n, bool b)
+{
+	m_actions[n]->setChecked(b);
+}
+
+void TripletFontStyleQMenu::setRowsChecked(int n)
+{
+	m_actions[n+3]->setChecked(true);
+}

x26menus.h

@@ -0,0 +1,207 @@
+/*
+ * Copyright (C) 2020-2024 Gavin MacGregor
+ *
+ * This file is part of QTeletextMaker.
+ *
+ * QTeletextMaker is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QTeletextMaker is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QTeletextMaker.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef X26MENUS_H
+#define X26MENUS_H
+
+#include <QActionGroup>
+#include <QColor>
+#include <QMenu>
+#include <QString>
+
+#include "render.h"
+
+class ModeTripletNames
+{
+public:
+	static const QString modeName(int i) { return m_modeTripletName[i]; }
+
+private:
+	static inline const QString m_modeTripletName[64] {
+		// Row triplet modes
+		"Full screen colour",
+		"Full row colour",
+		"Reserved 0x02",
+		"Reserved 0x03",
+
+		"Set Active Position",
+		"Reserved 0x05",
+		"Reserved 0x06",
+		"Address row 0",
+
+		"PDC origin, source",
+		"PDC month and day",
+		"PDC cursor and start hour",
+		"PDC cursor and end hour",
+
+		"PDC cursor local offset",
+		"PDC series ID and code",
+		"Reserved 0x0e",
+		"Reserved 0x0f",
+
+		"Origin modifier",
+		"Invoke active object",
+		"Invoke adaptive object",
+		"Invoke passive object",
+
+		"Reserved 0x14",
+		"Define active object",
+		"Define adaptive object",
+		"Define passive object",
+
+		"DRCS mode",
+		"Reserved 0x19",
+		"Reserved 0x1a",
+		"Reserved 0x1b",
+
+		"Reserved 0x1c",
+		"Reserved 0x1d",
+		"Reserved 0x1e",
+		"Termination marker",
+
+		// Column triplet modes
+		"Foreground colour",
+		"G1 block mosaic",
+		"G3 smooth mosaic, level 1.5",
+		"Background colour",
+
+		"Reserved 0x04",
+		"Reserved 0x05",
+		"PDC cursor, start end min",
+		"Additional flash functions",
+
+		"Modified G0/G2 character set",
+		"G0 character",
+		"Reserved 0x0a",
+		"G3 smooth mosaic, level 2.5",
+
+		"Display attributes",
+		"DRCS character",
+		"Font style, level 3.5",
+		"G2 supplementary character",
+
+		"G0 character no diacritical",
+		"G0 character diacritical 1",
+		"G0 character diacritical 2",
+		"G0 character diacritical 3",
+		"G0 character diacritical 4",
+		"G0 character diacritical 5",
+		"G0 character diacritical 6",
+		"G0 character diacritical 7",
+		"G0 character diacritical 8",
+		"G0 character diacritical 9",
+		"G0 character diacritical A",
+		"G0 character diacritical B",
+		"G0 character diacritical C",
+		"G0 character diacritical D",
+		"G0 character diacritical E",
+		"G0 character diacritical F"
+	};
+};
+
+class TripletModeQMenu : public QMenu
+{
+	Q_OBJECT
+
+public:
+	TripletModeQMenu(QWidget *parent = nullptr);
+	QAction *action(int n) const { return m_actions[n]; };
+
+private:
+	void addModeAction(QMenu *menu, int mode);
+
+	QAction *m_actions[64];
+	ModeTripletNames m_modeTripletNames;
+};
+
+class TripletCLUTQMenu : public QMenu
+{
+	Q_OBJECT
+
+public:
+	TripletCLUTQMenu(bool rows, QWidget *parent = nullptr);
+	QAction *action(int n) const { return m_actions[n]; };
+	void setColour(int i, QColor c);
+
+private:
+	QAction *m_actions[34];
+};
+
+class TripletCharacterQMenu : public QMenu
+{
+	Q_OBJECT
+
+public:
+	TripletCharacterQMenu(int charSet, bool mosaic, QWidget *parent = nullptr);
+	QAction *action(int n) const { return m_actions[n]; };
+
+private:
+	QAction *m_actions[96];
+	TeletextFontBitmap m_fontBitmap;
+};
+
+class TripletFlashQMenu : public QMenu
+{
+	Q_OBJECT
+
+public:
+	TripletFlashQMenu(QWidget *parent = nullptr);
+	QAction *modeAction(int n) const { return m_actions[n]; };
+	QAction *ratePhaseAction(int n) const { return m_actions[n+4]; };
+	void setModeChecked(int n);
+	void setRatePhaseChecked(int n);
+
+private:
+	QAction *m_actions[10];
+	QActionGroup *m_modeActionGroup, *m_ratePhaseActionGroup;
+};
+
+class TripletDisplayAttrsQMenu : public QMenu
+{
+	Q_OBJECT
+
+public:
+	TripletDisplayAttrsQMenu(QWidget *parent = nullptr);
+	QAction *textSizeAction(int n) const { return m_actions[n]; };
+	QAction *otherAttrAction(int n) const { return m_actions[n+4]; };
+	void setTextSizeChecked(int n);
+	void setOtherAttrChecked(int n, bool b);
+
+private:
+	QAction *m_actions[8];
+	QActionGroup *m_sizeActionGroup, *m_otherActionGroup;
+};
+
+class TripletFontStyleQMenu : public QMenu
+{
+	Q_OBJECT
+
+public:
+	TripletFontStyleQMenu(QWidget *parent = nullptr);
+	QAction *styleAction(int n) const { return m_actions[n]; };
+	QAction *rowsAction(int n) const { return m_actions[n+3]; };
+	void setStyleChecked(int n, bool b);
+	void setRowsChecked(int n);
+
+private:
+	QAction *m_actions[11];
+	QActionGroup *m_styleActionGroup, *m_rowsActionGroup;
+};
+
+#endif

x26model.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2023 Gavin MacGregor
+ * Copyright (C) 2020-2024 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *
@@ -19,10 +19,11 @@
 
 #include "x26model.h"
 
+#include <QIcon>
 #include <QList>
 
-#include "render.h"
 #include "x26commands.h"
+#include "x26menus.h"
 
 X26Model::X26Model(TeletextWidget *parent): QAbstractListModel(parent)
 {
@@ -114,7 +115,7 @@ QVariant X26Model::data(const QModelIndex &index, int role) const
 
 	if (role == Qt::DisplayRole) {
 		if (index.column() == 2)
-			return (m_modeTripletName[triplet.modeExt()]);
+			return (m_modeTripletNames.modeName(triplet.modeExt()));
 		// Column 3 - describe effects of data/address triplet parameters in plain English
 		switch (triplet.modeExt()) {
 			case 0x01: // Full row colour
@@ -134,7 +135,9 @@ QVariant X26Model::data(const QModelIndex &index, int role) const
 			case 0x10: // Origin Modifier
 				// For Set Active Position and Origin Modifier, data is the column, so return blank
 				return QVariant();
-			case 0x11 ... 0x13: // Invoke object
+			case 0x11: // Invoke Active Object
+			case 0x12: // Invoke Adaptive Object
+			case 0x13: // Invoke Passive Object
 				switch (triplet.address() & 0x18) {
 					case 0x08:
 						return QString("Local: d%1 t%2").arg((triplet.data() >> 4) | ((triplet.address() & 0x01) << 3)).arg(triplet.data() & 0x0f);
@@ -152,7 +155,9 @@ QVariant X26Model::data(const QModelIndex &index, int role) const
 				else
 					result.append("1-9");
 				return result;
-			case 0x15 ... 0x17: // Define object
+			case 0x15: // Define Active Object
+			case 0x16: // Define Adaptive Object
+			case 0x17: // Define Passive Object
 				switch (triplet.address() & 0x18) {
 					case 0x08:
 						return "Local: L2.5 only";
@@ -212,7 +217,12 @@ QVariant X26Model::data(const QModelIndex &index, int role) const
 						break;
 				}
 				break;
-			case 0x08 ... 0x0d: // PDC
+			case 0x08: // PDC country of origin & programme source
+			case 0x09: // PDC month & day
+			case 0x0a: // PDC cursor row & announced start hour
+			case 0x0b: // PDC cursor row & announced finish hour
+			case 0x0c: // PDC cursor row & local time offset
+			case 0x0d: // PDC series ID & series code
 				return QString("0x%1").arg(triplet.data(), 2, 16, QChar('0'));
 			case 0x20: // Foreground colour
 			case 0x23: // Background colour
@@ -223,7 +233,7 @@ QVariant X26Model::data(const QModelIndex &index, int role) const
 			case 0x22: // G3 mosaic character at level 1.5
 			case 0x29: // G0 character
 			case 0x2b: // G3 mosaic character at level >=2.5
-			case 0x2f ... 0x3f: // G2 character or G0 diacritical mark
+			case 0x2f: // G2 character
 				if (triplet.data() >= 0x20)
 					return QString("0x%1").arg(triplet.data(), 2, 16);
 				break;
@@ -339,7 +349,12 @@ QVariant X26Model::data(const QModelIndex &index, int role) const
 				return result;
 			case 0x26: // PDC
 				return QString("0x%1").arg(triplet.data(), 2, 16, QChar('0'));
-			default: // Reserved
+			default:
+				if (triplet.modeExt() >= 0x30 && triplet.modeExt() <= 0x3f && triplet.data() >= 0x20)
+					// G0 with diacritical
+					return QString("0x%1").arg(triplet.data(), 2, 16);
+				else
+					// Reserved
 					return QString("Reserved 0x%1").arg(triplet.data(), 2, 16, QChar('0'));
 		}
 		// Reserved mode or data
@@ -361,20 +376,26 @@ QVariant X26Model::data(const QModelIndex &index, int role) const
 				break;
 			case 0x21: // G1 mosaic character
 				if (triplet.data() & 0x20)
-					return m_fontBitmap.rawBitmap()->copy((triplet.data()-32)*12, 24*10, 12, 10);
+					return m_fontBitmap.charIcon(triplet.data(), 24);
+				else if (triplet.data() >= 0x20)
+					// Blast-through
+					return m_fontBitmap.charIcon(triplet.data(), m_parentMainWidget->pageDecode()->cellG0CharacterSet(triplet.activePositionRow(), triplet.activePositionColumn()));
 				break;
 			case 0x22: // G3 mosaic character at level 1.5
 			case 0x2b: // G3 mosaic character at level >=2.5
 				if (triplet.data() >= 0x20)
-					return m_fontBitmap.rawBitmap()->copy((triplet.data()-32)*12, 26*10, 12, 10);
+					return m_fontBitmap.charIcon(triplet.data(), 26);
 				break;
-			case 0x29: // G0 character
 			case 0x2f: // G2 character
-			case 0x30 ... 0x3f: // G0 diacritical mark
 				if (triplet.data() >= 0x20)
-					return m_fontBitmap.rawBitmap()->copy((triplet.data()-32)*12, m_parentMainWidget->pageDecode()->cellCharacterSet(triplet.activePositionRow(), triplet.activePositionColumn())*10, 12, 10);
+					return m_fontBitmap.charIcon(triplet.data(), m_parentMainWidget->pageDecode()->cellG2CharacterSet(triplet.activePositionRow(), triplet.activePositionColumn()));
 				break;
-		};
+			default:
+				if (triplet.modeExt() == 0x29 || (triplet.modeExt() >= 0x30 && triplet.modeExt() <= 0x3f))
+					// G0 character or G0 diacritical mark
+					if (triplet.data() >= 0x20)
+						return m_fontBitmap.charIcon(triplet.data(), m_parentMainWidget->pageDecode()->cellG0CharacterSet(triplet.activePositionRow(), triplet.activePositionColumn()));
+		}
 
 	if (role == Qt::EditRole && index.column() == 2)
 		return triplet.modeExt();
@@ -394,7 +415,9 @@ QVariant X26Model::data(const QModelIndex &index, int role) const
 			if (role == Qt::UserRole+1) // Colour index
 				return triplet.data() & 0x1f;
 			break;
-		case 0x11 ... 0x13: // Invoke object
+		case 0x11: // Invoke Active Object
+		case 0x12: // Invoke Adaptive Object
+		case 0x13: // Invoke Passive Object
 			switch (role) {
 				case Qt::UserRole+1: // Object source: Local, POP or GPOP
 					return ((triplet.address() & 0x18) >> 3) - 1;
@@ -418,7 +441,9 @@ QVariant X26Model::data(const QModelIndex &index, int role) const
 					return (triplet.data() & 0x10) >> 4;
 			}
 			break;
-		case 0x15 ... 0x17: // Define object
+		case 0x15: // Define Active Object
+		case 0x16: // Define Adaptive Object
+		case 0x17: // Define Passive Object
 			switch (role) {
 				case Qt::UserRole+1: // Required at which levels
 					return ((triplet.address() & 0x18) >> 3) - 1;
@@ -446,6 +471,21 @@ QVariant X26Model::data(const QModelIndex &index, int role) const
 					return (triplet.data() & 0x01) == 0x01;
 			}
 			break;
+		case 0x21: // G1 character
+			// Qt::UserRole+1 is character number, returned by default below
+			switch (role) {
+				case Qt::UserRole+2: // G1 character set
+					return 24;
+				case Qt::UserRole+3: // G0 character set for blast-through
+					return m_parentMainWidget->pageDecode()->cellG0CharacterSet(triplet.activePositionRow(), triplet.activePositionColumn());
+			}
+			break;
+		case 0x22: // G3 character at Level 1.5
+		case 0x2b: // G3 character at Level 2.5
+			// Qt::UserRole+1 is character number, returned by default below
+			if (role == Qt::UserRole+2) // G3 character set
+				return 26;
+			break;
 		case 0x27: // Flash functions
 			switch (role) {
 				case Qt::UserRole+1: // Flash mode
@@ -488,13 +528,17 @@ QVariant X26Model::data(const QModelIndex &index, int role) const
 					return triplet.data() >> 4;
 			}
 			break;
-		case 0x29: // G0 character
 		case 0x2f: // G2 character
-		case 0x30 ... 0x3f: // G0 diacritical mark
 			// Qt::UserRole+1 is character number, returned by default below
 			if (role == Qt::UserRole+2) // Character set
-				return m_parentMainWidget->pageDecode()->cellCharacterSet(triplet.activePositionRow(), triplet.activePositionColumn());
+				return m_parentMainWidget->pageDecode()->cellG2CharacterSet(triplet.activePositionRow(), triplet.activePositionColumn());
 			break;
+		default:
+			if (triplet.modeExt() == 0x29 || (triplet.modeExt() >= 0x30 && triplet.modeExt() <= 0x3f))
+				// G0 character or G0 diacritical mark
+				// Qt::UserRole+1 is character number, returned by default below
+				if (role == Qt::UserRole+2) // Character set
+					return m_parentMainWidget->pageDecode()->cellG0CharacterSet(triplet.activePositionRow(), triplet.activePositionColumn());
 	};
 
 	// For characters and other triplet modes, return the complete data value
@@ -628,15 +672,6 @@ bool X26Model::setData(const QModelIndex &index, const QVariant &value, int role
 						if (triplet.data() & 0x78)
 							m_parentMainWidget->document()->undoStack()->push(new EditTripletCommand(m_parentMainWidget->document(), this, index.row(), EditTripletCommand::ETdata, 0x07, 0x00, role));
 						break;
-					case 0x21: // G1 mosaic character
-					case 0x22: // G3 mosaic character at level 1.5
-					case 0x29: // G0 character
-					case 0x2b: // G3 mosaic character at level >=2.5
-					case 0x2f ... 0x3f: // G2 character or G0 diacritical mark
-						// Data range 0x20-0x7f
-						if (triplet.data() < 0x20)
-							m_parentMainWidget->document()->undoStack()->push(new EditTripletCommand(m_parentMainWidget->document(), this, index.row(), EditTripletCommand::ETdata, 0x00, 0x20, role));
-						break;
 					case 0x27: // Additional flash functions
 						// D6 and D5 must be clear, D4 and D3 set is reserved phase
 						if (triplet.data() >= 0x18)
@@ -653,6 +688,20 @@ bool X26Model::setData(const QModelIndex &index, const QVariant &value, int role
 						if ((triplet.data() & 0x3f) >= 48)
 							m_parentMainWidget->document()->undoStack()->push(new EditTripletCommand(m_parentMainWidget->document(), this, index.row(), EditTripletCommand::ETdata, 0x40, 0x77, role));
 						break;
+					case 0x21: // G1 mosaic character
+					case 0x22: // G3 mosaic character at level 1.5
+					case 0x29: // G0 character
+					case 0x2b: // G3 mosaic character at level >=2.5
+					case 0x2f: // G2 character
+						// Data range 0x20-0x7f
+						if (triplet.data() < 0x20)
+							m_parentMainWidget->document()->undoStack()->push(new EditTripletCommand(m_parentMainWidget->document(), this, index.row(), EditTripletCommand::ETdata, 0x00, 0x20, role));
+						break;
+					default:
+						if (intValue >= 0x30 && intValue <= 0x3f && triplet.data() < 0x20)
+						// G0 diacritical mark
+						// Data range 0x20-0x7f
+							m_parentMainWidget->document()->undoStack()->push(new EditTripletCommand(m_parentMainWidget->document(), this, index.row(), EditTripletCommand::ETdata, 0x00, 0x20, role));
 				}
 				return true;
 		}
@@ -674,7 +723,9 @@ bool X26Model::setData(const QModelIndex &index, const QVariant &value, int role
 					break;
 			}
 			break;
-		case 0x11 ... 0x13: // Invoke object
+		case 0x11: // Invoke Active Object
+		case 0x12: // Invoke Adaptive Object
+		case 0x13: // Invoke Passive Object
 			switch (role) {
 				case Qt::UserRole+1: // Object source: Local, POP or GPOP
 					m_parentMainWidget->document()->undoStack()->push(new EditTripletCommand(m_parentMainWidget->document(), this, index.row(), EditTripletCommand::ETaddress, 0x27, (intValue+1) << 3, role));
@@ -704,7 +755,9 @@ bool X26Model::setData(const QModelIndex &index, const QVariant &value, int role
 					return true;
 			}
 			break;
-		case 0x15 ... 0x17: // Define object
+		case 0x15: // Define Active Object
+		case 0x16: // Define Adaptive Object
+		case 0x17: // Define Passive Object
 			switch (role) {
 				case Qt::UserRole+1: // Required at which levels
 					m_parentMainWidget->document()->undoStack()->push(new EditTripletCommand(m_parentMainWidget->document(), this, index.row(), EditTripletCommand::ETaddress, 0x27, (intValue+1) << 3, role));

x26model.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2023 Gavin MacGregor
+ * Copyright (C) 2020-2024 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *
@@ -21,8 +21,9 @@
 #define X26MODEL_H
 
 #include <QAbstractListModel>
+
 #include "mainwidget.h"
-#include "render.h"
+#include "x26menus.h"
 
 class X26Model : public QAbstractListModel
 {
@@ -30,7 +31,7 @@ class X26Model : public QAbstractListModel
 
 public:
 	X26Model(TeletextWidget *parent);
-	void setX26ListLoaded(bool);
+	void setX26ListLoaded(bool newListLoaded);
 	int rowCount(const QModelIndex &parent = QModelIndex()) const override ;
 	int columnCount(const QModelIndex &parent = QModelIndex()) const override;
 	QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
@@ -41,8 +42,6 @@ public:
 	bool removeRows(int position, int rows, const QModelIndex &index);
 //	Qt::ItemFlags flags(const QModelIndex &index) const;
 
-	const QString modeTripletName(int i) const { return m_modeTripletName[i]; }
-
 	// The x26commands classes manipulate the model but beginInsertRows and endInsertRows
 	// are protected methods, so we need to friend them
 	friend class InsertTripletCommand;
@@ -53,87 +52,7 @@ private:
 	TeletextWidget *m_parentMainWidget;
 	bool m_listLoaded;
 	TeletextFontBitmap m_fontBitmap;
-
-	const QString m_modeTripletName[64] {
-		// Row triplet modes
-		"Full screen colour",
-		"Full row colour",
-		"Reserved 0x02",
-		"Reserved 0x03",
-
-		"Set Active Position",
-		"Reserved 0x05",
-		"Reserved 0x06",
-		"Address row 0",
-
-		"PDC origin, source",
-		"PDC month and day",
-		"PDC cursor and start hour",
-		"PDC cursor and end hour",
-
-		"PDC cursor local offset",
-		"PDC series ID and code",
-		"Reserved 0x0e",
-		"Reserved 0x0f",
-
-		"Origin modifier",
-		"Invoke active object",
-		"Invoke adaptive object",
-		"Invoke passive object",
-
-		"Reserved 0x14",
-		"Define active object",
-		"Define adaptive object",
-		"Define passive object",
-
-		"DRCS mode",
-		"Reserved 0x19",
-		"Reserved 0x1a",
-		"Reserved 0x1b",
-
-		"Reserved 0x1c",
-		"Reserved 0x1d",
-		"Reserved 0x1e",
-		"Termination marker",
-
-		// Column triplet modes
-		"Foreground colour",
-		"G1 block mosaic",
-		"G3 smooth mosaic, level 1.5",
-		"Background colour",
-
-		"Reserved 0x04",
-		"Reserved 0x05",
-		"PDC cursor, start end min",
-		"Additional flash functions",
-
-		"Modified G0/G2 character set",
-		"G0 character",
-		"Reserved 0x0a",
-		"G3 smooth mosaic, level 2.5",
-
-		"Display attributes",
-		"DRCS character",
-		"Font style, level 3.5",
-		"G2 supplementary character",
-
-		"G0 character no diacritical",
-		"G0 character diacritical 1",
-		"G0 character diacritical 2",
-		"G0 character diacritical 3",
-		"G0 character diacritical 4",
-		"G0 character diacritical 5",
-		"G0 character diacritical 6",
-		"G0 character diacritical 7",
-		"G0 character diacritical 8",
-		"G0 character diacritical 9",
-		"G0 character diacritical A",
-		"G0 character diacritical B",
-		"G0 character diacritical C",
-		"G0 character diacritical D",
-		"G0 character diacritical E",
-		"G0 character diacritical F"
-	};
+	ModeTripletNames m_modeTripletNames;
 
 	struct tripletErrorShow {
 		QString message;

x26triplets.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2023 Gavin MacGregor
+ * Copyright (C) 2020-2024 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *
@@ -74,6 +74,10 @@ void X26TripletList::updateInternalData()
 	ActivePosition activePosition;
 	X26Triplet *triplet;
 
+	m_objects[0].clear();
+	m_objects[1].clear();
+	m_objects[2].clear();
+
 	// Check for errors, and fill in where the Active Position goes for Level 2.5 and above
 	for (int i=0; i < m_list.size(); i++) {
 		triplet = &m_list[i];
@@ -124,7 +128,9 @@ void X26TripletList::updateInternalData()
 					    m_list.at(i+1).modeExt() > 0x13)
 						triplet->m_error = X26Triplet::OriginModifierAlone;
 					break;
-				case 0x11 ... 0x13: // Invoke Object
+				case 0x11: // Invoke Active Object
+				case 0x12: // Invoke Adaptive Object
+				case 0x13: // Invoke Passive Object
 					if (triplet->objectSource() == X26Triplet::LocalObject) {
 						if (triplet->objectLocalTripletNumber() > 12 ||
 							triplet->objectLocalIndex() > (m_list.size()-1) ||
@@ -135,7 +141,10 @@ void X26TripletList::updateInternalData()
 							triplet->m_error = X26Triplet::InvokeTypeMismatch;
 					}
 					break;
-				case 0x15 ... 0x17: // Define Object
+				case 0x15: // Define Active Object
+				case 0x16: // Define Adaptive Object
+				case 0x17: // Define Passive Object
+					m_objects[triplet->modeExt() - 0x15].append(i);
 					activePosition.reset();
 					// Make sure data field holds correct place of triplet
 					// otherwise the object won't appear
@@ -145,7 +154,12 @@ void X26TripletList::updateInternalData()
 					if ((triplet->m_data & 0x30) == 0x00)
 						triplet->m_reservedData = true;
 				case 0x1f: // Termination marker
-				case 0x08 ... 0x0d: // PDC
+				case 0x08: // PDC country of origin & programme source
+				case 0x09: // PDC month & day
+				case 0x0a: // PDC cursor row & announced start hour
+				case 0x0b: // PDC cursor row & announced finish hour
+				case 0x0c: // PDC cursor row & local time offset
+				case 0x0d: // PDC series ID & series code
 					break;
 				default:
 					triplet->m_reservedMode = true;
@@ -158,18 +172,10 @@ void X26TripletList::updateInternalData()
 		else
 			switch (triplet->modeExt()) {
 				case 0x20: // Foreground colour
-				case 0x23: // Foreground colour
+				case 0x23: // Background colour
 					if (triplet->m_data & 0x60)
 						triplet->m_reservedData = true;
 					break;
-				case 0x21: // G1 mosaic character
-				case 0x22: // G3 mosaic character at level 1.5
-				case 0x29: // G0 character
-				case 0x2b: // G3 mosaic character at level >=2.5
-				case 0x2f ... 0x3f: // G2 character or G0 diacritical mark
-					if (triplet->m_data < 0x20)
-						triplet->m_reservedData = true;
-					break;
 				case 0x27: // Additional flash functions
 					if (triplet->m_data >= 0x18)
 						triplet->m_reservedData = true;
@@ -193,6 +199,19 @@ void X26TripletList::updateInternalData()
 					if ((triplet->m_data & 0x3f) >= 48)
 						// Should really be an error?
 						triplet->m_reservedData = true;
+					break;
+				case 0x21: // G1 mosaic character
+				case 0x22: // G3 mosaic character at level 1.5
+				case 0x29: // G0 character
+				case 0x2b: // G3 mosaic character at level >=2.5
+				case 0x2f: // G2 character
+					if (triplet->m_data < 0x20)
+						triplet->m_reservedData = true;
+					break;
+				default:
+					if (triplet->modeExt() >= 0x30 && triplet->modeExt() <= 0x3f && triplet->m_data < 0x20)
+						// G0 diacritical mark
+						triplet->m_reservedData = true;
 			}
 
 		triplet->m_activePositionRow = activePosition.row();
@@ -217,15 +236,18 @@ void X26TripletList::updateInternalData()
 					activePosition.setColumn(8);
 				break;
 			case 0x22: // G3 mosaic character at level 1.5
-			case 0x2f ... 0x3f: // G2 character or G0 diacritical mark
+			case 0x2f: // G2 character
 				activePosition.setColumn(triplet->addressColumn());
 				break;
+			default:
+				if (triplet->modeExt() >= 0x30 && triplet->modeExt() <= 0x3f)
+					// G0 diacritical mark
+					activePosition.setColumn(triplet->addressColumn());
 		}
 
 		triplet->m_activePositionRow1p5 = activePosition.row();
 		triplet->m_activePositionColumn1p5 = activePosition.column();
 	}
-
 }
 
 void X26TripletList::append(const X26Triplet &value)

x26triplets.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2023 Gavin MacGregor
+ * Copyright (C) 2020-2024 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *
@@ -34,7 +34,7 @@ public:
 
 //	X26Triplet &operator=(const X26Triplet &other);
 
-	X26Triplet(int, int, int);
+	X26Triplet(int address, int mode, int data);
 
 	int address() const { return m_address; }
 	int mode() const { return m_mode; }
@@ -44,20 +44,20 @@ public:
 	int addressColumn() const { return (m_address); }
 	bool isRowTriplet() const { return (m_address >= 40); }
 
-	void setAddress(int);
-	void setMode(int);
-	void setData(int);
-	void setAddressRow(int);
-	void setAddressColumn(int);
+	void setAddress(int address);
+	void setMode(int mode);
+	void setData(int data);
+	void setAddressRow(int addressRow);
+	void setAddressColumn(int addressColumn);
 
 	int objectSource() const { return (m_address & 0x18) >> 3; }
 
 	int objectLocalDesignationCode() const { return (((m_address & 0x01) << 3) | (m_data >> 4)); }
 	int objectLocalTripletNumber() const { return m_data & 0x0f; }
 	int objectLocalIndex() const { return objectLocalDesignationCode() * 13 + objectLocalTripletNumber(); }
-	void setObjectLocalDesignationCode(int);
-	void setObjectLocalTripletNumber(int);
-	void setObjectLocalIndex(int);
+	void setObjectLocalDesignationCode(int i);
+	void setObjectLocalTripletNumber(int i);
+	void setObjectLocalIndex(int i);
 
 	int activePositionRow() const { return m_activePositionRow; }
 	int activePositionColumn() const { return m_activePositionColumn; }
@@ -85,10 +85,10 @@ private:
 class X26TripletList
 {
 public:
-	void append(const X26Triplet &);
-	void insert(int, const X26Triplet &);
-	void removeAt(int);
-	void replace(int, const X26Triplet &);
+	void append(const X26Triplet &value);
+	void insert(int i, const X26Triplet &value);
+	void removeAt(int i);
+	void replace(int i, const X26Triplet &value);
 
 	void removeLast() { m_list.removeLast(); }
 
@@ -96,11 +96,13 @@ public:
 	bool isEmpty() const { return m_list.isEmpty(); }
 	void reserve(int alloc) { m_list.reserve(alloc); }
 	int size() const { return m_list.size(); }
+	const QList<int> &objects(int t) const { return m_objects[t]; };
 
 private:
 	void updateInternalData();
 
 	QList<X26Triplet> m_list;
+	QList<int> m_objects[3];
 
 	class ActivePosition
 	{

x28commands.cpp

@@ -0,0 +1,243 @@
+/*
+ * Copyright (C) 2020-2024 Gavin MacGregor
+ *
+ * This file is part of QTeletextMaker.
+ *
+ * QTeletextMaker is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QTeletextMaker is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QTeletextMaker.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "x28commands.h"
+
+#include "document.h"
+
+X28Command::X28Command(TeletextDocument *teletextDocument, QUndoCommand *parent) : QUndoCommand(parent)
+{
+	m_teletextDocument = teletextDocument;
+	m_subPageIndex = teletextDocument->currentSubPageIndex();
+}
+
+
+SetFullScreenColourCommand::SetFullScreenColourCommand(TeletextDocument *teletextDocument, int newColour, QUndoCommand *parent) : X28Command(teletextDocument, parent)
+{
+	m_oldColour = teletextDocument->currentSubPage()->defaultScreenColour();
+	m_newColour = newColour;
+
+	setText(QObject::tr("full screen colour"));
+}
+
+void SetFullScreenColourCommand::redo()
+{
+	m_teletextDocument->selectSubPageIndex(m_subPageIndex);
+	m_teletextDocument->currentSubPage()->setDefaultScreenColour(m_newColour);
+
+	emit m_teletextDocument->contentsChanged();
+	emit m_teletextDocument->pageOptionsChanged();
+}
+
+void SetFullScreenColourCommand::undo()
+{
+	m_teletextDocument->selectSubPageIndex(m_subPageIndex);
+	m_teletextDocument->currentSubPage()->setDefaultScreenColour(m_oldColour);
+
+	emit m_teletextDocument->contentsChanged();
+	emit m_teletextDocument->pageOptionsChanged();
+}
+
+bool SetFullScreenColourCommand::mergeWith(const QUndoCommand *command)
+{
+	const SetFullScreenColourCommand *newerCommand = static_cast<const SetFullScreenColourCommand *>(command);
+
+	if (m_subPageIndex != newerCommand->m_subPageIndex)
+		return false;
+
+	m_newColour = newerCommand->m_newColour;
+
+	return true;
+}
+
+
+SetFullRowColourCommand::SetFullRowColourCommand(TeletextDocument *teletextDocument, int newColour, QUndoCommand *parent) : X28Command(teletextDocument, parent)
+{
+	m_oldColour = teletextDocument->currentSubPage()->defaultRowColour();
+	m_newColour = newColour;
+
+	setText(QObject::tr("full row colour"));
+}
+
+void SetFullRowColourCommand::redo()
+{
+	m_teletextDocument->selectSubPageIndex(m_subPageIndex);
+	m_teletextDocument->currentSubPage()->setDefaultRowColour(m_newColour);
+
+	emit m_teletextDocument->contentsChanged();
+	emit m_teletextDocument->pageOptionsChanged();
+}
+
+void SetFullRowColourCommand::undo()
+{
+	m_teletextDocument->selectSubPageIndex(m_subPageIndex);
+	m_teletextDocument->currentSubPage()->setDefaultRowColour(m_oldColour);
+
+	emit m_teletextDocument->contentsChanged();
+	emit m_teletextDocument->pageOptionsChanged();
+}
+
+bool SetFullRowColourCommand::mergeWith(const QUndoCommand *command)
+{
+	const SetFullRowColourCommand *newerCommand = static_cast<const SetFullRowColourCommand *>(command);
+
+	if (m_subPageIndex != newerCommand->m_subPageIndex)
+		return false;
+
+	m_newColour = newerCommand->m_newColour;
+
+	return true;
+}
+
+
+SetCLUTRemapCommand::SetCLUTRemapCommand(TeletextDocument *teletextDocument, int newMap, QUndoCommand *parent) : X28Command(teletextDocument, parent)
+{
+	m_oldMap = teletextDocument->currentSubPage()->colourTableRemap();
+	m_newMap = newMap;
+
+	setText(QObject::tr("CLUT remapping"));
+}
+
+void SetCLUTRemapCommand::redo()
+{
+	m_teletextDocument->selectSubPageIndex(m_subPageIndex);
+	m_teletextDocument->currentSubPage()->setColourTableRemap(m_newMap);
+
+	emit m_teletextDocument->contentsChanged();
+	emit m_teletextDocument->pageOptionsChanged();
+}
+
+void SetCLUTRemapCommand::undo()
+{
+	m_teletextDocument->selectSubPageIndex(m_subPageIndex);
+	m_teletextDocument->currentSubPage()->setColourTableRemap(m_oldMap);
+
+	emit m_teletextDocument->contentsChanged();
+	emit m_teletextDocument->pageOptionsChanged();
+}
+
+bool SetCLUTRemapCommand::mergeWith(const QUndoCommand *command)
+{
+	const SetCLUTRemapCommand *newerCommand = static_cast<const SetCLUTRemapCommand *>(command);
+
+	if (m_subPageIndex != newerCommand->m_subPageIndex)
+		return false;
+
+	m_newMap = newerCommand->m_newMap;
+
+	return true;
+}
+
+
+SetBlackBackgroundSubstCommand::SetBlackBackgroundSubstCommand(TeletextDocument *teletextDocument, bool newSub, QUndoCommand *parent) : X28Command(teletextDocument, parent)
+{
+	m_oldSub = teletextDocument->currentSubPage()->blackBackgroundSubst();
+	m_newSub = newSub;
+
+	setText(QObject::tr("black background substitution"));
+}
+
+void SetBlackBackgroundSubstCommand::redo()
+{
+	m_teletextDocument->selectSubPageIndex(m_subPageIndex);
+	m_teletextDocument->currentSubPage()->setBlackBackgroundSubst(m_newSub);
+
+	emit m_teletextDocument->contentsChanged();
+	emit m_teletextDocument->pageOptionsChanged();
+}
+
+void SetBlackBackgroundSubstCommand::undo()
+{
+	m_teletextDocument->selectSubPageIndex(m_subPageIndex);
+	m_teletextDocument->currentSubPage()->setBlackBackgroundSubst(m_oldSub);
+
+	emit m_teletextDocument->contentsChanged();
+	emit m_teletextDocument->pageOptionsChanged();
+}
+
+bool SetBlackBackgroundSubstCommand::mergeWith(const QUndoCommand *command)
+{
+	const SetBlackBackgroundSubstCommand *newerCommand = static_cast<const SetBlackBackgroundSubstCommand *>(command);
+
+	if (m_subPageIndex != newerCommand->m_subPageIndex)
+		return false;
+
+	setObsolete(true);
+	return true;
+}
+
+
+SetColourCommand::SetColourCommand(TeletextDocument *teletextDocument, int colourIndex, int newColour, QUndoCommand *parent) : X28Command(teletextDocument, parent)
+{
+	m_colourIndex = colourIndex;
+	m_oldColour = teletextDocument->currentSubPage()->CLUT(colourIndex);
+	m_newColour = newColour;
+
+	setText(QObject::tr("colour change"));
+}
+
+void SetColourCommand::redo()
+{
+	m_teletextDocument->selectSubPageIndex(m_subPageIndex);
+	m_teletextDocument->currentSubPage()->setCLUT(m_colourIndex, m_newColour);
+
+	emit m_teletextDocument->colourChanged(m_colourIndex);
+	emit m_teletextDocument->contentsChanged();
+}
+
+void SetColourCommand::undo()
+{
+	m_teletextDocument->selectSubPageIndex(m_subPageIndex);
+	m_teletextDocument->currentSubPage()->setCLUT(m_colourIndex, m_oldColour);
+
+	emit m_teletextDocument->colourChanged(m_colourIndex);
+	emit m_teletextDocument->contentsChanged();
+}
+
+
+ResetCLUTCommand::ResetCLUTCommand(TeletextDocument *teletextDocument, int colourTable, QUndoCommand *parent) : X28Command(teletextDocument, parent)
+{
+	m_colourTable = colourTable;
+	for (int i=m_colourTable*8; i<m_colourTable*8+8; i++)
+		m_oldColourEntry[i&7] = teletextDocument->currentSubPage()->CLUT(i);
+
+	setText(QObject::tr("CLUT %1 reset").arg(m_colourTable));
+}
+
+void ResetCLUTCommand::redo()
+{
+	m_teletextDocument->selectSubPageIndex(m_subPageIndex);
+	for (int i=m_colourTable*8; i<m_colourTable*8+8; i++) {
+		m_teletextDocument->currentSubPage()->setCLUT(i, m_teletextDocument->currentSubPage()->CLUT(i, 0));
+		emit m_teletextDocument->colourChanged(i);
+	}
+
+	emit m_teletextDocument->contentsChanged();
+}
+
+void ResetCLUTCommand::undo()
+{
+	m_teletextDocument->selectSubPageIndex(m_subPageIndex);
+	for (int i=m_colourTable*8; i<m_colourTable*8+8; i++) {
+		m_teletextDocument->currentSubPage()->setCLUT(i, m_oldColourEntry[i&7]);
+		emit m_teletextDocument->colourChanged(i);
+	}
+
+	emit m_teletextDocument->contentsChanged();
+}

x28commands.h

@@ -0,0 +1,126 @@
+/*
+ * Copyright (C) 2020-2024 Gavin MacGregor
+ *
+ * This file is part of QTeletextMaker.
+ *
+ * QTeletextMaker is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QTeletextMaker is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QTeletextMaker.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef X28COMMANDS_H
+#define X28COMMANDS_H
+
+#include <QUndoCommand>
+
+#include "document.h"
+
+class X28Command : public QUndoCommand
+{
+public:
+	X28Command(TeletextDocument *teletextDocument, QUndoCommand *parent = 0);
+
+protected:
+	TeletextDocument *m_teletextDocument;
+	int m_subPageIndex;
+};
+
+class SetFullScreenColourCommand : public X28Command
+{
+public:
+	enum { Id = 301 };
+
+	SetFullScreenColourCommand(TeletextDocument *teletextDocument, int newColour, QUndoCommand *parent = 0);
+
+	void redo() override;
+	void undo() override;
+	bool mergeWith(const QUndoCommand *command) override;
+	int id() const override { return Id; }
+
+private:
+	int m_oldColour, m_newColour;
+};
+
+class SetFullRowColourCommand : public X28Command
+{
+public:
+	enum { Id = 302 };
+
+	SetFullRowColourCommand(TeletextDocument *teletextDocument, int newColour, QUndoCommand *parent = 0);
+
+	void redo() override;
+	void undo() override;
+	bool mergeWith(const QUndoCommand *command) override;
+	int id() const override { return Id; }
+
+private:
+	int m_oldColour, m_newColour;
+};
+
+class SetCLUTRemapCommand : public X28Command
+{
+public:
+	enum { Id = 303 };
+
+	SetCLUTRemapCommand(TeletextDocument *teletextDocument, int newMap, QUndoCommand *parent = 0);
+
+	void redo() override;
+	void undo() override;
+	bool mergeWith(const QUndoCommand *command) override;
+	int id() const override { return Id; }
+
+private:
+	int m_oldMap, m_newMap;
+};
+
+class SetBlackBackgroundSubstCommand : public X28Command
+{
+public:
+	enum { Id = 304 };
+
+	SetBlackBackgroundSubstCommand(TeletextDocument *teletextDocument, bool newSub, QUndoCommand *parent = 0);
+
+	void redo() override;
+	void undo() override;
+	bool mergeWith(const QUndoCommand *command) override;
+	int id() const override { return Id; }
+
+private:
+	int m_oldSub, m_newSub;
+};
+
+class SetColourCommand : public X28Command
+{
+public:
+	SetColourCommand(TeletextDocument *teletextDocument, int colourIndex, int newColour, QUndoCommand *parent = 0);
+
+	void redo() override;
+	void undo() override;
+
+private:
+	int m_colourIndex, m_oldColour, m_newColour;
+};
+
+class ResetCLUTCommand : public X28Command
+{
+public:
+	ResetCLUTCommand(TeletextDocument *teletextDocument, int colourTable, QUndoCommand *parent = 0);
+
+	void redo() override;
+	void undo() override;
+
+private:
+	int m_colourTable;
+	int m_oldColourEntry[8];
+};
+
+#endif