Tag version 0.5.2-alpha

loadsave.cpp

@@ -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

main.cpp

@@ -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.2-alpha");
 	QCommandLineParser parser;
 	parser.setApplicationDescription(QApplication::applicationName());
 	parser.addHelpOption();

mainwindow.cpp

@@ -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();

render.cpp

@@ -251,7 +251,6 @@ void TeletextPageRender::buildEnhanceMap(TextLayer *enhanceLayer, int tripletNum
 
 void TeletextPageRender::decodePage()
 {
-	QPainter pixmapPainter;
 	int currentFullRowColour, downwardsFullRowColour;
 	int renderedFullScreenColour;
 

x26model.h

@@ -114,7 +114,7 @@ private:
 
 		"Display attributes",
 		"DRCS character",
-		"Font style",
+		"Font style, level 3.5",
 		"G2 supplementary character",
 
 		"G0 character no diacritical",

x26triplets.cpp

@@ -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);
 }