Compare commits
3 Commits
0.5.1-alph
...
0.5.2-alph
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
2da8da8c8e | ||
|
|
c2057e979d | ||
|
|
f5402d216a |
@@ -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
|
||||||
|
|||||||
2
main.cpp
2
main.cpp
@@ -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.2-alpha");
|
||||||
QCommandLineParser parser;
|
QCommandLineParser parser;
|
||||||
parser.setApplicationDescription(QApplication::applicationName());
|
parser.setApplicationDescription(QApplication::applicationName());
|
||||||
parser.addHelpOption();
|
parser.addHelpOption();
|
||||||
|
|||||||
@@ -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();
|
||||||
|
|||||||
Reference in New Issue
Block a user