daniel/QTeletextMaker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: daniel:0.5.1-alpha
Branches Tags
daniel:master daniel:refactor/packets
daniel:0.8.2-beta daniel:0.8.1-beta daniel:0.8-beta daniel:0.7.2-beta daniel:0.7.1-beta daniel:0.7-beta daniel:0.6.5-beta daniel:0.6.4-beta daniel:0.6.3-beta daniel:0.6.2-alpha daniel:0.6.1-alpha daniel:0.6-alpha daniel:0.5.5-alpha daniel:0.5.4-alpha daniel:0.5.3-alpha daniel:0.5.2-alpha daniel:0.5.1-alpha daniel:0.5-alpha daniel:0.4-alpha daniel:0.3-alpha daniel:0.2-alpha daniel:0.1-alpha
..
compare: daniel:0.5.3-alpha
Branches Tags
daniel:master daniel:refactor/packets
daniel:0.8.2-beta daniel:0.8.1-beta daniel:0.8-beta daniel:0.7.2-beta daniel:0.7.1-beta daniel:0.7-beta daniel:0.6.5-beta daniel:0.6.4-beta daniel:0.6.3-beta daniel:0.6.2-alpha daniel:0.6.1-alpha daniel:0.6-alpha daniel:0.5.5-alpha daniel:0.5.4-alpha daniel:0.5.3-alpha daniel:0.5.2-alpha daniel:0.5.1-alpha daniel:0.5-alpha daniel:0.4-alpha daniel:0.3-alpha daniel:0.2-alpha daniel:0.1-alpha

6 Commits
0.5.1-alph ... 0.5.3-alph

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
34 changed files with 41 additions and 41 deletions
Expand all files Collapse all files

2
document.cpp
View File

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

2
document.h
View File

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

2
keymap.h
View File

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

2
levelonecommands.cpp
View File

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

2
levelonecommands.h
View File

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

2
levelonepage.cpp
View File

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

2
levelonepage.h
View File

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

10
loadsave.cpp
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2020, 2021 Gavin MacGregor * Copyright (C) 2020-2022 Gavin MacGregor
* *
* This file is part of QTeletextMaker. * This file is part of QTeletextMaker.
* *
@@ -437,7 +437,7 @@ void saveTTI(QSaveFile &file, const TeletextDocument &document)
for (p=0; p<document.numberOfSubPages(); p++) { for (p=0; p<document.numberOfSubPages(); p++) {
// Page number // 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) #if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
outStream << Qt::endl; outStream << Qt::endl;
#else #else
@@ -447,7 +447,7 @@ void saveTTI(QSaveFile &file, const TeletextDocument &document)
// Subpage // Subpage
// Magazine Organisation Table and Magazine Inventory Page don't have subpages // Magazine Organisation Table and Magazine Inventory Page don't have subpages
if (document.pageFunction() != TeletextDocument::PFMOT && document.pageFunction() != TeletextDocument::PFMIP) { 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) #if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
outStream << Qt::endl; outStream << Qt::endl;
#else #else
@@ -680,8 +680,8 @@ void exportT42File(QSaveFile &file, const TeletextDocument &document)
outLine[5] = subPage.controlBit(PageBase::C4ErasePage) << 3; outLine[5] = subPage.controlBit(PageBase::C4ErasePage) << 3;
outLine[6] = 0; // Subcode S3 - always export as 0 outLine[6] = 0; // Subcode S3 - always export as 0
outLine[7] = (subPage.controlBit(PageBase::C5Newsflash) << 2) | (subPage.controlBit(PageBase::C6Subtitle) << 3); 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[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) << 2) | (subPage.controlBit(PageBase::C13NOS) << 2) | (subPage.controlBit(PageBase::C12NOS) << 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++) for (int i=0; i<10; i++)
outLine[i] = hamming_8_4_encode[(int)outLine.at(i)]; outLine[i] = hamming_8_4_encode[(int)outLine.at(i)];

2
loadsave.h
View File

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

4
main.cpp
View File

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

2
mainwidget.cpp
View File

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

2
mainwidget.h
View File

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

6
mainwindow.cpp
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2020, 2021 Gavin MacGregor * Copyright (C) 2020-2022 Gavin MacGregor
* *
* This file is part of QTeletextMaker. * This file is part of QTeletextMaker.
* *
@@ -213,7 +213,7 @@ void MainWindow::about()
QMessageBox::about(this, tr("About"), QString("<b>%1</b><br>" QMessageBox::about(this, tr("About"), QString("<b>%1</b><br>"
"An open source Level 2.5 teletext page editor.<br>" "An open source Level 2.5 teletext page editor.<br>"
"<i>Version %2</i><br><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>" "Released under the GNU General Public License version 3<br>"
"<a href=\"https://github.com/gkthemac/qteletextmaker\">https://github.com/gkthemac/qteletextmaker</a>").arg(QApplication::applicationDisplayName()).arg(QApplication::applicationVersion())); "<a 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()) if (m_textWidget->document()->undoStack()->isClean())
return true; 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) { switch (ret) {
case QMessageBox::Save: case QMessageBox::Save:
return save(); return save();

2
mainwindow.h
View File

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

2
pagebase.cpp
View File

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

2
pagebase.h
View File

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

2
pageenhancementsdockwidget.cpp
View File

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

2
pageenhancementsdockwidget.h
View File

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

2
pageoptionsdockwidget.cpp
View File

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

2
pageoptionsdockwidget.h
View File

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

2
pagex26base.cpp
View File

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

2
pagex26base.h
View File

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

2
palettedockwidget.cpp
View File

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

2
palettedockwidget.h
View File

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

2
render.cpp
View File

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

2
render.h
View File

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

2
x26commands.cpp
View File

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

2
x26commands.h
View File

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

2
x26dockwidget.cpp
View File

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

2
x26dockwidget.h
View File

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

2
x26model.cpp
View File

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

2
x26model.h
View File

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

2
x26triplets.cpp
View File

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

2
x26triplets.h
View File

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