Tag version 0.7.2-beta

The saving code has been refactored into one class per format with common
methods for each part of the saving process. This should make it easier to
add further formats, and inheriting a format class can allow implementing a
different format that is largely based on an existing format.

The loading code is also in one class per format but is largely the same as
what it was before.

Both classes have the ability to warn the user if any issues or errors are
or will be encountered when loading or saving.

TTI files are now written with CR/LF line endings on all platforms as a
result of using binary file writing for all formats, previously Linux builds
would save TTI files with just LF line endings. TTI files are still loaded
with readLine() and trimmed() which can cope with either type of line ending.

Experimental support for loading and exporting EP1 and HMS SD-Teletext htt
formats has been added. The htt format inherits from the t42 format as the
format appears to be largely the same except for the bits being reversed
within each byte and the clock run-in and framing code added before each
packet.

.gitignore

@@ -1,6 +1,4 @@
-.qmake.stash
-moc_*
-qrc_*
-*.o
 Makefile
-qteletextmaker
+build*/
+cmake-build-*/
+.idea

3rdparty/QtGifImage/.gitignore

@@ -0,0 +1,45 @@
+syntax: glob
+*.pro.user*
+*.autosave
+*.app
+*.moc
+*.prl
+Makefile*
+doc/html/
+*.framework/
+*.xcodeproj/
+debug/
+release/
+qtc-gdbmacros/
+*.rej
+*.orig
+*.obj
+*.swp
+*.dll
+*.exp
+*.ilk
+*.pdb
+*.lib
+Thumbs.db
+moc_*.cpp
+qrc_*.cpp
+*.o
+*.so.*
+*.so
+*.pdb
+ui_*.h
+*~
+.qmake.cache
+lib/*
+*.orig
+*.exe
+*.vcproj
+*.vcproj.*.user
+*_resource.rc
+*.sln
+*.idb
+*.ncb
+*.suo
+
+*.zip
+*.xlsx

3rdparty/QtGifImage/CMakeLists.txt

@@ -0,0 +1,32 @@
+cmake_minimum_required(VERSION 3.5...3.16)
+project(QtGifImage)
+
+set(CMAKE_CXX_STANDARD 17)
+
+find_package(QT NAMES Qt6 REQUIRED COMPONENTS Core Gui)
+find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Core Gui)
+
+set(LIB_LIBRARIES Qt${QT_VERSION_MAJOR}::Core Qt${QT_VERSION_MAJOR}::Gui)
+
+set(GIF_IMAGE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/include/gifimage)
+set(GIF_LIB_DIR ${CMAKE_CURRENT_SOURCE_DIR}/include/3rdparty/giflib)
+
+# Next line was "add_library(${PROJECT_NAME} SHARED"
+# but it breaks MXE static compilation
+add_library(${PROJECT_NAME}
+    ${GIF_IMAGE_DIR}/qgifglobal.h ${GIF_IMAGE_DIR}/qgifimage.cpp
+    ${GIF_IMAGE_DIR}/qgifimage.h  ${GIF_IMAGE_DIR}/qgifimage_p.h
+
+    ${GIF_LIB_DIR}/dgif_lib.c ${GIF_LIB_DIR}/egif_lib.c
+    ${GIF_LIB_DIR}/gif_err.c  ${GIF_LIB_DIR}/gif_font.c
+    ${GIF_LIB_DIR}/gif_hash.c ${GIF_LIB_DIR}/gif_hash.h
+    ${GIF_LIB_DIR}/gif_lib.h  ${GIF_LIB_DIR}/gif_lib_private.h
+    ${GIF_LIB_DIR}/gifalloc.c ${GIF_LIB_DIR}/quantize.c
+)
+
+add_library(${PROJECT_NAME}::${PROJECT_NAME} ALIAS ${PROJECT_NAME})
+
+target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include)
+target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include/3rdparty)
+
+target_link_libraries(${PROJECT_NAME} PRIVATE ${LIB_LIBRARIES})

3rdparty/QtGifImage/include/3rdparty/giflib/AUTHORS

@@ -0,0 +1,36 @@
+Michael Brown <michael_brown_uk[AT]hotmail.com>
+        callbacks to write data via user defined function
+
+Daniel Eisenbud <eisenbud[AT]google.com>
+	Fixes for crashes with invalid gif files and double freeing of
+	colormaps
+
+Gershon Elber <gershon[AT]cs.technion.sc.il>
+	original giflib code
+
+Marc Ewing <marc[AT]redhat.com>
+        spec file (for rpms) updates
+
+Toshio Kuratomi <toshio[AT]tiki-lounge.com>
+        uncompressed gif writing code
+        autoconf/automake process
+        former maintainer
+
+marek <marwaw[AT]users.sourceforge.net>
+	Gif initialization fix
+	windows build code
+
+Peter Mehlitz <peter[AT]transvirtual.com>
+        callbacks to read data from arbitrary sources (like libjpeg/libpng)
+
+Dick Porter <dick[AT]cymru.net>
+        int/pointer fixes for Alpha
+
+Eric Raymond <esr[AT]snark.thyrsus.com>
+        current as well as long time former maintainer of giflib code
+
+Petter Reinholdtsen <pere[AT]hungry.com>
+	Tru64 build fixs
+	
+Georg Schwarz <geos[AT]epost.de>
+	IRIX fixes

3rdparty/QtGifImage/include/3rdparty/giflib/COPYING

@@ -0,0 +1,19 @@
+The GIFLIB distribution is Copyright (c) 1997  Eric S. Raymond
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

3rdparty/QtGifImage/include/3rdparty/giflib/README

@@ -0,0 +1,27 @@
+= GIFLIB =
+
+This is the README file of GIFLIB, a library for manipulating GIF files.
+
+Latest versions of GIFLIB are currently hosted at:
+    http://sourceforge.net/projects/giflib
+
+== Overview ==
+
+GIF is a legacy format; we recommend against generating new images in
+it.  For a cleaner, more extensible design with better color support
+and compression, look up PNG.
+
+giflib provides code for reading GIF files and transforming them into 
+RGB bitmaps, and for writing RGB bitmaps as GIF files.
+
+The (permissive) open-source license is in the file COPYING.
+
+You will find build instructions in build.asc
+
+You will find full documentation of the API in doc/ and on the 
+project website.
+
+The project has a long and confusing history, described in history.asc
+
+The project to-do list is in TODO.
+

3rdparty/QtGifImage/include/3rdparty/giflib/gif_err.c

@@ -0,0 +1,67 @@
+/*****************************************************************************
+
+gif_err.c - handle error reporting for the GIF library.
+
+****************************************************************************/
+
+#include <giflib/gif_lib.h>
+
+/*****************************************************************************
+ Return a string description of  the last GIF error
+*****************************************************************************/
+char *
+GifErrorString(int ErrorCode) {
+  char *Err;
+
+  switch (ErrorCode) {
+  case E_GIF_ERR_OPEN_FAILED: Err = "Failed to open given file";
+	break;
+  case E_GIF_ERR_WRITE_FAILED: Err = "Failed to write to given file";
+	break;
+  case E_GIF_ERR_HAS_SCRN_DSCR: Err = "Screen descriptor has already been set";
+	break;
+  case E_GIF_ERR_HAS_IMAG_DSCR: Err = "Image descriptor is still active";
+	break;
+  case E_GIF_ERR_NO_COLOR_MAP: Err = "Neither global nor local color map";
+	break;
+  case E_GIF_ERR_DATA_TOO_BIG: Err = "Number of pixels bigger than width * height";
+	break;
+  case E_GIF_ERR_NOT_ENOUGH_MEM: Err = "Failed to allocate required memory";
+	break;
+  case E_GIF_ERR_DISK_IS_FULL: Err = "Write failed (disk full?)";
+	break;
+  case E_GIF_ERR_CLOSE_FAILED: Err = "Failed to close given file";
+	break;
+  case E_GIF_ERR_NOT_WRITEABLE: Err = "Given file was not opened for write";
+	break;
+  case D_GIF_ERR_OPEN_FAILED: Err = "Failed to open given file";
+	break;
+  case D_GIF_ERR_READ_FAILED: Err = "Failed to read from given file";
+	break;
+  case D_GIF_ERR_NOT_GIF_FILE: Err = "Data is not in GIF format";
+	break;
+  case D_GIF_ERR_NO_SCRN_DSCR: Err = "No screen descriptor detected";
+	break;
+  case D_GIF_ERR_NO_IMAG_DSCR: Err = "No Image Descriptor detected";
+	break;
+  case D_GIF_ERR_NO_COLOR_MAP: Err = "Neither global nor local color map";
+	break;
+  case D_GIF_ERR_WRONG_RECORD: Err = "Wrong record type detected";
+	break;
+  case D_GIF_ERR_DATA_TOO_BIG: Err = "Number of pixels bigger than width * height";
+	break;
+  case D_GIF_ERR_NOT_ENOUGH_MEM: Err = "Failed to allocate required memory";
+	break;
+  case D_GIF_ERR_CLOSE_FAILED: Err = "Failed to close given file";
+	break;
+  case D_GIF_ERR_NOT_READABLE: Err = "Given file was not opened for read";
+	break;
+  case D_GIF_ERR_IMAGE_DEFECT: Err = "Image is defective, decoding aborted";
+	break;
+  case D_GIF_ERR_EOF_TOO_SOON: Err = "Image EOF detected before image complete";
+	break;
+  default: Err = NULL;
+	break;
+  }
+  return Err;
+}

3rdparty/QtGifImage/include/3rdparty/giflib/gif_font.c

@@ -0,0 +1,246 @@
+/*****************************************************************************
+ 
+gif_font.c - utility font handling and simple drawing for the GIF library
+ 
+****************************************************************************/
+
+#include <string.h>
+
+#include <giflib/gif_lib.h>
+
+/*****************************************************************************
+ Ascii 8 by 8 regular font - only first 128 characters are supported.
+*****************************************************************************/
+
+/*
+ * Each array entry holds the bits for 8 horizontal scan lines, topmost
+ * first.  The most significant bit of each constant is the leftmost bit of
+ * the scan line.
+ */
+/*@+charint@*/
+const unsigned char GifAsciiTable8x8[][GIF_FONT_WIDTH] = {
+	{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},    /* Ascii 0 */
+	{0x3c, 0x42, 0xa5, 0x81, 0xbd, 0x42, 0x3c, 0x00},    /* Ascii 1 */
+	{0x3c, 0x7e, 0xdb, 0xff, 0xc3, 0x7e, 0x3c, 0x00},    /* Ascii 2 */
+	{0x00, 0xee, 0xfe, 0xfe, 0x7c, 0x38, 0x10, 0x00},    /* Ascii 3 */
+	{0x10, 0x38, 0x7c, 0xfe, 0x7c, 0x38, 0x10, 0x00},    /* Ascii 4 */
+	{0x00, 0x3c, 0x18, 0xff, 0xff, 0x08, 0x18, 0x00},    /* Ascii 5 */
+	{0x10, 0x38, 0x7c, 0xfe, 0xfe, 0x10, 0x38, 0x00},    /* Ascii 6 */
+	{0x00, 0x00, 0x18, 0x3c, 0x18, 0x00, 0x00, 0x00},    /* Ascii 7 */
+	{0xff, 0xff, 0xe7, 0xc3, 0xe7, 0xff, 0xff, 0xff},    /* Ascii 8 */
+	{0x00, 0x3c, 0x42, 0x81, 0x81, 0x42, 0x3c, 0x00},    /* Ascii 9 */
+	{0xff, 0xc3, 0xbd, 0x7e, 0x7e, 0xbd, 0xc3, 0xff},    /* Ascii 10 */
+	{0x1f, 0x07, 0x0d, 0x7c, 0xc6, 0xc6, 0x7c, 0x00},    /* Ascii 11 */
+	{0x00, 0x7e, 0xc3, 0xc3, 0x7e, 0x18, 0x7e, 0x18},    /* Ascii 12 */
+	{0x04, 0x06, 0x07, 0x04, 0x04, 0xfc, 0xf8, 0x00},    /* Ascii 13 */
+	{0x0c, 0x0a, 0x0d, 0x0b, 0xf9, 0xf9, 0x1f, 0x1f},    /* Ascii 14 */
+	{0x00, 0x92, 0x7c, 0x44, 0xc6, 0x7c, 0x92, 0x00},    /* Ascii 15 */
+	{0x00, 0x00, 0x60, 0x78, 0x7e, 0x78, 0x60, 0x00},    /* Ascii 16 */
+	{0x00, 0x00, 0x06, 0x1e, 0x7e, 0x1e, 0x06, 0x00},    /* Ascii 17 */
+	{0x18, 0x7e, 0x18, 0x18, 0x18, 0x18, 0x7e, 0x18},    /* Ascii 18 */
+	{0x66, 0x66, 0x66, 0x66, 0x66, 0x00, 0x66, 0x00},    /* Ascii 19 */
+	{0xff, 0xb6, 0x76, 0x36, 0x36, 0x36, 0x36, 0x00},    /* Ascii 20 */
+	{0x7e, 0xc1, 0xdc, 0x22, 0x22, 0x1f, 0x83, 0x7e},    /* Ascii 21 */
+	{0x00, 0x00, 0x00, 0x7e, 0x7e, 0x00, 0x00, 0x00},    /* Ascii 22 */
+	{0x18, 0x7e, 0x18, 0x18, 0x7e, 0x18, 0x00, 0xff},    /* Ascii 23 */
+	{0x18, 0x7e, 0x18, 0x18, 0x18, 0x18, 0x18, 0x00},    /* Ascii 24 */
+	{0x18, 0x18, 0x18, 0x18, 0x18, 0x7e, 0x18, 0x00},    /* Ascii 25 */
+	{0x00, 0x04, 0x06, 0xff, 0x06, 0x04, 0x00, 0x00},    /* Ascii 26 */
+	{0x00, 0x20, 0x60, 0xff, 0x60, 0x20, 0x00, 0x00},    /* Ascii 27 */
+	{0x00, 0x00, 0x00, 0xc0, 0xc0, 0xc0, 0xff, 0x00},    /* Ascii 28 */
+	{0x00, 0x24, 0x66, 0xff, 0x66, 0x24, 0x00, 0x00},    /* Ascii 29 */
+	{0x00, 0x00, 0x10, 0x38, 0x7c, 0xfe, 0x00, 0x00},    /* Ascii 30 */
+	{0x00, 0x00, 0x00, 0xfe, 0x7c, 0x38, 0x10, 0x00},    /* Ascii 31 */
+	{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},    /* */
+	{0x30, 0x30, 0x30, 0x30, 0x30, 0x00, 0x30, 0x00},    /* ! */
+	{0x66, 0x66, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},    /* " */
+	{0x6c, 0x6c, 0xfe, 0x6c, 0xfe, 0x6c, 0x6c, 0x00},    /* # */
+	{0x10, 0x7c, 0xd2, 0x7c, 0x86, 0x7c, 0x10, 0x00},    /* $ */
+	{0xf0, 0x96, 0xfc, 0x18, 0x3e, 0x72, 0xde, 0x00},    /* % */
+	{0x30, 0x48, 0x30, 0x78, 0xce, 0xcc, 0x78, 0x00},    /* & */
+	{0x0c, 0x0c, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00},    /* ' */
+	{0x10, 0x60, 0xc0, 0xc0, 0xc0, 0x60, 0x10, 0x00},    /* ( */
+	{0x10, 0x0c, 0x06, 0x06, 0x06, 0x0c, 0x10, 0x00},    /* ) */
+	{0x00, 0x54, 0x38, 0xfe, 0x38, 0x54, 0x00, 0x00},    /* * */
+	{0x00, 0x18, 0x18, 0x7e, 0x18, 0x18, 0x00, 0x00},    /* + */
+	{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x70},    /* , */
+	{0x00, 0x00, 0x00, 0x7e, 0x00, 0x00, 0x00, 0x00},    /* - */
+	{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00},    /* . */
+	{0x02, 0x06, 0x0c, 0x18, 0x30, 0x60, 0xc0, 0x00},    /* / */
+	{0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00},    /* 0 */
+	{0x18, 0x38, 0x78, 0x18, 0x18, 0x18, 0x3c, 0x00},    /* 1 */
+	{0x7c, 0xc6, 0x06, 0x0c, 0x30, 0x60, 0xfe, 0x00},    /* 2 */
+	{0x7c, 0xc6, 0x06, 0x3c, 0x06, 0xc6, 0x7c, 0x00},    /* 3 */
+	{0x0e, 0x1e, 0x36, 0x66, 0xfe, 0x06, 0x06, 0x00},    /* 4 */
+	{0xfe, 0xc0, 0xc0, 0xfc, 0x06, 0x06, 0xfc, 0x00},    /* 5 */
+	{0x7c, 0xc6, 0xc0, 0xfc, 0xc6, 0xc6, 0x7c, 0x00},    /* 6 */
+	{0xfe, 0x06, 0x0c, 0x18, 0x30, 0x60, 0x60, 0x00},    /* 7 */
+	{0x7c, 0xc6, 0xc6, 0x7c, 0xc6, 0xc6, 0x7c, 0x00},    /* 8 */
+	{0x7c, 0xc6, 0xc6, 0x7e, 0x06, 0xc6, 0x7c, 0x00},    /* 9 */
+	{0x00, 0x30, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00},    /* : */
+	{0x00, 0x30, 0x00, 0x00, 0x00, 0x30, 0x20, 0x00},    /* }, */
+	{0x00, 0x1c, 0x30, 0x60, 0x30, 0x1c, 0x00, 0x00},    /* < */
+	{0x00, 0x00, 0x7e, 0x00, 0x7e, 0x00, 0x00, 0x00},    /* = */
+	{0x00, 0x70, 0x18, 0x0c, 0x18, 0x70, 0x00, 0x00},    /* > */
+	{0x7c, 0xc6, 0x0c, 0x18, 0x30, 0x00, 0x30, 0x00},    /* ? */
+	{0x7c, 0x82, 0x9a, 0xaa, 0xaa, 0x9e, 0x7c, 0x00},    /* @ */
+	{0x38, 0x6c, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0x00},    /* A */
+	{0xfc, 0xc6, 0xc6, 0xfc, 0xc6, 0xc6, 0xfc, 0x00},    /* B */
+	{0x7c, 0xc6, 0xc6, 0xc0, 0xc0, 0xc6, 0x7c, 0x00},    /* C */
+	{0xf8, 0xcc, 0xc6, 0xc6, 0xc6, 0xcc, 0xf8, 0x00},    /* D */
+	{0xfe, 0xc0, 0xc0, 0xfc, 0xc0, 0xc0, 0xfe, 0x00},    /* E */
+	{0xfe, 0xc0, 0xc0, 0xfc, 0xc0, 0xc0, 0xc0, 0x00},    /* F */
+	{0x7c, 0xc6, 0xc0, 0xce, 0xc6, 0xc6, 0x7e, 0x00},    /* G */
+	{0xc6, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0xc6, 0x00},    /* H */
+	{0x78, 0x30, 0x30, 0x30, 0x30, 0x30, 0x78, 0x00},    /* I */
+	{0x1e, 0x06, 0x06, 0x06, 0xc6, 0xc6, 0x7c, 0x00},    /* J */
+	{0xc6, 0xcc, 0xd8, 0xf0, 0xd8, 0xcc, 0xc6, 0x00},    /* K */
+	{0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xfe, 0x00},    /* L */
+	{0xc6, 0xee, 0xfe, 0xd6, 0xc6, 0xc6, 0xc6, 0x00},    /* M */
+	{0xc6, 0xe6, 0xf6, 0xde, 0xce, 0xc6, 0xc6, 0x00},    /* N */
+	{0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00},    /* O */
+	{0xfc, 0xc6, 0xc6, 0xfc, 0xc0, 0xc0, 0xc0, 0x00},    /* P */
+	{0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x06},    /* Q */
+	{0xfc, 0xc6, 0xc6, 0xfc, 0xc6, 0xc6, 0xc6, 0x00},    /* R */
+	{0x78, 0xcc, 0x60, 0x30, 0x18, 0xcc, 0x78, 0x00},    /* S */
+	{0xfc, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x00},    /* T */
+	{0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00},    /* U */
+	{0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x6c, 0x38, 0x00},    /* V */
+	{0xc6, 0xc6, 0xc6, 0xd6, 0xfe, 0xee, 0xc6, 0x00},    /* W */
+	{0xc6, 0xc6, 0x6c, 0x38, 0x6c, 0xc6, 0xc6, 0x00},    /* X */
+	{0xc3, 0xc3, 0x66, 0x3c, 0x18, 0x18, 0x18, 0x00},    /* Y */
+	{0xfe, 0x0c, 0x18, 0x30, 0x60, 0xc0, 0xfe, 0x00},    /* Z */
+	{0x3c, 0x30, 0x30, 0x30, 0x30, 0x30, 0x3c, 0x00},    /* [ */
+	{0xc0, 0x60, 0x30, 0x18, 0x0c, 0x06, 0x03, 0x00},    /* \ */
+	{0x3c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x3c, 0x00},    /* ] */
+	{0x00, 0x38, 0x6c, 0xc6, 0x00, 0x00, 0x00, 0x00},    /* ^ */
+	{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff},    /* _ */
+	{0x30, 0x30, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00},    /* ` */
+	{0x00, 0x00, 0x7c, 0x06, 0x7e, 0xc6, 0x7e, 0x00},    /* a */
+	{0xc0, 0xc0, 0xfc, 0xc6, 0xc6, 0xe6, 0xdc, 0x00},    /* b */
+	{0x00, 0x00, 0x7c, 0xc6, 0xc0, 0xc0, 0x7e, 0x00},    /* c */
+	{0x06, 0x06, 0x7e, 0xc6, 0xc6, 0xce, 0x76, 0x00},    /* d */
+	{0x00, 0x00, 0x7c, 0xc6, 0xfe, 0xc0, 0x7e, 0x00},    /* e */
+	{0x1e, 0x30, 0x7c, 0x30, 0x30, 0x30, 0x30, 0x00},    /* f */
+	{0x00, 0x00, 0x7e, 0xc6, 0xce, 0x76, 0x06, 0x7c},    /* g */
+	{0xc0, 0xc0, 0xfc, 0xc6, 0xc6, 0xc6, 0xc6, 0x00},    /* */
+	{0x18, 0x00, 0x38, 0x18, 0x18, 0x18, 0x3c, 0x00},    /* i */
+	{0x18, 0x00, 0x38, 0x18, 0x18, 0x18, 0x18, 0xf0},    /* j */
+	{0xc0, 0xc0, 0xcc, 0xd8, 0xf0, 0xd8, 0xcc, 0x00},    /* k */
+	{0x38, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00},    /* l */
+	{0x00, 0x00, 0xcc, 0xfe, 0xd6, 0xc6, 0xc6, 0x00},    /* m */
+	{0x00, 0x00, 0xfc, 0xc6, 0xc6, 0xc6, 0xc6, 0x00},    /* n */
+	{0x00, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0x7c, 0x00},    /* o */
+	{0x00, 0x00, 0xfc, 0xc6, 0xc6, 0xe6, 0xdc, 0xc0},    /* p */
+	{0x00, 0x00, 0x7e, 0xc6, 0xc6, 0xce, 0x76, 0x06},    /* q */
+	{0x00, 0x00, 0x6e, 0x70, 0x60, 0x60, 0x60, 0x00},    /* r */
+	{0x00, 0x00, 0x7c, 0xc0, 0x7c, 0x06, 0xfc, 0x00},    /* s */
+	{0x30, 0x30, 0x7c, 0x30, 0x30, 0x30, 0x1c, 0x00},    /* t */
+	{0x00, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0x7e, 0x00},    /* u */
+	{0x00, 0x00, 0xc6, 0xc6, 0xc6, 0x6c, 0x38, 0x00},    /* v */
+	{0x00, 0x00, 0xc6, 0xc6, 0xd6, 0xfe, 0x6c, 0x00},    /* w */
+	{0x00, 0x00, 0xc6, 0x6c, 0x38, 0x6c, 0xc6, 0x00},    /* x */
+	{0x00, 0x00, 0xc6, 0xc6, 0xce, 0x76, 0x06, 0x7c},    /* y */
+	{0x00, 0x00, 0xfc, 0x18, 0x30, 0x60, 0xfc, 0x00},    /* z */
+	{0x0e, 0x18, 0x18, 0x70, 0x18, 0x18, 0x0e, 0x00},    /* { */
+	{0x18, 0x18, 0x18, 0x00, 0x18, 0x18, 0x18, 0x00},    /* | */
+	{0xe0, 0x30, 0x30, 0x1c, 0x30, 0x30, 0xe0, 0x00},    /* } */
+	{0x00, 0x00, 0x70, 0x9a, 0x0e, 0x00, 0x00, 0x00},    /* ~ */
+	{0x00, 0x00, 0x18, 0x3c, 0x66, 0xff, 0x00, 0x00}    /* Ascii 127 */
+};
+/*@=charint@*/
+
+void
+GifDrawText8x8(SavedImage *Image,
+			   const int x, const int y,
+			   const char *legend,
+			   const int color) {
+  int i, j;
+  int base;
+  const char *cp;
+
+  for (i = 0; i < GIF_FONT_HEIGHT; i++) {
+	base = Image->ImageDesc.Width * (y + i) + x;
+
+	for (cp = legend; *cp; cp++)
+	  for (j = 0; j < GIF_FONT_WIDTH; j++) {
+		if (GifAsciiTable8x8[(short)(*cp)][i] & (1 << (GIF_FONT_WIDTH - j)))
+		  Image->RasterBits[base] = color;
+		base++;
+	  }
+  }
+}
+
+void
+GifDrawBox(SavedImage *Image,
+		   const int x, const int y,
+		   const int w, const int d,
+		   const int color) {
+  int j, base = Image->ImageDesc.Width * y + x;
+
+  for (j = 0; j < w; j++)
+	Image->RasterBits[base + j] =
+	Image->RasterBits[base + (d * Image->ImageDesc.Width) + j] = color;
+
+  for (j = 0; j < d; j++)
+	Image->RasterBits[base + j * Image->ImageDesc.Width] =
+	Image->RasterBits[base + j * Image->ImageDesc.Width + w] = color;
+}
+
+void
+GifDrawRectangle(SavedImage *Image,
+				 const int x, const int y,
+				 const int w, const int d,
+				 const int color) {
+  unsigned char *bp = Image->RasterBits + Image->ImageDesc.Width * y + x;
+  int i;
+
+  for (i = 0; i < d; i++)
+	memset(bp + (i * Image->ImageDesc.Width), color, (size_t)w);
+}
+
+void
+GifDrawBoxedText8x8(SavedImage *Image,
+					const int x, const int y,
+					const char *legend,
+					const int border,
+					const int bg, const int fg) {
+  int i, j = 0, LineCount = 0, TextWidth = 0;
+  const char *cp;
+
+  /* compute size of text to box */
+  for (cp = legend; *cp; cp++)
+	if (*cp == '\r') {
+	  if (j > TextWidth)
+		TextWidth = j;
+	  j = 0;
+	  LineCount++;
+	} else if (*cp != '\t')
+	  ++j;
+  LineCount++;    /* count last line */
+  if (j > TextWidth)    /* last line might be longer than any previous */
+	TextWidth = j;
+
+  /* fill the box */
+  GifDrawRectangle(Image, x + 1, y + 1,
+				   border + TextWidth * GIF_FONT_WIDTH + border - 1,
+				   border + LineCount * GIF_FONT_HEIGHT + border - 1, bg);
+
+  /* draw the text */
+  i = 0;
+  cp = strtok((char *)legend, "\r\n");
+  do {
+	int leadspace = 0;
+
+	if (cp[0] == '\t')
+	  leadspace = (int)(TextWidth - strlen(++cp)) / 2;
+
+	GifDrawText8x8(Image, x + border + (leadspace * GIF_FONT_WIDTH),
+				   y + border + (GIF_FONT_HEIGHT * i++), cp, fg);
+	cp = strtok((char *)NULL, "\r\n");
+  } while (cp);
+
+  /* outline the box */
+  GifDrawBox(Image, x, y, border + TextWidth * GIF_FONT_WIDTH + border,
+			 border + LineCount * GIF_FONT_HEIGHT + border, fg);
+}

3rdparty/QtGifImage/include/3rdparty/giflib/gif_hash.c

@@ -0,0 +1,121 @@
+/*****************************************************************************
+
+gif_hash.c -- module to support the following operations:
+
+1. InitHashTable - initialize hash table.
+2. ClearHashTable - clear the hash table to an empty state.
+2. InsertHashTable - insert one item into data structure.
+3. ExistsHashTable - test if item exists in data structure.
+
+This module is used to hash the GIF codes during encoding.
+
+*****************************************************************************/
+
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <giflib/gif_hash.h>
+
+/* #define  DEBUG_HIT_RATE    Debug number of misses per hash Insert/Exists. */
+
+#ifdef    DEBUG_HIT_RATE
+static long NumberOfTests = 0,
+		NumberOfMisses = 0;
+#endif    /* DEBUG_HIT_RATE */
+
+static int KeyItem(uint32_t Item);
+
+/******************************************************************************
+ Initialize HashTable - allocate the memory needed and clear it.	      *
+******************************************************************************/
+GifHashTableType *_InitHashTable(void) {
+  GifHashTableType *HashTable;
+
+  if ((HashTable = (GifHashTableType *)malloc(sizeof(GifHashTableType)))
+	  == NULL)
+	return NULL;
+
+  _ClearHashTable(HashTable);
+
+  return HashTable;
+}
+
+/******************************************************************************
+ Routine to clear the HashTable to an empty state.			      *
+ This part is a little machine depended. Use the commented part otherwise.   *
+******************************************************************************/
+void _ClearHashTable(GifHashTableType *HashTable) {
+  memset(HashTable->HTable, 0xFF, HT_SIZE * sizeof(uint32_t));
+}
+
+/******************************************************************************
+ Routine to insert a new Item into the HashTable. The data is assumed to be  *
+ new one.								      *
+******************************************************************************/
+void _InsertHashTable(GifHashTableType *HashTable, uint32_t Key, int Code) {
+  int HKey = KeyItem(Key);
+  uint32_t *HTable = HashTable->HTable;
+
+#ifdef DEBUG_HIT_RATE
+  NumberOfTests++;
+	NumberOfMisses++;
+#endif /* DEBUG_HIT_RATE */
+
+  while (HT_GET_KEY(HTable[HKey]) != 0xFFFFFL) {
+#ifdef DEBUG_HIT_RATE
+	NumberOfMisses++;
+#endif /* DEBUG_HIT_RATE */
+	HKey = (HKey + 1) & HT_KEY_MASK;
+  }
+  HTable[HKey] = HT_PUT_KEY(Key) | HT_PUT_CODE(Code);
+}
+
+/******************************************************************************
+ Routine to test if given Key exists in HashTable and if so returns its code *
+ Returns the Code if key was found, -1 if not.				      *
+******************************************************************************/
+int _ExistsHashTable(GifHashTableType *HashTable, uint32_t Key) {
+  int HKey = KeyItem(Key);
+  uint32_t *HTable = HashTable->HTable, HTKey;
+
+#ifdef DEBUG_HIT_RATE
+  NumberOfTests++;
+	NumberOfMisses++;
+#endif /* DEBUG_HIT_RATE */
+
+  while ((HTKey = HT_GET_KEY(HTable[HKey])) != 0xFFFFFL) {
+#ifdef DEBUG_HIT_RATE
+	NumberOfMisses++;
+#endif /* DEBUG_HIT_RATE */
+	if (Key == HTKey)
+	  return HT_GET_CODE(HTable[HKey]);
+	HKey = (HKey + 1) & HT_KEY_MASK;
+  }
+
+  return -1;
+}
+
+/******************************************************************************
+ Routine to generate an HKey for the hashtable out of the given unique key.  *
+ The given Key is assumed to be 20 bits as follows: lower 8 bits are the     *
+ new postfix character, while the upper 12 bits are the prefix code.	      *
+ Because the average hit ratio is only 2 (2 hash references per entry),      *
+ evaluating more complex keys (such as twin prime keys) does not worth it!   *
+******************************************************************************/
+static int KeyItem(uint32_t Item) {
+  return (int)(((Item >> 12) ^ Item) & HT_KEY_MASK);
+}
+
+#ifdef    DEBUG_HIT_RATE
+/******************************************************************************
+ Debugging routine to print the hit ratio - number of times the hash table   *
+ was tested per operation. This routine was used to test the KeyItem routine *
+******************************************************************************/
+void HashTablePrintHitRatio(void)
+{
+	printf("Hash Table Hit Ratio is %ld/%ld = %ld%%.\n",
+	NumberOfMisses, NumberOfTests,
+	NumberOfMisses * 100 / NumberOfTests);
+}
+#endif    /* DEBUG_HIT_RATE */

3rdparty/QtGifImage/include/3rdparty/giflib/gif_hash.h

@@ -0,0 +1,39 @@
+/******************************************************************************
+
+gif_hash.h - magfic constants and declarations for GIF LZW
+
+******************************************************************************/
+
+#ifndef GIF_LIB_GIF_HASH_H_
+#define GIF_LIB_GIF_HASH_H_
+
+#ifndef _WIN32
+#include <unistd.h>
+#endif
+#include <stdint.h>
+
+#define HT_SIZE 8192       /* 12bits = 4096 or twice as big! */
+#define HT_KEY_MASK 0x1FFF /* 13bits keys */
+#define HT_KEY_NUM_BITS 13 /* 13bits keys */
+#define HT_MAX_KEY 8191    /* 13bits - 1, maximal code possible */
+#define HT_MAX_CODE 4095   /* Biggest code possible in 12 bits. */
+
+/* The 32 bits of the long are divided into two parts for the key & code:   */
+/* 1. The code is 12 bits as our compression algorithm is limited to 12bits */
+/* 2. The key is 12 bits Prefix code + 8 bit new char or 20 bits.	    */
+/* The key is the upper 20 bits.  The code is the lower 12. */
+#define HT_GET_KEY(l) (l >> 12)
+#define HT_GET_CODE(l) (l & 0x0FFF)
+#define HT_PUT_KEY(l) (l << 12)
+#define HT_PUT_CODE(l) (l & 0x0FFF)
+
+typedef struct GifHashTableType {
+  uint32_t HTable[HT_SIZE];
+} GifHashTableType;
+
+GifHashTableType *_InitHashTable(void);
+void _ClearHashTable(GifHashTableType *HashTable);
+void _InsertHashTable(GifHashTableType *HashTable, uint32_t Key, int Code);
+int _ExistsHashTable(GifHashTableType *HashTable, uint32_t Key);
+
+#endif // GIF_LIB_GIF_HASH_H_

3rdparty/QtGifImage/include/3rdparty/giflib/gif_lib.h

@@ -0,0 +1,319 @@
+/******************************************************************************
+ 
+gif_lib.h - service library for decoding and encoding GIF images
+                                                                             
+*****************************************************************************/
+
+#ifndef GIF_LIB_GIF_LIB_H_
+#define GIF_LIB_GIF_LIB_H_ 1
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#define GIFLIB_MAJOR 5
+#define GIFLIB_MINOR 0
+#define GIFLIB_RELEASE 5
+
+#define GIF_ERROR   0
+#define GIF_OK      1
+
+#include <stddef.h>
+
+#define BOOL int
+#define TRUE 1
+#define FALSE 0
+
+//#ifdef _MSC_VER
+//#define BOOL int
+//#define TRUE 1
+//#define FALSE 0
+//#else
+//#include <stdbool.h>
+//#define BOOL int
+//#define TRUE 1
+//#define FALSE 0
+//#endif
+
+#define GIF_STAMP "GIFVER"          /* First chars in file - GIF stamp.  */
+#define GIF_STAMP_LEN sizeof(GIF_STAMP) - 1
+#define GIF_VERSION_POS 3           /* Version first character in stamp. */
+#define GIF87_STAMP "GIF87a"        /* First chars in file - GIF stamp.  */
+#define GIF89_STAMP "GIF89a"        /* First chars in file - GIF stamp.  */
+
+typedef unsigned char GifPixelType;
+typedef unsigned char *GifRowType;
+typedef unsigned char GifByteType;
+typedef unsigned int GifPrefixType;
+typedef int GifWord;
+
+typedef struct GifColorType {
+  GifByteType Red, Green, Blue;
+} GifColorType;
+
+typedef struct ColorMapObject {
+  int ColorCount;
+  int BitsPerPixel;
+  BOOL SortFlag;
+  GifColorType *Colors;    /* on malloc(3) heap */
+} ColorMapObject;
+
+typedef struct GifImageDesc {
+  GifWord Left, Top, Width, Height;   /* Current image dimensions. */
+  BOOL Interlace;                     /* Sequential/Interlaced lines. */
+  ColorMapObject *ColorMap;           /* The local color map */
+} GifImageDesc;
+
+typedef struct ExtensionBlock {
+  int ByteCount;
+  GifByteType *Bytes; /* on malloc(3) heap */
+  int Function;       /* The block function code */
+#define CONTINUE_EXT_FUNC_CODE    0x00    /* continuation subblock */
+#define COMMENT_EXT_FUNC_CODE     0xfe    /* comment */
+#define GRAPHICS_EXT_FUNC_CODE    0xf9    /* graphics control (GIF89) */
+#define PLAINTEXT_EXT_FUNC_CODE   0x01    /* plaintext */
+#define APPLICATION_EXT_FUNC_CODE 0xff    /* application block */
+} ExtensionBlock;
+
+typedef struct SavedImage {
+  GifImageDesc ImageDesc;
+  GifByteType *RasterBits;         /* on malloc(3) heap */
+  int ExtensionBlockCount;         /* Count of extensions before image */
+  ExtensionBlock *ExtensionBlocks; /* Extensions before image */
+} SavedImage;
+
+typedef struct GifFileType {
+  GifWord SWidth, SHeight;         /* Size of virtual canvas */
+  GifWord SColorResolution;        /* How many colors can we generate? */
+  GifWord SBackGroundColor;        /* Background color for virtual canvas */
+  GifByteType AspectByte;         /* Used to compute pixel aspect ratio */
+  ColorMapObject *SColorMap;       /* Global colormap, NULL if nonexistent. */
+  int ImageCount;                  /* Number of current image (both APIs) */
+  GifImageDesc Image;              /* Current image (low-level API) */
+  SavedImage *SavedImages;         /* Image sequence (high-level API) */
+  int ExtensionBlockCount;         /* Count extensions past last image */
+  ExtensionBlock *ExtensionBlocks; /* Extensions past last image */
+  int Error;                 /* Last error condition reported */
+  void *UserData;                  /* hook to attach user data (TVT) */
+  void *Private;                   /* Don't mess with this! */
+} GifFileType;
+
+#define GIF_ASPECT_RATIO(n)    ((n)+15.0/64.0)
+
+typedef enum {
+  UNDEFINED_RECORD_TYPE,
+  SCREEN_DESC_RECORD_TYPE,
+  IMAGE_DESC_RECORD_TYPE, /* Begin with ',' */
+  EXTENSION_RECORD_TYPE,  /* Begin with '!' */
+  TERMINATE_RECORD_TYPE   /* Begin with ';' */
+} GifRecordType;
+
+/* func type to read gif data from arbitrary sources (TVT) */
+typedef int (*InputFunc)(GifFileType *, GifByteType *, int);
+
+/* func type to write gif data to arbitrary targets.
+ * Returns count of bytes written. (MRB)
+ */
+typedef int (*OutputFunc)(GifFileType *, const GifByteType *, int);
+
+/******************************************************************************
+ GIF89 structures
+******************************************************************************/
+
+#define DISPOSAL_UNSPECIFIED      0       /* No disposal specified. */
+#define DISPOSE_DO_NOT            1       /* Leave image in place */
+#define DISPOSE_BACKGROUND        2       /* Set area too background color */
+#define DISPOSE_PREVIOUS          3       /* Restore to previous content */
+#define NO_TRANSPARENT_COLOR    (-1)
+
+typedef struct GraphicsControlBlock {
+  int DisposalMode;
+  BOOL UserInputFlag;      /* User confirmation required before disposal */
+  int DelayTime;           /* pre-display delay in 0.01sec units */
+  int TransparentColor;    /* Palette index for transparency, -1 if none */
+} GraphicsControlBlock;
+
+/******************************************************************************
+ GIF encoding routines
+******************************************************************************/
+
+/* Main entry points */
+GifFileType *EGifOpenFileName(const char *GifFileName,
+							  BOOL GifTestExistence, int *Error);
+GifFileType *EGifOpenFileHandle(int GifFileHandle, int *Error);
+GifFileType *EGifOpen(void *userPtr, OutputFunc writeFunc, int *Error);
+int EGifSpew(GifFileType *GifFile);
+char *EGifGetGifVersion(GifFileType *GifFile); /* new in 5.x */
+int EGifCloseFile(GifFileType *GifFile);
+int EGifCloseFile1(GifFileType *GifFile);
+
+#define E_GIF_ERR_OPEN_FAILED    1    /* And EGif possible errors. */
+#define E_GIF_ERR_WRITE_FAILED   2
+#define E_GIF_ERR_HAS_SCRN_DSCR  3
+#define E_GIF_ERR_HAS_IMAG_DSCR  4
+#define E_GIF_ERR_NO_COLOR_MAP   5
+#define E_GIF_ERR_DATA_TOO_BIG   6
+#define E_GIF_ERR_NOT_ENOUGH_MEM 7
+#define E_GIF_ERR_DISK_IS_FULL   8
+#define E_GIF_ERR_CLOSE_FAILED   9
+#define E_GIF_ERR_NOT_WRITEABLE  10
+
+/* These are legacy.  You probably do not want to call them directly */
+int EGifPutScreenDesc(GifFileType *GifFile,
+					  int GifWidth, int GifHeight,
+					  int GifColorRes, int GifBackGround,
+					  const ColorMapObject *GifColorMap);
+int EGifPutImageDesc(GifFileType *GifFile,
+					 int GifLeft, int GifTop,
+					 int GifWidth, int GifHeight,
+					 BOOL GifInterlace,
+					 const ColorMapObject *GifColorMap);
+void EGifSetGifVersion(GifFileType *GifFile, BOOL gif89);
+int EGifPutLine(GifFileType *GifFile, GifPixelType *GifLine,
+				int GifLineLen);
+int EGifPutPixel(GifFileType *GifFile, GifPixelType GifPixel);
+int EGifPutComment(GifFileType *GifFile, const char *GifComment);
+int EGifPutExtensionLeader(GifFileType *GifFile, int GifExtCode);
+int EGifPutExtensionBlock(GifFileType *GifFile,
+						  int GifExtLen, const void *GifExtension);
+int EGifPutExtensionTrailer(GifFileType *GifFile);
+int EGifPutExtension(GifFileType *GifFile, int GifExtCode,
+					 int GifExtLen,
+					 const void *GifExtension);
+int EGifPutCode(GifFileType *GifFile, const GifByteType *GifCodeBlock);
+int EGifPutCodeNext(GifFileType *GifFile,
+					const GifByteType *GifCodeBlock);
+
+/******************************************************************************
+ GIF decoding routines
+******************************************************************************/
+
+/* Main entry points */
+GifFileType *DGifOpenFileName(const char *GifFileName, int *Error);
+GifFileType *DGifOpenFileHandle(int GifFileHandle, int *Error);
+int DGifSlurp(GifFileType *GifFile);
+GifFileType *DGifOpen(void *userPtr, InputFunc readFunc, int *Error);    /* new one (TVT) */
+int DGifCloseFile(GifFileType *GifFile);
+
+#define D_GIF_ERR_OPEN_FAILED    101    /* And DGif possible errors. */
+#define D_GIF_ERR_READ_FAILED    102
+#define D_GIF_ERR_NOT_GIF_FILE   103
+#define D_GIF_ERR_NO_SCRN_DSCR   104
+#define D_GIF_ERR_NO_IMAG_DSCR   105
+#define D_GIF_ERR_NO_COLOR_MAP   106
+#define D_GIF_ERR_WRONG_RECORD   107
+#define D_GIF_ERR_DATA_TOO_BIG   108
+#define D_GIF_ERR_NOT_ENOUGH_MEM 109
+#define D_GIF_ERR_CLOSE_FAILED   110
+#define D_GIF_ERR_NOT_READABLE   111
+#define D_GIF_ERR_IMAGE_DEFECT   112
+#define D_GIF_ERR_EOF_TOO_SOON   113
+
+/* These are legacy.  You probably do not want to call them directly */
+int DGifGetScreenDesc(GifFileType *GifFile);
+int DGifGetRecordType(GifFileType *GifFile, GifRecordType *GifType);
+int DGifGetImageDesc(GifFileType *GifFile);
+int DGifGetLine(GifFileType *GifFile, GifPixelType *GifLine, int GifLineLen);
+int DGifGetPixel(GifFileType *GifFile, GifPixelType GifPixel);
+int DGifGetComment(GifFileType *GifFile, char *GifComment);
+int DGifGetExtension(GifFileType *GifFile, int *GifExtCode,
+					 GifByteType **GifExtension);
+int DGifGetExtensionNext(GifFileType *GifFile, GifByteType **GifExtension);
+int DGifGetCode(GifFileType *GifFile, int *GifCodeSize,
+				GifByteType **GifCodeBlock);
+int DGifGetCodeNext(GifFileType *GifFile, GifByteType **GifCodeBlock);
+int DGifGetLZCodes(GifFileType *GifFile, int *GifCode);
+
+/******************************************************************************
+ Color table quantization (deprecated)
+******************************************************************************/
+int GifQuantizeBuffer(unsigned int Width, unsigned int Height,
+					  int *ColorMapSize, const GifByteType *RedInput,
+					  const GifByteType *GreenInput, const GifByteType *BlueInput,
+					  GifByteType *OutputBuffer,
+					  GifColorType *OutputColorMap);
+
+/******************************************************************************
+ Error handling and reporting.
+******************************************************************************/
+extern char *GifErrorString(int ErrorCode);     /* new in 2012 - ESR */
+
+/*****************************************************************************
+ Everything below this point is new after version 1.2, supporting `slurp
+ mode' for doing I/O in two big belts with all the image-bashing in core.
+******************************************************************************/
+
+/******************************************************************************
+ Color map handling from gif_alloc.c
+******************************************************************************/
+
+extern ColorMapObject *GifMakeMapObject(int ColorCount,
+										const GifColorType *ColorMap);
+extern void GifFreeMapObject(ColorMapObject *Object);
+extern ColorMapObject *GifUnionColorMap(const ColorMapObject *ColorIn1,
+										const ColorMapObject *ColorIn2,
+										GifPixelType ColorTransIn2[]);
+extern int GifBitSize(int n);
+
+/******************************************************************************
+ Support for the in-core structures allocation (slurp mode).
+******************************************************************************/
+
+extern void GifApplyTranslation(SavedImage *Image, const GifPixelType Translation[]);
+extern int GifAddExtensionBlock(int *ExtensionBlock_Count,
+								ExtensionBlock **ExtensionBlocks,
+								int Function,
+								unsigned int Len, unsigned char ExtData[]);
+extern void GifFreeExtensions(int *ExtensionBlock_Count,
+							  ExtensionBlock **ExtensionBlocks);
+extern void FreeLastSavedImage(GifFileType *GifFile);
+extern SavedImage *GifMakeSavedImage(GifFileType *GifFile,
+									 const SavedImage *CopyFrom);
+extern void GifFreeSavedImages(GifFileType *GifFile);
+
+/******************************************************************************
+ 5.x functions for GIF89 graphics control blocks
+******************************************************************************/
+
+int DGifExtensionToGCB(size_t GifExtensionLength,
+					   const GifByteType *GifExtension,
+					   GraphicsControlBlock *GCB);
+size_t EGifGCBToExtension(const GraphicsControlBlock *GCB,
+						  GifByteType *GifExtension);
+
+int DGifSavedExtensionToGCB(GifFileType *GifFile,
+							int ImageIndex,
+							GraphicsControlBlock *GCB);
+int EGifGCBToSavedExtension(const GraphicsControlBlock *GCB,
+							GifFileType *GifFile,
+							int ImageIndex);
+
+/******************************************************************************
+ The library's internal utility font
+******************************************************************************/
+
+#define GIF_FONT_WIDTH  8
+#define GIF_FONT_HEIGHT 8
+extern const unsigned char GifAsciiTable8x8[][GIF_FONT_WIDTH];
+
+extern void GifDrawText8x8(SavedImage *Image,
+						   int x, int y,
+						   const char *legend, int color);
+
+extern void GifDrawBox(SavedImage *Image,
+					   int x, int y,
+					   int w, int d, int color);
+
+extern void GifDrawRectangle(SavedImage *Image,
+							 int x, int y,
+							 int w, int d, int color);
+
+extern void GifDrawBoxedText8x8(SavedImage *Image,
+								int x, int y,
+								const char *legend,
+								int border, int bg, int fg);
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+#endif // GIF_LIB_GIF_LIB_H_

3rdparty/QtGifImage/include/3rdparty/giflib/gif_lib_private.h

@@ -0,0 +1,59 @@
+/****************************************************************************
+
+gif_lib_private.h - internal giflib routines and structures
+
+****************************************************************************/
+
+#ifndef GIF_LIB_GIF_LIB_PRIVATE_H_
+#define GIF_LIB_GIF_LIB_PRIVATE_H_
+
+#include <stdio.h>
+
+#include <giflib/gif_lib.h>
+#include <giflib/gif_hash.h>
+
+#define EXTENSION_INTRODUCER 0x21
+#define DESCRIPTOR_INTRODUCER 0x2c
+#define TERMINATOR_INTRODUCER 0x3b
+
+#define LZ_MAX_CODE 4095 /* Biggest code possible in 12 bits. */
+#define LZ_BITS 12
+
+#define FLUSH_OUTPUT 4096 /* Impossible code, to signal flush. */
+#define FIRST_CODE 4097   /* Impossible code, to signal first. */
+#define NO_SUCH_CODE 4098 /* Impossible code, to signal empty. */
+
+#define FILE_STATE_WRITE 0x01
+#define FILE_STATE_SCREEN 0x02
+#define FILE_STATE_IMAGE 0x04
+#define FILE_STATE_READ 0x08
+
+#define IS_READABLE(Private) (Private->FileState & FILE_STATE_READ)
+#define IS_WRITEABLE(Private) (Private->FileState & FILE_STATE_WRITE)
+
+typedef struct GifFilePrivateType {
+  GifWord FileState, FileHandle, /* Where all this data goes to! */
+  BitsPerPixel, /* Bits per pixel (Codes uses at least this + 1). */
+  ClearCode,    /* The CLEAR LZ code. */
+  EOFCode,      /* The EOF LZ code. */
+  RunningCode,  /* The next code algorithm can generate. */
+  RunningBits,  /* The number of bits required to represent RunningCode. */
+  MaxCode1,     /* 1 bigger than max. possible code, in RunningBits bits. */
+  LastCode,     /* The code before the current code. */
+  CrntCode,     /* Current algorithm code. */
+  StackPtr,     /* For character stack (see below). */
+  CrntShiftState;                  /* Number of bits in CrntShiftDWord. */
+  unsigned long CrntShiftDWord;        /* For bytes decomposition into codes. */
+  unsigned long PixelCount;            /* Number of pixels in image. */
+  FILE *File;                          /* File as stream. */
+  InputFunc Read;                      /* function to read gif input (TVT) */
+  OutputFunc Write;                    /* function to write gif output (MRB) */
+  GifByteType Buf[256];                /* Compressed input is buffered here. */
+  GifByteType Stack[LZ_MAX_CODE];      /* Decoded pixels are stacked here. */
+  GifByteType Suffix[LZ_MAX_CODE + 1]; /* So we can trace the codes. */
+  GifPrefixType Prefix[LZ_MAX_CODE + 1];
+  GifHashTableType *HashTable;
+  BOOL gif89;
+} GifFilePrivateType;
+
+#endif // GIF_LIB_GIF_LIB_PRIVATE_H_

3rdparty/QtGifImage/include/3rdparty/giflib/gifalloc.c

@@ -0,0 +1,393 @@
+/*****************************************************************************
+
+ GIF construction tools
+
+****************************************************************************/
+
+#include <stdlib.h>
+#include <string.h>
+
+#include <giflib/gif_lib.h>
+
+#define MAX(x, y)    (((x) > (y)) ? (x) : (y))
+
+/******************************************************************************
+ Miscellaneous utility functions
+******************************************************************************/
+
+/* return smallest bitfield size n will fit in */
+int GifBitSize(int n) {
+  register int i;
+
+  for (i = 1; i <= 8; i++)
+	if ((1 << i) >= n)
+	  break;
+  return (i);
+}
+
+/******************************************************************************
+  Color map object functions
+******************************************************************************/
+
+/*
+ * Allocate a color map of given size; initialize with contents of
+ * ColorMap if that pointer is non-NULL.
+ */
+ColorMapObject *
+GifMakeMapObject(int ColorCount, const GifColorType *ColorMap) {
+  ColorMapObject *Object;
+
+  /*** FIXME: Our ColorCount has to be a power of two.  Is it necessary to
+   * make the user know that or should we automatically round up instead? */
+  if (ColorCount != (1 << GifBitSize(ColorCount))) {
+	return NULL;
+  }
+
+  Object = (ColorMapObject *)malloc(sizeof(ColorMapObject));
+  if (Object == NULL) {
+	return NULL;
+  }
+
+  Object->Colors = (GifColorType *)calloc(ColorCount, sizeof(GifColorType));
+  if (Object->Colors == NULL) {
+	free(Object);
+	return NULL;
+  }
+
+  Object->ColorCount = ColorCount;
+  Object->BitsPerPixel = GifBitSize(ColorCount);
+
+  if (ColorMap != NULL) {
+	memcpy((char *)Object->Colors,
+		   (char *)ColorMap, ColorCount * sizeof(GifColorType));
+  }
+
+  return (Object);
+}
+
+/*******************************************************************************
+Free a color map object
+*******************************************************************************/
+void
+GifFreeMapObject(ColorMapObject *Object) {
+  if (Object != NULL && Object->Colors != NULL) {
+	free(Object->Colors);
+  }
+  if (Object) {
+	free(Object);
+  }
+}
+
+#ifdef DEBUG
+void
+DumpColorMap(ColorMapObject *Object,
+			 FILE * fp)
+{
+	if (Object != NULL) {
+		int i, j, Len = Object->ColorCount;
+
+		for (i = 0; i < Len; i += 4) {
+			for (j = 0; j < 4 && j < Len; j++) {
+				(void)fprintf(fp, "%3d: %02x %02x %02x   ", i + j,
+				  Object->Colors[i + j].Red,
+				  Object->Colors[i + j].Green,
+				  Object->Colors[i + j].Blue);
+			}
+			(void)fprintf(fp, "\n");
+		}
+	}
+}
+#endif /* DEBUG */
+
+/*******************************************************************************
+ Compute the union of two given color maps and return it.  If result can't
+ fit into 256 colors, NULL is returned, the allocated union otherwise.
+ ColorIn1 is copied as is to ColorUnion, while colors from ColorIn2 are
+ copied iff they didn't exist before.  ColorTransIn2 maps the old
+ ColorIn2 into the ColorUnion color map table./
+*******************************************************************************/
+ColorMapObject *
+GifUnionColorMap(const ColorMapObject *ColorIn1,
+				 const ColorMapObject *ColorIn2,
+				 GifPixelType ColorTransIn2[]) {
+  int i, j, CrntSlot, RoundUpTo, NewGifBitSize;
+  ColorMapObject *ColorUnion;
+
+  /*
+   * We don't worry about duplicates within either color map; if
+   * the caller wants to resolve those, he can perform unions
+   * with an empty color map.
+   */
+
+  /* Allocate table which will hold the result for sure. */
+  ColorUnion = GifMakeMapObject(MAX(ColorIn1->ColorCount,
+									ColorIn2->ColorCount) * 2, NULL);
+
+  if (ColorUnion == NULL)
+	return (NULL);
+
+  /*
+   * Copy ColorIn1 to ColorUnion.
+   */
+  for (i = 0; i < ColorIn1->ColorCount; i++)
+	ColorUnion->Colors[i] = ColorIn1->Colors[i];
+  CrntSlot = ColorIn1->ColorCount;
+
+  /*
+   * Potentially obnoxious hack:
+   *
+   * Back CrntSlot down past all contiguous {0, 0, 0} slots at the end
+   * of table 1.  This is very useful if your display is limited to
+   * 16 colors.
+   */
+  while (ColorIn1->Colors[CrntSlot - 1].Red == 0
+	  && ColorIn1->Colors[CrntSlot - 1].Green == 0
+	  && ColorIn1->Colors[CrntSlot - 1].Blue == 0)
+	CrntSlot--;
+
+  /* Copy ColorIn2 to ColorUnion (use old colors if they exist): */
+  for (i = 0; i < ColorIn2->ColorCount && CrntSlot <= 256; i++) {
+	/* Let's see if this color already exists: */
+	for (j = 0; j < ColorIn1->ColorCount; j++)
+	  if (memcmp(&ColorIn1->Colors[j], &ColorIn2->Colors[i],
+				 sizeof(GifColorType)) == 0)
+		break;
+
+	if (j < ColorIn1->ColorCount)
+	  ColorTransIn2[i] = j;    /* color exists in Color1 */
+	else {
+	  /* Color is new - copy it to a new slot: */
+	  ColorUnion->Colors[CrntSlot] = ColorIn2->Colors[i];
+	  ColorTransIn2[i] = CrntSlot++;
+	}
+  }
+
+  if (CrntSlot > 256) {
+	GifFreeMapObject(ColorUnion);
+	return NULL;
+  }
+
+  NewGifBitSize = GifBitSize(CrntSlot);
+  RoundUpTo = (1 << NewGifBitSize);
+
+  if (RoundUpTo != ColorUnion->ColorCount) {
+	register GifColorType *Map = ColorUnion->Colors;
+
+	/*
+	 * Zero out slots up to next power of 2.
+	 * We know these slots exist because of the way ColorUnion's
+	 * start dimension was computed.
+	 */
+	for (j = CrntSlot; j < RoundUpTo; j++)
+	  Map[j].Red = Map[j].Green = Map[j].Blue = 0;
+
+	/* perhaps we can shrink the map? */
+	if (RoundUpTo < ColorUnion->ColorCount)
+	  ColorUnion->Colors = (GifColorType *)realloc(Map,
+												   sizeof(GifColorType) * RoundUpTo);
+  }
+
+  ColorUnion->ColorCount = RoundUpTo;
+  ColorUnion->BitsPerPixel = NewGifBitSize;
+
+  return (ColorUnion);
+}
+
+/*******************************************************************************
+ Apply a given color translation to the raster bits of an image
+*******************************************************************************/
+void
+GifApplyTranslation(SavedImage *Image, const GifPixelType Translation[]) {
+  register int i;
+  register int RasterSize = Image->ImageDesc.Height * Image->ImageDesc.Width;
+
+  for (i = 0; i < RasterSize; i++)
+	Image->RasterBits[i] = Translation[Image->RasterBits[i]];
+}
+
+/******************************************************************************
+ Extension record functions
+******************************************************************************/
+int
+GifAddExtensionBlock(int *ExtensionBlockCount,
+					 ExtensionBlock **ExtensionBlocks,
+					 int Function,
+					 unsigned int Len,
+					 unsigned char ExtData[]) {
+  ExtensionBlock *ep;
+
+  if (*ExtensionBlocks == NULL)
+	*ExtensionBlocks = (ExtensionBlock *)malloc(sizeof(ExtensionBlock));
+  else
+	*ExtensionBlocks = (ExtensionBlock *)realloc(*ExtensionBlocks,
+												 sizeof(ExtensionBlock) *
+													 (*ExtensionBlockCount + 1));
+
+  if (*ExtensionBlocks == NULL)
+	return (GIF_ERROR);
+
+  ep = &(*ExtensionBlocks)[(*ExtensionBlockCount)++];
+
+  ep->Function = Function;
+  ep->ByteCount = (int)(Len);
+  ep->Bytes = (GifByteType *)malloc(ep->ByteCount);
+  if (ep->Bytes == NULL)
+	return (GIF_ERROR);
+
+  if (ExtData != NULL) {
+	memcpy(ep->Bytes, ExtData, Len);
+  }
+
+  return (GIF_OK);
+}
+
+void
+GifFreeExtensions(int *ExtensionBlockCount,
+				  ExtensionBlock **ExtensionBlocks) {
+  ExtensionBlock *ep;
+
+  if (*ExtensionBlocks == NULL)
+	return;
+
+  for (ep = *ExtensionBlocks;
+	   ep < (*ExtensionBlocks + *ExtensionBlockCount);
+	   ep++) {
+	free((char *)ep->Bytes);
+  }
+
+  free((char *)*ExtensionBlocks);
+  *ExtensionBlocks = NULL;
+  *ExtensionBlockCount = 0;
+}
+
+/******************************************************************************
+ Image block allocation functions
+******************************************************************************/
+
+/* Private Function:
+ * Frees the last image in the GifFile->SavedImages array
+ */
+void
+FreeLastSavedImage(GifFileType *GifFile) {
+  SavedImage *sp;
+
+  if ((GifFile == NULL) || (GifFile->SavedImages == NULL))
+	return;
+
+  /* Remove one SavedImage from the GifFile */
+  GifFile->ImageCount--;
+  sp = &GifFile->SavedImages[GifFile->ImageCount];
+
+  /* Deallocate its Colormap */
+  if (sp->ImageDesc.ColorMap != NULL) {
+	GifFreeMapObject(sp->ImageDesc.ColorMap);
+	sp->ImageDesc.ColorMap = NULL;
+  }
+
+  /* Deallocate the image data */
+  if (sp != NULL && sp->RasterBits != NULL)
+	free((char *)sp->RasterBits);
+
+  /* Deallocate any extensions */
+  GifFreeExtensions(&sp->ExtensionBlockCount, &sp->ExtensionBlocks);
+
+  /*** FIXME: We could realloc the GifFile->SavedImages structure but is
+   * there a point to it? Saves some memory but we'd have to do it every
+   * time.  If this is used in GifFreeSavedImages then it would be inefficient
+   * (The whole array is going to be deallocated.)  If we just use it when
+   * we want to free the last Image it's convenient to do it here.
+   */
+}
+
+/*
+ * Append an image block to the SavedImages array
+ */
+SavedImage *
+GifMakeSavedImage(GifFileType *GifFile, const SavedImage *CopyFrom) {
+  if (GifFile->SavedImages == NULL)
+	GifFile->SavedImages = (SavedImage *)malloc(sizeof(SavedImage));
+  else
+	GifFile->SavedImages = (SavedImage *)realloc(GifFile->SavedImages,
+												 sizeof(SavedImage) * (GifFile->ImageCount + 1));
+
+  if (GifFile->SavedImages == NULL)
+	return NULL;
+  else {
+	SavedImage *sp = &GifFile->SavedImages[GifFile->ImageCount++];
+	memset((char *)sp, '\0', sizeof(SavedImage));
+
+	if (CopyFrom != NULL) {
+	  memcpy((char *)sp, CopyFrom, sizeof(SavedImage));
+
+	  /*
+	   * Make our own allocated copies of the heap fields in the
+	   * copied record.  This guards against potential aliasing
+	   * problems.
+	   */
+
+	  /* first, the local color map */
+	  if (sp->ImageDesc.ColorMap != NULL) {
+		sp->ImageDesc.ColorMap = GifMakeMapObject(
+			CopyFrom->ImageDesc.ColorMap->ColorCount,
+			CopyFrom->ImageDesc.ColorMap->Colors);
+		if (sp->ImageDesc.ColorMap == NULL) {
+		  FreeLastSavedImage(GifFile);
+		  return NULL;
+		}
+	  }
+
+	  /* next, the raster */
+	  sp->RasterBits = (unsigned char *)malloc(sizeof(GifPixelType) *
+		  CopyFrom->ImageDesc.Height *
+		  CopyFrom->ImageDesc.Width);
+	  if (sp->RasterBits == NULL) {
+		FreeLastSavedImage(GifFile);
+		return NULL;
+	  }
+	  memcpy(sp->RasterBits, CopyFrom->RasterBits,
+			 sizeof(GifPixelType) * CopyFrom->ImageDesc.Height *
+				 CopyFrom->ImageDesc.Width);
+
+	  /* finally, the extension blocks */
+	  if (sp->ExtensionBlocks != NULL) {
+		sp->ExtensionBlocks = (ExtensionBlock *)malloc(
+			sizeof(ExtensionBlock) *
+				CopyFrom->ExtensionBlockCount);
+		if (sp->ExtensionBlocks == NULL) {
+		  FreeLastSavedImage(GifFile);
+		  return NULL;
+		}
+		memcpy(sp->ExtensionBlocks, CopyFrom->ExtensionBlocks,
+			   sizeof(ExtensionBlock) * CopyFrom->ExtensionBlockCount);
+	  }
+	}
+
+	return (sp);
+  }
+}
+
+void
+GifFreeSavedImages(GifFileType *GifFile) {
+  SavedImage *sp;
+
+  if ((GifFile == NULL) || (GifFile->SavedImages == NULL)) {
+	return;
+  }
+
+  for (sp = GifFile->SavedImages;
+	   sp < GifFile->SavedImages + GifFile->ImageCount; sp++) {
+	if (sp->ImageDesc.ColorMap != NULL) {
+	  GifFreeMapObject(sp->ImageDesc.ColorMap);
+	  sp->ImageDesc.ColorMap = NULL;
+	}
+
+	if (sp != NULL && sp->RasterBits != NULL) {
+	  free((char *)sp->RasterBits);
+	}
+
+	GifFreeExtensions(&sp->ExtensionBlockCount, &sp->ExtensionBlocks);
+  }
+
+  free((char *)GifFile->SavedImages);
+  GifFile->SavedImages = NULL;
+}

3rdparty/QtGifImage/include/3rdparty/giflib/quantize.c

@@ -0,0 +1,308 @@
+/*****************************************************************************
+
+ quantize.c - quantize a high resolution image into lower one
+
+ Based on: "Color Image Quantization for frame buffer Display", by
+ Paul Heckbert SIGGRAPH 1982 page 297-307.
+
+ This doesn't really belong in the core library, was undocumented,
+ and was removed in 4.2.  Then it turned out some client apps were
+ actually using it, so it was restored in 5.0.
+
+******************************************************************************/
+
+#include <stdlib.h>
+
+#include <giflib/gif_lib.h>
+
+#define ABS(x)    ((x) > 0 ? (x) : (-(x)))
+
+#define COLOR_ARRAY_SIZE 32768
+#define BITS_PER_PRIM_COLOR 5
+#define MAX_PRIM_COLOR      0x1f
+
+static int SortRGBAxis;
+
+typedef struct QuantizedColorType {
+  GifByteType RGB[3];
+  GifByteType NewColorIndex;
+  long Count;
+  struct QuantizedColorType *Pnext;
+} QuantizedColorType;
+
+typedef struct NewColorMapType {
+  GifByteType RGBMin[3], RGBWidth[3];
+  unsigned int NumEntries; /* # of QuantizedColorType in linked list below */
+  unsigned long Count; /* Total number of pixels in all the entries */
+  QuantizedColorType *QuantizedColors;
+} NewColorMapType;
+
+static int SubdivColorMap(NewColorMapType *NewColorSubdiv,
+						  unsigned int ColorMapSize,
+						  unsigned int *NewColorMapSize);
+static int SortCmpRtn(const void *Entry1, const void *Entry2);
+
+/******************************************************************************
+ Quantize high resolution image into lower one. Input image consists of a
+ 2D array for each of the RGB colors with size Width by Height. There is no
+ Color map for the input. Output is a quantized image with 2D array of
+ indexes into the output color map.
+   Note input image can be 24 bits at the most (8 for red/green/blue) and
+ the output has 256 colors at the most (256 entries in the color map.).
+ ColorMapSize specifies size of color map up to 256 and will be updated to
+ real size before returning.
+   Also non of the parameter are allocated by this routine.
+   This function returns GIF_OK if successful, GIF_ERROR otherwise.
+******************************************************************************/
+int
+GifQuantizeBuffer(unsigned int Width,
+				  unsigned int Height,
+				  int *ColorMapSize,
+				  const GifByteType *RedInput,
+				  const GifByteType *GreenInput,
+				  const GifByteType *BlueInput,
+				  GifByteType *OutputBuffer,
+				  GifColorType *OutputColorMap) {
+
+  unsigned int Index, NumOfEntries;
+  int i, j, MaxRGBError[3];
+  unsigned int NewColorMapSize;
+  long Red, Green, Blue;
+  NewColorMapType NewColorSubdiv[256];
+  QuantizedColorType *ColorArrayEntries, *QuantizedColor;
+
+  ColorArrayEntries = (QuantizedColorType *)malloc(
+	  sizeof(QuantizedColorType) * COLOR_ARRAY_SIZE);
+  if (ColorArrayEntries == NULL) {
+	return GIF_ERROR;
+  }
+
+  for (i = 0; i < COLOR_ARRAY_SIZE; i++) {
+	ColorArrayEntries[i].RGB[0] = i >> (2 * BITS_PER_PRIM_COLOR);
+	ColorArrayEntries[i].RGB[1] = (i >> BITS_PER_PRIM_COLOR) &
+		MAX_PRIM_COLOR;
+	ColorArrayEntries[i].RGB[2] = i & MAX_PRIM_COLOR;
+	ColorArrayEntries[i].Count = 0;
+  }
+
+  /* Sample the colors and their distribution: */
+  for (i = 0; i < (int)(Width * Height); i++) {
+	Index = ((RedInput[i] >> (8 - BITS_PER_PRIM_COLOR)) <<
+														(2 * BITS_PER_PRIM_COLOR)) +
+		((GreenInput[i] >> (8 - BITS_PER_PRIM_COLOR)) <<
+													  BITS_PER_PRIM_COLOR) +
+		(BlueInput[i] >> (8 - BITS_PER_PRIM_COLOR));
+	ColorArrayEntries[Index].Count++;
+  }
+
+  /* Put all the colors in the first entry of the color map, and call the
+   * recursive subdivision process.  */
+  for (i = 0; i < 256; i++) {
+	NewColorSubdiv[i].QuantizedColors = NULL;
+	NewColorSubdiv[i].Count = NewColorSubdiv[i].NumEntries = 0;
+	for (j = 0; j < 3; j++) {
+	  NewColorSubdiv[i].RGBMin[j] = 0;
+	  NewColorSubdiv[i].RGBWidth[j] = 255;
+	}
+  }
+
+  /* Find the non empty entries in the color table and chain them: */
+  for (i = 0; i < COLOR_ARRAY_SIZE; i++)
+	if (ColorArrayEntries[i].Count > 0)
+	  break;
+  QuantizedColor = NewColorSubdiv[0].QuantizedColors = &ColorArrayEntries[i];
+  NumOfEntries = 1;
+  while (++i < COLOR_ARRAY_SIZE)
+	if (ColorArrayEntries[i].Count > 0) {
+	  QuantizedColor->Pnext = &ColorArrayEntries[i];
+	  QuantizedColor = &ColorArrayEntries[i];
+	  NumOfEntries++;
+	}
+  QuantizedColor->Pnext = NULL;
+
+  NewColorSubdiv[0].NumEntries = NumOfEntries; /* Different sampled colors */
+  NewColorSubdiv[0].Count = ((long)Width) * Height; /* Pixels */
+  NewColorMapSize = 1;
+  if (SubdivColorMap(NewColorSubdiv, *ColorMapSize, &NewColorMapSize) !=
+	  GIF_OK) {
+	free((char *)ColorArrayEntries);
+	return GIF_ERROR;
+  }
+  if (NewColorMapSize < *ColorMapSize) {
+	/* And clear rest of color map: */
+	for (i = (int)(NewColorMapSize); i < *ColorMapSize; i++)
+	  OutputColorMap[i].Red = OutputColorMap[i].Green =
+	  OutputColorMap[i].Blue = 0;
+  }
+
+  /* Average the colors in each entry to be the color to be used in the
+   * output color map, and plug it into the output color map itself. */
+  for (i = 0; i < NewColorMapSize; i++) {
+	if ((j = (int)(NewColorSubdiv[i].NumEntries)) > 0) {
+	  QuantizedColor = NewColorSubdiv[i].QuantizedColors;
+	  Red = Green = Blue = 0;
+	  while (QuantizedColor) {
+		QuantizedColor->NewColorIndex = i;
+		Red += QuantizedColor->RGB[0];
+		Green += QuantizedColor->RGB[1];
+		Blue += QuantizedColor->RGB[2];
+		QuantizedColor = QuantizedColor->Pnext;
+	  }
+	  OutputColorMap[i].Red = (Red << (8 - BITS_PER_PRIM_COLOR)) / j;
+	  OutputColorMap[i].Green = (Green << (8 - BITS_PER_PRIM_COLOR)) / j;
+	  OutputColorMap[i].Blue = (Blue << (8 - BITS_PER_PRIM_COLOR)) / j;
+	}
+  }
+
+  /* Finally scan the input buffer again and put the mapped index in the
+   * output buffer.  */
+  MaxRGBError[0] = MaxRGBError[1] = MaxRGBError[2] = 0;
+  for (i = 0; i < (int)(Width * Height); i++) {
+	Index = ((RedInput[i] >> (8 - BITS_PER_PRIM_COLOR)) <<
+														(2 * BITS_PER_PRIM_COLOR)) +
+		((GreenInput[i] >> (8 - BITS_PER_PRIM_COLOR)) <<
+													  BITS_PER_PRIM_COLOR) +
+		(BlueInput[i] >> (8 - BITS_PER_PRIM_COLOR));
+	Index = ColorArrayEntries[Index].NewColorIndex;
+	OutputBuffer[i] = Index;
+	if (MaxRGBError[0] < ABS(OutputColorMap[Index].Red - RedInput[i]))
+	  MaxRGBError[0] = ABS(OutputColorMap[Index].Red - RedInput[i]);
+	if (MaxRGBError[1] < ABS(OutputColorMap[Index].Green - GreenInput[i]))
+	  MaxRGBError[1] = ABS(OutputColorMap[Index].Green - GreenInput[i]);
+	if (MaxRGBError[2] < ABS(OutputColorMap[Index].Blue - BlueInput[i]))
+	  MaxRGBError[2] = ABS(OutputColorMap[Index].Blue - BlueInput[i]);
+  }
+
+#ifdef DEBUG
+  fprintf(stderr,
+			"Quantization L(0) errors: Red = %d, Green = %d, Blue = %d.\n",
+			MaxRGBError[0], MaxRGBError[1], MaxRGBError[2]);
+#endif /* DEBUG */
+
+  free((char *)ColorArrayEntries);
+
+  *ColorMapSize = (int)(NewColorMapSize);
+
+  return GIF_OK;
+}
+
+/******************************************************************************
+ Routine to subdivide the RGB space recursively using median cut in each
+ axes alternatingly until ColorMapSize different cubes exists.
+ The biggest cube in one dimension is subdivide unless it has only one entry.
+ Returns GIF_ERROR if failed, otherwise GIF_OK.
+*******************************************************************************/
+static int
+SubdivColorMap(NewColorMapType *NewColorSubdiv,
+			   unsigned int ColorMapSize,
+			   unsigned int *NewColorMapSize) {
+
+  int MaxSize;
+  unsigned int i, j, Index = 0, NumEntries, MinColor, MaxColor;
+  long Sum, Count;
+  QuantizedColorType *QuantizedColor, **SortArray;
+
+  while (ColorMapSize > *NewColorMapSize) {
+	/* Find candidate for subdivision: */
+	MaxSize = -1;
+	for (i = 0; i < *NewColorMapSize; i++) {
+	  for (j = 0; j < 3; j++) {
+		if ((((int)NewColorSubdiv[i].RGBWidth[j]) > MaxSize) &&
+			(NewColorSubdiv[i].NumEntries > 1)) {
+		  MaxSize = NewColorSubdiv[i].RGBWidth[j];
+		  Index = i;
+		  SortRGBAxis = (int)(j);
+		}
+	  }
+	}
+
+	if (MaxSize == -1)
+	  return GIF_OK;
+
+	/* Split the entry Index into two along the axis SortRGBAxis: */
+
+	/* Sort all elements in that entry along the given axis and split at
+	 * the median.  */
+	SortArray = (QuantizedColorType **)malloc(
+		sizeof(QuantizedColorType *) *
+			NewColorSubdiv[Index].NumEntries);
+	if (SortArray == NULL)
+	  return GIF_ERROR;
+	for (j = 0, QuantizedColor = NewColorSubdiv[Index].QuantizedColors;
+		 j < NewColorSubdiv[Index].NumEntries && QuantizedColor != NULL;
+		 j++, QuantizedColor = QuantizedColor->Pnext)
+	  SortArray[j] = QuantizedColor;
+
+	qsort(SortArray, NewColorSubdiv[Index].NumEntries,
+		  sizeof(QuantizedColorType *), SortCmpRtn);
+
+	/* Relink the sorted list into one: */
+	for (j = 0; j < NewColorSubdiv[Index].NumEntries - 1; j++) {
+	  SortArray[j]->Pnext = SortArray[j + 1];
+	}
+
+	SortArray[NewColorSubdiv[Index].NumEntries - 1]->Pnext = NULL;
+	NewColorSubdiv[Index].QuantizedColors = QuantizedColor = SortArray[0];
+	free((char *)SortArray);
+
+	/* Now simply add the Counts until we have half of the Count: */
+	Sum = (long int)(NewColorSubdiv[Index].Count / 2 - QuantizedColor->Count);
+	NumEntries = 1;
+	Count = QuantizedColor->Count;
+	while (QuantizedColor->Pnext != NULL &&
+		(Sum -= QuantizedColor->Pnext->Count) >= 0 &&
+		QuantizedColor->Pnext->Pnext != NULL) {
+	  QuantizedColor = QuantizedColor->Pnext;
+	  NumEntries++;
+	  Count += QuantizedColor->Count;
+	}
+	/* Save the values of the last color of the first half, and first
+	 * of the second half, so we can update the Bounding Boxes later.
+	 * Also, as the colors are quantized and the BBoxes are full 0..255,
+	 * they need to be rescaled.
+	 */
+	MaxColor = QuantizedColor->RGB[SortRGBAxis]; /* Max. of first half */
+	/* coverity[var_deref_op] */
+	MinColor = QuantizedColor->Pnext->RGB[SortRGBAxis]; /* of second */
+	MaxColor <<= (8 - BITS_PER_PRIM_COLOR);
+	MinColor <<= (8 - BITS_PER_PRIM_COLOR);
+
+	/* Partition right here: */
+	NewColorSubdiv[*NewColorMapSize].QuantizedColors =
+		QuantizedColor->Pnext;
+	QuantizedColor->Pnext = NULL;
+	NewColorSubdiv[*NewColorMapSize].Count = Count;
+	NewColorSubdiv[Index].Count -= Count;
+	NewColorSubdiv[*NewColorMapSize].NumEntries =
+		NewColorSubdiv[Index].NumEntries - NumEntries;
+	NewColorSubdiv[Index].NumEntries = NumEntries;
+	for (j = 0; j < 3; j++) {
+	  NewColorSubdiv[*NewColorMapSize].RGBMin[j] =
+		  NewColorSubdiv[Index].RGBMin[j];
+	  NewColorSubdiv[*NewColorMapSize].RGBWidth[j] =
+		  NewColorSubdiv[Index].RGBWidth[j];
+	}
+	NewColorSubdiv[*NewColorMapSize].RGBWidth[SortRGBAxis] =
+		NewColorSubdiv[*NewColorMapSize].RGBMin[SortRGBAxis] +
+			NewColorSubdiv[*NewColorMapSize].RGBWidth[SortRGBAxis] - MinColor;
+	NewColorSubdiv[*NewColorMapSize].RGBMin[SortRGBAxis] = MinColor;
+
+	NewColorSubdiv[Index].RGBWidth[SortRGBAxis] =
+		MaxColor - NewColorSubdiv[Index].RGBMin[SortRGBAxis];
+
+	(*NewColorMapSize)++;
+  }
+
+  return GIF_OK;
+}
+
+/****************************************************************************
+ Routine called by qsort to compare two entries.
+*****************************************************************************/
+static int
+SortCmpRtn(const void *Entry1,
+		   const void *Entry2) {
+
+  return (*((QuantizedColorType **)Entry1))->RGB[SortRGBAxis] -
+	  (*((QuantizedColorType **)Entry2))->RGB[SortRGBAxis];
+}

3rdparty/QtGifImage/include/gifimage/qgifglobal.h

@@ -0,0 +1,40 @@
+/****************************************************************************
+** Copyright (c) 2013 Debao Zhang <hello@debao.me>
+** All right reserved.
+**
+** Permission is hereby granted, free of charge, to any person obtaining
+** a copy of this software and associated documentation files (the
+** "Software"), to deal in the Software without restriction, including
+** without limitation the rights to use, copy, modify, merge, publish,
+** distribute, sublicense, and/or sell copies of the Software, and to
+** permit persons to whom the Software is furnished to do so, subject to
+** the following conditions:
+**
+** The above copyright notice and this permission notice shall be
+** included in all copies or substantial portions of the Software.
+**
+** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+** NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+** LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+** OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+** WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+**
+****************************************************************************/
+#ifndef GIF_IMAGE_Q_GIF_GLOBAL_H_
+#define GIF_IMAGE_Q_GIF_GLOBAL_H_
+
+#include <QtGlobal>
+
+#if !defined(QT_STATIC) && !defined(GIFIMAGE_NO_LIB)
+#if defined(QT_BUILD_GIFIMAGE_LIB)
+#define Q_GIFIMAGE_EXPORT Q_DECL_EXPORT
+#else
+#define Q_GIFIMAGE_EXPORT Q_DECL_IMPORT
+#endif
+#else
+#define Q_GIFIMAGE_EXPORT
+#endif
+
+#endif // GIF_IMAGE_Q_GIF_GLOBAL_H_

3rdparty/QtGifImage/include/gifimage/qgifimage.cpp

@@ -0,0 +1,668 @@
+/****************************************************************************
+** Copyright (c) 2013 Debao Zhang <hello@debao.me>
+** All right reserved.
+**
+** Permission is hereby granted, free of charge, to any person obtaining
+** a copy of this software and associated documentation files (the
+** "Software"), to deal in the Software without restriction, including
+** without limitation the rights to use, copy, modify, merge, publish,
+** distribute, sublicense, and/or sell copies of the Software, and to
+** permit persons to whom the Software is furnished to do so, subject to
+** the following conditions:
+**
+** The above copyright notice and this permission notice shall be
+** included in all copies or substantial portions of the Software.
+**
+** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+** NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+** LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+** OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+** WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+**
+****************************************************************************/
+
+#include <gifimage/qgifimage.h>
+#include <gifimage/qgifimage_p.h>
+
+#include <QFile>
+#include <QImage>
+#include <QDebug>
+#include <QScopedPointer>
+
+namespace {
+
+int writeToIODevice(GifFileType *gifFile, const GifByteType *data,
+					int maxSize) {
+  return static_cast<int>(
+	  static_cast<QIODevice *>(
+		  gifFile->UserData)->write(
+		  reinterpret_cast<const char *>(data), maxSize));
+}
+
+int readFromIODevice(GifFileType *gifFile, GifByteType *data, int maxSize) {
+  return static_cast<int>(
+	  static_cast<QIODevice *>(
+		  gifFile->UserData)->read(
+		  reinterpret_cast<char *>(data), maxSize));
+}
+
+}  // namespace
+
+QGifImagePrivate::QGifImagePrivate(QGifImage *p)
+	: loopCount(0), defaultDelayTime(1000), q_ptr(p) {}
+
+QVector<QRgb> QGifImagePrivate::colorTableFromColorMapObject(
+	ColorMapObject *colorMap, int transColorIndex) const {
+  QVector<QRgb> colorTable;
+  if (colorMap) {
+	for (int idx = 0; idx < colorMap->ColorCount; ++idx) {
+	  GifColorType gifColor = colorMap->Colors[idx];
+	  QRgb color = gifColor.Blue | (gifColor.Green << 8) | (gifColor.Red << 16);
+	  // For non-transparent color, set the alpha to opaque.
+	  if (idx != transColorIndex)
+		color |= 0xff << 24;
+	  colorTable.append(color);
+	}
+  }
+  return colorTable;
+}
+
+ColorMapObject *QGifImagePrivate::colorTableToColorMapObject(
+	QVector<QRgb> colorTable) const {
+  if (colorTable.isEmpty())
+	return nullptr;
+
+  auto cmap = (ColorMapObject *)malloc(sizeof(ColorMapObject));
+  // num of colors must be a power of 2
+  int numColors = 1 << GifBitSize(static_cast<int>(colorTable.size()));
+  cmap->ColorCount = numColors;
+  // Maybe a bug of giflib, BitsPerPixel is used as size of the color table
+  // size.
+  cmap->BitsPerPixel = GifBitSize(static_cast<int>(colorTable.size()));  // Todo!
+  cmap->SortFlag = false;
+
+  auto colorValues =
+	  (GifColorType *)calloc(numColors, sizeof(GifColorType));
+  for (int idx = 0; idx < colorTable.size(); ++idx) {
+	colorValues[idx].Red = qRed(colorTable[idx]);
+	colorValues[idx].Green = qGreen(colorTable[idx]);
+	colorValues[idx].Blue = qBlue(colorTable[idx]);
+  }
+
+  cmap->Colors = colorValues;
+
+  return cmap;
+}
+
+QSize QGifImagePrivate::getCanvasSize() const {
+  // If canvasSize has been set by user.
+  if (canvasSize.isValid())
+	return canvasSize;
+
+  // Calc the right canvasSize from the frame size.
+  int width = -1;
+  int height = -1;
+	  foreach (QGifFrameInfoData info, frameInfos) {
+	  int w = info.image.width() + info.offset.x();
+	  int h = info.image.height() + info.offset.y();
+	  if (w > width)
+		width = w;
+	  if (h > height)
+		height = h;
+	}
+  return {width, height};
+}
+
+int QGifImagePrivate::getFrameTransparentColorIndex(
+	const QGifFrameInfoData &frameInfo) const {
+  int index = -1;
+
+  QColor transColor = frameInfo.transparentColor.isValid()
+					  ? frameInfo.transparentColor
+					  : defaultTransparentColor;
+
+  if (transColor.isValid()) {
+	if (!frameInfo.image.colorTable().isEmpty())
+	  index = static_cast<int>(frameInfo.image.colorTable().indexOf(transColor.rgb()));
+	else if (!globalColorTable.isEmpty())
+	  index = static_cast<int>(globalColorTable.indexOf(transColor.rgb()));
+  }
+
+  return index;
+}
+
+bool QGifImagePrivate::load(QIODevice *device) {
+  static int interlacedOffset[] = {0, 4, 2,
+								   1}; /* The way Interlaced image should. */
+  static int interlacedJumps[] = {8, 8, 4,
+								  2}; /* be read - offsets and jumps... */
+
+  int error;
+  GifFileType *gifFile = DGifOpen(device, readFromIODevice, &error);
+  if (!gifFile) {
+	char *temp = GifErrorString(error);
+	qWarning("%s", temp);
+	return false;
+  }
+
+  if (DGifSlurp(gifFile) == GIF_ERROR)
+	return false;
+
+  canvasSize.setWidth(gifFile->SWidth);
+  canvasSize.setHeight(gifFile->SHeight);
+  if (gifFile->SColorMap) {
+	globalColorTable = colorTableFromColorMapObject(gifFile->SColorMap);
+	if (gifFile->SBackGroundColor < globalColorTable.size())
+	  bgColor = QColor(globalColorTable[gifFile->SBackGroundColor]);
+  }
+
+  for (int idx = 0; idx < gifFile->ImageCount; ++idx) {
+	SavedImage gifImage = gifFile->SavedImages[idx];
+	int top = gifImage.ImageDesc.Top;
+	int left = gifImage.ImageDesc.Left;
+	int width = gifImage.ImageDesc.Width;
+	int height = gifImage.ImageDesc.Height;
+
+	QGifFrameInfoData frameInfo;
+	GraphicsControlBlock gcb;
+	DGifSavedExtensionToGCB(gifFile, idx, &gcb);
+	int transColorIndex = gcb.TransparentColor;
+
+	QVector<QRgb> colorTable;
+	if (gifImage.ImageDesc.ColorMap)
+	  colorTable = colorTableFromColorMapObject(gifImage.ImageDesc.ColorMap,
+												transColorIndex);
+	else if (transColorIndex != -1)
+	  colorTable =
+		  colorTableFromColorMapObject(gifFile->SColorMap, transColorIndex);
+	else
+	  colorTable = globalColorTable;
+
+	if (transColorIndex != -1)
+	  frameInfo.transparentColor = colorTable[transColorIndex];
+	frameInfo.delayTime = gcb.DelayTime * 10;  // convert to milliseconds
+	frameInfo.interlace = gifImage.ImageDesc.Interlace;
+	frameInfo.offset = QPoint(left, top);
+
+	QImage image(width, height, QImage::Format_Indexed8);
+	image.setOffset(QPoint(left, top));  // Maybe useful for some users.
+	image.setColorTable(colorTable);
+	if (transColorIndex != -1)
+	  image.fill(transColorIndex);
+	else if (!globalColorTable.isEmpty())
+	  image.fill(gifFile->SBackGroundColor);  //! ToDo
+
+	if (gifImage.ImageDesc.Interlace) {
+	  int line = 0;
+	  for (int i = 0; i < 4; i++) {
+		for (int row = interlacedOffset[i]; row < height;
+			 row += interlacedJumps[i]) {
+		  memcpy(image.scanLine(row), gifImage.RasterBits + line * width,
+				 width);
+		  line++;
+		}
+	  }
+	} else {
+	  for (int row = 0; row < height; row++) {
+		memcpy(image.scanLine(row), gifImage.RasterBits + row * width, width);
+	  }
+	}
+
+	// Extract other data for the image.
+	if (idx == 0) {
+	  if (gifImage.ExtensionBlockCount > 2) {
+		ExtensionBlock *extBlock = gifImage.ExtensionBlocks;
+		if (extBlock->Function == APPLICATION_EXT_FUNC_CODE &&
+			extBlock->ByteCount == 8) {
+		  if (QByteArray((char *)extBlock->Bytes) ==
+			  QByteArray("NETSCAPE2.0")) {
+			ExtensionBlock *block = gifImage.ExtensionBlocks + 1;
+			if (block->ByteCount == 3) {
+			  loopCount =
+				  uchar(block->Bytes[1]) + uchar((block->Bytes[2]) << 8);
+			}
+		  }
+		}
+	  }
+	}
+
+	frameInfo.image = image;
+	frameInfos.append(frameInfo);
+  }
+
+  DGifCloseFile(gifFile);
+  return true;
+}
+
+bool QGifImagePrivate::save(QIODevice *device) const {
+  int error;
+  GifFileType *gifFile = EGifOpen(device, writeToIODevice, &error);
+  if (!gifFile) {
+	char *temp = GifErrorString(error);
+	qWarning("%s", temp);
+	return false;
+  }
+
+  QSize _canvasSize = getCanvasSize();
+  gifFile->SWidth = _canvasSize.width();
+  gifFile->SHeight = _canvasSize.height();
+  gifFile->SColorResolution = 8;
+  if (!globalColorTable.isEmpty()) {
+	gifFile->SColorMap = colorTableToColorMapObject(globalColorTable);
+	int idx = static_cast<int>(globalColorTable.indexOf(bgColor.rgba()));
+	gifFile->SBackGroundColor = idx == -1 ? 0 : idx;
+  }
+
+  gifFile->ImageCount = static_cast<int>(frameInfos.size());
+  gifFile->SavedImages =
+	  (SavedImage *)calloc(frameInfos.size(), sizeof(SavedImage));
+  for (int idx = 0; idx < frameInfos.size(); ++idx) {
+	const QGifFrameInfoData frameInfo = frameInfos.at(idx);
+	QImage image = frameInfo.image;
+	if (image.format() != QImage::Format_Indexed8) {
+	  if (!globalColorTable.isEmpty())
+		image =
+			image.convertToFormat(QImage::Format_Indexed8, globalColorTable);
+	  else
+		image = image.convertToFormat(QImage::Format_Indexed8);
+	}
+
+	SavedImage *gifImage = gifFile->SavedImages + idx;
+
+	gifImage->ImageDesc.Left = frameInfo.offset.x();
+	gifImage->ImageDesc.Top = frameInfo.offset.y();
+	gifImage->ImageDesc.Width = image.width();
+	gifImage->ImageDesc.Height = image.height();
+	gifImage->ImageDesc.Interlace = frameInfo.interlace;
+
+	if (!image.colorTable().isEmpty() &&
+		(image.colorTable() != globalColorTable))
+	  gifImage->ImageDesc.ColorMap =
+		  colorTableToColorMapObject(image.colorTable());
+	else
+	  gifImage->ImageDesc.ColorMap = nullptr;
+
+	auto data = (GifByteType *)malloc(image.width() * image.height() *
+		sizeof(GifByteType));
+	for (int row = 0; row < image.height(); ++row) {
+	  memcpy(data + row * image.width(), image.scanLine(row), image.width());
+	}
+	gifImage->RasterBits = data;
+
+	if (idx == 0) {
+	  uchar data8[12] = "NETSCAPE2.0";
+	  GifAddExtensionBlock(&gifImage->ExtensionBlockCount,
+						   &gifImage->ExtensionBlocks,
+						   APPLICATION_EXT_FUNC_CODE, 11, data8);
+	  uchar data_char[3];
+	  data_char[0] = 0x01;
+	  data_char[1] = loopCount & 0xFF;
+	  data_char[2] = (loopCount >> 8) & 0xFF;
+	  GifAddExtensionBlock(&gifImage->ExtensionBlockCount,
+						   &gifImage->ExtensionBlocks, CONTINUE_EXT_FUNC_CODE,
+						   3, data_char);
+	}
+
+	GraphicsControlBlock gcbBlock;
+	gcbBlock.DisposalMode = 0;
+	gcbBlock.UserInputFlag = false;
+	gcbBlock.TransparentColor = getFrameTransparentColorIndex(frameInfo);
+
+	if (frameInfo.delayTime != -1)
+	  gcbBlock.DelayTime =
+		  frameInfo.delayTime / 10;  // convert from milliseconds
+	else
+	  gcbBlock.DelayTime = defaultDelayTime / 10;
+
+	EGifGCBToSavedExtension(&gcbBlock, gifFile, idx);
+  }
+  EGifSpew(gifFile);
+
+  return true;
+}
+
+/*!
+    \class QGifImage
+    \inmodule QtGifImage
+    \brief Class used to read/wirte .gif files.
+*/
+
+/*!
+    Constructs a gif image
+*/
+QGifImage::QGifImage() : d_ptr(new QGifImagePrivate(this)) {}
+
+/*!
+    Constructs a gif image and tries to load the image from the
+    file with the given \a fileName
+*/
+QGifImage::QGifImage(const QString &fileName)
+	: d_ptr(new QGifImagePrivate(this)) {
+  load(fileName);
+}
+
+/*!
+    Constructs a gif image with the given \a size
+*/
+QGifImage::QGifImage(const QSize &size) : d_ptr(new QGifImagePrivate(this)) {
+  d_ptr->canvasSize = size;
+}
+
+/*!
+    Destroys the gif image and cleans up.
+*/
+QGifImage::~QGifImage() { delete d_ptr; }
+
+/*!
+    Return global color table.
+ */
+QVector<QRgb> QGifImage::globalColorTable() const {
+  Q_D(const QGifImage);
+  return d->globalColorTable;
+}
+
+/*!
+    Return background color of the gif canvas. It only makes sense when
+    global color table is not empty.
+ */
+QColor QGifImage::backgroundColor() const {
+  Q_D(const QGifImage);
+  return d->bgColor;
+}
+
+/*!
+    Set the global color table \a colors and background color \a bgColor.
+    \a bgColor must be one the color in \a colors.
+
+    Unlike other image formats that support alpha (e.g. png), GIF does not
+    support semi-transparent pixels. So the alpha channel of the color table
+    will be ignored.
+*/
+void QGifImage::setGlobalColorTable(const QVector<QRgb> &colors,
+									const QColor &bgColor) {
+  Q_D(QGifImage);
+  d->globalColorTable = colors;
+  d->bgColor = bgColor;
+}
+
+/*!
+    Return the default delay in milliseconds. The default value is 1000 ms.
+
+    The time delay can be different for every frame.
+*/
+int QGifImage::defaultDelay() const {
+  Q_D(const QGifImage);
+  return d->defaultDelayTime;
+}
+
+/*!
+    Set the default \a delay in milliseconds.
+*/
+void QGifImage::setDefaultDelay(int delay) {
+  Q_D(QGifImage);
+  d->defaultDelayTime = delay;
+}
+
+/*!
+    Return the default transparent color.
+
+    The transparent color can be different for every frame.
+*/
+QColor QGifImage::defaultTransparentColor() const {
+  Q_D(const QGifImage);
+  return d->defaultTransparentColor;
+}
+
+/*!
+    Set the default transparent \a color.
+
+    Unlike other image formats that support alpha (e.g. png), GIF does
+    not support semi-transparent pixels. The way to achieve transparency
+    is to set a color that will be transparent when rendering the GIF.
+    So, if you set the transparent color to black, the black pixels in
+    the gif file will be transparent.
+*/
+void QGifImage::setDefaultTransparentColor(const QColor &color) {
+  Q_D(QGifImage);
+  d->defaultTransparentColor = color;
+}
+
+/*!
+    Return the loop count.
+*/
+int QGifImage::loopCount() const {
+  Q_D(const QGifImage);
+  return d->loopCount;
+}
+
+/*!
+    Set the loop count. The default value of \a loop is 0, which means loop
+   forever.
+*/
+void QGifImage::setLoopCount(int loop) {
+  Q_D(QGifImage);
+  d->loopCount = loop;
+}
+
+/*!
+    Insert the QImage object \a frame at position \a index with \a delay.
+
+    As gif file only support indexed image, so all the \a frame will be
+   converted to the QImage::Format_Indexed8 format. Global color table will be
+   used in the convertion if it has been set.
+
+    QImage::offset() will be used when insert the QImage to the gif canvas.
+*/
+void QGifImage::insertFrame(int index, const QImage &frame, int delay) {
+  Q_D(QGifImage);
+
+  QGifFrameInfoData data;
+  data.image = frame;
+  data.delayTime = delay;
+  data.offset = frame.offset();
+
+  d->frameInfos.insert(index, data);
+}
+
+/*!
+    \overload
+
+    Insert the QImage object \a frame at position \a index with the given \a
+   offset and \a delay.
+
+    As gif file only support indexed image, so all the \a frame will be
+   converted to the QImage::Format_Indexed8 format. Global color table will be
+   used in the convertion if it has been set.
+*/
+void QGifImage::insertFrame(int index, const QImage &frame,
+							const QPoint &offset, int delay) {
+  Q_D(QGifImage);
+  QGifFrameInfoData data;
+  data.image = frame;
+  data.delayTime = delay;
+  data.offset = offset;
+
+  d->frameInfos.insert(index, data);
+}
+
+/*!
+    Append the QImage object \a frame with \a delay.
+
+    As gif file only support indexed image, so all the \a frame will be
+   converted to the QImage::Format_Indexed8 format. Global color table will be
+   used in the convertion if it has been set.
+
+    QImage::offset() will be used when insert the QImage to the gif canvas.
+*/
+void QGifImage::addFrame(const QImage &frame, int delay) {
+  Q_D(QGifImage);
+
+  QGifFrameInfoData data;
+  data.image = frame;
+  data.delayTime = delay;
+  data.offset = frame.offset();
+
+  d->frameInfos.append(data);
+}
+
+/*!
+    \overload
+    Append the QImage object \a frame with the given \a offset and \a delay.
+ */
+void QGifImage::addFrame(const QImage &frame, const QPoint &offset, int delay) {
+  Q_D(QGifImage);
+
+  QGifFrameInfoData data;
+  data.image = frame;
+  data.delayTime = delay;
+  data.offset = offset;
+
+  d->frameInfos.append(data);
+}
+
+/*!
+    Return frame count contained in the gif file.
+ */
+int QGifImage::frameCount() const {
+  Q_D(const QGifImage);
+  return static_cast<int>(d->frameInfos.count());
+}
+
+/*!
+    Return the image at \a index.
+ */
+QImage QGifImage::frame(int index) const {
+  Q_D(const QGifImage);
+  if (index < 0 || index >= d->frameInfos.size())
+	return {};
+
+  return d->frameInfos[index].image;
+}
+
+/*!
+     Return the offset value of the frame at \a index
+ */
+QPoint QGifImage::frameOffset(int index) const {
+  Q_D(const QGifImage);
+  if (index < 0 || index >= d->frameInfos.size())
+	return {};
+
+  return d->frameInfos[index].offset;
+}
+
+/*!
+     Set the \a offset value for the frame at \a index
+ */
+void QGifImage::setFrameOffset(int index, const QPoint &offset) {
+  Q_D(QGifImage);
+  if (index < 0 || index >= d->frameInfos.size())
+	return;
+  d->frameInfos[index].offset = offset;
+}
+
+/*!
+     Return the delay value of the frame at \a index
+ */
+int QGifImage::frameDelay(int index) const {
+  Q_D(const QGifImage);
+  if (index < 0 || index >= d->frameInfos.size())
+	return -1;
+
+  return d->frameInfos[index].delayTime;
+}
+
+/*!
+     Set the \a delay value for the frame at \a index
+ */
+void QGifImage::setFrameDelay(int index, int delay) {
+  Q_D(QGifImage);
+  if (index < 0 || index >= d->frameInfos.size())
+	return;
+  d->frameInfos[index].delayTime = delay;
+}
+
+/*!
+     Return the transparent color of the frame at \a index
+ */
+QColor QGifImage::frameTransparentColor(int index) const {
+  Q_D(const QGifImage);
+  if (index < 0 || index >= d->frameInfos.size())
+	return {};
+
+  return d->frameInfos[index].transparentColor;
+}
+
+/*!
+    Sets the transparent \a color of the frame \a index. Unlike other image
+   formats that support alpha (e.g. PNG), GIF does not support semi-transparent
+   pixels. The way to achieve transparency is to set a color that will be
+   transparent when rendering the GIF. So, if you set the transparent color to
+   black, the black pixels in your gif file will be transparent.
+*/
+void QGifImage::setFrameTransparentColor(int index, const QColor &color) {
+  Q_D(QGifImage);
+  if (index < 0 || index >= d->frameInfos.size())
+	return;
+  d->frameInfos[index].transparentColor = color;
+}
+
+/*!
+    Saves the gif image to the file with the given \a fileName.
+    Returns \c true if the image was successfully saved; otherwise
+    returns \c false.
+*/
+bool QGifImage::save(const QString &fileName) const {
+  Q_D(const QGifImage);
+  QFile file(fileName);
+  if (file.open(QIODevice::WriteOnly)) {
+	bool res = d->save(&file);
+//      d->~QGifImagePrivate();
+//      delete d;
+	return res;
+  }
+
+  return false;
+}
+
+/*!
+    \overload
+
+    This function writes a QImage to the given \a device.
+*/
+bool QGifImage::save(QIODevice *device) const {
+  Q_D(const QGifImage);
+  if (device->openMode() | QIODevice::WriteOnly)
+	return d->save(device);
+
+  return false;
+}
+
+/*!
+    Loads an gif image from the file with the given \a fileName. Returns \c true
+   if the image was successfully loaded; otherwise invalidates the image and
+   returns \c false.
+*/
+bool QGifImage::load(const QString &fileName) {
+  Q_D(QGifImage);
+  QFile file(fileName);
+  if (file.open(QIODevice::ReadOnly))
+	return d->load(&file);
+
+  return false;
+}
+
+/*!
+    \overload
+
+    This function reads a gif image from the given \a device. This can,
+    for example, be used to load an image directly into a QByteArray.
+*/
+bool QGifImage::load(QIODevice *device) {
+  Q_D(QGifImage);
+  if (device->openMode() | QIODevice::ReadOnly)
+	return d->load(device);
+
+  return false;
+}

3rdparty/QtGifImage/include/gifimage/qgifimage.h

@@ -0,0 +1,89 @@
+/****************************************************************************
+** Copyright (c) 2013 Debao Zhang <hello@debao.me>
+** All right reserved.
+**
+** Permission is hereby granted, free of charge, to any person obtaining
+** a copy of this software and associated documentation files (the
+** "Software"), to deal in the Software without restriction, including
+** without limitation the rights to use, copy, modify, merge, publish,
+** distribute, sublicense, and/or sell copies of the Software, and to
+** permit persons to whom the Software is furnished to do so, subject to
+** the following conditions:
+**
+** The above copyright notice and this permission notice shall be
+** included in all copies or substantial portions of the Software.
+**
+** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+** NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+** LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+** OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+** WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+**
+****************************************************************************/
+#ifndef GIF_IMAGE_Q_GIF_IMAGE_H_
+#define GIF_IMAGE_Q_GIF_IMAGE_H_
+
+#include <gifimage/qgifglobal.h>
+
+#include <QList>
+#include <QImage>
+#include <QColor>
+#include <QVector>
+
+class QGifImagePrivate;
+
+class QGifImage {
+  Q_DECLARE_PRIVATE(QGifImage)
+
+public:
+  QGifImage();
+  explicit QGifImage(const QString &fileName);
+  explicit QGifImage(const QSize &size);
+
+  ~QGifImage();
+
+public:
+  QVector<QRgb> globalColorTable() const;
+  QColor backgroundColor() const;
+
+  void setGlobalColorTable(const QVector<QRgb> &colors, const QColor &bgColor = QColor());
+  int defaultDelay() const;
+
+  void setDefaultDelay(int internal);
+  QColor defaultTransparentColor() const;
+  void setDefaultTransparentColor(const QColor &color);
+
+  int loopCount() const;
+  void setLoopCount(int loop);
+
+  int frameCount() const;
+  QImage frame(int index) const;
+
+  void addFrame(const QImage &frame, int delay = -1);
+  void addFrame(const QImage &frame, const QPoint &offset, int delay = -1);
+
+  void insertFrame(int index, const QImage &frame, int delay = -1);
+  void insertFrame(int index, const QImage &frame, const QPoint &offset, int delay = -1);
+
+  QPoint frameOffset(int index) const;
+  void setFrameOffset(int index, const QPoint &offset);
+
+  int frameDelay(int index) const;
+  void setFrameDelay(int index, int delay);
+
+  QColor frameTransparentColor(int index) const;
+  void setFrameTransparentColor(int index, const QColor &color);
+
+  bool load(QIODevice *device);
+  bool load(const QString &fileName);
+
+  bool save(QIODevice *device) const;
+  bool save(const QString &fileName) const;
+
+private:
+  QGifImagePrivate *const d_ptr;
+};
+
+#endif // GIF_IMAGE_Q_GIF_IMAGE_H_

3rdparty/QtGifImage/include/gifimage/qgifimage_p.h

@@ -0,0 +1,75 @@
+/****************************************************************************
+** Copyright (c) 2013 Debao Zhang <hello@debao.me>
+** All right reserved.
+**
+** Permission is hereby granted, free of charge, to any person obtaining
+** a copy of this software and associated documentation files (the
+** "Software"), to deal in the Software without restriction, including
+** without limitation the rights to use, copy, modify, merge, publish,
+** distribute, sublicense, and/or sell copies of the Software, and to
+** permit persons to whom the Software is furnished to do so, subject to
+** the following conditions:
+**
+** The above copyright notice and this permission notice shall be
+** included in all copies or substantial portions of the Software.
+**
+** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+** NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+** LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+** OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+** WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+**
+****************************************************************************/
+#ifndef GIF_IMAGE_Q_GIF_IMAGE_P_H_
+#define GIF_IMAGE_Q_GIF_IMAGE_P_H_
+
+#include <giflib/gif_lib.h>
+#include <gifimage/qgifimage.h>
+
+#include <QVector>
+#include <QColor>
+
+struct QGifFrameInfoData {
+  QGifFrameInfoData() : delayTime(-1), interlace(false) {}
+
+public:
+  QImage image;
+  QPoint offset; //offset info of QImage will lost when convert from One format to another.
+  int delayTime;
+  bool interlace;
+  QColor transparentColor;
+};
+
+class QGifImagePrivate {
+  Q_DECLARE_PUBLIC(QGifImage)
+
+public:
+  explicit QGifImagePrivate(QGifImage *p);
+  ~QGifImagePrivate() = default;
+
+public:
+  bool load(QIODevice *device);
+  bool save(QIODevice *device) const;
+
+  QVector<QRgb> colorTableFromColorMapObject(ColorMapObject *object, int transColorIndex = -1) const;
+  [[nodiscard]] ColorMapObject *colorTableToColorMapObject(QVector<QRgb> colorTable) const;
+
+  [[nodiscard]] QSize getCanvasSize() const;
+  [[nodiscard]] int getFrameTransparentColorIndex(const QGifFrameInfoData &info) const;
+
+public:
+  QSize canvasSize;
+  int loopCount;
+  int defaultDelayTime;
+  QColor defaultTransparentColor;
+
+  QVector<QRgb> globalColorTable;
+  QColor bgColor;
+  QList<QGifFrameInfoData> frameInfos;
+
+  QGifImage *q_ptr;
+};
+
+#endif // GIF_IMAGE_Q_GIF_IMAGE_P_H_

CMakeLists.txt

@@ -0,0 +1,62 @@
+cmake_minimum_required(VERSION 3.16.0)
+
+project(qteletextmaker VERSION 1.0.0 LANGUAGES CXX)
+
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+find_package(Qt6 COMPONENTS Core Widgets REQUIRED)
+
+qt_standard_project_setup()
+
+add_subdirectory(src/qteletextdecoder)
+
+add_subdirectory(3rdparty/QtGifImage)
+
+file (GLOB SOURCES src/qteletextmaker/*.cpp)
+qt_add_executable(qteletextmaker ${SOURCES} src/qteletextmaker/actionicons.qrc)
+
+target_link_libraries(qteletextmaker PRIVATE QtGifImage::QtGifImage qteletextdecoder Qt::Widgets)
+
+set_target_properties(qteletextmaker PROPERTIES
+	WIN32_EXECUTABLE ON
+)
+
+if(UNIX)
+	include(GNUInstallDirs)
+
+	set(BIN_INSTALL_DIR "${CMAKE_INSTALL_BINDIR}")
+	set(DOC_INSTALL_DIR "${CMAKE_INSTALL_DOCDIR}")
+	set(EXAMPLES_INSTALL_DIR "${DOC_INSTALL_DIR}/examples")
+else()
+	set(BIN_INSTALL_DIR ".")
+	set(DOC_INSTALL_DIR ".")
+	set(EXAMPLES_INSTALL_DIR "./examples")
+endif()
+
+install(TARGETS qteletextmaker
+	BUNDLE DESTINATION .
+	RUNTIME DESTINATION ${BIN_INSTALL_DIR}
+)
+
+install(FILES
+	${CMAKE_CURRENT_LIST_DIR}/README.md
+	${CMAKE_CURRENT_LIST_DIR}/LICENSE
+	DESTINATION ${DOC_INSTALL_DIR}
+)
+
+install(DIRECTORY
+	${CMAKE_CURRENT_LIST_DIR}/examples/
+	DESTINATION ${EXAMPLES_INSTALL_DIR}
+)
+
+qt_generate_deploy_app_script(
+	TARGET qteletextmaker
+	FILENAME_VARIABLE deploy_script
+	NO_UNSUPPORTED_PLATFORM_ERROR
+)
+install(SCRIPT ${deploy_script})

README.md

@@ -1,30 +1,38 @@
 # QTeletextMaker
 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.
+It is written in C++ using the Qt 6 widget libraries.
 
 Features
-- Load and save teletext pages in .tti format.
-- Rendering of teletext pages in Levels 1, 1.5, 2.5 and 3.5
-- Rendering of Local Objects and side panels.
-- Import and export of single pages in .t42 format.
-- Export PNG images of teletext pages.
+- Load and save pages in TTI format.
+- Rendering of pages in Levels 1, 1.5, 2.5 and 3.5 including Local Objects and side panels.
+- Import and export of single pages in t42, EP1 and HTT formats.
+- Export PNG and animated GIF images of pages.
 - Undo and redo of editing actions.
 - Interactive X/26 Local Enhancement Data triplet editor.
 - Editing of X/27/4 and X/27/5 compositional links to enhancement data pages.
 - Palette editor.
 - Configurable zoom.
-- View teletext pages in 4:3, 16:9 pillar-box and 16:9 stretch aspect ratios.
+- View pages in 4:3, 16:9 pillar-box and 16:9 stretch aspect ratios.
+- View pages in mix and attribute-less monochrome modes.
 
-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.
+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://web.archive.org/web/20230606021352/https://blog.8bitbuddhism.com/2018/08/22/cross-compiling-windows-applications-with-mxe/). After MXE is installed `make qt6-qtbase` should build and install the required dependencies to build QTeletextMaker.
 
 ## Building
 ### Linux
-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.
+Install version 6 of the QtCore, QtGui and QtWidgets libraries and build headers, along with CMake.
 
-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.
+Change into the source directory and run the following commands. -j8 can be replaced with the number of processor cores used for the compile process
+```
+mkdir build
+cd build
+cmake -DCMAKE_BUILD_TYPE=Release ..
+make -j8
+```
 
-Optionally, type `make install` afterwards to place the executable into /usr/local/bin.
+The above should place the qteletextmaker executable into the build directory created by the above commands. Within the build directory type `./qteletextmaker` in the terminal to launch.
+
+Optionally, type `cmake --install .` to place the executable into /usr/local/bin and the example .tti files into /usr/local/share/doc/qteletextmaker.
 
 ## Current limitations
 The following X/26 enhancement triplets are not rendered by the editor, although the list is fully aware of them.

examples/Level3p5-Joseph.tti

@@ -0,0 +1,22 @@
+DE,The colours of Joseph's dreamcoat
+PN,19900
+SC,0000
+PS,8000
+CT,20,T
+OL,28,@@@|g`VrO@_r{kGFBooWk}M`ooGDsL`ORrs}c@@@
+OL,28,D@@|g@@pC@|p@@CH|O@pwp}]@@wAws]G@@
+OL,26,@lD@`CHnD@AcHTCI`cIpD@ACJJcEL`CTcJ`CKrD@
+OL,26,AhQRAcKTCL`cLtD@JCMTcM`cBvD@ACNTcN`cGxD@
+OL,26,BAcFTCO`cO_CpURJcDjD@ACElD@JCGBBB
+OL,2, It was...                              
+OL,4,A]GRed   C]DYellow B]DGreen  MLA]GBrown 
+OL,6,A]GScarlet\ Black  A]GOchre  MLC]DPeach 
+OL,8,E]GRuby  C]DOlive  E]GViolet MLC]DFawn  
+OL,10,E]DLilac C]DGold MLA]GChocolateE]DMauve 
+OL,12, ]DCream A]GCrimson ]DSilver MLE]GRose  
+OL,14,D]GAzure C]DLemon  A]GRusset ML \ Grey  
+OL,16,E]GPurple ]DWhite  E]DPink   MLA]GOrange
+OL,18,                            andD]GBlue!M
+OL,21,  FRose is CLUT 0:5. Gold, Cream and    
+OL,22,  FLemon are in CLUT 1 and applied with 
+OL,23,  Fa Level 3.5 only Object.             

examples/Template-ActivePosition.tti

@@ -4,6 +4,6 @@ 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,26,BvD@@kfwD@@kfxD@@kfyD@@kfzD@@kf{D@@kf|D@
+OL,26,C@kf}D@@kf~D@@kfD@@kfCCCCCC
 OL,1,  Active Position across every row      

loadsave.cpp

@@ -1,811 +0,0 @@
-/*
- * 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 "loadsave.h"
-
-#include <QByteArray>
-#include <QDataStream>
-#include <QFile>
-#include <QSaveFile>
-#include <QString>
-#include <QTextStream>
-
-#include "document.h"
-#include "hamming.h"
-#include "levelonepage.h"
-#include "pagebase.h"
-
-void loadTTI(QFile *inFile, TeletextDocument *document)
-{
-	QByteArray inLine;
-	bool firstSubPageAlreadyFound = false;
-	int cycleCommandsFound = 0;
-	int mostRecentCycleValue = -1;
-	LevelOnePage::CycleTypeEnum mostRecentCycleType;
-
-	LevelOnePage* loadingPage = document->subPage(0);
-
-	for (;;) {
-		inLine = inFile->readLine(160).trimmed();
-		if (inLine.isEmpty())
-			break;
-		if (inLine.startsWith("DE,"))
-			document->setDescription(QString(inLine.remove(0, 3)));
-		if (inLine.startsWith("PN,")) {
-			// When second and subsequent PN commands are found, firstSubPageAlreadyFound==true at this point
-			// This assumes that PN is the first command of a new subpage...
-			if (firstSubPageAlreadyFound) {
-				document->insertSubPage(document->numberOfSubPages(), false);
-				loadingPage = document->subPage(document->numberOfSubPages()-1);
-			} else {
-				document->setPageNumberFromString(inLine.mid(3,3));
-				firstSubPageAlreadyFound = true;
-			}
-		}
-/*		if (lineType == "SC,") {
-			bool subPageNumberOk;
-			int subPageNumberRead = inLine.mid(3, 4).toInt(&subPageNumberOk, 16);
-			if ((!subPageNumberOk) || subPageNumberRead > 0x3f7f)
-				subPageNumberRead = 0;
-			loadingPage->setSubPageNumber(subPageNumberRead);
-		}*/
-		if (inLine.startsWith("PS,")) {
-			bool pageStatusOk;
-			int pageStatusRead = inLine.mid(3, 4).toInt(&pageStatusOk, 16);
-			if (pageStatusOk) {
-				loadingPage->setControlBit(PageBase::C4ErasePage, pageStatusRead & 0x4000);
-				for (int i=PageBase::C5Newsflash, pageStatusBit=0x0001; i<=PageBase::C11SerialMagazine; i++, pageStatusBit<<=1)
-					loadingPage->setControlBit(i, pageStatusRead & pageStatusBit);
-				loadingPage->setDefaultNOS(((pageStatusRead & 0x0200) >> 9) | ((pageStatusRead & 0x0100) >> 7) | ((pageStatusRead & 0x0080) >> 5));
-			}
-		}
-		if (inLine.startsWith("CT,") && (inLine.endsWith(",C") || inLine.endsWith(",T"))) {
-			bool cycleValueOk;
-			int cycleValueRead = inLine.mid(3, inLine.size()-5).toInt(&cycleValueOk);
-			if (cycleValueOk) {
-				cycleCommandsFound++;
-				// House-keep CT command values, in case it's the only one within multiple subpages
-				mostRecentCycleValue = cycleValueRead;
-				loadingPage->setCycleValue(cycleValueRead);
-				mostRecentCycleType = inLine.endsWith("C") ? LevelOnePage::CTcycles : LevelOnePage::CTseconds;
-				loadingPage->setCycleType(mostRecentCycleType);
-			}
-		}
-		if (inLine.startsWith("FL,")) {
-			bool fastTextLinkOk;
-			int fastTextLinkRead;
-			QString flLine = QString(inLine.remove(0, 3));
-			if (flLine.count(',') == 5)
-				for (int i=0; i<6; i++) {
-					fastTextLinkRead = flLine.section(',', i, i).toInt(&fastTextLinkOk, 16);
-					if (fastTextLinkOk) {
-						if (fastTextLinkRead == 0)
-							fastTextLinkRead = 0x8ff;
-						// Stored as page link with relative magazine number, convert from absolute page number that was read
-						fastTextLinkRead ^= document->pageNumber() & 0x700;
-						fastTextLinkRead &= 0x7ff; // Fixes magazine 8 to 0
-						loadingPage->setFastTextLinkPageNumber(i, fastTextLinkRead);
-					}
-				}
-		}
-		if (inLine.startsWith("OL,")) {
-			bool lineNumberOk;
-			int lineNumber, secondCommaPosition;
-
-			secondCommaPosition = inLine.indexOf(",", 3);
-			if (secondCommaPosition != 4 && secondCommaPosition != 5)
-				continue;
-
-			lineNumber = inLine.mid(3, secondCommaPosition-3).toInt(&lineNumberOk, 10);
-			if (lineNumberOk && lineNumber>=0 && lineNumber<=29) {
-				inLine.remove(0, secondCommaPosition+1);
-				if (lineNumber <= 25) {
-					for (int c=0; c<40; c++) {
-						// trimmed() helpfully removes CRLF line endings from the just-read line for us
-						// But it also (un)helpfully removes spaces at the end of a 40 character line, so put them back
-						if (c >= inLine.size())
-							inLine.append(' ');
-						if (inLine.at(c) & 0x80)
-							inLine[c] = inLine.at(c) & 0x7f;
-						else if (inLine.at(c) == 0x10)
-							inLine[c] = 0x0d;
-						else if (inLine.at(c) == 0x1b) {
-							inLine.remove(c, 1);
-							inLine[c] = inLine.at(c) & 0xbf;
-						}
-					}
-					loadingPage->setPacket(lineNumber, inLine);
-				} else {
-					int designationCode = inLine.at(0) & 0x3f;
-					if (inLine.size() < 40) {
-						// OL is too short!
-						if (lineNumber == 26) {
-							// For a too-short enhancement triplets OL, first trim the line down to nearest whole triplet
-							inLine.resize((inLine.size() / 3 * 3) + 1);
-							// Then use "dummy" enhancement triplets to extend the line to the proper length
-							for (int i=inLine.size(); i<40; i+=3)
-								inLine.append("i^@"); // Address 41, Mode 0x1e, Data 0
-						} else
-							// For other triplet OLs and Hamming 8/4 OLs, just pad with zero data
-							for (int i=inLine.size(); i<40; i++)
-								inLine.append("@");
-					}
-					for (int i=1; i<=39; i++)
-						inLine[i] = inLine.at(i) & 0x3f;
-					// Import M/29 whole-magazine packets as X/28 per-page packets
-					if (lineNumber == 29) {
-						if ((document->pageNumber() & 0xff) != 0xff)
-							qDebug("M/29/%d packet found, but page number is not xFF!", designationCode);
-						lineNumber = 28;
-					}
-					loadingPage->setPacket(lineNumber, designationCode, inLine);
-				}
-			}
-		}
-	}
-	// If there's more than one subpage but only one valid CT command was found, apply it to all subpages
-	// I don't know if this is correct
-	if (cycleCommandsFound == 1 && document->numberOfSubPages()>1)
-		for (int i=0; i<document->numberOfSubPages(); i++) {
-			document->subPage(i)->setCycleValue(mostRecentCycleValue);
-			document->subPage(i)->setCycleType(mostRecentCycleType);
-		}
-}
-
-void importT42(QFile *inFile, TeletextDocument *document)
-{
-	unsigned char inLine[42];
-	int readMagazineNumber, readPacketNumber;
-	int foundMagazineNumber = -1;
-	int foundPageNumber = -1;
-	bool firstPacket0Found = false;
-	bool pageBodyPacketsFound = false;
-
-	for (;;) {
-		if (inFile->read((char *)inLine, 42) != 42)
-			// Reached end of .t42 file, or less than 42 bytes left
-			break;
-
-		// Magazine and packet numbers
-		inLine[0] = hamming_8_4_decode[inLine[0]];
-		inLine[1] = hamming_8_4_decode[inLine[1]];
-		if (inLine[0] == 0xff || inLine[1] == 0xff)
-			// Error decoding magazine or packet number
-			continue;
-		readMagazineNumber = inLine[0] & 0x07;
-		readPacketNumber = (inLine[0] >> 3) | (inLine[1] << 1);
-
-		if (readPacketNumber == 0) {
-			// Hamming decode page number, subcodes and control bits
-			for (int i=2; i<10; i++)
-				inLine[i] = hamming_8_4_decode[inLine[i]];
-			// See if the page number is valid
-			if (inLine[2] == 0xff || inLine[3] == 0xff)
-				// Error decoding page number
-				continue;
-
-			const int readPageNumber = (inLine[3] << 4) | inLine[2];
-
-			if (readPageNumber == 0xff)
-				// Time filling header
-				continue;
-
-			// A second or subsequent X/0 has been found
-			if (firstPacket0Found) {
-				if (readMagazineNumber != foundMagazineNumber)
-					// Packet from different magazine broadcast in parallel mode
-					continue;
-				if ((readPageNumber == foundPageNumber) && pageBodyPacketsFound)
-					// X/0 with same page number found after page body packets loaded - assume end of page
-					break;
-				if (readPageNumber != foundPageNumber) {
-					// More than one page in .t42 file - end of current page reached
-					qDebug("More than one page in .t42 file");
-					break;
-				}
-				// Could get here if X/0 with same page number was found with no body packets inbetween
-				continue;
-			} else {
-				// First X/0 found
-				foundMagazineNumber = readMagazineNumber;
-				foundPageNumber = readPageNumber;
-				firstPacket0Found = true;
-
-				if (foundMagazineNumber == 0)
-					document->setPageNumber(0x800 | foundPageNumber);
-				else
-					document->setPageNumber((foundMagazineNumber << 8) | foundPageNumber);
-
-				document->subPage(0)->setControlBit(PageBase::C4ErasePage, inLine[5] & 0x08);
-				document->subPage(0)->setControlBit(PageBase::C5Newsflash, inLine[7] & 0x04);
-				document->subPage(0)->setControlBit(PageBase::C6Subtitle, inLine[7] & 0x08);
-				for (int i=0; i<4; i++)
-					document->subPage(0)->setControlBit(PageBase::C7SuppressHeader+i, inLine[8] & (1 << i));
-				document->subPage(0)->setControlBit(PageBase::C11SerialMagazine, inLine[9] & 0x01);
-				document->subPage(0)->setControlBit(PageBase::C12NOS, inLine[9] & 0x08);
-				document->subPage(0)->setControlBit(PageBase::C13NOS, inLine[9] & 0x04);
-				document->subPage(0)->setControlBit(PageBase::C14NOS, inLine[9] & 0x02);
-
-				continue;
-			}
-		}
-
-		// No X/0 has been found yet, keep looking for one
-		if (!firstPacket0Found)
-			continue;
-
-		// Disregard whole-magazine packets
-		if (readPacketNumber > 28)
-			continue;
-
-		// We get here when a page-body packet belonging to the found X/0 header was found
-		pageBodyPacketsFound = true;
-
-		// At the moment this only loads a Level One Page properly
-		// because it assumes X/1 to X/25 is odd partity
-		if (readPacketNumber < 25) {
-			for (int i=2; i<42; i++)
-				// TODO - obey odd parity?
-				inLine[i] &= 0x7f;
-			document->subPage(0)->setPacket(readPacketNumber, QByteArray((const char *)&inLine[2], 40));
-			continue;
-		}
-
-		// X/26, X/27 or X/28
-		int readDesignationCode = hamming_8_4_decode[inLine[2]];
-
-		if (readDesignationCode == 0xff)
-			// Error decoding designation code
-			continue;
-
-		if (readPacketNumber == 27 && readDesignationCode < 4) {
-			// X/27/0 to X/27/3 for Editorial Linking
-			// Decode Hamming 8/4 on each of the six links, checking for errors on the way
-			for (int i=0; i<6; i++) {
-				bool decodingError = false;
-				const int b = 3 + i*6; // First byte of this link
-
-				for (int j=0; j<6; j++) {
-					inLine[b+j] = hamming_8_4_decode[inLine[b+j]];
-					if (inLine[b+j] == 0xff) {
-						decodingError = true;
-						break;
-					}
-				}
-
-				if (decodingError) {
-					// Error found in at least one byte of the link
-					// Neutralise the whole link to same magazine, page FF, subcode 3F7F
-					qDebug("X/27/%d link %d decoding error", readDesignationCode, i);
-					inLine[b]   = 0xf;
-					inLine[b+1] = 0xf;
-					inLine[b+2] = 0xf;
-					inLine[b+3] = 0x7;
-					inLine[b+4] = 0xf;
-					inLine[b+5] = 0x3;
-				}
-			}
-			document->subPage(0)->setPacket(readPacketNumber, readDesignationCode, QByteArray((const char *)&inLine[2], 40));
-
-			continue;
-		}
-
-		// X/26, or X/27/4 to X/27/15, or X/28
-		// Decode Hamming 24/18
-		for (int i=0; i<13; i++) {
-			const int b = 3 + i*3; // First byte of triplet
-
-			const int p0 = inLine[b];
-			const int p1 = inLine[b+1];
-			const int p2 = inLine[b+2];
-
-			unsigned int D1_D4;
-			unsigned int D5_D11;
-			unsigned int D12_D18;
-			unsigned int ABCDEF;
-			int32_t d;
-
-			D1_D4 = hamming_24_18_decode_d1_d4[p0 >> 2];
-			D5_D11 = p1 & 0x7f;
-			D12_D18 = p2 & 0x7f;
-
-			d = D1_D4 | (D5_D11 << 4) | (D12_D18 << 11);
-
-			ABCDEF = (hamming_24_18_parities[0][p0] ^ hamming_24_18_parities[1][p1]  ^ hamming_24_18_parities[2][p2]);
-
-			d ^= (int)hamming_24_18_decode_correct[ABCDEF];
-
-			if ((d & 0x80000000) == 0x80000000) {
-				// Error decoding Hamming 24/18
-				qDebug("X/%d/%d triplet %d decoding error", readPacketNumber, readDesignationCode, i);
-				if (readPacketNumber == 26) {
-					// Enhancements packet, set to "dummy" Address 41, Mode 0x1e, Data 0
-					inLine[b]   = 41;
-					inLine[b+1] = 0x1e;
-					inLine[b+2] = 0;
-				} else {
-					// Zero out whole decoded triplet, bound to make things go wrong...
-					inLine[b]   = 0x00;
-					inLine[b+1] = 0x00;
-					inLine[b+2] = 0x00;
-				}
-			} else {
-				inLine[b]   = d & 0x0003f;
-				inLine[b+1] = (d & 0x00fc0) >> 6;
-				inLine[b+2] = d >> 12;
-			}
-		}
-		document->subPage(0)->setPacket(readPacketNumber, readDesignationCode, QByteArray((const char *)&inLine[2], 40));
-	}
-
-	if (!firstPacket0Found)
-		qDebug("No X/0 found");
-	else if (!pageBodyPacketsFound)
-		qDebug("X/0 found, but no page body packets were found");
-}
-
-// Used by saveTTI and HashString
-int controlBitsToPS(PageBase *subPage)
-{
-	// C4 Erase page is stored in bit 14
-	int pageStatus = 0x8000 | (subPage->controlBit(PageBase::C4ErasePage) << 14); 
-	// C5 to C11 stored in order from bits 1 to 6
-	for (int i=PageBase::C5Newsflash; i<=PageBase::C11SerialMagazine; i++)
-		pageStatus |= subPage->controlBit(i) << (i-1);
-	// Apparently the TTI format stores the NOS bits backwards
-	pageStatus |= subPage->controlBit(PageBase::C12NOS) << 9;
-	pageStatus |= subPage->controlBit(PageBase::C13NOS) << 8;
-	pageStatus |= subPage->controlBit(PageBase::C14NOS) << 7;
-	return pageStatus;
-}
-
-void saveTTI(QSaveFile &file, const TeletextDocument &document)
-{
-	int p;
-	QTextStream outStream(&file);
-
-	auto write7bitPacket=[&](int packetNumber)
-	{
-		if (document.subPage(p)->packetExists(packetNumber)) {
-			QByteArray outLine = document.subPage(p)->packet(packetNumber);
-
-			outStream << QString("OL,%1,").arg(packetNumber);
-			for (int c=0; c<outLine.size(); c++)
-				if (outLine.at(c) < 0x20) {
-					// TTI files are plain text, so put in escape followed by control code with bit 6 set
-					outLine[c] = outLine.at(c) | 0x40;
-					outLine.insert(c, 0x1b);
-					c++;
-				}
-#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
-			outStream << outLine << Qt::endl;
-#else
-			outStream << outLine << endl;
-#endif
-		}
-	};
-
-	auto writeHammingPacket=[&](int packetNumber, int designationCode=0)
-	{
-		if (document.subPage(p)->packetExists(packetNumber, designationCode)) {
-			QByteArray outLine = document.subPage(p)->packet(packetNumber, designationCode);
-
-			outStream << QString("OL,%1,").arg(packetNumber);
-			// TTI stores raw values with bit 6 set, doesn't do Hamming encoding
-			outLine[0] = designationCode | 0x40;
-			for (int c=1; c<outLine.size(); c++)
-				outLine[c] = outLine.at(c) | 0x40;
-#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
-			outStream << outLine << Qt::endl;
-#else
-			outStream << outLine << endl;
-#endif
-		}
-	};
-
-#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)
-		outStream << "DE," << document.description() << Qt::endl;
-#else
-		outStream << "DE," << document.description() << endl;
-#endif
-
-	// TODO DS and SP commands
-
-	// If there's just one subpage then we save it with a subcode of 0000
-	// otherwise start with a subcode of 0001
-	int subPageNumber = document.numberOfSubPages() > 1;
-
-	for (p=0; p<document.numberOfSubPages(); p++) {
-
-		// Page number
-		outStream << QString("PN,%1%2").arg(document.pageNumber(), 3, 16, QChar('0')).arg(subPageNumber & 0xff, 2, 10, QChar('0'));
-#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
-			outStream << Qt::endl;
-#else
-			outStream << endl;
-#endif
-
-		// Subpage
-		// Magazine Organisation Table and Magazine Inventory Page don't have subpages
-		if (document.pageFunction() != TeletextDocument::PFMOT && document.pageFunction() != TeletextDocument::PFMIP) {
-			outStream << QString("SC,%1").arg(subPageNumber, 4, 10, QChar('0'));
-#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
-			outStream << Qt::endl;
-#else
-			outStream << endl;
-#endif
-		}
-
-		// Status bits
-		outStream << QString("PS,%1").arg(0x8000 | controlBitsToPS(document.subPage(p)), 4, 16, QChar('0'));
-#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
-		outStream << Qt::endl;
-#else
-		outStream << endl;
-#endif
-
-		// Cycle time
-		if (document.pageFunction() == TeletextDocument::PFLevelOnePage)
-			// Assume that only Level One Pages have configurable cycle times
-			outStream << QString("CT,%1,%2").arg(document.subPage(p)->cycleValue()).arg(document.subPage(p)->cycleType()==LevelOnePage::CTcycles ? 'C' : 'T');
-		else
-			// X/28/0 specifies page function and coding but the PF command
-			// should make it obvious to a human that this isn't a Level One Page
-			outStream << QString("PF,%1,%2").arg(document.pageFunction()).arg(document.packetCoding());
-#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
-		outStream << Qt::endl;
-#else
-		outStream << endl;
-#endif
-
-		// FastText links
-		bool writeFLCommand = false;
-		if (document.pageFunction() == TeletextDocument::PFLevelOnePage && document.subPage(p)->packetExists(27,0)) {
-			// Subpage has FastText links - if any link to a specific subpage, we need to write X/27/0 as raw
-			// otherwise we write the links as a human-readable FL command later on
-			writeFLCommand = true;
-			// TODO uncomment this when we can edit FastText subpage links
-			/*for (int i=0; i<6; i++)
-				if (document.subPage(p)->fastTextLinkSubPageNumber(i) != 0x3f7f) {
-					writeFLCommand = false;
-					break;
-				}*/
-		}
-
-		// X/27 then X/28 always come first
-		for (int i=(writeFLCommand ? 1 : 0); i<16; i++)
-			writeHammingPacket(27, i);
-		for (int i=0; i<16; i++)
-			writeHammingPacket(28, i);
-
-		if (document.packetCoding() == TeletextDocument::Coding7bit) {
-			// For 7 bit coding i.e. Level One Pages, X/26 are written before X/1 to X/25
-			for (int i=0; i<16; i++)
-				writeHammingPacket(26, i);
-			for (int i=1; i<=24; i++)
-				write7bitPacket(i);
-		} else {
-			// For others (especially (G)POP pages) X/1 to X/25 are written before X/26
-			for (int i=1; i<=25; i++)
-				writeHammingPacket(i);
-			for (int i=0; i<16; i++)
-				writeHammingPacket(26, i);
-		}
-
-		if (writeFLCommand) {
-			outStream << "FL,";
-			for (int i=0; i<6; i++) {
-				// Stored as page link with relative magazine number, convert to absolute page number for display
-				int absoluteLinkPageNumber = document.subPage(p)->fastTextLinkPageNumber(i) ^ (document.pageNumber() & 0x700);
-				// Fix magazine 0 to 8
-				if ((absoluteLinkPageNumber & 0x700) == 0x000)
-					absoluteLinkPageNumber |= 0x800;
-
-				outStream << QString("%1").arg(absoluteLinkPageNumber, 3, 16, QChar('0'));
-				if (i<5)
-					outStream << ',';
-			}
-#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
-			outStream << Qt::endl;
-#else
-			outStream << endl;
-#endif
-		}
-
-		subPageNumber++;
-	}
-}
-
-void exportM29File(QSaveFile &file, const TeletextDocument &document)
-{
-	const PageBase &subPage = *document.currentSubPage();
-	QTextStream outStream(&file);
-
-	auto writeM29Packet=[&](int designationCode)
-	{
-		if (subPage.packetExists(28, designationCode)) {
-			QByteArray outLine = subPage.packet(28, designationCode);
-
-			outStream << QString("OL,29,");
-			// TTI stores raw values with bit 6 set, doesn't do Hamming encoding
-			outLine[0] = designationCode | 0x40;
-			for (int c=1; c<outLine.size(); c++)
-				outLine[c] = outLine.at(c) | 0x40;
-#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
-			outStream << outLine << Qt::endl;
-#else
-			outStream << outLine << endl;
-#endif
-		}
-	};
-
-#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)
-	outStream << "DE," << document.description() << Qt::endl;
-#else
-	outStream << "DE," << document.description() << endl;
-#endif
-
-	// Force page number to xFF
-	outStream << QString("PN,%1ff00").arg(document.pageNumber() >> 8, 1, 16);
-#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
-	outStream << Qt::endl;
-#else
-	outStream << endl;
-#endif
-
-	outStream << "PS,8000";
-#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
-	outStream << Qt::endl;
-#else
-	outStream << endl;
-#endif
-
-	writeM29Packet(0);
-	writeM29Packet(1);
-	writeM29Packet(4);
-}
-
-void exportT42File(QSaveFile &file, const TeletextDocument &document)
-{
-	const PageBase &subPage = *document.currentSubPage();
-
-	QDataStream outStream(&file);
-	// Displayable row header we export as spaces, hence the (odd parity valid) 0x20 init value
-	QByteArray outLine(42, 0x20);
-	int magazineNumber = (document.pageNumber() & 0xf00) >> 8;
-
-	auto write7bitPacket=[&](int packetNumber)
-	{
-		if (subPage.packetExists(packetNumber)) {
-			outLine[0] = hamming_8_4_encode[magazineNumber | ((packetNumber & 0x01) << 3)];
-			outLine[1] = hamming_8_4_encode[packetNumber >> 1];
-			outLine.replace(2, 40, subPage.packet(packetNumber));
-
-			// Odd parity encoding
-			for (int c=0; c<outLine.size(); c++) {
-				char p = outLine.at(c);
-
-				// Recursively divide integer into two equal halves and take their XOR until only 1 bit is left
-				p ^= p >> 4;
-				p ^= p >> 2;
-				p ^= p >> 1;
-				// If last bit left is 0 then it started with an even number of bits, so do the odd parity
-				if (!(p & 1))
-					outLine[c] = outLine.at(c) | 0x80;
-			}
-			outStream.writeRawData(outLine.constData(), 42);
-		}
-	};
-
-	auto writeHamming8_4Packet=[&](int packetNumber, int designationCode=0)
-	{
-		if (subPage.packetExists(packetNumber, designationCode)) {
-			outLine[0] = hamming_8_4_encode[magazineNumber | ((packetNumber & 0x01) << 3)];
-			outLine[1] = hamming_8_4_encode[packetNumber >> 1];
-			outLine.replace(2, 40, subPage.packet(packetNumber, designationCode));
-			outLine[2] = hamming_8_4_encode[designationCode];
-
-			for (int c=3; c<outLine.size(); c++)
-				outLine[c] = hamming_8_4_encode[(int)outLine.at(c)];
-
-			outStream.writeRawData(outLine.constData(), 42);
-		}
-	};
-
-	auto writeHamming24_18Packet=[&](int packetNumber, int designationCode=0)
-	{
-		if (subPage.packetExists(packetNumber, designationCode)) {
-			outLine[0] = hamming_8_4_encode[magazineNumber | ((packetNumber & 0x01) << 3)];
-			outLine[1] = hamming_8_4_encode[packetNumber >> 1];
-			outLine.replace(2, 40, subPage.packet(packetNumber, designationCode));
-			outLine[2] = hamming_8_4_encode[designationCode];
-
-			for (int c=3; c<outLine.size(); c+=3) {
-				unsigned int D5_D11;
-				unsigned int D12_D18;
-				unsigned int P5, P6;
-				unsigned int Byte_0;
-
-				const unsigned int toEncode = outLine[c] | (outLine[c+1] << 6) | (outLine[c+2] << 12);
-
-				Byte_0 = (hamming_24_18_forward[0][(toEncode >> 0) & 0xff] ^ hamming_24_18_forward[1][(toEncode >> 8) & 0xff] ^ hamming_24_18_forward_2[(toEncode >> 16) & 0x03]);
-				outLine[c] = Byte_0;
-
-				D5_D11 = (toEncode >> 4) & 0x7f;
-				D12_D18 = (toEncode >> 11) & 0x7f;
-
-				P5 = 0x80 & ~(hamming_24_18_parities[0][D12_D18] << 2);
-				outLine[c+1] = D5_D11 | P5;
-
-				P6 = 0x80 & ((hamming_24_18_parities[0][Byte_0] ^ hamming_24_18_parities[0][D5_D11]) << 2);
-				outLine[c+2] = D12_D18 | P6;
-			}
-
-			outStream.writeRawData(outLine.constData(), 42);
-		}
-	};
-
-
-	if (magazineNumber == 8)
-		magazineNumber = 0;
-
-	// Write X/0 separately as it features both Hamming 8/4 and 7-bit odd parity within
-	outLine[0] = magazineNumber & 0x07;
-	outLine[1] = 0; // Packet number 0
-	outLine[2] = document.pageNumber() & 0x00f;
-	outLine[3] = (document.pageNumber() & 0x0f0) >> 4;
-	outLine[4] = 0; // Subcode S1 - always export as 0
-	outLine[5] = subPage.controlBit(PageBase::C4ErasePage) << 3;
-	outLine[6] = 0; // Subcode S3 - always export as 0
-	outLine[7] = (subPage.controlBit(PageBase::C5Newsflash) << 2) | (subPage.controlBit(PageBase::C6Subtitle) << 3);
-	outLine[8] = subPage.controlBit(PageBase::C7SuppressHeader) | (subPage.controlBit(PageBase::C8Update) << 1) | (subPage.controlBit(PageBase::C9InterruptedSequence) << 2) | (subPage.controlBit(PageBase::C10InhibitDisplay) << 3);
-	outLine[9] = subPage.controlBit(PageBase::C11SerialMagazine) | (subPage.controlBit(PageBase::C14NOS) << 1) | (subPage.controlBit(PageBase::C13NOS) << 2) | (subPage.controlBit(PageBase::C12NOS) << 3);
-
-	for (int i=0; i<10; i++)
-		outLine[i] = hamming_8_4_encode[(int)outLine.at(i)];
-
-	// If we allow text in the row header, we'd odd-parity encode it here
-
-	outStream.writeRawData(outLine.constData(), 42);
-
-	// After X/0, X/27 then X/28 always come next
-	for (int i=0; i<4; i++)
-		writeHamming8_4Packet(27, i);
-	for (int i=4; i<16; i++)
-		writeHamming24_18Packet(27, i);
-	for (int i=0; i<16; i++)
-		writeHamming24_18Packet(28, i);
-
-	if (document.packetCoding() == TeletextDocument::Coding7bit) {
-		// For 7 bit coding i.e. Level One Pages, X/26 are written before X/1 to X/25
-		for (int i=0; i<16; i++)
-			writeHamming24_18Packet(26, i);
-		for (int i=1; i<=24; i++)
-			write7bitPacket(i);
-	} else {
-		// For others (especially (G)POP pages) X/1 to X/25 are written before X/26
-		if (document.packetCoding() == TeletextDocument::Coding18bit)
-			for (int i=1; i<=25; i++)
-				writeHamming24_18Packet(i);
-		else if (document.packetCoding() == TeletextDocument::Coding4bit)
-			for (int i=1; i<=25; i++)
-				writeHamming8_4Packet(i);
-		else
-			qDebug("Exported broken file as page coding is not supported");
-		for (int i=0; i<16; i++)
-			writeHamming24_18Packet(26, i);
-	}
-}
-
-QByteArray rowPacketAlways(PageBase *subPage, int packetNumber)
-{
-	if (subPage->packetExists(packetNumber))
-		return subPage->packet(packetNumber);
-	else
-		return QByteArray(40, ' ');
-}
-
-QString exportHashStringPage(LevelOnePage *subPage)
-{
-	int hashDigits[1167]={0};
-	int totalBits, charBit;
-	const char base64[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_";
-	QString hashString;
-
-	// TODO int editTFCharacterSet = 5;
-	bool blackForeground = false;
-
-	for (int r=0; r<25; r++) {
-		QByteArray rowPacket = rowPacketAlways(subPage, r);
-		for (int c=0; c<40; c++) {
-			if (rowPacket.at(c) == 0x00 || rowPacket.at(c) == 0x10)
-				blackForeground = true;
-			for (int b=0; b<7; b++) {
-				totalBits = (r * 40 + c) * 7 + b;
-				charBit = ((rowPacket.at(c)) >> (6 - b)) & 0x01;
-				hashDigits[totalBits / 6] |= charBit << (5 - (totalBits % 6));
-			}
-		}
-	}
-
-	hashString.append(QString("#%1:").arg(blackForeground ? 8 : 0, 1, 16));
-
-	for (int i=0; i<1167; i++)
-		hashString.append(base64[hashDigits[i]]);
-
-	return hashString;
-}
-
-QString exportHashStringPackets(LevelOnePage *subPage)
-{
-	auto colourToHexString=[&](int whichCLUT)
-	{
-		QString resultHexString;
-
-		for (int i=whichCLUT*8; i<whichCLUT*8+8; i++)
-			resultHexString.append(QString("%1").arg(subPage->CLUT(i), 3, 16, QChar('0')));
-		return resultHexString;
-	};
-
-	const char base64[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_";
-	QString result;
-
-	if (subPage->packetExists(28,0) || subPage->packetExists(28,4)) {
-		// X/28/0 and X/28/4 are duplicates apart from the CLUT definitions
-		// Assemble the duplicate beginning and ending of both packets
-		QString x28StringBegin, x28StringEnd;
-
-		x28StringBegin.append(QString("00%1").arg((subPage->defaultCharSet() << 3) | subPage->defaultNOS(), 2, 16, QChar('0')).toUpper());
-		x28StringBegin.append(QString("%1").arg((subPage->secondCharSet() << 3) | subPage->secondNOS(), 2, 16, QChar('0')).toUpper());
-		x28StringBegin.append(QString("%1%2%3%4").arg(subPage->leftSidePanelDisplayed(), 1, 10).arg(subPage->rightSidePanelDisplayed(), 1, 10).arg(subPage->sidePanelStatusL25(), 1, 10).arg(subPage->sidePanelColumns(), 1, 16));
-
-		x28StringEnd = QString("%1%2%3%4").arg(subPage->defaultScreenColour(), 2, 16, QChar('0')).arg(subPage->defaultRowColour(), 2, 16, QChar('0')).arg(subPage->blackBackgroundSubst(), 1, 10).arg(subPage->colourTableRemap(), 1, 10);
-
-		if (subPage->packetExists(28,0))
-			result.append(":X280=" + x28StringBegin + colourToHexString(2) + colourToHexString(3) + x28StringEnd);
-		if (subPage->packetExists(28,4))
-			result.append(":X284=" + x28StringBegin + colourToHexString(0) + colourToHexString(1) + x28StringEnd);
-	}
-
-	if (!subPage->enhancements()->isEmpty()) {
-		result.append(":X26=");
-		for (int i=0; i<subPage->enhancements()->size(); i++) {
-			result.append(base64[subPage->enhancements()->at(i).data() >> 1]);
-			result.append(base64[subPage->enhancements()->at(i).mode() | ((subPage->enhancements()->at(i).data() & 1) << 5)]);
-			result.append(base64[subPage->enhancements()->at(i).address()]);
-		}
-	}
-
-	result.append(QString(":PS=%1").arg(0x8000 | controlBitsToPS(subPage), 0, 16, QChar('0')));
-	return result;
-}

pagebase.cpp

@@ -1,122 +0,0 @@
-/*
- * 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 <QByteArray>
-
-#include "pagebase.h"
-
-PageBase::PageBase()
-{
-	// We use nullptrs to keep track of allocated packets, so initialise them this way
-	for (int i=0; i<26; i++)
-		m_displayPackets[i] = nullptr;
-	for (int i=0; i<4; i++)
-		for (int j=0; j<16; j++)
-			m_designationPackets[i][j] = nullptr;
-
-	for (int i=PageBase::C4ErasePage; i<=PageBase::C14NOS; i++)
-		m_controlBits[i] = false;
-}
-
-PageBase::~PageBase()
-{
-	for (int i=0; i<26; i++)
-		if (m_displayPackets[i] != nullptr)
-			delete m_displayPackets[i];
-	for (int i=0; i<4; i++)
-		for (int j=0; j<16; j++)
-			if (m_designationPackets[i][j] != nullptr)
-				delete m_designationPackets[i][j];
-}
-
-bool PageBase::isEmpty() const
-{
-	for (int i=0; i<26; i++)
-		if (m_displayPackets[i] != nullptr)
-			return false;
-	for (int i=0; i<4; i++)
-		for (int j=0; j<16; j++)
-			if (m_designationPackets[i][j] != nullptr)
-				return false;
-
-	return true;
-}
-
-QByteArray PageBase::packet(int i) const
-{
-	if (m_displayPackets[i] == nullptr)
-		return QByteArray(); // Blank result
-
-	return *m_displayPackets[i];
-}
-
-QByteArray PageBase::packet(int i, int j) const
-{
-	if (m_designationPackets[i-26][j] == nullptr)
-		return QByteArray(); // Blank result
-
-	return *m_designationPackets[i-26][j];
-}
-
-
-bool PageBase::setPacket(int i, QByteArray packetContents)
-{
-	if (m_displayPackets[i] == nullptr)
-		m_displayPackets[i] = new QByteArray(40, 0x00);
-	*m_displayPackets[i] = packetContents;
-
-	return true;
-}
-
-bool PageBase::setPacket(int i, int j, QByteArray packetContents)
-{
-	if (m_designationPackets[i-26][j] == nullptr)
-		m_designationPackets[i-26][j] = new QByteArray(40, 0x00);
-	*m_designationPackets[i-26][j] = packetContents;
-
-	return true;
-}
-
-/*
-bool PageBase::deletePacket(int i)
-{
-	if (m_displayPackets[i] != nullptr) {
-		delete m_displayPackets[i];
-		m_displayPackets[i] = nullptr;
-	}
-
-	return true;
-}
-
-bool PageBase::deletePacket(int i)
-{
-	if (m_designationPackets[i-26][j] != nullptr) {
-		delete m_designationPackets[i-26][j];
-		m_designationPackets[i-26][j] = nullptr;
-	}
-
-	return true;
-}
-*/
-
-bool PageBase::setControlBit(int bitNumber, bool active)
-{
-	m_controlBits[bitNumber] = active;
-	return true;
-}

qteletextmaker.pro

@@ -1,51 +0,0 @@
-QT += widgets
-requires(qtConfig(filedialog))
-
-HEADERS       = decode.h \
-                document.h \
-                hamming.h \
-                keymap.h \
-                levelonecommands.h \
-                levelonepage.h \
-                loadsave.h \
-                mainwidget.h \
-                mainwindow.h \
-                pagebase.h \
-                pagex26base.h \
-                pagecomposelinksdockwidget.h \
-                pageenhancementsdockwidget.h \
-                pageoptionsdockwidget.h \
-                palettedockwidget.h \
-                render.h \
-                x26commands.h \
-                x26dockwidget.h \
-                x26menus.h \
-                x26model.h \
-                x26triplets.h \
-                x28commands.h
-SOURCES       = decode.cpp \
-                document.cpp \
-                levelonecommands.cpp \
-                levelonepage.cpp \
-                loadsave.cpp \
-                main.cpp \
-                mainwidget.cpp \
-                mainwindow.cpp \
-                pagebase.cpp \
-                pagex26base.cpp \
-                pagecomposelinksdockwidget.cpp \
-                pageenhancementsdockwidget.cpp \
-                pageoptionsdockwidget.cpp \
-                palettedockwidget.cpp \
-                render.cpp \
-                x26commands.cpp \
-                x26dockwidget.cpp \
-                x26menus.cpp \
-                x26model.cpp \
-                x26triplets.cpp \
-                x28commands.cpp
-RESOURCES     = qteletextmaker.qrc
-
-# install
-target.path = /usr/local/bin
-INSTALLS += target

src/qteletextdecoder/CMakeLists.txt

@@ -0,0 +1,7 @@
+file (GLOB SOURCES *.cpp)
+
+add_library(qteletextdecoder ${SOURCES} teletextfonts.qrc)
+
+target_include_directories(qteletextdecoder PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
+
+target_link_libraries(qteletextdecoder Qt::Widgets)

src/qteletextdecoder/decode.cpp

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

src/qteletextdecoder/decode.h

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

src/qteletextdecoder/document.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2024 Gavin MacGregor
+ * Copyright (C) 2020-2025 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *
@@ -18,7 +18,7 @@
  */
 
 #include <QAbstractListModel>
-#include <vector>
+#include <QList>
 
 #include "document.h"
 
@@ -52,7 +52,7 @@ void ClutModel::setSubPage(LevelOnePage *subPage)
 {
 	if (subPage != m_subPage) {
 		m_subPage = subPage;
-		emit dataChanged(createIndex(0, 0), createIndex(31, 0), QVector<int>(Qt::DecorationRole));
+		emit dataChanged(createIndex(0, 0), createIndex(31, 0), QList<int>(Qt::DecorationRole));
 	}
 }
 
@@ -63,11 +63,12 @@ TeletextDocument::TeletextDocument()
 	m_description.clear();
 	m_pageFunction = PFLevelOnePage;
 	m_packetCoding = Coding7bit;
-	m_subPages.push_back(new LevelOnePage);
+	m_subPages.append(new LevelOnePage);
 	m_currentSubPageIndex = 0;
 	m_undoStack = new QUndoStack(this);
 	m_cursorRow = 1;
 	m_cursorColumn = 0;
+	m_rowZeroAllowed = false;
 	m_selectionCornerRow = m_selectionCornerColumn = -1;
 	m_selectionSubPage = nullptr;
 
@@ -96,9 +97,7 @@ bool TeletextDocument::isEmpty() const
 
 void TeletextDocument::clear()
 {
-	LevelOnePage *blankSubPage = new LevelOnePage;
-
-	m_subPages.insert(m_subPages.begin(), blankSubPage);
+	m_subPages.prepend(new LevelOnePage);
 
 	emit aboutToChangeSubPage();
 	m_currentSubPageIndex = 0;
@@ -109,7 +108,7 @@ void TeletextDocument::clear()
 
 	for (int i=m_subPages.size()-1; i>0; i--) {
 		delete(m_subPages[i]);
-		m_subPages.erase(m_subPages.begin()+i);
+		m_subPages.remove(i);
 	}
 }
 
@@ -176,9 +175,9 @@ void TeletextDocument::insertSubPage(int beforeSubPageIndex, bool copySubPage)
 		insertedSubPage = new LevelOnePage;
 
 	if (beforeSubPageIndex == m_subPages.size())
-		m_subPages.push_back(insertedSubPage);
+		m_subPages.append(insertedSubPage);
 	else
-		m_subPages.insert(m_subPages.begin()+beforeSubPageIndex, insertedSubPage);
+		m_subPages.insert(beforeSubPageIndex, insertedSubPage);
 }
 
 void TeletextDocument::deleteSubPage(int subPageToDelete)
@@ -186,19 +185,19 @@ void TeletextDocument::deleteSubPage(int subPageToDelete)
 	m_clutModel->setSubPage(nullptr);
 
 	delete(m_subPages[subPageToDelete]);
-	m_subPages.erase(m_subPages.begin()+subPageToDelete);
+	m_subPages.remove(subPageToDelete);
 }
 
 void TeletextDocument::deleteSubPageToRecycle(int subPageToRecycle)
 {
-	m_recycleSubPages.push_back(m_subPages[subPageToRecycle]);
-	m_subPages.erase(m_subPages.begin()+subPageToRecycle);
+	m_recycleSubPages.append(m_subPages[subPageToRecycle]);
+	m_subPages.remove(subPageToRecycle);
 }
 
 void TeletextDocument::unDeleteSubPageFromRecycle(int subPage)
 {
-	m_subPages.insert(m_subPages.begin()+subPage, m_recycleSubPages.back());
-	m_recycleSubPages.pop_back();
+	m_subPages.insert(subPage, m_recycleSubPages.last());
+	m_recycleSubPages.removeLast();
 }
 
 void TeletextDocument::setPageNumber(int pageNumber)
@@ -252,7 +251,7 @@ void TeletextDocument::cursorUp(bool shiftKey)
 	if (shiftKey && !selectionActive())
 		setSelectionCorner(m_cursorRow, m_cursorColumn);
 
-	if (--m_cursorRow == 0)
+	if (--m_cursorRow == 0 - (int)m_rowZeroAllowed)
 		m_cursorRow = 24;
 
 	if (shiftKey)
@@ -269,7 +268,7 @@ void TeletextDocument::cursorDown(bool shiftKey)
 		setSelectionCorner(m_cursorRow, m_cursorColumn);
 
 	if (++m_cursorRow == 25)
-		m_cursorRow = 1;
+		m_cursorRow = (int)!m_rowZeroAllowed;
 
 	if (shiftKey)
 		emit selectionMoved();
@@ -333,6 +332,13 @@ void TeletextDocument::moveCursor(int cursorRow, int cursorColumn, bool selectio
 	emit cursorMoved();
 }
 
+void TeletextDocument::setRowZeroAllowed(bool allowed)
+{
+	m_rowZeroAllowed = allowed;
+	if (m_cursorRow == 0 && !allowed)
+		cursorDown();
+}
+
 void TeletextDocument::setSelectionCorner(int row, int column)
 {
 	if (m_selectionCornerRow != row || m_selectionCornerColumn != column) {

src/qteletextdecoder/document.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2024 Gavin MacGregor
+ * Copyright (C) 2020-2025 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *
@@ -21,9 +21,9 @@
 #define DOCUMENT_H
 
 #include <QAbstractListModel>
+#include <QList>
 #include <QObject>
 #include <QUndoStack>
-#include <vector>
 
 #include "levelonepage.h"
 
@@ -89,6 +89,8 @@ public:
 	void cursorLeft(bool shiftKey=false);
 	void cursorRight(bool shiftKey=false);
 	void moveCursor(int cursorRow, int cursorColumn, bool selectionInProgress=false);
+	bool rowZeroAllowed() const { return m_rowZeroAllowed; };
+	void setRowZeroAllowed(bool allowed);
 	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); }
@@ -119,10 +121,11 @@ private:
 	int m_pageNumber, m_currentSubPageIndex;
 	PageFunctionEnum m_pageFunction;
 	PacketCodingEnum m_packetCoding;
-	std::vector<LevelOnePage *> m_subPages;
-	std::vector<LevelOnePage *> m_recycleSubPages;
+	QList<LevelOnePage *> m_subPages;
+	QList<LevelOnePage *> m_recycleSubPages;
 	QUndoStack *m_undoStack;
 	int m_cursorRow, m_cursorColumn, m_selectionCornerRow, m_selectionCornerColumn;
+	bool m_rowZeroAllowed;
 	LevelOnePage *m_selectionSubPage;
 	ClutModel *m_clutModel;
 };

src/qteletextdecoder/levelonepage.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2024 Gavin MacGregor
+ * Copyright (C) 2020-2025 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *
@@ -33,31 +33,11 @@ LevelOnePage::LevelOnePage()
 	clearPage();
 }
 
-LevelOnePage::LevelOnePage(const PageBase &other)
-{
-	m_enhancements.reserve(maxEnhancements());
-	clearPage();
-
-	for (int i=0; i<26; i++)
-		if (other.packetExists(i))
-			setPacket(i, other.packet(i));
-	for (int i=26; i<30; i++)
-		for (int j=0; j<16; j++)
-			if (other.packetExists(i, j))
-				setPacket(i, j, other.packet(i));
-
-	for (int i=PageBase::C4ErasePage; i<=PageBase::C14NOS; i++)
-		setControlBit(i, other.controlBit(i));
-}
-
 // So far we only call clearPage() once, within the constructor
 void LevelOnePage::clearPage()
 {
-	for (int r=0; r<25; r++)
-		for (int c=0; c<40; c++)
-			m_level1Page[r][c] = 0x20;
-	for (int i=C4ErasePage; i<=C14NOS; i++)
-		setControlBit(i, false);
+	for (int b=C4ErasePage; b<=C14NOS; b++)
+		setControlBit(b, false);
 	for (int i=0; i<8; i++)
 		m_composeLink[i] = { (i<4) ? i : 0, false, i>=4, 0x0ff, 0x0000 };
 	for (int i=0; i<6; i++)
@@ -91,38 +71,24 @@ bool LevelOnePage::isEmpty() const
 		return false;
 
 	for (int r=0; r<25; r++)
-		for (int c=0; c<40; c++)
-			if (m_level1Page[r][c] != 0x20)
-				return false;
+		if (!PageX26Base::packet(r).isEmpty())
+			return false;
 
 	return true;
 }
 
-QByteArray LevelOnePage::packet(int packetNumber) const
+QByteArray LevelOnePage::packet(int y, int d) const
 {
 	QByteArray result(40, 0x00);
 
-	if (packetNumber <= 24) {
-		for (int c=0; c<40; c++)
-			result[c] = m_level1Page[packetNumber][c];
-		return result;
-	}
-
-	return PageBase::packet(packetNumber);
-}
-
-QByteArray LevelOnePage::packet(int packetNumber, int designationCode) const
-{
-	QByteArray result(40, 0x00);
-
-	if (packetNumber == 26) {
-		if (!packetFromEnhancementListNeeded(designationCode))
+	if (y == 26) {
+		if (!packetFromEnhancementListNeeded(d))
 			return result; // Blank result
 
-		return packetFromEnhancementList(designationCode);
+		return packetFromEnhancementList(d);
 	}
 
-	if (packetNumber == 27 && designationCode == 0) {
+	if (y == 27 && d == 0) {
 		for (int i=0; i<6; i++) {
 			result[i*6+1] = m_fastTextLink[i].pageNumber & 0x00f;
 			result[i*6+2] = (m_fastTextLink[i].pageNumber & 0x0f0) >> 4;
@@ -137,9 +103,9 @@ QByteArray LevelOnePage::packet(int packetNumber, int designationCode) const
 		return result;
 	}
 
-	if (packetNumber == 27 && (designationCode == 4 || designationCode == 5)) {
-		for (int i=0; i<(designationCode == 4 ? 6 : 2); i++) {
-			int pageLinkNumber = i+(designationCode == 4 ? 0 : 6);
+	if (y == 27 && (d == 4 || d == 5)) {
+		for (int i=0; i<(d == 4 ? 6 : 2); i++) {
+			int pageLinkNumber = i+(d == 4 ? 0 : 6);
 
 			result[i*6+1] = (m_composeLink[pageLinkNumber].level3p5 << 3) | (m_composeLink[pageLinkNumber].level2p5 << 2) | m_composeLink[pageLinkNumber].function;
 			result[i*6+2] = ((m_composeLink[pageLinkNumber].pageNumber & 0x100) >> 3) | 0x10 | (m_composeLink[pageLinkNumber].pageNumber & 0x00f);
@@ -153,8 +119,8 @@ QByteArray LevelOnePage::packet(int packetNumber, int designationCode) const
 		return result;
 	}
 
-	if (packetNumber == 28 && (designationCode == 0 || designationCode == 4)) {
-		int CLUToffset = (designationCode == 0) ? 16 : 0;
+	if (y == 28 && (d == 0 || d == 4)) {
+		int CLUToffset = (d == 0) ? 16 : 0;
 
 		result[1] = 0x00;
 		result[2] = ((m_defaultCharSet & 0x3) << 4) | (m_defaultNOS << 1);
@@ -174,34 +140,32 @@ QByteArray LevelOnePage::packet(int packetNumber, int designationCode) const
 		return result;
 	}
 
-	return PageBase::packet(packetNumber, designationCode);
+	return PageX26Base::packet(y, d);
 }
 
-bool LevelOnePage::setPacket(int packetNumber, QByteArray packetContents)
+/*
+bool LevelOnePage::setPacket(int y, QByteArray pkt)
 {
-	if (packetNumber <= 24) {
-		for (int c=0; c<40; c++)
-			m_level1Page[packetNumber][c] = packetContents.at(c);
+	if (y == 25)
+		qDebug("LevelOnePage unhandled setPacket X/25");
+
+	return PageX26Base::setPacket(y, pkt);
+}
+*/
+
+bool LevelOnePage::setPacket(int y, int d, QByteArray pkt)
+{
+	if (y == 26) {
+		setEnhancementListFromPacket(d, pkt);
 		return true;
 	}
 
-	qDebug("LevelOnePage unhandled setPacket X/%d", packetNumber);
-	return PageBase::setPacket(packetNumber, packetContents);
-}
-
-bool LevelOnePage::setPacket(int packetNumber, int designationCode, QByteArray packetContents)
-{
-	if (packetNumber == 26) {
-		setEnhancementListFromPacket(designationCode, packetContents);
-		return true;
-	}
-
-	if (packetNumber == 27 && designationCode == 0) {
+	if (y == 27 && d == 0) {
 		for (int i=0; i<6; i++) {
-			int relativeMagazine = (packetContents.at(i*6+4) >> 3) | ((packetContents.at(i*6+6) & 0xc) >> 1);
-			int pageNumber = (packetContents.at(i*6+2) << 4) | packetContents.at(i*6+1);
+			int relativeMagazine = (pkt.at(i*6+4) >> 3) | ((pkt.at(i*6+6) & 0xc) >> 1);
+			int pageNumber = (pkt.at(i*6+2) << 4) | pkt.at(i*6+1);
 			m_fastTextLink[i].pageNumber = (relativeMagazine << 8) | pageNumber;
-			m_fastTextLink[i].subPageNumber = packetContents.at(i*6+3) | ((packetContents.at(i*6+4) & 0x7) << 4) | (packetContents.at(i*6+5) << 8) | ((packetContents.at(i*6+6) & 0x3) << 12);
+			m_fastTextLink[i].subPageNumber = pkt.at(i*6+3) | ((pkt.at(i*6+4) & 0x7) << 4) | (pkt.at(i*6+5) << 8) | ((pkt.at(i*6+6) & 0x3) << 12);
 			// TODO remove this warning when we can preserve FastText subpage links
 			if (m_fastTextLink[i].subPageNumber != 0x3f7f)
 				qDebug("FastText link %d has custom subPageNumber %x - will NOT be saved!", i, m_fastTextLink[i].subPageNumber);
@@ -209,71 +173,59 @@ bool LevelOnePage::setPacket(int packetNumber, int designationCode, QByteArray p
 		return true;
 	}
 
-	if (packetNumber == 27 && (designationCode == 4 || designationCode == 5)) {
-		for (int i=0; i<(designationCode == 4 ? 6 : 2); i++) {
-			int pageLinkNumber = i+(designationCode == 4 ? 0 : 6);
-			int pageFunction = packetContents.at(i*6+1) & 0x03;
+	if (y == 27 && (d == 4 || d == 5)) {
+		for (int i=0; i<(d == 4 ? 6 : 2); i++) {
+			int pageLinkNumber = i+(d == 4 ? 0 : 6);
+			int pageFunction = pkt.at(i*6+1) & 0x03;
 			if (i >= 4)
 				m_composeLink[pageLinkNumber].function = pageFunction;
 			else if (i != pageFunction)
 				qDebug("X/27/4 link number %d fixed at function %d. Attempted to set to %d.", pageLinkNumber, pageLinkNumber, pageFunction);
 
-			m_composeLink[pageLinkNumber].level2p5 = packetContents.at(i*6+1) & 0x04;
-			m_composeLink[pageLinkNumber].level3p5 = packetContents.at(i*6+1) & 0x08;
+			m_composeLink[pageLinkNumber].level2p5 = pkt.at(i*6+1) & 0x04;
+			m_composeLink[pageLinkNumber].level3p5 = pkt.at(i*6+1) & 0x08;
 
-			m_composeLink[pageLinkNumber].pageNumber = ((packetContents.at(i*6+3) & 0x03) << 9) | ((packetContents.at(i*6+2) & 0x20) << 3) | ((packetContents.at(i*6+3) & 0x3c) << 2) | (packetContents.at(i*6+2) & 0x0f);
+			m_composeLink[pageLinkNumber].pageNumber = ((pkt.at(i*6+3) & 0x03) << 9) | ((pkt.at(i*6+2) & 0x20) << 3) | ((pkt.at(i*6+3) & 0x3c) << 2) | (pkt.at(i*6+2) & 0x0f);
 
-			m_composeLink[pageLinkNumber].subPageCodes = (packetContents.at(i*6+4) >> 2) | (packetContents.at(i*6+5) << 4) | (packetContents.at(i*6+6) << 10);
+			m_composeLink[pageLinkNumber].subPageCodes = (pkt.at(i*6+4) >> 2) | (pkt.at(i*6+5) << 4) | (pkt.at(i*6+6) << 10);
 		}
 		return true;
 	}
 
-	if (packetNumber == 28 && (designationCode == 0 || designationCode == 4)) {
-		int CLUToffset = (designationCode == 0) ? 16 : 0;
+	if (y == 28 && (d == 0 || d == 4)) {
+		int CLUToffset = (d == 0) ? 16 : 0;
 
-		m_defaultCharSet = ((packetContents.at(2) >> 4) & 0x3) | ((packetContents.at(3) << 2) & 0xc);
-		m_defaultNOS = (packetContents.at(2) >> 1) & 0x7;
-		m_secondCharSet = ((packetContents.at(3) >> 5) & 0x1) | ((packetContents.at(4) << 1) & 0xe);
-		m_secondNOS = (packetContents.at(3) >> 2) & 0x7;
+		m_defaultCharSet = ((pkt.at(2) >> 4) & 0x3) | ((pkt.at(3) << 2) & 0xc);
+		m_defaultNOS = (pkt.at(2) >> 1) & 0x7;
+		m_secondCharSet = ((pkt.at(3) >> 5) & 0x1) | ((pkt.at(4) << 1) & 0xe);
+		m_secondNOS = (pkt.at(3) >> 2) & 0x7;
 
-		m_leftSidePanelDisplayed = (packetContents.at(4) >> 3) & 1;
-		m_rightSidePanelDisplayed = (packetContents.at(4) >> 4) & 1;
-		m_sidePanelStatusL25 = (packetContents.at(4) >> 5) & 1;
-		m_sidePanelColumns = packetContents.at(5) & 0xf;
+		m_leftSidePanelDisplayed = (pkt.at(4) >> 3) & 1;
+		m_rightSidePanelDisplayed = (pkt.at(4) >> 4) & 1;
+		m_sidePanelStatusL25 = (pkt.at(4) >> 5) & 1;
+		m_sidePanelColumns = pkt.at(5) & 0xf;
 
 		for (int c=0; c<16; c++)
-			m_CLUT[CLUToffset+c] = ((packetContents.at(c*2+5) << 4) & 0x300) | ((packetContents.at(c*2+6) << 10) & 0xc00) | ((packetContents.at(c*2+6) << 2) & 0x0f0) | (packetContents.at(c*2+7) & 0x00f);
+			m_CLUT[CLUToffset+c] = ((pkt.at(c*2+5) << 4) & 0x300) | ((pkt.at(c*2+6) << 10) & 0xc00) | ((pkt.at(c*2+6) << 2) & 0x0f0) | (pkt.at(c*2+7) & 0x00f);
 
-		m_defaultScreenColour = (packetContents.at(37) >> 4) | ((packetContents.at(38) << 2) & 0x1c);
-		m_defaultRowColour = ((packetContents.at(38)) >> 3) | ((packetContents.at(39) << 3) & 0x18);
-		m_blackBackgroundSubst = (packetContents.at(39) >> 2) & 1;
-		m_colourTableRemap = (packetContents.at(39) >> 3) & 7;
+		m_defaultScreenColour = (pkt.at(37) >> 4) | ((pkt.at(38) << 2) & 0x1c);
+		m_defaultRowColour = ((pkt.at(38)) >> 3) | ((pkt.at(39) << 3) & 0x18);
+		m_blackBackgroundSubst = (pkt.at(39) >> 2) & 1;
+		m_colourTableRemap = (pkt.at(39) >> 3) & 7;
 
 		return true;
 	}
 
-	qDebug("LevelOnePage unhandled setPacket X/%d/%d", packetNumber, designationCode);
-	return PageBase::setPacket(packetNumber, designationCode, packetContents);
+	qDebug("LevelOnePage unhandled setPacket X/%d/%d", y, d);
+	return PageX26Base::setPacket(y, d, pkt);
 }
 
-bool LevelOnePage::packetExists(int packetNumber) const
+bool LevelOnePage::packetExists(int y, int d) const
 {
-	if (packetNumber <= 24) {
-		for (int c=0; c<40; c++)
-			if (m_level1Page[packetNumber][c] != 0x20)
-				return true;
-		return false;
-	}
+	if (y == 26)
+		return packetFromEnhancementListNeeded(d);
 
-	return PageBase::packetExists(packetNumber);
-}
-
-bool LevelOnePage::packetExists(int packetNumber, int designationCode) const
-{
-	if (packetNumber == 26)
-		return packetFromEnhancementListNeeded(designationCode);
-
-	if (packetNumber == 27 && designationCode == 0) {
+	if (y == 27 && d == 0) {
 		for (int i=0; i<6; i++)
 			if ((m_fastTextLink[i].pageNumber & 0x0ff) != 0xff)
 				return true;
@@ -281,63 +233,49 @@ bool LevelOnePage::packetExists(int packetNumber, int designationCode) const
 		return false;
 	}
 
-	if (packetNumber == 27 && (designationCode == 4 || designationCode == 5)) {
-		for (int i=0; i<(designationCode == 4 ? 6 : 2); i++) {
-			int pageLinkNumber = i+(designationCode == 4 ? 0 : 6);
+	if (y == 27 && (d == 4 || d == 5)) {
+		for (int i=0; i<(d == 4 ? 6 : 2); i++) {
+			int pageLinkNumber = i+(d == 4 ? 0 : 6);
 			if ((m_composeLink[pageLinkNumber].pageNumber & 0x0ff) != 0x0ff)
 				return true;
 		}
 		return false;
 	}
 
-	if (packetNumber == 28) {
-		if (designationCode == 0) {
-			if (m_leftSidePanelDisplayed || m_rightSidePanelDisplayed || m_defaultScreenColour !=0 || m_defaultRowColour !=0 || m_blackBackgroundSubst || m_colourTableRemap !=0 || m_defaultCharSet != 0 || m_secondCharSet != 0xf)
+	if (y == 28) {
+		if (d == 0) {
+			if (m_leftSidePanelDisplayed || m_rightSidePanelDisplayed || m_defaultScreenColour != 0 || m_defaultRowColour != 0 || m_blackBackgroundSubst || m_colourTableRemap != 0 || m_secondCharSet != 0xf)
 				return true;
 			return !isPaletteDefault(16, 31);
 		}
-		if (designationCode == 4)
+		if (d == 4)
 			return !isPaletteDefault(0, 15);
 	}
 
-	return PageBase::packetExists(packetNumber, designationCode);
+	return PageX26Base::packetExists(y, d);
 }
 
-bool LevelOnePage::controlBit(int bitNumber) const
+bool LevelOnePage::setControlBit(int b, bool active)
 {
-	switch (bitNumber) {
+	switch (b) {
 		case C12NOS:
-			return (m_defaultNOS & 1) == 1;
+			m_defaultNOS &= 0x6;
+			if (active)
+				m_defaultNOS |= 0x1;
+			break;
 		case C13NOS:
-			return (m_defaultNOS & 2) == 2;
+			m_defaultNOS &= 0x5;
+			if (active)
+				m_defaultNOS |= 0x2;
+			break;
 		case C14NOS:
-			return (m_defaultNOS & 4) == 4;
-		default:
-			return PageBase::controlBit(bitNumber);
+			m_defaultNOS &= 0x3;
+			if (active)
+				m_defaultNOS |= 0x4;
+			break;
 	}
-}
 
-bool LevelOnePage::setControlBit(int bitNumber, bool active)
-{
-	switch (bitNumber) {
-		case C12NOS:
-			m_defaultNOS &= 0x06;
-			if (active)
-				m_defaultNOS |= 0x01;
-			return true;
-		case C13NOS:
-			m_defaultNOS &= 0x05;
-			if (active)
-				m_defaultNOS |= 0x02;
-			return true;
-		case C14NOS:
-			m_defaultNOS &= 0x03;
-			if (active)
-				m_defaultNOS |= 0x04;
-			return true;
-		default:
-			return PageBase::setControlBit(bitNumber, active);
-	}
+	return PageX26Base::setControlBit(b, active);
 }
 
 /* void LevelOnePage::setSubPageNumber(int newSubPageNumber) { m_subPageNumber = newSubPageNumber; } */
@@ -348,6 +286,10 @@ void LevelOnePage::setDefaultCharSet(int newDefaultCharSet) { m_defaultCharSet =
 void LevelOnePage::setDefaultNOS(int defaultNOS)
 {
 	m_defaultNOS = defaultNOS;
+
+	PageX26Base::setControlBit(C12NOS, m_defaultNOS & 0x1);
+	PageX26Base::setControlBit(C13NOS, m_defaultNOS & 0x2);
+	PageX26Base::setControlBit(C14NOS, m_defaultNOS & 0x4);
 }
 
 void LevelOnePage::setSecondCharSet(int newSecondCharSet)
@@ -358,7 +300,27 @@ void LevelOnePage::setSecondCharSet(int newSecondCharSet)
 }
 
 void LevelOnePage::setSecondNOS(int newSecondNOS) { m_secondNOS = newSecondNOS; }
-void LevelOnePage::setCharacter(int row, int column, unsigned char newCharacter) { m_level1Page[row][column] = newCharacter; }
+
+void LevelOnePage::setCharacter(int r, int c, unsigned char newCharacter)
+{
+	QByteArray pkt;
+
+	if (!packetExists(r)) {
+		if (newCharacter == 0x20)
+			return;
+		pkt = QByteArray(40, 0x20);
+		pkt[c] = newCharacter;
+		setPacket(r, pkt);
+	} else {
+		pkt = packet(r);
+		pkt[c] = newCharacter;
+		if (pkt == QByteArray(40, 0x20))
+			clearPacket(r);
+		else
+			setPacket(r, pkt);
+	}
+}
+
 void LevelOnePage::setDefaultScreenColour(int newDefaultScreenColour) { m_defaultScreenColour = newDefaultScreenColour; }
 void LevelOnePage::setDefaultRowColour(int newDefaultRowColour) { m_defaultRowColour = newDefaultRowColour; }
 void LevelOnePage::setColourTableRemap(int newColourTableRemap) { m_colourTableRemap = newColourTableRemap; }

src/qteletextdecoder/levelonepage.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2024 Gavin MacGregor
+ * Copyright (C) 2020-2025 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *
@@ -33,26 +33,25 @@ class LevelOnePage : public PageX26Base //: public QObject
 	//Q_OBJECT
 
 public:
+	using PageX26Base::packet;
+	using PageX26Base::setPacket;
+	using PageX26Base::packetExists;
+
 	enum CycleTypeEnum { CTcycles, CTseconds };
 
 	LevelOnePage();
-	LevelOnePage(const PageBase &other);
 
 	bool isEmpty() const 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;
+	QByteArray packet(int y, int d) const override;
+	bool setPacket(int y, int d, QByteArray pkt) override;
+	bool packetExists(int y, int d) const override;
 
-	bool controlBit(int bitNumber) const override;
-	bool setControlBit(int bitNumber, bool active) override;
+	bool setControlBit(int b, bool active) override;
 
 	void clearPage();
 
-	int maxEnhancements() const { return 208; };
+	int maxEnhancements() const override { return 208; };
 
 /*	void setSubPageNumber(int); */
 	int cycleValue() const { return m_cycleValue; };
@@ -67,8 +66,8 @@ public:
 	void setSecondCharSet(int newSecondCharSet);
 	int secondNOS() const { return m_secondNOS; }
 	void setSecondNOS(int newSecondNOS);
-	unsigned char character(int row, int column) const { return m_level1Page[row][column]; }
-	void setCharacter(int row, int column, unsigned char newCharacter);
+	unsigned char character(int r, int c) const { return PageX26Base::packetExists(r) ? PageX26Base::packet(r).at(c) : 0x20; }
+	void setCharacter(int r, int c, unsigned char newChar);
 	int defaultScreenColour() const { return m_defaultScreenColour; }
 	void setDefaultScreenColour(int newDefaultScreenColour);
 	int defaultRowColour() const { return m_defaultRowColour; }
@@ -105,7 +104,6 @@ public:
 	void setComposeLinkSubPageCodes(int linkNumber, int newSubPageCodes);
 
 private:
-	unsigned char m_level1Page[25][40];
 /*	int m_subPageNumber; */
 	int m_cycleValue;
 	CycleTypeEnum m_cycleType;

src/qteletextdecoder/pagebase.cpp

@@ -0,0 +1,84 @@
+/*
+ * Copyright (C) 2020-2025 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 <QByteArray>
+
+#include "pagebase.h"
+
+PageBase::PageBase()
+{
+	for (int b=PageBase::C4ErasePage; b<=PageBase::C14NOS; b++)
+		m_controlBits[b] = false;
+}
+
+bool PageBase::isEmpty() const
+{
+	for (int y=0; y<26; y++)
+		if (!m_displayPackets[y].isEmpty())
+			return false;
+	for (int y=0; y<3; y++)
+		for (int d=0; d<16; d++)
+			if (!m_designationPackets[y][d].isEmpty())
+				return false;
+
+	return true;
+}
+
+bool PageBase::setPacket(int y, QByteArray pkt)
+{
+	m_displayPackets[y] = pkt;
+
+	return true;
+}
+
+bool PageBase::setPacket(int y, int d, QByteArray pkt)
+{
+	m_designationPackets[y-26][d] = pkt;
+
+	return true;
+}
+
+bool PageBase::clearPacket(int y)
+{
+	m_displayPackets[y] = QByteArray();
+
+	return true;
+}
+
+bool PageBase::clearPacket(int y, int d)
+{
+	m_designationPackets[y-26][d] = QByteArray();
+
+	return true;
+}
+
+void PageBase::clearAllPackets()
+{
+	for (int y=0; y<26; y++)
+		clearPacket(y);
+	for (int y=0; y<3; y++)
+		for (int d=0; d<16; d++)
+			clearPacket(y, d);
+}
+
+bool PageBase::setControlBit(int b, bool active)
+{
+	m_controlBits[b] = active;
+	return true;
+}

src/qteletextdecoder/pagebase.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2024 Gavin MacGregor
+ * Copyright (C) 2020-2025 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *
@@ -31,25 +31,25 @@ public:
 	enum ControlBitsEnum { C4ErasePage, C5Newsflash, C6Subtitle, C7SuppressHeader, C8Update, C9InterruptedSequence, C10InhibitDisplay, C11SerialMagazine, C12NOS, C13NOS, C14NOS };
 
 	PageBase();
-	virtual ~PageBase();
 
 	virtual bool isEmpty() 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 i, QByteArray packetContents);
-	virtual bool setPacket(int i, int j, QByteArray packetContents);
-//	bool deletePacket(int);
-//	bool deletePacket(int, int);
+	virtual QByteArray packet(int y) const { return m_displayPackets[y]; }
+	virtual QByteArray packet(int y, int d) const { return m_designationPackets[y-26][d]; }
+	virtual bool setPacket(int y, QByteArray pkt);
+	virtual bool setPacket(int y, int d, QByteArray pkt);
+	virtual bool packetExists(int y) const { return !m_displayPackets[y].isEmpty(); }
+	virtual bool packetExists(int y, int d) const { return !m_designationPackets[y-26][d].isEmpty(); }
+	bool clearPacket(int y);
+	bool clearPacket(int y, int d);
+	void clearAllPackets();
 
-	virtual bool controlBit(int bitNumber) const { return m_controlBits[bitNumber]; }
-	virtual bool setControlBit(int bitNumber, bool active);
+	virtual bool controlBit(int b) const { return m_controlBits[b]; }
+	virtual bool setControlBit(int b, bool active);
 
 private:
 	bool m_controlBits[11];
-	QByteArray *m_displayPackets[26], *m_designationPackets[4][16];
+	QByteArray m_displayPackets[26], m_designationPackets[3][16];
 };
 
 #endif

src/qteletextdecoder/pagex26base.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2024 Gavin MacGregor
+ * Copyright (C) 2020-2025 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *
@@ -21,20 +21,19 @@
 
 #include "pagex26base.h"
 
-QByteArray PageX26Base::packetFromEnhancementList(int packetNumber) const
+QByteArray PageX26Base::packetFromEnhancementList(int p) const
 {
 	QByteArray result(40, 0x00);
 
-	int enhanceListPointer;
 	X26Triplet lastTriplet;
 
-	for (int i=0; i<13; i++) {
-		enhanceListPointer = packetNumber*13+i;
+	for (int t=0; t<13; t++) {
+		const int enhanceListPointer = p*13+t;
 
 		if (enhanceListPointer < m_enhancements.size()) {
-			result[i*3+1] = m_enhancements.at(enhanceListPointer).address();
-			result[i*3+2] = m_enhancements.at(enhanceListPointer).mode() | ((m_enhancements.at(enhanceListPointer).data() & 1) << 5);
-			result[i*3+3] = m_enhancements.at(enhanceListPointer).data() >> 1;
+			result[t*3+1] = m_enhancements.at(enhanceListPointer).address();
+			result[t*3+2] = m_enhancements.at(enhanceListPointer).mode() | ((m_enhancements.at(enhanceListPointer).data() & 1) << 5);
+			result[t*3+3] = m_enhancements.at(enhanceListPointer).data() >> 1;
 
 			// If this is the last triplet, get a copy to repeat to the end of the packet
 			if (enhanceListPointer == m_enhancements.size()-1) {
@@ -48,32 +47,31 @@ QByteArray PageX26Base::packetFromEnhancementList(int packetNumber) const
 			}
 		} else {
 			// We've gone past the end of the triplet list, so repeat the Termination Marker to the end
-			result[i*3+1] = lastTriplet.address();
-			result[i*3+2] = lastTriplet.mode() | ((lastTriplet.data() & 1) << 5);
-			result[i*3+3] = lastTriplet.data() >> 1;
+			result[t*3+1] = lastTriplet.address();
+			result[t*3+2] = lastTriplet.mode() | ((lastTriplet.data() & 1) << 5);
+			result[t*3+3] = lastTriplet.data() >> 1;
 		}
 	}
 
 	return result;
 }
 
-void PageX26Base::setEnhancementListFromPacket(int packetNumber, QByteArray packetContents)
+void PageX26Base::setEnhancementListFromPacket(int p, QByteArray pkt)
 {
 	// Preallocate entries in the m_enhancements list to hold our incoming triplets.
 	// We write "dummy" reserved 11110 Row Triplets in the allocated entries which then get overwritten by the packet contents.
 	// This is in case of missing packets so we can keep Local Object pointers valid.
-	while (m_enhancements.size() < (packetNumber+1)*13)
+	while (m_enhancements.size() < (p+1)*13)
 		m_enhancements.append(m_paddingX26Triplet);
 
-	int enhanceListPointer;
 	X26Triplet newX26Triplet;
 
-	for (int i=0; i<13; i++) {
-		enhanceListPointer = packetNumber*13+i;
+	for (int t=0; t<13; t++) {
+		const int enhanceListPointer = p*13+t;
 
-		newX26Triplet.setAddress(packetContents.at(i*3+1) & 0x3f);
-		newX26Triplet.setMode(packetContents.at(i*3+2) & 0x1f);
-		newX26Triplet.setData(((packetContents.at(i*3+3) & 0x3f) << 1) | ((packetContents.at(i*3+2) & 0x20) >> 5));
+		newX26Triplet.setAddress(pkt.at(t*3+1) & 0x3f);
+		newX26Triplet.setMode(pkt.at(t*3+2) & 0x1f);
+		newX26Triplet.setData(((pkt.at(t*3+3) & 0x3f) << 1) | ((pkt.at(t*3+2) & 0x20) >> 5));
 		m_enhancements.replace(enhanceListPointer, newX26Triplet);
 	}
 	if (newX26Triplet.mode() == 0x1f && newX26Triplet.address() == 0x3f && newX26Triplet.data() & 0x01)

src/qteletextdecoder/pagex26base.h

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

src/qteletextdecoder/render.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2024 Gavin MacGregor
+ * Copyright (C) 2020-2025 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *
@@ -19,6 +19,7 @@
 
 #include <QBitmap>
 #include <QColor>
+#include <QDir>
 #include <QImage>
 #include <QPainter>
 #include <QPixmap>
@@ -34,8 +35,10 @@ QImage *TeletextFontBitmap::s_fontImage = nullptr;
 
 TeletextFontBitmap::TeletextFontBitmap()
 {
+	Q_INIT_RESOURCE(teletextfonts);
+
 	if (s_instances == 0) {
-		s_fontBitmap = new QBitmap(":/images/teletextfont.png");
+		s_fontBitmap = new QBitmap(":/fontimages/teletextfont.png");
 		s_fontImage = new QImage(s_fontBitmap->toImage());
 	}
 	s_instances++;
@@ -57,7 +60,7 @@ TeletextPageRender::TeletextPageRender()
 		m_pageImage[i] = new QImage(864, 250, QImage::Format_ARGB32_Premultiplied);
 
 	m_reveal = false;
-	m_mix = false;
+	m_renderMode = RenderNormal;
 	m_showControlCodes = false;
 	m_flashBuffersHz = 0;
 
@@ -158,7 +161,7 @@ inline void TeletextPageRender::drawCharacter(QPainter &painter, int r, int c, u
 	else if ((m_decoder->cellBold(r, c) || m_decoder->cellItalic(r, c)) && characterSet < 24)
 		drawBoldOrItalicCharacter(painter, r, c, characterCode, characterSet, characterFragment);
 	else {
-		m_fontBitmap.image()->setColorTable(QVector<QRgb>{m_backgroundQColor.rgba(), m_foregroundQColor.rgba()});
+		m_fontBitmap.image()->setColorTable(QList<QRgb>{m_backgroundQColor.rgba(), m_foregroundQColor.rgba()});
 		drawFromFontBitmap(painter, r, c, characterCode, characterSet, characterFragment);
 	}
 
@@ -182,7 +185,7 @@ inline void TeletextPageRender::drawCharacter(QPainter &painter, int r, int c, u
 
 	if (characterDiacritical != 0) {
 		painter.setCompositionMode(QPainter::CompositionMode_SourceOver);
-		m_fontBitmap.image()->setColorTable(QVector<QRgb>{0x00000000, m_foregroundQColor.rgba()});
+		m_fontBitmap.image()->setColorTable(QList<QRgb>{0x00000000, m_foregroundQColor.rgba()});
 		drawFromFontBitmap(painter, r, c, characterDiacritical+64, 7, characterFragment);
 		painter.setCompositionMode(QPainter::CompositionMode_Source);
 	}
@@ -193,8 +196,8 @@ inline void TeletextPageRender::drawBoldOrItalicCharacter(QPainter &painter, int
 	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()});
+	m_fontBitmap.image()->setColorTable(QList<QRgb>{m_backgroundQColor.rgba(), m_foregroundQColor.rgba()});
+	styledImage.setColorTable(QList<QRgb>{m_backgroundQColor.rgba(), m_foregroundQColor.rgba()});
 
 	if (m_decoder->cellItalic(r, c)) {
 		styledImage.fill(0);
@@ -214,7 +217,7 @@ inline void TeletextPageRender::drawBoldOrItalicCharacter(QPainter &painter, int
 		boldeningImage = styledImage.copy();
 		styledPainter.begin(&styledImage);
 		styledPainter.setCompositionMode(QPainter::CompositionMode_SourceOver);
-		boldeningImage.setColorTable(QVector<QRgb>{0x00000000, m_foregroundQColor.rgba()});
+		boldeningImage.setColorTable(QList<QRgb>{0x00000000, m_foregroundQColor.rgba()});
 		styledPainter.drawImage(1, 0, boldeningImage);
 		styledPainter.end();
 	}
@@ -223,6 +226,13 @@ inline void TeletextPageRender::drawBoldOrItalicCharacter(QPainter &painter, int
 
 void TeletextPageRender::renderPage(bool force)
 {
+	if (m_renderMode == RenderWhiteOnBlack) {
+		m_foregroundQColor = Qt::white;
+		m_backgroundQColor = Qt::black;
+	} else if (m_renderMode == RenderBlackOnWhite) {
+		m_foregroundQColor = Qt::black;
+		m_backgroundQColor = Qt::white;
+	}
 	for (int r=0; r<25; r++)
 		renderRow(r, 0, force);
 }
@@ -250,9 +260,11 @@ void TeletextPageRender::renderRow(int r, int ph, bool force)
 			}
 		}
 
-		if (ph == 0) {
+		// Second part of "if" suppresses all flashing on monochrome render modes
+		if (ph == 0 && m_renderMode < RenderWhiteOnBlack) {
 			if (m_decoder->cellFlashMode(r, c) != 0)
 				flashingRow = qMax(flashingRow, (m_decoder->cellFlashRatePhase(r, c) == 0) ? 1 : 2);
+//		} else if (!force)
 		} else
 			force = m_decoder->cellFlashMode(r, c) != 0;
 
@@ -275,42 +287,44 @@ void TeletextPageRender::renderRow(int r, int ph, bool force)
 				characterDiacritical = m_decoder->cellCharacterDiacritical(r, c);
 			}
 
-			if (m_decoder->cellFlashMode(r, c) == 0)
-				m_foregroundQColor = m_decoder->cellForegroundQColor(r, c);
-			else {
-				// Flashing cell, decide if phase in this cycle is on or off
-				bool phaseOn;
-
-				if (m_decoder->cellFlashRatePhase(r, c) == 0)
-					phaseOn = (ph < 3) ^ (m_decoder->cellFlashMode(r, c) == 2);
-				else
-					phaseOn = ((ph == m_decoder->cellFlash2HzPhaseNumber(r, c)-1) || (ph == m_decoder->cellFlash2HzPhaseNumber(r, c)+2)) ^ (m_decoder->cellFlashMode(r, c) == 2);
-
-				// If flashing to adjacent CLUT select the appropriate foreground colour
-				if (m_decoder->cellFlashMode(r, c) == 3 && !phaseOn)
-					m_foregroundQColor = m_decoder->cellFlashForegroundQColor(r, c);
-				else
+			if (m_renderMode < RenderWhiteOnBlack) {
+				if (m_decoder->cellFlashMode(r, c) == 0)
 					m_foregroundQColor = m_decoder->cellForegroundQColor(r, c);
+				else {
+					// Flashing cell, decide if phase in this cycle is on or off
+					bool phaseOn;
 
-				// 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) {
-					// Character 0x00 draws space without underline
-					characterCode = 0x00;
-					characterSet = 0;
-					characterDiacritical = 0;
+					if (m_decoder->cellFlashRatePhase(r, c) == 0)
+						phaseOn = (ph < 3) ^ (m_decoder->cellFlashMode(r, c) == 2);
+					else
+						phaseOn = ((ph == m_decoder->cellFlash2HzPhaseNumber(r, c)-1) || (ph == m_decoder->cellFlash2HzPhaseNumber(r, c)+2)) ^ (m_decoder->cellFlashMode(r, c) == 2);
+
+					// If flashing to adjacent CLUT select the appropriate foreground colour
+					if (m_decoder->cellFlashMode(r, c) == 3 && !phaseOn)
+						m_foregroundQColor = m_decoder->cellFlashForegroundQColor(r, c);
+					else
+						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) {
+						// Character 0x00 draws space without underline
+						characterCode = 0x00;
+						characterSet = 0;
+						characterDiacritical = 0;
+					}
 				}
-			}
 
-			if (!m_mix || m_decoder->cellBoxed(r, c))
-				m_backgroundQColor = m_decoder->cellBackgroundQColor(r, c);
-			else
-				m_backgroundQColor = Qt::transparent;
+				if (m_renderMode != RenderMix || m_decoder->cellBoxed(r, c))
+					m_backgroundQColor = m_decoder->cellBackgroundQColor(r, c);
+				else
+					m_backgroundQColor = Qt::transparent;
+			}
 
 			drawCharacter(painter, r, c, characterCode, characterSet, characterDiacritical, m_decoder->cellCharacterFragment(r, c));
 
 			if (m_showControlCodes && c < 40 && m_decoder->teletextPage()->character(r, c) < 0x20) {
 				painter.setCompositionMode(QPainter::CompositionMode_SourceOver);
-				m_fontBitmap.image()->setColorTable(QVector<QRgb>{0x7f000000, 0xe0ffffff});
+				m_fontBitmap.image()->setColorTable(QList<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);
 			}
@@ -436,17 +450,16 @@ void TeletextPageRender::setReveal(bool reveal)
 				m_decoder->setRefresh(r, c, true);
 }
 
-void TeletextPageRender::setMix(bool mix)
+void TeletextPageRender::setRenderMode(RenderMode renderMode)
 {
-	if (mix  == m_mix)
+	if (renderMode == m_renderMode)
 		return;
 
-	m_mix = mix;
+	m_renderMode = renderMode;
 
 	for (int r=0; r<25; r++)
 		for (int c=0; c<72; c++)
-			if (!m_decoder->cellBoxed(r, c))
-				m_decoder->setRefresh(r, c, true);
+			m_decoder->setRefresh(r, c, true);
 }
 
 

src/qteletextdecoder/render.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2024 Gavin MacGregor
+ * Copyright (C) 2020-2025 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *
@@ -49,11 +49,13 @@ class TeletextPageRender : public QObject
 	Q_OBJECT
 
 public:
+	enum RenderMode { RenderNormal, RenderMix, RenderWhiteOnBlack, RenderBlackOnWhite };
+
 	TeletextPageRender();
 	~TeletextPageRender();
 
 	QImage* image(int i) const { return m_pageImage[i]; };
-	bool mix() const { return m_mix; };
+	RenderMode renderMode() const { return m_renderMode; };
 	void setDecoder(TeletextPageDecode *decoder);
 	void renderPage(bool force=false);
 	bool showControlCodes() const { return m_showControlCodes; };
@@ -61,7 +63,7 @@ public:
 public slots:
 	void colourChanged(int index);
 	void setReveal(bool reveal);
-	void setMix(bool mix);
+	void setRenderMode(RenderMode renderMode);
 	void setShowControlCodes(bool showControlCodes);
 
 signals:
@@ -71,7 +73,8 @@ protected:
 	TeletextFontBitmap m_fontBitmap;
 	QImage* m_pageImage[6];
 	unsigned char m_controlCodeCache[25][40];
-	bool m_reveal, m_mix, m_showControlCodes;
+	RenderMode m_renderMode;
+	bool m_reveal, m_showControlCodes;
 	int m_flashBuffersHz;
 	int m_flashingRow[25];
 

src/qteletextdecoder/teletextfonts.qrc

@@ -0,0 +1,5 @@
+<!DOCTYPE RCC><RCC version="1.0">
+<qresource>
+	<file>fontimages/teletextfont.png</file>
+</qresource>
+</RCC>

src/qteletextdecoder/x26triplets.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2024 Gavin MacGregor
+ * Copyright (C) 2020-2025 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *
@@ -238,11 +238,18 @@ void X26TripletList::updateInternalData()
 			case 0x22: // G3 mosaic character at level 1.5
 			case 0x2f: // G2 character
 				activePosition.setColumn(triplet->addressColumn());
+
+				if (activePosition.row() != triplet->m_activePositionRow || activePosition.column() != triplet->m_activePositionColumn)
+					triplet->m_activePosition1p5Differs = true;
 				break;
 			default:
-				if (triplet->modeExt() >= 0x30 && triplet->modeExt() <= 0x3f)
+				if (triplet->modeExt() >= 0x30 && triplet->modeExt() <= 0x3f) {
 					// G0 diacritical mark
 					activePosition.setColumn(triplet->addressColumn());
+
+					if (activePosition.row() != triplet->m_activePositionRow || activePosition.column() != triplet->m_activePositionColumn)
+						triplet->m_activePosition1p5Differs = true;
+				}
 		}
 
 		triplet->m_activePositionRow1p5 = activePosition.row();

src/qteletextdecoder/x26triplets.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2024 Gavin MacGregor
+ * Copyright (C) 2020-2025 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *
@@ -66,6 +66,7 @@ public:
 	X26TripletError error() const { return m_error; }
 	bool reservedMode() const { return m_reservedMode; }
 	bool reservedData() const { return m_reservedData; }
+	bool activePosition1p5Differs() const { return m_activePosition1p5Differs; }
 
 	friend class X26TripletList;
 
@@ -77,6 +78,7 @@ private:
 	int m_activePositionColumn = -1;
 	int m_activePositionRow1p5 = -1;
 	int m_activePositionColumn1p5 = -1;
+	bool m_activePosition1p5Differs = false;
 	X26TripletError m_error = NoError;
 	bool m_reservedMode = false;
 	bool m_reservedData = false;

src/qteletextmaker/actionicons.qrc

@@ -1,6 +1,5 @@
 <!DOCTYPE RCC><RCC version="1.0">
 <qresource>
-	<file>images/teletextfont.png</file>
 	<file>images/copy.png</file>
 	<file>images/cut.png</file>
 	<file>images/new.png</file>

src/qteletextmaker/hashformats.cpp

@@ -0,0 +1,117 @@
+/*
+ * Copyright (C) 2020-2025 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 "hashformats.h"
+
+#include <QByteArray>
+#include <QString>
+
+#include "levelonepage.h"
+#include "pagebase.h"
+
+QString exportHashStringPage(LevelOnePage *subPage)
+{
+	int hashDigits[1167]={0};
+	int totalBits, charBit;
+	const char base64[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_";
+	QString hashString;
+	QByteArray rowPacket;
+
+	// TODO int editTFCharacterSet = 5;
+	bool blackForeground = false;
+
+	for (int r=0; r<25; r++) {
+		if (subPage->packetExists(r))
+			rowPacket = subPage->packet(r);
+		else
+			rowPacket = QByteArray(40, 0x20).constData();
+
+		for (int c=0; c<40; c++) {
+			if (rowPacket.at(c) == 0x00 || rowPacket.at(c) == 0x10)
+				blackForeground = true;
+			for (int b=0; b<7; b++) {
+				totalBits = (r * 40 + c) * 7 + b;
+				charBit = ((rowPacket.at(c)) >> (6 - b)) & 0x01;
+				hashDigits[totalBits / 6] |= charBit << (5 - (totalBits % 6));
+			}
+		}
+	}
+
+	hashString.append(QString("#%1:").arg(blackForeground ? 8 : 0, 1, 16));
+
+	for (int i=0; i<1167; i++)
+		hashString.append(base64[hashDigits[i]]);
+
+	return hashString;
+}
+
+QString exportHashStringPackets(LevelOnePage *subPage)
+{
+	auto colourToHexString=[&](int whichCLUT)
+	{
+		QString resultHexString;
+
+		for (int i=whichCLUT*8; i<whichCLUT*8+8; i++)
+			resultHexString.append(QString("%1").arg(subPage->CLUT(i), 3, 16, QChar('0')));
+		return resultHexString;
+	};
+
+	const char base64[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_";
+	QString result;
+
+	if (subPage->packetExists(28,0) || subPage->packetExists(28,4)) {
+		// X/28/0 and X/28/4 are duplicates apart from the CLUT definitions
+		// Assemble the duplicate beginning and ending of both packets
+		QString x28StringBegin, x28StringEnd;
+
+		x28StringBegin.append(QString("00%1").arg((subPage->defaultCharSet() << 3) | subPage->defaultNOS(), 2, 16, QChar('0')).toUpper());
+		x28StringBegin.append(QString("%1").arg((subPage->secondCharSet() << 3) | subPage->secondNOS(), 2, 16, QChar('0')).toUpper());
+		x28StringBegin.append(QString("%1%2%3%4").arg(subPage->leftSidePanelDisplayed(), 1, 10).arg(subPage->rightSidePanelDisplayed(), 1, 10).arg(subPage->sidePanelStatusL25(), 1, 10).arg(subPage->sidePanelColumns(), 1, 16));
+
+		x28StringEnd = QString("%1%2%3%4").arg(subPage->defaultScreenColour(), 2, 16, QChar('0')).arg(subPage->defaultRowColour(), 2, 16, QChar('0')).arg(subPage->blackBackgroundSubst(), 1, 10).arg(subPage->colourTableRemap(), 1, 10);
+
+		if (subPage->packetExists(28,0))
+			result.append(":X280=" + x28StringBegin + colourToHexString(2) + colourToHexString(3) + x28StringEnd);
+		if (subPage->packetExists(28,4))
+			result.append(":X284=" + x28StringBegin + colourToHexString(0) + colourToHexString(1) + x28StringEnd);
+	}
+
+	if (!subPage->enhancements()->isEmpty()) {
+		result.append(":X26=");
+		for (int i=0; i<subPage->enhancements()->size(); i++) {
+			result.append(base64[subPage->enhancements()->at(i).data() >> 1]);
+			result.append(base64[subPage->enhancements()->at(i).mode() | ((subPage->enhancements()->at(i).data() & 1) << 5)]);
+			result.append(base64[subPage->enhancements()->at(i).address()]);
+		}
+	}
+
+	// Assemble PS
+	// C4 Erase page is stored in bit 14
+	int pageStatus = 0x8000 | (subPage->controlBit(PageBase::C4ErasePage) << 14);
+	// C5 to C11 stored in order from bits 1 to 6
+	for (int i=PageBase::C5Newsflash; i<=PageBase::C11SerialMagazine; i++)
+		pageStatus |= subPage->controlBit(i) << (i-1);
+	// Apparently the TTI format stores the NOS bits backwards
+	pageStatus |= subPage->controlBit(PageBase::C12NOS) << 9;
+	pageStatus |= subPage->controlBit(PageBase::C13NOS) << 8;
+	pageStatus |= subPage->controlBit(PageBase::C14NOS) << 7;
+
+	result.append(QString(":PS=%1").arg(0x8000 | pageStatus, 0, 16, QChar('0')));
+	return result;
+}

src/qteletextmaker/hashformats.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2024 Gavin MacGregor
+ * Copyright (C) 2020-2025 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *
@@ -17,30 +17,15 @@
  * along with QTeletextMaker.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-#ifndef LOADSAVE_H
-#define LOADSAVE_H
+#ifndef HASHFORMATS_H
+#define HASHFORMATS_H
 
 #include <QByteArray>
-#include <QFile>
-#include <QSaveFile>
 #include <QString>
-#include <QTextStream>
 
-#include "document.h"
 #include "levelonepage.h"
 #include "pagebase.h"
 
-void loadTTI(QFile *inFile, TeletextDocument *document);
-void importT42(QFile *inFile, TeletextDocument *document);
-
-int controlBitsToPS(PageBase *subPage);
-
-void saveTTI(QSaveFile &file, const TeletextDocument &document);
-void exportT42File(QSaveFile &file, const TeletextDocument &document);
-void exportM29File(QSaveFile &file, const TeletextDocument &document);
-
-QByteArray rowPacketAlways(PageBase *subPage, int packetNumber);
-
 QString exportHashStringPage(LevelOnePage *subPage);
 QString exportHashStringPackets(LevelOnePage *subPage);
 

src/qteletextmaker/keymap.h

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

src/qteletextmaker/levelonecommands.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2024 Gavin MacGregor
+ * Copyright (C) 2020-2025 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *
@@ -457,6 +457,49 @@ ShiftMosaicsRightCommand::ShiftMosaicsRightCommand(TeletextDocument *teletextDoc
 	setText(QObject::tr("shift mosaics right"));
 }
 
+FillMosaicsCommand::FillMosaicsCommand(TeletextDocument *teletextDocument, const QSet<QPair<int, int>> &mosaicList, QUndoCommand *parent) : ShiftMosaicsCommand(teletextDocument, mosaicList, parent)
+{
+	for (const auto &m : m_mosaicList)
+		m_newCharacters[m.first - m_selectionTopRow][m.second - m_selectionLeftColumn] = 0x7f;
+
+	setText(QObject::tr("fill mosaics"));
+}
+
+ClearMosaicsCommand::ClearMosaicsCommand(TeletextDocument *teletextDocument, const QSet<QPair<int, int>> &mosaicList, QUndoCommand *parent) : ShiftMosaicsCommand(teletextDocument, mosaicList, parent)
+{
+	for (const auto &m : m_mosaicList)
+		m_newCharacters[m.first - m_selectionTopRow][m.second - m_selectionLeftColumn] = 0x20;
+
+	setText(QObject::tr("clear mosaics"));
+}
+
+InvertMosaicsCommand::InvertMosaicsCommand(TeletextDocument *teletextDocument, const QSet<QPair<int, int>> &mosaicList, QUndoCommand *parent) : ShiftMosaicsCommand(teletextDocument, mosaicList, parent)
+{
+	for (const auto &m : m_mosaicList)
+		m_newCharacters[m.first - m_selectionTopRow][m.second - m_selectionLeftColumn] ^= 0x5f;
+
+	setText(QObject::tr("reverse mosaics"));
+}
+
+bool InvertMosaicsCommand::mergeWith(const QUndoCommand *command)
+{
+	const InvertMosaicsCommand *newerCommand = static_cast<const InvertMosaicsCommand *>(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;
+
+	setObsolete(true);
+	return true;
+}
+
+DitherMosaicsCommand::DitherMosaicsCommand(TeletextDocument *teletextDocument, const QSet<QPair<int, int>> &mosaicList, QUndoCommand *parent) : ShiftMosaicsCommand(teletextDocument, mosaicList, parent)
+{
+	for (const auto &m : m_mosaicList)
+		m_newCharacters[m.first - m_selectionTopRow][m.second - m_selectionLeftColumn] = (m.first & 1) ? 0x66 : 0x39;
+
+	setText(QObject::tr("dither mosaics"));
+}
+
 
 InsertRowCommand::InsertRowCommand(TeletextDocument *teletextDocument, bool copyRow, QUndoCommand *parent) : LevelOneCommand(teletextDocument, parent)
 {
@@ -767,7 +810,7 @@ PasteCommand::PasteCommand(TeletextDocument *teletextDocument, int pageCharSet,
 			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});
+			imageData = imageData.convertToFormat(QImage::Format_MonoLSB, QList<QRgb>{0x000000ff, 0xffffffff});
 
 		for (int r=0; r<m_clipboardDataHeight; r++)
 			m_pastingCharacters.append(QByteArray(m_clipboardDataWidth, 0x00));

src/qteletextmaker/levelonecommands.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2024 Gavin MacGregor
+ * Copyright (C) 2020-2025 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *
@@ -164,6 +164,47 @@ public:
 	int id() const override { return Id; }
 };
 
+class FillMosaicsCommand : public ShiftMosaicsCommand
+{
+public:
+	enum { Id = 120 };
+
+	FillMosaicsCommand(TeletextDocument *teletextDocument, const QSet<QPair<int, int>> &mosaicList, QUndoCommand *parent = 0);
+
+	int id() const override { return Id; }
+};
+
+class ClearMosaicsCommand : public ShiftMosaicsCommand
+{
+public:
+	enum { Id = 121 };
+
+	ClearMosaicsCommand(TeletextDocument *teletextDocument, const QSet<QPair<int, int>> &mosaicList, QUndoCommand *parent = 0);
+
+	int id() const override { return Id; }
+};
+
+class InvertMosaicsCommand : public ShiftMosaicsCommand
+{
+public:
+	enum { Id = 122 };
+
+	InvertMosaicsCommand(TeletextDocument *teletextDocument, const QSet<QPair<int, int>> &mosaicList, QUndoCommand *parent = 0);
+
+	bool mergeWith(const QUndoCommand *command) override;
+	int id() const override { return Id; }
+};
+
+class DitherMosaicsCommand : public ShiftMosaicsCommand
+{
+public:
+	enum { Id = 123 };
+
+	DitherMosaicsCommand(TeletextDocument *teletextDocument, const QSet<QPair<int, int>> &mosaicList, QUndoCommand *parent = 0);
+
+	int id() const override { return Id; }
+};
+
 class InsertSubPageCommand : public LevelOneCommand
 {
 public:

src/qteletextmaker/loadformats.cpp

@@ -0,0 +1,597 @@
+/*
+ * Copyright (C) 2020-2025 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 "loadformats.h"
+
+#include <QByteArray>
+#include <QDataStream>
+#include <QFile>
+#include <QString>
+#include <QStringList>
+#include <QTextStream>
+
+#include "document.h"
+#include "hamming.h"
+#include "levelonepage.h"
+#include "pagebase.h"
+
+bool LoadTTIFormat::load(QFile *inFile, TeletextDocument *document)
+{
+	m_warnings.clear();
+	m_error.clear();
+
+	QByteArray inLine;
+	bool firstSubPageAlreadyFound = false;
+	bool pageBodyPacketsFound = false;
+	int cycleCommandsFound = 0;
+	int mostRecentCycleValue = -1;
+	LevelOnePage::CycleTypeEnum mostRecentCycleType;
+
+	LevelOnePage* loadingPage = document->subPage(0);
+
+	for (;;) {
+		inLine = inFile->readLine(160).trimmed();
+		if (inLine.isEmpty())
+			break;
+		if (inLine.startsWith("DE,"))
+			document->setDescription(QString(inLine.remove(0, 3)));
+		if (inLine.startsWith("PN,")) {
+			// When second and subsequent PN commands are found, firstSubPageAlreadyFound==true at this point
+			// This assumes that PN is the first command of a new subpage...
+			if (firstSubPageAlreadyFound) {
+				document->insertSubPage(document->numberOfSubPages(), false);
+				loadingPage = document->subPage(document->numberOfSubPages()-1);
+			} else {
+				document->setPageNumberFromString(inLine.mid(3,3));
+				firstSubPageAlreadyFound = true;
+			}
+		}
+/*		if (lineType == "SC,") {
+			bool subPageNumberOk;
+			int subPageNumberRead = inLine.mid(3, 4).toInt(&subPageNumberOk, 16);
+			if ((!subPageNumberOk) || subPageNumberRead > 0x3f7f)
+				subPageNumberRead = 0;
+			loadingPage->setSubPageNumber(subPageNumberRead);
+		}*/
+		if (inLine.startsWith("PS,")) {
+			bool pageStatusOk;
+			int pageStatusRead = inLine.mid(3, 4).toInt(&pageStatusOk, 16);
+			if (pageStatusOk) {
+				loadingPage->setControlBit(PageBase::C4ErasePage, pageStatusRead & 0x4000);
+				for (int i=PageBase::C5Newsflash, pageStatusBit=0x0001; i<=PageBase::C11SerialMagazine; i++, pageStatusBit<<=1)
+					loadingPage->setControlBit(i, pageStatusRead & pageStatusBit);
+				loadingPage->setDefaultNOS(((pageStatusRead & 0x0200) >> 9) | ((pageStatusRead & 0x0100) >> 7) | ((pageStatusRead & 0x0080) >> 5));
+			}
+		}
+		if (inLine.startsWith("RE,")) {
+			bool regionValueOk;
+			int regionValueRead = inLine.remove(0, 3).toInt(&regionValueOk);
+			if (regionValueOk)
+				loadingPage->setDefaultCharSet(regionValueRead);
+		}
+		if (inLine.startsWith("CT,") && (inLine.endsWith(",C") || inLine.endsWith(",T"))) {
+			bool cycleValueOk;
+			int cycleValueRead = inLine.mid(3, inLine.size()-5).toInt(&cycleValueOk);
+			if (cycleValueOk) {
+				cycleCommandsFound++;
+				// House-keep CT command values, in case it's the only one within multiple subpages
+				mostRecentCycleValue = cycleValueRead;
+				loadingPage->setCycleValue(cycleValueRead);
+				mostRecentCycleType = inLine.endsWith("C") ? LevelOnePage::CTcycles : LevelOnePage::CTseconds;
+				loadingPage->setCycleType(mostRecentCycleType);
+			}
+		}
+		if (inLine.startsWith("FL,")) {
+			bool fastTextLinkOk;
+			int fastTextLinkRead;
+			QString flLine = QString(inLine.remove(0, 3));
+			if (flLine.count(',') == 5)
+				for (int i=0; i<6; i++) {
+					fastTextLinkRead = flLine.section(',', i, i).toInt(&fastTextLinkOk, 16);
+					if (fastTextLinkOk) {
+						if (fastTextLinkRead == 0)
+							fastTextLinkRead = 0x8ff;
+						// Stored as page link with relative magazine number, convert from absolute page number that was read
+						fastTextLinkRead ^= document->pageNumber() & 0x700;
+						fastTextLinkRead &= 0x7ff; // Fixes magazine 8 to 0
+						loadingPage->setFastTextLinkPageNumber(i, fastTextLinkRead);
+					}
+				}
+		}
+		if (inLine.startsWith("OL,")) {
+			bool lineNumberOk;
+			int lineNumber, secondCommaPosition;
+
+			secondCommaPosition = inLine.indexOf(",", 3);
+			if (secondCommaPosition != 4 && secondCommaPosition != 5)
+				continue;
+
+			lineNumber = inLine.mid(3, secondCommaPosition-3).toInt(&lineNumberOk, 10);
+			if (lineNumberOk && lineNumber >= 0 && lineNumber <= 29) {
+				pageBodyPacketsFound = true;
+
+				inLine.remove(0, secondCommaPosition+1);
+				if (lineNumber <= 25) {
+					for (int c=0; c<40; c++) {
+						// trimmed() helpfully removes CRLF line endings from the just-read line for us
+						// But it also (un)helpfully removes spaces at the end of a 40 character line, so put them back
+						if (c >= inLine.size())
+							inLine.append(' ');
+						if (inLine.at(c) & 0x80)
+							inLine[c] = inLine.at(c) & 0x7f;
+						else if (inLine.at(c) == 0x10)
+							inLine[c] = 0x0d;
+						else if (inLine.at(c) == 0x1b) {
+							inLine.remove(c, 1);
+							inLine[c] = inLine.at(c) & 0xbf;
+						}
+					}
+					loadingPage->setPacket(lineNumber, inLine);
+				} else {
+					int designationCode = inLine.at(0) & 0x3f;
+					if (inLine.size() < 40) {
+						// OL is too short!
+						if (lineNumber == 26) {
+							// For a too-short enhancement triplets OL, first trim the line down to nearest whole triplet
+							inLine.resize((inLine.size() / 3 * 3) + 1);
+							// Then use "dummy" enhancement triplets to extend the line to the proper length
+							for (int i=inLine.size(); i<40; i+=3)
+								inLine.append("i^@"); // Address 41, Mode 0x1e, Data 0
+						} else
+							// For other triplet OLs and Hamming 8/4 OLs, just pad with zero data
+							for (int i=inLine.size(); i<40; i++)
+								inLine.append("@");
+					}
+					for (int i=1; i<=39; i++)
+						inLine[i] = inLine.at(i) & 0x3f;
+					// Import M/29 whole-magazine packets as X/28 per-page packets
+					if (lineNumber == 29) {
+						if ((document->pageNumber() & 0xff) != 0xff)
+							m_warnings.append(QString("M/29/%1 packet found, but page number was not xFF.").arg(designationCode));
+						lineNumber = 28;
+					}
+					loadingPage->setPacket(lineNumber, designationCode, inLine);
+				}
+			}
+		}
+	}
+
+	if (!pageBodyPacketsFound) {
+		m_error = "No OL lines found";
+		return false;
+	}
+
+	// If there's more than one subpage but only one valid CT command was found, apply it to all subpages
+	// I don't know if this is correct
+	if (cycleCommandsFound == 1 && document->numberOfSubPages()>1)
+		for (int i=0; i<document->numberOfSubPages(); i++) {
+			document->subPage(i)->setCycleValue(mostRecentCycleValue);
+			document->subPage(i)->setCycleType(mostRecentCycleType);
+		}
+
+	return true;
+}
+
+
+bool LoadT42Format::readPacket()
+{
+	return m_inFile->read((char *)m_inLine, 42) == 42;
+}
+
+bool LoadT42Format::load(QFile *inFile, TeletextDocument *document)
+{
+	int readMagazineNumber, readPacketNumber;
+	int foundMagazineNumber = -1;
+	int foundPageNumber = -1;
+	bool firstPacket0Found = false;
+	bool pageBodyPacketsFound = false;
+
+	m_inFile = inFile;
+
+	m_warnings.clear();
+	m_error.clear();
+	m_reExportWarning = false;
+
+	for (;;) {
+		if (!readPacket())
+			// Reached end of .t42 file, or less than 42 bytes left
+			break;
+
+		// Magazine and packet numbers
+		m_inLine[0] = hamming_8_4_decode[m_inLine[0]];
+		m_inLine[1] = hamming_8_4_decode[m_inLine[1]];
+		if (m_inLine[0] == 0xff || m_inLine[1] == 0xff)
+			// Error decoding magazine or packet number
+			continue;
+		readMagazineNumber = m_inLine[0] & 0x07;
+		readPacketNumber = (m_inLine[0] >> 3) | (m_inLine[1] << 1);
+
+		if (readPacketNumber == 0) {
+			// Hamming decode page number, subcodes and control bits
+			for (int i=2; i<10; i++)
+				m_inLine[i] = hamming_8_4_decode[m_inLine[i]];
+			// See if the page number is valid
+			if (m_inLine[2] == 0xff || m_inLine[3] == 0xff)
+				// Error decoding page number
+				continue;
+
+			const int readPageNumber = (m_inLine[3] << 4) | m_inLine[2];
+
+			if (readPageNumber == 0xff)
+				// Time filling header
+				continue;
+
+			// A second or subsequent X/0 has been found
+			if (firstPacket0Found) {
+				if (readMagazineNumber != foundMagazineNumber)
+					// Packet from different magazine broadcast in parallel mode
+					continue;
+				if ((readPageNumber == foundPageNumber) && pageBodyPacketsFound)
+					// X/0 with same page number found after page body packets loaded - assume end of page
+					break;
+				if (readPageNumber != foundPageNumber) {
+					// More than one page in .t42 file - end of current page reached
+					m_warnings.append("More than one page in .t42 file, only first full page loaded.");
+					m_reExportWarning = true;
+					break;
+				}
+				// Could get here if X/0 with same page number was found with no body packets inbetween
+				continue;
+			} else {
+				// First X/0 found
+				foundMagazineNumber = readMagazineNumber;
+				foundPageNumber = readPageNumber;
+				firstPacket0Found = true;
+
+				if (foundMagazineNumber == 0)
+					document->setPageNumber(0x800 | foundPageNumber);
+				else
+					document->setPageNumber((foundMagazineNumber << 8) | foundPageNumber);
+
+				document->subPage(0)->setControlBit(PageBase::C4ErasePage, m_inLine[5] & 0x08);
+				document->subPage(0)->setControlBit(PageBase::C5Newsflash, m_inLine[7] & 0x04);
+				document->subPage(0)->setControlBit(PageBase::C6Subtitle, m_inLine[7] & 0x08);
+				for (int i=0; i<4; i++)
+					document->subPage(0)->setControlBit(PageBase::C7SuppressHeader+i, m_inLine[8] & (1 << i));
+				document->subPage(0)->setControlBit(PageBase::C11SerialMagazine, m_inLine[9] & 0x01);
+				document->subPage(0)->setControlBit(PageBase::C12NOS, m_inLine[9] & 0x08);
+				document->subPage(0)->setControlBit(PageBase::C13NOS, m_inLine[9] & 0x04);
+				document->subPage(0)->setControlBit(PageBase::C14NOS, m_inLine[9] & 0x02);
+
+				// See if there's text in the header row
+				bool headerText = false;
+
+				for (int i=10; i<42; i++)
+					if (m_inLine[i] != 0x20) {
+						// TODO - obey odd parity?
+						m_inLine[i] &= 0x7f;
+						headerText = true;
+					}
+				if (headerText) {
+					// Clear the page address and control bits to spaces before putting the row in
+					for (int i=0; i<10; i++)
+						m_inLine[i] = 0x20;
+
+					document->subPage(0)->setPacket(0, QByteArray((const char *)&m_inLine[2], 40));
+				}
+				continue;
+			}
+		}
+
+		// No X/0 has been found yet, keep looking for one
+		if (!firstPacket0Found)
+			continue;
+
+		// Disregard whole-magazine packets
+		if (readPacketNumber > 28)
+			continue;
+
+		// We get here when a page-body packet belonging to the found X/0 header was found
+		pageBodyPacketsFound = true;
+
+		// At the moment this only loads a Level One Page properly
+		// because it assumes X/1 to X/25 is odd partity
+		if (readPacketNumber < 25) {
+			for (int i=2; i<42; i++)
+				// TODO - obey odd parity?
+				m_inLine[i] &= 0x7f;
+			document->subPage(0)->setPacket(readPacketNumber, QByteArray((const char *)&m_inLine[2], 40));
+			continue;
+		}
+
+		// X/26, X/27 or X/28
+		int readDesignationCode = hamming_8_4_decode[m_inLine[2]];
+
+		if (readDesignationCode == 0xff)
+			// Error decoding designation code
+			continue;
+
+		if (readPacketNumber == 27 && readDesignationCode < 4) {
+			// X/27/0 to X/27/3 for Editorial Linking
+			// Decode Hamming 8/4 on each of the six links, checking for errors on the way
+			for (int i=0; i<6; i++) {
+				bool decodingError = false;
+				const int b = 3 + i*6; // First byte of this link
+
+				for (int j=0; j<6; j++) {
+					m_inLine[b+j] = hamming_8_4_decode[m_inLine[b+j]];
+					if (m_inLine[b+j] == 0xff) {
+						decodingError = true;
+						break;
+					}
+				}
+
+				if (decodingError) {
+					// Error found in at least one byte of the link
+					// Neutralise the whole link to same magazine, page FF, subcode 3F7F
+					qDebug("X/27/%d link %d decoding error", readDesignationCode, i);
+					m_inLine[b]   = 0xf;
+					m_inLine[b+1] = 0xf;
+					m_inLine[b+2] = 0xf;
+					m_inLine[b+3] = 0x7;
+					m_inLine[b+4] = 0xf;
+					m_inLine[b+5] = 0x3;
+				}
+			}
+			document->subPage(0)->setPacket(readPacketNumber, readDesignationCode, QByteArray((const char *)&m_inLine[2], 40));
+
+			continue;
+		}
+
+		// X/26, or X/27/4 to X/27/15, or X/28
+		// Decode Hamming 24/18
+		for (int i=0; i<13; i++) {
+			const int b = 3 + i*3; // First byte of triplet
+
+			const int p0 = m_inLine[b];
+			const int p1 = m_inLine[b+1];
+			const int p2 = m_inLine[b+2];
+
+			unsigned int D1_D4;
+			unsigned int D5_D11;
+			unsigned int D12_D18;
+			unsigned int ABCDEF;
+			int32_t d;
+
+			D1_D4 = hamming_24_18_decode_d1_d4[p0 >> 2];
+			D5_D11 = p1 & 0x7f;
+			D12_D18 = p2 & 0x7f;
+
+			d = D1_D4 | (D5_D11 << 4) | (D12_D18 << 11);
+
+			ABCDEF = (hamming_24_18_parities[0][p0] ^ hamming_24_18_parities[1][p1]  ^ hamming_24_18_parities[2][p2]);
+
+			d ^= (int)hamming_24_18_decode_correct[ABCDEF];
+
+			if ((d & 0x80000000) == 0x80000000) {
+				// Error decoding Hamming 24/18
+				qDebug("X/%d/%d triplet %d decoding error", readPacketNumber, readDesignationCode, i);
+				if (readPacketNumber == 26) {
+					// Enhancements packet, set to "dummy" Address 41, Mode 0x1e, Data 0
+					m_inLine[b]   = 41;
+					m_inLine[b+1] = 0x1e;
+					m_inLine[b+2] = 0;
+				} else {
+					// Zero out whole decoded triplet, bound to make things go wrong...
+					m_inLine[b]   = 0x00;
+					m_inLine[b+1] = 0x00;
+					m_inLine[b+2] = 0x00;
+				}
+			} else {
+				m_inLine[b]   = d & 0x0003f;
+				m_inLine[b+1] = (d & 0x00fc0) >> 6;
+				m_inLine[b+2] = d >> 12;
+			}
+		}
+		document->subPage(0)->setPacket(readPacketNumber, readDesignationCode, QByteArray((const char *)&m_inLine[2], 40));
+	}
+
+	if (!firstPacket0Found) {
+		m_error = "No X/0 found.";
+		return false;
+	} else if (!pageBodyPacketsFound) {
+		m_error = "X/0 found, but no page body packets were found.";
+		return false;
+	} else
+		return true;
+}
+
+
+bool LoadHTTFormat::readPacket()
+{
+	unsigned char httLine[45];
+
+	if (m_inFile->read((char *)httLine, 45) != 45)
+		return false;
+
+	if (httLine[0] != 0xaa || httLine[1] != 0xaa || httLine[2] != 0xe4)
+		return false;
+
+	for (int i=0; i<42; i++) {
+		unsigned char b = httLine[i+3];
+		b = (b & 0xf0) >> 4 | (b & 0x0f) << 4;
+		b = (b & 0xcc) >> 2 | (b & 0x33) << 2;
+		b = (b & 0xaa) >> 1 | (b & 0x55) << 1;
+		m_inLine[i] = b;
+	}
+
+	return true;
+}
+
+
+bool LoadEP1Format::load(QFile *inFile, TeletextDocument *document)
+{
+	m_warnings.clear();
+	m_error.clear();
+	m_reExportWarning = false;
+
+	unsigned char inLine[42];
+	unsigned char numOfSubPages = 1;
+
+	LevelOnePage* loadingPage = document->subPage(0);
+
+	for (;;) {
+		// Read six bytes, will either be a header for a (sub)page
+		// or a start header indicating multiple subpages are within
+		if (inFile->read((char *)inLine, 6) != 6)
+			return false;
+		if (inLine[0] == 'J' || inLine[1] == 'W' || inLine[2] == 'C') {
+			// Multiple subpages: get number of subpages then read
+			// next six bytes that really will be the header of the first subpage
+			numOfSubPages = inLine[3];
+			if (inFile->read((char *)inLine, 6) != 6)
+				return false;
+
+			m_warnings.append("More than one page in EP1/EPX file, only first full page loaded.");
+			m_reExportWarning = true;
+		}
+
+		// Check for header of a (sub)page
+		if (inLine[0] != 0xfe || inLine[1] != 0x01)
+			return false;
+
+		// Deal with language code unique to EP1 - unknown values are mapped to English
+		loadingPage->setDefaultCharSet(m_languageCode.key(inLine[2], 0x09) >> 3);
+		loadingPage->setDefaultNOS(m_languageCode.key(inLine[2], 0x09) & 0x7);
+
+		// If fourth byte is 0xca then "X/26 enhancements header" follows
+		// Otherwise Level 1 page data follows
+		if (inLine[3] == 0xca) {
+			// Read next four bytes that form the "X/26 enhancements header"
+			if (inFile->read((char *)inLine, 4) != 4)
+				return false;
+			// Third and fourth bytes are little-endian length of enhancement data
+			const int numOfX26Bytes = inLine[2] | (inLine[3] << 8);
+			const int numOfX26Packets = (numOfX26Bytes + 39) / 40;
+
+			QByteArray packet(40, 0x00);
+			packet[0] = 0;
+
+			for (int i=0; i<numOfX26Packets; i++) {
+				bool terminatorFound = false;
+				unsigned char terminatorTriplet[3];
+
+				if (inFile->read((char *)inLine, 40) != 40)
+					return false;
+
+				// Assumes that X/26 packets are saved with ascending designation codes...
+				for (int c=1; c<39; c+=3) {
+					if (!terminatorFound) {
+						// Shuffle triplet bits from 6 bit address, 5 bit mode, 7 bit data
+						packet[c] = inLine[c];
+						packet[c+1] = inLine[c+1] | ((inLine[c+2] & 1) << 5);
+						packet[c+2] = inLine[c+2] >> 1;
+						// Address of termination marker is 7f instead of 3f
+						if (inLine[c+1] == 0x1f && inLine[c] == 0x7f) {
+							packet[c] = 0x3f;
+
+							if (inLine[c+2] & 0x01) {
+								// If a termination marker was found, stop reading the packet
+								// and repeat the marker ourselves to the end
+								terminatorFound = true;
+								terminatorTriplet[0] = packet[c+1];
+								terminatorTriplet[1] = packet[c+2];
+							}
+						}
+					} else {
+						packet[c] = 0x3f;
+						packet[c+1] = terminatorTriplet[0];
+						packet[c+2] = terminatorTriplet[1];
+					}
+				}
+
+				loadingPage->setPacket(26, i, packet);
+			}
+		}
+
+		// Level 1 rows
+		for (int r=0; r<24; r++) {
+			if (inFile->read((char *)inLine, 40) != 40)
+				return false;
+
+			for (int c=0; c<40; c++)
+				if (inLine[c] != 0x20) {
+					loadingPage->setPacket(r, QByteArray((const char *)&inLine, 40));
+					break;
+				}
+		}
+
+		numOfSubPages--;
+
+		// FIXME uncomment "if" statement when we're ready to save multi-page EPX files
+		//if (numOfSubPages == 0)
+		break;
+
+		// There are more subpages coming up so skip over the 40 byte buffer and 2 byte terminator
+		if (inFile->read((char *)inLine, 42) != 42)
+			return false;
+
+		document->insertSubPage(document->numberOfSubPages(), false);
+		loadingPage = document->subPage(document->numberOfSubPages()-1);
+	}
+	return true;
+}
+
+
+int LoadFormats::s_instances = 0;
+
+LoadFormats::LoadFormats()
+{
+	if (s_instances == 0) {
+		s_fileFormat[0] = new LoadTTIFormat;
+		s_fileFormat[1] = new LoadT42Format;
+		s_fileFormat[2] = new LoadEP1Format;
+		s_fileFormat[3] = new LoadHTTFormat;
+
+		s_filters = "All Supported Files (*.";
+
+		for (int i=0; i<s_size; i++) {
+			if (i != 0)
+				s_filters.append(" *.");
+			s_filters.append(s_fileFormat[i]->extensions().join(" *."));
+		}
+		s_filters.append(");;");
+
+		for (int i=0; i<s_size; i++) {
+			if (i != 0)
+				s_filters.append(";;");
+			s_filters.append(s_fileFormat[i]->fileDialogFilter());
+		}
+	}
+
+	s_instances++;
+}
+
+LoadFormats::~LoadFormats()
+{
+	s_instances--;
+
+	if (s_instances == 0)
+		for (int i=s_size-1; i>=0; i--)
+			delete s_fileFormat[i];
+}
+
+LoadFormat *LoadFormats::findFormat(const QString &suffix) const
+{
+	for (int i=0; i<s_size; i++)
+		if (s_fileFormat[i]->extensions().contains(suffix, Qt::CaseInsensitive))
+			return s_fileFormat[i];
+
+	return nullptr;
+}

src/qteletextmaker/loadformats.h

@@ -0,0 +1,128 @@
+/*
+ * Copyright (C) 2020-2025 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 LOADFORMATS_H
+#define LOADFORMATS_H
+
+#include <QByteArray>
+#include <QDataStream>
+#include <QFile>
+#include <QString>
+#include <QStringList>
+#include <QTextStream>
+
+#include "document.h"
+#include "levelonepage.h"
+#include "pagebase.h"
+
+class LoadFormat
+{
+public:
+	virtual ~LoadFormat() {};
+
+	virtual bool load(QFile *inFile, TeletextDocument *document) =0;
+
+	virtual QString description() const =0;
+	virtual QStringList extensions() const =0;
+	QString fileDialogFilter() const { return QString(description() + " (*." + extensions().join(" *.") + ')'); };
+	QStringList warningStrings() const { return m_warnings; };
+	QString errorString() const { return m_error; };
+	bool reExportWarning() const { return m_reExportWarning; };
+
+protected:
+	TeletextDocument const *m_document;
+	QStringList m_warnings;
+	QString m_error;
+	bool m_reExportWarning = false;
+};
+
+class LoadTTIFormat : public LoadFormat
+{
+public:
+	bool load(QFile *inFile, TeletextDocument *document) override;
+
+	QString description() const override { return QString("MRG Systems TTI"); };
+	QStringList extensions() const override { return QStringList { "tti", "ttix" }; };
+};
+
+class LoadT42Format : public LoadFormat
+{
+public:
+	bool load(QFile *inFile, TeletextDocument *document) override;
+
+	QString description() const override { return QString("t42 packet stream"); };
+	QStringList extensions() const override { return QStringList { "t42" }; };
+
+protected:
+	virtual bool readPacket();
+
+	QFile *m_inFile;
+	unsigned char m_inLine[42];
+};
+
+class LoadHTTFormat : public LoadT42Format
+{
+public:
+	QString description() const override { return QString("HMS SD-Teletext HTT"); };
+	QStringList extensions() const override { return QStringList { "htt" }; };
+
+protected:
+	bool readPacket() override;
+};
+
+class LoadEP1Format : public LoadFormat
+{
+public:
+	bool load(QFile *inFile, TeletextDocument *document) override;
+
+	QString description() const override { return QString("Softel EP1"); };
+	QStringList extensions() const override { return QStringList { "ep1", "epx" }; };
+
+protected:
+	// Language codes unique to EP1
+	// FIXME duplicated in saveformats.h
+	const QMap<int, int> m_languageCode {
+		{ 0x00, 0x09 }, { 0x01, 0x0d }, { 0x02, 0x18 }, { 0x03, 0x11 }, { 0x04, 0x0b }, { 0x05, 0x17 }, { 0x06, 0x07 },
+		{ 0x08, 0x14 }, { 0x09, 0x0d }, { 0x0a, 0x18 }, { 0x0b, 0x11 }, { 0x0c, 0x0b }, { 0x0e, 0x07 },
+		{ 0x10, 0x09 }, { 0x11, 0x0d }, { 0x12, 0x18 }, { 0x13, 0x11 }, { 0x14, 0x0b }, { 0x15, 0x17 }, { 0x16, 0x1c },
+		{ 0x1d, 0x1e }, { 0x1f, 0x16 },
+		{ 0x21, 0x0d }, { 0x22, 0xff }, { 0x23, 0xff }, { 0x26, 0x07 },
+		{ 0x36, 0x1c }, { 0x37, 0x0e },
+		{ 0x40, 0x09 }, { 0x44, 0x0b }
+	};
+};
+
+
+class LoadFormats
+{
+public:
+	LoadFormats();
+	~LoadFormats();
+
+	LoadFormat *findFormat(const QString &suffix) const;
+	QString filters() const { return s_filters; };
+
+private:
+	static const inline int s_size = 4;
+	static int s_instances;
+	inline static LoadFormat *s_fileFormat[s_size];
+	inline static QString s_filters;
+};
+
+#endif

src/qteletextmaker/main.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2024 Gavin MacGregor
+ * Copyright (C) 2020-2025 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *
@@ -24,13 +24,13 @@
 
 int main(int argc, char *argv[])
 {
-	Q_INIT_RESOURCE(qteletextmaker);
+	Q_INIT_RESOURCE(actionicons);
 	QApplication app(argc, argv);
 	QApplication::setApplicationName("QTeletextMaker");
 	QApplication::setApplicationDisplayName(QApplication::applicationName());
 	QApplication::setOrganizationName("gkmac.co.uk");
 	QApplication::setOrganizationDomain("gkmac.co.uk");
-	QApplication::setApplicationVersion("0.6.4-beta");
+	QApplication::setApplicationVersion("0.7.2-beta");
 	QCommandLineParser parser;
 	parser.setApplicationDescription(QApplication::applicationName());
 	parser.addHelpOption();

src/qteletextmaker/mainwidget.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2024 Gavin MacGregor
+ * Copyright (C) 2020-2025 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *
@@ -140,13 +140,18 @@ void TeletextWidget::timerEvent(QTimerEvent *event)
 		QWidget::timerEvent(event);
 }
 
-void TeletextWidget::pauseFlash(bool pauseNow)
+void TeletextWidget::pauseFlash(int p)
 {
-	if (pauseNow && m_flashTiming != 0) {
+	if (m_flashTiming != 0) {
 		m_flashTimer.stop();
-		m_flashPhase = 0;
+		m_flashPhase = p;
 		update();
-	} else if (m_flashTiming != 0)
+	}
+}
+
+void TeletextWidget::resumeFlash()
+{
+	if (m_flashTiming != 0)
 		m_flashTimer.start((m_flashTiming == 1) ? 500 : 167, this);
 }
 
@@ -161,18 +166,18 @@ void TeletextWidget::setReveal(bool reveal)
 	update();
 }
 
-void TeletextWidget::setMix(bool mix)
-{
-	m_pageRender.setMix(mix);
-	update();
-}
-
 void TeletextWidget::setShowControlCodes(bool showControlCodes)
 {
 	m_pageRender.setShowControlCodes(showControlCodes);
 	update();
 }
 
+void TeletextWidget::setRenderMode(TeletextPageRender::RenderMode renderMode)
+{
+	m_pageRender.setRenderMode(renderMode);
+	update();
+}
+
 void TeletextWidget::setControlBit(int bitNumber, bool active)
 {
 	m_levelOnePage->setControlBit(bitNumber, active);
@@ -228,8 +233,9 @@ 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.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 ((m_pageDecode.level1MosaicAttr(m_teletextDocument->cursorRow(), m_teletextDocument->cursorColumn()) || m_teletextDocument->selectionActive()) && (mappedKeyPress < 0x40 || mappedKeyPress > 0x5f)) {
+			// A blast-through character was NOT pressed
+			// and we're either on a mosaic or a selection is active
 			if (event->key() >= Qt::Key_0 && event->key() <= Qt::Key_9 && event->modifiers() & Qt::KeypadModifier) {
 				switch (event->key()) {
 					case Qt::Key_7:
@@ -388,20 +394,47 @@ void TeletextWidget::setCharacter(unsigned char newCharacter)
 
 void TeletextWidget::toggleCharacterBit(unsigned char bitToToggle)
 {
-	m_teletextDocument->undoStack()->push(new ToggleMosaicBitCommand(m_teletextDocument, bitToToggle));
+	if (!m_teletextDocument->selectionActive())
+		m_teletextDocument->undoStack()->push(new ToggleMosaicBitCommand(m_teletextDocument, bitToToggle));
+	else {
+		const QSet<QPair<int, int>> mosaicList = findMosaics();
+
+		if (!mosaicList.isEmpty())
+			switch (bitToToggle) {
+				case 0x7f:
+					m_teletextDocument->undoStack()->push(new FillMosaicsCommand(m_teletextDocument, mosaicList));
+					break;
+				case 0x20:
+					m_teletextDocument->undoStack()->push(new ClearMosaicsCommand(m_teletextDocument, mosaicList));
+					break;
+				case 0x5f:
+					m_teletextDocument->undoStack()->push(new InvertMosaicsCommand(m_teletextDocument, mosaicList));
+					break;
+				case 0x66:
+					m_teletextDocument->undoStack()->push(new DitherMosaicsCommand(m_teletextDocument, mosaicList));
+					break;
+			}
+	}
 }
 
-void TeletextWidget::shiftMosaics(int key)
+QSet<QPair<int, int>> TeletextWidget::findMosaics()
 {
-	if (!m_teletextDocument->selectionActive())
-		return;
+	QSet<QPair<int, int>> result;
 
-	QSet<QPair<int, int>> mosaicList;
+	if (!m_teletextDocument->selectionActive())
+		return result;
 
 	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));
+				result.insert(qMakePair(r, c));
+
+	return result;
+}
+
+void TeletextWidget::shiftMosaics(int key)
+{
+	const QSet<QPair<int, int>> mosaicList = findMosaics();
 
 	if (!mosaicList.isEmpty())
 		switch (key) {
@@ -510,8 +543,10 @@ QPair<int, int> TeletextWidget::mouseToRowAndColumn(const QPoint &mousePosition)
 {
 	int row = mousePosition.y() / 10;
 	int column = mousePosition.x() / 12 - m_pageDecode.leftSidePanelColumns();
-	if (row < 1)
-		row = 1;
+	const int topRow = (int)!m_teletextDocument->rowZeroAllowed();
+
+	if (row < topRow)
+		row = topRow;
 	if (row > 24)
 		row = 24;
 	if (column < 0)
@@ -614,6 +649,9 @@ LevelOneScene::LevelOneScene(QWidget *levelOneWidget, QObject *parent) : QGraphi
 	m_mainGridItemGroup = new QGraphicsItemGroup;
 	m_mainGridItemGroup->setVisible(false);
 	addItem(m_mainGridItemGroup);
+	m_rowZeroGridItemGroup = new QGraphicsItemGroup;
+	m_rowZeroGridItemGroup->setVisible(false);
+	addItem(m_rowZeroGridItemGroup);
 	// Additional vertical pieces of grid for side panels
 	for (int i=0; i<32; i++) {
 		m_sidePanelGridNeeded[i] = false;
@@ -621,14 +659,17 @@ LevelOneScene::LevelOneScene(QWidget *levelOneWidget, QObject *parent) : QGraphi
 		m_sidePanelGridItemGroup[i]->setVisible(false);
 		addItem(m_sidePanelGridItemGroup[i]);
 	}
-	for (int r=1; r<25; r++) {
+	for (int r=0; r<25; r++) {
 		for (int c=0; c<40; c++) {
 			QGraphicsRectItem *gridPiece = new QGraphicsRectItem(c*12, r*10, 12, 10);
-			gridPiece->setPen(QPen(QBrush(QColor(128, 128, 128, r<24 ? 192 : 128)), 0));
-			m_mainGridItemGroup->addToGroup(gridPiece);
+			gridPiece->setPen(QPen(QBrush(QColor(128, 128, 128, (r != 0 && r != 24) ? 192 : 128)), 0));
+			if (r == 0)
+				m_rowZeroGridItemGroup->addToGroup(gridPiece);
+			else
+				m_mainGridItemGroup->addToGroup(gridPiece);
 		}
 
-		if (r < 24)
+		if (r != 0 && r != 24)
 			for (int c=0; c<32; c++) {
 				QGraphicsRectItem *gridPiece = new QGraphicsRectItem(0, r*10, 12, 10);
 				gridPiece->setPen(QPen(QBrush(QColor(128, 128, 128, 64)), 0));
@@ -653,6 +694,7 @@ void LevelOneScene::setBorderDimensions(int sceneWidth, int sceneHeight, int wid
 
 	// Position grid to cover central 40 columns
 	m_mainGridItemGroup->setPos(leftRightBorders + leftSidePanelColumns*12, topBottomBorders);
+	m_rowZeroGridItemGroup->setPos(leftRightBorders + leftSidePanelColumns*12, topBottomBorders);
 
 	updateCursor();
 	updateSelection();
@@ -705,31 +747,57 @@ void LevelOneScene::updateSelection()
 	m_selectionRectItem->setVisible(true);
 }
 
-void LevelOneScene::setMix(bool mix)
+void LevelOneScene::setRenderMode(TeletextPageRender::RenderMode renderMode)
 {
-	if (mix) {
-		m_fullScreenTopRectItem->setBrush(Qt::transparent);
-		m_fullScreenBottomRectItem->setBrush(Qt::transparent);
-		for (int r=0; r<25; r++) {
-			m_fullRowLeftRectItem[r]->setBrush(Qt::transparent);
-			m_fullRowRightRectItem[r]->setBrush(Qt::transparent);
-		}
-	} else {
-		setFullScreenColour(static_cast<TeletextWidget *>(m_levelOneProxyWidget->widget())->pageDecode()->fullScreenQColor());
-		for (int r=0; r<25; r++)
-			setFullRowColour(r, static_cast<TeletextWidget *>(m_levelOneProxyWidget->widget())->pageDecode()->fullRowQColor(r));
+	static_cast<TeletextWidget *>(m_levelOneProxyWidget->widget())->setRenderMode(renderMode);
+
+	QColor fullColour;
+
+	switch (renderMode) {
+		case TeletextPageRender::RenderNormal:
+			setFullScreenColour(static_cast<TeletextWidget *>(m_levelOneProxyWidget->widget())->pageDecode()->fullScreenQColor());
+			for (int r=0; r<25; r++)
+				setFullRowColour(r, static_cast<TeletextWidget *>(m_levelOneProxyWidget->widget())->pageDecode()->fullRowQColor(r));
+			return;
+		case TeletextPageRender::RenderMix:
+			fullColour = Qt::transparent;
+			break;
+		case TeletextPageRender::RenderWhiteOnBlack:
+			fullColour = Qt::black;
+			break;
+		case TeletextPageRender::RenderBlackOnWhite:
+			fullColour = Qt::white;
+			break;
+	}
+
+	m_fullScreenTopRectItem->setBrush(fullColour);
+	m_fullScreenBottomRectItem->setBrush(fullColour);
+	for (int r=0; r<25; r++) {
+		m_fullRowLeftRectItem[r]->setBrush(fullColour);
+		m_fullRowRightRectItem[r]->setBrush(fullColour);
 	}
 }
 
 void LevelOneScene::toggleGrid(bool gridOn)
 {
 	m_grid = gridOn;
+
 	m_mainGridItemGroup->setVisible(gridOn);
+	if (static_cast<TeletextWidget *>(m_levelOneProxyWidget->widget())->document()->rowZeroAllowed())
+		m_rowZeroGridItemGroup->setVisible(gridOn);
 	for (int i=0; i<32; i++)
 		if (m_sidePanelGridNeeded[i])
 			m_sidePanelGridItemGroup[i]->setVisible(gridOn);
 }
 
+void LevelOneScene::toggleRowZeroAllowed(bool allowed)
+{
+	static_cast<TeletextWidget *>(m_levelOneProxyWidget->widget())->document()->setRowZeroAllowed(allowed);
+
+	if (m_grid)
+		m_rowZeroGridItemGroup->setVisible(allowed);
+}
+
 void LevelOneScene::hideGUIElements(bool hidden)
 {
 	if (hidden) {
@@ -782,7 +850,7 @@ void LevelOneScene::keyReleaseEvent(QKeyEvent *keyEvent)
 
 void LevelOneScene::setFullScreenColour(const QColor &newColor)
 {
-	if (!static_cast<TeletextWidget *>(m_levelOneProxyWidget->widget())->pageRender()->mix()) {
+	if (static_cast<TeletextWidget *>(m_levelOneProxyWidget->widget())->pageRender()->renderMode() == TeletextPageRender::RenderNormal) {
 		m_fullScreenTopRectItem->setBrush(newColor);
 		m_fullScreenBottomRectItem->setBrush(newColor);
 	}
@@ -790,7 +858,7 @@ void LevelOneScene::setFullScreenColour(const QColor &newColor)
 
 void LevelOneScene::setFullRowColour(int row, const QColor &newColor)
 {
-	if (!static_cast<TeletextWidget *>(m_levelOneProxyWidget->widget())->pageRender()->mix()) {
+	if (static_cast<TeletextWidget *>(m_levelOneProxyWidget->widget())->pageRender()->renderMode() == TeletextPageRender::RenderNormal) {
 		m_fullRowLeftRectItem[row]->setBrush(newColor);
 		m_fullRowRightRectItem[row]->setBrush(newColor);
 	}

src/qteletextmaker/mainwidget.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2024 Gavin MacGregor
+ * Copyright (C) 2020-2025 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *
@@ -48,10 +48,11 @@ public:
 	bool insertMode() const { return m_insertMode; };
 	void setInsertMode(bool insertMode);
 	bool showControlCodes() const { return m_pageRender.showControlCodes(); };
+	int flashTiming() const { return m_flashTiming; };
 
 	QSize sizeHint() { return QSize(480+(pageDecode()->leftSidePanelColumns()+pageDecode()->rightSidePanelColumns())*12, 250); }
 
-	void inputMethodEvent(QInputMethodEvent *event);
+	void inputMethodEvent(QInputMethodEvent *event) override;
 
 	TeletextDocument* document() const { return m_teletextDocument; }
 	TeletextPageDecode *pageDecode() { return &m_pageDecode; }
@@ -65,10 +66,11 @@ public slots:
 	void subPageSelected();
 	void refreshPage();
 	void setReveal(bool reveal);
-	void setMix(bool mix);
 	void setShowControlCodes(bool showControlCodes);
+	void setRenderMode(TeletextPageRender::RenderMode renderMode);
 	void updateFlashTimer(int newFlashTimer);
-	void pauseFlash(bool pauseNow);
+	void pauseFlash(int p);
+	void resumeFlash();
 
 	void setControlBit(int bitNumber, bool active);
 	void setDefaultCharSet(int newDefaultCharSet);
@@ -102,6 +104,7 @@ private:
 	int m_flashTiming, m_flashPhase;
 
 	void timerEvent(QTimerEvent *event) override;
+	QSet<QPair<int, int>> findMosaics();
 	void shiftMosaics(int key);
 	void selectionToClipboard();
 
@@ -120,8 +123,9 @@ public:
 public slots:
 	void updateCursor();
 	void updateSelection();
-	void setMix(bool mix);
+	void setRenderMode(TeletextPageRender::RenderMode renderMode);
 	void toggleGrid(bool gridOn);
+	void toggleRowZeroAllowed(bool allowed);
 	void hideGUIElements(bool hidden);
 	void setFullScreenColour(const QColor &newColor);
 	void setFullRowColour(int row, const QColor &newColor);
@@ -140,7 +144,7 @@ private:
 	QGraphicsRectItem *m_fullRowLeftRectItem[25], *m_fullRowRightRectItem[25];
 	QGraphicsProxyWidget *m_levelOneProxyWidget;
 	QGraphicsRectItem *m_cursorRectItem, *m_selectionRectItem;
-	QGraphicsItemGroup *m_mainGridItemGroup, *m_sidePanelGridItemGroup[32];
+	QGraphicsItemGroup *m_mainGridItemGroup, *m_rowZeroGridItemGroup, *m_sidePanelGridItemGroup[32];
 	bool m_grid, m_sidePanelGridNeeded[32];
 };
 

src/qteletextmaker/mainwindow.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2024 Gavin MacGregor
+ * Copyright (C) 2020-2025 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *
@@ -41,15 +41,19 @@
 
 #include "mainwindow.h"
 
+#include "hashformats.h"
 #include "levelonecommands.h"
-#include "loadsave.h"
+#include "loadformats.h"
 #include "mainwidget.h"
 #include "pagecomposelinksdockwidget.h"
 #include "pageenhancementsdockwidget.h"
 #include "pageoptionsdockwidget.h"
 #include "palettedockwidget.h"
+#include "saveformats.h"
 #include "x26dockwidget.h"
 
+#include "gifimage/qgifimage.h"
+
 MainWindow::MainWindow()
 {
 	init();
@@ -82,7 +86,7 @@ void MainWindow::newFile()
 
 void MainWindow::open()
 {
-	const QString fileName = QFileDialog::getOpenFileName(this);
+	const QString fileName = QFileDialog::getOpenFileName(this, tr("Open File"), QString(), m_loadFormats.filters());
 	if (!fileName.isEmpty())
 		openFile(fileName);
 }
@@ -112,39 +116,37 @@ void MainWindow::openFile(const QString &fileName)
 	other->show();
 }
 
-static inline bool hasTTISuffix(const QString &filename)
-{
-	return filename.endsWith(".tti", Qt::CaseInsensitive) || filename.endsWith(".ttix", Qt::CaseInsensitive);
-}
-
-static inline void changeSuffixFromTTI(QString &filename, const QString &newSuffix)
-{
-	if (filename.endsWith(".tti", Qt::CaseInsensitive)) {
-		filename.chop(4);
-		filename.append("." + newSuffix);
-	} else if (filename.endsWith(".ttix", Qt::CaseInsensitive)) {
-		filename.chop(5);
-		filename.append("." + newSuffix);
-	}
-}
-
 bool MainWindow::save()
 {
-	// If imported from non-.tti, force "Save As" so we don't clobber the original imported file
-	return m_isUntitled || !hasTTISuffix(m_curFile) ? saveAs() : saveFile(m_curFile);
+	// If imported from a format we only export, force "Save As" so we don't clobber the original imported file
+	if (m_isUntitled || m_saveFormats.isExportOnly(QFileInfo(m_curFile).suffix()))
+		return saveAs();
+	else
+		return saveFile(m_curFile);
 }
 
 bool MainWindow::saveAs()
 {
 	QString suggestedName = m_curFile;
 
-	// If imported from non-.tti, change extension so we don't clobber the original imported file
-	if (suggestedName.endsWith(".t42", Qt::CaseInsensitive)) {
-		suggestedName.chop(4);
+	// If imported from a format we only export, change suffix so we don't clobber the original imported file
+	if (m_saveFormats.isExportOnly(QFileInfo(suggestedName).suffix())) {
+		const int pos = suggestedName.lastIndexOf(QChar('.'));
+		if (pos != -1)
+			suggestedName.truncate(pos);
+
 		suggestedName.append(".tti");
 	}
 
-	QString fileName = QFileDialog::getSaveFileName(this, tr("Save As"), suggestedName, "TTI teletext page (*.tti *.ttix)");
+	// Set the filter in the file dialog to the same as the current filename extension
+	QString dialogFilter;
+
+	SaveFormat *savingFormat = m_saveFormats.findExportFormat(QFileInfo(suggestedName).suffix());
+
+	if (savingFormat != nullptr)
+		dialogFilter = savingFormat->fileDialogFilter();
+
+	QString fileName = QFileDialog::getSaveFileName(this, tr("Save As"), suggestedName, m_saveFormats.filters(), &dialogFilter);
 	if (fileName.isEmpty())
 		return false;
 
@@ -179,53 +181,130 @@ void MainWindow::reload()
 	m_textWidget->document()->selectSubPageIndex(subPageIndex, true);
 }
 
-void MainWindow::exportPNG()
+void MainWindow::exportImage()
 {
-	QString exportFileName = QFileDialog::getSaveFileName(this, tr("Export PNG"), QString(), "PNG image (*.png)");
+	QString exportFileName, selectedFilter, gifFilter;
+
+	if (!m_exportImageFileName.isEmpty())
+		exportFileName = m_exportImageFileName;
+	else {
+		// Image not exported before: suggest a filename with image extension
+		// If page has flashing, suggest GIF
+		exportFileName = m_curFile.left(m_curFile.lastIndexOf('.'));
+		exportFileName.append(m_textWidget->flashTiming() != 0 ? ".gif" : ".png");
+	}
+
+	if (m_textWidget->flashTiming() != 0)
+		gifFilter = "Animated GIF image (*.gif)";
+	else
+		gifFilter = "GIF image (*.gif)";
+
+	// Set the filter in the file dialog to the same as the current filename extension
+	if (QFileInfo(exportFileName).suffix().toLower() == "gif")
+		selectedFilter = gifFilter;
+	else
+		selectedFilter = "PNG image (*.png)";
+
+	exportFileName = QFileDialog::getSaveFileName(this, tr("Export image"), exportFileName, "PNG image (*.png);;" + gifFilter, &selectedFilter);
 	if (exportFileName.isEmpty())
 		return;
 
-	// Prepare widget image for extraction
-	m_textWidget->pauseFlash(true);
-	m_textScene->hideGUIElements(true);
-	// Disable exporting in Mix mode as it corrupts the background
-	bool reMix = m_textWidget->pageRender()->mix();
-	if (reMix) {
-		m_textWidget->setMix(false);
-		m_textScene->setMix(false);
+	const QString suffix = QFileInfo(exportFileName).suffix().toLower();
+
+	if (suffix.isEmpty()) {
+		QMessageBox::warning(this, QApplication::applicationDisplayName(), tr("No filename extension specified."));
+		return;
+	} else if (suffix != "png" && suffix != "gif") {
+		QMessageBox::warning(this, QApplication::applicationDisplayName(), tr("Cannot export image of format %1.").arg(suffix));
+		return;
 	}
 
-	// Extract the image from the scene
-	QImage interImage = QImage(m_textScene->sceneRect().size().toSize(), QImage::Format_RGB32);
-//	This ought to make the background transparent in Mix mode, but it doesn't
-//	if (m_textWidget->pageDecode()->mix())
-//		interImage.fill(QColor(0, 0, 0, 0));
-	QPainter interPainter(&interImage);
-	m_textScene->render(&interPainter);
+	// Disable flash exporting if extension is not GIF
+	const int flashTiming = suffix == "gif" ? m_textWidget->flashTiming() : 0;
+
+	// Prepare widget image for extraction
+	m_textScene->hideGUIElements(true);
+	// Disable exporting in Mix mode as it corrupts the background
+	bool reMix = m_textWidget->pageRender()->renderMode() == TeletextPageRender::RenderMix;
+	if (reMix)
+		m_textScene->setRenderMode(TeletextPageRender::RenderNormal);
+
+	// Allocate initial image, with additional images for flashing if necessary
+	QImage interImage[6];
+
+	interImage[0] = QImage(m_textScene->sceneRect().size().toSize(), QImage::Format_RGB32);
+	if (flashTiming != 0) {
+		interImage[3] = QImage(m_textScene->sceneRect().size().toSize(), QImage::Format_RGB32);
+		if (flashTiming == 2) {
+			interImage[1] = QImage(m_textScene->sceneRect().size().toSize(), QImage::Format_RGB32);
+			interImage[2] = QImage(m_textScene->sceneRect().size().toSize(), QImage::Format_RGB32);
+			interImage[4] = QImage(m_textScene->sceneRect().size().toSize(), QImage::Format_RGB32);
+			interImage[5] = QImage(m_textScene->sceneRect().size().toSize(), QImage::Format_RGB32);
+		}
+	}
+
+	// Now extract the image(s) from the scene
+	for (int p=0; p<6; p++)
+		if (!interImage[p].isNull()) {
+			m_textWidget->pauseFlash(p);
+			//	This ought to make the background transparent in Mix mode, but it doesn't
+			//	if (m_textWidget->pageDecode()->mix())
+			//		interImage.fill(QColor(0, 0, 0, 0));
+			QPainter interPainter(&interImage[p]);
+			m_textScene->render(&interPainter);
+		}
 
 	// Now we've extracted the image we can put the GUI things back
 	m_textScene->hideGUIElements(false);
-	if (reMix) {
-		m_textWidget->setMix(true);
-		m_textScene->setMix(true);
+	if (reMix)
+		m_textScene->setRenderMode(TeletextPageRender::RenderMix);
+	m_textWidget->resumeFlash();
+
+	// Now scale the extracted image(s) to the selected aspect ratio
+	QImage scaledImage[6];
+
+	for (int p=0; p<6; p++)
+		if (!interImage[p].isNull()) {
+			if (m_viewAspectRatio == 3)
+				// Aspect ratio is Pixel 1:2 so we only need to double the vertical height
+				scaledImage[p] = interImage[p].scaled(interImage[p].width(), interImage[p].height()*2, Qt::IgnoreAspectRatio, Qt::FastTransformation);
+			else {
+				// Scale the image in two steps so that smoothing only occurs on vertical lines
+				// Double the vertical height first
+				const QImage doubleHeightImage = interImage[p].scaled(interImage[p].width(), interImage[p].height()*2, Qt::IgnoreAspectRatio, Qt::FastTransformation);
+				// then scale it horizontally to the selected aspect ratio
+				// Don't smooth GIF as it's bound to break the 256 colour limit
+				scaledImage[p] = doubleHeightImage.scaled((int)((float)doubleHeightImage.width() * aspectRatioHorizontalScaling[m_viewAspectRatio] * 2), doubleHeightImage.height(), Qt::IgnoreAspectRatio, (suffix == "gif") ? Qt::FastTransformation : Qt::SmoothTransformation);
+			}
+		}
+
+	if (suffix == "png") {
+		if (scaledImage[0].save(exportFileName, "PNG"))
+			m_exportImageFileName = exportFileName;
+		else
+			QMessageBox::warning(this, QApplication::applicationDisplayName(), tr("Cannot export image %1.").arg(QDir::toNativeSeparators(exportFileName)));
 	}
-	m_textWidget->pauseFlash(false);
 
-	// Now scale the extracted image to the selected aspect ratio
-	// We do this in two steps so that anti-aliasing only occurs on vertical lines
+	if (suffix == "gif") {
+		QGifImage gif(scaledImage[0].size());
 
-	// Double the vertical height first
-	const QImage doubleHeightImage = interImage.scaled(interImage.width(), interImage.height()*2, Qt::IgnoreAspectRatio, Qt::FastTransformation);
+		if (scaledImage[3].isNull())
+			// No flashing
+			gif.addFrame(scaledImage[0], 0);
+		else if (interImage[1].isNull()) {
+			// 1Hz flashing
+			gif.addFrame(scaledImage[0], 500);
+			gif.addFrame(scaledImage[3], 500);
+		} else
+			// 2Hz flashing
+			for (int p=0; p<6; p++)
+				gif.addFrame(scaledImage[p], (p % 3 == 0) ? 166 : 167);
 
-	// If aspect ratio is Pixel 1:2 we're already at the correct scale
-	if (m_viewAspectRatio != 3) {
-		// Scale it horizontally to the selected aspect ratio
-		const QImage scaledImage = doubleHeightImage.scaled((int)((float)doubleHeightImage.width() * aspectRatioHorizontalScaling[m_viewAspectRatio] * 2), doubleHeightImage.height(), Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
-
-		if (!scaledImage.save(exportFileName, "PNG"))
-			QMessageBox::warning(this, QApplication::applicationDisplayName(), tr("Cannot export file %1.").arg(QDir::toNativeSeparators(exportFileName)));
-	} else if (!doubleHeightImage.save(exportFileName, "PNG"))
-		QMessageBox::warning(this, QApplication::applicationDisplayName(), tr("Cannot export file %1.").arg(QDir::toNativeSeparators(exportFileName)));
+		if (gif.save(exportFileName))
+			m_exportImageFileName = exportFileName;
+		else
+			QMessageBox::warning(this, QApplication::applicationDisplayName(), tr("Cannot export image %1.").arg(QDir::toNativeSeparators(exportFileName)));
+	}
 }
 
 void MainWindow::exportZXNet()
@@ -243,7 +322,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-2024 Gavin MacGregor<br><br>"
+	"Copyright (C) 2020-2025 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()));
 }
@@ -253,6 +332,7 @@ void MainWindow::init()
 	setAttribute(Qt::WA_DeleteOnClose);
 
 	m_isUntitled = true;
+	m_reExportWarning = false;
 
 	m_textWidget = new TeletextWidget;
 
@@ -280,6 +360,7 @@ void MainWindow::init()
 		m_textView->setRenderHints(QPainter::SmoothPixmapTransform);
 	m_textView->setBackgroundBrush(QBrush(QColor(32, 48, 96)));
 	m_zoomSlider->setValue(m_viewZoom);
+	setSceneDimensions();
 	setCentralWidget(m_textView);
 
 	connect(m_textWidget->document(), &TeletextDocument::cursorMoved, this, &MainWindow::updateCursorPosition);
@@ -381,9 +462,9 @@ void MainWindow::createActions()
 	connect(fileMenu, &QMenu::aboutToShow, this, &MainWindow::updateExportAutoAction);
 	connect(m_exportAutoAct, &QAction::triggered, this, &MainWindow::exportAuto);
 
-	QAction *exportT42Act = fileMenu->addAction(tr("Export subpage as t42..."));
-	exportT42Act->setStatusTip("Export this subpage as a t42 file");
-	connect(exportT42Act, &QAction::triggered, this, [=]() { exportT42(false); });
+	QAction *exportFileAct = fileMenu->addAction(tr("Export subpage as..."));
+	exportFileAct->setStatusTip("Export this subpage to various formats");
+	connect(exportFileAct, &QAction::triggered, this, [=]() { exportFile(false); });
 
 	QMenu *exportHashStringSubMenu = fileMenu->addMenu(tr("Export subpage to online editor"));
 
@@ -395,9 +476,9 @@ void MainWindow::createActions()
 	exportEditTFAct->setStatusTip("Export and open this subpage in the edit.tf online editor");
 	connect(exportEditTFAct, &QAction::triggered, this, &MainWindow::exportEditTF);
 
-	QAction *exportPNGAct = fileMenu->addAction(tr("Export subpage as PNG..."));
-	exportPNGAct->setStatusTip("Export a PNG image of this subpage");
-	connect(exportPNGAct, &QAction::triggered, this, &MainWindow::exportPNG);
+	QAction *exportImageAct = fileMenu->addAction(tr("Export subpage as image..."));
+	exportImageAct->setStatusTip("Export an image of this subpage");
+	connect(exportImageAct, &QAction::triggered, this, &MainWindow::exportImage);
 
 	QAction *exportM29Act = fileMenu->addAction(tr("Export subpage X/28 as M/29..."));
 	exportM29Act->setStatusTip("Export this subpage's X/28 packets as a tti file with M/29 packets");
@@ -495,6 +576,13 @@ void MainWindow::createActions()
 	m_deleteSubPageAction->setStatusTip(tr("Delete this subpage"));
 	connect(m_deleteSubPageAction, &QAction::triggered, this, &MainWindow::deleteSubPage);
 
+	editMenu->addSeparator();
+
+	m_rowZeroAct = editMenu->addAction(tr("Edit header row"));
+	m_rowZeroAct->setCheckable(true);
+	m_rowZeroAct->setStatusTip(tr("Allow editing of header row"));
+	connect(m_rowZeroAct, &QAction::toggled, m_textScene, &LevelOneScene::toggleRowZeroAllowed);
+
 	QMenu *viewMenu = menuBar()->addMenu(tr("&View"));
 
 	QAction *revealAct = viewMenu->addAction(tr("&Reveal"));
@@ -503,20 +591,13 @@ void MainWindow::createActions()
 	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->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->setStatusTip(tr("Toggle the text grid"));
 	connect(gridAct, &QAction::toggled, m_textScene, &LevelOneScene::toggleGrid);
 
-	QAction *showControlCodesAct = viewMenu->addAction(tr("Show control codes"));
+	QAction *showControlCodesAct = viewMenu->addAction(tr("Control codes"));
 	showControlCodesAct->setCheckable(true);
 	showControlCodesAct->setShortcut(QKeySequence(Qt::CTRL | Qt::Key_T));
 	showControlCodesAct->setStatusTip(tr("Toggle showing of control codes"));
@@ -524,6 +605,17 @@ void MainWindow::createActions()
 
 	viewMenu->addSeparator();
 
+	QMenu *renderModeSubMenu = viewMenu->addMenu(tr("Render mode"));
+	QAction *renderModeActs[4];
+	renderModeActs[0] = renderModeSubMenu->addAction(tr("Normal"));
+	renderModeActs[0]->setStatusTip(tr("Render page normally"));
+	renderModeActs[1] = renderModeSubMenu->addAction(tr("Mix"));
+	renderModeActs[1]->setStatusTip(tr("Render page in mix mode"));
+	renderModeActs[2] = renderModeSubMenu->addAction(tr("White on black"));
+	renderModeActs[2]->setStatusTip(tr("Render page with white foreground on black background"));
+	renderModeActs[3] = renderModeSubMenu->addAction(tr("Black on white"));
+	renderModeActs[3]->setStatusTip(tr("Render page with black foreground on white background"));
+
 	QMenu *borderSubMenu = viewMenu->addMenu(tr("Border"));
 	m_borderActs[0] = borderSubMenu->addAction(tr("None"));
 	m_borderActs[0]->setStatusTip(tr("View with no border"));
@@ -542,18 +634,26 @@ void MainWindow::createActions()
 	m_aspectRatioActs[3] = aspectRatioSubMenu->addAction(tr("Pixel 1:2"));
 	m_aspectRatioActs[3]->setStatusTip(tr("View with 1:2 pixel mapping"));
 
+	QActionGroup *renderModeGroup = new QActionGroup(this);
 	QActionGroup *borderGroup = new QActionGroup(this);
 	QActionGroup *aspectRatioGroup = new QActionGroup(this);
 	for (int i=0; i<=3; i++) {
+		renderModeActs[i]->setCheckable(true);
+		connect(renderModeActs[i], &QAction::triggered, [=]() { m_textScene->setRenderMode(static_cast<TeletextPageRender::RenderMode>(i)); });
+		renderModeGroup->addAction(renderModeActs[i]);
+
 		m_aspectRatioActs[i]->setCheckable(true);
 		connect(m_aspectRatioActs[i], &QAction::triggered, [=]() { setAspectRatio(i); });
 		aspectRatioGroup->addAction(m_aspectRatioActs[i]);
+
 		if (i == 3)
 			break;
+
 		m_borderActs[i]->setCheckable(true);
 		connect(m_borderActs[i], &QAction::triggered, [=]() { setBorder(i); });
 		borderGroup->addAction(m_borderActs[i]);
 	}
+	renderModeActs[0]->setChecked(true);
 
 	viewMenu->addSeparator();
 
@@ -866,8 +966,6 @@ 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"));
 }
 
 void MainWindow::readSettings()
@@ -877,11 +975,11 @@ void MainWindow::readSettings()
 	const QByteArray geometry = settings.value("geometry", QByteArray()).toByteArray();
 	const QByteArray windowState = settings.value("windowState", QByteArray()).toByteArray();
 
-	m_viewBorder = settings.value("border", 2).toInt();
-	m_viewBorder = (m_viewBorder < 0 || m_viewBorder > 2) ? 2 : m_viewBorder;
+	m_viewBorder = settings.value("border", 1).toInt();
+	m_viewBorder = (m_viewBorder < 0 || m_viewBorder > 2) ? 1 : m_viewBorder;
 	m_borderActs[m_viewBorder]->setChecked(true);
 	m_viewAspectRatio = settings.value("aspectratio", 0).toInt();
-	m_viewAspectRatio = (m_viewAspectRatio < 0 || m_viewAspectRatio > 2) ? 0 : m_viewAspectRatio;
+	m_viewAspectRatio = (m_viewAspectRatio < 0 || m_viewAspectRatio > 3) ? 0 : m_viewAspectRatio;
 	m_aspectRatioActs[m_viewAspectRatio]->setChecked(true);
 	m_viewSmoothTransform = settings.value("smoothTransform", 0).toBool();
 	m_smoothTransformAction->blockSignals(true);
@@ -890,17 +988,17 @@ void MainWindow::readSettings()
 	m_viewZoom = settings.value("zoom", 2).toInt();
 	m_viewZoom = (m_viewZoom < 0 || m_viewZoom > 12) ? 2 : m_viewZoom;
 
-	// zoom 0 = 420,426px, 1 = 620,570px, 2 = 780,720px
+	// zoom 0 = 430,385px, 1 = 500,530px, 2 = 650,670px
 	if (geometry.isEmpty()) {
 		const QRect availableGeometry = QGuiApplication::primaryScreen()->availableGeometry();
-		if (availableGeometry.width() < 620 || availableGeometry.height() < 570) {
-			resize(430, 430);
+		if (availableGeometry.width() < 500 || availableGeometry.height() < 530) {
+			resize(430, 385);
 			m_viewZoom = 0;
-		} else if (availableGeometry.width() < 780 || availableGeometry.height() < 720) {
-			resize(620, 570);
+		} else if (availableGeometry.width() < 650 || availableGeometry.height() < 670) {
+			resize(500, 530);
 			m_viewZoom = 1;
 		} else
-			resize(780, 720);
+			resize(650, 670);
 //			m_viewZoom = 2;
 		move((availableGeometry.width() - width()) / 2, (availableGeometry.height() - height()) / 2);
 	} else
@@ -952,28 +1050,35 @@ void MainWindow::loadFile(const QString &fileName)
 	int levelSeen;
 
 	QFile file(fileName);
-	const QFileInfo fileInfo(file);
-	QIODevice::OpenMode fileOpenMode;
 
-	if (fileInfo.suffix() == "t42")
-		fileOpenMode = QFile::ReadOnly;
-	else
-		fileOpenMode = QFile::ReadOnly | QFile::Text;
+	LoadFormat *loadingFormat = m_loadFormats.findFormat(QFileInfo(fileName).suffix());
+	if (loadingFormat == nullptr) {
+		QMessageBox::warning(this, QApplication::applicationDisplayName(), tr("Cannot load file %1:\nUnknown file format or extension").arg(QDir::toNativeSeparators(fileName)));
+		setCurrentFile(QString());
 
-	if (!file.open(fileOpenMode)) {
+		return;
+	}
+
+	if (!file.open(QFile::ReadOnly)) {
 		QMessageBox::warning(this, QApplication::applicationDisplayName(), tr("Cannot read file %1:\n%2.").arg(QDir::toNativeSeparators(fileName), file.errorString()));
 		setCurrentFile(QString());
+
 		return;
 	}
 
 	QApplication::setOverrideCursor(Qt::WaitCursor);
 
-	if (fileInfo.suffix() == "t42") {
-		importT42(&file, m_textWidget->document());
-		m_exportAutoFileName = fileName;
+	if (loadingFormat->load(&file, m_textWidget->document())) {
+		if (m_saveFormats.isExportOnly(QFileInfo(file).suffix()))
+			m_exportAutoFileName = fileName;
+		else
+			m_exportAutoFileName.clear();
 	} else {
-		loadTTI(&file, m_textWidget->document());
-		m_exportAutoFileName.clear();
+		QApplication::restoreOverrideCursor();
+		QMessageBox::warning(this, QApplication::applicationDisplayName(), tr("Cannot load file %1\n%2").arg(QDir::toNativeSeparators(fileName), loadingFormat->errorString()));
+		setCurrentFile(QString());
+
+		return;
 	}
 
 	levelSeen = m_textWidget->document()->levelRequired();
@@ -985,6 +1090,17 @@ void MainWindow::loadFile(const QString &fileName)
 
 	QApplication::restoreOverrideCursor();
 
+	if (!loadingFormat->warningStrings().isEmpty())
+		QMessageBox::warning(this, QApplication::applicationDisplayName(), tr("The following issues were encountered when loading<br>%1:<ul><li>%2</li></ul>").arg(QDir::toNativeSeparators(fileName), loadingFormat->warningStrings().join("</li><li>")));
+
+	m_reExportWarning = loadingFormat->reExportWarning();
+
+	for (int i=0; i<m_textWidget->document()->numberOfSubPages(); i++)
+		if (m_textWidget->document()->subPage(i)->packetExists(0)) {
+			m_rowZeroAct->setChecked(true);
+			break;
+		}
+
 	setCurrentFile(fileName);
 	statusBar()->showMessage(tr("File loaded"), 2000);
 }
@@ -1082,14 +1198,23 @@ bool MainWindow::saveFile(const QString &fileName)
 {
 	QString errorMessage;
 
+	SaveFormat *savingFormat = m_saveFormats.findFormat(QFileInfo(fileName).suffix());
+	if (savingFormat == nullptr) {
+		QMessageBox::warning(this, QApplication::applicationDisplayName(), tr("Cannot save file %1:\nUnknown file format or extension").arg(QDir::toNativeSeparators(fileName)));
+		return false;
+	}
+
 	QApplication::setOverrideCursor(Qt::WaitCursor);
+
 	QSaveFile file(fileName);
-	if (file.open(QFile::WriteOnly | QFile::Text)) {
-		saveTTI(file, *m_textWidget->document());
+	if (file.open(QFile::WriteOnly)) {
+		savingFormat->saveAllPages(file, *m_textWidget->document());
+
 		if (!file.commit())
 			errorMessage = tr("Cannot write file %1:\n%2.").arg(QDir::toNativeSeparators(fileName), file.errorString());
 	} else
 		errorMessage = tr("Cannot open file %1 for writing:\n%2.").arg(QDir::toNativeSeparators(fileName), file.errorString());
+
 	QApplication::restoreOverrideCursor();
 
 	if (!errorMessage.isEmpty()) {
@@ -1108,33 +1233,66 @@ void MainWindow::exportAuto()
 	if (m_exportAutoFileName.isEmpty())
 		return;
 
-	exportT42(true);
+	exportFile(true);
 }
 
-void MainWindow::exportT42(bool fromAuto)
+void MainWindow::exportFile(bool fromAuto)
 {
 	QString errorMessage;
 	QString exportFileName;
+	SaveFormat *exportFormat = nullptr;
 
-	if (fromAuto)
+	if (fromAuto) {
+		if (m_reExportWarning) {
+			QMessageBox::StandardButton ret = QMessageBox::warning(this, QApplication::applicationDisplayName(), tr("Will not overwrite imported file %1:\nAll other subpages in that file would be erased.\nPlease save or export to a different file.").arg(strippedName(m_exportAutoFileName)));
+
+			return;
+		}
 		exportFileName = m_exportAutoFileName;
-	else {
-		exportFileName = m_curFile;
-		changeSuffixFromTTI(exportFileName, "t42");
+	} else {
+		if (m_exportAutoFileName.isEmpty())
+			exportFileName = m_curFile;
+		else
+			exportFileName = m_exportAutoFileName;
 
-		exportFileName = QFileDialog::getSaveFileName(this, tr("Export t42"), exportFileName, "t42 stream (*.t42)");
+		// Set the filter in the file dialog to the same as the current filename extension
+		QString dialogFilter;
+
+		exportFormat = m_saveFormats.findExportFormat(QFileInfo(exportFileName).suffix());
+
+		if (exportFormat != nullptr)
+			dialogFilter = exportFormat->fileDialogFilter();
+
+		exportFileName = QFileDialog::getSaveFileName(this, tr("Export subpage"), exportFileName, m_saveFormats.exportFilters(), &dialogFilter);
 		if (exportFileName.isEmpty())
 			return;
 	}
 
+	exportFormat = m_saveFormats.findExportFormat(QFileInfo(exportFileName).suffix());
+	if (exportFormat == nullptr) {
+		QMessageBox::warning(this, QApplication::applicationDisplayName(), tr("Cannot export file %1:\nUnknown file format or extension").arg(QDir::toNativeSeparators(exportFileName)));
+		return;
+	}
+
+	if (!fromAuto && exportFormat->getWarnings(*m_textWidget->document()->currentSubPage())) {
+		const QMessageBox::StandardButton ret = QMessageBox::warning(this, QApplication::applicationDisplayName(), tr("The following issues will be encountered when exporting<br>%1:<ul><li>%2</li></ul>Do you want to export?").arg(strippedName(exportFileName)).arg(exportFormat->warningStrings().join("</li><li>")), QMessageBox::Yes | QMessageBox::No);
+
+		if (ret != QMessageBox::Yes)
+			return;
+	}
+
 	QApplication::setOverrideCursor(Qt::WaitCursor);
+
 	QSaveFile file(exportFileName);
+
 	if (file.open(QFile::WriteOnly)) {
-		exportT42File(file, *m_textWidget->document());
+		exportFormat->saveCurrentSubPage(file, *m_textWidget->document());
+
 		if (!file.commit())
 			errorMessage = tr("Cannot write file %1:\n%2.").arg(QDir::toNativeSeparators(exportFileName), file.errorString());
 	} else
-		errorMessage = tr("Cannot open file %1 for writing:\n%2.").arg(QDir::toNativeSeparators(exportFileName), file.errorString());
+			errorMessage = tr("Cannot open file %1 for writing:\n%2.").arg(QDir::toNativeSeparators(exportFileName), file.errorString());
+
 	QApplication::restoreOverrideCursor();
 
 	if (!errorMessage.isEmpty()) {
@@ -1145,6 +1303,7 @@ void MainWindow::exportT42(bool fromAuto)
 	MainWindow::prependToRecentFiles(exportFileName);
 
 	m_exportAutoFileName = exportFileName;
+	m_reExportWarning = false;
 	statusBar()->showMessage(tr("File exported"), 2000);
 }
 
@@ -1181,18 +1340,23 @@ void MainWindow::exportM29()
 		exportFileName = QDir(QFileInfo(m_curFile).absoluteDir()).filePath(exportFileName);
 	}
 
-	exportFileName = QFileDialog::getSaveFileName(this, tr("Export M/29 tti"), exportFileName, "TTI teletext page (*.tti *.ttix)");
+	exportFileName = QFileDialog::getSaveFileName(this, tr("Export M/29 tti"), exportFileName, "MRG Systems TTI (*.tti *.ttix)");
 	if (exportFileName.isEmpty())
 		return;
 
 	QApplication::setOverrideCursor(Qt::WaitCursor);
+
 	QSaveFile file(exportFileName);
-	if (file.open(QFile::WriteOnly | QFile::Text)) {
-		exportM29File(file, *m_textWidget->document());
+	if (file.open(QFile::WriteOnly)) {
+		SaveM29Format saveM29Format;
+
+		saveM29Format.saveCurrentSubPage(file, *m_textWidget->document());
+
 		if (!file.commit())
 			errorMessage = tr("Cannot write file %1:\n%2.").arg(QDir::toNativeSeparators(exportFileName), file.errorString());
 	} else
 		errorMessage = tr("Cannot open file %1 for writing:\n%2.").arg(QDir::toNativeSeparators(exportFileName), file.errorString());
+
 	QApplication::restoreOverrideCursor();
 
 	if (!errorMessage.isEmpty())

src/qteletextmaker/mainwindow.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2024 Gavin MacGregor
+ * Copyright (C) 2020-2025 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *
@@ -30,11 +30,13 @@
 #include <QSlider>
 #include <QToolButton>
 
+#include "loadformats.h"
 #include "mainwidget.h"
 #include "pagecomposelinksdockwidget.h"
 #include "pageenhancementsdockwidget.h"
 #include "pageoptionsdockwidget.h"
 #include "palettedockwidget.h"
+#include "saveformats.h"
 #include "x26dockwidget.h"
 
 class QAction;
@@ -61,10 +63,10 @@ private slots:
 	bool saveAs();
 	void reload();
 	void exportAuto();
-	void exportT42(bool fromAuto);
+	void exportFile(bool fromAuto);
 	void exportZXNet();
 	void exportEditTF();
-	void exportPNG();
+	void exportImage();
 	void exportM29();
 	void updateRecentFileActions();
 	void updateExportAutoAction();
@@ -129,6 +131,7 @@ private:
 	QAction *m_borderActs[3];
 	QAction *m_aspectRatioActs[4];
 	QAction *m_smoothTransformAction;
+	QAction *m_rowZeroAct;
 
 	QLabel *m_subPageLabel, *m_cursorPositionLabel;
 	QToolButton *m_previousSubPageButton, *m_nextSubPageButton;
@@ -136,8 +139,11 @@ private:
 	QPushButton *m_insertModePushButton;
 	QRadioButton *m_levelRadioButton[4];
 
-	QString m_curFile, m_exportAutoFileName;
-	bool m_isUntitled;
+	QString m_curFile, m_exportAutoFileName, m_exportImageFileName;
+	bool m_isUntitled, m_reExportWarning;
+
+	LoadFormats m_loadFormats;
+	SaveFormats m_saveFormats;
 };
 
 #endif

src/qteletextmaker/pagecomposelinksdockwidget.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2024 Gavin MacGregor
+ * Copyright (C) 2020-2025 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *
@@ -68,10 +68,18 @@ PageComposeLinksDockWidget::PageComposeLinksDockWidget(TeletextWidget *parent):
 			// Required at which Levels
 			m_composeLinkLevelCheckbox[i][0] = new QCheckBox(this);
 			x27Layout->addWidget(m_composeLinkLevelCheckbox[i][0], i+2, 1, 1, 1);
+#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
+			connect(m_composeLinkLevelCheckbox[i][0], &QCheckBox::checkStateChanged, [=](bool active) { m_parentMainWidget->document()->currentSubPage()->setComposeLinkLevel2p5(i, active); });
+#else
 			connect(m_composeLinkLevelCheckbox[i][0], &QCheckBox::stateChanged, [=](bool active) { m_parentMainWidget->document()->currentSubPage()->setComposeLinkLevel2p5(i, active); });
+#endif
 			m_composeLinkLevelCheckbox[i][1] = new QCheckBox(this);
 			x27Layout->addWidget(m_composeLinkLevelCheckbox[i][1], i+2, 2, 1, 1);
+#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
+			connect(m_composeLinkLevelCheckbox[i][1], &QCheckBox::checkStateChanged, [=](bool active) { m_parentMainWidget->document()->currentSubPage()->setComposeLinkLevel3p5(i, active); });
+#else
 			connect(m_composeLinkLevelCheckbox[i][1], &QCheckBox::stateChanged, [=](bool active) { m_parentMainWidget->document()->currentSubPage()->setComposeLinkLevel3p5(i, active); });
+#endif
 		} else {
 			// Selectable link functions for Level 3.5
 			m_composeLinkFunctionComboBox[i-4] = new QComboBox;

src/qteletextmaker/pagecomposelinksdockwidget.h

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

src/qteletextmaker/pageenhancementsdockwidget.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2024 Gavin MacGregor
+ * Copyright (C) 2020-2025 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *
@@ -71,7 +71,11 @@ PageEnhancementsDockWidget::PageEnhancementsDockWidget(TeletextWidget *parent):
 	// Black background colour substitution
 	m_blackBackgroundSubstAct = new QCheckBox("Black background colour substitution");
 	colourLayout->addWidget(m_blackBackgroundSubstAct, 3, 0, 1, 2, Qt::AlignTop);
+#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
+	connect(m_blackBackgroundSubstAct, &QCheckBox::checkStateChanged, [=](int state){ m_parentMainWidget->document()->undoStack()->push(new SetBlackBackgroundSubstCommand(m_parentMainWidget->document(), state)); });
+#else
 	connect(m_blackBackgroundSubstAct, &QCheckBox::stateChanged, [=](int state){ m_parentMainWidget->document()->undoStack()->push(new SetBlackBackgroundSubstCommand(m_parentMainWidget->document(), state)); });
+#endif
 
 	// Add group box to the main layout
 	colourGroupBox->setLayout(colourLayout);
@@ -98,7 +102,11 @@ PageEnhancementsDockWidget::PageEnhancementsDockWidget(TeletextWidget *parent):
 	// Side panels status
 	m_sidePanelStatusAct = new QCheckBox("Side panels at level 3.5 only");
 	sidePanelsLayout->addWidget(m_sidePanelStatusAct, 2, 0, 1, 2, Qt::AlignTop);
+#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
+	connect(m_sidePanelStatusAct, &QCheckBox::checkStateChanged, m_parentMainWidget, &TeletextWidget::setSidePanelAtL35Only);
+#else
 	connect(m_sidePanelStatusAct, &QCheckBox::stateChanged, m_parentMainWidget, &TeletextWidget::setSidePanelAtL35Only);
+#endif
 
 	// Add group box to the main layout
 	sidePanelsGroupBox->setLayout(sidePanelsLayout);

src/qteletextmaker/pageenhancementsdockwidget.h

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

src/qteletextmaker/pageoptionsdockwidget.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2024 Gavin MacGregor
+ * Copyright (C) 2020-2025 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *
@@ -104,7 +104,11 @@ PageOptionsDockWidget::PageOptionsDockWidget(TeletextWidget *parent): QDockWidge
 
 		m_controlBitsAct[i] = new QCheckBox(controlBitsLabel[i]);
 		subPageOptionsLayout->addWidget(m_controlBitsAct[i]);
+#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
+		connect(m_controlBitsAct[i], &QCheckBox::checkStateChanged, [=](bool active) { m_parentMainWidget->setControlBit(i, active); });
+#else
 		connect(m_controlBitsAct[i], &QCheckBox::stateChanged, [=](bool active) { m_parentMainWidget->setControlBit(i, active); });
+#endif
 	}
 
 	// Region and language

src/qteletextmaker/pageoptionsdockwidget.h

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

src/qteletextmaker/palettedockwidget.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2024 Gavin MacGregor
+ * Copyright (C) 2020-2025 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *
@@ -65,7 +65,11 @@ PaletteDockWidget::PaletteDockWidget(TeletextWidget *parent): QDockWidget(parent
 
 	m_showHexValuesCheckBox = new QCheckBox(tr("Show colour hex values"));
 	paletteGridLayout->addWidget(m_showHexValuesCheckBox, 5, 1, 1, 8);
+#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
+	connect(m_showHexValuesCheckBox, &QCheckBox::checkStateChanged, this, &PaletteDockWidget::updateAllColourButtons);
+#else
 	connect(m_showHexValuesCheckBox, &QCheckBox::stateChanged, this, &PaletteDockWidget::updateAllColourButtons);
+#endif
 
 	paletteGridWidget->setLayout(paletteGridLayout);
 	this->setWidget(paletteGridWidget);

src/qteletextmaker/palettedockwidget.h

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

src/qteletextmaker/saveformats.cpp

@@ -0,0 +1,588 @@
+/*
+ * Copyright (C) 2020-2025 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 "saveformats.h"
+
+#include <QByteArray>
+#include <QDataStream>
+#include <QSaveFile>
+#include <QString>
+
+#include "document.h"
+#include "hamming.h"
+#include "levelonepage.h"
+#include "pagebase.h"
+
+void SaveFormat::saveAllPages(QSaveFile &outFile, const TeletextDocument &document)
+{
+	m_document = &document;
+	m_outFile = &outFile;
+	m_outStream.setDevice(m_outFile);
+	m_warnings.clear();
+	m_error.clear();
+
+	writeDocumentStart();
+	writeAllPages();
+	writeDocumentEnd();
+}
+
+void SaveFormat::saveCurrentSubPage(QSaveFile &outFile, const TeletextDocument &document)
+{
+	m_document = &document;
+	m_outFile = &outFile;
+	m_outStream.setDevice(m_outFile);
+	m_warnings.clear();
+	m_error.clear();
+
+	writeDocumentStart();
+	writeSubPage(*m_document->currentSubPage());
+	writeDocumentEnd();
+}
+
+void SaveFormat::writeAllPages()
+{
+	for (int p=0; p<m_document->numberOfSubPages(); p++)
+		writeSubPage(*m_document->subPage(p), (m_document->numberOfSubPages() == 1) ? 0 : p+1);
+}
+
+void SaveFormat::writeSubPage(const PageBase &subPage, int subPageNumber)
+{
+	writeSubPageStart(subPage, subPageNumber);
+	writeSubPageBody(subPage);
+	writeSubPageEnd(subPage);
+}
+
+void SaveFormat::writeSubPageBody(const PageBase &subPage)
+{
+	writeX27Packets(subPage);
+	writeX28Packets(subPage);
+	if (m_document->pageFunction() == TeletextDocument::PFLevelOnePage) {
+		writeX26Packets(subPage);
+		writeX1to25Packets(subPage);
+	} else {
+		qDebug("Not LevelOnePage, assuming 7-bit packets!");
+		writeX1to25Packets(subPage);
+		writeX26Packets(subPage);
+	}
+}
+
+void SaveFormat::writeX27Packets(const PageBase &subPage)
+{
+	for (int i=0; i<4; i++)
+		if (subPage.packetExists(27, i))
+			writePacket(format4BitPacket(subPage.packet(27, i)), 27, i);
+	for (int i=4; i<16; i++)
+		if (subPage.packetExists(27, i))
+			writePacket(format18BitPacket(subPage.packet(27, i)), 27, i);
+}
+
+void SaveFormat::writeX28Packets(const PageBase &subPage)
+{
+	for (int i=0; i<16; i++)
+		if (subPage.packetExists(28, i))
+			writePacket(format18BitPacket(subPage.packet(28, i)), 28, i);
+}
+
+void SaveFormat::writeX26Packets(const PageBase &subPage)
+{
+	for (int i=0; i<16; i++)
+		if (subPage.packetExists(26, i))
+			writePacket(format18BitPacket(subPage.packet(26, i)), 26, i);
+}
+
+void SaveFormat::writeX1to25Packets(const PageBase &subPage)
+{
+	for (int i=1; i<26; i++)
+		if (subPage.packetExists(i))
+			// BUG must check m_document->packetCoding() !!
+			writePacket(format7BitPacket(subPage.packet(i)), i);
+}
+
+int SaveFormat::writePacket(QByteArray packet, int packetNumber, int designationCode)
+{
+	return writeRawData(packet, packet.size());
+}
+
+int SaveFormat::writeRawData(const char *s, int len)
+{
+	return m_outStream.writeRawData(s, len);
+}
+
+
+inline void SaveTTIFormat::writeString(const QString &command)
+{
+	QByteArray result = command.toUtf8() + "\r\n";
+
+	writeRawData(result, result.size());
+}
+
+void SaveTTIFormat::writeDocumentStart()
+{
+	if (!m_document->description().isEmpty())
+		writeString(QString("DE,%1").arg(m_document->description()));
+
+	// TODO DS and SP commands
+}
+
+QByteArray SaveTTIFormat::format7BitPacket(QByteArray packet)
+{
+	for (int i=0; i<packet.size(); i++)
+		if (packet.at(i) < 0x20) {
+			// TTI files are plain text, so put in escape followed by control code with bit 6 set
+			packet[i] = packet.at(i) | 0x40;
+			packet.insert(i, 0x1b);
+			i++;
+		}
+
+	return packet;
+}
+
+// format4BitPacket in this class calls this method as the encoding is the same
+// i.e. the bytes as-is with bit 6 set to make them ASCII friendly
+QByteArray SaveTTIFormat::format18BitPacket(QByteArray packet)
+{
+	// TTI stores the triplets 6 bits at a time like we do, without Hamming encoding
+	// We don't touch the first byte; the caller replaces it with the designation code
+	// unless it's X/1-X/25 used in (G)POP pages
+	for (int i=1; i<packet.size(); i++)
+		packet[i] = packet.at(i) | 0x40;
+
+	return packet;
+}
+
+void SaveTTIFormat::writeSubPageStart(const PageBase &subPage, int subPageNumber)
+{
+	// Page number
+	writeString(QString("PN,%1%2").arg(m_document->pageNumber(), 3, 16, QChar('0')).arg(subPageNumber & 0xff, 2, 10, QChar('0')));
+
+	// Subpage
+	// Magazine Organisation Table and Magazine Inventory Page don't have subpages
+	if (m_document->pageFunction() != TeletextDocument::PFMOT && m_document->pageFunction() != TeletextDocument::PFMIP)
+		writeString(QString("SC,%1").arg(subPageNumber, 4, 10, QChar('0')));
+
+	// Status bits
+	// We assume that bit 15 "transmit page" is always wanted
+	// C4 stored in bit 14
+	int statusBits = 0x8000 | (subPage.controlBit(PageBase::C4ErasePage) << 14);
+	// C5 to C11 stored in order from bits 1 to 6
+	for (int i=PageBase::C5Newsflash; i<=PageBase::C11SerialMagazine; i++)
+		statusBits |= subPage.controlBit(i) << (i-1);
+	// NOS in bits 7 to 9
+	statusBits |= subPage.controlBit(PageBase::C12NOS) << 9;
+	statusBits |= subPage.controlBit(PageBase::C13NOS) << 8;
+	statusBits |= subPage.controlBit(PageBase::C14NOS) << 7;
+
+	writeString(QString("PS,%1").arg(0x8000 | statusBits, 4, 16, QChar('0')));
+
+	if (m_document->pageFunction() == TeletextDocument::PFLevelOnePage) {
+		// Level One Page: page region and cycle
+		writeString(QString("RE,%1").arg(static_cast<const LevelOnePage *>(&subPage)->defaultCharSet()));
+		writeString(QString("CT,%1,%2").arg(static_cast<const LevelOnePage *>(&subPage)->cycleValue()).arg(static_cast<const LevelOnePage *>(&subPage)->cycleType()==LevelOnePage::CTcycles ? 'C' : 'T'));
+	} else
+		// Not a Level One Page: X/28/0 specifies page function and coding but the PF command
+		// should make it obvious to a human that this is not a Level One Page
+		writeString(QString("PF,%1,%2").arg(m_document->pageFunction()).arg(m_document->packetCoding()));
+}
+
+void SaveTTIFormat::writeSubPageBody(const PageBase &subPage)
+{
+	// Header row
+	if (subPage.packetExists(0))
+		writePacket(format7BitPacket(subPage.packet(0)), 0);
+
+	// FLOF links
+	bool writeFLCommand = false;
+	if (m_document->pageFunction() == TeletextDocument::PFLevelOnePage && subPage.packetExists(27,0)) {
+		// Subpage has FLOF links - if any link to a specific subpage we need to write X/27/0
+		// as raw, otherwise we write the links as a human-readable FL command later on
+		writeFLCommand = true;
+		// TODO uncomment this when we can edit FLOF subpage links
+		/*for (int i=0; i<6; i++)
+			if (document.subPage(p)->fastTextLinkSubPageNumber(i) != 0x3f7f) {
+				writeFLCommand = false;
+				break;
+			}*/
+	}
+
+	// Don't write X/27/0 if FL command will be written
+	// but write the rest of the X/27 packets
+	for (int i=(writeFLCommand ? 1 : 0); i<4; i++)
+		if (subPage.packetExists(27, i))
+			writePacket(format4BitPacket(subPage.packet(27, i)), 27, i);
+	for (int i=4; i<16; i++)
+		if (subPage.packetExists(27, i))
+			writePacket(format18BitPacket(subPage.packet(27, i)), 27, i);
+
+	// Now write the other packets like the rest of writeSubPageBody does
+	writeX28Packets(subPage);
+	if (m_document->pageFunction() == TeletextDocument::PFLevelOnePage) {
+		writeX26Packets(subPage);
+		writeX1to25Packets(subPage);
+	} else {
+		qDebug("Not LevelOnePage, assuming 7-bit packets!");
+		writeX1to25Packets(subPage);
+		writeX26Packets(subPage);
+	}
+
+	if (writeFLCommand) {
+		QString flofLine;
+		flofLine.reserve(26);
+		flofLine="FL,";
+
+		for (int i=0; i<6; i++) {
+			// Stored as page link with relative magazine number, convert to absolute page number for display
+			int absoluteLinkPageNumber = static_cast<const LevelOnePage *>(&subPage)->fastTextLinkPageNumber(i) ^ (m_document->pageNumber() & 0x700);
+			// Fix magazine 0 to 8
+			if ((absoluteLinkPageNumber & 0x700) == 0x000)
+				absoluteLinkPageNumber |= 0x800;
+
+			flofLine.append(QString("%1").arg(absoluteLinkPageNumber, 3, 16, QChar('0')));
+			if (i < 5)
+				flofLine.append(',');
+		}
+
+		writeString(flofLine);
+	}
+}
+
+int SaveTTIFormat::writePacket(QByteArray packet, int packetNumber, int designationCode)
+{
+	if (designationCode != -1)
+		packet[0] = designationCode | 0x40;
+
+	packet.prepend("OL," + QByteArray::number(packetNumber) + ",");
+	packet.append("\r\n");
+
+	return(writeRawData(packet, packet.size()));
+}
+
+
+void SaveM29Format::writeSubPageStart(const PageBase &subPage, int subPageNumber)
+{
+	Q_UNUSED(subPageNumber);
+
+	// Force page number to 0xFF and subpage to 0
+	writeString(QString("PN,%1ff00").arg(m_document->pageNumber() >> 8, 1, 16));
+	// Not sure if this PS forcing is necessary
+	writeString("PS,8000");
+}
+
+void SaveM29Format::writeSubPageBody(const PageBase &subPage)
+{
+	if (subPage.packetExists(28, 0))
+		writePacket(format18BitPacket(subPage.packet(28, 0)), 29, 0);
+	if (subPage.packetExists(28, 1))
+		writePacket(format18BitPacket(subPage.packet(28, 1)), 29, 1);
+	if (subPage.packetExists(28, 4))
+		writePacket(format18BitPacket(subPage.packet(28, 4)), 29, 4);
+}
+
+
+QByteArray SaveT42Format::format7BitPacket(QByteArray packet)
+{
+	// Odd parity encoding
+	for (int c=0; c<packet.size(); c++) {
+		char p = packet.at(c);
+
+		// Recursively divide integer into two equal halves and take their XOR until only 1 bit is left
+		p ^= p >> 4;
+		p ^= p >> 2;
+		p ^= p >> 1;
+		// If last bit left is 0 then it started with an even number of bits, so do the odd parity
+		if (!(p & 1))
+			packet[c] = packet.at(c) | 0x80;
+	}
+
+	return packet;
+}
+
+QByteArray SaveT42Format::format4BitPacket(QByteArray packet)
+{
+	for (int c=0; c<packet.size(); c++)
+		packet[c] = hamming_8_4_encode[(int)packet.at(c)];
+
+	return packet;
+}
+
+QByteArray SaveT42Format::format18BitPacket(QByteArray packet)
+{
+	for (int c=1; c<packet.size(); c+=3) {
+		unsigned int D5_D11;
+		unsigned int D12_D18;
+		unsigned int P5, P6;
+		unsigned int Byte_0;
+
+		const unsigned int toEncode = packet[c] | (packet[c+1] << 6) | (packet[c+2] << 12);
+
+		Byte_0 = (hamming_24_18_forward[0][(toEncode >> 0) & 0xff] ^ hamming_24_18_forward[1][(toEncode >> 8) & 0xff] ^ hamming_24_18_forward_2[(toEncode >> 16) & 0x03]);
+		packet[c] = Byte_0;
+
+		D5_D11 = (toEncode >> 4) & 0x7f;
+		D12_D18 = (toEncode >> 11) & 0x7f;
+
+		P5 = 0x80 & ~(hamming_24_18_parities[0][D12_D18] << 2);
+		packet[c+1] = D5_D11 | P5;
+
+		P6 = 0x80 & ((hamming_24_18_parities[0][Byte_0] ^ hamming_24_18_parities[0][D5_D11]) << 2);
+		packet[c+2] = D12_D18 | P6;
+	}
+
+	return packet;
+}
+
+int SaveT42Format::writePacket(QByteArray packet, int packetNumber, int designationCode)
+{
+	// Byte 2 - designation code
+	if (designationCode != - 1)
+		packet[0] = hamming_8_4_encode[designationCode];
+
+	// Byte 1 of MRAG
+	packet.prepend(hamming_8_4_encode[packetNumber >> 1]);
+	// Byte 0 of MRAG
+	packet.prepend(hamming_8_4_encode[m_magazineNumber | ((packetNumber & 0x01) << 3)]);
+
+	return(writeRawData(packet, packet.size()));
+}
+
+void SaveT42Format::writeSubPageStart(const PageBase &subPage, int subPageNumber)
+{
+	QByteArray packet;
+
+	// Convert integer to Binary Coded Decimal
+	subPageNumber = QString::number(subPageNumber).toInt(nullptr, 16);
+
+	m_magazineNumber = (m_document->pageNumber() & 0xf00) >> 8;
+	if (m_magazineNumber == 8)
+		m_magazineNumber = 0;
+
+	// Retrieve and apply odd parity to header row if there's text there,
+	// otherwise create an initial packet of (odd parity valid) spaces
+	if (subPage.packetExists(0))
+		packet = format7BitPacket(subPage.packet(0));
+	else
+		packet.fill(0x20, 40);
+
+	// Byte 1 of MRAG - packet number 0
+	packet.prepend((char)0);
+	// Byte 0 of MRAG - magazine number, and packet number 0
+	packet.prepend(m_magazineNumber & 0x07);
+
+	packet[2] = m_document->pageNumber() & 0x00f;
+	packet[3] = (m_document->pageNumber() & 0x0f0) >> 4;
+	packet[4] = subPageNumber & 0xf;
+	packet[5] = ((subPageNumber >> 4) & 0x7) | (subPage.controlBit(PageBase::C4ErasePage) << 3);
+	packet[6] = ((subPageNumber >> 8) & 0xf);
+	packet[7] = ((subPageNumber >> 12) & 0x3) | (subPage.controlBit(PageBase::C5Newsflash) << 2) | (subPage.controlBit(PageBase::C6Subtitle) << 3);
+	packet[8] = subPage.controlBit(PageBase::C7SuppressHeader) | (subPage.controlBit(PageBase::C8Update) << 1) | (subPage.controlBit(PageBase::C9InterruptedSequence) << 2) | (subPage.controlBit(PageBase::C10InhibitDisplay) << 3);
+	packet[9] = subPage.controlBit(PageBase::C11SerialMagazine) | (subPage.controlBit(PageBase::C14NOS) << 1) | (subPage.controlBit(PageBase::C13NOS) << 2) | (subPage.controlBit(PageBase::C12NOS) << 3);
+
+	for (int i=0; i<10; i++)
+		packet[i] = hamming_8_4_encode[(int)packet.at(i)];
+
+	writeRawData(packet.constData(), 42);
+}
+
+
+int SaveHTTFormat::writeRawData(const char *s, int len)
+{
+	char httLine[45];
+
+	httLine[0] = 0xaa;
+	httLine[1] = 0xaa;
+	httLine[2] = 0xe4;
+
+	for (int i=0; i<42; i++) {
+		unsigned char b = s[i];
+		b = (b & 0xf0) >> 4 | (b & 0x0f) << 4;
+		b = (b & 0xcc) >> 2 | (b & 0x33) << 2;
+		b = (b & 0xaa) >> 1 | (b & 0x55) << 1;
+		httLine[i+3] = b;
+	}
+
+	return m_outStream.writeRawData(httLine, len+3);
+}
+
+
+bool SaveEP1Format::getWarnings(const PageBase &subPage)
+{
+	m_warnings.clear();
+
+	if (!m_languageCode.contains((static_cast<const LevelOnePage *>(&subPage)->defaultCharSet() << 3) | static_cast<const LevelOnePage *>(&subPage)->defaultNOS()))
+		m_warnings.append("Page language not supported, will be exported as English.");
+
+	if (subPage.packetExists(24) || subPage.packetExists(27, 0))
+		m_warnings.append("FLOF display row and page links will not be exported.");
+
+	if (subPage.packetExists(27, 4) || subPage.packetExists(27, 5))
+		m_warnings.append("X/27/4-5 compositional links will not be exported.");
+
+	if (subPage.packetExists(28, 0) || subPage.packetExists(28, 4))
+		m_warnings.append("X/28 page enhancements will not be exported.");
+
+	return (!m_warnings.isEmpty());
+}
+
+QByteArray SaveEP1Format::format18BitPacket(QByteArray packet)
+{
+	for (int c=1; c<packet.size(); c+=3) {
+		// Shuffle triplet bits to 6 bit address, 5 bit mode, 7 bit data
+		packet[c+2] = ((packet.at(c+2) & 0x3f) << 1) | ((packet.at(c+1) & 0x20) >> 5);
+		packet[c+1] = packet.at(c+1) & 0x1f;
+		// Address of termination marker is 7f instead of 3f
+		if (packet.at(c+1) == 0x1f && packet.at(c) == 0x3f)
+			packet[c] = 0x7f;
+	}
+
+	return packet;
+}
+
+void SaveEP1Format::writeSubPageStart(const PageBase &subPage, int subPageNumber)
+{
+	Q_UNUSED(subPageNumber);
+
+	QByteArray pageStart(3, 0x00);
+
+	// First two bytes always 0xfe, 0x01
+	pageStart[0] = 0xfe;
+	pageStart[1] = 0x01;
+	// Next byte is language code unique to EP1
+	// Unknown values are mapped to English, after warning the user
+	pageStart[2] = m_languageCode.value((static_cast<const LevelOnePage *>(&subPage)->defaultCharSet() << 3) | static_cast<const LevelOnePage *>(&subPage)->defaultNOS(), 0x09);
+
+	writeRawData(pageStart.constData(), 3);
+}
+
+void SaveEP1Format::writeSubPageBody(const PageBase &subPage)
+{
+	// Following the first three bytes already written by writeSubPageStart,
+	// the next three bytes for pages with X/26 packets are 0xca
+	// then little-endian offset to start of Level 1 page data.
+	// For pages with no X/26 packets, just three zeroes.
+	QByteArray offsetData(4, 0x00);
+
+	int numOfX26Packets = 0;
+
+	if (subPage.packetExists(26, 0)) {
+		offsetData[0] = 0xca;
+
+		while (subPage.packetExists(26, numOfX26Packets))
+			numOfX26Packets++;
+
+		const int level1Offset = numOfX26Packets * 40 + 4;
+		offsetData[1] = level1Offset & 0xff;
+		offsetData[2] = level1Offset >> 8;
+	}
+
+	writeRawData(offsetData.constData(), 3);
+
+	// We should really re-implement writeX26Packets but I can't be bothered
+	// to count the number of X/26 packets twice...
+	if (numOfX26Packets > 0) {
+		// Reuse offsetData for this 4-byte header of the enhancement data
+		// Bytes are 0xc2, 0x00, then little-endian length of enhancement data
+		offsetData[0] = 0xc2;
+		offsetData[1] = 0x00;
+		offsetData[2] = (numOfX26Packets * 40) & 0xff;
+		offsetData[3] = (numOfX26Packets * 40) >> 8;
+		writeRawData(offsetData.constData(), 4);
+
+		for (int i=0; i<numOfX26Packets; i++) {
+			QByteArray packet = format18BitPacket(subPage.packet(26, i));
+			packet[0] = i;
+			writeRawData(packet.constData(), 40);
+		}
+	}
+
+	writeX1to25Packets(subPage);
+}
+
+void SaveEP1Format::writeSubPageEnd(const PageBase &subPage)
+{
+	// 40 byte buffer for undo purposes or something? Just write a blank row of spaces
+	writeRawData(QByteArray(40, 0x20).constData(), 40);
+
+	// Last two bytes always 0x00, 0x00
+	writeRawData(QByteArray(2, 0x00).constData(), 2);
+}
+
+void SaveEP1Format::writeX1to25Packets(const PageBase &subPage)
+{
+	for (int i=0; i<24; i++)
+		if (subPage.packetExists(i))
+			writePacket(format7BitPacket(subPage.packet(i)), i, 0);
+		else
+			writeRawData(QByteArray(40, 0x20).constData(), 40);
+}
+
+
+int SaveFormats::s_instances = 0;
+
+SaveFormats::SaveFormats()
+{
+	if (s_instances == 0) {
+		s_fileFormat[0] = new SaveTTIFormat;
+		s_fileFormat[1] = new SaveT42Format;
+		s_fileFormat[2] = new SaveEP1Format;
+		s_fileFormat[3] = new SaveHTTFormat;
+
+		for (int i=0; i<s_size; i++) {
+			if (i != 0)
+				s_exportFilters.append(";;");
+			s_exportFilters.append(s_fileFormat[i]->fileDialogFilter());
+			if (i < s_nativeSize) {
+				if (i != 0)
+					s_filters.append(";;");
+				s_filters.append(s_fileFormat[i]->fileDialogFilter());
+			}
+		}
+	}
+
+	s_instances++;
+}
+
+SaveFormats::~SaveFormats()
+{
+	s_instances--;
+
+	if (s_instances == 0)
+		for (int i=s_size-1; i>=0; i--)
+			delete s_fileFormat[i];
+}
+
+SaveFormat *SaveFormats::findFormat(const QString &suffix) const
+{
+	// TTI is the only official save format at the moment...
+//	for (int i=0; i<s_nativeSize; i++)
+//		if (s_fileFormat[i]->extensions().contains(suffix, Qt::CaseInsensitive))
+//			return s_fileFormat[i];
+
+	if (s_fileFormat[0]->extensions().contains(suffix, Qt::CaseInsensitive))
+		return s_fileFormat[0];
+
+	return nullptr;
+}
+
+SaveFormat *SaveFormats::findExportFormat(const QString &suffix) const
+{
+	for (int i=0; i<s_size; i++)
+		if (s_fileFormat[i]->extensions().contains(suffix, Qt::CaseInsensitive))
+			return s_fileFormat[i];
+
+	return nullptr;
+}

src/qteletextmaker/saveformats.h

@@ -0,0 +1,178 @@
+/*
+ * Copyright (C) 2020-2025 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 SAVEFORMATS_H
+#define SAVEFORMATS_H
+
+#include <QByteArray>
+#include <QDataStream>
+#include <QSaveFile>
+#include <QString>
+
+#include "document.h"
+#include "levelonepage.h"
+#include "pagebase.h"
+
+class SaveFormat
+{
+public:
+	virtual ~SaveFormat() { };
+
+	virtual void saveAllPages(QSaveFile &outFile, const TeletextDocument &document);
+	virtual void saveCurrentSubPage(QSaveFile &outFile, const TeletextDocument &document);
+
+	virtual QString description() const =0;
+	virtual QStringList extensions() const =0;
+	QString fileDialogFilter() const { return QString(description() + " (*." + extensions().join(" *.") + ')'); };
+	virtual bool getWarnings(const PageBase &subPage) { return false; };
+	QStringList warningStrings() const { return m_warnings; };
+	QString errorString() const { return m_error; };
+
+protected:
+	virtual void writeDocumentStart() { };
+	virtual void writeAllPages();
+	virtual void writeSubPage(const PageBase &subPage, int subPageNumber=0);
+	virtual void writeSubPageStart(const PageBase &subPage, int subPageNumber=0) { };
+	virtual void writeSubPageBody(const PageBase &subPage);
+	virtual void writeSubPageEnd(const PageBase &subPage) { };
+	virtual void writeDocumentEnd() { };
+
+	virtual void writeX27Packets(const PageBase &subPage);
+	virtual void writeX28Packets(const PageBase &subPage);
+	virtual void writeX26Packets(const PageBase &subPage);
+	virtual void writeX1to25Packets(const PageBase &subPage);
+
+	virtual QByteArray format7BitPacket(QByteArray packet) { return packet; };
+	virtual QByteArray format4BitPacket(QByteArray packet) { return packet; };
+	virtual QByteArray format18BitPacket(QByteArray packet) { return packet; };
+
+	virtual int writePacket(QByteArray packet, int packetNumber, int designationCode = -1);
+	virtual int writeRawData(const char *s, int len);
+
+	TeletextDocument const *m_document;
+	QSaveFile *m_outFile;
+	QDataStream m_outStream;
+	QStringList m_warnings;
+	QString m_error;
+};
+
+class SaveTTIFormat : public SaveFormat
+{
+public:
+	QString description() const override { return QString("MRG Systems TTI"); };
+	QStringList extensions() const override { return QStringList { "tti", "ttix" }; };
+
+protected:
+	virtual void writeDocumentStart();
+	virtual void writeSubPageStart(const PageBase &subPage, int subPageNumber=0);
+	virtual void writeSubPageBody(const PageBase &subPage);
+
+	virtual int writePacket(QByteArray packet, int packetNumber, int designationCode = -1);
+	void writeString(const QString &command);
+
+	QByteArray format7BitPacket(QByteArray packet);
+	QByteArray format4BitPacket(QByteArray packet) { return format18BitPacket(packet); };
+	QByteArray format18BitPacket(QByteArray packet);
+};
+
+class SaveM29Format : public SaveTTIFormat
+{
+protected:
+	void writeSubPageStart(const PageBase &subPage, int subPageNumber=0);
+	void writeSubPageBody(const PageBase &subPage);
+};
+
+class SaveT42Format : public SaveFormat
+{
+public:
+	QString description() const override { return QString("t42 packet stream"); };
+	QStringList extensions() const override { return QStringList { "t42" }; };
+
+protected:
+	void writeSubPageStart(const PageBase &subPage, int subPageNumber=0);
+	virtual int writePacket(QByteArray packet, int packetNumber, int designationCode = -1);
+
+	virtual QByteArray format7BitPacket(QByteArray packet);
+	virtual QByteArray format4BitPacket(QByteArray packet);
+	virtual QByteArray format18BitPacket(QByteArray packet);
+
+	int m_magazineNumber;
+};
+
+class SaveHTTFormat : public SaveT42Format
+{
+public:
+	QString description() const override { return QString("HMS SD-Teletext HTT"); };
+	QStringList extensions() const override { return QStringList { "htt" }; };
+
+protected:
+	int writeRawData(const char *s, int len) override;
+};
+
+class SaveEP1Format : public SaveFormat
+{
+public:
+	QString description() const override { return QString("Softel EP1"); };
+	QStringList extensions() const override { return QStringList { "ep1" }; };
+	virtual bool getWarnings(const PageBase &subPage);
+
+protected:
+	void writeSubPageStart(const PageBase &subPage, int subPageNumber=0);
+	void writeSubPageBody(const PageBase &subPage);
+	void writeSubPageEnd(const PageBase &subPage);
+
+	virtual void writeX1to25Packets(const PageBase &subPage);
+
+	virtual QByteArray format18BitPacket(QByteArray packet);
+
+	// Language codes unique to EP1
+	// FIXME duplicated in loadformats.h
+	const QMap<int, int> m_languageCode {
+		{ 0x00, 0x09 }, { 0x01, 0x0d }, { 0x02, 0x18 }, { 0x03, 0x11 }, { 0x04, 0x0b }, { 0x05, 0x17 }, { 0x06, 0x07 },
+		{ 0x08, 0x14 }, { 0x09, 0x0d }, { 0x0a, 0x18 }, { 0x0b, 0x11 }, { 0x0c, 0x0b }, { 0x0e, 0x07 },
+		{ 0x10, 0x09 }, { 0x11, 0x0d }, { 0x12, 0x18 }, { 0x13, 0x11 }, { 0x14, 0x0b }, { 0x15, 0x17 }, { 0x16, 0x1c },
+		{ 0x1d, 0x1e }, { 0x1f, 0x16 },
+		{ 0x21, 0x0d }, { 0x22, 0xff }, { 0x23, 0xff }, { 0x26, 0x07 },
+		{ 0x36, 0x1c }, { 0x37, 0x0e },
+		{ 0x40, 0x09 }, { 0x44, 0x0b }
+	};
+};
+
+
+class SaveFormats
+{
+public:
+	SaveFormats();
+	~SaveFormats();
+
+	SaveFormat *findFormat(const QString &suffix) const;
+	SaveFormat *findExportFormat(const QString &suffix) const;
+	QString filters() const { return s_filters; };
+	QString exportFilters() const { return s_exportFilters; };
+	bool isExportOnly(const QString &suffix) const { return findFormat(suffix) == nullptr; };
+
+private:
+	static const inline int s_size = 4;
+	static const inline int s_nativeSize = 1;
+	static int s_instances;
+	inline static SaveFormat *s_fileFormat[s_size];
+	inline static QString s_filters, s_exportFilters;
+};
+
+#endif

src/qteletextmaker/x26commands.cpp

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

src/qteletextmaker/x26commands.h

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

src/qteletextmaker/x26dockwidget.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2024 Gavin MacGregor
+ * Copyright (C) 2020-2025 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *
@@ -74,7 +74,7 @@ void CharacterListModel::setCharacterSet(int 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));
+		emit dataChanged(createIndex(0, 0), createIndex(95, 0), QList<int>(Qt::DecorationRole));
 	}
 }
 
@@ -83,7 +83,7 @@ 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));
+		emit dataChanged(createIndex(0, 0), createIndex(95, 0), QList<int>(Qt::DecorationRole));
 	}
 }
 
@@ -208,7 +208,11 @@ X26DockWidget::X26DockWidget(TeletextWidget *parent): QDockWidget(parent)
 
 	x26Layout->addLayout(tripletSelectLayout);
 
+#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
+	connect(rawOrCookedCheckBox, &QCheckBox::checkStateChanged,[=](const int value) { m_rawOrCookedStackedLayout->setCurrentIndex(value == 2); } );
+#else
 	connect(rawOrCookedCheckBox, &QCheckBox::stateChanged,[=](const int value) { m_rawOrCookedStackedLayout->setCurrentIndex(value == 2); } );
+#endif
 
 
 	// Widgets that alter the parameters of triplets which will all be stacked
@@ -280,10 +284,17 @@ X26DockWidget::X26DockWidget(TeletextWidget *parent): QDockWidget(parent)
 	displayAttributesLayout->addWidget(m_displayAttributeConcealCheckBox);
 	displayAttributesLayout->addWidget(m_displayAttributeInvertCheckBox);
 	displayAttributesLayout->addWidget(m_displayAttributeUnderlineCheckBox);
+#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
+	connect(m_displayAttributeBoxingCheckBox, &QCheckBox::checkStateChanged, this, [=](const int value) {  updateModelFromCookedWidget((value == 2), Qt::UserRole+2); } );
+	connect(m_displayAttributeConcealCheckBox, &QCheckBox::checkStateChanged, this, [=](const int value) {  updateModelFromCookedWidget((value == 2), Qt::UserRole+3); } );
+	connect(m_displayAttributeInvertCheckBox, &QCheckBox::checkStateChanged, this, [=](const int value) {  updateModelFromCookedWidget((value == 2), Qt::UserRole+4); } );
+	connect(m_displayAttributeUnderlineCheckBox, &QCheckBox::checkStateChanged, this, [=](const int value) {  updateModelFromCookedWidget((value == 2), Qt::UserRole+5); } );
+#else
 	connect(m_displayAttributeBoxingCheckBox, &QCheckBox::stateChanged, this, [=](const int value) {  updateModelFromCookedWidget((value == 2), Qt::UserRole+2); } );
 	connect(m_displayAttributeConcealCheckBox, &QCheckBox::stateChanged, this, [=](const int value) {  updateModelFromCookedWidget((value == 2), Qt::UserRole+3); } );
 	connect(m_displayAttributeInvertCheckBox, &QCheckBox::stateChanged, this, [=](const int value) {  updateModelFromCookedWidget((value == 2), Qt::UserRole+4); } );
 	connect(m_displayAttributeUnderlineCheckBox, &QCheckBox::stateChanged, this, [=](const int value) {  updateModelFromCookedWidget((value == 2), Qt::UserRole+5); } );
+#endif
 
 	// Index 5 - Invoke Object
 	QHBoxLayout *invokeObjectLayout = new QHBoxLayout;
@@ -422,9 +433,15 @@ X26DockWidget::X26DockWidget(TeletextWidget *parent): QDockWidget(parent)
 	fontStyleLayout->addWidget(m_fontStyleProportionalCheckBox);
 	fontStyleLayout->addWidget(m_fontStyleBoldCheckBox);
 	fontStyleLayout->addWidget(m_fontStyleItalicCheckBox);
+#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
+	connect(m_fontStyleProportionalCheckBox, &QCheckBox::checkStateChanged, this, [=](const int value) {  updateModelFromCookedWidget((value == 2), Qt::UserRole+1); } );
+	connect(m_fontStyleBoldCheckBox, &QCheckBox::checkStateChanged, this, [=](const int value) { updateModelFromCookedWidget((value == 2), Qt::UserRole+2);; } );
+	connect(m_fontStyleItalicCheckBox, &QCheckBox::checkStateChanged, this, [=](const int value) { updateModelFromCookedWidget((value == 2), Qt::UserRole+3); } );
+#else
 	connect(m_fontStyleProportionalCheckBox, &QCheckBox::stateChanged, this, [=](const int value) {  updateModelFromCookedWidget((value == 2), Qt::UserRole+1); } );
 	connect(m_fontStyleBoldCheckBox, &QCheckBox::stateChanged, this, [=](const int value) { updateModelFromCookedWidget((value == 2), Qt::UserRole+2);; } );
 	connect(m_fontStyleItalicCheckBox, &QCheckBox::stateChanged, this, [=](const int value) { updateModelFromCookedWidget((value == 2), Qt::UserRole+3); } );
+#endif
 	m_fontStyleRowsSpinBox = new QSpinBox;
 	m_fontStyleRowsSpinBox->setRange(0, 7);
 	fontStyleLayout->addWidget(m_fontStyleRowsSpinBox);
@@ -454,7 +471,11 @@ X26DockWidget::X26DockWidget(TeletextWidget *parent): QDockWidget(parent)
 
 	m_terminationMarkerMoreFollowsCheckBox = new QCheckBox(tr("Objects follow"));
 	terminationMarkerLayout->addWidget(m_terminationMarkerMoreFollowsCheckBox);
+#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
+	connect(m_terminationMarkerMoreFollowsCheckBox, &QCheckBox::checkStateChanged, this, [=](const int value) {  updateModelFromCookedWidget(value != 2, Qt::UserRole+2); } );
+#else
 	connect(m_terminationMarkerMoreFollowsCheckBox, &QCheckBox::stateChanged, this, [=](const int value) {  updateModelFromCookedWidget(value != 2, Qt::UserRole+2); } );
+#endif
 
 
 	// Stack all the triplet parameter layouts together
@@ -602,15 +623,14 @@ void X26DockWidget::selectX26ListRow(int row)
 
 void X26DockWidget::loadX26List()
 {
+	disableTripletWidgets();
 	m_x26Model->setX26ListLoaded(true);
 }
 
 void X26DockWidget::unloadX26List()
 {
+	disableTripletWidgets();
 	m_x26Model->setX26ListLoaded(false);
-	m_rawTripletAddressSpinBox->setEnabled(false);
-	m_rawTripletDataSpinBox->setEnabled(false);
-	m_rawTripletModeSpinBox->setEnabled(false);
 }
 
 void X26DockWidget::rowSelected(const QModelIndex &current, const QModelIndex &previous)

src/qteletextmaker/x26dockwidget.h

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

src/qteletextmaker/x26menus.cpp

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

src/qteletextmaker/x26menus.h

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

src/qteletextmaker/x26model.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2024 Gavin MacGregor
+ * Copyright (C) 2020-2025 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *
@@ -69,19 +69,27 @@ QVariant X26Model::data(const QModelIndex &index, int role) const
 	if (role == Qt::ForegroundRole) {
 		if (triplet.error() != X26Triplet::NoError && index.column() == m_tripletErrors[triplet.error()].columnHighlight)
 			return QColor(252, 252, 252);
-		else if ((index.column() == 2 && triplet.reservedMode()) || (index.column() == 3 && triplet.reservedData()))
+		if ((index.column() == 2 && triplet.reservedMode()) || (index.column() == 3 && triplet.reservedData()))
+			return QColor(35, 38, 39);
+		if (index.column() <= 1 && triplet.activePosition1p5Differs())
 			return QColor(35, 38, 39);
 	}
 
 	if (role == Qt::BackgroundRole) {
 		if (triplet.error() != X26Triplet::NoError && index.column() == m_tripletErrors[triplet.error()].columnHighlight)
 			return QColor(218, 68, 63);
-		else if ((index.column() == 2 && triplet.reservedMode()) || (index.column() == 3 && triplet.reservedData()))
+		if ((index.column() == 2 && triplet.reservedMode()) || (index.column() == 3 && triplet.reservedData()))
+			return QColor(246, 116, 0);
+		if (index.column() <= 1 && triplet.activePosition1p5Differs())
 			return QColor(246, 116, 0);
 	}
 
-	if (role == Qt::ToolTipRole && triplet.error() != X26Triplet::NoError)
-		return m_tripletErrors[triplet.error()].message;
+	if (role == Qt::ToolTipRole) {
+		if (triplet.error() != X26Triplet::NoError)
+			return m_tripletErrors[triplet.error()].message;
+		if (triplet.activePosition1p5Differs())
+			return "Active Position differs between Level 1.5 and higher levels";
+	}
 
 	if (role == Qt::DisplayRole || role == Qt::EditRole)
 		switch (index.column()) {

src/qteletextmaker/x26model.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2024 Gavin MacGregor
+ * Copyright (C) 2020-2025 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *
@@ -35,11 +35,11 @@ public:
 	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;
-	bool setData(const QModelIndex &index, const QVariant &value, int role);
-	QVariant headerData(int section, Qt::Orientation orientation, int role) const;
-	bool insertRows(int position, int rows, const QModelIndex &parent);
+	bool setData(const QModelIndex &index, const QVariant &value, int role) override;
+	QVariant headerData(int section, Qt::Orientation orientation, int role) const override;
+	bool insertRows(int position, int rows, const QModelIndex &parent) override;
 	bool insertRows(int position, int rows, const QModelIndex &parent, X26Triplet triplet);
-	bool removeRows(int position, int rows, const QModelIndex &index);
+	bool removeRows(int position, int rows, const QModelIndex &index) override;
 //	Qt::ItemFlags flags(const QModelIndex &index) const;
 
 	// The x26commands classes manipulate the model but beginInsertRows and endInsertRows

src/qteletextmaker/x28commands.cpp

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

src/qteletextmaker/x28commands.h

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