Tag version 0.5.3-alpha

Fix incorrect C8 and C14 bits on t42 exporing
Update copyright notices to 2022
2022-01-05 21:45:17 +00:00 · 2022-01-05 20:57:26 +00:00 · 2021-12-31 21:40:36 +00:00 · 2021-12-28 12:33:58 +00:00 · 2021-12-28 12:22:29 +00:00 · 2021-12-14 22:06:18 +00:00
34 changed files with 44 additions and 45 deletions
--- a/document.cpp
+++ b/document.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020, 2021 Gavin MacGregor
+ * Copyright (C) 2020-2022 Gavin MacGregor
 *
 * This file is part of QTeletextMaker.
 *
--- a/document.h
+++ b/document.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020, 2021 Gavin MacGregor
+ * Copyright (C) 2020-2022 Gavin MacGregor
 *
 * This file is part of QTeletextMaker.
 *
--- a/keymap.h
+++ b/keymap.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020, 2021 Gavin MacGregor
+ * Copyright (C) 2020-2022 Gavin MacGregor
 *
 * This file is part of QTeletextMaker.
 *
--- a/levelonecommands.cpp
+++ b/levelonecommands.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020, 2021 Gavin MacGregor
+ * Copyright (C) 2020-2022 Gavin MacGregor
 *
 * This file is part of QTeletextMaker.
 *
--- a/levelonecommands.h
+++ b/levelonecommands.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020, 2021 Gavin MacGregor
+ * Copyright (C) 2020-2022 Gavin MacGregor
 *
 * This file is part of QTeletextMaker.
 *
--- a/levelonepage.cpp
+++ b/levelonepage.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020, 2021 Gavin MacGregor
+ * Copyright (C) 2020-2022 Gavin MacGregor
 *
 * This file is part of QTeletextMaker.
 *
--- a/levelonepage.h
+++ b/levelonepage.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020, 2021 Gavin MacGregor
+ * Copyright (C) 2020-2022 Gavin MacGregor
 *
 * This file is part of QTeletextMaker.
 *
--- a/loadsave.cpp
+++ b/loadsave.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020, 2021 Gavin MacGregor
+ * Copyright (C) 2020-2022 Gavin MacGregor
 *
 * This file is part of QTeletextMaker.
 *
@@ -437,7 +437,7 @@ void saveTTI(QSaveFile &file, const TeletextDocument &document)
 	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, 16, QChar('0'));
+		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
@@ -447,7 +447,7 @@ void saveTTI(QSaveFile &file, const TeletextDocument &document)
 		// 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, 16, QChar('0'));
+			outStream << QString("SC,%1").arg(subPageNumber, 4, 10, QChar('0'));
 #if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
 			outStream << Qt::endl;
 #else
@@ -680,8 +680,8 @@ void exportT42File(QSaveFile &file, const TeletextDocument &document)
 	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) << 2) | (subPage.controlBit(PageBase::C9InterruptedSequence) << 2) | (subPage.controlBit(PageBase::C10InhibitDisplay) << 3);
-	outLine[9] = subPage.controlBit(PageBase::C11SerialMagazine) | (subPage.controlBit(PageBase::C14NOS) << 2) | (subPage.controlBit(PageBase::C13NOS) << 2) | (subPage.controlBit(PageBase::C12NOS) << 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)];
--- a/loadsave.h
+++ b/loadsave.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020, 2021 Gavin MacGregor
+ * Copyright (C) 2020-2022 Gavin MacGregor
 *
 * This file is part of QTeletextMaker.
 *
--- a/main.cpp
+++ b/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020, 2021 Gavin MacGregor
+ * Copyright (C) 2020-2022 Gavin MacGregor
 *
 * This file is part of QTeletextMaker.
 *
@@ -30,7 +30,7 @@ int main(int argc, char *argv[])
 	QApplication::setApplicationDisplayName(QApplication::applicationName());
 	QApplication::setOrganizationName("gkmac.co.uk");
 	QApplication::setOrganizationDomain("gkmac.co.uk");
-	QApplication::setApplicationVersion("0.5-alpha");
+	QApplication::setApplicationVersion("0.5.3-alpha");
 	QCommandLineParser parser;
 	parser.setApplicationDescription(QApplication::applicationName());
 	parser.addHelpOption();
--- a/mainwidget.cpp
+++ b/mainwidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020, 2021 Gavin MacGregor
+ * Copyright (C) 2020-2022 Gavin MacGregor
 *
 * This file is part of QTeletextMaker.
 *
--- a/mainwidget.h
+++ b/mainwidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020, 2021 Gavin MacGregor
+ * Copyright (C) 2020-2022 Gavin MacGregor
 *
 * This file is part of QTeletextMaker.
 *
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020, 2021 Gavin MacGregor
+ * Copyright (C) 2020-2022 Gavin MacGregor
 *
 * This file is part of QTeletextMaker.
 *
@@ -213,7 +213,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, 2021 Gavin MacGregor<br><br>"
+	"Copyright (C) 2020-2022 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()));
 }
@@ -865,7 +865,7 @@ bool MainWindow::maybeSave()
 {
 	if (m_textWidget->document()->undoStack()->isClean())
 		return true;
-	const QMessageBox::StandardButton ret = QMessageBox::warning(this, QApplication::applicationDisplayName(), tr("The document has been modified.\nDo you want to save your changes?"), QMessageBox::Save | QMessageBox::Discard | QMessageBox::Cancel);
+	const QMessageBox::StandardButton ret = QMessageBox::warning(this, QApplication::applicationDisplayName(), tr("The document \"%1\" has been modified.\nDo you want to save your changes or discard them?").arg(QFileInfo(m_curFile).fileName()), QMessageBox::Save | QMessageBox::Discard | QMessageBox::Cancel);
 	switch (ret) {
 		case QMessageBox::Save:
 			return save();
--- a/mainwindow.h
+++ b/mainwindow.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020, 2021 Gavin MacGregor
+ * Copyright (C) 2020-2022 Gavin MacGregor
 *
 * This file is part of QTeletextMaker.
 *
--- a/pagebase.cpp
+++ b/pagebase.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020, 2021 Gavin MacGregor
+ * Copyright (C) 2020-2022 Gavin MacGregor
 *
 * This file is part of QTeletextMaker.
 *
--- a/pagebase.h
+++ b/pagebase.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020, 2021 Gavin MacGregor
+ * Copyright (C) 2020-2022 Gavin MacGregor
 *
 * This file is part of QTeletextMaker.
 *
--- a/pageenhancementsdockwidget.cpp
+++ b/pageenhancementsdockwidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020, 2021 Gavin MacGregor
+ * Copyright (C) 2020-2022 Gavin MacGregor
 *
 * This file is part of QTeletextMaker.
 *
--- a/pageenhancementsdockwidget.h
+++ b/pageenhancementsdockwidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020, 2021 Gavin MacGregor
+ * Copyright (C) 2020-2022 Gavin MacGregor
 *
 * This file is part of QTeletextMaker.
 *
--- a/pageoptionsdockwidget.cpp
+++ b/pageoptionsdockwidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020, 2021 Gavin MacGregor
+ * Copyright (C) 2020-2022 Gavin MacGregor
 *
 * This file is part of QTeletextMaker.
 *
--- a/pageoptionsdockwidget.h
+++ b/pageoptionsdockwidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020, 2021 Gavin MacGregor
+ * Copyright (C) 2020-2022 Gavin MacGregor
 *
 * This file is part of QTeletextMaker.
 *
--- a/pagex26base.cpp
+++ b/pagex26base.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020, 2021 Gavin MacGregor
+ * Copyright (C) 2020-2022 Gavin MacGregor
 *
 * This file is part of QTeletextMaker.
 *
--- a/pagex26base.h
+++ b/pagex26base.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020, 2021 Gavin MacGregor
+ * Copyright (C) 2020-2022 Gavin MacGregor
 *
 * This file is part of QTeletextMaker.
 *
--- a/palettedockwidget.cpp
+++ b/palettedockwidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020, 2021 Gavin MacGregor
+ * Copyright (C) 2020-2022 Gavin MacGregor
 *
 * This file is part of QTeletextMaker.
 *
--- a/palettedockwidget.h
+++ b/palettedockwidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020, 2021 Gavin MacGregor
+ * Copyright (C) 2020-2022 Gavin MacGregor
 *
 * This file is part of QTeletextMaker.
 *
--- a/render.cpp
+++ b/render.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020, 2021 Gavin MacGregor
+ * Copyright (C) 2020-2022 Gavin MacGregor
 *
 * This file is part of QTeletextMaker.
 *
@@ -251,7 +251,6 @@ void TeletextPageRender::buildEnhanceMap(TextLayer *enhanceLayer, int tripletNum

 void TeletextPageRender::decodePage()
 {
-	QPainter pixmapPainter;
 	int currentFullRowColour, downwardsFullRowColour;
 	int renderedFullScreenColour;

--- a/render.h
+++ b/render.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020, 2021 Gavin MacGregor
+ * Copyright (C) 2020-2022 Gavin MacGregor
 *
 * This file is part of QTeletextMaker.
 *
--- a/x26commands.cpp
+++ b/x26commands.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020, 2021 Gavin MacGregor
+ * Copyright (C) 2020-2022 Gavin MacGregor
 *
 * This file is part of QTeletextMaker.
 *
--- a/x26commands.h
+++ b/x26commands.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020, 2021 Gavin MacGregor
+ * Copyright (C) 2020-2022 Gavin MacGregor
 *
 * This file is part of QTeletextMaker.
 *
--- a/x26dockwidget.cpp
+++ b/x26dockwidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020, 2021 Gavin MacGregor
+ * Copyright (C) 2020-2022 Gavin MacGregor
 *
 * This file is part of QTeletextMaker.
 *
--- a/x26dockwidget.h
+++ b/x26dockwidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020, 2021 Gavin MacGregor
+ * Copyright (C) 2020-2022 Gavin MacGregor
 *
 * This file is part of QTeletextMaker.
 *
--- a/x26model.cpp
+++ b/x26model.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020, 2021 Gavin MacGregor
+ * Copyright (C) 2020-2022 Gavin MacGregor
 *
 * This file is part of QTeletextMaker.
 *
--- a/x26model.h
+++ b/x26model.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020, 2021 Gavin MacGregor
+ * Copyright (C) 2020-2022 Gavin MacGregor
 *
 * This file is part of QTeletextMaker.
 *
@@ -114,7 +114,7 @@ private:

 		"Display attributes",
 		"DRCS character",
-		"Font style",
+		"Font style, level 3.5",
 		"G2 supplementary character",

 		"G0 character no diacritical",
--- a/x26triplets.cpp
+++ b/x26triplets.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020, 2021 Gavin MacGregor
+ * Copyright (C) 2020-2022 Gavin MacGregor
 *
 * This file is part of QTeletextMaker.
 *
@@ -53,7 +53,7 @@ void X26Triplet::setAddressColumn(int addressColumn)

 void X26Triplet::setObjectLocalDesignationCode(int i)
 {
-	m_address = 0x28 | (i >> 3);
+	m_address = (m_address & 0x38) | (i >> 3);
 	m_data = (m_data & 0x0f) | ((i & 0x07) << 4);
 }

@@ -64,7 +64,7 @@ void X26Triplet::setObjectLocalTripletNumber(int i)

 void X26Triplet::setObjectLocalIndex(int i)
 {
-	m_address = 0x28 + (i >= 104); // Set bit 0 of address if triplet >= 8
+	m_address = (m_address & 0x38) + (i >= 104); // Set bit 0 of address if triplet >= 8
 	m_data = (((i / 13) & 0x07) << 4) | (i % 13);
 }

--- a/x26triplets.h
+++ b/x26triplets.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020, 2021 Gavin MacGregor
+ * Copyright (C) 2020-2022 Gavin MacGregor
 *
 * This file is part of QTeletextMaker.
 *
Author	SHA1	Message	Date
G.K.MacGregor	4aa77395c0	Tag version 0.5.3-alpha	2022-01-05 21:45:17 +00:00
G.K.MacGregor	ae1aef63f9	Fix incorrect C8 and C14 bits on t42 exporing	2022-01-05 20:57:26 +00:00
G.K.MacGregor	406ab6c6ed	Update copyright notices to 2022	2021-12-31 21:40:36 +00:00
G.K.MacGregor	2da8da8c8e	Tag version 0.5.2-alpha	2021-12-28 12:33:58 +00:00
G.K.MacGregor	c2057e979d	Fix SC incorrectly saved as hexadecimal	2021-12-28 12:22:29 +00:00
G.K.MacGregor	f5402d216a	Show filename when asking about unsaved changes	2021-12-14 22:06:18 +00:00
G.K.MacGregor	43e3155a08	Tag version 0.5.1-alpha	2021-11-16 17:48:26 +00:00
G.K.MacGregor	fa29f25c91	Fix object definitions stuck on Level 2.5 only	2021-11-10 09:16:24 +00:00
G.K.MacGregor	dab124cf80	Remove unused variable	2021-09-15 14:42:03 +01:00
G.K.MacGregor	2f23c83d49	Clarify that font style is Level 3.5 only	2021-09-10 21:18:06 +01:00