birkeh/storyWriter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Migrated to QT6

Browse Source
This commit is contained in:
Herwig Birke
2021-05-19 13:22:41 +02:00
parent 926f326e64
commit b8a01deef8
11 changed files with 193 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cbook.cpp
+3 -3
View File
@@ -20,9 +20,9 @@ cBook::cBook(const QString &szTitle, QObject *parent) :
m_lpShortDescription(new cTextDocument(parent)),
m_lpDescription(new cTextDocument(parent)),
m_szAuthor(""),
m_startedAt(QDateTime(QDate(1, 1, 1))),
m_finishedAt(QDateTime(QDate(1, 1, 1))),
m_targetDate(QDateTime(QDate(1, 1, 1)))
m_startedAt(QDateTime(QDate(1, 1, 1).startOfDay())),
m_finishedAt(QDateTime(QDate(1, 1, 1).startOfDay())),
m_targetDate(QDateTime(QDate(1, 1, 1).startOfDay()))
{
}
cmainwindow.cpp
+15 -15
View File
@@ -110,9 +110,11 @@ cMainWindow::cMainWindow(cSplashScreen *lpSplashScreen, QTranslator *lpTranslato
m_lpOldTextEdit(nullptr),
m_lpOptionsDialog(nullptr)
{
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
qRegisterMetaTypeStreamOperators<cPart*>("cPart*");
qRegisterMetaTypeStreamOperators<cChapter*>("cChapter*");
qRegisterMetaTypeStreamOperators<cScene*>("cScene*");
#endif
initUI();
createActions();
@@ -329,7 +331,7 @@ void cMainWindow::createFileActions()
const QIcon exportPdfIcon = QIcon::fromTheme("document-pdf");
m_lpFileExportPDFAction = m_lpFileMenu->addAction(exportPdfIcon, tr("&Export PDF..."), this, &cMainWindow::onFilePrintPdf);
m_lpFileExportPDFAction->setPriority(QAction::LowPriority);
m_lpFileExportPDFAction->setShortcut(Qt::CTRL + Qt::Key_D);
m_lpFileExportPDFAction->setShortcut(Qt::CTRL | Qt::Key_D);
m_lpFileToolBar->addAction(m_lpFileExportPDFAction);
m_lpFileMenu->addSeparator();
@@ -350,7 +352,7 @@ void cMainWindow::createFileActions()
m_lpSeparatorRecent->setVisible(false);
m_lpFileQuitAction = m_lpFileMenu->addAction(tr("&Quit"), this, &QWidget::close);
m_lpFileQuitAction->setShortcut(Qt::CTRL + Qt::Key_Q);
m_lpFileQuitAction->setShortcut(Qt::CTRL | Qt::Key_Q);
}
void cMainWindow::createEditActions()
@@ -512,7 +514,7 @@ void cMainWindow::createTextActions()
const QIcon boldIcon = QIcon::fromTheme("format-text-bold");
m_lpTextBoldAction = m_lpTextMenu->addAction(boldIcon, tr("&Bold"));
m_lpTextBoldAction->setShortcut(Qt::CTRL + Qt::Key_B);
m_lpTextBoldAction->setShortcut(Qt::CTRL | Qt::Key_B);
m_lpTextBoldAction->setPriority(QAction::LowPriority);
QFont bold;
bold.setBold(true);
@@ -523,7 +525,7 @@ void cMainWindow::createTextActions()
const QIcon italicIcon = QIcon::fromTheme("format-text-italic");
m_lpTextItalicAction = m_lpTextMenu->addAction(italicIcon, tr("&Italic"));
m_lpTextItalicAction->setPriority(QAction::LowPriority);
m_lpTextItalicAction->setShortcut(Qt::CTRL + Qt::Key_I);
m_lpTextItalicAction->setShortcut(Qt::CTRL | Qt::Key_I);
QFont italic;
italic.setItalic(true);
m_lpTextItalicAction->setFont(italic);
@@ -532,7 +534,7 @@ void cMainWindow::createTextActions()
const QIcon underlineIcon = QIcon::fromTheme("format-text-underline");
m_lpTextUnderlineAction = m_lpTextMenu->addAction(underlineIcon, tr("&Underline"));
m_lpTextUnderlineAction->setShortcut(Qt::CTRL + Qt::Key_U);
m_lpTextUnderlineAction->setShortcut(Qt::CTRL | Qt::Key_U);
m_lpTextUnderlineAction->setPriority(QAction::LowPriority);
QFont underline;
underline.setUnderline(true);
@@ -544,22 +546,22 @@ void cMainWindow::createTextActions()
const QIcon leftIcon = QIcon::fromTheme("format-justify-left");
m_lpAlignLeftAction = new QAction(leftIcon, tr("&Left"), this);
m_lpAlignLeftAction->setShortcut(Qt::CTRL + Qt::Key_L);
m_lpAlignLeftAction->setShortcut(Qt::CTRL | Qt::Key_L);
m_lpAlignLeftAction->setCheckable(true);
m_lpAlignLeftAction->setPriority(QAction::LowPriority);
const QIcon centerIcon = QIcon::fromTheme("format-justify-center");
m_lpAlignCenterAction = new QAction(centerIcon, tr("C&enter"), this);
m_lpAlignCenterAction->setShortcut(Qt::CTRL + Qt::Key_E);
m_lpAlignCenterAction->setShortcut(Qt::CTRL | Qt::Key_E);
m_lpAlignCenterAction->setCheckable(true);
m_lpAlignCenterAction->setPriority(QAction::LowPriority);
const QIcon rightIcon = QIcon::fromTheme("format-justify-right");
m_lpAlignRightAction = new QAction(rightIcon, tr("&Right"), this);
m_lpAlignRightAction->setShortcut(Qt::CTRL + Qt::Key_R);
m_lpAlignRightAction->setShortcut(Qt::CTRL | Qt::Key_R);
m_lpAlignRightAction->setCheckable(true);
m_lpAlignRightAction->setPriority(QAction::LowPriority);
const QIcon fillIcon = QIcon::fromTheme("format-justify-fill");
m_lpAlignJustifyAction = new QAction(fillIcon, tr("&Justify"), this);
m_lpAlignJustifyAction->setShortcut(Qt::CTRL + Qt::Key_J);
m_lpAlignJustifyAction->setShortcut(Qt::CTRL | Qt::Key_J);
m_lpAlignJustifyAction->setCheckable(true);
m_lpAlignJustifyAction->setPriority(QAction::LowPriority);
@@ -961,8 +963,8 @@ void cMainWindow::prepareTextEdit(cTextEdit* lpTextEdit)
connect(m_lpAlignGroup, &QActionGroup::triggered, lpTextEdit, &cTextEdit::onTextAlign);
connect(m_lpComboFont, QOverload<const QString &>::of(&QComboBox::activated), lpTextEdit, &cTextEdit::onTextFamily);
connect(m_lpComboSize, QOverload<const QString &>::of(&QComboBox::activated), lpTextEdit, &cTextEdit::onTextSize);
connect(m_lpComboFont, QOverload<const QString &>::of(&QComboBox::textActivated), lpTextEdit, &cTextEdit::onTextFamily);
connect(m_lpComboSize, QOverload<const QString &>::of(&QComboBox::textActivated), lpTextEdit, &cTextEdit::onTextSize);
connect(lpTextEdit, &cTextEdit::fontChanged, this, &cMainWindow::onFontChanged);
connect(lpTextEdit, &cTextEdit::colorChanged, this, &cMainWindow::onColorChanged);
@@ -997,8 +999,8 @@ void cMainWindow::disconnectTextEdit()
disconnect(m_lpAlignGroup, &QActionGroup::triggered, m_lpOldTextEdit, &cTextEdit::onTextAlign);
disconnect(m_lpComboFont, QOverload<const QString &>::of(&QComboBox::activated), m_lpOldTextEdit, &cTextEdit::onTextFamily);
disconnect(m_lpComboSize, QOverload<const QString &>::of(&QComboBox::activated), m_lpOldTextEdit, &cTextEdit::onTextSize);
disconnect(m_lpComboFont, QOverload<const QString &>::of(&QComboBox::textActivated), m_lpOldTextEdit, &cTextEdit::onTextFamily);
disconnect(m_lpComboSize, QOverload<const QString &>::of(&QComboBox::textActivated), m_lpOldTextEdit, &cTextEdit::onTextSize);
disconnect(m_lpOldTextEdit, &cTextEdit::fontChanged, this, &cMainWindow::onFontChanged);
disconnect(m_lpOldTextEdit, &cTextEdit::colorChanged, this, &cMainWindow::onColorChanged);
@@ -1953,8 +1955,6 @@ void cMainWindow::fileOpen(const QString& szFileName)
}
}
QMessageBox::information(this, "Initialize", szFileName);
QString szProjectName;
if(szFileName.isEmpty())
common.cpp
+130 -130
View File
@@ -83,146 +83,146 @@ QString localePath()
return(szPath);
}
QString paperName(QPagedPaintDevice::PageSize paperSize)
QString paperName(QPageSize::PageSizeId paperSize)
{
QMap<QPagedPaintDevice::PageSize, QString> list = paperList();
QMap<QPageSize::PageSizeId, QString> list = paperList();
return(list.value(paperSize));
}
QPagedPaintDevice::PageSize paperKey(const QString& szPaperSize)
QPageSize::PageSizeId paperKey(const QString& szPaperSize)
{
QMap<QPagedPaintDevice::PageSize, QString> list = paperList();
QMap<QPageSize::PageSizeId, QString> list = paperList();
return(list.key(szPaperSize));
}
QMap<QPagedPaintDevice::PageSize, QString> paperList()
QMap<QPageSize::PageSizeId, QString> paperList()
{
QMap<QPagedPaintDevice::PageSize, QString> list;
QMap<QPageSize::PageSizeId, QString> list;
list.insert(QPagedPaintDevice::A0, QObject::tr("A0"));
list.insert(QPagedPaintDevice::A1, QObject::tr("A1"));
list.insert(QPagedPaintDevice::A2, QObject::tr("A2"));
list.insert(QPagedPaintDevice::A3, QObject::tr("A3"));
list.insert(QPagedPaintDevice::A4, QObject::tr("A4"));
list.insert(QPagedPaintDevice::A5, QObject::tr("A5"));
list.insert(QPagedPaintDevice::A6, QObject::tr("A6"));
list.insert(QPagedPaintDevice::A7, QObject::tr("A7"));
list.insert(QPagedPaintDevice::A8, QObject::tr("A8"));
list.insert(QPagedPaintDevice::A9, QObject::tr("A9"));
list.insert(QPagedPaintDevice::B0, QObject::tr("B0"));
list.insert(QPagedPaintDevice::B1, QObject::tr("B1"));
list.insert(QPagedPaintDevice::B2, QObject::tr("B2"));
list.insert(QPagedPaintDevice::B3, QObject::tr("B3"));
list.insert(QPagedPaintDevice::B4, QObject::tr("B4"));
list.insert(QPagedPaintDevice::B5, QObject::tr("B5"));
list.insert(QPagedPaintDevice::B6, QObject::tr("B6"));
list.insert(QPagedPaintDevice::B7, QObject::tr("B7"));
list.insert(QPagedPaintDevice::B8, QObject::tr("B8"));
list.insert(QPagedPaintDevice::B9, QObject::tr("B9"));
list.insert(QPagedPaintDevice::B10, QObject::tr("B10"));
list.insert(QPagedPaintDevice::C5E, QObject::tr("C5E"));
list.insert(QPagedPaintDevice::Comm10E, QObject::tr("Comm10E"));
list.insert(QPagedPaintDevice::DLE, QObject::tr("DLE"));
list.insert(QPagedPaintDevice::Executive, QObject::tr("Executive"));
list.insert(QPagedPaintDevice::Folio, QObject::tr("Folio"));
list.insert(QPagedPaintDevice::Ledger, QObject::tr("Ledger"));
list.insert(QPagedPaintDevice::Legal, QObject::tr("Legal"));
list.insert(QPagedPaintDevice::Letter, QObject::tr("Letter"));
list.insert(QPagedPaintDevice::Tabloid, QObject::tr("Tabloid"));
list.insert(QPagedPaintDevice::Custom, QObject::tr("Custom"));
list.insert(QPagedPaintDevice::A10, QObject::tr("A10"));
list.insert(QPagedPaintDevice::A3Extra, QObject::tr("A3Extra"));
list.insert(QPagedPaintDevice::A4Extra, QObject::tr("A4Extra"));
list.insert(QPagedPaintDevice::A4Plus, QObject::tr("A4Plus"));
list.insert(QPagedPaintDevice::A4Small, QObject::tr("A4Small"));
list.insert(QPagedPaintDevice::A5Extra, QObject::tr("A5Extra"));
list.insert(QPagedPaintDevice::B5Extra, QObject::tr("B5Extra"));
list.insert(QPagedPaintDevice::JisB0, QObject::tr("JisB0"));
list.insert(QPagedPaintDevice::JisB1, QObject::tr("JisB1"));
list.insert(QPagedPaintDevice::JisB2, QObject::tr("JisB2"));
list.insert(QPagedPaintDevice::JisB3, QObject::tr("JisB3"));
list.insert(QPagedPaintDevice::JisB4, QObject::tr("JisB4"));
list.insert(QPagedPaintDevice::JisB5, QObject::tr("JisB5"));
list.insert(QPagedPaintDevice::JisB6, QObject::tr("JisB6"));
list.insert(QPagedPaintDevice::JisB7, QObject::tr("JisB7"));
list.insert(QPagedPaintDevice::JisB8, QObject::tr("JisB8"));
list.insert(QPagedPaintDevice::JisB9, QObject::tr("JisB9"));
list.insert(QPagedPaintDevice::JisB10, QObject::tr("JisB10"));
list.insert(QPagedPaintDevice::AnsiA, QObject::tr("Letter"));
list.insert(QPagedPaintDevice::AnsiB, QObject::tr("Ledger"));
list.insert(QPagedPaintDevice::AnsiC, QObject::tr("AnsiC"));
list.insert(QPagedPaintDevice::AnsiD, QObject::tr("AnsiD"));
list.insert(QPagedPaintDevice::AnsiE, QObject::tr("AnsiE"));
list.insert(QPagedPaintDevice::LegalExtra, QObject::tr("LegalExtra"));
list.insert(QPagedPaintDevice::LetterExtra, QObject::tr("LetterExtra"));
list.insert(QPagedPaintDevice::LetterPlus, QObject::tr("LetterPlus"));
list.insert(QPagedPaintDevice::LetterSmall, QObject::tr("LetterSmall"));
list.insert(QPagedPaintDevice::TabloidExtra, QObject::tr("TabloidExtra"));
list.insert(QPagedPaintDevice::ArchA, QObject::tr("ArchA"));
list.insert(QPagedPaintDevice::ArchB, QObject::tr("ArchB"));
list.insert(QPagedPaintDevice::ArchC, QObject::tr("ArchC"));
list.insert(QPagedPaintDevice::ArchD, QObject::tr("ArchD"));
list.insert(QPagedPaintDevice::ArchE, QObject::tr("ArchE"));
list.insert(QPagedPaintDevice::Imperial7x9, QObject::tr("Imperial7x9"));
list.insert(QPagedPaintDevice::Imperial8x10, QObject::tr("Imperial8x10"));
list.insert(QPagedPaintDevice::Imperial9x11, QObject::tr("Imperial9x11"));
list.insert(QPagedPaintDevice::Imperial9x12, QObject::tr("Imperial9x12"));
list.insert(QPagedPaintDevice::Imperial10x11, QObject::tr("Imperial10x11"));
list.insert(QPagedPaintDevice::Imperial10x13, QObject::tr("Imperial10x13"));
list.insert(QPagedPaintDevice::Imperial10x14, QObject::tr("Imperial10x14"));
list.insert(QPagedPaintDevice::Imperial12x11, QObject::tr("Imperial12x11"));
list.insert(QPagedPaintDevice::Imperial15x11, QObject::tr("Imperial15x11"));
list.insert(QPagedPaintDevice::ExecutiveStandard, QObject::tr("ExecutiveStandard"));
list.insert(QPagedPaintDevice::Note, QObject::tr("Note"));
list.insert(QPagedPaintDevice::Quarto, QObject::tr("Quarto"));
list.insert(QPagedPaintDevice::Statement, QObject::tr("Statement"));
list.insert(QPagedPaintDevice::SuperA, QObject::tr("SuperA"));
list.insert(QPagedPaintDevice::SuperB, QObject::tr("SuperB"));
list.insert(QPagedPaintDevice::Postcard, QObject::tr("Postcard"));
list.insert(QPagedPaintDevice::DoublePostcard, QObject::tr("DoublePostcard"));
list.insert(QPagedPaintDevice::Prc16K, QObject::tr("Prc16K"));
list.insert(QPagedPaintDevice::Prc32K, QObject::tr("Prc32K"));
list.insert(QPagedPaintDevice::Prc32KBig, QObject::tr("Prc32KBig"));
list.insert(QPagedPaintDevice::FanFoldUS, QObject::tr("FanFoldUS"));
list.insert(QPagedPaintDevice::FanFoldGerman, QObject::tr("FanFoldGerman"));
list.insert(QPagedPaintDevice::FanFoldGermanLegal, QObject::tr("FanFoldGermanLegal"));
list.insert(QPagedPaintDevice::EnvelopeB4, QObject::tr("EnvelopeB4"));
list.insert(QPagedPaintDevice::EnvelopeB5, QObject::tr("EnvelopeB5"));
list.insert(QPagedPaintDevice::EnvelopeB6, QObject::tr("EnvelopeB6"));
list.insert(QPagedPaintDevice::EnvelopeC0, QObject::tr("EnvelopeC0"));
list.insert(QPagedPaintDevice::EnvelopeC1, QObject::tr("EnvelopeC1"));
list.insert(QPagedPaintDevice::EnvelopeC2, QObject::tr("EnvelopeC2"));
list.insert(QPagedPaintDevice::EnvelopeC3, QObject::tr("EnvelopeC3"));
list.insert(QPagedPaintDevice::EnvelopeC4, QObject::tr("EnvelopeC4"));
list.insert(QPagedPaintDevice::EnvelopeC5, QObject::tr("EnvelopeC5"));
list.insert(QPagedPaintDevice::EnvelopeC6, QObject::tr("EnvelopeC6"));
list.insert(QPagedPaintDevice::EnvelopeC65, QObject::tr("EnvelopeC65"));
list.insert(QPagedPaintDevice::EnvelopeC7, QObject::tr("EnvelopeC7"));
list.insert(QPagedPaintDevice::EnvelopeDL, QObject::tr("EnvelopeDL"));
list.insert(QPagedPaintDevice::Envelope9, QObject::tr("Envelope9"));
list.insert(QPagedPaintDevice::Envelope10, QObject::tr("Envelope10"));
list.insert(QPagedPaintDevice::Envelope11, QObject::tr("Envelope11"));
list.insert(QPagedPaintDevice::Envelope12, QObject::tr("Envelope12"));
list.insert(QPagedPaintDevice::Envelope14, QObject::tr("Envelope14"));
list.insert(QPagedPaintDevice::EnvelopeMonarch, QObject::tr("EnvelopeMonarch"));
list.insert(QPagedPaintDevice::EnvelopePersonal, QObject::tr("EnvelopePersonal"));
list.insert(QPagedPaintDevice::EnvelopeChou3, QObject::tr("EnvelopeChou3"));
list.insert(QPagedPaintDevice::EnvelopeChou4, QObject::tr("EnvelopeChou4"));
list.insert(QPagedPaintDevice::EnvelopeInvite, QObject::tr("EnvelopeInvite"));
list.insert(QPagedPaintDevice::EnvelopeItalian, QObject::tr("EnvelopeItalian"));
list.insert(QPagedPaintDevice::EnvelopeKaku2, QObject::tr("EnvelopeKaku2"));
list.insert(QPagedPaintDevice::EnvelopeKaku3, QObject::tr("EnvelopeKaku3"));
list.insert(QPagedPaintDevice::EnvelopePrc1, QObject::tr("EnvelopePrc1"));
list.insert(QPagedPaintDevice::EnvelopePrc2, QObject::tr("EnvelopePrc2"));
list.insert(QPagedPaintDevice::EnvelopePrc3, QObject::tr("EnvelopePrc3"));
list.insert(QPagedPaintDevice::EnvelopePrc4, QObject::tr("EnvelopePrc4"));
list.insert(QPagedPaintDevice::EnvelopePrc5, QObject::tr("EnvelopePrc5"));
list.insert(QPagedPaintDevice::EnvelopePrc6, QObject::tr("EnvelopePrc6"));
list.insert(QPagedPaintDevice::EnvelopePrc7, QObject::tr("EnvelopePrc7"));
list.insert(QPagedPaintDevice::EnvelopePrc8, QObject::tr("EnvelopePrc8"));
list.insert(QPagedPaintDevice::EnvelopePrc9, QObject::tr("EnvelopePrc9"));
list.insert(QPagedPaintDevice::EnvelopePrc10, QObject::tr("EnvelopePrc10"));
list.insert(QPagedPaintDevice::EnvelopeYou4, QObject::tr("EnvelopeYou4"));
list.insert(QPageSize::A0, QObject::tr("A0"));
list.insert(QPageSize::A1, QObject::tr("A1"));
list.insert(QPageSize::A2, QObject::tr("A2"));
list.insert(QPageSize::A3, QObject::tr("A3"));
list.insert(QPageSize::A4, QObject::tr("A4"));
list.insert(QPageSize::A5, QObject::tr("A5"));
list.insert(QPageSize::A6, QObject::tr("A6"));
list.insert(QPageSize::A7, QObject::tr("A7"));
list.insert(QPageSize::A8, QObject::tr("A8"));
list.insert(QPageSize::A9, QObject::tr("A9"));
list.insert(QPageSize::B0, QObject::tr("B0"));
list.insert(QPageSize::B1, QObject::tr("B1"));
list.insert(QPageSize::B2, QObject::tr("B2"));
list.insert(QPageSize::B3, QObject::tr("B3"));
list.insert(QPageSize::B4, QObject::tr("B4"));
list.insert(QPageSize::B5, QObject::tr("B5"));
list.insert(QPageSize::B6, QObject::tr("B6"));
list.insert(QPageSize::B7, QObject::tr("B7"));
list.insert(QPageSize::B8, QObject::tr("B8"));
list.insert(QPageSize::B9, QObject::tr("B9"));
list.insert(QPageSize::B10, QObject::tr("B10"));
list.insert(QPageSize::C5E, QObject::tr("C5E"));
list.insert(QPageSize::Comm10E, QObject::tr("Comm10E"));
list.insert(QPageSize::DLE, QObject::tr("DLE"));
list.insert(QPageSize::Executive, QObject::tr("Executive"));
list.insert(QPageSize::Folio, QObject::tr("Folio"));
list.insert(QPageSize::Ledger, QObject::tr("Ledger"));
list.insert(QPageSize::Legal, QObject::tr("Legal"));
list.insert(QPageSize::Letter, QObject::tr("Letter"));
list.insert(QPageSize::Tabloid, QObject::tr("Tabloid"));
list.insert(QPageSize::Custom, QObject::tr("Custom"));
list.insert(QPageSize::A10, QObject::tr("A10"));
list.insert(QPageSize::A3Extra, QObject::tr("A3Extra"));
list.insert(QPageSize::A4Extra, QObject::tr("A4Extra"));
list.insert(QPageSize::A4Plus, QObject::tr("A4Plus"));
list.insert(QPageSize::A4Small, QObject::tr("A4Small"));
list.insert(QPageSize::A5Extra, QObject::tr("A5Extra"));
list.insert(QPageSize::B5Extra, QObject::tr("B5Extra"));
list.insert(QPageSize::JisB0, QObject::tr("JisB0"));
list.insert(QPageSize::JisB1, QObject::tr("JisB1"));
list.insert(QPageSize::JisB2, QObject::tr("JisB2"));
list.insert(QPageSize::JisB3, QObject::tr("JisB3"));
list.insert(QPageSize::JisB4, QObject::tr("JisB4"));
list.insert(QPageSize::JisB5, QObject::tr("JisB5"));
list.insert(QPageSize::JisB6, QObject::tr("JisB6"));
list.insert(QPageSize::JisB7, QObject::tr("JisB7"));
list.insert(QPageSize::JisB8, QObject::tr("JisB8"));
list.insert(QPageSize::JisB9, QObject::tr("JisB9"));
list.insert(QPageSize::JisB10, QObject::tr("JisB10"));
list.insert(QPageSize::AnsiA, QObject::tr("Letter"));
list.insert(QPageSize::AnsiB, QObject::tr("Ledger"));
list.insert(QPageSize::AnsiC, QObject::tr("AnsiC"));
list.insert(QPageSize::AnsiD, QObject::tr("AnsiD"));
list.insert(QPageSize::AnsiE, QObject::tr("AnsiE"));
list.insert(QPageSize::LegalExtra, QObject::tr("LegalExtra"));
list.insert(QPageSize::LetterExtra, QObject::tr("LetterExtra"));
list.insert(QPageSize::LetterPlus, QObject::tr("LetterPlus"));
list.insert(QPageSize::LetterSmall, QObject::tr("LetterSmall"));
list.insert(QPageSize::TabloidExtra, QObject::tr("TabloidExtra"));
list.insert(QPageSize::ArchA, QObject::tr("ArchA"));
list.insert(QPageSize::ArchB, QObject::tr("ArchB"));
list.insert(QPageSize::ArchC, QObject::tr("ArchC"));
list.insert(QPageSize::ArchD, QObject::tr("ArchD"));
list.insert(QPageSize::ArchE, QObject::tr("ArchE"));
list.insert(QPageSize::Imperial7x9, QObject::tr("Imperial7x9"));
list.insert(QPageSize::Imperial8x10, QObject::tr("Imperial8x10"));
list.insert(QPageSize::Imperial9x11, QObject::tr("Imperial9x11"));
list.insert(QPageSize::Imperial9x12, QObject::tr("Imperial9x12"));
list.insert(QPageSize::Imperial10x11, QObject::tr("Imperial10x11"));
list.insert(QPageSize::Imperial10x13, QObject::tr("Imperial10x13"));
list.insert(QPageSize::Imperial10x14, QObject::tr("Imperial10x14"));
list.insert(QPageSize::Imperial12x11, QObject::tr("Imperial12x11"));
list.insert(QPageSize::Imperial15x11, QObject::tr("Imperial15x11"));
list.insert(QPageSize::ExecutiveStandard, QObject::tr("ExecutiveStandard"));
list.insert(QPageSize::Note, QObject::tr("Note"));
list.insert(QPageSize::Quarto, QObject::tr("Quarto"));
list.insert(QPageSize::Statement, QObject::tr("Statement"));
list.insert(QPageSize::SuperA, QObject::tr("SuperA"));
list.insert(QPageSize::SuperB, QObject::tr("SuperB"));
list.insert(QPageSize::Postcard, QObject::tr("Postcard"));
list.insert(QPageSize::DoublePostcard, QObject::tr("DoublePostcard"));
list.insert(QPageSize::Prc16K, QObject::tr("Prc16K"));
list.insert(QPageSize::Prc32K, QObject::tr("Prc32K"));
list.insert(QPageSize::Prc32KBig, QObject::tr("Prc32KBig"));
list.insert(QPageSize::FanFoldUS, QObject::tr("FanFoldUS"));
list.insert(QPageSize::FanFoldGerman, QObject::tr("FanFoldGerman"));
list.insert(QPageSize::FanFoldGermanLegal, QObject::tr("FanFoldGermanLegal"));
list.insert(QPageSize::EnvelopeB4, QObject::tr("EnvelopeB4"));
list.insert(QPageSize::EnvelopeB5, QObject::tr("EnvelopeB5"));
list.insert(QPageSize::EnvelopeB6, QObject::tr("EnvelopeB6"));
list.insert(QPageSize::EnvelopeC0, QObject::tr("EnvelopeC0"));
list.insert(QPageSize::EnvelopeC1, QObject::tr("EnvelopeC1"));
list.insert(QPageSize::EnvelopeC2, QObject::tr("EnvelopeC2"));
list.insert(QPageSize::EnvelopeC3, QObject::tr("EnvelopeC3"));
list.insert(QPageSize::EnvelopeC4, QObject::tr("EnvelopeC4"));
list.insert(QPageSize::EnvelopeC5, QObject::tr("EnvelopeC5"));
list.insert(QPageSize::EnvelopeC6, QObject::tr("EnvelopeC6"));
list.insert(QPageSize::EnvelopeC65, QObject::tr("EnvelopeC65"));
list.insert(QPageSize::EnvelopeC7, QObject::tr("EnvelopeC7"));
list.insert(QPageSize::EnvelopeDL, QObject::tr("EnvelopeDL"));
list.insert(QPageSize::Envelope9, QObject::tr("Envelope9"));
list.insert(QPageSize::Envelope10, QObject::tr("Envelope10"));
list.insert(QPageSize::Envelope11, QObject::tr("Envelope11"));
list.insert(QPageSize::Envelope12, QObject::tr("Envelope12"));
list.insert(QPageSize::Envelope14, QObject::tr("Envelope14"));
list.insert(QPageSize::EnvelopeMonarch, QObject::tr("EnvelopeMonarch"));
list.insert(QPageSize::EnvelopePersonal, QObject::tr("EnvelopePersonal"));
list.insert(QPageSize::EnvelopeChou3, QObject::tr("EnvelopeChou3"));
list.insert(QPageSize::EnvelopeChou4, QObject::tr("EnvelopeChou4"));
list.insert(QPageSize::EnvelopeInvite, QObject::tr("EnvelopeInvite"));
list.insert(QPageSize::EnvelopeItalian, QObject::tr("EnvelopeItalian"));
list.insert(QPageSize::EnvelopeKaku2, QObject::tr("EnvelopeKaku2"));
list.insert(QPageSize::EnvelopeKaku3, QObject::tr("EnvelopeKaku3"));
list.insert(QPageSize::EnvelopePrc1, QObject::tr("EnvelopePrc1"));
list.insert(QPageSize::EnvelopePrc2, QObject::tr("EnvelopePrc2"));
list.insert(QPageSize::EnvelopePrc3, QObject::tr("EnvelopePrc3"));
list.insert(QPageSize::EnvelopePrc4, QObject::tr("EnvelopePrc4"));
list.insert(QPageSize::EnvelopePrc5, QObject::tr("EnvelopePrc5"));
list.insert(QPageSize::EnvelopePrc6, QObject::tr("EnvelopePrc6"));
list.insert(QPageSize::EnvelopePrc7, QObject::tr("EnvelopePrc7"));
list.insert(QPageSize::EnvelopePrc8, QObject::tr("EnvelopePrc8"));
list.insert(QPageSize::EnvelopePrc9, QObject::tr("EnvelopePrc9"));
list.insert(QPageSize::EnvelopePrc10, QObject::tr("EnvelopePrc10"));
list.insert(QPageSize::EnvelopeYou4, QObject::tr("EnvelopeYou4"));
return(list);
}
common.h
+9 -5
View File
@@ -16,6 +16,7 @@
#include <QDebug>
#include <QPrinter>
#include <QPagedPaintDevice>
#include <QPageSize>
#ifdef __GNUC__
@@ -27,6 +28,9 @@
#endif
#define TEXT_COLOR_ROLE Qt::ForegroundRole
#define BACKGROUND_COLOR_ROLE Qt::BackgroundRole
/*!
\brief
@@ -96,22 +100,22 @@ QByteArray textDocument2Blob(cTextDocument* lpTextDocument);
*/
QString localePath();
QString paperName(QPagedPaintDevice::PageSize paperSize);
QString paperName(QPageSize::PageSizeId paperSize);
/*!
\brief
\fn paperKey
\param szPaperSize
\return QPagedPaintDevice::PageSize
\return QPageSize::PageSizeId
*/
QPagedPaintDevice::PageSize paperKey(const QString& szPaperSize);
QPageSize::PageSizeId paperKey(const QString& szPaperSize);
/*!
\brief
\fn paperList
\return QMap<QPagedPaintDevice::PageSize, QString>
\return QMap<QPageSize::PageSizeId, QString>
*/
QMap<QPagedPaintDevice::PageSize, QString> paperList();
QMap<QPageSize::PageSizeId, QString> paperList();
/*!
\brief
cpropertieswindow.cpp
+6 -6
View File
@@ -15,8 +15,8 @@ cPropertiesWindow::cPropertiesWindow(QWidget *parent) :
ui->setupUi(this);
ui->m_lpTab->setCurrentIndex(0);
QMap<QPagedPaintDevice::PageSize, QString> paperLst = paperList();
QMap<QPagedPaintDevice::PageSize, QString>::iterator i;
QMap<QPageSize::PageSizeId, QString> paperLst = paperList();
QMap<QPageSize::PageSizeId, QString>::iterator i;
for(i = paperLst.begin();i != paperLst.end();i++)
ui->m_lpPaperSize->addItem(i.value(), QVariant::fromValue((int)i.key()));
@@ -356,8 +356,8 @@ void cPropertiesWindow::setBook(cStoryBook *lpStoryBook)
ui->m_lpPrintSceneDescription->setChecked(lpStoryBook->printSceneDescription());
ui->m_lpPrintSceneText->setChecked(lpStoryBook->printSceneText());
ui->m_lpPaperSize->setCurrentText(paperName(lpStoryBook->paperSize()));
ui->m_lpOrientationPortrait->setChecked(lpStoryBook->paperOrientation() == QPrinter::Portrait);
ui->m_lpOrientationLandscape->setChecked(lpStoryBook->paperOrientation() == QPrinter::Landscape);
ui->m_lpOrientationPortrait->setChecked(lpStoryBook->paperOrientation() == QPageLayout::Portrait);
ui->m_lpOrientationLandscape->setChecked(lpStoryBook->paperOrientation() == QPageLayout::Landscape);
ui->m_lpUnit->setCurrentText(QString("%1").arg(lpStoryBook->unit()));
ui->m_lpMarginLeft->setValue(lpStoryBook->leftMargin());
ui->m_lpMarginRight->setValue(lpStoryBook->rightMargin());
@@ -953,14 +953,14 @@ void cPropertiesWindow::onPaperSizeChanged(const QString &text)
void cPropertiesWindow::onOrientationPortraitChanged(bool checked)
{
if(checked)
m_lpStoryBook->setPaperOrientation(QPrinter::Portrait);
m_lpStoryBook->setPaperOrientation(QPageLayout::Portrait);
m_lpMainWindow->somethingChanged();
}
void cPropertiesWindow::onOrientationLandscapeChanged(bool checked)
{
if(checked)
m_lpStoryBook->setPaperOrientation(QPrinter::Landscape);
m_lpStoryBook->setPaperOrientation(QPageLayout::Landscape);
m_lpMainWindow->somethingChanged();
}
cscenewindow.cpp
+6 -6
View File
@@ -33,19 +33,19 @@ cSceneWindow::cSceneWindow(QWidget *parent) :
ui->m_lpTab->setCurrentIndex(0);
ui->m_lpState->addItem(cScene::stateText(cScene::STATE_init), cScene::STATE_init);
ui->m_lpState->setItemData(0, QBrush(cScene::stateColor(cScene::STATE_init)), Qt::TextColorRole);
ui->m_lpState->setItemData(0, QBrush(cScene::stateColor(cScene::STATE_init)), TEXT_COLOR_ROLE);
ui->m_lpState->addItem(cScene::stateText(cScene::STATE_progress), cScene::STATE_progress);
ui->m_lpState->setItemData(1, QBrush(cScene::stateColor(cScene::STATE_progress)), Qt::BackgroundColorRole);
ui->m_lpState->setItemData(1, QBrush(cScene::stateColor(cScene::STATE_progress)), BACKGROUND_COLOR_ROLE);
ui->m_lpState->addItem(cScene::stateText(cScene::STATE_delayed), cScene::STATE_delayed);
ui->m_lpState->setItemData(2, QBrush(cScene::stateColor(cScene::STATE_delayed)), Qt::BackgroundColorRole);
ui->m_lpState->setItemData(2, QBrush(cScene::stateColor(cScene::STATE_delayed)), BACKGROUND_COLOR_ROLE);
ui->m_lpState->addItem(cScene::stateText(cScene::STATE_finished), cScene::STATE_finished);
ui->m_lpState->setItemData(3, QBrush(cScene::stateColor(cScene::STATE_finished)), Qt::BackgroundColorRole);
ui->m_lpState->setItemData(3, QBrush(cScene::stateColor(cScene::STATE_finished)), BACKGROUND_COLOR_ROLE);
ui->m_lpState->addItem(cScene::stateText(cScene::STATE_unknown), cScene::STATE_unknown);
ui->m_lpState->setItemData(4, QBrush(cScene::stateColor(cScene::STATE_unknown)), Qt::BackgroundColorRole);
ui->m_lpState->setItemData(4, QBrush(cScene::stateColor(cScene::STATE_unknown)), BACKGROUND_COLOR_ROLE);
connect(ui->m_lpCharacterShowDetails, &QPushButton::clicked, this, &cSceneWindow::onCharacterShowDetails);
@@ -211,7 +211,7 @@ void cSceneWindow::onDescriptionChanged()
void cSceneWindow::onStateChanged(int index)
{
QBrush brush = qvariant_cast<QBrush>(ui->m_lpState->currentData(Qt::BackgroundColorRole));
QBrush brush = qvariant_cast<QBrush>(ui->m_lpState->currentData(BACKGROUND_COLOR_ROLE));
QColor color = brush.color();
ui->m_lpState->setStyleSheet(QString("background-color: rgb(%1, %2, %3);").arg(color.red()).arg(color.green()).arg(color.blue()));
cstorybook.cpp
+13 -16
View File
@@ -91,8 +91,8 @@ cStoryBook::cStoryBook(QObject *parent) :
m_iSceneAlign(ALIGN_left),
m_bPrintSceneDescription(true),
m_bPrintSceneText(true),
m_paperSize(QPagedPaintDevice::A4),
m_iPaperOrientation(QPrinter::Portrait),
m_paperSize(QPageSize::A4),
m_iPaperOrientation(QPageLayout::Portrait),
m_dLeftMargin(10),
m_dRightMargin(10),
m_dTopMargin(10),
@@ -345,7 +345,7 @@ bool cStoryBook::printDocument(QPrinter& printer)
file.close();
}
doc.setPageSize(printer.pageRect().size());
doc.setPageSize(printer.pageRect(QPrinter::Millimeter).size());
doc.print(&printer);
return(true);
@@ -353,11 +353,8 @@ bool cStoryBook::printDocument(QPrinter& printer)
void cStoryBook::configPrinter(QPrinter& printer)
{
printer.setPaperSize(paperSize());
printer.setOrientation(paperOrientation());
QMarginsF marginsF(leftMargin(), topMargin(), rightMargin(), bottomMargin());
printer.setPageMargins(marginsF, unit());
QPageLayout layout(QPageSize(paperSize()), paperOrientation(), QMarginsF(leftMargin(), topMargin(), rightMargin(), bottomMargin()));
printer.setPageLayout(layout);
}
void cStoryBook::printBlock(QTextCursor& cursor, const QString& szText, const QString& szFont, const qint16& iFontSize, const ALIGN align, const bool& bold, const bool& italic, const bool& underline)
@@ -580,8 +577,8 @@ bool cStoryBook::createDatabase()
query.bindValue(":sceneAlign", ALIGN_left);
query.bindValue(":printSceneDescription", true);
query.bindValue(":printSceneText", true);
query.bindValue(":paperSize", QPagedPaintDevice::A4);
query.bindValue(":paperOrientation", QPrinter::Portrait);
query.bindValue(":paperSize", QPageSize::A4);
query.bindValue(":paperOrientation", QPageLayout::Portrait);
query.bindValue(":leftMargin", 10);
query.bindValue(":rightMargin", 10);
query.bindValue(":topMargin", 10);
@@ -1240,8 +1237,8 @@ bool cStoryBook::loadConfig()
m_iSceneAlign = static_cast<ALIGN>(query.value("sceneAlign").toInt());
m_bPrintSceneDescription = query.value("printSceneDescription").toBool();
m_bPrintSceneText = query.value("printSceneText").toBool();
m_paperSize = static_cast<QPagedPaintDevice::PageSize>(query.value("paperSize").toInt());
m_iPaperOrientation = static_cast<QPrinter::Orientation>(query.value("paperOrientation").toInt());
m_paperSize = static_cast<QPageSize::PageSizeId>(query.value("paperSize").toInt());
m_iPaperOrientation = static_cast<QPageLayout::Orientation>(query.value("paperOrientation").toInt());
m_dLeftMargin = query.value("leftMargin").toDouble();
m_dRightMargin = query.value("rightMargin").toDouble();
m_dTopMargin = query.value("topMargin").toDouble();
@@ -2384,22 +2381,22 @@ void cStoryBook::setPrintSceneText(const bool& value)
m_bPrintSceneText = value;
}
QPagedPaintDevice::PageSize cStoryBook::paperSize()
QPageSize::PageSizeId cStoryBook::paperSize()
{
return(m_paperSize);
}
void cStoryBook::setPaperSize(const QPagedPaintDevice::PageSize& value)
void cStoryBook::setPaperSize(const QPageSize::PageSizeId& value)
{
m_paperSize = value;
}
QPrinter::Orientation cStoryBook::paperOrientation()
QPageLayout::Orientation cStoryBook::paperOrientation()
{
return(m_iPaperOrientation);
}
void cStoryBook::setPaperOrientation(const QPrinter::Orientation& value)
void cStoryBook::setPaperOrientation(const QPageLayout::Orientation& value)
{
m_iPaperOrientation = value;
}
cstorybook.h
+8 -8
View File
@@ -1074,31 +1074,31 @@ public:
\brief
\fn paperSize
\return QPagedPaintDevice::PageSize
\return QPageSize::PageSizeId
*/
QPagedPaintDevice::PageSize paperSize();
QPageSize::PageSizeId paperSize();
/*!
\brief
\fn setPaperSize
\param value
*/
void setPaperSize(const QPagedPaintDevice::PageSize& value);
void setPaperSize(const QPageSize::PageSizeId& value);
/*!
\brief
\fn paperOrientation
\return QPrinter::Orientation
\return QPageLayout::Orientation
*/
QPrinter::Orientation paperOrientation();
QPageLayout::Orientation paperOrientation();
/*!
\brief
\fn setPaperOrientation
\param value
*/
void setPaperOrientation(const QPrinter::Orientation& value);
void setPaperOrientation(const QPageLayout::Orientation& value);
/*!
\brief
@@ -1238,8 +1238,8 @@ private:
ALIGN m_iSceneAlign; /*!< TODO: describe */
bool m_bPrintSceneDescription; /*!< TODO: describe */
bool m_bPrintSceneText; /*!< TODO: describe */
QPagedPaintDevice::PageSize m_paperSize; /*!< TODO: describe */
QPrinter::Orientation m_iPaperOrientation; /*!< TODO: describe */
QPageSize::PageSizeId m_paperSize; /*!< TODO: describe */
QPageLayout::Orientation m_iPaperOrientation; /*!< TODO: describe */
qreal m_dLeftMargin; /*!< TODO: describe */
qreal m_dRightMargin; /*!< TODO: describe */
qreal m_dTopMargin; /*!< TODO: describe */
ctextdocument.cpp
+1 -1
View File
@@ -94,7 +94,7 @@ void cTextDocument::printPreview(QPrinter* lpPrinter)
#ifdef QT_NO_PRINTER
Q_UNUSED(lpPrinter);
#else
lpPrinter->setPageSizeMM(QSizeF(210, 297));
lpPrinter->setPageSize(QPageSize(QSizeF(210, 297), QPageSize::Millimeter));
print(lpPrinter);
#endif
}
ctextedit.cpp
+1 -1
View File
@@ -149,7 +149,7 @@ void cTextEdit::onTextAlign(QAction *a)
void cTextEdit::onTextFamily(const QString &f)
{
QTextCharFormat fmt;
fmt.setFontFamily(f);
fmt.setFontFamilies(QStringList() << f);
mergeFormatOnWordOrSelection(fmt);
}
storyWriter.pro
+1
View File
@@ -19,6 +19,7 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
TARGET = storyWriter
TEMPLATE = app
qtHaveModule(printsupport): QT += printsupport
qtHaveModule(core5compat): QT += core5compat
# The following define makes your compiler emit warnings if you use
# any feature of Qt which has been marked as deprecated (the exact warnings