realAscot/qelectrotech-source-mirror
realAscot/qelectrotech-source-mirror
1
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2025-09-14 20:33:05 +02:00
Code Packages Releases 1 Activity

fix QT DEPRECATED VERSION 5.15.2 and QT6

Browse Source 
-QPrinter
This commit is contained in:
Simon De Backer 2020-12-04 21:46:20 +01:00
parent b22741732b
commit 53aaa03967
1 changed files with 78 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
sources/print/projectprintwindow.cpp
View File

@ -30,10 +30,11 @@
#pragma message("@TODO remove code for QT 6 or later") #pragma message("@TODO remove code for QT 6 or later")
#endif #endif
#endif #endif
#include <QScreen> #include <QMarginsF>
#include <QPainter>
#include <QPageSetupDialog> #include <QPageSetupDialog>
#include <QPainter>
#include <QPrintDialog> #include <QPrintDialog>
#include <QScreen>
/** /**
* @brief ProjectPrintWindow::ProjectPrintWindow * @brief ProjectPrintWindow::ProjectPrintWindow
@ -383,13 +384,16 @@ int ProjectPrintWindow::verticalPagesCount(
Diagram *diagram, const ExportProperties &option, bool full_page) const Diagram *diagram, const ExportProperties &option, bool full_page) const
{ {
QRect printable_area; QRect printable_area;
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) // ### Qt 6: remove #if QT_VERSION < QT_VERSION_CHECK(5, 15, 1) // ### Qt 6: remove
printable_area = full_page ? m_printer->paperRect() : m_printer->pageRect(); printable_area = full_page ? m_printer->paperRect() : m_printer->pageRect();
#else #else
#if TODO_LIST #if TODO_LIST
#pragma message("@TODO remove code for QT 6 or later") #pragma message("@TODO remove code for QT 6 or later")
#endif # endif
qDebug()<<"Help code for QT 6 or later"; printable_area =
full_page ?
m_printer->pageLayout().fullRectPixels(m_printer->resolution()) :
m_printer->pageLayout().paintRectPixels(m_printer->resolution());
#endif #endif
QRect diagram_rect = diagramRect(diagram, option); QRect diagram_rect = diagramRect(diagram, option);
@ -449,18 +453,19 @@ QString ProjectPrintWindow::settingsSectionName(const QPrinter *printer)
void ProjectPrintWindow::loadPageSetupForCurrentPrinter() void ProjectPrintWindow::loadPageSetupForCurrentPrinter()
{ {
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) // ### Qt 6: remove
QSettings settings; QSettings settings;
QString printer_section = settingsSectionName(m_printer); QString printer_section = settingsSectionName(m_printer);
while (!settings.group().isEmpty()) settings.endGroup(); while (! settings.group().isEmpty()) settings.endGroup();
settings.beginGroup("printers"); settings.beginGroup("printers");
if (!settings.childGroups().contains(printer_section)) { if (! settings.childGroups().contains(printer_section))
{
settings.endGroup(); settings.endGroup();
return; return;
} }
settings.beginGroup(printer_section); settings.beginGroup(printer_section);
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 1) // ### Qt 6: remove
if (settings.contains("orientation")) { if (settings.contains("orientation")) {
QString value = settings.value("orientation", "landscape").toString(); QString value = settings.value("orientation", "landscape").toString();
m_printer -> setOrientation(value == "landscape" ? QPrinter::Landscape : QPrinter::Portrait); m_printer -> setOrientation(value == "landscape" ? QPrinter::Landscape : QPrinter::Portrait);
@ -487,17 +492,74 @@ void ProjectPrintWindow::loadPageSetupForCurrentPrinter()
qreal value = settings.value("margin" + margins_names.at(i), -1.0).toReal(&conv_ok); qreal value = settings.value("margin" + margins_names.at(i), -1.0).toReal(&conv_ok);
if (conv_ok && value != -1.0) margins[i] = value; if (conv_ok && value != -1.0) margins[i] = value;
} }
m_printer -> setPageMargins(margins[0], margins[1], margins[2], margins[3], QPrinter::Millimeter); m_printer->setPageMargins(
m_printer -> setFullPage(settings.value("fullpage", "false").toString() == "true"); margins[0],
margins[1],
settings.endGroup(); margins[2],
settings.endGroup(); margins[3],
QPrinter::Millimeter);
#else #else
#if TODO_LIST #if TODO_LIST
#pragma message("@TODO remove code for QT 6 or later") #pragma message("@TODO remove code for QT 6 or later")
# endif
if (settings.contains("orientation"))
{
QString value = settings.value("orientation", "landscape").toString();
m_printer->setPageOrientation(
value == "landscape" ? QPageLayout::Landscape :
QPageLayout::Portrait);
}
if (settings.contains("papersize"))
{
int value = settings.value("papersize", QPageSize::A4).toInt();
if (value == QPageSize::Custom)
{
bool w_ok, h_ok;
int w = settings.value("customwidthmm", -1).toInt(&w_ok);
int h = settings.value("customheightmm", -1).toInt(&h_ok);
if (w_ok && h_ok && w != -1 && h != -1)
{
m_printer->setPageSize(QPageSize(
QSizeF(w, h),
QPageSize::Millimeter,
"Custom",
QPageSize::FuzzyMatch));
}
}
else if (value < QPageSize::Custom)
{
QPageSize var;
var.id(value);
m_printer->setPageSize(var);
}
}
qreal margins[4];
margins[0] = m_printer->pageLayout().margins().left();
margins[1] = m_printer->pageLayout().margins().top();
margins[2] = m_printer->pageLayout().margins().right();
margins[3] = m_printer->pageLayout().margins().bottom();
QStringList margins_names(
QStringList() << "left"
<< "top"
<< "right"
<< "bottom");
for (int i = 0; i < 4; ++i)
{
bool conv_ok;
qreal value = settings.value("margin" + margins_names.at(i), -1.0)
.toReal(&conv_ok);
if (conv_ok && value != -1.0) margins[i] = value;
}
m_printer->setPageMargins(
QMarginsF(margins[0], margins[1], margins[2], margins[3]),
QPageLayout::Millimeter);
#endif #endif
qDebug()<<"Help code for QT 6 or later"; m_printer->setFullPage(
#endif settings.value("fullpage", "false").toString() == "true");
settings.endGroup();
settings.endGroup();
} }
void ProjectPrintWindow::savePageSetupForCurrentPrinter() void ProjectPrintWindow::savePageSetupForCurrentPrinter()